projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nx-match: Fold all of its data structures into mf_field.
[openvswitch]
/
lib
/
ovsdb-idl.h
diff --git
a/lib/ovsdb-idl.h
b/lib/ovsdb-idl.h
index ac61e1abfec8c93735b6b2a4a920dfec4f63824d..320a1efcdd0dff2cf3358704ec493b52a36431f2 100644
(file)
--- a/
lib/ovsdb-idl.h
+++ b/
lib/ovsdb-idl.h
@@
-50,6
+50,10
@@
void ovsdb_idl_destroy(struct ovsdb_idl *);
bool ovsdb_idl_run(struct ovsdb_idl *);
void ovsdb_idl_wait(struct ovsdb_idl *);
bool ovsdb_idl_run(struct ovsdb_idl *);
void ovsdb_idl_wait(struct ovsdb_idl *);
+void ovsdb_idl_set_lock(struct ovsdb_idl *, const char *lock_name);
+bool ovsdb_idl_has_lock(const struct ovsdb_idl *);
+bool ovsdb_idl_is_lock_contended(const struct ovsdb_idl *);
+
unsigned int ovsdb_idl_get_seqno(const struct ovsdb_idl *);
bool ovsdb_idl_has_ever_connected(const struct ovsdb_idl *);
void ovsdb_idl_force_reconnect(struct ovsdb_idl *);
unsigned int ovsdb_idl_get_seqno(const struct ovsdb_idl *);
bool ovsdb_idl_has_ever_connected(const struct ovsdb_idl *);
void ovsdb_idl_force_reconnect(struct ovsdb_idl *);
@@
-116,9
+120,12
@@
enum ovsdb_idl_txn_status {
TXN_INCOMPLETE, /* Commit in progress, please wait. */
TXN_ABORTED, /* ovsdb_idl_txn_abort() called. */
TXN_SUCCESS, /* Commit successful. */
TXN_INCOMPLETE, /* Commit in progress, please wait. */
TXN_ABORTED, /* ovsdb_idl_txn_abort() called. */
TXN_SUCCESS, /* Commit successful. */
- TXN_
TRY_AGAIN,
/* Commit failed because a "verify" operation
+ TXN_
AGAIN_WAIT,
/* Commit failed because a "verify" operation
* reported an inconsistency, due to a network
* reported an inconsistency, due to a network
- * problem, or other transient failure. */
+ * problem, or other transient failure. Wait
+ * for a change, then try again. */
+ TXN_AGAIN_NOW, /* Same as above but try again immediately. */
+ TXN_NOT_LOCKED, /* Server hasn't given us the lock yet. */
TXN_ERROR /* Commit failed due to a hard error. */
};
TXN_ERROR /* Commit failed due to a hard error. */
};