From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Wed, 7 Nov 2007 15:29:36 +0000 (+0000)
Subject: update fix
X-Git-Tag: v0.12.20~758
X-Git-Url: https://git.lttng.org/?a=commitdiff_plain;h=af7b2c3459f0448f25ca00389f70813446e5470a;p=lttv.git

update fix

git-svn-id: http://ltt.polymtl.ca/svn@2731 04897980-b3bd-0310-b5e0-8ef037075253
---

diff --git a/ltt/branches/poly/ltt/marker.c b/ltt/branches/poly/ltt/marker.c
index aacfa00c..a439ec93 100644
--- a/ltt/branches/poly/ltt/marker.c
+++ b/ltt/branches/poly/ltt/marker.c
@@ -407,10 +407,15 @@ int marker_format_event(LttTrace *trace, GQuark name, const char *format)
   struct marker_info *info;
   
   info = marker_get_info_from_name(trace, name);
-  if (!info)
-    g_error("Got marker format \"%s\", but marker name \"%s\" has no ID yet. "
-            "Kernel issue.",
-            format, g_quark_to_string(name));
+  if (!info) {
+    /* We ignore marker format that does not have IDs. It just means that it
+     * is only used by someone else's probe.
+     */
+    //g_error("Got marker format \"%s\", but marker name \"%s\" has no ID yet. "
+    //        "Kernel issue.",
+    //        format, g_quark_to_string(name));
+    return 0;
+  }
   for (; info != NULL; info = info->next) {
     if (info->format)
       g_free(info->format);