Commit 4b2d9eb0da287e59f146f3b8cfe1be28d3f33397
1 parent
b290c2eb
fix some names and adapt to fixed PARENTCALL
Showing
12 changed files
with
16 additions
and
15 deletions
@@ -26,7 +26,7 @@ | @@ -26,7 +26,7 @@ | ||
26 | #include "tr/comm_end_point.h" | 26 | #include "tr/comm_end_point.h" |
27 | 27 | ||
28 | void | 28 | void |
29 | -cepAppendReadData(TR_CommEndPoint this, TR_RemoteData data) | 29 | +TR_cepAppendReadData(TR_CommEndPoint this, TR_RemoteData data) |
30 | { | 30 | { |
31 | TR_queuePut(this->read_buffer, data); | 31 | TR_queuePut(this->read_buffer, data); |
32 | } | 32 | } |
@@ -26,7 +26,7 @@ | @@ -26,7 +26,7 @@ | ||
26 | #include "tr/comm_end_point.h" | 26 | #include "tr/comm_end_point.h" |
27 | 27 | ||
28 | void | 28 | void |
29 | -cepAppendWriteData(TR_CommEndPoint this, TR_RemoteData data) | 29 | +TR_cepAppendWriteData(TR_CommEndPoint this, TR_RemoteData data) |
30 | { | 30 | { |
31 | TR_queuePut(this->write_buffer, data); | 31 | TR_queuePut(this->write_buffer, data); |
32 | } | 32 | } |
@@ -26,7 +26,7 @@ | @@ -26,7 +26,7 @@ | ||
26 | #include "tr/comm_end_point.h" | 26 | #include "tr/comm_end_point.h" |
27 | 27 | ||
28 | int | 28 | int |
29 | -cepBufferedRead(TR_CommEndPoint this) | 29 | +TR_cepBufferRead(TR_CommEndPoint this) |
30 | { | 30 | { |
31 | TR_RemoteData data = TR_socketRecv(this->transport, this->read_chunk_size); | 31 | TR_RemoteData data = TR_socketRecv(this->transport, this->read_chunk_size); |
32 | 32 |
@@ -26,7 +26,7 @@ | @@ -26,7 +26,7 @@ | ||
26 | #include "tr/comm_end_point.h" | 26 | #include "tr/comm_end_point.h" |
27 | 27 | ||
28 | int | 28 | int |
29 | -cepWriteBuffered(TR_CommEndPoint this) | 29 | +TR_cepWriteBuffered(TR_CommEndPoint this) |
30 | { | 30 | { |
31 | TR_RemoteData data = TR_cepNextWriteData(this); | 31 | TR_RemoteData data = TR_cepNextWriteData(this); |
32 | int send = 0; | 32 | int send = 0; |
@@ -37,7 +37,7 @@ commManagerCtor(void * _this, va_list * params) | @@ -37,7 +37,7 @@ commManagerCtor(void * _this, va_list * params) | ||
37 | { | 37 | { |
38 | TR_CommManager this = _this; | 38 | TR_CommManager this = _this; |
39 | 39 | ||
40 | - TR_PARENTCALL(_this, TR_Class, ctor, params); | 40 | + TR_PARENTCALL(TR_CommManager, _this, TR_Class, ctor, params); |
41 | 41 | ||
42 | this->n_endpoints = sysconf(_SC_OPEN_MAX); | 42 | this->n_endpoints = sysconf(_SC_OPEN_MAX); |
43 | this->endpoints = TR_calloc(sizeof(TR_CommEndPoint), this->n_endpoints); | 43 | this->endpoints = TR_calloc(sizeof(TR_CommEndPoint), this->n_endpoints); |
@@ -41,7 +41,7 @@ commManagerPollCtor(void * _this, va_list * params) | @@ -41,7 +41,7 @@ commManagerPollCtor(void * _this, va_list * params) | ||
41 | TR_CommManager cmgr = _this; | 41 | TR_CommManager cmgr = _this; |
42 | nfds_t i; | 42 | nfds_t i; |
43 | 43 | ||
44 | - TR_PARENTCALL(_this, TR_Class, ctor, params); | 44 | + TR_PARENTCALL(TR_CommManagerPoll, _this, TR_Class, ctor, params); |
45 | this->fds = TR_malloc(sizeof(struct pollfd) * cmgr->n_endpoints); | 45 | this->fds = TR_malloc(sizeof(struct pollfd) * cmgr->n_endpoints); |
46 | for (i = 0; i < cmgr->n_endpoints; i++) { | 46 | for (i = 0; i < cmgr->n_endpoints; i++) { |
47 | this->fds[i].fd = -1; | 47 | this->fds[i].fd = -1; |
@@ -59,7 +59,7 @@ commManagerPollDtor(void * _this) | @@ -59,7 +59,7 @@ commManagerPollDtor(void * _this) | ||
59 | TR_CommManagerPoll this = _this; | 59 | TR_CommManagerPoll this = _this; |
60 | 60 | ||
61 | TR_MEM_FREE(this->fds); | 61 | TR_MEM_FREE(this->fds); |
62 | - TR_PARENTCALL(_this, TR_Class, dtor); | 62 | + TR_PARENTCALL(TR_CommManagerPoll, _this, TR_Class, dtor); |
63 | } | 63 | } |
64 | 64 | ||
65 | static | 65 | static |
@@ -36,7 +36,7 @@ static | @@ -36,7 +36,7 @@ static | ||
36 | int | 36 | int |
37 | connEntryPointCtor(void * _this, va_list * params) | 37 | connEntryPointCtor(void * _this, va_list * params) |
38 | { | 38 | { |
39 | - TR_PARENTCALL(_this, TR_Class, ctor, params); | 39 | + TR_PARENTCALL(TR_ConnEntryPoint, _this, TR_Class, ctor, params); |
40 | return 0; | 40 | return 0; |
41 | } | 41 | } |
42 | 42 | ||
@@ -44,7 +44,7 @@ static | @@ -44,7 +44,7 @@ static | ||
44 | void | 44 | void |
45 | connEntryPointDtor(void * _this) | 45 | connEntryPointDtor(void * _this) |
46 | { | 46 | { |
47 | - TR_PARENTCALL(_this, TR_Class, dtor); | 47 | + TR_PARENTCALL(TR_ConnEntryPoint, _this, TR_Class, dtor); |
48 | } | 48 | } |
49 | 49 | ||
50 | static | 50 | static |
@@ -39,7 +39,7 @@ connectionCtor(void * _this, va_list * params) | @@ -39,7 +39,7 @@ connectionCtor(void * _this, va_list * params) | ||
39 | { | 39 | { |
40 | TR_Connection this = _this; | 40 | TR_Connection this = _this; |
41 | 41 | ||
42 | - TR_PARENTCALL(_this, TR_Class, ctor, params); | 42 | + TR_PARENTCALL(TR_Connection, _this, TR_Class, ctor, params); |
43 | this->current_message = NULL; | 43 | this->current_message = NULL; |
44 | 44 | ||
45 | return 0; | 45 | return 0; |
@@ -52,7 +52,7 @@ connectionDtor(void * _this) | @@ -52,7 +52,7 @@ connectionDtor(void * _this) | ||
52 | TR_Connection this = _this; | 52 | TR_Connection this = _this; |
53 | 53 | ||
54 | TR_delete(this->current_message); | 54 | TR_delete(this->current_message); |
55 | - TR_PARENTCALL(_this, TR_Class, dtor); | 55 | + TR_PARENTCALL(TR_Connection, _this, TR_Class, dtor); |
56 | } | 56 | } |
57 | 57 | ||
58 | static | 58 | static |
@@ -37,7 +37,7 @@ static | @@ -37,7 +37,7 @@ static | ||
37 | int | 37 | int |
38 | connectorCtor(void * _this, va_list * params) | 38 | connectorCtor(void * _this, va_list * params) |
39 | { | 39 | { |
40 | - TR_PARENTCALL(_this, TR_Class, ctor, params); | 40 | + TR_PARENTCALL(TR_Connector, _this, TR_Class, ctor, params); |
41 | return 0; | 41 | return 0; |
42 | } | 42 | } |
43 | 43 | ||
@@ -45,7 +45,7 @@ static | @@ -45,7 +45,7 @@ static | ||
45 | void | 45 | void |
46 | connectorDtor(void * _this) | 46 | connectorDtor(void * _this) |
47 | { | 47 | { |
48 | - TR_PARENTCALL(_this, TR_Class, dtor); | 48 | + TR_PARENTCALL(TR_Connector, _this, TR_Class, dtor); |
49 | } | 49 | } |
50 | 50 | ||
51 | static | 51 | static |
@@ -33,7 +33,7 @@ static | @@ -33,7 +33,7 @@ static | ||
33 | int | 33 | int |
34 | ioHandlerCtor(void * _this, va_list * params) | 34 | ioHandlerCtor(void * _this, va_list * params) |
35 | { | 35 | { |
36 | - TR_PARENTCALL(_this, TR_Class, ctor, params); | 36 | + TR_PARENTCALL(TR_IoHandler, _this, TR_Class, ctor, params); |
37 | 37 | ||
38 | return 0; | 38 | return 0; |
39 | } | 39 | } |
@@ -36,7 +36,7 @@ static | @@ -36,7 +36,7 @@ static | ||
36 | int | 36 | int |
37 | protocolHandlerCtor(void * _this, va_list * params) | 37 | protocolHandlerCtor(void * _this, va_list * params) |
38 | { | 38 | { |
39 | - TR_PARENTCALL(_this, TR_Class, ctor, params); | 39 | + TR_PARENTCALL(TR_ProtocolHandler, _this, TR_Class, ctor, params); |
40 | 40 | ||
41 | return 0; | 41 | return 0; |
42 | } | 42 | } |
Please
register
or
login
to post a comment