ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/event.c
(Generate patch)

Comparing libev/event.c (file contents):
Revision 1.37 by root, Wed Oct 29 17:50:57 2008 UTC vs.
Revision 1.42 by root, Mon May 10 20:01:45 2010 UTC

1/* 1/*
2 * libevent compatibility layer 2 * libevent compatibility layer
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
39 39
40#include <stddef.h> 40#include <stddef.h>
41#include <stdlib.h> 41#include <stdlib.h>
42#include <assert.h> 42#include <assert.h>
43 43
44#ifndef WIN32
45# include <sys/time.h>
46#endif
47
48#ifdef EV_EVENT_H 44#ifdef EV_EVENT_H
49# include EV_EVENT_H 45# include EV_EVENT_H
50#else 46#else
51# include "event.h" 47# include "event.h"
52#endif 48#endif
… …
76 72
77static ev_tstamp 73static ev_tstamp
78ev_tv_get (struct timeval *tv) 74ev_tv_get (struct timeval *tv)
79{ 75{
80 if (tv) 76 if (tv)
77 {
81 return tv->tv_sec + tv->tv_usec * 1e-6; 78 ev_tstamp after = tv->tv_sec + tv->tv_usec * 1e-6;
79 return after ? after : 1e-6;
80 }
82 else 81 else
83 return -1.; 82 return -1.;
84} 83}
85 84
86#define EVENT_VERSION(a,b) # a "." # b 85#define EVENT_STRINGIFY(s) # s
86#define EVENT_VERSION(a,b) EVENT_STRINGIFY (a) "." EVENT_STRINGIFY (b)
87 87
88const char *event_get_version (void) 88const char *event_get_version (void)
89{ 89{
90 /* returns ABI, not API or library, version */
90 return EVENT_VERSION (EV_VERSION_MAJOR, EV_VERSION_MINOR); 91 return EVENT_VERSION (EV_VERSION_MAJOR, EV_VERSION_MINOR);
91} 92}
92 93
93const char *event_get_method (void) 94const char *event_get_method (void)
94{ 95{
… …
101 if (ev_x_cur) 102 if (ev_x_cur)
102 ev_x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO); 103 ev_x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO);
103 else 104 else
104 ev_x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO); 105 ev_x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO);
105#else 106#else
106 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !ev_x_cur)); 107 assert (("libev: multiple event bases not supported when not compiled with EV_MULTIPLICITY", !ev_x_cur));
107 108
108 ev_x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO); 109 ev_x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO);
109#endif 110#endif
110 111
111 return ev_x_cur; 112 return ev_x_cur;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines