fceabb2498
This is a fairly intrusive change, but outside of the moving of opal/event to opal/mca/event, the only changes involved (a) changing all calls to opal_event functions to reflect the new framework instead, and (b) ensuring that all opal_event_t objects are properly constructed since they are now true opal_objects. Note: Shiqing has just returned from vacation and has not yet had a chance to complete the Windows integration. Thus, this commit almost certainly breaks Windows support on the trunk. However, I want this to have a chance to soak for as long as possible before I become less available a week from today (going to be at a class for 5 days, and thus will only be sparingly available) so we can find and fix any problems. Biggest change is moving the libevent code from opal/event to a new opal/mca/event framework. This was done to make it much easier to update libevent in the future. New versions can be inserted as a new component and tested in parallel with the current version until validated, then we can remove the earlier version if we so choose. This is a statically built framework ala installdirs, so only one component will build at a time. There is no selection logic - the sole compiled component simply loads its function pointers into the opal_event struct. I have gone thru the code base and converted all the libevent calls I could find. However, I cannot compile nor test every environment. It is therefore quite likely that errors remain in the system. Please keep an eye open for two things: 1. compile-time errors: these will be obvious as calls to the old functions (e.g., opal_evtimer_new) must be replaced by the new framework APIs (e.g., opal_event.evtimer_new) 2. run-time errors: these will likely show up as segfaults due to missing constructors on opal_event_t objects. It appears that it became a typical practice for people to "init" an opal_event_t by simply using memset to zero it out. This will no longer work - you must either OBJ_NEW or OBJ_CONSTRUCT an opal_event_t. I tried to catch these cases, but may have missed some. Believe me, you'll know when you hit it. There is also the issue of the new libevent "no recursion" behavior. As I described on a recent email, we will have to discuss this and figure out what, if anything, we need to do. This commit was SVN r23925.
72 строки
1.1 KiB
C
72 строки
1.1 KiB
C
/*
|
|
* Compile with:
|
|
* cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent
|
|
*/
|
|
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
#include <sys/types.h>
|
|
#endif
|
|
#include <sys/stat.h>
|
|
#ifndef WIN32
|
|
#ifdef HAVE_SYS_QUEUE_H
|
|
#include <sys/queue.h>
|
|
#endif
|
|
#ifdef HAVE_UNISTD_H
|
|
#include <unistd.h>
|
|
#endif
|
|
#else
|
|
#include <time.h>
|
|
#endif
|
|
#ifdef HAVE_SYS_TIME_H
|
|
#include <sys/time.h>
|
|
#endif
|
|
#include <fcntl.h>
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
|
|
#include <opal/event/event.h>
|
|
|
|
int lasttime;
|
|
|
|
void
|
|
timeout_cb(int fd, short event, void *arg)
|
|
{
|
|
struct timeval tv;
|
|
opal_event_t *timeout = arg;
|
|
int newtime = time(NULL);
|
|
|
|
printf("%s: called at %d: %d\n", __func__, newtime,
|
|
newtime - lasttime);
|
|
lasttime = newtime;
|
|
|
|
timerclear(&tv);
|
|
tv.tv_sec = 2;
|
|
opal_event_add(timeout, &tv);
|
|
}
|
|
|
|
int
|
|
main (int argc, char **argv)
|
|
{
|
|
opal_event_t timeout;
|
|
struct timeval tv;
|
|
|
|
/* Initalize the event library */
|
|
opal_event_init();
|
|
|
|
/* Initalize one event */
|
|
opal_evtimer_set(&timeout, timeout_cb, &timeout);
|
|
|
|
timerclear(&tv);
|
|
tv.tv_sec = 2;
|
|
opal_event_add(&timeout, &tv);
|
|
|
|
lasttime = time(NULL);
|
|
|
|
opal_event_dispatch();
|
|
|
|
return (0);
|
|
}
|
|
|