projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vport-netdev: Use vport stats layer on 32-bit machines.
[openvswitch]
/
lib
/
ovsdb-idl.c
diff --git
a/lib/ovsdb-idl.c
b/lib/ovsdb-idl.c
index 42c53b831c60e9044731af6dd4cdedb69ba46b38..94dd466bb1d171e2e9abfa3a30f2dfae254e192a 100644
(file)
--- a/
lib/ovsdb-idl.c
+++ b/
lib/ovsdb-idl.c
@@
-25,6
+25,7
@@
#include "bitmap.h"
#include "dynamic-string.h"
#include "bitmap.h"
#include "dynamic-string.h"
+#include "fatal-signal.h"
#include "json.h"
#include "jsonrpc.h"
#include "ovsdb-data.h"
#include "json.h"
#include "jsonrpc.h"
#include "ovsdb-data.h"
@@
-1281,6
+1282,7
@@
ovsdb_idl_txn_commit_block(struct ovsdb_idl_txn *txn)
{
enum ovsdb_idl_txn_status status;
{
enum ovsdb_idl_txn_status status;
+ fatal_signal_run();
while ((status = ovsdb_idl_txn_commit(txn)) == TXN_INCOMPLETE) {
ovsdb_idl_run(txn->idl);
ovsdb_idl_wait(txn->idl);
while ((status = ovsdb_idl_txn_commit(txn)) == TXN_INCOMPLETE) {
ovsdb_idl_run(txn->idl);
ovsdb_idl_wait(txn->idl);
@@
-1520,7
+1522,7
@@
ovsdb_idl_txn_process_inc_reply(struct ovsdb_idl_txn *txn,
if (txn->inc_index + 2 > results->n) {
VLOG_WARN_RL(&syntax_rl, "reply does not contain enough operations "
if (txn->inc_index + 2 > results->n) {
VLOG_WARN_RL(&syntax_rl, "reply does not contain enough operations "
- "for increment (has %u, needs %u)",
+ "for increment (has %
z
u, needs %u)",
results->n, txn->inc_index + 2);
return false;
}
results->n, txn->inc_index + 2);
return false;
}
@@
-1534,7
+1536,7
@@
ovsdb_idl_txn_process_inc_reply(struct ovsdb_idl_txn *txn,
}
if (count->u.integer != 1) {
VLOG_WARN_RL(&syntax_rl,
}
if (count->u.integer != 1) {
VLOG_WARN_RL(&syntax_rl,
- "\"mutate\" reply \"count\" is %
"PRId64"
instead of 1",
+ "\"mutate\" reply \"count\" is %
lld
instead of 1",
count->u.integer);
return false;
}
count->u.integer);
return false;
}
@@
-1545,7
+1547,7
@@
ovsdb_idl_txn_process_inc_reply(struct ovsdb_idl_txn *txn,
return false;
}
if (rows->u.array.n != 1) {
return false;
}
if (rows->u.array.n != 1) {
- VLOG_WARN_RL(&syntax_rl, "\"select\" reply \"rows\" has %u elements "
+ VLOG_WARN_RL(&syntax_rl, "\"select\" reply \"rows\" has %
z
u elements "
"instead of 1",
rows->u.array.n);
return false;
"instead of 1",
rows->u.array.n);
return false;
@@
-1575,7
+1577,7
@@
ovsdb_idl_txn_process_insert_reply(struct ovsdb_idl_txn_insert *insert,
if (insert->op_index >= results->n) {
VLOG_WARN_RL(&syntax_rl, "reply does not contain enough operations "
if (insert->op_index >= results->n) {
VLOG_WARN_RL(&syntax_rl, "reply does not contain enough operations "
- "for insert (has %u, needs %u)",
+ "for insert (has %
z
u, needs %u)",
results->n, insert->op_index);
return false;
}
results->n, insert->op_index);
return false;
}