MirrorSave
/
pigpio
mirror of https://github.com/joan2937/pigpio
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

V66: #133 fixed by simplifying timer loop

This commit is contained in:
joan 2018-02-13 21:39:02 +00:00
parent 5981d495cc
commit cf29b45ded
2 changed files with 6 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pigpio.c
View File

@ -25,7 +25,7 @@ OTHER DEALINGS IN THE SOFTWARE.
For more information, please refer to <http://unlicense.org/>
*/
/* pigpio version 65 */
/* pigpio version 66 */
/* include ------------------------------------------------------- */
@ -981,7 +981,6 @@ typedef struct
unsigned id;
unsigned running;
unsigned millis;
struct timespec nextTick;
pthread_t pthId;
} gpioTimer_t;
@ -6750,28 +6749,15 @@ static void *pthScript(void *x)
static void * pthTimerTick(void *x)
{
gpioTimer_t * tp;
struct timespec req, rem, period;
char buf[256];
gpioTimer_t *tp;
struct timespec req, rem;
tp = x;
clock_gettime(CLOCK_REALTIME, &tp->nextTick);
while (1)
{
clock_gettime(CLOCK_REALTIME, &rem);
period.tv_sec = tp->millis / THOUSAND;
period.tv_nsec = (tp->millis % THOUSAND) * THOUSAND * THOUSAND;
do
{
TIMER_ADD(&tp->nextTick, &period, &tp->nextTick);
TIMER_SUB(&tp->nextTick, &rem, &req);
}
while (req.tv_sec < 0);
req.tv_sec = tp->millis / THOUSAND;
req.tv_nsec = (tp->millis % THOUSAND) * THOUSAND * THOUSAND;
while (nanosleep(&req, &rem))
{
@ -6779,18 +6765,6 @@ static void * pthTimerTick(void *x)
req.tv_nsec = rem.tv_nsec;
}
if (gpioCfg.dbgLevel >= DBG_SLOW_TICK)
{
if ((tp->millis > 50) || (gpioCfg.dbgLevel >= DBG_FAST_TICK))
{
sprintf(buf, "pigpio: TIMER=%d @ %u %u\n",
tp->id,
(unsigned)tp->nextTick.tv_sec,
(unsigned)tp->nextTick.tv_nsec);
fprintf(stderr, "%s", buf);
}
}
if (tp->ex) (tp->func)(tp->userdata);
else (tp->func)();
}

2
pigpio.h
View File

@ -31,7 +31,7 @@ For more information, please refer to <http://unlicense.org/>
#include <stdint.h>
#include <pthread.h>
#define PIGPIO_VERSION 6601
#define PIGPIO_VERSION 6602
/*TEXT