X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Futil.c;h=8379c9ac5e9f99d214e6171ab2ea30b4f8cbe5f8;hb=58cb487b92ab039bd0c3ce5e4b4b5c7063c44476;hp=f784f0399fd6d7b10c5962f88052958529b38c74;hpb=71d7c22f54ae32d15133571e09ddf7ab435e8afa;p=sliver-openvswitch.git diff --git a/lib/util.c b/lib/util.c index f784f0399..8379c9ac5 100644 --- a/lib/util.c +++ b/lib/util.c @@ -16,8 +16,11 @@ #include #include "util.h" +#include #include +#include #include +#include #include #include #include @@ -30,11 +33,12 @@ VLOG_DEFINE_THIS_MODULE(util); COVERAGE_DEFINE(util_xalloc); const char *program_name; +static char *program_version; void out_of_memory(void) { - ovs_fatal(0, "virtual memory exhausted"); + ovs_abort(0, "virtual memory exhausted"); } void * @@ -171,32 +175,74 @@ ovs_strzcpy(char *dst, const char *src, size_t size) } } +/* Prints 'format' on stderr, formatting it like printf() does. If 'err_no' is + * nonzero, then it is formatted with ovs_retval_to_string() and appended to + * the message inside parentheses. Then, terminates with abort(). + * + * This function is preferred to ovs_fatal() in a situation where it would make + * sense for a monitoring process to restart the daemon. + * + * 'format' should not end with a new-line, because this function will add one + * itself. */ void -ovs_fatal(int err_no, const char *format, ...) +ovs_abort(int err_no, const char *format, ...) { va_list args; - fprintf(stderr, "%s: ", program_name); va_start(args, format); - vfprintf(stderr, format, args); + ovs_error_valist(err_no, format, args); va_end(args); - if (err_no != 0) - fprintf(stderr, " (%s)", ovs_retval_to_string(err_no)); - putc('\n', stderr); + abort(); +} + +/* Prints 'format' on stderr, formatting it like printf() does. If 'err_no' is + * nonzero, then it is formatted with ovs_retval_to_string() and appended to + * the message inside parentheses. Then, terminates with EXIT_FAILURE. + * + * 'format' should not end with a new-line, because this function will add one + * itself. */ +void +ovs_fatal(int err_no, const char *format, ...) +{ + va_list args; + + va_start(args, format); + ovs_fatal_valist(err_no, format, args); +} + +/* Same as ovs_fatal() except that the arguments are supplied as a va_list. */ +void +ovs_fatal_valist(int err_no, const char *format, va_list args) +{ + ovs_error_valist(err_no, format, args); exit(EXIT_FAILURE); } +/* Prints 'format' on stderr, formatting it like printf() does. If 'err_no' is + * nonzero, then it is formatted with ovs_retval_to_string() and appended to + * the message inside parentheses. + * + * 'format' should not end with a new-line, because this function will add one + * itself. */ void ovs_error(int err_no, const char *format, ...) { - int save_errno = errno; va_list args; - fprintf(stderr, "%s: ", program_name); va_start(args, format); - vfprintf(stderr, format, args); + ovs_error_valist(err_no, format, args); va_end(args); +} + +/* Same as ovs_error() except that the arguments are supplied as a va_list. */ +void +ovs_error_valist(int err_no, const char *format, va_list args) +{ + int save_errno = errno; + + fprintf(stderr, "%s: ", program_name); + vfprintf(stderr, format, args); if (err_no != 0) { fprintf(stderr, " (%s)", ovs_retval_to_string(err_no)); } @@ -232,21 +278,41 @@ ovs_retval_to_string(int retval) return unknown; } -/* Sets program_name based on 'argv0'. Should be called at the beginning of - * main(), as "set_program_name(argv[0]);". */ -void set_program_name(const char *argv0) +/* Sets global "program_name" and "program_version" variables. Should + * be called at the beginning of main() with "argv[0]" as the argument + * to 'argv0'. + * + * The 'date' and 'time' arguments should likely be called with + * "__DATE__" and "__TIME__" to use the time the binary was built. + * Alternatively, the "set_program_name" macro may be called to do this + * automatically. + */ +void +set_program_name__(const char *argv0, const char *date, const char *time) { const char *slash = strrchr(argv0, '/'); program_name = slash ? slash + 1 : argv0; + + free(program_version); + program_version = xasprintf("%s (Open vSwitch) "VERSION BUILDNR"\n" + "Compiled %s %s\n", + program_name, date, time); +} + +/* Returns a pointer to a string describing the program version. The + * caller must not modify or free the returned string. + */ +const char * +get_program_version(void) +{ + return program_version; } /* Print the version information for the program. */ void -ovs_print_version(char *date, char *time, - uint8_t min_ofp, uint8_t max_ofp) +ovs_print_version(uint8_t min_ofp, uint8_t max_ofp) { - printf("%s (Open vSwitch) "VERSION BUILDNR"\n", program_name); - printf("Compiled %s %s\n", date, time); + printf("%s", program_version); if (min_ofp || max_ofp) { printf("OpenFlow versions %#x:%#x\n", min_ofp, max_ofp); } @@ -554,3 +620,116 @@ abs_file_name(const char *dir, const char *file_name) * its return value. (Note that every scalar type can be implicitly * converted to bool.) */ void ignore(bool x OVS_UNUSED) { } + +/* Returns an appropriate delimiter for inserting just before the 0-based item + * 'index' in a list that has 'total' items in it. */ +const char * +english_list_delimiter(size_t index, size_t total) +{ + return (index == 0 ? "" + : index < total - 1 ? ", " + : total > 2 ? ", and " + : " and "); +} + +/* Given a 32 bit word 'n', calculates floor(log_2('n')). This is equivalent + * to finding the bit position of the most significant one bit in 'n'. It is + * an error to call this function with 'n' == 0. */ +int +log_2_floor(uint32_t n) +{ + assert(n); + +#if !defined(UINT_MAX) || !defined(UINT32_MAX) +#error "Someone screwed up the #includes." +#elif __GNUC__ >= 4 && UINT_MAX == UINT32_MAX + return 31 - __builtin_clz(n); +#else + { + int log = 0; + +#define BIN_SEARCH_STEP(BITS) \ + if (n >= (1 << BITS)) { \ + log += BITS; \ + n >>= BITS; \ + } + BIN_SEARCH_STEP(16); + BIN_SEARCH_STEP(8); + BIN_SEARCH_STEP(4); + BIN_SEARCH_STEP(2); + BIN_SEARCH_STEP(1); +#undef BIN_SEARCH_STEP + return log; + } +#endif +} + +/* Given a 32 bit word 'n', calculates ceil(log_2('n')). It is an error to + * call this function with 'n' == 0. */ +int +log_2_ceil(uint32_t n) +{ + return log_2_floor(n) + !IS_POW2(n); +} + +/* Returns the number of trailing 0-bits in 'n', or 32 if 'n' is 0. */ +int +ctz(uint32_t n) +{ + if (!n) { + return 32; + } else { +#if !defined(UINT_MAX) || !defined(UINT32_MAX) +#error "Someone screwed up the #includes." +#elif __GNUC__ >= 4 && UINT_MAX == UINT32_MAX + return __builtin_ctz(n); +#else + unsigned int k; + int count = 31; + +#define CTZ_STEP(X) \ + k = n << (X); \ + if (k) { \ + count -= X; \ + n = k; \ + } + CTZ_STEP(16); + CTZ_STEP(8); + CTZ_STEP(4); + CTZ_STEP(2); + CTZ_STEP(1); +#undef CTZ_STEP + + return count; +#endif + } +} + +/* Returns true if the 'n' bytes starting at 'p' are zeros. */ +bool +is_all_zeros(const uint8_t *p, size_t n) +{ + size_t i; + + for (i = 0; i < n; i++) { + if (p[i] != 0x00) { + return false; + } + } + return true; +} + +/* Returns true if the 'n' bytes starting at 'p' are 0xff. */ +bool +is_all_ones(const uint8_t *p, size_t n) +{ + size_t i; + + for (i = 0; i < n; i++) { + if (p[i] != 0xff) { + return false; + } + } + return true; +} +