X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fpoll-loop.c;h=ea00d265af1d87411af8fdf4ec621c7cade298e4;hb=f80022d9df98d29ee41176a4bc6cb91025da84b8;hp=fca1dfa46c0410cbdbd762644fa41ce3b48f1293;hpb=cb22974d773942d66da42b700b8bca0db27a0920;p=sliver-openvswitch.git diff --git a/lib/poll-loop.c b/lib/poll-loop.c index fca1dfa46..ea00d265a 100644 --- a/lib/poll-loop.c +++ b/lib/poll-loop.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc. + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -165,8 +165,8 @@ log_wakeup(const char *where, const struct pollfd *pollfd, int timeout) cpu_usage = get_cpu_usage(); if (VLOG_IS_DBG_ENABLED()) { level = VLL_DBG; - } else if (cpu_usage > 50 && !VLOG_DROP_WARN(&rl)) { - level = VLL_WARN; + } else if (cpu_usage > 50 && !VLOG_DROP_INFO(&rl)) { + level = VLL_INFO; } else { return; } @@ -249,7 +249,7 @@ poll_block(void) retval = time_poll(pollfds, n_pollfds, timeout_when, &elapsed); if (retval < 0) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); - VLOG_ERR_RL(&rl, "poll: %s", strerror(-retval)); + VLOG_ERR_RL(&rl, "poll: %s", ovs_strerror(-retval)); } else if (!retval) { log_wakeup(timeout_where, NULL, elapsed); }