proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-06 15:58:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2004-10-05 Paul Jakma <paul@dishone.st>

Browse Source 
* thread.c: (funcname_thread_add_timer_timeval) new function, add
          timer at specified timeval.
	  (funcname_thread_add_timer) use funcname_thread_add_timer_timeval.
	  (funcname_thread_add_timer_msec) ditto
This commit is contained in:
paul 2004-10-05 14:57:50 +00:00
parent 7216466aec
commit 98c91ac6ac
2 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ChangeLog
View File

@ -3,6 +3,10 @@
* sockopt.{c,h}: add sockopt_iphdrincl_swab_{htosys,systoh}, * sockopt.{c,h}: add sockopt_iphdrincl_swab_{htosys,systoh},
functions to change byte order between system IP_HDRINCL order functions to change byte order between system IP_HDRINCL order
and host order. and host order.
* thread.c: (funcname_thread_add_timer_timeval) new function, add
timer at specified timeval.
(funcname_thread_add_timer) use funcname_thread_add_timer_timeval.
(funcname_thread_add_timer_msec) ditto
2004-10-04 Hasso Tepper <hasso at quagga.net> 2004-10-04 Hasso Tepper <hasso at quagga.net>

69
lib/thread.c
View File

@ -482,13 +482,15 @@ funcname_thread_add_write (struct thread_master *m,
return thread; return thread;
} }
/* Add timer event thread. */ static struct thread *
struct thread * funcname_thread_add_timer_timeval (struct thread_master *m,
funcname_thread_add_timer (struct thread_master *m, int (*func) (struct thread *),
int (*func) (struct thread *), void *arg, long timer, char* funcname) void *arg,
struct timeval *time_relative,
char* funcname)
{ {
struct timeval timer_now;
struct thread *thread; struct thread *thread;
struct timeval timer_now;
#ifndef TIMER_NO_SORT #ifndef TIMER_NO_SORT
struct thread *tt; struct thread *tt;
#endif /* TIMER_NO_SORT */ #endif /* TIMER_NO_SORT */
@ -499,7 +501,9 @@ funcname_thread_add_timer (struct thread_master *m,
/* Do we need jitter here? */ /* Do we need jitter here? */
gettimeofday (&timer_now, NULL); gettimeofday (&timer_now, NULL);
timer_now.tv_sec += timer; timer_now.tv_sec += time_relative->tv_sec;
timer_now.tv_usec += time_relative->tv_usec;
timeval_adjust (timer_now);
thread->u.sands = timer_now; thread->u.sands = timer_now;
/* Sort by timeval. */ /* Sort by timeval. */
@ -519,44 +523,39 @@ funcname_thread_add_timer (struct thread_master *m,
return thread; return thread;
} }
/* Add timer event thread with "millisecond" resolution */
/* Add timer event thread. */
struct thread * struct thread *
funcname_thread_add_timer_msec (struct thread_master *m, funcname_thread_add_timer (struct thread_master *m,
int (*func) (struct thread *), void *arg, long timer, char* funcname) int (*func) (struct thread *),
void *arg, long timer, char* funcname)
{ {
struct timeval timer_now; struct timeval trel;
struct thread *thread;
#ifndef TIMER_NO_SORT
struct thread *tt;
#endif /* TIMER_NO_SORT */
assert (m != NULL); assert (m != NULL);
thread = thread_get (m, THREAD_TIMER, func, arg, funcname); trel.tv_sec += timer;
trel.tv_usec = 0;
return funcname_thread_add_timer_timeval (m, func, arg, &trel, funcname);
}
/* Add timer event thread with "millisecond" resolution */
struct thread *
funcname_thread_add_timer_msec (struct thread_master *m,
int (*func) (struct thread *),
void *arg, long timer, char* funcname)
{
struct timeval trel;
assert (m != NULL);
timer = 1000*timer; /* milli -> micro */ timer = 1000*timer; /* milli -> micro */
/* Do we need jitter here? */ trel.tv_sec += timer / TIMER_SECOND_MICRO;
gettimeofday (&timer_now, NULL); trel.tv_usec += (timer % TIMER_SECOND_MICRO);
timer_now.tv_sec += timer / TIMER_SECOND_MICRO;
timer_now.tv_usec += (timer % TIMER_SECOND_MICRO);
thread->u.sands = timer_now;
/* Sort by timeval. */ return funcname_thread_add_timer_timeval (m, func, arg, &trel, funcname);
#ifdef TIMER_NO_SORT
thread_list_add (&m->timer, thread);
#else
for (tt = m->timer.head; tt; tt = tt->next)
if (timeval_cmp (thread->u.sands, tt->u.sands) <= 0)
break;
if (tt)
thread_list_add_before (&m->timer, tt, thread);
else
thread_list_add (&m->timer, thread);
#endif /* TIMER_NO_SORT */
return thread;
} }
/* Add simple event thread. */ /* Add simple event thread. */