beremiz

Fix bug python thread blocked sometimes on Linux

2012-11-05, Laurent Bessard
179d5c455f29
Parents a8952b79caec
Children 7e695249be8d
Fix bug python thread blocked sometimes on Linux
1 files changed, 26 insertions(+), 1 deletions(-)
  • +26 -1
    targets/Linux/plc_Linux_main.c
    • --- a/targets/Linux/plc_Linux_main.c Sat Nov 03 17:00:26 2012 +0100
    +++ b/targets/Linux/plc_Linux_main.c Mon Nov 05 20:15:28 2012 +0100
    @@ -9,8 +9,10 @@
    #include <stdlib.h>
    #include <pthread.h>
    #include <locale.h>
    +#include <semaphore.h>
    extern unsigned long long common_ticktime__;
    +static sem_t Run_PLC;
    long AtomicCompareExchange(long* atomicvar,long compared, long exchange)
    {
    @@ -28,7 +30,7 @@
    void PLC_timer_notify(sigval_t val)
    {
    PLC_GetTime(&__CURRENT_TIME);
    - __run();
    + sem_post(&Run_PLC);
    }
    timer_t PLC_timer;
    @@ -69,11 +71,23 @@
    static unsigned long __debug_tick;
    +pthread_t PLC_thread;
    static pthread_mutex_t python_wait_mutex = PTHREAD_MUTEX_INITIALIZER;
    static pthread_mutex_t python_mutex = PTHREAD_MUTEX_INITIALIZER;
    static pthread_mutex_t debug_wait_mutex = PTHREAD_MUTEX_INITIALIZER;
    static pthread_mutex_t debug_mutex = PTHREAD_MUTEX_INITIALIZER;
    +int PLC_shutdown = 0;
    +
    +void PLC_thread_proc(void *arg)
    +{
    + while (!PLC_shutdown) {
    + sem_wait(&Run_PLC);
    + __run();
    + }
    + pthread_exit(0);
    +}
    +
    #define maxval(a,b) ((a>b)?a:b)
    int startPLC(int argc,char **argv)
    {
    @@ -82,6 +96,12 @@
    /* Define Ttick to 1ms if common_ticktime not defined */
    Ttick = common_ticktime__?common_ticktime__:1000000;
    + PLC_shutdown = 0;
    +
    + sem_init(&Run_PLC, 0, 0);
    +
    + pthread_create(&PLC_thread, NULL, (void*) &PLC_thread_proc, NULL);
    +
    memset (&sigev, 0, sizeof (struct sigevent));
    sigev.sigev_value.sival_int = 0;
    sigev.sigev_notify = SIGEV_THREAD;
    @@ -128,7 +148,11 @@
    int stopPLC()
    {
    /* Stop the PLC */
    + PLC_shutdown = 1;
    + sem_post(&Run_PLC);
    PLC_SetTimer(0,0);
    + pthread_join(PLC_thread, NULL);
    + sem_destroy(&Run_PLC);
    timer_delete (PLC_timer);
    __cleanup();
    pthread_mutex_destroy(&debug_wait_mutex);
    @@ -143,6 +167,7 @@
    int WaitDebugData(unsigned long *tick)
    {
    int res;
    + if (PLC_shutdown) return 1;
    /* Wait signal from PLC thread */
    res = pthread_mutex_lock(&debug_wait_mutex);
    *tick = __debug_tick;