deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Reimplemented waiting with select() instead of nanosleep(). Let's see if Linux compiles this code now...

Browse source
This commit is contained in:
adamdunkels 2007-11-28 12:54:41 +00:00
parent 13ca6c9946
commit a725de0f79
5 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

18
platform/netsim/main.c
View file

@ -30,7 +30,7 @@
*
* Author: Adam Dunkels <adam@sics.se>
*
* $Id: main.c,v 1.7 2007/11/26 23:28:33 adamdunkels Exp $
* $Id: main.c,v 1.8 2007/11/28 12:54:42 adamdunkels Exp $
*/
/**
@ -111,7 +111,7 @@ static int
start_node(int x, int y, int b)
{
pid_t pid;
struct timespec ts;
struct timeval tv;
static unsigned short port = NODES_PORTBASE;
pid = fork();
@ -123,9 +123,9 @@ start_node(int x, int y, int b)
srand(getpid());
ts.tv_sec = 0;
ts.tv_nsec = 1000000 * (rand() % 1000);
nanosleep(&ts, NULL);
tv.tv_sec = 0;
tv.tv_usec = 1000 * (rand() % 1000);
select(0, NULL, NULL, NULL, &tv);
node_init(port - NODES_PORTBASE + 2, x, y, b);
ethernode_init(port);
@ -213,10 +213,10 @@ static signed long drift = 0;
void
clock_delay(unsigned int num)
{
struct timespec ts;
ts.tv_sec = 0;
ts.tv_nsec = 100000 * num;
nanosleep(&ts, NULL);
struct timeval tv;
tv.tv_sec = 0;
tv.tv_usec = 100 * num;
select(0, NULL, NULL, NULL, &tv);
}
void