Merge pull request #4016 from nrwahl2/nrwahl2-based_first

Clean up based_io.c

Author: clumens

daemons/based/Makefile.am

@@ -10,13 +10,14 @@
 include $(top_srcdir)/mk/common.mk
 include $(top_srcdir)/mk/man.mk
 
-EXTRA_DIST	= cib.pam
-
 halibdir	= $(CRM_DAEMON_DIR)
 
 halib_PROGRAMS	= pacemaker-based
 
-noinst_HEADERS = based_transaction.h
+noinst_HEADERS = based_io.h
+noinst_HEADERS += based_notify.h
+noinst_HEADERS += based_operation.h
+noinst_HEADERS += based_transaction.h
 noinst_HEADERS += pacemaker-based.h
 
 pacemaker_based_CFLAGS	= $(CFLAGS_HARDENED_EXE)

daemons/based/based_callbacks.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2025 the Pacemaker project contributors
+ * Copyright 2004-2026 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -9,29 +9,39 @@
 
 #include <crm_internal.h>
 
-#include <sys/param.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <unistd.h>
-
+#include <errno.h>                  // EACCES, ECONNREFUSED
+#include <inttypes.h>               // PRIu64
 #include <stdbool.h>
-#include <stdlib.h>
-#include <stdint.h>     // uint32_t, uint64_t, UINT64_C()
-#include <errno.h>
-#include <fcntl.h>
-#include <inttypes.h>   // PRIu64
-
-#include <glib.h>
-#include <libxml/tree.h>
-#include <libxml/xpath.h>               // xmlXPathObject, etc.
-
-#include <crm/crm.h>
-#include <crm/cib.h>
-#include <crm/cluster/internal.h>
-
-#include <crm/common/xml.h>
-
-#include <pacemaker-based.h>
+#include <stddef.h>                 // NULL, size_t
+#include <stdint.h>                 // u?int*_t, UINT64_C
+#include <stdio.h>                  // snprintf
+#include <stdlib.h>                 // free
+#include <sys/types.h>              // gid_t, uid_t
+#include <syslog.h>                 // LOG_INFO, LOG_DEBUG
+#include <time.h>                   // time_t
+#include <unistd.h>                 // close
+
+#include <glib.h>                   // gboolean, gpointer, g_*, etc.
+#include <libxml/tree.h>            // xmlNode
+#include <libxml/xpath.h>           // xmlXPath*
+#include <qb/qbdefs.h>              // QB_FALSE
+#include <qb/qbipcs.h>              // qb_ipcs_connection_t
+#include <qb/qblog.h>               // LOG_TRACE
+
+#include <crm/cib.h>                // cib_call_options values
+#include <crm/cib/internal.h>       // cib__*
+#include <crm/cluster.h>            // pcmk_cluster_disconnect
+#include <crm/cluster/internal.h>   // pcmk__cluster_send_message
+#include <crm/common/cib.h>         // pcmk_find_cib_element
+#include <crm/common/internal.h>    // pcmk__s, pcmk__str_eq
+#include <crm/common/ipc.h>         // crm_ipc_*, pcmk_ipc_*
+#include <crm/common/logging.h>     // CRM_LOG_ASSERT, CRM_CHECK
+#include <crm/common/mainloop.h>    // mainloop_*
+#include <crm/common/results.h>     // pcmk_rc_*
+#include <crm/common/xml.h>         // PCMK_XA_*, PCMK_XE_*
+#include <crm/crm.h>                // CRM_OP_*
+
+#include "pacemaker-based.h"
 
 #define EXIT_ESCALATION_MS 10000
 
@@ -1127,8 +1137,7 @@ cib_process_command(xmlNode *request, const cib__operation_t *operation,
                         pcmk__xe_get(result_cib, PCMK_XA_NUM_UPDATES),
                         (config_changed? " changed" : ""));
 
-            rc = activateCibXml(result_cib, config_changed, op);
-            rc = pcmk_legacy2rc(rc);
+            rc = based_activate_cib(result_cib, config_changed, op);
             if (rc != pcmk_rc_ok) {
                 pcmk__err("Failed to activate new CIB: %s", pcmk_rc_str(rc));
             }
@@ -1183,8 +1192,8 @@ cib_process_command(xmlNode *request, const cib__operation_t *operation,
                              cib_dryrun|cib_inhibit_notify|cib_transaction)) {
         pcmk__trace("Sending notifications %d",
                     pcmk__is_set(call_options, cib_dryrun));
-        cib_diff_notify(op, pcmk_rc2legacy(rc), call_id, client_id, client_name,
-                        originator, input, cib_diff);
+        based_diff_notify(op, pcmk_rc2legacy(rc), call_id, client_id,
+                          client_name, originator, input, cib_diff);
     }
 
     pcmk__log_xml_patchset(LOG_TRACE, cib_diff);
@@ -1363,7 +1372,7 @@ terminate_cib(int exit_status)
         remote_tls_fd = 0;
     }
 
-    uninitializeCib();
+    g_clear_pointer(&the_cib, pcmk__xml_free);
 
     // Exit immediately on error
     if (exit_status > CRM_EX_OK) {