11philip22/c-ipfs
1
0
Fork 0
forked from agorise/c-ipfs
Code Pull requests Activity

Fixed thread-safe in API.

Browse source
This commit is contained in:
Jose Marcial Vieira Bisneto 2017-07-23 11:49:40 -03:00
parent 937504c3f2
commit f7ddfa0088
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/api.c
View file

@ -12,14 +12,15 @@
#include "libp2p/utils/logger.h" #include "libp2p/utils/logger.h"
#include "ipfs/core/api.h" #include "ipfs/core/api.h"
volatile int conns_count; pthread_mutex_t conns_lock;
int conns_count;
pthread_t listen_thread = 0; pthread_t listen_thread = 0;
struct s_list api_list; struct s_list api_list;
/** /**
* Create a new bitswap exchange * Pthread to take care of each client connection.
* @param ptr is the connection index in api_list, integer not pointer, cast required. * @param ptr is the connection index in api_list, integer not pointer, cast required.
* @returns nothing * @returns nothing
*/ */
@ -65,10 +66,12 @@ quit:
if (inet_ntop(AF_INET, &(api_list.conns[i]->ipv4), client, INET_ADDRSTRLEN) == NULL) if (inet_ntop(AF_INET, &(api_list.conns[i]->ipv4), client, INET_ADDRSTRLEN) == NULL)
strcpy(client, "UNKNOW"); strcpy(client, "UNKNOW");
libp2p_logger_error("api", "Closing client connection %s:%d (%d).\n", client, api_list.conns[i]->port, i+1); libp2p_logger_error("api", "Closing client connection %s:%d (%d).\n", client, api_list.conns[i]->port, i+1);
pthread_mutex_lock(&conns_lock);
close(s); close(s);
free (api_list.conns[i]); free (api_list.conns[i]);
api_list.conns[i] = NULL; api_list.conns[i] = NULL;
conns_count--; conns_count--;
pthread_mutex_unlock(&conns_lock);
return NULL; return NULL;
} }
@ -80,6 +83,7 @@ void api_connections_cleanup (void)
{ {
int i; int i;
pthread_mutex_lock(&conns_lock);
if (conns_count > 0 && api_list.conns) { if (conns_count > 0 && api_list.conns) {
for (i = 0 ; i < api_list.max_conns ; i++) { for (i = 0 ; i < api_list.max_conns ; i++) {
if (api_list.conns[i]->pthread) { if (api_list.conns[i]->pthread) {
@ -95,6 +99,7 @@ void api_connections_cleanup (void)
free (api_list.conns); free (api_list.conns);
api_list.conns = NULL; api_list.conns = NULL;
} }
pthread_mutex_unlock(&conns_lock);
} }
/** /**
@ -123,7 +128,7 @@ void *api_listen_thread (void *ptr)
continue; continue;
} }
conns_count++; pthread_mutex_lock(&conns_lock);
for (i = 0 ; i < api_list.max_conns && api_list.conns[i] ; i++); for (i = 0 ; i < api_list.max_conns && api_list.conns[i] ; i++);
api_list.conns[i] = malloc (sizeof (struct s_conns)); api_list.conns[i] = malloc (sizeof (struct s_conns));
if (!api_list.conns[i]) { if (!api_list.conns[i]) {
@ -143,7 +148,10 @@ void *api_listen_thread (void *ptr)
api_list.conns[i] = NULL; api_list.conns[i] = NULL;
conns_count--; conns_count--;
close(s); close(s);
} else {
conns_count++;
} }
pthread_mutex_unlock(&conns_lock);
} }
api_connections_cleanup (); api_connections_cleanup ();
return NULL; return NULL;