beremiz

fixed debug with xenomai, fixed unprotected access to ___debug_tick

2011-09-26, Edouard Tisserant
7c23fac40a2a
Parents b9271faec96e
Children c6b1a22aa614
fixed debug with xenomai, fixed unprotected access to ___debug_tick
2 files changed, 9 insertions(+), 4 deletions(-)
  • +4 -2
    targets/Linux/plc_Linux_main.c
  • +5 -2
    targets/Xenomai/plc_Xenomai_main.c
    • --- a/targets/Linux/plc_Linux_main.c Sun Sep 25 22:51:51 2011 +0200
    +++ b/targets/Linux/plc_Linux_main.c Mon Sep 26 00:24:04 2011 +0200
    @@ -142,9 +142,11 @@
    int WaitDebugData(unsigned long *tick)
    {
    - *tick = __debug_tick;
    + int res;
    /* Wait signal from PLC thread */
    - return pthread_mutex_lock(&debug_wait_mutex);
    + res = pthread_mutex_lock(&debug_wait_mutex);
    + *tick = __debug_tick;
    + return res;
    }
    /* Called by PLC thread when debug_publish finished
    --- a/targets/Xenomai/plc_Xenomai_main.c Sun Sep 25 22:51:51 2011 +0200
    +++ b/targets/Xenomai/plc_Xenomai_main.c Mon Sep 26 00:24:04 2011 +0200
    @@ -256,11 +256,12 @@
    {
    char cmd;
    int res;
    - *tick = __debug_tick;
    /* Wait signal from PLC thread */
    res = read(WaitDebug_pipe_fd, &cmd, sizeof(cmd));
    - if (res == sizeof(cmd) && cmd == DEBUG_PENDING_DATA)
    + if (res == sizeof(cmd) && cmd == DEBUG_PENDING_DATA){
    + *tick = __debug_tick;
    return 0;
    + }
    return -1;
    }
    @@ -288,6 +289,8 @@
    }
    }
    __DEBUG = !disable;
    + if (disable)
    + AtomicCompareExchange( &debug_state, DEBUG_BUSY, DEBUG_FREE);
    return 0;
    }