projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rhel: Don't delete bridges on boot.
[openvswitch]
/
lib
/
lockfile.c
diff --git
a/lib/lockfile.c
b/lib/lockfile.c
index f056502de81e7cc0cc29725c00a6c90af861f77d..43ccaf98a21387fa448cfa9fa779994373e79c43 100644
(file)
--- a/
lib/lockfile.c
+++ b/
lib/lockfile.c
@@
-1,4
+1,4
@@
- /* Copyright (c) 2008, 2009, 2010 Nicira Networks
+ /* Copyright (c) 2008, 2009, 2010
, 2011
Nicira Networks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-33,6
+33,11
@@
VLOG_DEFINE_THIS_MODULE(lockfile);
VLOG_DEFINE_THIS_MODULE(lockfile);
+COVERAGE_DEFINE(lockfile_lock);
+COVERAGE_DEFINE(lockfile_timeout);
+COVERAGE_DEFINE(lockfile_error);
+COVERAGE_DEFINE(lockfile_unlock);
+
struct lockfile {
struct hmap_node hmap_node;
char *name;
struct lockfile {
struct hmap_node hmap_node;
char *name;
@@
-106,17
+111,12
@@
lockfile_lock(const char *file, int timeout, struct lockfile **lockfilep)
}
} while (error == EINTR && (timeout == INT_MAX || elapsed < timeout));
}
} while (error == EINTR && (timeout == INT_MAX || elapsed < timeout));
- if (!error) {
- if (elapsed) {
- VLOG_WARN("%s: waited %lld ms for lock file",
- lock_name, elapsed);
- }
- } else if (error == EINTR) {
+ if (error == EINTR) {
COVERAGE_INC(lockfile_timeout);
VLOG_WARN("%s: giving up on lock file after %lld ms",
lock_name, elapsed);
error = ETIMEDOUT;
COVERAGE_INC(lockfile_timeout);
VLOG_WARN("%s: giving up on lock file after %lld ms",
lock_name, elapsed);
error = ETIMEDOUT;
- } else {
+ } else
if (error)
{
COVERAGE_INC(lockfile_error);
if (error == EACCES) {
error = EAGAIN;
COVERAGE_INC(lockfile_error);
if (error == EACCES) {
error = EAGAIN;