d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This commit was generated by cvs2svn to compensate for changes in r145673,

Browse Source 
which included commits to RCS files with non-trunk default branches.
This commit is contained in:
harti 2005-04-29 11:02:18 +00:00
commit 577bdeea78
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/bsnmp/snmpd/main.c
View File

@ -1634,9 +1634,7 @@ void *
timer_start(u_int ticks, void (*func)(void *), void *udata, struct lmodule *mod)
{
struct timer *tp;
#ifdef USE_LIBBEGEMOT
struct timeval due;
#else
#ifndef USE_LIBBEGEMOT
struct timespec due;
#endif
@ -1644,15 +1642,8 @@ timer_start(u_int ticks, void (*func)(void *), void *udata, struct lmodule *mod)
syslog(LOG_CRIT, "out of memory for timer");
exit(1);
}
#ifdef USE_LIBBEGEMOT
(void)gettimeofday(&due, NULL);
due.tv_sec += ticks / 100;
due.tv_usec += (ticks % 100) * 10000;
if (due.tv_usec >= 1000000) {
due.tv_sec++;
due.tv_usec -= 1000000;
}
#else
#ifndef USE_LIBBEGEMOT
due = evAddTime(evNowTime(),
evConsTime(ticks / 100, (ticks % 100) * 10000));
#endif
@ -1664,8 +1655,7 @@ timer_start(u_int ticks, void (*func)(void *), void *udata, struct lmodule *mod)
LIST_INSERT_HEAD(&timer_list, tp, link);
#ifdef USE_LIBBEGEMOT
if ((tp->id = poll_start_timer(due.tv_sec * 1000 + due.tv_usec / 1000,
0, tfunc, tp)) < 0) {
if ((tp->id = poll_start_timer(ticks * 10, 0, tfunc, tp)) < 0) {
syslog(LOG_ERR, "cannot set timer: %m");
exit(1);
}