rpitx/csdr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Attempting to fix nmux crash (#40)

Browse source
This commit is contained in:
Andras Retzler 2019-01-24 15:37:14 +01:00
parent eabc2c50dc
commit 055127ca31
4 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -3,6 +3,7 @@ nmux
ddcd ddcd
*.o *.o
*.so *.so
*.so.*
tags tags
dumpvect.*.vect dumpvect.*.vect
*.swp *.swp

22
nmux.cpp
View file

@ -192,7 +192,7 @@ int main(int argc, char* argv[])
if(NMUX_DEBUG) if(NMUX_DEBUG)
{ {
fprintf(stderr, "\x1b[1m\x1b[33mmainfor: clients before closing: "); fprintf(stderr, "\x1b[1m\x1b[33mmainfor: clients before closing: ");
for(int i=0;i<clients.size();i++) fprintf(stderr, "0x%x ", (intptr_t)clients[i]); for(int i=0;i<clients.size();i++) fprintf(stderr, "%p ", clients[i]);
fprintf(stderr, "\x1b[0m\n"); fprintf(stderr, "\x1b[0m\n");
} }
if(NMUX_DEBUG) fprintf(stderr, "mainfor: accepted (socket = %d).\n", new_socket); if(NMUX_DEBUG) fprintf(stderr, "mainfor: accepted (socket = %d).\n", new_socket);
@ -211,7 +211,7 @@ int main(int argc, char* argv[])
if(NMUX_DEBUG) if(NMUX_DEBUG)
{ {
fprintf(stderr, "\x1b[1m\x1b[33mmainfor: clients after closing: "); fprintf(stderr, "\x1b[1m\x1b[33mmainfor: clients after closing: ");
for(int i=0;i<clients.size();i++) fprintf(stderr, "0x%x ", (intptr_t)clients[i]); for(int i=0;i<clients.size();i++) fprintf(stderr, "%p ", clients[i]);
fprintf(stderr, "\x1b[0m\n"); fprintf(stderr, "\x1b[0m\n");
} }
@ -227,7 +227,7 @@ int main(int argc, char* argv[])
if(pthread_create(&new_client->thread, NULL, client_thread, (void*)new_client)==0) if(pthread_create(&new_client->thread, NULL, client_thread, (void*)new_client)==0)
{ {
clients.push_back(new_client); clients.push_back(new_client);
fprintf(stderr, MSG_START "pthread_create() done, clients now: %d\n", clients.size()); fprintf(stderr, MSG_START "pthread_create() done, clients now: %d\n", (int)clients.size());
} }
else else
{ {
@ -278,14 +278,14 @@ int main(int argc, char* argv[])
void* client_thread (void* param) void* client_thread (void* param)
{ {
fprintf(stderr, "client 0x%x: started!\n", (intptr_t)param); fprintf(stderr, "client %p: started!\n", param);
client_t* this_client = (client_t*)param; client_t* this_client = (client_t*)param;
this_client->status = CS_THREAD_RUNNING; this_client->status = CS_THREAD_RUNNING;
int retval; int retval;
tsmpool* lpool = this_client->lpool; tsmpool* lpool = this_client->lpool;
if(NMUX_DEBUG) fprintf(stderr, "client 0x%x: socket = %d!\n", (intptr_t)param, this_client->socket); if(NMUX_DEBUG) fprintf(stderr, "client %p: socket = %d!\n", param, this_client->socket);
if(NMUX_DEBUG) fprintf(stderr, "client 0x%x: poll init...", (intptr_t)param); if(NMUX_DEBUG) fprintf(stderr, "client %p: poll init...", param);
struct pollfd pollfds[1]; struct pollfd pollfds[1];
pollfds[0].fd = this_client->socket; pollfds[0].fd = this_client->socket;
pollfds[0].events = POLLOUT; pollfds[0].events = POLLOUT;
@ -307,10 +307,10 @@ void* client_thread (void* param)
// (Wait for the server process to wake me up.) // (Wait for the server process to wake me up.)
while(!pool_read_buffer || client_buffer_index >= lpool->size) while(!pool_read_buffer || client_buffer_index >= lpool->size)
{ {
if(NMUX_DEBUG) fprintf(stderr, "client 0x%x: trying to grb\n", (intptr_t)param); if(NMUX_DEBUG) fprintf(stderr, "client %p: trying to grb\n", param);
pool_read_buffer = (char*)lpool->get_read_buffer(this_client->tsmthread); pool_read_buffer = (char*)lpool->get_read_buffer(this_client->tsmthread);
if(pool_read_buffer) { client_buffer_index = 0; break; } if(pool_read_buffer) { client_buffer_index = 0; break; }
if(NMUX_DEBUG) fprintf(stderr, "client 0x%x: cond_waiting for more data\n", (intptr_t)param); if(NMUX_DEBUG) fprintf(stderr, "client %p: cond_waiting for more data\n", param);
pthread_mutex_lock(&wait_mutex); pthread_mutex_lock(&wait_mutex);
this_client->sleeping = 1; this_client->sleeping = 1;
pthread_cond_wait(&wait_condition, &wait_mutex); pthread_cond_wait(&wait_condition, &wait_mutex);
@ -318,14 +318,14 @@ void* client_thread (void* param)
} }
//Wait for the socket to be available for write. //Wait for the socket to be available for write.
if(NMUX_DEBUG) fprintf(stderr, "client 0x%x: polling for socket write...", (intptr_t)param); if(NMUX_DEBUG) fprintf(stderr, "client %p: polling for socket write...", param);
int ret = poll(pollfds, 1, -1); int ret = poll(pollfds, 1, -1);
if(NMUX_DEBUG) fprintf(stderr, "client polled for socket write.\n"); if(NMUX_DEBUG) fprintf(stderr, "client polled for socket write.\n");
if(ret == 0) continue; if(ret == 0) continue;
else if (ret == -1) { client_goto_source = 1; goto client_thread_exit; } else if (ret == -1) { client_goto_source = 1; goto client_thread_exit; }
//Read data from global tsmpool and write it to client socket //Read data from global tsmpool and write it to client socket
if(NMUX_DEBUG) fprintf(stderr, "client 0x%x: sending...", (intptr_t)param); if(NMUX_DEBUG) fprintf(stderr, "client %p: sending...", param);
ret = send(this_client->socket, pool_read_buffer + client_buffer_index, lpool->size - client_buffer_index, MSG_NOSIGNAL); ret = send(this_client->socket, pool_read_buffer + client_buffer_index, lpool->size - client_buffer_index, MSG_NOSIGNAL);
if(NMUX_DEBUG) fprintf(stderr, "client sent.\n"); if(NMUX_DEBUG) fprintf(stderr, "client sent.\n");
if(ret == -1) if(ret == -1)
@ -340,7 +340,7 @@ void* client_thread (void* param)
} }
client_thread_exit: client_thread_exit:
fprintf(stderr, "client 0x%x: CS_THREAD_FINISHED, client_goto_source = %d, errno = %d", (intptr_t)param, client_goto_source, errno); fprintf(stderr, "client %p: CS_THREAD_FINISHED, client_goto_source = %d, errno = %d", param, client_goto_source, errno);
this_client->status = CS_THREAD_FINISHED; this_client->status = CS_THREAD_FINISHED;
pthread_exit(NULL); pthread_exit(NULL);
return NULL; return NULL;

2
tsmpool.cpp
View file

@ -42,7 +42,7 @@ tsmthread_t* tsmpool::register_thread()
return thread; return thread;
} }
int tsmpool::remove_thread(tsmthread_t* thread) void tsmpool::remove_thread(tsmthread_t* thread)
{ {
pthread_mutex_lock(&this->mutex); pthread_mutex_lock(&this->mutex);
for(int i=0;i<threads.size();i++) for(int i=0;i<threads.size();i++)

2
tsmpool.h
View file

@ -36,7 +36,7 @@ public:
tsmpool(size_t size, int num); tsmpool(size_t size, int num);
void* get_write_buffer(); void* get_write_buffer();
tsmthread_t* register_thread(); tsmthread_t* register_thread();
int remove_thread(tsmthread_t* thread); void remove_thread(tsmthread_t* thread);
void* get_read_buffer(tsmthread_t* thread); void* get_read_buffer(tsmthread_t* thread);
int index_next(int index) { return (index+1==num)?0:index+1; } int index_next(int index) { return (index+1==num)?0:index+1; }
int index_before(int index) { return (index-1<0)?num-1:index-1; } int index_before(int index) { return (index-1<0)?num-1:index-1; }