natas_hw
/
paho
mirror of https://github.com/eclipse/paho.mqtt.c
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attaching the global mutexes creation to the main init function 

Signed-off-by: Raffi Enficiaud <raffi.enficiaud@tuebingen.mpg.de>
This commit is contained in:
Raffi Enficiaud 2017-10-17 15:42:47 +02:00
parent 7e559553a9
commit 706db7c878
No known key found for this signature in database
GPG Key ID: D4DCF656B16691C4
2 changed files with 58 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/MQTTAsync.c
View File

@ -68,8 +68,12 @@
const char *client_timestamp_eye = "MQTTAsyncV3_Timestamp " BUILD_TIMESTAMP;
const char *client_version_eye = "MQTTAsyncV3_Version " CLIENT_VERSION;
// global objects init declaration
void MQTTAsync_init();
void MQTTAsync_global_init(MQTTAsync_init_options* inits)
{
MQTTAsync_init();
#if defined(OPENSSL)
SSLSocket_handleOpensslInit(inits->do_openssl_init);
#endif
@ -115,30 +119,45 @@ BOOL APIENTRY DllMain(HANDLE hModule,
{
case DLL_PROCESS_ATTACH:
Log(TRACE_MAX, -1, "DLL process attach");
if (mqttasync_mutex == NULL)
{
mqttasync_mutex = CreateMutex(NULL, 0, NULL);
mqttcommand_mutex = CreateMutex(NULL, 0, NULL);
send_sem = CreateEvent(
NULL, /* default security attributes */
FALSE, /* manual-reset event? */
FALSE, /* initial state is nonsignaled */
NULL /* object name */
);
stack_mutex = CreateMutex(NULL, 0, NULL);
heap_mutex = CreateMutex(NULL, 0, NULL);
log_mutex = CreateMutex(NULL, 0, NULL);
socket_mutex = CreateMutex(NULL, 0, NULL);
}
MQTTAsync_init();
break;
case DLL_THREAD_ATTACH:
Log(TRACE_MAX, -1, "DLL thread attach");
break;
case DLL_THREAD_DETACH:
Log(TRACE_MAX, -1, "DLL thread detach");
break;
case DLL_PROCESS_DETACH:
Log(TRACE_MAX, -1, "DLL process detach");
break;
}
return TRUE;
}
void MQTTAsync_init(void)
{
if (mqttasync_mutex == NULL)
{
mqttasync_mutex = CreateMutex(NULL, 0, NULL);
mqttcommand_mutex = CreateMutex(NULL, 0, NULL);
send_sem = CreateEvent(
NULL, /* default security attributes */
FALSE, /* manual-reset event? */
FALSE, /* initial state is nonsignaled */
NULL /* object name */
);
stack_mutex = CreateMutex(NULL, 0, NULL);
heap_mutex = CreateMutex(NULL, 0, NULL);
log_mutex = CreateMutex(NULL, 0, NULL);
socket_mutex = CreateMutex(NULL, 0, NULL);
}
else
{
Log(TRACE_MAX, -1, "Library already initialized");
}
}
#else
static pthread_mutex_t mqttasync_mutex_store = PTHREAD_MUTEX_INITIALIZER;
static mutex_type mqttasync_mutex = &mqttasync_mutex_store;

35
src/MQTTClient.c
View File

@ -76,8 +76,11 @@
const char *client_timestamp_eye = "MQTTClientV3_Timestamp " BUILD_TIMESTAMP;
const char *client_version_eye = "MQTTClientV3_Version " CLIENT_VERSION;
void MQTTClient_init(void);
void MQTTClient_global_init(MQTTClient_init_options* inits)
{
MQTTClient_init();
#if defined(OPENSSL)
SSLSocket_handleOpensslInit(inits->do_openssl_init);
#endif
@ -110,26 +113,36 @@ BOOL APIENTRY DllMain(HANDLE hModule,
{
case DLL_PROCESS_ATTACH:
Log(TRACE_MAX, -1, "DLL process attach");
if (mqttclient_mutex == NULL)
{
mqttclient_mutex = CreateMutex(NULL, 0, NULL);
subscribe_mutex = CreateMutex(NULL, 0, NULL);
unsubscribe_mutex = CreateMutex(NULL, 0, NULL);
connect_mutex = CreateMutex(NULL, 0, NULL);
stack_mutex = CreateMutex(NULL, 0, NULL);
heap_mutex = CreateMutex(NULL, 0, NULL);
log_mutex = CreateMutex(NULL, 0, NULL);
socket_mutex = CreateMutex(NULL, 0, NULL);
}
MQTTClient_init();
break;
case DLL_THREAD_ATTACH:
Log(TRACE_MAX, -1, "DLL thread attach");
break;
case DLL_THREAD_DETACH:
Log(TRACE_MAX, -1, "DLL thread detach");
break;
case DLL_PROCESS_DETACH:
Log(TRACE_MAX, -1, "DLL process detach");
break;
}
return TRUE;
}
void MQTTClient_init(void)
{
if (mqttclient_mutex == NULL)
{
mqttclient_mutex = CreateMutex(NULL, 0, NULL);
subscribe_mutex = CreateMutex(NULL, 0, NULL);
unsubscribe_mutex = CreateMutex(NULL, 0, NULL);
connect_mutex = CreateMutex(NULL, 0, NULL);
stack_mutex = CreateMutex(NULL, 0, NULL);
heap_mutex = CreateMutex(NULL, 0, NULL);
log_mutex = CreateMutex(NULL, 0, NULL);
socket_mutex = CreateMutex(NULL, 0, NULL);
}
}
#else
static pthread_mutex_t mqttclient_mutex_store = PTHREAD_MUTEX_INITIALIZER;
static mutex_type mqttclient_mutex = &mqttclient_mutex_store;