diff options
| author | Alan Conway <aconway@apache.org> | 2009-01-08 21:56:21 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-01-08 21:56:21 +0000 |
| commit | c27590353a30ea036f7b2614bfc0ef73a3402140 (patch) | |
| tree | 08701643115bcefd12ee364462bf08e8553c9e65 /cpp/src/qpid/cluster/Cpg.cpp | |
| parent | 0b493a805eedb2584b9c118f4d002000e65cc5f5 (diff) | |
| download | qpid-python-c27590353a30ea036f7b2614bfc0ef73a3402140.tar.gz | |
Fix to build on latest corosync versions.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@732839 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/cluster/Cpg.cpp')
| -rw-r--r-- | cpp/src/qpid/cluster/Cpg.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/cpp/src/qpid/cluster/Cpg.cpp b/cpp/src/qpid/cluster/Cpg.cpp index 48c3b483f9..3b7e82a751 100644 --- a/cpp/src/qpid/cluster/Cpg.cpp +++ b/cpp/src/qpid/cluster/Cpg.cpp @@ -126,8 +126,16 @@ void Cpg::shutdown() { } } -void Cpg::dispatch(cpg_dispatch_t type) { - check(cpg_dispatch(handle,type), "Error in CPG dispatch"); +void Cpg::dispatchOne() { + check(cpg_dispatch(handle,CPG_DISPATCH_ONE), "Error in CPG dispatch"); +} + +void Cpg::dispatchAll() { + check(cpg_dispatch(handle,CPG_DISPATCH_ALL), "Error in CPG dispatch"); +} + +void Cpg::dispatchBlocking() { + check(cpg_dispatch(handle,CPG_DISPATCH_BLOCKING), "Error in CPG dispatch"); } string Cpg::errorStr(cpg_error_t err, const std::string& msg) { @@ -135,7 +143,7 @@ string Cpg::errorStr(cpg_error_t err, const std::string& msg) { case CPG_OK: return msg+": ok"; case CPG_ERR_LIBRARY: return msg+": library error"; case CPG_ERR_TIMEOUT: return msg+": timeout"; - case CPG_ERR_TRY_AGAIN: return msg+": timeout. The aisexec daemon may not be running"; + case CPG_ERR_TRY_AGAIN: return msg+": timeout."; case CPG_ERR_INVALID_PARAM: return msg+": invalid param"; case CPG_ERR_NO_MEMORY: return msg+": no memory"; case CPG_ERR_BAD_HANDLE: return msg+": bad handle"; |