ghopp
/
libtrcomm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Revert "try for a threaded server, but not very much luck now." 

This reverts commit c0b33ec777.
1.0.0
Georg Hopp 11 years ago
parent
17cf44b9b9
commit
d32d05f52e
16 changed files with 10 additions and 236 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      .gitignore
  2. 4
      include/Makefile.am
  3. 47
      include/tr/threaded_server.h
  4. 1
      include/trcomm.h
  5. 2
      src/Makefile.am
  6. 2
      src/comm_manager.c
  7. 12
      src/connector.c
  8. 2
      src/io_handler.c
  9. 2
      src/protocol_handler.c
  10. 2
      src/simple_client.c
  11. 71
      src/threaded_server.c
  12. 44
      src/threaded_server_start.c
  13. 1
      testers/build.sh
  14. 2
      testers/test_handler.c
  15. 3
      testers/testclient.c
  16. 44
      testers/testserver_thread.c

7
.gitignore
View File

@ -40,8 +40,5 @@ test-driver
/assets/html/_documentation.html /assets/html/_documentation.html
tags tags
/trcomm.h* /trcomm.h*
/testers/testserver
/testers/testserver2
/testers/testserver_thread
/testers/testudp
/testers/testtcp
/testers/testserver*
/testers/testclient*

4
include/Makefile.am
View File

@ -18,5 +18,5 @@ nobase_include_HEADERS = trcomm.h \
tr/simple_client.h \ tr/simple_client.h \
tr/interface/comm_end_point.h \ tr/interface/comm_end_point.h \
tr/interface/comm_manager.h \ tr/interface/comm_manager.h \
tr/interface/protocol.h \
tr/threaded_server.h
tr/interface/protocol.h

47
include/tr/threaded_server.h
View File

