Commit 2ee7035dc7b9de711e9dc8e179b0c7ae2300f117
1 parent
7c8fcd3b
preparation for edge triggerd events and add a small testscript for paralell testing.
Showing
4 changed files
with
17 additions
and
5 deletions
@@ -62,7 +62,6 @@ TR_commManagerSelect(void * _this, TR_Event event) | @@ -62,7 +62,6 @@ TR_commManagerSelect(void * _this, TR_Event event) | ||
62 | timeout = TR_eventDispatcherGetDataWaitTime(dispatcher); | 62 | timeout = TR_eventDispatcherGetDataWaitTime(dispatcher); |
63 | } else { | 63 | } else { |
64 | timeout = *timeoutptr; | 64 | timeout = *timeoutptr; |
65 | - TR_MEM_FREE(timeoutptr); | ||
66 | } | 65 | } |
67 | 66 | ||
68 | TR_CALL(_this, TR_CommManager, select, event, timeout); | 67 | TR_CALL(_this, TR_CommManager, select, event, timeout); |
@@ -43,7 +43,7 @@ serverCtor(void * _this, va_list * params) | @@ -43,7 +43,7 @@ serverCtor(void * _this, va_list * params) | ||
43 | TR_Server this = _this; | 43 | TR_Server this = _this; |
44 | 44 | ||
45 | this->comm_manager = (TR_CommManager)TR_new(TR_CommManagerPoll); | 45 | this->comm_manager = (TR_CommManager)TR_new(TR_CommManagerPoll); |
46 | - this->dispatcher = TR_new(TR_EventDispatcher); | 46 | + this->dispatcher = TR_new(TR_EventDispatcher, TR_EVD_SERVER, NULL, 100); |
47 | this->connector = TR_new(TR_Connector); | 47 | this->connector = TR_new(TR_Connector); |
48 | this->io_handler = TR_new(TR_IoHandler); | 48 | this->io_handler = TR_new(TR_IoHandler); |
49 | this->protocol_handler = TR_new(TR_ProtocolHandler); | 49 | this->protocol_handler = TR_new(TR_ProtocolHandler); |
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | -TRLIBS="-ltrbase -ltrhashing -ltrio -ltrdata -ltrevent -ltrcomm" | 2 | +#TRLIBS="-ltrbase -ltrhashing -ltrio -ltrdata -ltrevent -ltrcomm" |
3 | +TRLIBS="/usr/local/lib/libtrcomm.a /usr/local/lib/libtrevent.a /usr/local/lib/libtrdata.a /usr/local/lib/libtrio.a /usr/local/lib/libtrhashing.a /usr/local/lib/libtrbase.a" | ||
3 | LIBS="-lcrypto -lssl -lrt -luuid" | 4 | LIBS="-lcrypto -lssl -lrt -luuid" |
4 | gcc ${CFLAGS} -c -o test_handler.o test_handler.c | 5 | gcc ${CFLAGS} -c -o test_handler.o test_handler.c |
5 | -gcc ${CFLAGS} -I/usr/local/include -L/usr/local/lib ${TRLIBS} ${LIBS} -o testserver testserver.c test_handler.o | ||
6 | -gcc ${CFLAGS} -I/usr/local/include -L/usr/local/lib ${TRLIBS} ${LIBS} -o testserver2 testserver2.c test_handler.o | 6 | +gcc ${CFLAGS} -I/usr/local/include -L/usr/local/lib ${LIBS} -o testserver testserver.c test_handler.o ${TRLIBS} |
7 | +gcc ${CFLAGS} -I/usr/local/include -L/usr/local/lib ${LIBS} -o testserver2 testserver2.c test_handler.o ${TRLIBS} |
Please
register
or
login
to post a comment