X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttv%2Flttv%2Fsync%2Fevent_processing_lttng_common.c;h=892d2028c388e8704e1ba042fce9d56de671f171;hb=b91d16695a53ce2a6159640b5a3fe5a5ec2cd980;hp=8f1d2dcbc3a249af70e8e5f2c62fc1da6c51c2c9;hpb=f6691532b67cb6911749118e3da8d74de876380c;p=lttv.git

diff --git a/lttv/lttv/sync/event_processing_lttng_common.c b/lttv/lttv/sync/event_processing_lttng_common.c
index 8f1d2dcb..892d2028 100644
--- a/lttv/lttv/sync/event_processing_lttng_common.c
+++ b/lttv/lttv/sync/event_processing_lttng_common.c
@@ -1,19 +1,18 @@
 /* This file is part of the Linux Trace Toolkit viewer
- * Copyright (C) 2009 Benjamin Poirier <benjamin.poirier@polymtl.ca>
+ * Copyright (C) 2009, 2010 Benjamin Poirier <benjamin.poirier@polymtl.ca>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License Version 2 as
- * published by the Free Software Foundation;
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or (at
+ * your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+ * License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -24,11 +23,6 @@
 #include "event_processing_lttng_common.h"
 
 
-#ifndef g_info
-#define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format)
-#endif
-
-
 /*
  * Initialize the GQuarks needed to register the event hooks for
  * synchronization
@@ -124,7 +118,7 @@ void registerHooks(GArray* hookListList, LttvTracesetContext* const
 			.eventName= LTT_EVENT_UDPV4_RCV_EXTENDED,
 			.fields= FIELD_ARRAY(LTT_FIELD_SKB, LTT_FIELD_SADDR,
 				LTT_FIELD_DADDR, LTT_FIELD_UNICAST, LTT_FIELD_ULEN,
-				LTT_FIELD_DATA_START),
+				LTT_FIELD_SOURCE, LTT_FIELD_DEST, LTT_FIELD_DATA_START),
 			.eventTypes[TCP]= false,
 			.eventTypes[UDP]= true,
 		}
@@ -147,12 +141,12 @@ void registerHooks(GArray* hookListList, LttvTracesetContext* const
 			guint old_len;
 			bool registerHook;
 
-			registerHook= true;
+			registerHook= false;
 			for (k= 0; k < TYPE_COUNT; k++)
 			{
-				if (eventTypes[k] && eventHookInfoList[j].eventTypes[k] == false)
+				if (eventTypes[k] && eventHookInfoList[j].eventTypes[k])
 				{
-					registerHook= false;
+					registerHook= true;
 					break;
 				}
 			}
@@ -246,6 +240,7 @@ void unregisterHooks(GArray* hookListList, LttvTracesetContext* const
 			}
 		}
 
+		lttv_trace_hook_remove_all(&hookList);
 		g_array_free(hookList, TRUE);
 	}
 	g_array_free(hookListList, TRUE);