openais uses some deprecated macros from logsysv1. This patch fixes
those up to work with v2.
Index: services/amfsi.c
===================================================================
--- services/amfsi.c (revision 1656)
+++ services/amfsi.c (working copy)
@@ -297,7 +297,7 @@
void amf_si_comp_set_ha_state_done (
struct amf_si *si, struct amf_csi_assignment *csi_assignment)
{
- ENTER ("'%s', '%s'", si->name.value, csi_assignment->csi->name.value);
+ ENTER ();
set_si_ha_state (csi_assignment);
@@ -322,7 +322,7 @@
{
struct amf_csi *csi;
- ENTER ("'%s'", si->name.value);
+ ENTER ();
for (csi = si->csi_head; csi != NULL; csi = csi->next) {
struct amf_csi_assignment *csi_assignment;
@@ -346,7 +346,7 @@
void amf_si_comp_set_ha_state_failed (
struct amf_si *si, struct amf_csi_assignment *csi_assignment)
{
- ENTER ("");
+ ENTER ();
assert (0);
}
@@ -354,7 +354,7 @@
{
struct amf_si_assignment *si_assignment = _si_assignment;
- ENTER ("");
+ ENTER ();
si_assignment->saAmfSISUHAState = si_assignment->requested_ha_state;
si_assignment->assumed_callback_fn (si_assignment, 0);
}
@@ -369,9 +369,7 @@
int csi_assignment_cnt = 0;
int hastate_set_done_cnt = 0;
- ENTER ("SI '%s' SU '%s' state %s", si_assignment->si->name.value,
- si_assignment->su->name.value,
- amf_ha_state (si_assignment->requested_ha_state));
+ ENTER ();
si_assignment->assumed_callback_fn = assumed_ha_state_callback_fn;
for (csi = si_assignment->si->csi_head; csi != NULL; csi = csi->next) {
@@ -509,7 +507,7 @@
void amf_csi_delete_assignments (struct amf_csi *csi, struct amf_su *su)
{
struct amf_csi_assignment *csi_assignment;
- ENTER ("'%s'", su->name.value);
+ ENTER ();
struct amf_csi_assignment **prev = &csi->assigned_csis;
for (csi_assignment = csi->assigned_csis; csi_assignment != NULL;
@@ -517,7 +515,7 @@
if (csi_assignment->comp->su == su) {
struct amf_csi_assignment *tmp = csi_assignment;
*prev = csi_assignment->next;
- dprintf ("CSI assignment %s unlinked", tmp->name.value);
+ TRACE1 ("CSI assignment %s unlinked", tmp->name.value);
free (tmp);
} else {
prev = &csi_assignment->next;
@@ -689,7 +687,7 @@
}
if (si == NULL) {
- dprintf ("SI %s not found!", name);
+ TRACE1 ("SI %s not found!", name);
}
return si;
@@ -761,7 +759,7 @@
}
if (csi == NULL) {
- dprintf ("CSI %s not found!", name);
+ TRACE1 ("CSI %s not found!", name);
}
return csi;
}
@@ -1000,9 +998,7 @@
struct amf_csi *csi;
int csi_assignment_cnt = 0;
- ENTER ("SI '%s' SU '%s' state %s", si_assignment->si->name.value,
- si_assignment->su->name.value,
- amf_ha_state (si_assignment->requested_ha_state));
+ ENTER ();
si_assignment->requested_ha_state = USR_AMF_HA_STATE_REMOVED;
si_assignment->removed_callback_fn = async_func;
@@ -1042,7 +1038,7 @@
struct amf_si *si, struct amf_csi_assignment *csi_assignment,
SaAisErrorT error)
{
- ENTER ("'%s', '%s'", si->name.value, csi_assignment->csi->name.value);
+ ENTER ();
assert (csi_assignment->si_assignment->removed_callback_fn != NULL);
Index: services/aisexec
===================================================================
--- services/aisexec (revision 1656)
+++ services/aisexec (working copy)
@@ -1,3 +1,3 @@
#!/bin/sh
export COROSYNC_DEFAULT_CONFIG_IFACE="openaisserviceenable:openaisparser"
-/usr/sbin/corosync
+/usr/sbin/corosync -f
Index: services/amfutil.c
===================================================================
--- services/amfutil.c (revision 1656)
+++ services/amfutil.c (working copy)
@@ -1303,7 +1303,7 @@
int i;
- ENTER("'%s %s'",string, pattern);
+ ENTER();
if (regcomp(&re, pattern, REG_EXTENDED) != 0) {
status = 0;
@@ -1345,7 +1345,7 @@
int i;
- ENTER("'%s %s'",string, pattern);
+ ENTER();
if (regcomp(&re, pattern, REG_EXTENDED) != 0) {
status = 0;
goto out;
@@ -1390,7 +1390,7 @@
int iov_cnt;
int res;
-// ENTER ("%u, %p, %u", msg_id, buf, len);
+ ENTER ();
msg.header.size = sizeof (msg);
msg.header.id = SERVICE_ID_MAKE (AMF_SERVICE, msg_id);
@@ -1410,7 +1410,7 @@
res = api->totem_mcast (iov, iov_cnt, TOTEM_AGREED);
if (res != 0) {
- dprintf("Unable to send %d bytes\n", msg.header.size);
+ TRACE1("Unable to send %d bytes\n", msg.header.size);
corosync_fatal_error (COROSYNC_FATAL_ERR);
}
Index: services/amf.c
===================================================================
--- services/amf.c (revision 1656)
+++ services/amf.c (working copy)
@@ -594,7 +594,7 @@
int i;
amf_node_t *amf_node;
- ENTER ("");
+ ENTER ();
if (amf_cluster == NULL) {
return;
@@ -611,7 +611,7 @@
if (strcmp ((char*)amf_node->saAmfNodeClmNode.value,
clm_node_list[i].hostname) == 0) {
- dprintf ("%s id set to %u", amf_node->name.value,
+ TRACE1 ("%s id set to %u", amf_node->name.value,
clm_node_list[i].nodeid);
amf_node->nodeid = clm_node_list[i].nodeid;
}
@@ -680,7 +680,7 @@
res = api->totem_mcast (iov, 2, TOTEM_AGREED);
if (res != 0) {
- dprintf("Unable to send %d bytes of sync data\n", req_exec.header.size);
+ TRACE1("Unable to send %d bytes of sync data\n", req_exec.header.size);
}
return res;
@@ -1111,7 +1111,7 @@
int i;
struct amf_node *node;
- ENTER ("");
+ ENTER ();
log_printf(LOG_NOTICE, "AMF synchronisation ready, starting cluster");
for (i = 0; i < clm_node_list_entries; i++) {
@@ -1150,7 +1150,7 @@
}
break;
default:
- dprintf ("unknown state: %u", scsm.state);;
+ TRACE1 ("unknown state: %u", scsm.state);;
assert (0);
break;
}
@@ -1287,7 +1287,7 @@
case NORMAL_OPERATION:
break;
default:
- dprintf ("unknown state: %u", scsm.state);;
+ TRACE1 ("unknown state: %u", scsm.state);;
assert (0);
break;
}
@@ -1338,9 +1338,7 @@
unsigned int *joined_list, int joined_list_entries,
struct memb_ring_id *ring_id)
{
- ENTER ("mnum: %d, jnum: %d, lnum: %d, sync state: %s, ring ID %llu rep %s\n",
- member_list_entries, joined_list_entries, left_list_entries,
- scsm_state_names[scsm.state], ring_id->seq, api->totem_ip_print (&ring_id->rep));
+ ENTER ();
switch (scsm.state) {
case UNCONFIGURED:
@@ -1442,7 +1440,7 @@
/* Make sure this is not a new connection */
if (comp != NULL && comp->conn == conn ) {
comp->conn = NULL;
- dprintf ("Lib exit from comp %s\n", getSaNameT (&comp->name));
+ TRACE1 ("Lib exit from comp %s\n", getSaNameT (&comp->name));
}
return (0);
@@ -1571,7 +1569,7 @@
}
comp = amf_comp_find (amf_cluster, &req_exec->compName);
- ENTER ("%s",comp->name.value);
+ ENTER ();
if (comp == NULL) {
log_printf (LOG_ERR, "Error: '%s' not found", req_exec->compName.value);
@@ -1603,7 +1601,7 @@
return;
}
- ENTER ("%s", comp->name.value);
+ ENTER ();
healthcheck = amf_comp_find_healthcheck (comp, &req_exec->safHealthcheckKey);
@@ -1678,7 +1676,7 @@
case UNCONFIGURED:
break;
default:
- dprintf ("unknown state %d", scsm.state);
+ TRACE1 ("unknown state %d", scsm.state);
assert (0);
break;
}
@@ -1788,7 +1786,7 @@
scsm.csi_attribute->name);
break;
default:
- dprintf ("unknown object: %u", req_exec->object_type);
+ TRACE1 ("unknown object: %u", req_exec->object_type);
assert (0);
break;
}
Index: services/amfapp.c
===================================================================
--- services/amfapp.c (revision 1656)
+++ services/amfapp.c (working copy)
@@ -151,7 +151,7 @@
amf_node_t *node)
{
application_event_t app_event = {event_type, app, node};
- ENTER("");
+ ENTER();
amf_fifo_put (event_type, &app->deferred_events,
sizeof (application_event_t), &app_event);
}
@@ -189,7 +189,7 @@
{
amf_application_t *app = (amf_application_t*)data;
- ENTER ("");
+ ENTER ();
application_recall_deferred_events (app);
}
@@ -239,14 +239,14 @@
static void timer_function_cluster_application_started (void* app)
{
- ENTER("");
+ ENTER();
amf_application_t *application = (amf_application_t*)app;
amf_cluster_application_started (application->cluster, application);
}
static void timer_function_node_application_started (void* app)
{
- ENTER("");
+ ENTER();
amf_application_t *application = (amf_application_t*)app;
amf_node_application_started (application->node_to_start, application);
}
@@ -258,7 +258,7 @@
int su_to_instantiate = 0;
app->node_to_start = node;
app->acsm_state = APP_AC_STARTING_SGS;
- ENTER ("%s",app->name.value);
+ ENTER ();
for (sg = app->sg_head; sg != NULL; sg = sg->next) {
su_to_instantiate += amf_sg_start (sg, node);
}
@@ -279,7 +279,7 @@
{
amf_sg_t *sg = 0;
int posible_to_assign_si = 0;
- ENTER ("%s",app->name.value);
+ ENTER ();
app->acsm_state = APP_AC_ASSIGNING_WORKLOAD;
for (sg = app->sg_head; sg != NULL; sg = sg->next) {
if (amf_sg_assign_si_req (sg, 0)) {
@@ -294,7 +294,7 @@
static void application_enter_workload_assigned (amf_application_t *app)
{
- ENTER ("%s", app->name.value);
+ ENTER ();
if (all_sg_assigned (app)){
app->acsm_state = APP_AC_WORKLOAD_ASSIGNED;
if (app->node_to_start == NULL){
@@ -319,7 +319,7 @@
void amf_application_start (
struct amf_application *app, struct amf_node *node)
{
- ENTER ("'%s'", app->name.value);
+ ENTER ();
assert (app != NULL);
switch (app->acsm_state) {
case APP_AC_UNINSTANTIATED:
@@ -365,7 +365,7 @@
assert (app != NULL);
app->node_to_start = node;
- ENTER("app->acsm_state = %d",app->acsm_state);
+ ENTER();
switch (app->acsm_state) {
case APP_AC_STARTING_SGS:
@@ -398,7 +398,7 @@
/*
* Calling object has violated the contract !
*/
- dprintf ("acsm_state = %d",app->acsm_state);
+ TRACE1 ("acsm_state = %d",app->acsm_state);
assert (0);
break;
}
@@ -411,7 +411,7 @@
void amf_application_sg_started (struct amf_application *app, struct amf_sg *sg,
struct amf_node *node)
{
- ENTER ("'%s %s'", app->name.value, sg->name.value);
+ ENTER ();
assert (app != NULL);
@@ -437,7 +437,7 @@
void amf_application_sg_assigned (
struct amf_application *app, struct amf_sg *sg)
{
- ENTER ("'%s'", app->name.value);
+ ENTER ();
assert (app != NULL);
switch (app->acsm_state) {
@@ -543,7 +543,7 @@
}
if (app == NULL) {
- dprintf ("App %s not found!", name);
+ TRACE1 ("App %s not found!", name);
}
return app;
}
Index: services/amfcluster.c
===================================================================
--- services/amfcluster.c (revision 1656)
+++ services/amfcluster.c (working copy)
@@ -195,7 +195,7 @@
{
amf_cluster_t *cluster = (amf_cluster_t*)data;
- ENTER ("");
+ ENTER ();
cluster_recall_deferred_events (cluster);
}
@@ -260,7 +260,7 @@
static void amf_cluster_assign_workload (struct amf_cluster *cluster)
{
struct amf_application *app;
- ENTER ("");
+ ENTER ();
for (app = cluster->application_head; app != NULL; app = app->next) {
amf_application_assign_workload (app, NULL);
@@ -279,7 +279,7 @@
{
((struct amf_cluster*)cluster)->timeout_handle = 0;
- ENTER ("");
+ ENTER ();
amf_msg_mcast (MESSAGE_REQ_EXEC_AMF_CLUSTER_START_TMO, &this_amf_node->name,
sizeof(SaNameT));
@@ -288,7 +288,7 @@
static inline void stop_cluster_startup_timer (struct amf_cluster *cluster)
{
if (cluster->timeout_handle) {
- dprintf ("Stop cluster startup timer");
+ TRACE1 ("Stop cluster startup timer");
api->timer_delete (cluster->timeout_handle);
cluster->timeout_handle = 0;
}
@@ -308,7 +308,7 @@
static inline void cluster_enter_starting_applications (
struct amf_cluster *cluster)
{
- ENTER ("");
+ ENTER ();
start_cluster_startup_timer (cluster);
amf_cluster->acsm_state = CLUSTER_AC_STARTING_APPLICATIONS;
amf_cluster_start_applications (cluster);
@@ -316,7 +316,7 @@
static void acsm_cluster_enter_started (amf_cluster_t *cluster)
{
- ENTER ("");
+ ENTER ();
amf_cluster->acsm_state = CLUSTER_AC_STARTED;
amf_call_function_asynchronous (
timer_function_cluster_recall_deferred_events, cluster);
@@ -329,19 +329,19 @@
void amf_cluster_start_tmo_event (int is_sync_masterm,
struct amf_cluster *cluster, SaNameT *sourceNodeName)
{
- ENTER ("acsm_state = %d", amf_cluster->acsm_state);
+ ENTER ();
stop_cluster_startup_timer (cluster);
switch (cluster->acsm_state) {
case CLUSTER_AC_WAITING_OVER_TIME_1:
if (cluster_applications_are_starting_sgs (cluster)) {
- dprintf ("Cluster startup timeout,"
+ TRACE1 ("Cluster startup timeout,"
"start waiting over time");
amf_cluster->acsm_state =
CLUSTER_AC_WAITING_OVER_TIME_2;
} else {
- dprintf ("Cluster startup timeout,"
+ TRACE1 ("Cluster startup timeout,"
" assigning workload");
acsm_cluster_enter_assigning_workload (cluster);
}
@@ -392,7 +392,7 @@
*/
void amf_cluster_sync_ready (struct amf_cluster *cluster, struct amf_node *node)
{
- ENTER ("");
+ ENTER ();
switch (amf_cluster->acsm_state) {
case CLUSTER_AC_UNINSTANTIATED:
if (amf_cluster->saAmfClusterAdminState ==
@@ -448,8 +448,7 @@
void amf_cluster_application_started (
struct amf_cluster *cluster, struct amf_application *application)
{
- ENTER ("application '%s' started %d", application->name.value,
- cluster->acsm_state);
+ ENTER ();
switch (cluster->acsm_state) {
case CLUSTER_AC_STARTING_APPLICATIONS:
if (cluster_applications_started_instantiated (cluster)) {
@@ -479,7 +478,7 @@
void amf_cluster_application_workload_assigned (
struct amf_cluster *cluster, struct amf_application *app)
{
- ENTER ("");
+ ENTER ();
switch (cluster->acsm_state) {
case CLUSTER_AC_ASSIGNING_WORKLOAD:
log_printf (LOG_NOTICE, "Cluster: application %s assigned.",
Index: services/amfnode.c
===================================================================
--- services/amfnode.c (revision 1656)
+++ services/amfnode.c (working copy)
@@ -203,7 +203,7 @@
static void node_acsm_enter_leaving_spontaneously(struct amf_node *node)
{
- ENTER("'%s'", node->name.value);
+ ENTER();
node->saAmfNodeOperState = SA_AMF_OPERATIONAL_DISABLED;
node->nodeid = 0;
}
@@ -215,7 +215,7 @@
struct amf_su *su;
struct amf_comp *component = NULL;
- ENTER("'%s'", node->name.value);
+ ENTER();
node->acsm_state = NODE_ACSM_LEAVING_SPONTANEOUSLY_FAILING_OVER;
/*
* Indicate to each component object in the model that current
@@ -267,7 +267,7 @@
static void node_acsm_enter_failing_gracefully_failing_over (amf_node_t *node)
{
- ENTER("%s", node->name.value);
+ ENTER();
node->acsm_state = NODE_ACSM_FAILING_GRACEFULLY_FAILING_OVER;
failover_all_sg_on_node (node);
}
@@ -301,7 +301,7 @@
static void repair_node (amf_node_t *node)
{
- ENTER("");
+ ENTER();
char hostname[256];
gethostname (hostname, 256);
if (!strcmp (hostname, (const char*)node->saAmfNodeClmNode.value)) {
@@ -316,14 +316,14 @@
static void enter_failing_gracefully_rebooting_node (amf_node_t *node)
{
- ENTER("");
+ ENTER();
node->acsm_state = NODE_ACSM_FAILING_GRACEFULLY_REBOOTING_NODE;
repair_node (node);
}
static void node_acsm_enter_idle (amf_node_t *node)
{
- ENTER ("history_state=%d",node->history_state);
+ ENTER ();
node->acsm_state = node->history_state;
}
@@ -334,7 +334,7 @@
"Node=%s: all applications started, assigning workload.",
node->name.value);
- ENTER("");
+ ENTER();
node->acsm_state = NODE_ACSM_JOINING_ASSIGNING_WORKLOAD;
for (app = app->cluster->application_head; app != NULL;
app = app->next) {
@@ -355,10 +355,8 @@
void amf_node_leave (struct amf_node *node)
{
assert (node != NULL);
- ENTER("'%s', CLM node '%s'", node->name.value,
- node->saAmfNodeClmNode.value);
+ ENTER();
-
switch (node->acsm_state) {
case NODE_ACSM_IDLE_ESCALLATION_LEVEL_0:
case NODE_ACSM_IDLE_ESCALLATION_LEVEL_2:
@@ -389,8 +387,7 @@
void amf_node_failover (struct amf_node *node)
{
assert (node != NULL);
- ENTER("'%s', CLM node '%s'", node->name.value,
- node->saAmfNodeClmNode.value);
+ ENTER();
switch (node->acsm_state) {
case NODE_ACSM_IDLE_ESCALLATION_LEVEL_0:
@@ -438,7 +435,7 @@
void amf_node_comp_restart_req (struct amf_node *node, struct amf_comp *comp)
{
amf_su_t *su = comp->su;
- ENTER("");
+ ENTER();
switch (node->acsm_state) {
case NODE_ACSM_IDLE_ESCALLATION_LEVEL_0:
node->acsm_state = NODE_ACSM_IDLE_ESCALLATION_LEVEL_2;
@@ -478,7 +475,7 @@
}
break;
default:
- dprintf("%d",node->acsm_state);
+ TRACE1("%d",node->acsm_state);
assert (0);
break;
}
@@ -494,7 +491,7 @@
*/
void amf_node_comp_failover_req (amf_node_t *node, amf_comp_t *comp)
{
- ENTER("");
+ ENTER();
switch (node->acsm_state) {
case NODE_ACSM_IDLE_ESCALLATION_LEVEL_0:
case NODE_ACSM_IDLE_ESCALLATION_LEVEL_2:
@@ -516,7 +513,7 @@
}
break;
default:
- dprintf("%d",node->acsm_state);
+ TRACE1("%d",node->acsm_state);
assert (0);
break;
}
@@ -578,8 +575,7 @@
struct amf_application *app)
{
assert (node != NULL && app != NULL );
- ENTER ("Node=%s: application '%s' started", node->name.value,
- app->name.value);
+ ENTER ();
switch (node->acsm_state) {
case NODE_ACSM_JOINING_STARTING_APPLICATIONS:
@@ -608,8 +604,7 @@
struct amf_application *app)
{
assert (node != NULL && app != NULL );
- ENTER ("Node=%s: application '%s' started", node->name.value,
- app->name.value);
+ ENTER ();
switch (node->acsm_state) {
case NODE_ACSM_JOINING_ASSIGNING_WORKLOAD:
@@ -638,8 +633,7 @@
void amf_node_sg_failed_over (struct amf_node *node, struct amf_sg *sg_in)
{
assert (node != NULL);
- ENTER ("Node=%s: SG '%s' started %d", node->name.value,
- sg_in->name.value,node->acsm_state);
+ ENTER ();
switch (node->acsm_state) {
case NODE_ACSM_LEAVING_SPONTANEOUSLY_FAILING_OVER:
@@ -756,7 +750,7 @@
}
}
- dprintf ("node %s not found in configuration!", name->value);
+ TRACE1 ("node %s not found in configuration!", name->value);
return NULL;
}
@@ -772,7 +766,7 @@
}
}
- dprintf ("node %u not found in configuration!", nodeid);
+ TRACE1 ("node %u not found in configuration!", nodeid);
return NULL;
}
@@ -788,7 +782,7 @@
}
}
- dprintf ("node %s not found in configuration!", hostname);
+ TRACE1 ("node %s not found in configuration!", hostname);
return NULL;
}
Index: services/amfsu.c
===================================================================
--- services/amfsu.c (revision 1656)
+++ services/amfsu.c (working copy)
@@ -421,7 +421,7 @@
su_event_t event;
su_event_set(su, comp, recommended_recovery,&event, su_event_type);
- ENTER("event_type = %d", event.event_type);
+ ENTER();
amf_fifo_put (event.event_type, &event.su->deferred_events,
sizeof (su_event_t), &event);
}
@@ -430,7 +430,7 @@
{
su_event_t su_event;
- ENTER ("%s", su->name.value);
+ ENTER ();
if (amf_fifo_get (&su->deferred_events, &su_event)) {
switch (su_event.event_type) {
case SU_COMP_ERROR_SUSPECTED_EV:
@@ -438,7 +438,7 @@
su_event.recommended_recovery);
break;
default:
- dprintf("event_type = %d", su_event.event_type);
+ TRACE1("event_type = %d", su_event.event_type);
break;
}
}
@@ -472,7 +472,7 @@
static void clear_ha_state (
struct amf_su *su, struct amf_si_assignment *si_assignment)
{
- ENTER ("");
+ ENTER ();
si_assignment->saAmfSISUHAState = 0;
}
@@ -564,7 +564,7 @@
{
struct amf_csi_assignment *csi_assignment;
- dprintf (" Creating CSI '%s' to comp '%s' with hastate %s\n",
+ TRACE1 (" Creating CSI '%s' to comp '%s' with hastate %s\n",
getSaNameT (&csi->name), getSaNameT (&comp->name),
amf_ha_state (ha_state));
@@ -584,7 +584,7 @@
{
SaNameT dn;
- ENTER ("'%s'", comp->name.value);
+ ENTER ();
amf_comp_dn_make (comp, &dn);
log_printf (LOG_NOTICE, "Error detected for '%s', recovery "
"action: Component restart", dn.value);
@@ -609,7 +609,7 @@
{
struct amf_si_assignment *si_assignment;
- ENTER ("");
+ ENTER ();
si_assignment = amf_su_get_next_si_assignment(su, NULL);
@@ -729,8 +729,7 @@
static void su_comp_presence_state_changed (struct amf_su *su,
struct amf_comp *comp, int state)
{
- ENTER ("'%s', '%s' %d %d", su->name.value, comp->name.value, state,
- su->restart_control_state);
+ ENTER ();
amf_node_t *node = amf_node_find (&comp->su->saAmfSUHostedByNode);
switch (state) {
case SA_AMF_PRESENCE_INSTANTIATED:
@@ -782,7 +781,7 @@
}
break;
default:
- dprintf ("state %d", su->restart_control_state);
+ TRACE1 ("state %d", su->restart_control_state);
assert (0);
break;
}
@@ -863,7 +862,7 @@
}
break;
default:
- dprintf ("state %d", su->restart_control_state);
+ TRACE1 ("state %d", su->restart_control_state);
assert (0);
break;
}
@@ -905,7 +904,7 @@
}
break;
default:
- dprintf ("state %d", su->restart_control_state);
+ TRACE1 ("state %d", su->restart_control_state);
assert (0);
break;
}
@@ -945,7 +944,7 @@
default:
log_printf (LOG_LEVEL_NOTICE,"%s %d",su->name.value,
su->restart_control_state);
- dprintf ("state %d", su->restart_control_state);
+ TRACE1 ("state %d", su->restart_control_state);
assert (0);
break;
}
@@ -965,7 +964,7 @@
static void su_comp_op_state_changed (
struct amf_su *su, struct amf_comp *comp, int state)
{
- ENTER ("'%s', '%s' %d", su->name.value, comp->name.value, state);
+ ENTER ();
switch (state) {
case SA_AMF_OPERATIONAL_ENABLED:
@@ -1064,7 +1063,7 @@
static void su_rc_enter_idle_escalation_level_1 (amf_comp_t *component,
SaAmfRecommendedRecoveryT recommended_recovery)
{
- ENTER("");
+ ENTER();
component->su->restart_control_state = SU_RC_IDLE_ESCALATION_LEVEL_1;
if (has_component_restarted_max_times (component, component->su)) {
component->su->restart_control_state = SU_RC_IDLE_ESCALATION_LEVEL_2;
@@ -1076,7 +1075,7 @@
static void su_rc_enter_idle_escalation_level_2 (amf_comp_t *component,
SaAmfRecommendedRecoveryT recommended_recovery)
{
- ENTER("");
+ ENTER();
component->su->restart_control_state = SU_RC_IDLE_ESCALATION_LEVEL_2;
amf_node_t *node = amf_node_find (&component->su->saAmfSUHostedByNode);
amf_node_comp_restart_req (node, component);
@@ -1157,7 +1156,7 @@
{
int is_instantiating = 1;
- ENTER ("'%s %d'", su->name.value, su->saAmfSUPresenceState);
+ ENTER ();
switch (su->saAmfSUPresenceState) {
case SA_AMF_PRESENCE_UNINSTANTIATED:
instantiate_all_components_in_level(su,
@@ -1186,7 +1185,7 @@
*/
void amf_su_terminate (struct amf_su *su)
{
- ENTER ("'%s'", su->name.value);
+ ENTER ();
su->current_comp_instantiation_level = get_instantiation_max_level (su);
terminate_all_components_in_level (su, su->current_comp_instantiation_level);
@@ -1203,8 +1202,7 @@
struct amf_comp *comp,
SaAmfRecommendedRecoveryT recommended_recovery)
{
- ENTER ("Comp '%s', SU '%s' %d", comp->name.value, su->name.value,
- su->restart_control_state);
+ ENTER ();
switch (su->restart_control_state) {
case SU_RC_IDLE_ESCALATION_LEVEL_0:
@@ -1255,7 +1253,7 @@
SU_COMP_ERROR_SUSPECTED_EV);
break;
default:
- dprintf ("restart_control_state = %d",su->restart_control_state);
+ TRACE1 ("restart_control_state = %d",su->restart_control_state);
break;
}
}
@@ -1268,7 +1266,7 @@
{
SaNameT dn;
- ENTER ("'%s'", su->name.value);
+ ENTER ();
amf_su_dn_make (su, &dn);
log_printf (LOG_NOTICE, "Error detected for '%s', recovery "
@@ -1316,7 +1314,7 @@
struct amf_comp *comp;
struct amf_csi_assignment *csi_assignment;
int all_confirmed = 1;
- ENTER ("");
+ ENTER ();
tmp_si_assignment = amf_su_get_next_si_assignment(si_assignment->su, NULL);
while (tmp_si_assignment != NULL) {
@@ -1572,7 +1570,7 @@
{
struct amf_si_assignment *si_assignment;
- dprintf ("Creating SI '%s' to SU '%s' with hastate %s\n",
+ TRACE1 ("Creating SI '%s' to SU '%s' with hastate %s\n",
getSaNameT (&si->name), getSaNameT (&su->name),
amf_ha_state (ha_state));
Index: services/amfcomp.c
===================================================================
--- services/amfcomp.c (revision 1656)
+++ services/amfcomp.c (working copy)
@@ -319,8 +319,7 @@
struct amf_comp *comp,
SaAmfRecommendedRecoveryT recommended_recovery)
{
- ENTER ("%s, recommended_recovery = %d",
- comp->name.value, recommended_recovery);
+ ENTER ();
amf_comp_error_suspected_set (comp);
comp_recover_action (comp, recommended_recovery);
}
@@ -348,7 +347,7 @@
int argv_size;
int envp_size;
- ENTER_VOID();
+ ENTER();
pid = fork();
@@ -512,7 +511,7 @@
static void start_component_instantiate_timer (struct amf_comp *component)
{
- ENTER("%s",component->name.value);
+ ENTER();
if (component->instantiate_timeout_handle == 0) {
api->timer_add_duration (
component->saAmfCompInstantiateTimeout * MILLI_2_NANO_SECONDS,
@@ -524,7 +523,7 @@
static void start_component_cleanup_timer (struct amf_comp *component)
{
- ENTER("%s",component->name.value);
+ ENTER();
if (component->cleanup_timeout_handle == 0) {
api->timer_add_duration (
component->saAmfCompCleanupTimeout * MILLI_2_NANO_SECONDS,
@@ -536,7 +535,7 @@
void stop_component_cleanup_timer (struct amf_comp *component)
{
- ENTER("%s",component->name.value);
+ ENTER();
if (component->cleanup_timeout_handle != 0) {
api->timer_delete (
@@ -556,7 +555,7 @@
struct clc_command_run_data *clc_command_run_data;
- ENTER("comp '%s'\n", getSaNameT (&comp->name));
+ ENTER();
clc_command_run_data = amf_malloc (sizeof (struct clc_command_run_data));
clc_command_run_data->comp = comp;
@@ -575,13 +574,13 @@
static int clc_instantiate_callback (struct amf_comp *comp)
{
- ENTER("comp %s\n", getSaNameT (&comp->name));
+ ENTER();
return (0);
}
static int clc_csi_set_callback (struct amf_comp *comp)
{
- ENTER("comp %s\n", getSaNameT (&comp->name));
+ ENTER();
return (0);
}
@@ -590,7 +589,7 @@
*/
static int clc_cli_terminate (struct amf_comp *comp)
{
- ENTER("comp %s\n", getSaNameT (&comp->name));
+ ENTER();
return (0);
}
@@ -605,7 +604,7 @@
struct res_lib_amf_componentterminatecallback res_lib;
struct component_terminate_callback_data *component_terminate_callback_data;
- ENTER("comp %s\n", getSaNameT (&comp->name));
+ ENTER();
res_lib.header.id = MESSAGE_RES_AMF_COMPONENTTERMINATECALLBACK;
res_lib.header.size = sizeof (struct res_lib_amf_componentterminatecallback);
@@ -632,7 +631,7 @@
static int clc_csi_remove_callback (struct amf_comp *comp)
{
- dprintf ("clc_tcsi_remove_callback\n");
+ TRACE1 ("clc_tcsi_remove_callback\n");
return (0);
}
@@ -672,7 +671,7 @@
struct clc_command_run_data *clc_command_run_data;
- dprintf ("clc_cli_cleanup\n");
+ TRACE1 ("clc_cli_cleanup\n");
clc_command_run_data = amf_malloc (sizeof (struct clc_command_run_data));
clc_command_run_data->comp = comp;
clc_command_run_data->type = CLC_COMMAND_RUN_OPERATION_TYPE_CLEANUP;
@@ -691,7 +690,7 @@
static int clc_cli_cleanup_local (struct amf_comp *comp)
{
- dprintf ("clc_cli_cleanup_local\n");
+ TRACE1 ("clc_cli_cleanup_local\n");
return (0);
}
@@ -700,7 +699,7 @@
{
int res;
- dprintf ("clc terminate for comp %s\n", getSaNameT (&comp->name));
+ TRACE1 ("clc terminate for comp %s\n", getSaNameT (&comp->name));
assert (0);
comp_presence_state_set (comp, SA_AMF_PRESENCE_TERMINATING);
operational_state_comp_set (comp, SA_AMF_OPERATIONAL_DISABLED);
@@ -912,7 +911,7 @@
if (!amf_su_is_local (comp->su))
return;
- ENTER ("'%s'\n", getSaNameT (&comp->name));
+ ENTER ();
for (healthcheck = comp->healthcheck_head;
healthcheck != NULL;
@@ -1048,7 +1047,7 @@
static void healthcheck_deactivate (
struct amf_healthcheck *healthcheck_active)
{
- dprintf ("deactivating healthcheck for component %s\n",
+ TRACE1 ("deactivating healthcheck for component %s\n",
getSaNameT (&healthcheck_active->comp->name));
api->timer_delete (healthcheck_active->timer_handle_period);
@@ -1168,11 +1167,7 @@
csi = csi_assignment->csi;
- ENTER ("Assigning CSI '%s' state %s to comp '%s'\n",
- getSaNameT (&csi->name),
- amf_ha_state (csi_assignment->requested_ha_state),
- comp->name.value);
-
+ ENTER ();
for (attribute = csi->attributes_head;
attribute != NULL;
attribute = attribute->next) {
@@ -1254,10 +1249,10 @@
static void stop_component_instantiate_timer (struct amf_comp *component)
{
- ENTER("%s",component->name.value);
+ ENTER();
if (component->instantiate_timeout_handle) {
- dprintf ("Stop component instantiate timer");
+ TRACE1 ("Stop component instantiate timer");
api->timer_delete (component->instantiate_timeout_handle);
component->instantiate_timeout_handle = 0;
}
@@ -1330,7 +1325,7 @@
static void clear_ha_state (
struct amf_comp *comp, struct amf_csi_assignment *csi_assignment)
{
- ENTER ("");
+ ENTER ();
csi_assignment->saAmfCSICompHAState = 0;
}
@@ -1340,8 +1335,7 @@
{
- ENTER ("%s %d %d", comp->name.value,recommendedRecovery,
- comp->saAmfCompRecoveryOnError);
+ ENTER ();
amf_node_t *node = amf_node_find (&comp->su->saAmfSUHostedByNode);
switch (recommendedRecovery) {
@@ -1389,7 +1383,7 @@
break;
case SA_AMF_APPLICATION_RESTART:
default:
- dprintf("recommendedRecovery=%d",recommendedRecovery);
+ TRACE1("recommendedRecovery=%d",recommendedRecovery);
assert (0);
break;
}
@@ -1430,7 +1424,7 @@
*/
void amf_comp_cleanup_failed_completed (amf_comp_t *comp)
{
- ENTER ("'%s'", comp->name.value);
+ ENTER ();
stop_component_cleanup_timer (comp);
amf_comp_error_suspected_clear (comp);
@@ -1755,7 +1749,7 @@
goto error_exit;
}
- dprintf ("Healthcheckstart: '%s', key '%s'",
+ TRACE1 ("Healthcheckstart: '%s', key '%s'",
comp->name.value, healthcheckKey->key);
/*
@@ -1811,7 +1805,7 @@
struct amf_healthcheck *healthcheck;
SaAisErrorT error = SA_AIS_OK;
- dprintf ("Healthcheckstop: '%s'", comp->name.value);
+ TRACE1 ("Healthcheckstop: '%s'", comp->name.value);
if (!amf_su_is_local (comp->su)) {
return SA_AIS_OK;
@@ -1843,8 +1837,7 @@
*/
void amf_comp_instantiate (struct amf_comp *comp)
{
- ENTER ("'%s' SU '%s'", getSaNameT (&comp->name),
- getSaNameT (&comp->su->name));
+ ENTER ();
switch (comp->saAmfCompPresenceState) {
case SA_AMF_PRESENCE_RESTARTING:
@@ -1860,7 +1853,7 @@
}
break;
default:
- dprintf("Instantiate ignored in Component presence state %d",
+ TRACE1("Instantiate ignored in Component presence state %d",
comp->saAmfCompPresenceState);
break;
}
@@ -1868,9 +1861,7 @@
void amf_comp_cleanup_tmo_event (struct amf_comp *comp)
{
- ENTER ("Comp cleanup timeout after %d ms '%s' '%s'",
- comp->saAmfCompCleanupTimeout, comp->su->name.value,
- comp->name.value);
+ ENTER ();
amf_comp_error_suspected_clear(comp);
amf_comp_operational_state_set (comp, SA_AMF_OPERATIONAL_DISABLED);
comp_presence_state_set (comp, SA_AMF_PRESENCE_TERMINATION_FAILED);
@@ -1878,9 +1869,7 @@
void amf_comp_instantiate_tmo_event (struct amf_comp *comp)
{
- ENTER ("Comp instantiate timeout after %d ms '%s' '%s'",
- comp->saAmfCompInstantiateTimeout, comp->su->name.value,
- comp->name.value);
+ ENTER ();
switch (comp->saAmfCompPresenceState) {
case SA_AMF_PRESENCE_RESTARTING:
@@ -1897,7 +1886,7 @@
assert (comp->instantiate_timeout_handle == 0);
break;
default:
- dprintf("Presence state = %d", comp->saAmfCompPresenceState);
+ TRACE1("Presence state = %d", comp->saAmfCompPresenceState);
assert (0);
break;
}
@@ -1906,14 +1895,14 @@
void amf_comp_instantiate_event (struct amf_comp *component)
{
int res;
- ENTER ("");
+ ENTER ();
switch (component->saAmfCompPresenceState) {
case SA_AMF_PRESENCE_INSTANTIATING:
case SA_AMF_PRESENCE_INSTANTIATED:
case SA_AMF_PRESENCE_TERMINATING:
case SA_AMF_PRESENCE_INSTANTIATION_FAILED:
case SA_AMF_PRESENCE_TERMINATION_FAILED:
- dprintf("Instantiate ignored in Component presence state %d",
+ TRACE1("Instantiate ignored in Component presence state %d",
component->saAmfCompPresenceState);
break;
case SA_AMF_PRESENCE_UNINSTANTIATED:
@@ -1934,7 +1923,7 @@
}
break;
default:
- dprintf("Component presence state %d",
+ TRACE1("Component presence state %d",
component->saAmfCompPresenceState);
assert (0);
break;
@@ -2033,7 +2022,7 @@
struct component_terminate_callback_data *component_terminate_callback_data;
component_terminate_callback_data = data;
- dprintf ("Lib component terminate callback response, error: %d", error);
+ TRACE1 ("Lib component terminate callback response, error: %d", error);
amf_comp_healthcheck_deactivate (component_terminate_callback_data->comp);
escalation_policy_restart (component_terminate_callback_data->comp);
return 1;
@@ -2072,11 +2061,11 @@
switch (interface) {
case AMF_RESPONSE_CSISETCALLBACK: {
- ENTER("'%s'", dn->value);
+ ENTER();
csi_assignment = amf_csi_assignment_find (amf_cluster, dn);
assert (csi_assignment != NULL);
comp = csi_assignment->comp;
- dprintf ("CSI '%s' set callback response from '%s', error: %d",
+ TRACE1 ("CSI '%s' set callback response from '%s', error: %d",
csi_assignment->csi->name.value,
csi_assignment->comp->name.value, error);
comp = csi_assignment->comp;
@@ -2092,10 +2081,10 @@
break;
}
case AMF_RESPONSE_CSIREMOVECALLBACK: {
- ENTER("'%s'", dn->value);
+ ENTER();
csi_assignment = amf_csi_assignment_find (amf_cluster, dn);
assert (csi_assignment != NULL);
- dprintf ("Lib csi '%s' remove callback response from '%s', error: %d",
+ TRACE1 ("Lib csi '%s' remove callback response from '%s', error: %d",
csi_assignment->csi->name.value,
csi_assignment->comp->name.value, error);
comp = csi_assignment->comp;
@@ -2108,7 +2097,7 @@
break;
}
case AMF_RESPONSE_HEALTHCHECKCALLBACK: {
- dprintf("AMF_RESPONSE_HEALTHCHECKCALLBACK for %s", dn->value);
+ TRACE1("AMF_RESPONSE_HEALTHCHECKCALLBACK for %s", dn->value);
comp = amf_comp_find (amf_cluster, dn);
assert (comp);
@@ -2124,7 +2113,7 @@
#if 0
case AMF_RESPONSE_COMPONENTTERMINATECALLBACK: {
struct component_terminate_callback_data *callback_data = data;
- dprintf ("Lib comp '%s' terminate callback response, error: %d",
+ TRACE1 ("Lib comp '%s' terminate callback response, error: %d",
callback_data->comp->name.value, error);
comp_presence_state_set (callback_data->comp,
SA_AMF_PRESENCE_UNINSTANTIATED);
@@ -2149,7 +2138,7 @@
struct amf_comp *component,
struct amf_csi_assignment *csi_assignment)
{
- ENTER ("'%s'", csi_assignment->csi->name.value);
+ ENTER ();
assert (component != NULL && csi_assignment != NULL);
@@ -2160,13 +2149,13 @@
if (csi_assignment->requested_ha_state == SA_AMF_HA_QUIESCED) {
csi_assignment->saAmfCSICompHAState = csi_assignment->requested_ha_state;
} else {
- dprintf ("csi_assignment->requested_ha_state = %d",
+ TRACE1 ("csi_assignment->requested_ha_state = %d",
component->error_suspected);
assert (0);
}
}
- LEAVE("");
+ LEAVE();
}
/**
@@ -2175,7 +2164,7 @@
*/
void amf_comp_terminate (struct amf_comp *comp)
{
- dprintf ("comp terminate '%s'\n", getSaNameT (&comp->name));
+ TRACE1 ("comp terminate '%s'\n", getSaNameT (&comp->name));
comp_presence_state_set (comp, SA_AMF_PRESENCE_TERMINATING);
if (amf_su_is_local (comp->su)) {
@@ -2197,7 +2186,7 @@
*/
void amf_comp_restart (struct amf_comp *comp)
{
- dprintf ("comp restart '%s'\n", getSaNameT (&comp->name));
+ TRACE1 ("comp restart '%s'\n", getSaNameT (&comp->name));
comp_presence_state_set (comp, SA_AMF_PRESENCE_RESTARTING);
comp->saAmfCompRestartCount += 1;
@@ -2223,7 +2212,7 @@
assert (comp != NULL && csi_name != NULL && ha_state != NULL);
- dprintf ("comp ha state get from comp '%s' CSI '%s'\n",
+ TRACE1 ("comp ha state get from comp '%s' CSI '%s'\n",
getSaNameT (&comp->name), csi_name->value);
assignment = csi_assignment_find_in (comp, csi_name);
@@ -2366,7 +2355,8 @@
int change_pending = 0;
struct amf_csi_assignment *csi_assignment;
- ENTER("saAmfCompPresenceState = %d", component->saAmfCompPresenceState);
+ ENTER();
+
amf_comp_error_suspected_clear (component);
if (component->saAmfCompPresenceState == SA_AMF_PRESENCE_INSTANTIATING ||
component->saAmfCompPresenceState == SA_AMF_PRESENCE_RESTARTING ||
@@ -2713,7 +2703,7 @@
{
struct res_lib_amf_csiremovecallback res_lib;
- ENTER("");
+ ENTER();
res_lib.header.id = MESSAGE_RES_AMF_CSIREMOVECALLBACK;
res_lib.header.size = sizeof (struct res_lib_amf_csiremovecallback);
Index: services/amfsg.c
===================================================================
--- services/amfsg.c (revision 1656)
+++ services/amfsg.c (working copy)
@@ -429,7 +429,7 @@
static void sg_defer_event (amf_sg_event_type_t event_type,
sg_event_t *sg_event)
{
- ENTER("Defered event = %d", event_type);
+ ENTER();
amf_fifo_put (event_type, &sg_event->sg->deferred_events,
sizeof (sg_event_t),
sg_event);
@@ -439,7 +439,7 @@
{
sg_event_t sg_event;
- ENTER ("%s", sg->name.value);
+ ENTER ();
if (amf_fifo_get (&sg->deferred_events, &sg_event)) {
switch (sg_event.event_type) {
case SG_FAILOVER_SU_EV:
@@ -455,7 +455,7 @@
case SG_START_EV:
case SG_AUTO_ADJUST_EV:
default:
- dprintf("event_type = %d", sg_event.event_type);
+ TRACE1("event_type = %d", sg_event.event_type);
break;
}
}
@@ -464,7 +464,7 @@
static void timer_function_sg_recall_deferred_events (void *data)
{
amf_sg_t *sg = (amf_sg_t*)data;
- ENTER ("");
+ ENTER ();
sg_recall_deferred_events (sg);
}
@@ -473,7 +473,7 @@
{
SaNameT dn;
- ENTER ("sg: %s state: %d", sg->name.value, sg->avail_state);
+ ENTER ();
sg->avail_state = SG_AC_Idle;
if (sg->recovery_scope.event_type != 0) {
@@ -604,7 +604,7 @@
static void acsm_enter_terminating_suspected (struct amf_sg *sg)
{
struct amf_su **sus= sg->recovery_scope.sus;
- ENTER("%s",sg->name.value);
+ ENTER();
sg->avail_state = SG_AC_TerminatingSuspected;
/*
* Terminate suspected SU(s)
@@ -636,7 +636,7 @@
{
amf_sg_t *sg = (amf_sg_t *)data;
- ENTER ("");
+ ENTER ();
dependent_si_deactivated_cbfn2 (sg);
}
@@ -712,7 +712,7 @@
sg->avail_state = SG_AC_DeactivatingDependantWorkload;
- ENTER("'%s'",sg->name.value);
+ ENTER();
/*
* For each SI in the recovery scope, find all active
* assignments and request them to be deactivated.
@@ -746,7 +746,7 @@
if (callback_pending == 0) {
static corosync_timer_handle_t dependent_si_deactivated_handle;
- ENTER("");
+ ENTER();
api->timer_add_duration (
0, sg,
timer_function_dependent_si_deactivated2,
@@ -764,7 +764,7 @@
struct amf_si_assignment *si_assignment;
int is_no_standby_activated = 1;
- ENTER("'%s'",sg->name.value);
+ ENTER();
sg->avail_state = SG_AC_ActivatingStandby;
/*
@@ -800,7 +800,7 @@
int is_any_su_instantiated = 0;
const int PERFORMS_INSTANTIATING = 1;
- ENTER("'%s'",sg->name.value);
+ ENTER();
sg->avail_state = SG_AC_ReparingSu;
/*
* Instantiate SUs in current recovery scope until the configured
@@ -835,7 +835,7 @@
static inline void remove_all_suspected_sus (amf_sg_t *sg)
{
amf_su_t *su;
- ENTER("");
+ ENTER();
for (su = sg->su_head; su != NULL; su =su->next) {
amf_comp_t *component;
@@ -946,7 +946,7 @@
*/
static void assume_standby_si_assignment_for_spare_sus (amf_sg_t *sg)
{
- ENTER("");
+ ENTER();
assign_si (sg, 0);
}
@@ -957,7 +957,7 @@
*/
static void acsm_enter_assigning_standby_to_spare (amf_sg_t *sg)
{
- ENTER("%s", sg->name.value);
+ ENTER();
sg->avail_state = SG_AC_AssigningStandbyToSpare;
if (is_spare_sus (sg)) {
@@ -971,7 +971,7 @@
acsm_enter_repairing_su (sg);
break;
default:
- dprintf("event_type %d",sg->recovery_scope.event_type);
+ TRACE1("event_type %d",sg->recovery_scope.event_type);
assert (0);
break;
}
@@ -1006,8 +1006,6 @@
int number_of_si = 2; /* It shall be at least two */
struct amf_si **tmp_sis= sg->recovery_scope.sis;
- ENTER ("'%s'", si->name.value);
-
while (*tmp_sis != NULL) {
number_of_si++;
tmp_sis++;
@@ -1037,7 +1035,7 @@
int number_of_su = 2; /* It shall be at least two */
struct amf_su **tmp_sus= sg->recovery_scope.sus;
- ENTER ("'%s'", su->name.value);
+ ENTER ();
while (*tmp_sus != NULL) {
number_of_su++;
tmp_sus++;
@@ -1096,15 +1094,15 @@
}
sus = sg->recovery_scope.sus;
- dprintf("The following sus are within the scope:\n");
+ TRACE1("The following sus are within the scope:\n");
while (*sus != NULL) {
- dprintf("%s\n", (*sus)->name.value);
+ TRACE1("%s\n", (*sus)->name.value);
sus++;
}
sis= sg->recovery_scope.sis;
- dprintf("The following sis are within the scope:\n");
+ TRACE1("The following sis are within the scope:\n");
while (*sis != NULL) {
- dprintf("%s\n", (*sis)->name.value);
+ TRACE1("%s\n", (*sis)->name.value);
sis++;
}
}
@@ -1116,7 +1114,7 @@
struct amf_su **sus;
struct amf_su *su;
- ENTER ("'%s'", node->name.value);
+ ENTER ();
sg->recovery_scope.event_type = SG_FAILOVER_NODE_EV;
sg->recovery_scope.node = node;
sg->recovery_scope.comp = NULL;
@@ -1153,15 +1151,15 @@
}
sus = sg->recovery_scope.sus;
- dprintf("The following sus are within the scope:\n");
+ TRACE1("The following sus are within the scope:\n");
while (*sus != NULL) {
- dprintf("%s\n", (*sus)->name.value);
+ TRACE1("%s\n", (*sus)->name.value);
sus++;
}
sis = sg->recovery_scope.sis;
- dprintf("The following sis are within the scope:\n");
+ TRACE1("The following sis are within the scope:\n");
while (*sis != NULL) {
- dprintf("%s\n", (*sis)->name.value);
+ TRACE1("%s\n", (*sis)->name.value);
sis++;
}
}
@@ -1184,7 +1182,7 @@
amf_si_assignment_t *to_be_removed = si_assignment_tmp;
*prev = si_assignment_tmp->next;
- dprintf ("SI assignment %s unlinked",
+ TRACE1 ("SI assignment %s unlinked",
to_be_removed->name.value);
free (to_be_removed);
} else {
@@ -1205,7 +1203,7 @@
struct amf_si_assignment *si_assignment;
struct amf_si_assignment **prev;
- ENTER ("'%s'", su->name.value);
+ ENTER ();
for (si = su->sg->application->si_head; si != NULL; si = si->next) {
@@ -1224,7 +1222,7 @@
if (si_assignment->su == su) {
struct amf_si_assignment *tmp = si_assignment;
*prev = si_assignment->next;
- dprintf ("SI assignment %s unlinked", tmp->name.value);
+ TRACE1 ("SI assignment %s unlinked", tmp->name.value);
free (tmp);
} else {
prev = &si_assignment->next;
@@ -1299,7 +1297,7 @@
{
amf_si_assignment_t *si_assignment = si_assignment_in;
- ENTER("");
+ ENTER();
delete_si_assignment (si_assignment);
/*
@@ -1323,7 +1321,7 @@
amf_su_t *standby_su;
int removed = 0;
- ENTER("'%s'", sg->name.value);
+ ENTER();
/*
* For each SI in the recovery scope, find a standby
@@ -1375,7 +1373,7 @@
*/
static void acsm_enter_removing_standby_assignments (amf_sg_t *sg)
{
- ENTER("SG: %s", sg->name.value);
+ ENTER();
sg->avail_state = SG_AC_RemovingStandbyAssignments;
if (sg->saAmfSGRedundancyModel == SA_AMF_NPM_REDUNDANCY_MODEL) {
@@ -1530,7 +1528,7 @@
int si_left;
int si_total;
int su_left_to_assign = su_active_assign;
- ENTER("SG: %s", sg->name.value);
+ ENTER();
si_total = sg_si_count_get (sg);
si_left = si_total;
@@ -1570,13 +1568,13 @@
su = su->next;
su_left_to_assign -= 1;
si_left -= assigned;
- dprintf (" su_left_to_assign =%d, si_left=%d\n",
+ TRACE1 (" su_left_to_assign =%d, si_left=%d\n",
su_left_to_assign, si_left);
}
assert (total_assigned <= si_total);
if (total_assigned == 0) {
- dprintf ("Info: No SIs assigned");
+ TRACE1 ("Info: No SIs assigned");
}
return total_assigned;
@@ -1593,7 +1591,7 @@
int si_total;
int su_left_to_assign = su_standby_assign;
- ENTER ("'%s'", sg->name.value);
+ ENTER ();
if (su_standby_assign == 0) {
return 0;
@@ -1635,7 +1633,7 @@
}
su_left_to_assign -= 1;
si_left -= assigned;
- dprintf (" su_left_to_assign =%d, si_left=%d\n",
+ TRACE1 (" su_left_to_assign =%d, si_left=%d\n",
su_left_to_assign, si_left);
su = su->next;
@@ -1643,7 +1641,7 @@
assert (total_assigned <= si_total);
if (total_assigned == 0) {
- dprintf ("Info: No SIs assigned!");
+ TRACE1 ("Info: No SIs assigned!");
}
return total_assigned;
@@ -1726,7 +1724,7 @@
int assigned = 0;
int active_out_of_service = 0;
int standby_out_of_service = 0;
- ENTER ("'%s'", sg->name.value);
+ ENTER ();
/**
* Phase 1: Calculate assignments and create all runtime objects in
@@ -1760,7 +1758,7 @@
}
- dprintf ("(inservice=%d) (active_sus_needed=%d) (standby_sus_needed=%d)"
+ TRACE1 ("(inservice=%d) (active_sus_needed=%d) (standby_sus_needed=%d)"
"\n",
inservice_count, active_sus_needed, standby_sus_needed);
@@ -1768,7 +1766,7 @@
* to assign based upon reduction procedure
*/
if ((inservice_count < active_sus_needed - active_out_of_service)) {
- dprintf ("assignment VI - partial assignment with SIs drop outs\n");
+ TRACE1 ("assignment VI - partial assignment with SIs drop outs\n");
su_active_assign = inservice_count;
su_standby_assign = 0;
@@ -1776,7 +1774,7 @@
} else
if ((inservice_count < active_sus_needed - active_out_of_service +
standby_sus_needed)) {
- dprintf ("assignment V - partial assignment with reduction of"
+ TRACE1 ("assignment V - partial assignment with reduction of"
" standby units\n");
su_active_assign = active_sus_needed;
@@ -1784,7 +1782,7 @@
su_spare_assign = 0;
} else
if ((inservice_count < sg->saAmfSGNumPrefActiveSUs + standby_sus_needed)) {
- dprintf ("IV: full assignment with reduction of active service"
+ TRACE1 ("IV: full assignment with reduction of active service"
" units\n");
su_active_assign = inservice_count - standby_sus_needed;
su_standby_assign = standby_sus_needed;
@@ -1792,7 +1790,7 @@
} else
if ((inservice_count <
sg->saAmfSGNumPrefActiveSUs + sg->saAmfSGNumPrefStandbySUs)) {
- dprintf ("III: full assignment with reduction of standby service"
+ TRACE1 ("III: full assignment with reduction of standby service"
" units\n");
su_active_assign = sg->saAmfSGNumPrefActiveSUs;
su_standby_assign = inservice_count - sg->saAmfSGNumPrefActiveSUs;
@@ -1801,23 +1799,23 @@
if ((inservice_count ==
sg->saAmfSGNumPrefActiveSUs + sg->saAmfSGNumPrefStandbySUs)) {
if (sg->saAmfSGNumPrefInserviceSUs > inservice_count) {
- dprintf ("II: full assignment with spare reduction\n");
+ TRACE1 ("II: full assignment with spare reduction\n");
} else {
- dprintf ("II: full assignment without spares\n");
+ TRACE1 ("II: full assignment without spares\n");
}
su_active_assign = sg->saAmfSGNumPrefActiveSUs;
su_standby_assign = sg->saAmfSGNumPrefStandbySUs;
su_spare_assign = 0;
} else {
- dprintf ("I: full assignment with spares\n");
+ TRACE1 ("I: full assignment with spares\n");
su_active_assign = sg->saAmfSGNumPrefActiveSUs;
su_standby_assign = sg->saAmfSGNumPrefStandbySUs;
su_spare_assign = inservice_count -
sg->saAmfSGNumPrefActiveSUs - sg->saAmfSGNumPrefStandbySUs;
}
- dprintf ("(inservice=%d) (assigning active=%d) (assigning standby=%d)"
+ TRACE1 ("(inservice=%d) (assigning active=%d) (assigning standby=%d)"
" (assigning spares=%d)\n",
inservice_count, su_active_assign, su_standby_assign, su_spare_assign);
@@ -1851,7 +1849,7 @@
}
}
- LEAVE ("'%s'", sg->name.value);
+ LEAVE ();
return assigned;
}
@@ -1948,7 +1946,7 @@
*/
static void sg_su_state_changed_to_instantiated (struct amf_sg *sg, struct amf_su *su)
{
- ENTER("%s %s",sg->name.value, su->name.value);
+ ENTER();
switch (sg->avail_state) {
case SG_AC_InstantiatingServiceUnits:
if (no_su_has_presence_state(sg, sg->node_to_start,
@@ -1969,13 +1967,13 @@
acsm_enter_idle (sg);
}
} else {
- dprintf ("avail-state: %u", sg->avail_state);
+ TRACE1 ("avail-state: %u", sg->avail_state);
assert (0);
}
}
break;
default:
- dprintf ("avail-state: %u", sg->avail_state);
+ TRACE1 ("avail-state: %u", sg->avail_state);
assert (0);
break;
}
@@ -1990,7 +1988,7 @@
static void amf_sg_su_state_changed_to_uninstantiated (amf_sg_t *sg,
amf_su_t *su)
{
- ENTER("%s %s",sg->name.value, su->name.value);
+ ENTER();
switch (sg->avail_state) {
case SG_AC_TerminatingSuspected:
if (no_su_has_presence_state(sg, sg->node_to_start,
@@ -2042,7 +2040,7 @@
static void amf_sg_su_state_changed_to_termination_failed (amf_sg_t *sg,
amf_su_t *su)
{
- ENTER("%s %s",sg->name.value, su->name.value);
+ ENTER();
if (no_su_has_presence_state(sg, sg->node_to_start,
SA_AMF_PRESENCE_TERMINATING)) {
if (is_comp_in_active_ha_state_nplusm (sg, su)) {
@@ -2078,7 +2076,7 @@
static void amf_sg_su_state_changed_to_instantiation_failed (amf_sg_t *sg,
amf_su_t *su)
{
- ENTER("%s %s",sg->name.value, su->name.value);
+ ENTER();
switch (sg->avail_state) {
case SG_AC_InstantiatingServiceUnits:
if (no_su_has_presence_state(sg, sg->node_to_start,
@@ -2103,7 +2101,7 @@
break;
default:
/* TODO: Insert the assert (0) until solving defers in SU */
- dprintf("sg->avail_state = %d", sg->avail_state);
+ TRACE1("sg->avail_state = %d", sg->avail_state);
break;
}
}
@@ -2123,7 +2121,7 @@
{
sg->recovery_scope.event_type = SG_START_EV;
- ENTER ("'%s'", sg->name.value);
+ ENTER ();
int instantiated_sus = 0;
switch (sg->avail_state) {
@@ -2133,7 +2131,7 @@
amf_su_t *su;
sg_avail_control_state_t old_avail_state = sg->avail_state;
- ENTER ("'%s'", sg->name.value);
+ ENTER ();
sg->node_to_start = node;
@@ -2221,7 +2219,7 @@
*/
void amf_sg_failover_node_req (struct amf_sg *sg, struct amf_node *node)
{
- ENTER("'%s, %s'",node->name.value, sg->name.value);
+ ENTER();
sg_event_t sg_event;
switch (sg->avail_state) {
@@ -2239,8 +2237,7 @@
while (*sus != NULL) {
amf_su_t *su = *sus;
- ENTER("SU %s pr_state='%d'",su->name.value,
- su->saAmfSUPresenceState);
+ ENTER();
if (su_presense_state_is_ored (su,
SA_AMF_PRESENCE_UNINSTANTIATED,
@@ -2296,7 +2293,7 @@
void amf_sg_failover_su_req (struct amf_sg *sg, struct amf_su *su,
struct amf_node *node)
{
- ENTER ("%s", su->name.value);
+ ENTER ();
sg_event_t sg_event;
switch (sg->avail_state) {
@@ -2340,8 +2337,7 @@
void amf_sg_su_state_changed_2 (struct amf_sg *sg,
struct amf_su *su, SaAmfStateT type, int state)
{
- ENTER ("'%s' SU '%s' state %s",
- sg->name.value, su->name.value, amf_presence_state(state));
+ ENTER ();
if (type == SA_AMF_PRESENCE_STATE) {
if (state == SA_AMF_PRESENCE_INSTANTIATED) {
@@ -2362,11 +2358,11 @@
}
} else {
- dprintf ("avail-state: %u", sg->avail_state);
+ TRACE1 ("avail-state: %u", sg->avail_state);
assert (0);
}
} else {
- dprintf ("avail-state: %u", sg->avail_state);
+ TRACE1 ("avail-state: %u", sg->avail_state);
assert (0);
}
} else if (state == SA_AMF_PRESENCE_UNINSTANTIATED) {
@@ -2396,7 +2392,7 @@
acsm_enter_idle (sg);
}
} else {
- dprintf("%d",sg->avail_state);
+ TRACE1("%d",sg->avail_state);
assert (0);
}
}
@@ -2444,11 +2440,11 @@
}
} else {
/* TODO: Insert the assert (0) until solving defers in SU */
- dprintf("sg->avail_state = %d, su instantiation state = %d",
+ TRACE1("sg->avail_state = %d, su instantiation state = %d",
sg->avail_state, state);
}
} else {
- dprintf("sg->avail_state = %d, su instantiation state = %d",
+ TRACE1("sg->avail_state = %d, su instantiation state = %d",
sg->avail_state, state);
assert (0);
}
@@ -2467,8 +2463,7 @@
void amf_sg_su_state_changed (struct amf_sg *sg, struct amf_su *su,
SaAmfStateT type, int state)
{
- ENTER ("'%s' SU '%s' state %s",
- sg->name.value, su->name.value, amf_presence_state(state));
+ ENTER ();
if (sg->avail_state != SG_AC_Idle) {
if (type == SA_AMF_PRESENCE_STATE) {
@@ -2492,7 +2487,7 @@
; /* nop */
break;
default :
- dprintf("sg->avail_state = %d, su instantiation state = %d",
+ TRACE1("sg->avail_state = %d, su instantiation state = %d",
sg->avail_state, state);
assert (0);
break;
@@ -2510,7 +2505,7 @@
{
struct amf_su **sus = sg->recovery_scope.sus;
- ENTER("'%s'", sg->name.value);
+ ENTER();
/*
* Select next state depending on if some
@@ -2520,8 +2515,7 @@
while (*sus != NULL) {
amf_su_t *su = *sus;
- ENTER("SU %s pr_state='%d'",su->name.value,
- su->saAmfSUPresenceState);
+ ENTER();
if (su_presense_state_is_ored (su,
SA_AMF_PRESENCE_UNINSTANTIATED,
@@ -2554,7 +2548,7 @@
struct amf_su **sus = sg->recovery_scope.sus;
struct amf_su *su;
- ENTER ("'%s', %d", si_assignment->si->name.value, result);
+ ENTER ();
/*
* If all SI assignments for all SUs in the SG are not pending,
@@ -2599,7 +2593,7 @@
acsm_enter_removing_standby_assignments (sg);
}
}
- LEAVE("");
+ LEAVE();
}
/**
@@ -2615,7 +2609,7 @@
int si_assignment_cnt = 0;
int confirmed_assignments = 0;
- ENTER ("'%s', %d", si_assignment->si->name.value, result);
+ ENTER ();
switch (sg->avail_state) {
@@ -2624,7 +2618,7 @@
acsm_enter_idle (sg);
amf_application_sg_assigned (sg->application, sg);
} else {
- dprintf ("%d, %d", si_assignment_cnt, confirmed_assignments);
+ TRACE1 ("%d, %d", si_assignment_cnt, confirmed_assignments);
}
break;
case SG_AC_AssigningWorkload:
@@ -2660,7 +2654,7 @@
}
break;
default:
- dprintf ("%d, %d, %d", sg->avail_state, si_assignment_cnt,
+ TRACE1 ("%d, %d, %d", sg->avail_state, si_assignment_cnt,
confirmed_assignments);
amf_runtime_attributes_print (amf_cluster);
assert (0);
@@ -2680,7 +2674,7 @@
struct amf_su **sus = si_assignment->su->sg->recovery_scope.sus;
struct amf_si **sis = si_assignment->su->sg->recovery_scope.sis;
- ENTER ("'%s', %d", si_assignment->si->name.value, result);
+ ENTER ();
/*
* If all SI assignments for all SIs in the scope are activated, goto next
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
