Included patches contains replacement for objdb and confdb. All services are converted to use icmap. SAM is converted to use cmap service. There is also tool called corosync-cmapctl, which should be fully suited replacement for corosync-objctl. Jan Friesse (14): Add icmap Add cmap service Add user library to use cmap service Move corosync core to use icmap Move testquorum to icmap Move votequorum to use icmap Move cfg service to use icmap Add cmapctl tool Move notifyd to use cmap service Move quorumtool to use cmap service Move SAM to use CMAP service Move mon service to use icmap Move wd service to use icmap Remove objdb and confdb configure.ac | 2 +- corosync.spec.in | 13 +- cts/agents/Makefile.am | 12 +- cts/agents/cmap-dispatch-deadlock.sh | 57 + cts/agents/confdb-dispatch-deadlock.sh | 57 - cts/agents/confdb_test_agent.c | 643 ----------- cts/agents/sam_test_agent.c | 407 +++----- cts/corosync.py | 15 - cts/corotests.py | 88 +-- exec/Makefile.am | 25 +- exec/apidef.c | 32 - exec/apidef.h | 3 - exec/coroparse.c | 745 ++++++++++++-- exec/evil.c | 1 - exec/icmap.c | 892 +++++++++++++++ exec/ipc_glue.c | 294 +++--- exec/main.c | 603 +++-------- exec/main.h | 1 - exec/mainconfig.c | 450 +++------ exec/mainconfig.h | 15 - exec/objdb.c | 1857 -------------------------------- exec/service.c | 398 +++----- exec/service.h | 3 +- exec/totemconfig.c | 472 +++------ exec/totemconfig.h | 3 - exec/vsf_quorum.c | 52 +- include/Makefile.am | 8 +- include/corosync/cmap.h | 334 ++++++ include/corosync/confdb.h | 353 ------ include/corosync/corodefs.h | 3 +- include/corosync/corotypes.h | 17 - include/corosync/engine/config.h | 6 +- include/corosync/engine/coroapi.h | 244 ----- include/corosync/engine/icmap.h | 262 +++++ include/corosync/engine/objdb.h | 275 ----- include/corosync/ipc_cmap.h | 183 ++++ include/corosync/ipc_confdb.h | 278 ----- include/corosync/sam.h | 9 +- include/corosync/totem/totem.h | 1 - lib/Makefile.am | 16 +- lib/cmap.c | 1007 +++++++++++++++++ lib/confdb.c | 1814 ------------------------------- lib/libcmap.versions | 6 + lib/libcmap.verso | 1 + lib/libconfdb.versions | 24 - lib/libconfdb.verso | 1 - lib/sa-confdb.c | 449 -------- lib/sa-confdb.h | 112 -- lib/sam.c | 215 ++--- pkgconfig/Makefile.am | 4 +- services/Makefile.am | 2 +- services/cfg.c | 20 +- services/cmap.c | 645 +++++++++++ services/confdb.c | 1094 ------------------- services/mon.c | 280 ++---- services/testquorum.c | 44 +- services/votequorum.c | 168 +--- services/wd.c | 401 +++----- test/.gitignore | 1 - test/Makefile.am | 6 +- test/testconfdb.c | 259 ----- test/testsam.c | 368 ++----- tools/.gitignore | 1 + tools/Makefile.am | 12 +- tools/corosync-cmapctl.c | 636 +++++++++++ tools/corosync-notifyd.c | 285 ++---- tools/corosync-objctl.c | 935 ---------------- tools/corosync-quorumtool.c | 53 +- 68 files changed, 6167 insertions(+), 11805 deletions(-) create mode 100644 cts/agents/cmap-dispatch-deadlock.sh delete mode 100644 cts/agents/confdb-dispatch-deadlock.sh delete mode 100644 cts/agents/confdb_test_agent.c create mode 100644 exec/icmap.c delete mode 100644 exec/objdb.c create mode 100644 include/corosync/cmap.h delete mode 100644 include/corosync/confdb.h create mode 100644 include/corosync/engine/icmap.h delete mode 100644 include/corosync/engine/objdb.h create mode 100644 include/corosync/ipc_cmap.h delete mode 100644 include/corosync/ipc_confdb.h create mode 100644 lib/cmap.c delete mode 100644 lib/confdb.c create mode 100644 lib/libcmap.versions create mode 100644 lib/libcmap.verso delete mode 100644 lib/libconfdb.versions delete mode 100644 lib/libconfdb.verso delete mode 100644 lib/sa-confdb.c delete mode 100644 lib/sa-confdb.h create mode 100644 services/cmap.c delete mode 100644 services/confdb.c delete mode 100644 test/testconfdb.c create mode 100644 tools/corosync-cmapctl.c delete mode 100644 tools/corosync-objctl.c _______________________________________________ discuss mailing list discuss@xxxxxxxxxxxx http://lists.corosync.org/mailman/listinfo/discuss
