Attachment 616560 Details for Bug 838743 – Move some totem and cpg messages to trace level

[patch] Move some totem and cpg messages to trace level

2012-09-19-0002-Move-some-totem-and-cpg-messages-to-trace-level.patch (text/plain), 3.64 KB, created by Jan Friesse on 2012-09-24 13:35:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Friesse

Created: 2012-09-24 13:35:17 UTC

Size: 3.64 KB

patch

obsolete

>From 4a4109d640d586908e7880cc0dcd9e33598b01f0 Mon Sep 17 00:00:00 2001
>From: Jan Friesse <jfriesse@redhat.com>
>Date: Wed, 19 Sep 2012 15:58:13 +0200
>Subject: [PATCH 2/2] Move some totem and cpg messages to trace level
>
>Messages which are flow messages, rather then lifecycle are now
>logged in trace level.
>
>Signed-off-by: Jan Friesse <jfriesse@redhat.com>
>---
> exec/totemsrp.c |   30 +++++++++++++++++++-----------
> services/cpg.c  |    2 +-
> 2 files changed, 20 insertions(+), 12 deletions(-)
>
>diff --git a/exec/totemsrp.c b/exec/totemsrp.c
>index 9711366..67de157 100644
>--- a/exec/totemsrp.c
>+++ b/exec/totemsrp.c
>@@ -637,6 +637,19 @@ do {									\
> 		format, ##args);					\
> } while (0);
> 
>+#define TRACE(recid, format, args...) do {				\
>+	instance->totemsrp_log_printf (					\
>+		LOGSYS_ENCODE_RECID(LOGSYS_LEVEL_DEBUG,			\
>+				    instance->totemsrp_subsys_id,	\
>+				    recid),				\
>+		 __FUNCTION__, __FILE__, __LINE__,			\
>+		format, ##args);					\
>+} while(0)
>+
>+#define TRACE1(format, args...) do {					\
>+	TRACE(LOGSYS_RECID_TRACE1, format, ##args);			\
>+} while(0)
>+
> static void totemsrp_instance_initialize (struct totemsrp_instance *instance)
> {
> 	memset (instance, 0, sizeof (struct totemsrp_instance));
>@@ -1707,8 +1720,7 @@ static void memb_state_operational_enter (struct totemsrp_instance *instance)
> 
> 	deliver_messages_from_recovery_to_regular (instance);
> 
>-	log_printf (instance->totemsrp_log_level_debug,
>-		"Delivering to app %x to %x\n",
>+	TRACE1 ("Delivering to app %x to %x\n",
> 		instance->my_high_delivered + 1, instance->old_ring_state_high_seq_received);
> 
> 	aru_save = instance->my_aru;
>@@ -2229,7 +2241,7 @@ int totemsrp_mcast (
> 
> 	message_item.msg_len = addr_idx;
> 
>-	log_printf (instance->totemsrp_log_level_debug, "mcasted message added to pending queue\n");
>+	TRACE1 ("mcasted message added to pending queue\n");
> 	instance->stats.mcast_tx++;
> 	cs_queue_item_add (&instance->new_message_queue, &message_item);
> 
>@@ -2351,8 +2363,7 @@ static void messages_free (
> 	instance->last_released += range;
> 
>  	if (log_release) {
>-		log_printf (instance->totemsrp_log_level_debug,
>-			"releasing messages up to and including %x\n", release_to);
>+		TRACE1 ("releasing messages up to and including %x\n", release_to);
> 	}
> }
> 
>@@ -3704,8 +3715,7 @@ static void messages_deliver_to_app (
> 	range = end_point - instance->my_high_delivered;
> 
> 	if (range) {
>-		log_printf (instance->totemsrp_log_level_debug,
>-			"Delivering %x to %x\n", instance->my_high_delivered,
>+		TRACE1 ("Delivering %x to %x\n", instance->my_high_delivered,
> 			end_point);
> 	}
> 	assert (range < QUEUE_RTR_ITEMS_SIZE_MAX);
>@@ -3773,8 +3783,7 @@ static void messages_deliver_to_app (
> 		/*
> 		 * Message found
> 		 */
>-		log_printf (instance->totemsrp_log_level_debug,
>-			"Delivering MCAST message with seq %x to pending delivery queue\n",
>+		TRACE1 ("Delivering MCAST message with seq %x to pending delivery queue\n",
> 			mcast_header.seq);
> 
> 		/*
>@@ -3863,8 +3872,7 @@ static int message_handler_mcast (
> 		return (0);
> 	}
> 
>-	log_printf (instance->totemsrp_log_level_debug,
>-		"Received ringid(%s:%lld) seq %x\n",
>+	TRACE1 ("Received ringid(%s:%lld) seq %x\n",
> 		totemip_print (&mcast_header.ring_id.rep),
> 		mcast_header.ring_id.seq,
> 		mcast_header.seq);
>diff --git a/services/cpg.c b/services/cpg.c
>index 885a9c6..ee992cd 100644
>--- a/services/cpg.c
>+++ b/services/cpg.c
>@@ -1462,7 +1462,7 @@ static void message_handler_req_lib_cpg_mcast (void *conn, const void *message)
> 	int result;
>  	cs_error_t error = CPG_ERR_NOT_EXIST;
> 
>-	log_printf(LOGSYS_LEVEL_DEBUG, "got mcast request on %p\n", conn);
>+	TRACE1("got mcast request on %p\n", conn);
> 
>  	switch (cpd->cpd_state) {
>  	case CPD_STATE_UNJOINED:
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 838743: 616559 | 616560