@ -1,47 +0,0 @@
/**
* \file
*
* \author Georg Hopp
*
* \copyright
* Copyright © 2014 Georg Hopp
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __TR_THREADED_SERVER_H__
#define __TR_THREADED_SERVER_H__
#include <sys/types.h>
#include "trbase.h"
#include "trevent.h"
#include "tr/server.h"
TR_CLASS(TR_ThreadedServer) {
TR_EXTENDS(TR_Server);
TR_EventThread * threads;
size_t n_threads;
};
TR_INSTANCE_INIT(TR_ThreadedServer);
TR_CLASSVARS_DECL(TR_ThreadedServer) {};
void TR_threadedServerStart(TR_ThreadedServer, unsigned long);
#endif // __TR_THREADED_SERVER_H__
// vim: set ts=4 sw=4:

1
include/trcomm.h
View File

@ -21,7 +21,6 @@
#include "tr/interface/comm_end_point.h" #include "tr/interface/comm_end_point.h"
#include "tr/interface/comm_manager.h" #include "tr/interface/comm_manager.h"
#include "tr/interface/protocol.h" #include "tr/interface/protocol.h"
#include "tr/threaded_server.h"
#endif // __TR_COMM_H__ #endif // __TR_COMM_H__

2
src/Makefile.am
View File

@ -25,8 +25,6 @@ TRCOMM = cet_accept.c \
protocol_message_raw.c \ protocol_message_raw.c \
protocol_raw.c \ protocol_raw.c \
server.c \ server.c \
threaded_server.c \
threaded_server_start.c \
server_bind_tcp.c \ server_bind_tcp.c \
server_bind_udp.c \ server_bind_udp.c \
server_start.c \ server_start.c \

2
src/comm_manager.c
View File

@ -103,8 +103,6 @@ static
void void
commManagerCvInit(TR_class_ptr cls) commManagerCvInit(TR_class_ptr cls)
{ {
TR_CLASSVARS(TR_EventHandler, cls)->event_methods->tree = TR_new(TR_Tree);
TR_EVENT_HANDLER_SET_METHOD( TR_EVENT_HANDLER_SET_METHOD(
cls, TR_EventDispatcher, cls, TR_EventDispatcher,
TR_DISPATCHER_EVENT_DATA_WAIT, TR_DISPATCHER_EVENT_DATA_WAIT,

12
src/connector.c
View File

@ -92,13 +92,11 @@ static
void void
connectorCvInit(TR_class_ptr cls) connectorCvInit(TR_class_ptr cls)
{ {
TR_CLASSVARS(TR_EventHandler, cls)->event_methods->tree = TR_new(TR_Tree);
TR_EVENT_HANDLER_SET_METHOD(
cls,
TR_ConnEntryPoint,
TR_CET_EVENT_ACC_READY,
connectorAccept);
TR_EVENT_HANDLER_SET_METHOD(
cls,
TR_ConnEntryPoint,
TR_CET_EVENT_ACC_READY,
connectorAccept);
} }
TR_INSTANCE(TR_Hash, connectorEventMethods); TR_INSTANCE(TR_Hash, connectorEventMethods);

2
src/io_handler.c
View File

@ -158,8 +158,6 @@ static
void void
ioHandlerCvInit(TR_class_ptr cls) ioHandlerCvInit(TR_class_ptr cls)
{ {
TR_CLASSVARS(TR_EventHandler, cls)->event_methods->tree = TR_new(TR_Tree);
TR_EVENT_HANDLER_SET_METHOD( TR_EVENT_HANDLER_SET_METHOD(
cls, cls,
TR_CommEndPoint, TR_CommEndPoint,

2
src/protocol_handler.c
View File

@ -125,8 +125,6 @@ static
void void
protocolHandlerCvInit(TR_class_ptr cls) protocolHandlerCvInit(TR_class_ptr cls)
{ {
TR_CLASSVARS(TR_EventHandler, cls)->event_methods->tree = TR_new(TR_Tree);
TR_EVENT_HANDLER_SET_METHOD( TR_EVENT_HANDLER_SET_METHOD(
cls, cls,
TR_CommEndPoint, TR_CommEndPoint,

2
src/simple_client.c
View File

@ -135,8 +135,6 @@ static
void void
simpleClientCvInit(TR_class_ptr cls) simpleClientCvInit(TR_class_ptr cls)
{ {
TR_CLASSVARS(TR_EventHandler, cls)->event_methods->tree = TR_new(TR_Tree);
TR_EVENT_HANDLER_SET_METHOD( TR_EVENT_HANDLER_SET_METHOD(
cls, cls,
TR_EventDispatcher, TR_EventDispatcher,

71
src/threaded_server.c
View File

@ -1,71 +0,0 @@
/**
* \file
*
* \author Georg Hopp
*
* \copyright
* Copyright © 2014 Georg Hopp
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdarg.h>
#include <sys/types.h>
#include "trbase.h"
#include "trio.h"
#include "trevent.h"
#include "tr/threaded_server.h"
static
int
threadedServerCtor(void * _this, va_list * params)
{
TR_ThreadedServer this = _this;
int i;
TR_PARENTCALL(TR_ThreadedServer, _this, TR_Class, ctor, params);
this->n_threads = va_arg(*params, size_t);
this->threads = TR_malloc(sizeof(TR_EventThread) * this->n_threads);
for (i=0; i<this->n_threads; i++) {
this->threads[i] = TR_new(
TR_EventThread,
((TR_Server)this)->dispatcher);
}
return 0;
}
static
void
threadedServerDtor(void * _this)
{
TR_ThreadedServer this = _this;
int i;
for (i=0; i<this->n_threads; i++) {
TR_delete(this->threads[i]);
}
TR_PARENTCALL(TR_ThreadedServer, _this, TR_Class, dtor);
}
TR_INIT_IFACE(TR_Class, threadedServerCtor, threadedServerDtor, NULL);
TR_CREATE_CLASS(TR_ThreadedServer, TR_Server, NULL, TR_IF(TR_Class));
// vim: set ts=4 sw=4:

44
src/threaded_server_start.c
View File

@ -1,44 +0,0 @@
/**
* \file
*
* \author Georg Hopp
*
* \copyright
* Copyright © 2014 Georg Hopp
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "trbase.h"
#include "trevent.h"
#include "tr/threaded_server.h"
void
TR_threadedServerStart(TR_ThreadedServer this, unsigned long heartbeat)
{
int i;
TR_eventDispatcherSetHeartbeat(((TR_Server)this)->dispatcher, heartbeat);
for (i=0; i<this->n_threads; i++) {
TR_eventThreadStart(this->threads[i]);
}
for (i=0; i<this->n_threads; i++) {
TR_eventThreadJoin(this->threads[i]);
}
}
// vim: set ts=4 sw=4:

1
testers/build.sh
View File

@ -7,4 +7,3 @@ gcc ${CFLAGS} -I/usr/local/include -L/usr/local/lib ${LIBS} -o testserver testse
gcc ${CFLAGS} -I/usr/local/include -L/usr/local/lib ${LIBS} -o testserver2 testserver2.c test_handler.o ${TRLIBS} gcc ${CFLAGS} -I/usr/local/include -L/usr/local/lib ${LIBS} -o testserver2 testserver2.c test_handler.o ${TRLIBS}
gcc ${CFLAGS} -I/usr/local/include -L/usr/local/lib ${LIBS} -o testtcp testclient.c ${TRLIBS} gcc ${CFLAGS} -I/usr/local/include -L/usr/local/lib ${LIBS} -o testtcp testclient.c ${TRLIBS}
gcc ${CFLAGS} -I/usr/local/include -L/usr/local/lib ${LIBS} -DUDP=1 -o testudp testclient.c ${TRLIBS} gcc ${CFLAGS} -I/usr/local/include -L/usr/local/lib ${LIBS} -DUDP=1 -o testudp testclient.c ${TRLIBS}
gcc ${CFLAGS} -I/usr/local/include -L/usr/local/lib ${LIBS} -lpthread -o testserver_thread testserver_thread.c test_handler.o ${TRLIBS}

2
testers/test_handler.c
View File

@ -98,8 +98,6 @@ static
void void
testHandlerCvInit(TR_class_ptr class) testHandlerCvInit(TR_class_ptr class)
{ {
TR_CLASSVARS(TR_EventHandler, class)->event_methods->tree = TR_new(TR_Tree);
TR_EVENT_HANDLER_SET_METHOD( TR_EVENT_HANDLER_SET_METHOD(
class, class,
TR_EventDispatcher, TR_EventDispatcher,

3
testers/testclient.c
View File

@ -31,7 +31,6 @@ main (int argc, char * argv[])
int i, j=0; int i, j=0;
TR_logger = TR_INSTANCE_CAST(TR_Logger, mylogger2); TR_logger = TR_INSTANCE_CAST(TR_Logger, mylogger2);
protocol = TR_new(TR_ProtocolRaw); protocol = TR_new(TR_ProtocolRaw);
#if UDP #if UDP
socket = TR_new(TR_UdpSocket, TR_logger, "127.0.0.1", 5678, 0); socket = TR_new(TR_UdpSocket, TR_logger, "127.0.0.1", 5678, 0);
@ -57,7 +56,7 @@ main (int argc, char * argv[])
message = (TR_ProtoMessageRaw)TR_simpleClientIssue( message = (TR_ProtoMessageRaw)TR_simpleClientIssue(
client, client,
(TR_ProtoMessage)message, (TR_ProtoMessage)message,
100000000000000000);
100);
if (! message) break; if (! message) break;
#if 0 #if 0

44
testers/testserver_thread.c
View File

@ -1,44 +0,0 @@
#include <stdio.h>
#include <string.h>
#include <inttypes.h>
#include "trbase.h"
#include "trcomm.h"
#include "trio.h"
#include "trevent.h"
#include "test_handler.h"
TR_INSTANCE(TR_LoggerSyslog, mylogger, {TR_LOGGER_INFO});
TR_INSTANCE(TR_LoggerStderr, mylogger2, {TR_LOGGER_INFO});
int
main (int argc, char * argv[])
{
TR_ThreadedServer server = TR_new(TR_ThreadedServer, 2);
TR_Protocol protocol = TR_new(TR_ProtocolRaw);
TestHandler test_handler = TR_new(TestHandler);
//TR_logger = TR_INSTANCE_CAST(TR_Logger, mylogger2);
TR_serverAddHandler((TR_Server)server, (TR_EventHandler)test_handler);
TR_serverBindTcp((TR_Server)server, "0.0.0.0", 5678, protocol);
TR_serverBindUdp((TR_Server)server, "0.0.0.0", 5678, protocol);
TR_threadedServerStart(server, 1000);
puts("cleanup...");
TR_delete(server);
TR_delete(test_handler);
TR_delete(protocol);
TR_eventHandlerClassCleanup(TestHandler);
TR_serverClassCleanup();
TR_cleanup();
return 0;
}
// vim: set ts=4 sw=4:
Write Preview
Loading…
Cancel
Save