A working test

This commit is contained in:
madsenco committed 2012-03-12 08:46:58 +01:00
1 parent 3dd80622f4
commit 89022a9faa
4 files changed
+105 -10

No files matched your search

+2 -1
View File
@@ -22,6 +22,7 @@ lua: luauevent.so
libuevent.a: libuevent.o libuevent.a: libuevent.o
$(AR) r $@ $^ $(AR) r $@ $^
$(CROSS_COMPILE)strip --strip-unneeded $@
libuevent.so.$(MAJOR): libuevent.o libuevent.so.$(MAJOR): libuevent.o
$(CC) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname=libuevent $(CC) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname=libuevent
@@ -30,7 +31,7 @@ luauevent.so: luauevent.o all
$(CC) $(LDFLAGS) -shared -o $@ $^ -L . -l uevent -Wl,-soname=uevent $(CC) $(LDFLAGS) -shared -o $@ $^ -L . -l uevent -Wl,-soname=uevent
test: all test: all
$(CC) -o test test.c && test $(CC) -g -o test -D NO_DEBUG test.c libuevent.c && ./test
luatest: lua luatest: lua
lua test.lua lua test.lua
+22 -8
View File
@@ -21,6 +21,12 @@
#include "llist.h" #include "llist.h"
#include "libuevent.h" #include "libuevent.h"
#ifdef DEBUG
#define Debug(f, args...) printf(f "\n", ##args)
#else
#define Debug(f, args...)
#endif
static clock_t clock_tick = 0; static clock_t clock_tick = 0;
/// Enumerate file handle direction /// Enumerate file handle direction
@@ -220,12 +226,16 @@ struct LUETimerH *lueAddTimer(struct LUECtxt * ctxt, int periodMs,
ent->dueTime = 0; ent->dueTime = 0;
if (nent && ent->dueTime > periodMs) if (nent && ent->dueTime > periodMs)
{ {
Debug("Insert %d before %d", periodMs, ent->dueTime);
lListInsert(&ctxt->timeoutHandlers, nent, ent); lListInsert(&ctxt->timeoutHandlers, nent, ent);
nent = NULL; nent = NULL;
} }
} }
if (nent) if (nent)
{
Debug("Append %d at end", periodMs);
lListAppend(&ctxt->timeoutHandlers, nent); lListAppend(&ctxt->timeoutHandlers, nent);
}
ctxt->baseTime = curTime; ctxt->baseTime = curTime;
return ret; return ret;
@@ -317,18 +327,19 @@ void lueRun(struct LUECtxt *ctxt)
{ {
curTime = ctxt->timeSet ? ctxt->setTime : times(NULL); curTime = ctxt->timeSet ? ctxt->setTime : times(NULL);
curPeriod = (curTime - ctxt->baseTime) / clock_tick * 1000 curPeriod = (curTime - ctxt->baseTime) / clock_tick * 1000
+ ((curTime - ctxt->baseTime) % clock_tick) * 1000 / clock_tick; + ((curTime - ctxt->baseTime) % clock_tick) * 1000 / clock_tick;
Debug("Period for timer execution %d", curPeriod);
while((timer = lListHead(&ctxt->timeoutHandlers)) && while((timer = lListHead(&ctxt->timeoutHandlers)) &&
timer->dueTime <= curPeriod) timer->dueTime <= curPeriod)
{ {
timer->handler(ctxt, timer, timer->data); timer->handler(ctxt, timer, timer->data);
lueRemTimer(ctxt, timer); lueRemTimer(ctxt, timer);
// baseTime changes for every lueAddTime // baseTime changes for every lueAddTimer
curPeriod = (curTime - ctxt->baseTime) / clock_tick * 1000 curPeriod = (curTime - ctxt->baseTime) / clock_tick * 1000
+ ((curTime - ctxt->baseTime) % clock_tick) * 1000 / clock_tick; + ((curTime - ctxt->baseTime) % clock_tick) * 1000 / clock_tick;
} }
lListPurge(&ctxt->timeRem); lListPurge(&ctxt->timeRem); // Reap timer zombies
} }
// Calculate waiting time // Calculate waiting time
@@ -337,6 +348,8 @@ void lueRun(struct LUECtxt *ctxt)
else if ((timer = lListHead(&ctxt->timeoutHandlers)) && else if ((timer = lListHead(&ctxt->timeoutHandlers)) &&
timer->dueTime > curPeriod) timer->dueTime > curPeriod)
{ {
Debug("Period from timer head %d - %d -> %d",
timer->dueTime, curPeriod, timer->dueTime - curPeriod);
curPeriod = timer->dueTime - curPeriod; curPeriod = timer->dueTime - curPeriod;
} }
else if (NULL != timer) else if (NULL != timer)
@@ -346,7 +359,7 @@ void lueRun(struct LUECtxt *ctxt)
// Do pipe handlers // Do pipe handlers
pollRet = 0; pollRet = 0;
if (lListHead(&ctxt->fileHandlers)) if (lListHead(&ctxt->fileHandlers) && !ctxt->exiting)
{ {
struct pollfd polls[lListLength(&ctxt->fileHandlers)]; struct pollfd polls[lListLength(&ctxt->fileHandlers)];
struct LUEFileEventH *ent; struct LUEFileEventH *ent;
@@ -360,6 +373,7 @@ void lueRun(struct LUECtxt *ctxt)
polls[ix].revents = 0; polls[ix].revents = 0;
ix++; ix++;
} }
Debug("Polling %d fds in %d ms", ix, curPeriod);
pollRet = poll(polls, ix, curPeriod); pollRet = poll(polls, ix, curPeriod);
if (pollRet < 0) if (pollRet < 0)
{ {
@@ -407,11 +421,11 @@ void lueRun(struct LUECtxt *ctxt)
poll(NULL, 0, curPeriod); poll(NULL, 0, curPeriod);
else else
break; // LUEarently were out of work! break; // LUEarently were out of work!
} while (!ctxt->exiting || } while (!ctxt->exiting);
// Wont exit while there is due timers or files // Wont exit while there is due timers or files
((timer = lListHead(&ctxt->timeoutHandlers)) && //((timer = lListHead(&ctxt->timeoutHandlers)) &&
timer->dueTime <= 0) || pollRet > 0); //timer->dueTime <= 0) || pollRet > 0);
//logdebug("LUE exiting - bye"); Debug("LUE exiting - bye");
} }
/** /**
+1 -1
View File
@@ -54,7 +54,7 @@
if (!(e) || (a)->head == (e)) { \ if (!(e) || (a)->head == (e)) { \
n->_llNext = (a)->head; \ n->_llNext = (a)->head; \
n->_llPrev = NULL; \ n->_llPrev = NULL; \
(a)->head = (e); \ (a)->head = (n); \
} else { \ } else { \
n->_llNext = (e); \ n->_llNext = (e); \
n->_llPrev = (e)->_llPrev; \ n->_llPrev = (e)->_llPrev; \
+80
View File
@@ -0,0 +1,80 @@
/**
* @file
* Micro event library libuevent.
* Test & showcase of libuevent
*
* (C) Copyright 2012 flemming.madsen at madsensoft.dk. See libuevent.h
*/
#include <stdlib.h>
#include <stdio.h>
#include "libuevent.h"
static period;
static client_fd, server_fd, service_fd;
static struct LUETimerH *timeOut;
int readFd, writeFd;
static timeOutHdl(struct LUECtxt *ctxt, struct LUETimerH *handle, void *data)
{
timeOut = NULL;
printf("Timeout is exceeded %p\n", data);
lueRemFd(ctxt, readFd);
lueExit(ctxt);
}
static appTimeout(struct LUECtxt *ctxt, struct LUETimerH *handle, void *data)
{
printf("Lifetime is exceeded %p\n", data);
exit(1);
}
static int readCb(struct LUECtxt *ctxt, struct LUEFileEventH *handle, int fd, void *data)
{
if (timeOut) {
lueRemTimer(ctxt, timeOut);
timeOut = lueAddTimer(ctxt, 950, timeOutHdl, NULL);
}
char msg[50];
int cnt = read(readFd, msg, sizeof(msg));
//printf("READ %.*s %d\n", cnt, msg, cnt);
printf("%.*s.%d ", cnt, msg, cnt); fflush(stdout);
return 0;
}
static writeThread(struct LUECtxt *ctxt, struct LUETimerH *handle, void *data)
{
int cnt = (int) data;
char *msg = "TESTING";
write(writeFd, msg, cnt);
//printf("WRITE %.*s %d\n", cnt, msg, cnt);
printf("%d ", cnt); fflush(stdout);
period = cnt + 5;
lueAddTimer(ctxt, period * 100, writeThread, (void *) (cnt + 1));
}
main()
{
struct LUECtxt *ctxt = lueCtxtCreate();
timeOut = lueAddTimer(ctxt, 950, timeOutHdl, (void *)1);
lueAddTimer(ctxt, 5000, appTimeout, (void *)2);
lueAddTimer(ctxt, 500, writeThread, (void *) 1);
int fd[2];
pipe(fd);
readFd = fd[0];
writeFd = fd[1];
lueAddInput(ctxt, readFd, readCb, NULL);
lueRun(ctxt);
lueCtxtDestroy(ctxt);
printf("Period is %d must be 10\n", period);
exit(10 == period ? 0 : 1);
}
// vim: set sw=3 sts=3 et: