Adjust the marker names used for clock synchronization

... according to the patches posted to the ltt-dev list on 2009-10-21. There
are now regular and _extended version of the markers. Synchronization needs
the extended version.

Signed-off-by: Benjamin Poirier <benjamin.poirier@polymtl.ca>

diff --git a/lttv/lttv/sync/event_processing_lttng_common.c b/lttv/lttv/sync/event_processing_lttng_common.c
index 95f80c3cc6dd5d7d413c5a73d57d997c4d465f7a..a719fd6bd89455165c6bfea7d5a0a58db88c74e5 100644 (file)
--- a/lttv/lttv/sync/event_processing_lttng_common.c
+++ b/lttv/lttv/sync/event_processing_lttng_common.c
@@ -37,9 +37,9 @@ void createQuarks()
        LTT_CHANNEL_NET= g_quark_from_static_string("net");
        LTT_CHANNEL_NETIF_STATE= g_quark_from_static_string("netif_state");
 
-       LTT_EVENT_DEV_XMIT= g_quark_from_static_string("dev_xmit");
+       LTT_EVENT_DEV_XMIT_EXTENDED= g_quark_from_static_string("dev_xmit_extended");
        LTT_EVENT_DEV_RECEIVE= g_quark_from_static_string("dev_receive");
-       LTT_EVENT_TCPV4_RCV= g_quark_from_static_string("tcpv4_rcv");
+       LTT_EVENT_TCPV4_RCV_EXTENDED= g_quark_from_static_string("tcpv4_rcv_extended");
        LTT_EVENT_NETWORK_IPV4_INTERFACE=
                g_quark_from_static_string("network_ipv4_interface");
 
@@ -92,7 +92,7 @@ void registerHooks(GArray* hookListList, LttvTracesetContext* const
        } eventHookInfoList[] = {
                {
                        .channelName= LTT_CHANNEL_NET,
-                       .eventName= LTT_EVENT_DEV_XMIT,
+                       .eventName= LTT_EVENT_DEV_XMIT_EXTENDED,
                        .fields= FIELD_ARRAY(LTT_FIELD_SKB, LTT_FIELD_NETWORK_PROTOCOL,
                                LTT_FIELD_TRANSPORT_PROTOCOL, LTT_FIELD_SADDR,
                                LTT_FIELD_DADDR, LTT_FIELD_TOT_LEN, LTT_FIELD_IHL,
@@ -105,7 +105,7 @@ void registerHooks(GArray* hookListList, LttvTracesetContext* const
                        .fields= FIELD_ARRAY(LTT_FIELD_SKB, LTT_FIELD_PROTOCOL),
                }, {
                        .channelName= LTT_CHANNEL_NET,
-                       .eventName= LTT_EVENT_TCPV4_RCV,
+                       .eventName= LTT_EVENT_TCPV4_RCV_EXTENDED,
                        .fields= FIELD_ARRAY(LTT_FIELD_SKB, LTT_FIELD_SADDR,
                                LTT_FIELD_DADDR, LTT_FIELD_TOT_LEN, LTT_FIELD_IHL,
                                LTT_FIELD_SOURCE, LTT_FIELD_DEST, LTT_FIELD_SEQ,

diff --git a/lttv/lttv/sync/event_processing_lttng_common.h b/lttv/lttv/sync/event_processing_lttng_common.h
index aa34cfcc766a414c68dfd2e3ace08d3f61bfdd68..ee66058a1d917868bc2924669642e3c9dcdffe63 100644 (file)
--- a/lttv/lttv/sync/event_processing_lttng_common.h
+++ b/lttv/lttv/sync/event_processing_lttng_common.h
@@ -29,9 +29,9 @@ GQuark
        LTT_CHANNEL_NETIF_STATE;
 
 GQuark
-       LTT_EVENT_DEV_XMIT,
+       LTT_EVENT_DEV_XMIT_EXTENDED,
        LTT_EVENT_DEV_RECEIVE,
-       LTT_EVENT_TCPV4_RCV,
+       LTT_EVENT_TCPV4_RCV_EXTENDED,
        LTT_EVENT_NETWORK_IPV4_INTERFACE;
 
 GQuark

diff --git a/lttv/lttv/sync/event_processing_lttng_standard.c b/lttv/lttv/sync/event_processing_lttng_standard.c
index de2d86a4fa8dd8fc4a498cc74ac70d816a2996bb..218e7abf33751c99d772314ed73eb0d0998c1273 100644 (file)
--- a/lttv/lttv/sync/event_processing_lttng_standard.c
+++ b/lttv/lttv/sync/event_processing_lttng_standard.c
@@ -382,7 +382,7 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
                (long) time.tv_sec, time.tv_nsec, traceNum, trace,
                g_quark_to_string(info->name));
 
-       if (info->name == LTT_EVENT_DEV_XMIT)
+       if (info->name == LTT_EVENT_DEV_XMIT_EXTENDED)
        {
                Event* outE;
 
@@ -484,7 +484,7 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
                        g_debug("\n");
                }
        }
-       else if (info->name == LTT_EVENT_TCPV4_RCV)
+       else if (info->name == LTT_EVENT_TCPV4_RCV_EXTENDED)
        {
                Event* inE;
                void* skb;