Sat, 22 Oct 2016 11:27:39 +0200
improves logging
replaces some printf calls with log_ereport
in non-daemon mode, log output is also written to stdout
/* * 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 <ucx/map.h> #include "event.h" UcxMap *event_handler_map = NULL; int numevhandlers = 0; event_handler_t *default_event_handler = NULL; event_handler_t *last_handler_c = NULL; int create_event_handler(EventHandlerConfig *cfg) { if(event_handler_map == NULL) { event_handler_map = ucx_map_new(16); } /* if the event handler already exists, we don't modify it */ if(ucx_map_sstr_get(event_handler_map, cfg->name)) { /* TODO: log message */ /* TODO: set reload status */ return 1; } /* create new handler */ event_handler_t *e = evhandler_create(cfg->nthreads); if(e == NULL) { return 1; } if(cfg->isdefault) { if(default_event_handler) { /* there can be only one default event handler */ /* TODO: log warning */ } default_event_handler = e; } int ret = ucx_map_sstr_put(event_handler_map, cfg->name, e); if(ret == 0) { last_handler_c = e; numevhandlers++; } return ret; } /* * checks if there is at least one event handler and a default handler * if necessary, check_event_handler_cfg() creates a default event handler */ int check_event_handler_cfg() { if(numevhandlers > 0 ) { if(default_event_handler) { return 0; } else { default_event_handler = last_handler_c; return 0; } } EventHandlerConfig cfg; cfg.name = sstr("default"); cfg.nthreads = 1; cfg.isdefault = 1; return create_event_handler(&cfg); } event_handler_t* get_default_event_handler() { return default_event_handler; } event_handler_t* get_event_handler(char *name) { return ucx_map_cstr_get(event_handler_map, name); }