From coroberti at gmail.com Sun Apr 8 02:45:40 2007 From: coroberti at gmail.com (Robert Iakobashvili) Date: Sun Apr 8 02:45:46 2007 Subject: [Libevent-users] [ANN] curl-loader - hyper mode Message-ID: <7e63f56c0704072345u18324408l2b3bac152e0603f7@mail.gmail.com> It might be of interest for users of the great libevent library, that curl-loader hyper-mode (command option -m0) using libevent is released. The mode is using libevent epoll-based event demultiplexing on linux, HTTP and FTP client stacks of libcurl, and TLS/SSL stack of openssl to create HTTP, HTTPS, FTP, FTPS application load for performance testing. Y may look at it here: http://curl-loader.sourceforge.net -- Sincerely, Robert Iakobashvili, coroberti %x40 gmail %x2e com ................................................................... Navigare necesse est, vivere non est necesse ................................................................... -------------- next part -------------- An HTML attachment was scrubbed... URL: http://monkeymail.org/archives/libevent-users/attachments/20070408/15185a61/attachment.htm From scott at GameRanger.com Sun Apr 8 05:11:04 2007 From: scott at GameRanger.com (Scott Kevill) Date: Sun Apr 8 05:12:14 2007 Subject: [Libevent-users] bufferevent high watermark bug Message-ID: I've just started working with libevent as of v1.3b, and it appears to still have a bug with high watermarks for bufferevents. Chris Maxwell discovered and mentioned this on the list just over a year ago: http://monkeymail.org/archives/libevent-users/2006-February/ 000101.html His solution had not been implemented in any subsequent releases of libevent, and the bug remains. Although his solution (removing the return in the high-watermark check) does work in preventing lost callbacks, I don't think it is the best solution (something he also wondered). The callback can still be called with more data buffered than the highwater mark. Exactly how much more depends on the arbitrary decisions made in evbuffer_read. The simple change I made to fix the problem was changing: if (bufev->wm_read.high != 0) howmuch = bufev->wm_read.high; to: if (bufev->wm_read.high != 0) howmuch = bufev->wm_read.high - EVBUFFER_LENGTH(bufev->input); The original problem was that it was using the high watermark as the max *additional* bytes to read, instead of the max *total* bytes post- read. It might depend on your idea of what the high watermark behaviour should be (it's not really documented), but to me this makes more sense as the caller decides how much buffering should be done. While the above change works for my needs, it's not complete either, as there are situations where howmuch will go zero or negative. (eg. Not draining the entire buffer in the read-callback). I haven't dug deeper to figure out the best thing to do in this case, but the socket read should be skipped since there's already more buffered than the high watermark. The next read-callback would be with EVBUFFER_LENGTH(bufev->input) > bufev->wm_read.high, but if you're not completely draining the buffer in the callback, then you should probably expect that. Comments? Scott. -- Scott Kevill GameRanger Technologies http://www.GameRanger.com multiplayer online gaming services From scott at GameRanger.com Sun Apr 8 05:16:33 2007 From: scott at GameRanger.com (Scott Kevill) Date: Sun Apr 8 05:16:38 2007 Subject: [Libevent-users] bufferevent_setwatermark() not in event.h Message-ID: <3ECF958F-98F2-4AA1-9181-1BD050B4FE9F@GameRanger.com> bufferevent_setwatermark() from evbuffer.c isn't exposed in event.h. I'm guessing it isn't used that much or else more people would have noticed, perhaps that also explains why the previously mentioned bug has remained dormant. Scott. -- Scott Kevill GameRanger Technologies http://www.GameRanger.com multiplayer online gaming services From scott at GameRanger.com Sun Apr 8 05:17:16 2007 From: scott at GameRanger.com (Scott Kevill) Date: Sun Apr 8 05:17:20 2007 Subject: [Libevent-users] bufferevent_write(): 'data' argument should be const Message-ID: The current declaration is: int bufferevent_write(struct bufferevent *bufev, void *data, size_t size); Within bufferevent_write(), 'data' is only used in a call to evbuffer_add() where the argument is const. Scott. -- Scott Kevill GameRanger Technologies http://www.GameRanger.com multiplayer online gaming services From provos at citi.umich.edu Sun Apr 8 13:49:10 2007 From: provos at citi.umich.edu (Niels Provos) Date: Sun Apr 8 13:49:13 2007 Subject: [Libevent-users] bufferevent high watermark bug In-Reply-To: References: Message-ID: <850f7cbe0704081049v1699e86apc7b821a1951f8921@mail.gmail.com> Hi Scott, the best way for fixing anything that looks like a bug is to write a test case that triggers the desired behavior. I have to admit that I implemented the watermark code with a special use case in mind that unfortunately did not materialize. That means it's not well tested. Given that you seem to be working with the code, I would suggest that you write the test case and then we can look at it and see what the right semantics should be. The current code stops reading and callbacks once the high watermark has been reached. Once you start draining the input buffer, reading continues. I can see that there is a case where one might reach the high watermark is one go and never notify the user. That seems problematic to me, but is easy to fix. Niels. On 4/8/07, Scott Kevill wrote: > I've just started working with libevent as of v1.3b, and it appears > to still have a bug with high watermarks for bufferevents. Chris > Maxwell discovered and mentioned this on the list just over a year ago: > > http://monkeymail.org/archives/libevent-users/2006-February/ > 000101.html > > His solution had not been implemented in any subsequent releases of > libevent, and the bug remains. > > Although his solution (removing the return in the high-watermark > check) does work in preventing lost callbacks, I don't think it is > the best solution (something he also wondered). The callback can > still be called with more data buffered than the highwater mark. > Exactly how much more depends on the arbitrary decisions made in > evbuffer_read. > > The simple change I made to fix the problem was changing: > if (bufev->wm_read.high != 0) > howmuch = bufev->wm_read.high; > to: > if (bufev->wm_read.high != 0) > howmuch = bufev->wm_read.high - EVBUFFER_LENGTH(bufev->input); > > The original problem was that it was using the high watermark as the > max *additional* bytes to read, instead of the max *total* bytes post- > read. > > It might depend on your idea of what the high watermark behaviour > should be (it's not really documented), but to me this makes more > sense as the caller decides how much buffering should be done. > > While the above change works for my needs, it's not complete either, > as there are situations where howmuch will go zero or negative. (eg. > Not draining the entire buffer in the read-callback). I haven't dug > deeper to figure out the best thing to do in this case, but the > socket read should be skipped since there's already more buffered > than the high watermark. The next read-callback would be with > EVBUFFER_LENGTH(bufev->input) > bufev->wm_read.high, but if you're > not completely draining the buffer in the callback, then you should > probably expect that. > > Comments? > > Scott. > -- > Scott Kevill > GameRanger Technologies > http://www.GameRanger.com > multiplayer online gaming services > > _______________________________________________ > Libevent-users mailing list > Libevent-users@monkeymail.org > http://monkey.org/mailman/listinfo/libevent-users > > From adam.chou at gmail.com Thu Apr 12 06:01:27 2007 From: adam.chou at gmail.com (Adam Chou) Date: Thu Apr 12 06:01:31 2007 Subject: [Libevent-users] How do i make a multi-threaded libevent server? Message-ID: So i'm using libevent thus far to handle incoming requests and new connections. When new connections come in or data on an already connected socket come in, i'd like to pass off the connection to a thread to let the thread handle the data transactions and processing. I'm doing this by putting a socket id on a ring buffer and having the worker threads pull from the ring buffer as new tasks become available. The problem with this (or so it seems to me) is that I can't add the event back to the event handler until the worker thread has finished reading all the available data from the socket or else libevent will keep signaling that there is data waiting to be read and flood my ring buffer with requests. If it isn't apparent already, I can't add the event in the worker threads because libevent (as i understand it) isn't thread safe like that. So how do I go about implementing a system that will allow worker threads to handle a connection and have a master libevent thread handle events? Additionally, I'd like to also be able to have the worker threads somehow close the connection in the instance that the client gets disconnected between the time the client sends in a request and the time that the worker picks up the request and processes it. Thanks in advance for any help. Oh, additionally, It seems like once an event handler gets an event, I don't need to event_del() the event since its already removed from the event stack but i just wanted to clarify that if someone could answer this question for me. Thanks -------------- next part -------------- An HTML attachment was scrubbed... URL: http://monkeymail.org/archives/libevent-users/attachments/20070412/3f07e349/attachment.htm From martin.hedenfalk at gmail.com Fri Apr 13 13:25:10 2007 From: martin.hedenfalk at gmail.com (Martin Hedenfalk) Date: Fri Apr 13 13:25:14 2007 Subject: [Libevent-users] How do i make a multi-threaded libevent server? In-Reply-To: References: Message-ID: On 4/12/07, Adam Chou wrote: > So i'm using libevent thus far to handle incoming requests and new > connections. When new connections come in or data on an already connected > socket come in, i'd like to pass off the connection to a thread to let the > thread handle the data transactions and processing. I'm sorry, but why would you want to do something like that? Just for the overhead of context switching? (sorry, couldn't resist) > I'm doing this by > putting a socket id on a ring buffer and having the worker threads pull from > the ring buffer as new tasks become available. The problem with this (or so > it seems to me) is that I can't add the event back to the event handler > until the worker thread has finished reading all the available data from the > socket or else libevent will keep signaling that there is data waiting to be > read and flood my ring buffer with requests. You're not using libevents' bufferevents, are you? > If it isn't apparent already, I > can't add the event in the worker threads because libevent (as i understand > it) isn't thread safe like that. So how do I go about implementing a system > that will allow worker threads to handle a connection and have a master > libevent thread handle events? I think you should re-think your application design. 1. If the processing time of each client request is relatively short, you don't need threads. Use libevent and bufferevents. Just process every request directly in the input callback. You don't need to think about semaphores, mutexes and such horror. 2. If the processing of each client request takes long time and might block other requests, try to break it up into chunks. After each chunk you schedule another one (with a timer of 0 seconds) and go back to the event loop. I've implemented this successfully for a request that needed a full filesystem directory tree traversal. Each chunk/iteration would traverse 5 directories, then schedule another chunk and return to the event loop. Back in the event loop I would then either process any outstanding socket event, or go back to the directory traversal request. 3. Have you considered using a fork based approach? If the processing of each client is independent of each other, you don't need threads. 4. Finally, if nothing of the above is possible, why use libevent at all? Use blocking sockets and a simple accept() loop that spawns off threads. > Additionally, I'd like to also be able to > have the worker threads somehow close the connection in the instance that > the client gets disconnected between the time the client sends in a request > and the time that the worker picks up the request and processes it. Thanks > in advance for any help. I'm sorry if the above seems harsh, but I really don't see the point in implementing a multi-threaded libevent server. > Oh, additionally, It seems like once an event handler gets an event, I don't > need to event_del() the event since its already removed from the event stack > but i just wanted to clarify that if someone could answer this question for > me. Thanks I guess that depends on if you specify EV_PERSIST or not. But I let others elaborate on that. -martin From sgrimm at facebook.com Fri Apr 13 13:39:36 2007 From: sgrimm at facebook.com (Steven Grimm) Date: Fri Apr 13 13:39:30 2007 Subject: [Libevent-users] How do i make a multi-threaded libevent server? In-Reply-To: References: Message-ID: <461FC058.8060302@facebook.com> Martin Hedenfalk wrote: > I'm sorry if the above seems harsh, but I really don't see the point > in implementing a multi-threaded libevent server. I can answer that, since I converted memcached from single- to multi-threaded: even if each request completes in a very short time, pile enough of them up in a short period of time and you'll run out of capacity on one CPU. Adding threads lets you make full use of a multiprocessor machine without having to split your application up into separate processes. Splitting into multiple processes not only duplicates whatever constant overhead each instance of your app has, but if the application needs to have globally shared state, you're looking at something like a shared memory region or mmapped file with the same locking issues you have in a multithreaded app. As for how to do it, my approach is documented on the libevent home page (or rather, there's a link there to my explanation) so I won't repeat myself. But I will say it's working well for us -- our memcached instances are handling close to twice the request volume they used to be able to handle when they were single-threaded, and they still have plenty of capacity to spare. -Steve From coroberti at gmail.com Fri Apr 13 13:59:57 2007 From: coroberti at gmail.com (Robert Iakobashvili) Date: Fri Apr 13 14:10:01 2007 Subject: [Libevent-users] How do i make a multi-threaded libevent server? In-Reply-To: <461FC058.8060302@facebook.com> References: <461FC058.8060302@facebook.com> Message-ID: <7e63f56c0704131059u684a3b0ct925a8294489199c9@mail.gmail.com> Hi, On 4/13/07, Steven Grimm wrote: > Martin Hedenfalk wrote: > > I'm sorry if the above seems harsh, but I really don't see the point > > in implementing a multi-threaded libevent server. > > Adding threads lets you make full use of a > multiprocessor machine without having to split your application up into > separate processes. Splitting into multiple processes not only > duplicates whatever constant overhead each instance of your app has, but > if the application needs to have globally shared state, you're looking > at something like a shared memory region or mmapped file with the same > locking issues you have in a multithreaded app. Indeed, when HW has several CPUs or cores, etc, starts the business case for using multi-threading designs despite locking and etc weird issues to overcome. Multiprocess designs have pros and cons to consider: - pros are sometimes higher robustness, when several processes are doing jobs in parallel; if a single process fails only a portion of the load goes away (apache design); - cons are issues with on-fly reconfiguration and management of such multi-process entities. My preference is towards multi-threaded rather than multi-process architecture, where robustness may be enhanced by other means, like keeping all essential data-structures in memory-mapped file, etc. Y may wish to look for design using Leader-Followers design pattern and optimize the number of threads experimentally, where the optimum is in many cases 2-5 times multiple of CPUs number. Sincerely, Robert Iakobashvili, coroberti %x40 gmail %x2e com ................................................................... Navigare necesse est, vivere non est necesse ................................................................... http://curl-loader.sourceforge.net An open-source HTTP/S, FTP/S traffic generating, and web testing tool. From acd at weirdness.net Fri Apr 13 16:19:46 2007 From: acd at weirdness.net (Andrew Danforth) Date: Fri Apr 13 16:19:49 2007 Subject: [Libevent-users] How do i make a multi-threaded libevent server? In-Reply-To: <461FC058.8060302@facebook.com> References: <461FC058.8060302@facebook.com> Message-ID: I agree with Steve, there are definitely situations where using libevent in multithreaded apps makes sense. My only complaint is exactly what Steve mentioned in his earlier post regarding the use of a pipe/socketpair for inter-libevent thread communication. I have a main thread listening for inbound connections which then hands the request off to a worker thread. I generally create 2 * cores number of threads and load balance the inbound requests across them. Each worker thread runs its own event loop and handles communications with many clients at once. The worker performs all the communication necessary to fulfill a given client request. FWIW, I have a wrapper around the pipe-style message passing that works well for me available at http://www.weirdness.net/code/libevent/. I've been meaning to document it but I haven't got around to it yet. Andrew On 4/13/07, Steven Grimm wrote: > > Martin Hedenfalk wrote: > > I'm sorry if the above seems harsh, but I really don't see the point > > in implementing a multi-threaded libevent server. > > I can answer that, since I converted memcached from single- to > multi-threaded: even if each request completes in a very short time, > pile enough of them up in a short period of time and you'll run out of > capacity on one CPU. Adding threads lets you make full use of a > multiprocessor machine without having to split your application up into > separate processes. Splitting into multiple processes not only > duplicates whatever constant overhead each instance of your app has, but > if the application needs to have globally shared state, you're looking > at something like a shared memory region or mmapped file with the same > locking issues you have in a multithreaded app. > > As for how to do it, my approach is documented on the libevent home page > (or rather, there's a link there to my explanation) so I won't repeat > myself. But I will say it's working well for us -- our memcached > instances are handling close to twice the request volume they used to be > able to handle when they were single-threaded, and they still have > plenty of capacity to spare. > > -Steve > > _______________________________________________ > Libevent-users mailing list > Libevent-users@monkeymail.org > http://monkey.org/mailman/listinfo/libevent-users > -------------- next part -------------- An HTML attachment was scrubbed... URL: http://monkeymail.org/archives/libevent-users/attachments/20070413/61717c98/attachment.htm From kenstir78 at comcast.net Mon Apr 16 16:19:30 2007 From: kenstir78 at comcast.net (Ken Cox) Date: Mon Apr 16 16:19:50 2007 Subject: [Libevent-users] evbuffer_find fix and a test Message-ID: Greetings, We found an error where evbuffer_find(buf,"\r\n",2) would find only a bare "\r" at the end of the buffer, if there happened to be a leftover "\n" in the next byte. I added new tests to regress.c to show the bug and the error which is visible on FC6 with valgrind. I'm not certain that the enclosed fix is the most concise one possible, but it fixes the bug and the valgrind error. Regards, Ken Cox k e n s t i r a t v i v o x d o t c o m -------------- next part -------------- A non-text attachment was scrubbed... Name: libevent.patch Type: application/octet-stream Size: 2489 bytes Desc: not available Url : http://monkeymail.org/archives/libevent-users/attachments/20070416/61ca94c5/libevent-0001.obj From provos at citi.umich.edu Wed Apr 18 11:48:31 2007 From: provos at citi.umich.edu (Niels Provos) Date: Wed Apr 18 11:48:48 2007 Subject: [Libevent-users] evbuffer_find fix and a test In-Reply-To: References: Message-ID: <850f7cbe0704180848t35df19e0y715dd7f0e28a9da6@mail.gmail.com> Hi Ken, thanks for the bug report. Your regression test was good. Unfortunately, the fix was buggy :-) Here is what I plan on submitting as a fix: Index: buffer.c =================================================================== --- buffer.c (revision 351) +++ buffer.c (working copy) @@ -431,13 +431,12 @@ u_char * evbuffer_find(struct evbuffer *buffer, const u_char *what, size_t len) { - size_t remain = buffer->off; - u_char *search = buffer->buffer; + u_char *search = buffer->buffer, *end = search + buffer->off; u_char *p; - while ((p = memchr(search, *what, remain)) != NULL) { - remain = buffer->off - (size_t)(search - buffer->buffer); - if (remain < len) + while (search < end && + (p = memchr(search, *what, end - search)) != NULL) { + if (p + len > end) break; if (memcmp(p, what, len) == 0) return (p); Thanks, Niels. On 4/16/07, Ken Cox wrote: > Greetings, > > We found an error where evbuffer_find(buf,"\r\n",2) would find only a bare > "\r" at the end of the buffer, if there happened to be a leftover "\n" in > the next byte. I added new tests to regress.c to show the bug and the > error which is visible on FC6 with valgrind. I'm not certain that the > enclosed fix is the most concise one possible, but it fixes the bug and > the valgrind error. > > Regards, > Ken Cox > k e n s t i r a t v i v o x d o t c o m > _______________________________________________ > Libevent-users mailing list > Libevent-users@monkeymail.org > http://monkey.org/mailman/listinfo/libevent-users > > > From coroberti at gmail.com Mon Apr 23 05:57:21 2007 From: coroberti at gmail.com (Robert Iakobashvili) Date: Mon Apr 23 05:57:25 2007 Subject: [Libevent-users] NEVENT ifndef-ing Message-ID: <7e63f56c0704230257u5700cbffs1a0393959fdcde69@mail.gmail.com> Thank you for the great libevent. Some issue to improve is: NEVENT number is defined in devepoll.c and in epoll.c as 32000 If/when somebody needs higher numbers, he needs to patch the library. The suggestion is to ifndef the defines in order to let their over-writing, e.g. by CFLAGS option -DNEVENT=65535 -- Sincerely, Robert Iakobashvili, coroberti %x40 gmail %x2e com ................................................................... Navigare necesse est, vivere non est necesse ................................................................... http://curl-loader.sourceforge.net An open-source HTTP/S, FTP/S traffic generating, and web testing tool. From chip at corelands.com Mon Apr 23 13:46:26 2007 From: chip at corelands.com (Paul Querna) Date: Mon Apr 23 13:46:45 2007 Subject: [Libevent-users] setting event_base for http Message-ID: <462CF0F2.10009@corelands.com> Hello, I was looking at the http code in 1.3b, and it doesn't seem there is a way to set the event_base* used by the http server or client code. Is this intentional? Would people be interested in patches to allow setting of the event_base used by the http client and server APIs? Thanks, -Paul From chip at corelands.com Mon Apr 23 16:26:42 2007 From: chip at corelands.com (Paul Querna) Date: Mon Apr 23 16:27:05 2007 Subject: [Libevent-users] [PATCH] set base for evhttp Message-ID: <462D1682.3010209@corelands.com> Attached is a patch against the 1.3b sources, to set the event_base* for both the evhttp server and client connections. It adds the following functions to the API: evhttp_base_start evhttp_base_connection_new Only lightly tested, but it passes the regress tests. Thoughts? Thanks, -Paul -------------- next part -------------- Index: http.c =================================================================== --- http.c (revision 13656) +++ http.c (working copy) @@ -150,6 +150,15 @@ void evhttp_read(int, short, void *); void evhttp_write(int, short, void *); +static int evhttp_null_base_set(struct event_base *base, struct event *ev) +{ + if (base != NULL) { + return event_base_set(base, ev); + } + + return (0); +} + #ifndef HAVE_STRSEP static char * strsep(char **s, const char *del) @@ -277,6 +286,7 @@ event_del(&evcon->ev); event_set(&evcon->ev, evcon->fd, EV_WRITE, evhttp_write, evcon); + evhttp_null_base_set(evcon->base_ev, &evcon->ev); evhttp_add_event(&evcon->ev, evcon->timeout, HTTP_WRITE_TIMEOUT); } @@ -706,6 +716,7 @@ } /* Read more! */ event_set(&evcon->ev, evcon->fd, EV_READ, evhttp_read, evcon); + evhttp_null_base_set(evcon->base_ev, &evcon->ev); evhttp_add_event(&evcon->ev, evcon->timeout, HTTP_READ_TIMEOUT); } @@ -862,6 +873,7 @@ event_del(&evcon->close_ev); event_set(&evcon->close_ev, evcon->fd, EV_READ, evhttp_detect_close_cb, evcon); + evhttp_null_base_set(evcon->base_ev, &evcon->ev); event_add(&evcon->close_ev, NULL); } @@ -1349,6 +1361,12 @@ struct evhttp_connection * evhttp_connection_new(const char *address, unsigned short port) { + return evhttp_base_connection_new(NULL, address, port); +} + +struct evhttp_connection * +evhttp_base_connection_new(struct event_base *evb, const char *address, unsigned short port) +{ struct evhttp_connection *evcon = NULL; event_debug(("Attempting connection to %s:%d\n", address, port)); @@ -1360,6 +1378,8 @@ evcon->fd = -1; evcon->port = port; + + evcon->base_ev = evb; evcon->timeout = -1; evcon->retry_cnt = evcon->retry_max = 0; @@ -1382,6 +1402,8 @@ evcon->state = EVCON_DISCONNECTED; TAILQ_INIT(&evcon->requests); + evhttp_null_base_set(evcon->base_ev, &evcon->ev); + return (evcon); error: @@ -1441,6 +1463,7 @@ /* Set up a callback for successful connection setup */ event_set(&evcon->ev, evcon->fd, EV_WRITE, evhttp_connectioncb, evcon); + evhttp_null_base_set(evcon->base_ev, &evcon->ev); evhttp_add_event(&evcon->ev, evcon->timeout, HTTP_CONNECT_TIMEOUT); evcon->state = EVCON_CONNECTING; @@ -1506,7 +1529,7 @@ if (event_initialized(&evcon->ev)) event_del(&evcon->ev); event_set(&evcon->ev, evcon->fd, EV_READ, evhttp_read_header, evcon); - + evhttp_null_base_set(evcon->base_ev, &evcon->ev); evhttp_add_event(&evcon->ev, evcon->timeout, HTTP_READ_TIMEOUT); } @@ -1883,6 +1906,7 @@ /* Schedule the socket for accepting */ event_set(ev, fd, EV_READ | EV_PERSIST, accept_socket, http); + evhttp_null_base_set(http->base_ev, ev); event_add(ev, NULL); event_debug(("Bound to port %d - Awaiting connections ... ", port)); @@ -1897,6 +1921,12 @@ struct evhttp * evhttp_start(const char *address, u_short port) { + return evhttp_base_start(NULL, address, port); +} + +struct evhttp * +evhttp_base_start(struct event_base *evb, const char *address, u_short port) +{ struct evhttp *http; if ((http = calloc(1, sizeof(struct evhttp))) == NULL) { @@ -1904,6 +1934,8 @@ return (NULL); } + http->base_ev = evb; + http->timeout = -1; TAILQ_INIT(&http->callbacks); @@ -2073,7 +2105,7 @@ static struct evhttp_connection* evhttp_get_request_connection( - int fd, struct sockaddr *sa, socklen_t salen) + struct evhttp *http, int fd, struct sockaddr *sa, socklen_t salen) { struct evhttp_connection *evcon; char *hostname, *portname; @@ -2083,7 +2115,7 @@ __func__, hostname, portname, fd)); /* we need a connection object to put the http request on */ - if ((evcon = evhttp_connection_new(hostname, atoi(portname))) == NULL) + if ((evcon = evhttp_base_connection_new(http->base_ev, hostname, atoi(portname))) == NULL) return (NULL); evcon->flags |= EVHTTP_CON_INCOMING; evcon->state = EVCON_CONNECTED; @@ -2123,7 +2155,7 @@ { struct evhttp_connection *evcon; - evcon = evhttp_get_request_connection(fd, sa, salen); + evcon = evhttp_get_request_connection(http, fd, sa, salen); if (evcon == NULL) return; Index: evhttp.h =================================================================== --- evhttp.h (revision 13656) +++ evhttp.h (working copy) @@ -64,6 +64,7 @@ /* Start an HTTP server on the specified address and port */ struct evhttp *evhttp_start(const char *address, u_short port); +struct evhttp *evhttp_base_start(struct event_base *evb, const char *address, u_short port); /* * Free the previously create HTTP server. Works only if no requests are @@ -168,6 +169,8 @@ */ struct evhttp_connection *evhttp_connection_new( const char *address, unsigned short port); +struct evhttp_connection *evhttp_base_connection_new( + struct event_base *evb, const char *address, unsigned short port); /* Frees an http connection */ void evhttp_connection_free(struct evhttp_connection *evcon); Index: http-internal.h =================================================================== --- http-internal.h (revision 13656) +++ http-internal.h (working copy) @@ -44,6 +44,7 @@ struct event close_ev; struct evbuffer *input_buffer; struct evbuffer *output_buffer; + struct event_base *base_ev; char *address; u_short port; @@ -81,6 +82,7 @@ }; struct evhttp { + struct event_base *base_ev; struct event bind_ev; TAILQ_HEAD(httpcbq, evhttp_cb) callbacks; From mark at heily.com Wed Apr 25 22:28:59 2007 From: mark at heily.com (Mark Heily) Date: Wed Apr 25 22:29:08 2007 Subject: [Libevent-users] libevent API documentation available Message-ID: <1177554539.17391.8.camel@voltaire> Hello, I would like to thank Niels and everyone who has contributed to the development of libevent. It is a great framework that I am now using in my own project (shameless plug: http://www.naturalc.org). As a way of giving back, and as a way to learn more about the library, I have documented most of the API using Doxygen comments. Doxygen (www.doxygen.org) processes documented source code and produces output in a variety of formats including HTML, PDF, and Troff-formatted manpages. You can browse all of the documentation I have created by visiting: http://naturalc.org/libevent/ I invite everyone to take a look and offer any comments, additions, or corrections that may be needed. When the documentation is complete and has been reviewed, I will upload the annotated source code and the Doxygen configuration file to the list. Thanks, Mark Heily From mark at heily.com Mon Apr 30 23:15:56 2007 From: mark at heily.com (Mark Heily) Date: Mon Apr 30 23:51:39 2007 Subject: [Libevent-users] [PATCH] libevent-doxygen.diff Message-ID: <1177989356.18996.26.camel@voltaire> Here are the annotated header files and the Doxygen configuration file that can be used to generate the libevent API reference manual found at http://naturalc.org/libevent/. This patch creates the following files: doxygen/ doxygen/Doxyfile doxygen/event.h doxygen/evdns.h doxygen/evhttp.h It also modifies Makefile.am to include these files in the source tarball when running 'make dist'. After applying the patch, go to the doxygen/ subdirectory and run 'doxygen' to generate the documentation. Regards, - Mark P.S. For legal purposes, I, Mark Heily, hereby place the following modifications to libevent into the public domain. Hence, these modifications may be freely used and/or redistributed for any purpose with or without attribution and/or other notice. diff -ruN ../libevent.OLD/doxygen/Doxyfile ./doxygen/Doxyfile --- ../libevent.OLD/doxygen/Doxyfile 1969-12-31 19:00:00.000000000 -0500 +++ ./doxygen/Doxyfile 2007-04-30 23:02:31.000000000 -0400 @@ -0,0 +1,226 @@ +# Doxyfile 1.5.1 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project +# +# All text after a hash (#) is considered a comment and will be ignored +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" ") + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = libevent + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like the Qt-style comments (thus requiring an +# explicit @brief command for a brief description. + +JAVADOC_AUTOBRIEF = YES + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = YES + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = event.h evdns.h evhttp.h + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = YES + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4wide + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = NO + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = NO + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = YES + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = YES + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. + +PREDEFINED = TAILQ_ENTRY RB_ENTRY _EVENT_DEFINED_TQENTRY + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse +# the parser if not removed. + +SKIP_FUNCTION_MACROS = YES diff -ruN ../libevent.OLD/doxygen/evdns.h ./doxygen/evdns.h --- ../libevent.OLD/doxygen/evdns.h 1969-12-31 19:00:00.000000000 -0500 +++ ./doxygen/evdns.h 2007-04-30 22:24:20.000000000 -0400 @@ -0,0 +1,501 @@ +/* + * Copyright (c) 2006 Niels Provos + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * The original DNS code is due to Adam Langley with heavy + * modifications by Nick Mathewson. Adam put his DNS software in the + * public domain. You can find his original copyright below. Please, + * aware that the code as part of libevent is governed by the 3-clause + * BSD license above. + * + * This software is Public Domain. To view a copy of the public domain dedication, + * visit http://creativecommons.org/licenses/publicdomain/ or send a letter to + * Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. + * + * I ask and expect, but do not require, that all derivative works contain an + * attribution similar to: + * Parts developed by Adam Langley + * + * You may wish to replace the word "Parts" with something else depending on + * the amount of original code. + * + * (Derivative works does not include programs which link against, run or include + * the source verbatim in their source distributions) + */ + +/** @file evdns.h + * + * Welcome, gentle reader + * + * Async DNS lookups are really a whole lot harder than they should be, + * mostly stemming from the fact that the libc resolver has never been + * very good at them. Before you use this library you should see if libc + * can do the job for you with the modern async call getaddrinfo_a + * (see http://www.imperialviolet.org/page25.html#e498). Otherwise, + * please continue. + * + * This code is based on libevent and you must call event_init before + * any of the APIs in this file. You must also seed the OpenSSL random + * source if you are using OpenSSL for ids (see below). + * + * This library is designed to be included and shipped with your source + * code. You statically link with it. You should also test for the + * existence of strtok_r and define HAVE_STRTOK_R if you have it. + * + * The DNS protocol requires a good source of id numbers and these + * numbers should be unpredictable for spoofing reasons. There are + * three methods for generating them here and you must define exactly + * one of them. In increasing order of preference: + * + * DNS_USE_GETTIMEOFDAY_FOR_ID: + * Using the bottom 16 bits of the usec result from gettimeofday. This + * is a pretty poor solution but should work anywhere. + * DNS_USE_CPU_CLOCK_FOR_ID: + * Using the bottom 16 bits of the nsec result from the CPU's time + * counter. This is better, but may not work everywhere. Requires + * POSIX realtime support and you'll need to link against -lrt on + * glibc systems at least. + * DNS_USE_OPENSSL_FOR_ID: + * Uses the OpenSSL RAND_bytes call to generate the data. You must + * have seeded the pool before making any calls to this library. + * + * The library keeps track of the state of nameservers and will avoid + * them when they go down. Otherwise it will round robin between them. + * + * Quick start guide: + * #include "evdns.h" + * void callback(int result, char type, int count, int ttl, + * void *addresses, void *arg); + * evdns_resolv_conf_parse(DNS_OPTIONS_ALL, "/etc/resolv.conf"); + * evdns_resolve("www.hostname.com", 0, callback, NULL); + * + * When the lookup is complete the callback function is called. The + * first argument will be one of the DNS_ERR_* defines in evdns.h. + * Hopefully it will be DNS_ERR_NONE, in which case type will be + * DNS_IPv4_A, count will be the number of IP addresses, ttl is the time + * which the data can be cached for (in seconds), addresses will point + * to an array of uint32_t's and arg will be whatever you passed to + * evdns_resolve. + * + * Searching: + * + * In order for this library to be a good replacement for glibc's resolver it + * supports searching. This involves setting a list of default domains, in + * which names will be queried for. The number of dots in the query name + * determines the order in which this list is used. + * + * Searching appears to be a single lookup from the point of view of the API, + * although many DNS queries may be generated from a single call to + * evdns_resolve. Searching can also drastically slow down the resolution + * of names. + * + * To disable searching: + * 1. Never set it up. If you never call evdns_resolv_conf_parse or + * evdns_search_add then no searching will occur. + * + * 2. If you do call evdns_resolv_conf_parse then don't pass + * DNS_OPTION_SEARCH (or DNS_OPTIONS_ALL, which implies it). + * + * 3. When calling evdns_resolve, pass the DNS_QUERY_NO_SEARCH flag. + * + * The order of searches depends on the number of dots in the name. If the + * number is greater than the ndots setting then the names is first tried + * globally. Otherwise each search domain is appended in turn. + * + * The ndots setting can either be set from a resolv.conf, or by calling + * evdns_search_ndots_set. + * + * For example, with ndots set to 1 (the default) and a search domain list of + * ["myhome.net"]: + * Query: www + * Order: www.myhome.net, www. + * + * Query: www.abc + * Order: www.abc., www.abc.myhome.net + * + * Internals: + * + * Requests are kept in two queues. The first is the inflight queue. In + * this queue requests have an allocated transaction id and nameserver. + * They will soon be transmitted if they haven't already been. + * + * The second is the waiting queue. The size of the inflight ring is + * limited and all other requests wait in waiting queue for space. This + * bounds the number of concurrent requests so that we don't flood the + * nameserver. Several algorithms require a full walk of the inflight + * queue and so bounding its size keeps thing going nicely under huge + * (many thousands of requests) loads. + * + * If a nameserver loses too many requests it is considered down and we + * try not to use it. After a while we send a probe to that nameserver + * (a lookup for google.com) and, if it replies, we consider it working + * again. If the nameserver fails a probe we wait longer to try again + * with the next probe. + */ + +#ifndef EVENTDNS_H +#define EVENTDNS_H + +#ifdef __cplusplus +extern "C" { +#endif + +/** Error codes 0-5 are as described in RFC 1035. */ +#define DNS_ERR_NONE 0 +/** The name server was unable to interpret the query */ +#define DNS_ERR_FORMAT 1 +/** The name server was unable to process this query due to a problem with the + * name server */ +#define DNS_ERR_SERVERFAILED 2 +/** The domain name does not exist */ +#define DNS_ERR_NOTEXIST 3 +/** The name server does not support the requested kind of query */ +#define DNS_ERR_NOTIMPL 4 +/** The name server refuses to reform the specified operation for policy + * reasons */ +#define DNS_ERR_REFUSED 5 +/** The reply was truncated or ill-formated */ +#define DNS_ERR_TRUNCATED 65 +/** An unknown error occurred */ +#define DNS_ERR_UNKNOWN 66 +/** Communication with the server timed out */ +#define DNS_ERR_TIMEOUT 67 +/** The request was canceled because the DNS subsystem was shut down. */ +#define DNS_ERR_SHUTDOWN 68 + +#define DNS_IPv4_A 1 +#define DNS_PTR 2 +#define DNS_IPv6_AAAA 3 + +#define DNS_QUERY_NO_SEARCH 1 + +#define DNS_OPTION_SEARCH 1 +#define DNS_OPTION_NAMESERVERS 2 +#define DNS_OPTION_MISC 4 +#define DNS_OPTIONS_ALL 7 + +/** + * The callback that contains the results from a lookup. + * - type is either DNS_IPv4_A or DNS_PTR or DNS_IPv6_AAAA + * - count contains the number of addresses of form type + * - ttl is the number of seconds the resolution may be cached for. + * - addresses needs to be cast according to type + */ +typedef void (*evdns_callback_type) (int result, char type, int count, int ttl, void *addresses, void *arg); + +/** + Initialize the asynchronous DNS library. + + This function initializes support for non-blocking name resolution by calling + evdns_resolv_conf_parse() on UNIX and evdns_config_windows_nameservers() on Windows. + + @return 0 if successful, or -1 if an error occurred + @see evdns_shutdown() + */ +int evdns_init(void); + + +/** + Shut down the asynchronous DNS resolver and terminate all active requests. + + If the 'fail_requests' option is enabled, all active requests will return + an empty result with the error flag set to DNS_ERR_SHUTDOWN. Otherwise, + the requests will be silently discarded. + + @param fail_requests if zero, active requests will be aborted; if non-zero, + active requests will return DNS_ERR_SHUTDOWN. + @see evdns_init() + */ +void evdns_shutdown(int fail_requests); + + +/** + Convert a DNS error code to a string. + + @param err the DNS error code + @return a string containing an explanation of the error code +*/ +const char *evdns_err_to_string(int err); + + +/** + Add a nameserver. + + The address should be an IP address in network byte order. + The type of address is chosen so that it matches in_addr.s_addr. + + @param address an IP address in network byte order + @return 0 if successful, or -1 if an error occurred + @see evdns_nameserver_ip_add() + */ +int evdns_nameserver_add(unsigned long int address); + + +/** + Get the number of configured nameservers. + + This returns the number of configured nameservers (not necessarily the + number of running nameservers). This is useful for double-checking + whether our calls to the various nameserver configuration functions + have been successful. + + @return the number of configured nameservers + @see evdns_nameserver_add() + */ +int evdns_count_nameservers(void); + + +/** + Remove all configured nameservers, and suspend all pending resolves. + + Resolves will not necessarily be re-attempted until evdns_resume() is called. + + @return 0 if successful, or -1 if an error occurred + @see evdns_resume() + */ +int evdns_clear_nameservers_and_suspend(void); + + +/** + Resume normal operation and continue any suspended resolve requests. + + Re-attempt resolves left in limbo after an earlier call to + evdns_clear_nameservers_and_suspend(). + + @return 0 if successful, or -1 if an error occurred + @see evdns_clear_nameservers_and_suspend() + */ +int evdns_resume(void); + + +/** + Add a nameserver. + + This wraps the evdns_nameserver_add() function by parsing a string as an IP + address and adds it as a nameserver. + + @return 0 if successful, or -1 if an error occurred + @see evdns_nameserver_add() + */ +int evdns_nameserver_ip_add(const char *ip_as_string); + + +/** + Lookup an A record for a given name. + + @param name a DNS hostname + @param flags either 0, or DNS_QUERY_NO_SEARCH to disable searching for this query. + @param callback a callback function to invoke when the request is completed + @param ptr an argument to pass to the callback function + @return 0 if successful, or -1 if an error occurred + @see evdns_resolve_ipv6(), evdns_resolve_reverse(), evdns_resolve_reverse_ipv6() + */ +int evdns_resolve_ipv4(const char *name, int flags, evdns_callback_type callback, void *ptr); + + +/** + Lookup an AAAA record for a given name. + + @param name a DNS hostname + @param flags either 0, or DNS_QUERY_NO_SEARCH to disable searching for this query. + @param callback a callback function to invoke when the request is completed + @param ptr an argument to pass to the callback function + @return 0 if successful, or -1 if an error occurred + @see evdns_resolve_ipv4(), evdns_resolve_reverse(), evdns_resolve_reverse_ipv6() + */ +int evdns_resolve_ipv6(const char *name, int flags, evdns_callback_type callback, void *ptr); + +struct in_addr; +struct in6_addr; + +/** + Lookup a PTR record for a given IP address. + + @param in an IPv4 address + @param flags either 0, or DNS_QUERY_NO_SEARCH to disable searching for this query. + @param callback a callback function to invoke when the request is completed + @param ptr an argument to pass to the callback function + @return 0 if successful, or -1 if an error occurred + @see evdns_resolve_reverse_ipv6() + */ +int evdns_resolve_reverse(struct in_addr *in, int flags, evdns_callback_type callback, void *ptr); + + +/** + Lookup a PTR record for a given IPv6 address. + + @param in an IPv6 address + @param flags either 0, or DNS_QUERY_NO_SEARCH to disable searching for this query. + @param callback a callback function to invoke when the request is completed + @param ptr an argument to pass to the callback function + @return 0 if successful, or -1 if an error occurred + @see evdns_resolve_reverse_ipv6() + */ +int evdns_resolve_reverse_ipv6(struct in6_addr *in, int flags, evdns_callback_type callback, void *ptr); + + +/** + Set the value of a configuration option. + + The currently available configuration options are: + + ndots, timeout, max-timeouts, max-inflight, and attempts + + @param option the name of the configuration option to be modified + @param val the value to be set + @param flags either 0 | DNS_OPTION_SEARCH | DNS_OPTION_MISC + @return 0 if successful, or -1 if an error occurred + */ +int evdns_set_option(const char *option, const char *val, int flags); + + +/** + Parse a resolv.conf file. + + The 'flags' parameter determines what information is parsed from + the resolv.conf file. See the man page for resolv.conf for the format of this file. + The following directives are not parsed from the file: sortlist, rotate, no-check-names, inet6, debug + + If this function encounters an error, the possible return values are: + 1 = failed to open file, 2 = failed to stat file, 3 = file too large, + 4 = out of memory, 5 = short read from file, 6 = no nameservers listed in the file + + @param flags any of DNS_OPTION_NAMESERVERS|DNS_OPTION_SEARCH|DNS_OPTION_MISC|DNS_OPTIONS_ALL + @param filename the path to the resolv.conf file + @return 0 if successful, or various positive error codes if an error occurred (see above) + @see resolv.conf(3), evdns_config_windows_nameservers() + */ +int evdns_resolv_conf_parse(int flags, const char *filename); + + +/** + Obtain nameserver information using the Windows API. + + Attempt to configure a set of nameservers based on platform settings on + a win32 host. Preferentially tries to use GetNetworkParams; if that fails, + looks in the registry. + + @return 0 if successful, or -1 if an error occurred + @see evdns_resolv_conf_parse() + */ +#ifdef MS_WINDOWS +int evdns_config_windows_nameservers(void); +#endif + + +/** + Clear the list of search domains. + */ +void evdns_search_clear(void); + + +/** + Add a domain to the list of search domains + + @param domain the domain to be added to the search list + */ +void evdns_search_add(const char *domain); + + +/** + Set the 'ndots' parameter for searches. + + Sets the number of dots which, when found in a name, causes + the first query to be without any search domain. + + @param ndots the new ndots parameter + */ +void evdns_search_ndots_set(const int ndots); + +/** + A callback that is invoked when a log message is generated + + @param is_warning indicates if the log message is a 'warning' + @param msg the content of the log message + */ +typedef void (*evdns_debug_log_fn_type)(int is_warning, const char *msg); + + +/** + Set the callback function to handle log messages. + + @param fn the callback to be invoked when a log message is generated + */ +void evdns_set_log_fn(evdns_debug_log_fn_type fn); + +#define DNS_NO_SEARCH 1 + +#ifdef __cplusplus +} +#endif + +/* + * Structures and functions used to implement a DNS server. + */ + +struct evdns_server_request { + int flags; + int nquestions; + struct evdns_server_question **questions; +}; +struct evdns_server_question { + int type; + int class; + char name[1]; +}; +typedef void (*evdns_request_callback_fn_type)(struct evdns_server_request *, void *); +#define EVDNS_ANSWER_SECTION 0 +#define EVDNS_AUTHORITY_SECTION 1 +#define EVDNS_ADDITIONAL_SECTION 2 + +#define EVDNS_TYPE_A 1 +#define EVDNS_TYPE_NS 2 +#define EVDNS_TYPE_CNAME 5 +#define EVDNS_TYPE_SOA 6 +#define EVDNS_TYPE_PTR 12 +#define EVDNS_TYPE_MX 15 +#define EVDNS_TYPE_TXT 16 +#define EVDNS_TYPE_AAAA 28 + +#define EVDNS_QTYPE_AXFR 252 +#define EVDNS_QTYPE_ALL 255 + +#define EVDNS_CLASS_INET 1 + +struct evdns_server_port *evdns_add_server_port(int socket, int is_tcp, evdns_request_callback_fn_type callback, void *user_data); +void evdns_close_server_port(struct evdns_server_port *port); + +int evdns_server_request_add_reply(struct evdns_server_request *req, int section, const char *name, int type, int class, int ttl, int datalen, int is_name, const char *data); +int evdns_server_request_add_a_reply(struct evdns_server_request *req, const char *name, int n, void *addrs, int ttl); +int evdns_server_request_add_aaaa_reply(struct evdns_server_request *req, const char *name, int n, void *addrs, int ttl); +int evdns_server_request_add_ptr_reply(struct evdns_server_request *req, struct in_addr *in, const char *inaddr_name, const char *hostname, int ttl); +int evdns_server_request_add_cname_reply(struct evdns_server_request *req, const char *name, const char *cname, int ttl); + +int evdns_server_request_respond(struct evdns_server_request *req, int err); +int evdns_server_request_drop(struct evdns_server_request *req); + +#endif // !EVENTDNS_H diff -ruN ../libevent.OLD/doxygen/event.h ./doxygen/event.h --- ../libevent.OLD/doxygen/event.h 1969-12-31 19:00:00.000000000 -0500 +++ ./doxygen/event.h 2007-04-30 22:24:20.000000000 -0400 @@ -0,0 +1,995 @@ +/* + * Copyright (c) 2000-2004 Niels Provos + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#ifndef _EVENT_H_ +#define _EVENT_H_ + +/** @mainpage + + @section intro Introduction + + libevent is an event notification library for developing scalable + network servers. The libevent API provides a mechanism to execute a callback function when a specific + event occurs on a file descriptor or after a timeout has been reached. Furthermore, + libevent also support callbacks due to signals or regular timeouts. + + libevent is meant to replace the event loop found in event driven network servers. An application just needs to call event_dispatch() and then add or remove events dynamically without having to change the event loop. + + Currently, libevent supports /dev/poll, kqueue(2), select(2), poll(2) and epoll(4). It also has experimental support for real-time signals. The internal event mechanism is completely independent of the exposed event API, and a simple update of libevent can provide new functionality without having to redesign the applications. As a result, Libevent allows for portable application development and provides the most scalable event notification mechanism available on an operating system. Libevent can also be used for multi-threaded aplications; see Steven Grimm's explanation. Libevent should compile on Linux, *BSD, Mac OS X, Solaris and Windows. + + @section usage Standard usage + + Every program that uses libevent must include the header, and pass the -levent flag to the linker. + Before using any of the functions in the library, you must call event_init() to perform + one-time initialization of the libevent library. + + @section event Event notification + + For each file descriptor that you wish to monitor, you must declare an event structure and call event_set() to initialize the members of the structure. + To enable notification, you add the structure + to the list of monitored events by calling event_add(). The + event structure must remain allocated as long as it is active, so it should be + allocated on the heap. Finally, you call event_dispatch() + to loop and dispatch events. + + @section bufferevent I/O Buffers + + libevent provides an abstraction on top of the regular event callbacks. This abstraction is called a buffered event. A buffered event provides input and output buffers that get filled and drained automatically. The user of a buffered event no longer deals directly with the I/O, but instead is reading from input and writing to output buffers. + +Once initialized via bufferevent_new(), the bufferevent structure can be used repeatedly with bufferevent_enable() and bufferevent_disable(). Instead of reading and writing directly to a socket, you would call bufferevent_read() and bufferevent_write(). + +When read enabled the bufferevent will try to read from the file descriptor and call the read callback. The write callback is executed whenever the output buffer is drained below the write low watermark, which is 0 by default. + + @section timers Timers + + libevent can also be used to create timers that invoke a callback after a + certain amount of time has expired. The evtimer_set() function prepares + an event struct to be used as a timer. To activate the timer, call evtimer_add(). Timers can be deactivated by calling evtimer_del(). + + @section timeouts Timeouts + + In addition to simple timers, libevent can assign timeout events to file + descriptors that are triggered whenever a certain amount of time has passed + with no activity on a file descriptor. The timeout_set() function initializes + an event struct for use as a timeout. Once initialized, the event must be + activated by using timeout_add(). To cancel the timeout, call timeout_del(). + + @section evdns Asynchronous DNS resolution + + libevent provides an asynchronous DNS resolver that should be used instead of the + standard DNS resolver functions. These functions can be imported by including + the header in your program. Before using any of the resolver functions, you must call evdns_init() to initialize the library. To convert a hostname to an IP address, you call + the evdns_resolve_ipv4() function. To perform a reverse lookup, you would call the + evdns_resolve_reverse() function. All of these functions use callbacks to avoid + blocking while the lookup is performed. + + @section evhttp Event-driven HTTP servers + + libevent provides a very simple event-driven HTTP server that can be embedded in your program + and used to service HTTP requests. + + To use this capability, you need to include the header in your program. + You create the server by calling evhttp_start() and providing the address and port to listen on. You then register one or more callbacks to handle incoming requests. Each URI can be assigned a callback via the evhttp_set_cb() function. A generic callback function can also be registered via evhttp_set_gencb(); this callback will be invoked if no other callbacks have been + registered for a given URI. + + @section api API Reference + + To browse the complete documentation of the libevent API, click on any of the following links. + + event.h + The primary libevent header + + evdns.h + Asynchronous DNS resolution + + evhttp.h + An embedded libevent-based HTTP server + + */ + +/** @file event.h + + A library for writing event-driven network servers + + */ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +#ifdef WIN32 +#define WIN32_LEAN_AND_MEAN +#include +#undef WIN32_LEAN_AND_MEAN +typedef unsigned char u_char; +typedef unsigned short u_short; +#endif + +#define EVLIST_TIMEOUT 0x01 +#define EVLIST_INSERTED 0x02 +#define EVLIST_SIGNAL 0x04 +#define EVLIST_ACTIVE 0x08 +#define EVLIST_INTERNAL 0x10 +#define EVLIST_INIT 0x80 + +/* EVLIST_X_ Private space: 0x1000-0xf000 */ +#define EVLIST_ALL (0xf000 | 0x9f) + +#define EV_TIMEOUT 0x01 +#define EV_READ 0x02 +#define EV_WRITE 0x04 +#define EV_SIGNAL 0x08 +#define EV_PERSIST 0x10 /* Persistant event */ + +/* Fix so that ppl dont have to run with */ +#ifndef TAILQ_ENTRY +#define _EVENT_DEFINED_TQENTRY +#define TAILQ_ENTRY(type) \ +struct { \ + struct type *tqe_next; /* next element */ \ + struct type **tqe_prev; /* address of previous next element */ \ +} +#endif /* !TAILQ_ENTRY */ +#ifndef RB_ENTRY +#define _EVENT_DEFINED_RBENTRY +#define RB_ENTRY(type) \ +struct { \ + struct type *rbe_left; /* left element */ \ + struct type *rbe_right; /* right element */ \ + struct type *rbe_parent; /* parent element */ \ + int rbe_color; /* node color */ \ +} +#endif /* !RB_ENTRY */ + +struct event_base; +struct event { + TAILQ_ENTRY (event) ev_next; + TAILQ_ENTRY (event) ev_active_next; + TAILQ_ENTRY (event) ev_signal_next; + RB_ENTRY (event) ev_timeout_node; + + struct event_base *ev_base; + int ev_fd; + short ev_events; + short ev_ncalls; + short *ev_pncalls; /* Allows deletes in callback */ + + struct timeval ev_timeout; + + int ev_pri; /* smaller numbers are higher priority */ + + void (*ev_callback)(int, short, void *arg); + void *ev_arg; + + int ev_res; /* result passed to event callback */ + int ev_flags; +}; + +#define EVENT_SIGNAL(ev) (int)(ev)->ev_fd +#define EVENT_FD(ev) (int)(ev)->ev_fd + +/* + * Key-Value pairs. Can be used for HTTP headers but also for + * query argument parsing. + */ +struct evkeyval { + TAILQ_ENTRY(evkeyval) next; + + char *key; + char *value; +}; + +#ifdef _EVENT_DEFINED_TQENTRY +#undef TAILQ_ENTRY +struct event_list; +struct evkeyvalq; +#undef _EVENT_DEFINED_TQENTRY +#else +TAILQ_HEAD (event_list, event); +TAILQ_HEAD (evkeyvalq, evkeyval); +#endif /* _EVENT_DEFINED_TQENTRY */ +#ifdef _EVENT_DEFINED_RBENTRY +#undef RB_ENTRY +#undef _EVENT_DEFINED_RBENTRY +#endif /* _EVENT_DEFINED_RBENTRY */ + +struct eventop { + char *name; + void *(*init)(struct event_base *); + int (*add)(void *, struct event *); + int (*del)(void *, struct event *); + int (*recalc)(struct event_base *, void *, int); + int (*dispatch)(struct event_base *, void *, struct timeval *); + void (*dealloc)(struct event_base *, void *); +}; + +#define TIMEOUT_DEFAULT {5, 0} + +/** + Initialize the event API. + + The event API needs to be initialized with event_init() before it can be + used. + */ +void *event_init(void); + + +/** + Loop to process events. + + In order to process events, an application needs to call + event_dispatch(). This function only returns on error, and should + replace the event core of the application program. + + @see event_base_dispatch() + */ +int event_dispatch(void); + + +/** + Threadsafe event dispatching loop. + + @param eb the event_base structure returned by event_init() + @see event_init(), event_dispatch() + */ +int event_base_dispatch(struct event_base *); + + +/** + Deallocate all memory associated with an event_base. + + @param eb an event_base to be freed + */ +void event_base_free(struct event_base *eb); + + +#define _EVENT_LOG_DEBUG 0 +#define _EVENT_LOG_MSG 1 +#define _EVENT_LOG_WARN 2 +#define _EVENT_LOG_ERR 3 +typedef void (*event_log_cb)(int severity, const char *msg); +void event_set_log_callback(event_log_cb cb); + +/** + Associate a different event base with an event. + + @param eb the event base + @param ev the event + */ +int event_base_set(struct event_base *eb, struct event *ev); + +/** A flag for event_loop() to indicate ... (FIXME) */ +#define EVLOOP_ONCE 0x01 + +/** A flag for event_loop() to indicate ... (FIXME) */ +#define EVLOOP_NONBLOCK 0x02 + +/** + Execute a single event. + + The event_loop() function provides an interface for single pass execution of pending + events. + + @param flags any combination of EVLOOP_ONCE | EVLOOP_NONBLOCK + @return 0 if successful, or -1 if an error occurred + @see event_loopexit(), event_base_loop() +*/ +int event_loop(int flags); + +/** + Execute a single event (threadsafe variant). + + The event_base_loop() function provides an interface for single pass execution of pending + events. + + @param eb the event_base structure returned by event_init() + @param flags any combination of EVLOOP_ONCE | EVLOOP_NONBLOCK + @return 0 if successful, or -1 if an error occurred + @see event_loopexit(), event_base_loop() + */ +int event_base_loop(struct event_base *eb, int flags); + +/** + Execute a single event, with a timeout. + + The event_loopexit() function is similar to event_loop(), + but allows the loop to be terminated after some amount of time has passed. + + @param tv the amount of time after which the loop should terminate. + @return 0 if successful, or -1 if an error occurred + @see event_loop(), event_base_loop(), event_base_loopexit() + */ +int event_loopexit(struct timeval *tv); + + +/** + Execute a single event, with a timeout (threadsafe variant). + + @param eb the event_base structure returned by event_init() + @param tv the amount of time after which the loop should terminate. + @return 0 if successful, or -1 if an error occurred + @see event_loopexit() + */ +int event_base_loopexit(struct event_base *eb, struct timeval *tv); + + +/** + Add a timer event. + + @param ev the event struct + @param tv timeval struct + */ +#define evtimer_add(ev, tv) event_add(ev, tv) + + +/** + Define a timer event. + + @param ev event struct to be modified + @param cb callback function + @param arg argument that will be passed to the callback function + */ +#define evtimer_set(ev, cb, arg) event_set(ev, -1, 0, cb, arg) + + +/** + * Delete a timer event. + * + * @param ev the event struct to be disabled + */ +#define evtimer_del(ev) event_del(ev) +#define evtimer_pending(ev, tv) event_pending(ev, EV_TIMEOUT, tv) +#define evtimer_initialized(ev) ((ev)->ev_flags & EVLIST_INIT) + +/** + * Add a timeout event. + * + * @param ev the event struct to be disabled + * @param tv the timeout value, in seconds + */ +#define timeout_add(ev, tv) event_add(ev, tv) + + +/** + * Define a timeout event. + * + * @param ev the event struct to be defined + * @param cb the callback to be invoked when the timeout expires + * @param arg the argument to be passed to the callback + */ +#define timeout_set(ev, cb, arg) event_set(ev, -1, 0, cb, arg) + + +/** + * Disable a timeout event. + * + * @param ev the timeout event to be disabled + */ +#define timeout_del(ev) event_del(ev) + +#define timeout_pending(ev, tv) event_pending(ev, EV_TIMEOUT, tv) +#define timeout_initialized(ev) ((ev)->ev_flags & EVLIST_INIT) + +#define signal_add(ev, tv) event_add(ev, tv) +#define signal_set(ev, x, cb, arg) \ + event_set(ev, x, EV_SIGNAL|EV_PERSIST, cb, arg) +#define signal_del(ev) event_del(ev) +#define signal_pending(ev, tv) event_pending(ev, EV_SIGNAL, tv) +#define signal_initialized(ev) ((ev)->ev_flags & EVLIST_INIT) + +/** + Prepare an event structure to be added. + + The function event_set() prepares the event structure ev to be used in future calls to + event_add() and event_del(). The event will be prepared to call the function specified + by the fn argument with an int argument indicating the file descriptor, a short argument + indicating the type of event, and a void * argument given in the arg argument. The fd + indicates the file descriptor that should be monitored for events. The events can be + either EV_READ, EV_WRITE, or both. Indicating that an application can read or write from + the file descriptor respectively without blocking. + + The function fn will be called with the file descriptor that triggered the event and the + type of event which will be either EV_TIMEOUT, EV_SIGNAL, EV_READ, or EV_WRITE. The + additional flag EV_PERSIST makes an event_add() persistent until event_del() has been + called. + + @param ev an event struct to be modified + @param fd the file descriptor to be monitored + @param event desired events to monitor; can be EV_READ and/or EV_WRITE + @param fn callback function to be invoked when the event occurs + @param arg an argument to be passed to the callback function + + @see event_add(), event_del(), event_once() + + */ +void event_set(struct event *, int, short, void (*)(int, short, void *), void *); + +/** + Schedule a one-time event to occur. + + The function event_once() is similar to event_set(). However, it schedules a callback to + be called exactly once and does not require the caller to prepare an event structure. + + @param fd a file descriptor to monitor + @param events event(s) to monitor; can be any of EV_TIMEOUT | EV_READ | EV_WRITE + @param callback callback function to be invoked when the event occurs + @param arg an argument to be passed to the callback function + @param timeout the maximum amount of time to wait for the event, or NULL to wait forever + @return 0 if successful, or -1 if an error occurred + @see event_set() + + */ +int event_once(int fd, short events, + void (*callback)(int, short, void *), void *arg, struct timeval *tv); + + +/** + Schedule a one-time event (threadsafe variant) + + The function event_base_once() is similar to event_set(). However, it schedules a + callback to be called exactly once and does not require the caller to prepare an + event structure. + + @param base an event_base returned by event_init() + @param fd a file descriptor to monitor + @param events event(s) to monitor; can be any of EV_TIMEOUT | EV_READ | EV_WRITE + @param callback callback function to be invoked when the event occurs + @param arg an argument to be passed to the callback function + @param timeout the maximum amount of time to wait for the event, or NULL to wait forever + @return 0 if successful, or -1 if an error occurred + @see event_once() + */ +int event_base_once(struct event_base *base, int fd, short events, + void (*callback)(int, short, void *), void *arg, struct timeval *tv); + + +/** + Add an event to the set of monitored events. + + The function event_add() schedules the execution of the ev event when the event specified + in event_set() occurs or in at least the time specified in the tv. If tv is NULL, no + timeout occurs and the function will only be called if a matching event occurs on the + file descriptor. The event in the ev argument must be already initialized by event_set() + and may not be used in calls to event_set() until it has timed out or been removed with + event_del(). If the event in the ev argument already has a scheduled timeout, the old + timeout will be replaced by the new one. + + @param ev an event struct initialized via event_set() + @param timeout the maximum amount of time to wait for the event, or NULL to wait forever + @return 0 if successful, or -1 if an error occurred + @see event_del(), event_set() + */ +int event_add(struct event *ev, struct timeval *tv); + + +/** + Remove an event from the set of monitored events. + + The function event_del() will cancel the event in the argument ev. If the event has + already executed or has never been added the call will have no effect. + + @param ev an event struct to be removed from the working set + @return 0 if successful, or -1 if an error occurred + @see event_add() + */ +int event_del(struct event *ev); + +void event_active(struct event *, int, short); + + +/** + + Checks if a specific event is pending or scheduled. + + @param ev an event struct previously passed to event_add() + @param event the requested event type; any of EV_TIMEOUT|EV_READ|EV_WRITE|EV_SIGNAL + @param tv an alternate timeout (FIXME - is this true?) + + @return 1 if the event is pending, or 0 if the event has not occurred + + */ +int event_pending(struct event *ev, short event, struct timeval *tv); + + +/** + Test if an event structure has been initialized. + + The event_initialized() macro can be used to check if an event has been initialized. + + @param ev an event structure to be tested + @return 1 if the structure has been initialized, or 0 if it has not been initialized + */ +#ifdef WIN32 +#define event_initialized(ev) ((ev)->ev_flags & EVLIST_INIT && (ev)->ev_fd != (int)INVALID_HANDLE_VALUE) +#else +#define event_initialized(ev) ((ev)->ev_flags & EVLIST_INIT) +#endif + + +/** + Get the libevent version number. + + @return a string containing the version number of libevent + */ +const char *event_get_version(void); + + +/** + Get the kernel event notification mechanism used by libevent. + + @return a string identifying the kernel event mechanism (kqueue, epoll, etc.) + */ +const char *event_get_method(void); + + +/** + Set the number of different event priorities. + + By default libevent schedules all active events with the same priority. However, some + time it is desirable to process some events with a higher priority than others. For that + reason, libevent supports strict priority queues. Active events with a lower priority + are always processed before events with a higher priority. + + The number of different priorities can be set initially with the event_priority_init() + function. This function should be called before the first call to event_dispatch(). The + event_priority_set() function can be used to assign a priority to an event. By default, + libevent assigns the middle priority to all events unless their priority is explicitly + set. + + @param npriorities the maximum number of priorities + @return 0 if successful, or -1 if an error occurred + @see event_base_priority_init(), event_priority_set() + + */ +int event_priority_init(int npriorities); + + +/** + Set the number of different event priorities (threadsafe variant). + + See the description of event_priority_init() for more information. + + @param eb the event_base structure returned by event_init() + @param npriorities the maximum number of priorities + @return 0 if successful, or -1 if an error occurred + @see event_priority_init(), event_priority_set() + */ +int event_base_priority_init(struct event_base *eb, int npriorities); + + +/** + Assign a priority to an event. + + @param ev an event struct + @param priority the new priority to be assigned + @return 0 if successful, or -1 if an error occurred + @see event_priority_init() + */ +int event_priority_set(struct event *ev, int priority); + + +/* These functions deal with buffering input and output */ + +struct evbuffer { + u_char *buffer; + u_char *orig_buffer; + + size_t misalign; + size_t totallen; + size_t off; + + void (*cb)(struct evbuffer *, size_t, size_t, void *); + void *cbarg; +}; + +/* Just for error reporting - use other constants otherwise */ +#define EVBUFFER_READ 0x01 +#define EVBUFFER_WRITE 0x02 +#define EVBUFFER_EOF 0x10 +#define EVBUFFER_ERROR 0x20 +#define EVBUFFER_TIMEOUT 0x40 + +struct bufferevent; +typedef void (*evbuffercb)(struct bufferevent *, void *); +typedef void (*everrorcb)(struct bufferevent *, short what, void *); + +struct event_watermark { + size_t low; + size_t high; +}; + +struct bufferevent { + struct event ev_read; + struct event ev_write; + + struct evbuffer *input; + struct evbuffer *output; + + struct event_watermark wm_read; + struct event_watermark wm_write; + + evbuffercb readcb; + evbuffercb writecb; + everrorcb errorcb; + void *cbarg; + + int timeout_read; /* in seconds */ + int timeout_write; /* in seconds */ + + short enabled; /* events that are currently enabled */ +}; + + +/** + Create a new bufferevent. + + libevent provides an abstraction on top of the regular event callbacks. + This abstraction is called a buffered event. A buffered event provides + input and output buffers that get filled and drained automatically. The + user of a buffered event no longer deals directly with the I/O, but + instead is reading from input and writing to output buffers. + + Once initialized, the bufferevent structure can be used repeatedly with + bufferevent_enable() and bufferevent_disable(). + + When read enabled the bufferevent will try to read from the file descriptor and + call the read callback. The write callback is executed whenever the output buffer + is drained below the write low watermark, which is 0 by default. + + If multiple bases are in use, bufferevent_base_set() must be called before enabling the + bufferevent for the first time. + + @param fd the file descriptor from which data is read and written to. + This file descriptor is not allowed to be a pipe(2). + @param readcb callback to invoke when there is data to be read, or NULL if no callback is desired + @param writecb callback to invoke when the file descriptor is ready for writing, or NULL if no callback is desired + @param errorcb callback to invoke when there is an error on the file descriptor + @param cbarg an argument that will be supplied to each of the callbacks (readcb, writecb, and errorcb) + @return a pointer to a newly allocated bufferevent struct, or NULL if an error occurred + @see bufferevent_base_set(), bufferevent_free() + */ +struct bufferevent *bufferevent_new(int fd, + evbuffercb readcb, evbuffercb writecb, everrorcb errorcb, void *cbarg); + + +/** + Assign a bufferevent to a specific event_base. + + @param base an event_base returned by event_init() + @param bufev a bufferevent struct returned by bufferevent_new() + @return 0 if successful, or -1 if an error occurred + @see bufferevent_new() + */ +int bufferevent_base_set(struct event_base *base, struct bufferevent *bufev); + + +/** + Assign a priority to a bufferevent. + + @param bufev a bufferevent struct + @param pri the priority to be assigned + @return 0 if successful, or -1 if an error occurred + */ +int bufferevent_priority_set(struct bufferevent *bufev, int pri); + + +/** + Deallocate the storage associated with a bufferevent structure. + + @param bufev the bufferevent structure to be freed. + */ +void bufferevent_free(struct bufferevent *bufev); + + +/** + Write data to a bufferevent buffer. + + The bufferevent_write() function can be used to write data to the file descriptor. The + data is appended to the output buffer and written to the descriptor automatically as it + becomes available for writing. + + @param bufev the bufferevent to be written to + @param data a pointer to the data to be written + @param size the length of the data, in bytes + @return 0 if successful, or -1 if an error occurred + @see bufferevent_write_buffer() + */ +int bufferevent_write(struct bufferevent *bufev, void *data, size_t size); + + +/** + Write data from an evbuffer to a bufferevent buffer. + + @param bufev the bufferevent to be written to + @param buf the evbuffer to be written + @return 0 if successful, or -1 if an error occurred + @see bufferevent_write() + */ +int bufferevent_write_buffer(struct bufferevent *bufev, struct evbuffer *buf); + + +/** + Read data from a bufferevent buffer. + + The bufferevent_read() function is used to read data from the input buffer. + + @param bufev the bufferevent to be read from + @param data pointer to a buffer that will store the data + @param size the size of the data buffer, in bytes + @return the amount of data read, in bytes. + */ +size_t bufferevent_read(struct bufferevent *bufev, void *data, size_t size); + +/** + Enable a bufferevent. + + @param bufev the bufferevent to be enabled + @param event any combination of EV_READ | EV_WRITE. + @return 0 if successful, or -1 if an error occurred + @see bufferevent_disable() + */ +int bufferevent_enable(struct bufferevent *bufev, short event); + + +/** + Disable a bufferevent. + + @param bufev the bufferevent to be disabled + @param event any combination of EV_READ | EV_WRITE. + @return 0 if successful, or -1 if an error occurred + @see bufferevent_enable() + */ +int bufferevent_disable(struct bufferevent *bufev, short event); + + +/** + Set the read and write timeout for a buffered event. + + @param bufev the bufferevent to be modified + @param timeout_read the read timeout + @param timeout_write the write timeout + */ +void bufferevent_settimeout(struct bufferevent *bufev, + int timeout_read, int timeout_write); + + +#define EVBUFFER_LENGTH(x) (x)->off +#define EVBUFFER_DATA(x) (x)->buffer +#define EVBUFFER_INPUT(x) (x)->input +#define EVBUFFER_OUTPUT(x) (x)->output + + +/** + Allocate storage for a new evbuffer. + + @return a pointer to a newly allocated evbuffer struct, or NULL if an error occurred + */ +struct evbuffer *evbuffer_new(void); + + +/** + Deallocate storage for an evbuffer. + + @param pointer to the evbuffer to be freed + */ +void evbuffer_free(struct evbuffer *buffer); + + +/** + Expands the available space in an event buffer. + + Expands the available space in the event buffer to at least datlen + + @param buf the event buffer to be expanded + @param datlen the new minimum length requirement + @return 0 if successful, or -1 if an error occurred +*/ +int evbuffer_expand(struct evbuffer *buf, size_t datlen); + + +/** + Append data to the end of an evbuffer. + + @param buf the event buffer to be appended to + @param data pointer to the beginning of the data buffer + @param datlen the number of bytes to be copied from the data buffer + */ +int evbuffer_add(struct evbuffer *buf, const void *data, size_t datlen); + + + +/** + Read data from an event buffer and drain the bytes read. + + @param buf the event buffer to be read from + @param data the destination buffer to store the result + @param datlen the maximum size of the destination buffer + @return the number of bytes read + */ +int evbuffer_remove(struct evbuffer *buf, void *data, size_t datlen); + + +/** + * Read a single line from an event buffer. + * + * Reads a line terminated by either '\r\n', '\n\r' or '\r' or '\n'. + * The returned buffer needs to be freed by the caller. + * + * @param buffer the evbuffer to read from + * @return pointer to a single line, or NULL if an error occurred + */ +char *evbuffer_readline(struct evbuffer *); + + +/** + Move data from one evbuffer into another evbuffer. + + This is a destructive add. The data from one buffer moves into + the other buffer. The destination buffer is expanded as needed. + + @param outbuf the output buffer + @param inbuf the input buffer + @return 0 if successful, or -1 if an error occurred + */ +int evbuffer_add_buffer(struct evbuffer *outbuf, struct evbuffer *inbuf); + + +/** + Append a formatted string to the end of an evbuffer. + + @param buf the evbuffer that will be appended to + @param fmt a format string + @param ... arguments that will be passed to printf(3) + @return 0 if successful, or -1 if an error occurred + */ +int evbuffer_add_printf(struct evbuffer *buf, const char *fmt, ...); + + +/** + Append a va_list formatted string to the end of an evbuffer. + + @param buf the evbuffer that will be appended to + @param fmt a format string + @param ap a varargs va_list argument array that will be passed to vprintf(3) + @return 0 if successful, or -1 if an error occurred + */ +int evbuffer_add_vprintf(struct evbuffer *, const char *fmt, va_list ap); + + +/** + Remove a specified number of bytes data from the beginning of an evbuffer. + + @param buf the evbuffer to be drained + @param len the number of bytes to drain from the beginning of the buffer + @return 0 if successful, or -1 if an error occurred + */ +void evbuffer_drain(struct evbuffer *buf, size_t len); + + +/** + Write the contents of an evbuffer to a file descriptor. + + The evbuffer will be drained after the bytes have been successfully written. + + @param buffer the evbuffer to be written and drained + @param fd the file descriptor to be written to + @return the number of bytes written, or -1 if an error occurred + @see evbuffer_read() + */ +int evbuffer_write(struct evbuffer *buffer, int fd); + + +/** + Read from a file descriptor and store the result in an evbuffer. + + @param buf the evbuffer to store the result + @param fd the file descriptor to read from + @param howmuch the number of bytes to be read + @return the number of bytes read, or -1 if an error occurred + @see evbuffer_write() + */ +int evbuffer_read(struct evbuffer *buf, int fd, int howmuch); + + +/** + Find a string within an evbuffer. + + @param buffer the evbuffer to be searched + @param what the string to be searched for + @param len the length of the search string + @return a pointer to the beginning of the search string, or NULL if the search failed. + */ +u_char *evbuffer_find(struct evbuffer *buffer, const u_char *what, size_t len); + +/** + Set a callback to invoke when the evbuffer is modified. + + @param buffer the evbuffer to be monitored + @param cb the callback function to invoke when the evbuffer is modified + @param cbarg an argument to be provided to the callback function + */ +void evbuffer_setcb(struct evbuffer *buffer, void (*cb)(struct evbuffer *, size_t, size_t, void *), void *cbarg); + +/* + * Marshaling tagged data - We assume that all tags are inserted in their + * numeric order - so that unknown tags will always be higher than the + * known ones - and we can just ignore the end of an event buffer. + */ + +void evtag_init(void); + +void evtag_marshal(struct evbuffer *evbuf, u_int8_t tag, const void *data, + u_int32_t len); + +/** + Encode an integer and store it in an evbuffer. + + We encode integer's by nibbles; the first nibble contains the number + of significant nibbles - 1; this allows us to encode up to 64-bit + integers. This function is byte-order independent. + + @param evbuf evbuffer to store the encoded number + @param number a 32-bit integer + */ +void encode_int(struct evbuffer *evbuf, u_int32_t number); + +void evtag_marshal_int(struct evbuffer *evbuf, u_int8_t tag, + u_int32_t integer); + +void evtag_marshal_string(struct evbuffer *buf, u_int8_t tag, + const char *string); + +void evtag_marshal_timeval(struct evbuffer *evbuf, u_int8_t tag, + struct timeval *tv); + +void evtag_test(void); + +int evtag_unmarshal(struct evbuffer *src, u_int8_t *ptag, + struct evbuffer *dst); +int evtag_peek(struct evbuffer *evbuf, u_int8_t *ptag); +int evtag_peek_length(struct evbuffer *evbuf, u_int32_t *plength); +int evtag_payload_length(struct evbuffer *evbuf, u_int32_t *plength); +int evtag_consume(struct evbuffer *evbuf); + +int evtag_unmarshal_int(struct evbuffer *evbuf, u_int8_t need_tag, + u_int32_t *pinteger); + +int evtag_unmarshal_fixed(struct evbuffer *src, u_int8_t need_tag, void *data, + size_t len); + +int evtag_unmarshal_string(struct evbuffer *evbuf, u_int8_t need_tag, + char **pstring); + +int evtag_unmarshal_timeval(struct evbuffer *evbuf, u_int8_t need_tag, + struct timeval *ptv); + +#ifdef __cplusplus +} +#endif + +#endif /* _EVENT_H_ */ diff -ruN ../libevent.OLD/doxygen/evhttp.h ./doxygen/evhttp.h --- ../libevent.OLD/doxygen/evhttp.h 1969-12-31 19:00:00.000000000 -0500 +++ ./doxygen/evhttp.h 2007-04-30 22:24:20.000000000 -0400 @@ -0,0 +1,298 @@ +/* + * Copyright (c) 2000-2004 Niels Provos + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#ifndef _EVHTTP_H_ +#define _EVHTTP_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef WIN32 +#define WIN32_LEAN_AND_MEAN +#include +#include +#undef WIN32_LEAN_AND_MEAN +#endif + +/** @file evhttp.h + * + * Basic support for HTTP serving. + * + * As libevent is a library for dealing with event notification and most + * interesting applications are networked today, I have often found the + * need to write HTTP code. The following prototypes and definitions provide + * an application with a minimal interface for making HTTP requests and for + * creating a very simple HTTP server. + */ + +/* Response codes */ +#define HTTP_OK 200 +#define HTTP_NOCONTENT 204 +#define HTTP_MOVEPERM 301 +#define HTTP_MOVETEMP 302 +#define HTTP_NOTMODIFIED 304 +#define HTTP_BADREQUEST 400 +#define HTTP_NOTFOUND 404 +#define HTTP_SERVUNAVAIL 503 + +struct evhttp; +struct evhttp_request; +struct evkeyvalq; + + +/** + * Start an HTTP server on the specified address and port. + * + * @param address a string containing the IP address to listen(2) on + * @param port the port number to listen on + * @return a newly allocated evhttp struct + * @see evhttp_free() + */ +struct evhttp *evhttp_start(const char *address, u_short port); + + +/** + * Free the previously create HTTP server. + * + * Works only if no requests are currently being served. + * + * @param http the evhttp server object to be freed + * @see evhttp_start() + */ +void evhttp_free(struct evhttp* http); + + +/** Set a callback for a specified URI */ +void evhttp_set_cb(struct evhttp *, const char *, + void (*)(struct evhttp_request *, void *), void *); + +/** Set a callback for all requests that are not caught by specific callbacks */ +void evhttp_set_gencb(struct evhttp *, + void (*)(struct evhttp_request *, void *), void *); + + +/** + * Set the timeout for an HTTP request. + * + * @param http an evhttp object + * @param timeout_in_secs the timeout, in seconds + */ +void evhttp_set_timeout(struct evhttp *http, int timeout_in_secs); + +/** Request/Response functionality */ + + +/** + * Send an HTML error message to the client. + * + * @param req a request object + * @param error the HTTP error code + * @param reason a brief explanation of the error + */ +void evhttp_send_error(struct evhttp_request *req, int error, const char *reason); + + +/** + * Send an HTML reply to the client. + * + * @param req a request object + * @param code the HTTP response code to send + * @param reason a brief message to send with the response code + * @param databuf the body of the response + */ +void evhttp_send_reply(struct evhttp_request *req, int code, const char *reason, + struct evbuffer *databuf); + + +/* Low-level response interface, for streaming/chunked replies */ +void evhttp_send_reply_start(struct evhttp_request *, int, const char *); +void evhttp_send_reply_chunk(struct evhttp_request *, struct evbuffer *); +void evhttp_send_reply_end(struct evhttp_request *); + +/* Interfaces for making requests */ +enum evhttp_cmd_type { EVHTTP_REQ_GET, EVHTTP_REQ_POST, EVHTTP_REQ_HEAD }; + +enum evhttp_request_kind { EVHTTP_REQUEST, EVHTTP_RESPONSE }; + +/** + * the request structure that a server receives. + * WARNING: expect this structure to change. I will try to provide + * reasonable accessors. + */ +struct evhttp_request { + TAILQ_ENTRY(evhttp_request) next; + + /* the connection object that this request belongs to */ + struct evhttp_connection *evcon; + int flags; +#define EVHTTP_REQ_OWN_CONNECTION 0x0001 +#define EVHTTP_PROXY_REQUEST 0x0002 + + struct evkeyvalq *input_headers; + struct evkeyvalq *output_headers; + + /* address of the remote host and the port connection came from */ + char *remote_host; + u_short remote_port; + + enum evhttp_request_kind kind; + enum evhttp_cmd_type type; + + char *uri; /* uri after HTTP request was parsed */ + + char major; /* HTTP Major number */ + char minor; /* HTTP Minor number */ + + int got_firstline; + int response_code; /* HTTP Response code */ + char *response_code_line; /* Readable response */ + + struct evbuffer *input_buffer; /* read data */ + int ntoread; + int chunked; + + struct evbuffer *output_buffer; /* outgoing post or data */ + + /* Callback */ + void (*cb)(struct evhttp_request *, void *); + void *cb_arg; + + /* + * Chunked data callback - call for each completed chunk if + * specified. If not specified, all the data is delivered via + * the regular callback. + */ + void (*chunk_cb)(struct evhttp_request *, void *); +}; + +/** + * Creates a new request object that needs to be filled in with the request + * parameters. The callback is executed when the request completed or an + * error occurred. + */ +struct evhttp_request *evhttp_request_new( + void (*cb)(struct evhttp_request *, void *), void *arg); + +/** enable delivery of chunks to requestor */ +void evhttp_request_set_chunked_cb(struct evhttp_request *, + void (*cb)(struct evhttp_request *, void *)); + +/** Frees the request object and removes associated events. */ +void evhttp_request_free(struct evhttp_request *req); + +/** + * A connection object that can be used to for making HTTP requests. The + * connection object tries to establish the connection when it is given an + * http request object. + */ +struct evhttp_connection *evhttp_connection_new( + const char *address, unsigned short port); + +/** Frees an http connection */ +void evhttp_connection_free(struct evhttp_connection *evcon); + +/** Sets the timeout for events related to this connection */ +void evhttp_connection_set_timeout(struct evhttp_connection *evcon, + int timeout_in_secs); + +/** Sets the retry limit for this connection - -1 repeats indefnitely */ +void evhttp_connection_set_retries(struct evhttp_connection *evcon, + int retry_max); + +/** Set a callback for connection close. */ +void evhttp_connection_set_closecb(struct evhttp_connection *evcon, + void (*)(struct evhttp_connection *, void *), void *); + +/** Get the remote address and port associated with this connection. */ +void evhttp_connection_get_peer(struct evhttp_connection *evcon, + char **address, u_short *port); + +/** The connection gets ownership of the request */ +int evhttp_make_request(struct evhttp_connection *evcon, + struct evhttp_request *req, + enum evhttp_cmd_type type, const char *uri); + +const char *evhttp_request_uri(struct evhttp_request *req); + +/* Interfaces for dealing with HTTP headers */ + +const char *evhttp_find_header(const struct evkeyvalq *, const char *); +int evhttp_remove_header(struct evkeyvalq *, const char *); +int evhttp_add_header(struct evkeyvalq *, const char *, const char *); +void evhttp_clear_headers(struct evkeyvalq *); + +/* Miscellaneous utility functions */ + + +/** + Helper function to encode a URI. + + The returned string must be freed by the caller. + + @param uri an unencoded URI + @return a newly allocated URI-encoded string + */ +char *evhttp_encode_uri(const char *uri); + + +/** + Helper function to decode a URI. + + The returned string must be freed by the caller. + + @param uri an encoded URI + @return a newly allocated unencoded URI + */ +char *evhttp_decode_uri(const char *uri); + + +/** + * Helper function to parse out arguments in a query. + * The arguments are separated by key and value. + * URI should already be decoded. + */ +void evhttp_parse_query(const char *uri, struct evkeyvalq *); + + +/** + * Escape HTML character entities in a string. + * + * Replaces <, >, ", ' and & with <, >, ", + * ' and & correspondingly. + * + * The returned string needs to be freed by the caller. + * + * @param html an unescaped HTML string + * @return an escaped HTML string + */ +char *evhttp_htmlescape(const char *html); + +#ifdef __cplusplus +} +#endif + +#endif /* _EVHTTP_H_ */ diff -ruN ../libevent.OLD/Makefile.am ./Makefile.am --- ../libevent.OLD/Makefile.am 2007-04-30 22:23:48.000000000 -0400 +++ ./Makefile.am 2007-04-30 22:27:08.000000000 -0400 @@ -8,6 +8,7 @@ event.3 \ kqueue.c epoll_sub.c epoll.c select.c rtsig.c poll.c signal.c \ evport.c devpoll.c event_rpcgen.py \ + doxygen/evhttp.h doxygen/Doxyfile doxygen/evdns.h doxygen/event.h \ sample/Makefile.am sample/Makefile.in sample/event-test.c \ sample/signal-test.c sample/time-test.c \ test/Makefile.am test/Makefile.in test/bench.c test/regress.c \