X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=include%2Fvlog.h;h=f2641b092e28d0431f69b81e536458dbd9ed79a9;hb=9630e4100553c3531605aa44db65e9eaafe07dad;hp=f47324b85b6e80a148dd5beefb3cb6ac48538279;hpb=468e00132f76a6d057da1520873e7a468ccae422;p=sliver-openvswitch.git diff --git a/include/vlog.h b/include/vlog.h index f47324b85..f2641b092 100644 --- a/include/vlog.h +++ b/include/vlog.h @@ -1,22 +1,34 @@ -/* Copyright (C) 2007 Board of Trustees, Leland Stanford Jr. University. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. +/* Copyright (c) 2008 The Board of Trustees of The Leland Stanford + * Junior University + * + * We are making the OpenFlow specification and associated documentation + * (Software) available for public use and benefit with the expectation + * that others will use, modify and enhance the Software and contribute + * those enhancements back to the community. However, since we would + * like to make the Software available for broadest use, with as few + * restrictions as possible permission is hereby granted, free of + * charge, to any person obtaining a copy of this Software to deal in + * the Software under the copyrights without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * The name and trademarks of copyright holder(s) may NOT be used in + * advertising or publicity pertaining to the Software or any + * derivatives without specific, written prior permission. */ #ifndef VLOG_H @@ -49,18 +61,34 @@ enum vlog_facility vlog_get_facility_val(const char *name); /* Modules that can emit log messages. */ #define VLOG_MODULES \ + VLOG_MODULE(chain) \ VLOG_MODULE(controller) \ VLOG_MODULE(ctlpath) \ + VLOG_MODULE(daemon) \ + VLOG_MODULE(datapath) \ + VLOG_MODULE(dhcp) \ + VLOG_MODULE(dhcp_client) \ VLOG_MODULE(dpif) \ VLOG_MODULE(dpctl) \ VLOG_MODULE(fault) \ VLOG_MODULE(flow) \ + VLOG_MODULE(learning_switch) \ + VLOG_MODULE(mac_learning) \ + VLOG_MODULE(netdev) \ VLOG_MODULE(netlink) \ + VLOG_MODULE(ofp_discover) \ + VLOG_MODULE(poll_loop) \ VLOG_MODULE(secchan) \ + VLOG_MODULE(rconn) \ + VLOG_MODULE(switch) \ VLOG_MODULE(socket_util) \ VLOG_MODULE(vconn_netlink) \ VLOG_MODULE(vconn_tcp) \ + VLOG_MODULE(vconn_ssl) \ + VLOG_MODULE(vconn_stream) \ + VLOG_MODULE(vconn_unix) \ VLOG_MODULE(vconn) \ + VLOG_MODULE(vlog) \ /* VLM_ constant for each vlog module. */ enum vlog_module { @@ -79,6 +107,7 @@ enum vlog_level vlog_get_level(enum vlog_module, enum vlog_facility); void vlog_set_levels(enum vlog_module, enum vlog_facility, enum vlog_level); char *vlog_set_levels_from_string(const char *); char *vlog_get_levels(void); +bool vlog_is_enabled(enum vlog_module, enum vlog_level); void vlog_set_verbosity(const char *arg); /* Function for actual logging. */ @@ -90,11 +119,20 @@ void vlog(enum vlog_module, enum vlog_level, const char *format, ...) /* Convenience macros. To use these, define THIS_MODULE as a macro that * expands to the module used by the current source file, e.g. * #include "vlog.h" - * #define THIS_MODULE VLM_NETLINK + * #define THIS_MODULE VLM_netlink + * Guaranteed to preserve errno. */ #define VLOG_EMER(...) vlog(THIS_MODULE, VLL_EMER, __VA_ARGS__) #define VLOG_ERR(...) vlog(THIS_MODULE, VLL_ERR, __VA_ARGS__) #define VLOG_WARN(...) vlog(THIS_MODULE, VLL_WARN, __VA_ARGS__) #define VLOG_DBG(...) vlog(THIS_MODULE, VLL_DBG, __VA_ARGS__) +/* More convenience macros, for testing whether a given level is enabled in + * THIS_MODULE. When constructing a log message is expensive, this enables it + * to be skipped. */ +#define VLOG_IS_EMER_ENABLED() true +#define VLOG_IS_ERR_ENABLED() vlog_is_enabled(THIS_MODULE, VLL_EMER) +#define VLOG_IS_WARN_ENABLED() vlog_is_enabled(THIS_MODULE, VLL_WARN) +#define VLOG_IS_DBG_ENABLED() vlog_is_enabled(THIS_MODULE, VLL_DBG) + #endif /* vlog.h */