Sat, 21 Jan 2017 15:31:17 +0100
adds more error handling and logging to send_cgi
/* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright 2013 Olaf Wintermann. 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. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR CONTRIBUTORS 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. */ #include <stdio.h> #include <stdlib.h> #include <atomic.h> #include "event_solaris.h" event_handler_t* evhandler_create(int numthreads) { event_handler_t *ev = malloc(sizeof(event_handler_t)); if(ev == NULL) { return NULL; } ev->ports = calloc(numthreads, sizeof(int)); if(ev->ports == NULL) { free(ev); return NULL; } ev->nports = numthreads; ev->lp = 0; /* create ports event threads */ for(int i=0;i<numthreads;i++) { /* create port */ ev->ports[i] = port_create(); if(ev->ports[i] == 0) { free(ev->ports); free(ev); return NULL; } /* * start a new handler thread * the thread needs the event port and a pointer to the event handler */ ev_thr_conf_t *conf = malloc(sizeof(ev_thr_conf_t)); if(conf == NULL) { free(ev->ports); free(ev); return NULL; } conf->handler = ev; conf->port = ev->ports[i]; systhread_start(0, 0, (thrstartfunc)ev_handle_events, conf); // TODO: error handling } return ev; } void ev_handle_events(ev_thr_conf_t *conf) { event_handler_t *ev = conf->handler; int port = conf->port; free(conf); port_event_t events[16]; struct timespec timeout; timeout.tv_nsec = 0; timeout.tv_sec = 600; for(;;) { // wait for events uint_t nev = 1; int ret = port_getn(port, events, 16, &nev, &timeout); if(ret == -1) { // TODO: check for error perror("port_getn"); continue; } for(int i=0;i<nev;i++) { event_t *event = events[i].portev_user; if(event->fn) { int saved_ev = event->poll; if(event->fn(ev, event)) { /* * on solaris we have to reassociate the fd after * each event * we do this if the event function returns 1 */ if(event->poll != saved_ev) { // event type changed int ne = 0; if((event->poll & EVENT_POLLIN) == EVENT_POLLIN) { ne |= POLLIN; } if((event->poll & EVENT_POLLOUT) == EVENT_POLLOUT) { ne |= POLLOUT; } } if(ev_poll(ev, event)) { perror("port_associate"); } } else if(event->finish) { event->finish(ev, event); } } } } } // returns a event handler port int ev_get_port(event_handler_t *h) { int nps = h->nports; if(nps == 1) { return h->ports[0]; } int cp = h->lp % nps; atomic_inc_32(&h->lp); return h->ports[cp]; } int ev_pollin(event_handler_t *h, int fd, event_t *event) { event->object = (intptr_t)fd; event->events = POLLIN; event->poll = EVENT_POLLIN; return port_associate( ev_get_port(h), PORT_SOURCE_FD, (uintptr_t)fd, POLLIN, event); } int ev_pollout(event_handler_t *h, int fd, event_t *event) { event->object = (intptr_t)fd; event->events = POLLOUT; event->poll EVENT_POLLOUT; return port_associate( ev_get_port(h), PORT_SOURCE_FD, (uintptr_t)fd, POLLOUT, event); } int ev_poll(event_handler_t *h, event_t *event) { return port_associate( ev_get_port(h), PORT_SOURCE_FD, event->object, event->events, event); } int evt_send(event_handler_t *h, event_t *event) { event->object = 0; return port_send(ev_get_port(h), 0, event); }