From: John Hodge Date: Fri, 31 Jan 2014 10:26:07 +0000 (+0800) Subject: Door - Move thread init to after fork() X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=478107d848605d5dfd2c4e1a90d7265263eed04c;p=tpg%2Fopendispense2.git Door - Move thread init to after fork() --- diff --git a/src/server/handler_door.c b/src/server/handler_door.c index 0273cbf..5ec25c2 100644 --- a/src/server/handler_door.c +++ b/src/server/handler_door.c @@ -8,7 +8,6 @@ * COPYING for full details. */ #define DEBUG 1 -#define USE_POPEN 0 #include "common.h" #include @@ -22,6 +21,7 @@ #include #include #include +#include #define DOOR_UNLOCKED_DELAY 10 // Time in seconds before the door re-locks @@ -43,6 +43,7 @@ tHandler gDoor_Handler = { char *gsDoor_SerialPort; // Set from config in main.c sem_t gDoor_UnlockSemaphore; pthread_t gDoor_LockThread; +bool gbDoor_LockThreadStarted; // === CODE === void* Door_Lock(void* Unused __attribute__((unused))) @@ -84,10 +85,7 @@ void* Door_Lock(void* Unused __attribute__((unused))) int Door_InitHandler(void) { - // Initialize semaphore, triggers door lock release if semaphore is greater than 0 - sem_init(&gDoor_UnlockSemaphore, 0, 0); - - pthread_create(&gDoor_LockThread, NULL, &Door_Lock, NULL); + // Thread started later return 0; } @@ -125,7 +123,7 @@ int Door_DoDispense(int User, int Item) #if DEBUG printf("Door_DoDispense: (User=%i,Item=%i)\n", User, Item); #endif - + // Sanity please if( Item != 0 ) return -1; @@ -138,6 +136,14 @@ int Door_DoDispense(int User, int Item) return 1; } + // Door thread spun up here because program is forked after thread created + if( !gbDoor_LockThreadStarted ) + { + // Initialize semaphore, triggers door lock release if semaphore is greater than 0 + sem_init(&gDoor_UnlockSemaphore, 0, 0); + + pthread_create(&gDoor_LockThread, NULL, &Door_Lock, NULL); + } if(sem_post(&gDoor_UnlockSemaphore)) {