fix some names and adapt to fixed PARENTCALL

include/tr/comm_manager.h

@@ -24,6 +24,7 @@
 #define __TR_COMM_MANAGER_H__
 
 #include <sys/types.h>
+#include <poll.h>
 
 #include "trbase.h"
 #include "trevent.h"

src/cep_append_read_data.c

@@ -26,7 +26,7 @@
 #include "tr/comm_end_point.h"
 
 void
-cepAppendReadData(TR_CommEndPoint this, TR_RemoteData data)
+TR_cepAppendReadData(TR_CommEndPoint this, TR_RemoteData data)
 {
 	TR_queuePut(this->read_buffer, data);
 }

src/cep_append_write_data.c

@@ -26,7 +26,7 @@
 #include "tr/comm_end_point.h"
 
 void
-cepAppendWriteData(TR_CommEndPoint this, TR_RemoteData data)
+TR_cepAppendWriteData(TR_CommEndPoint this, TR_RemoteData data)
 {
 	TR_queuePut(this->write_buffer, data);
 }

src/cep_buffer_read.c

@@ -26,7 +26,7 @@
 #include "tr/comm_end_point.h"
 
 int
-cepBufferedRead(TR_CommEndPoint this)
+TR_cepBufferRead(TR_CommEndPoint this)
 {
 	TR_RemoteData data = TR_socketRecv(this->transport, this->read_chunk_size);
 

src/cep_write_buffered.c

@@ -26,7 +26,7 @@
 #include "tr/comm_end_point.h"
 
 int
-cepWriteBuffered(TR_CommEndPoint this)
+TR_cepWriteBuffered(TR_CommEndPoint this)
 {
 	TR_RemoteData data = TR_cepNextWriteData(this);
 	int           send = 0;

src/comm_manager.c

@@ -37,7 +37,7 @@ commManagerCtor(void * _this, va_list * params)
 {
 	TR_CommManager this = _this;
 
-	TR_PARENTCALL(_this, TR_Class, ctor, params);
+	TR_PARENTCALL(TR_CommManager, _this, TR_Class, ctor, params);
 
 	this->n_endpoints = sysconf(_SC_OPEN_MAX);
 	this->endpoints   = TR_calloc(sizeof(TR_CommEndPoint), this->n_endpoints);

src/comm_manager_poll.c

@@ -41,7 +41,7 @@ commManagerPollCtor(void * _this, va_list * params)
 	TR_CommManager     cmgr = _this;
 	nfds_t             i;
 
-	TR_PARENTCALL(_this, TR_Class, ctor, params);
+	TR_PARENTCALL(TR_CommManagerPoll, _this, TR_Class, ctor, params);
 	this->fds = TR_malloc(sizeof(struct pollfd) * cmgr->n_endpoints);
 	for (i = 0; i < cmgr->n_endpoints; i++) {
 		this->fds[i].fd      = -1;
@@ -59,7 +59,7 @@ commManagerPollDtor(void * _this)
 	TR_CommManagerPoll this = _this;
 
 	TR_MEM_FREE(this->fds);
-	TR_PARENTCALL(_this, TR_Class, dtor);
+	TR_PARENTCALL(TR_CommManagerPoll, _this, TR_Class, dtor);
 }
 
 static

src/conn_entry_point.c

@@ -36,7 +36,7 @@ static
 int
 connEntryPointCtor(void * _this, va_list * params)
 {
-	TR_PARENTCALL(_this, TR_Class, ctor, params);
+	TR_PARENTCALL(TR_ConnEntryPoint, _this, TR_Class, ctor, params);
 	return 0;
 }
 
@@ -44,7 +44,7 @@ static
 void
 connEntryPointDtor(void * _this)
 {
-	TR_PARENTCALL(_this, TR_Class, dtor);
+	TR_PARENTCALL(TR_ConnEntryPoint, _this, TR_Class, dtor);
 }
 
 static

src/connection.c

@@ -39,7 +39,7 @@ connectionCtor(void * _this, va_list * params)
 {
 	TR_Connection this = _this;
 
-	TR_PARENTCALL(_this, TR_Class, ctor, params);
+	TR_PARENTCALL(TR_Connection, _this, TR_Class, ctor, params);
 	this->current_message = NULL;
 
 	return 0;
@@ -52,7 +52,7 @@ connectionDtor(void * _this)
 	TR_Connection this = _this;
 
 	TR_delete(this->current_message);
-	TR_PARENTCALL(_this, TR_Class, dtor);
+	TR_PARENTCALL(TR_Connection, _this, TR_Class, dtor);
 }
 
 static

src/connector.c

@@ -37,7 +37,7 @@ static
 int
 connectorCtor(void * _this, va_list * params)
 {
-	TR_PARENTCALL(_this, TR_Class, ctor, params);
+	TR_PARENTCALL(TR_Connector, _this, TR_Class, ctor, params);
 	return 0;
 }
 
@@ -45,7 +45,7 @@ static
 void
 connectorDtor(void * _this)
 {
-	TR_PARENTCALL(_this, TR_Class, dtor);
+	TR_PARENTCALL(TR_Connector, _this, TR_Class, dtor);
 }
 
 static

src/io_handler.c

@@ -33,7 +33,7 @@ static
 int
 ioHandlerCtor(void * _this, va_list * params)
 {
-	TR_PARENTCALL(_this, TR_Class, ctor, params);
+	TR_PARENTCALL(TR_IoHandler, _this, TR_Class, ctor, params);
 
 	return 0;
 }

src/protocol_handler.c

@@ -36,7 +36,7 @@ static
 int
 protocolHandlerCtor(void * _this, va_list * params)
 {
-	TR_PARENTCALL(_this, TR_Class, ctor, params);
+	TR_PARENTCALL(TR_ProtocolHandler, _this, TR_Class, ctor, params);
 
 	return 0;
 }