Re: [devel] [PATCH 1/1] tools: Fix trace2dot, it stopped working after ticket #2165 [#2668]

2018-03-15 Thread Anders Widell 

Ack.

regards,

Anders Widell


On 03/09/2018 02:30 PM, Hans Nordeback wrote:

---
  tools/devel/dot/trace2dot | 22 +++---
  1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tools/devel/dot/trace2dot b/tools/devel/dot/trace2dot
index 160617c7a..1977276ea 100755
--- a/tools/devel/dot/trace2dot
+++ b/tools/devel/dot/trace2dot
@@ -2,7 +2,7 @@
  #
  #
  # (C) Copyright 2015 The OpenSAF Foundation
-# (C) Copyright Ericsson AB 2015, 2016, 2017. All rights reserved.
+# (C) Copyright Ericsson AB 2015, 2016, 2017, 2018. All rights reserved.
  #
  # This program is distributed in the hope that it will be useful, but
  # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -59,13 +59,13 @@ def check_infile(trace_file):
  trace_leave = set()
  for line in infile:
  items = line.split()
-if items.__len__() > 6:
-if items[5] == '>>':
-name = items[6].rstrip(':')
+if len(items) > 10:
+if items[9] == '>>':
+name = items[10].rstrip(':')
  trace_enter.add(name)
  
-if items[5] == '<<':

-name = items[6].rstrip(':')
+if items[9] == '<<':
+name = items[10].rstrip(':')
  trace_leave.add(name)
  
  for name in trace_enter:

@@ -86,9 +86,9 @@ def process_infile(infile, from_function, outfile):
  
  for line in infile:

  items = line.split()
-if items.__len__() > 6:
-if items[5] == '>>':
-func_enter = items[6].rstrip(':')
+if len(items) > 10:
+if items[9] == '>>':
+func_enter = items[10].rstrip(':')
  if from_function and not from_func_found:
  if from_function != func_enter:
  continue
@@ -108,8 +108,8 @@ def process_infile(infile, from_function, outfile):
  ' [ordering=out, color=red, shape=box, label="' +
  func_enter + '"];\n')
  
-if items[5] == '<<':

-func_leave = items[6].rstrip(':')
+if items[9] == '<<':
+func_leave = items[10].rstrip(':')
  if from_function:
  if from_function == func_leave:
  break



--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

[devel] [PATCH 1/1] tools: Fix trace2dot, it stopped working after ticket #2165 [#2668]

2018-03-09 Thread Hans Nordeback 
---
 tools/devel/dot/trace2dot | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tools/devel/dot/trace2dot b/tools/devel/dot/trace2dot
index 160617c7a..1977276ea 100755
--- a/tools/devel/dot/trace2dot
+++ b/tools/devel/dot/trace2dot
@@ -2,7 +2,7 @@
 #
 #
 # (C) Copyright 2015 The OpenSAF Foundation
-# (C) Copyright Ericsson AB 2015, 2016, 2017. All rights reserved.
+# (C) Copyright Ericsson AB 2015, 2016, 2017, 2018. All rights reserved.
 #
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -59,13 +59,13 @@ def check_infile(trace_file):
 trace_leave = set()
 for line in infile:
 items = line.split()
-if items.__len__() > 6:
-if items[5] == '>>':
-name = items[6].rstrip(':')
+if len(items) > 10:
+if items[9] == '>>':
+name = items[10].rstrip(':')
 trace_enter.add(name)
 
-if items[5] == '<<':
-name = items[6].rstrip(':')
+if items[9] == '<<':
+name = items[10].rstrip(':')
 trace_leave.add(name)
 
 for name in trace_enter:
@@ -86,9 +86,9 @@ def process_infile(infile, from_function, outfile):
 
 for line in infile:
 items = line.split()
-if items.__len__() > 6:
-if items[5] == '>>':
-func_enter = items[6].rstrip(':')
+if len(items) > 10:
+if items[9] == '>>':
+func_enter = items[10].rstrip(':')
 if from_function and not from_func_found:
 if from_function != func_enter:
 continue
@@ -108,8 +108,8 @@ def process_infile(infile, from_function, outfile):
 ' [ordering=out, color=red, shape=box, label="' +
 func_enter + '"];\n')
 
-if items[5] == '<<':
-func_leave = items[6].rstrip(':')
+if items[9] == '<<':
+func_leave = items[10].rstrip(':')
 if from_function:
 if from_function == func_leave:
 break
-- 
2.16.2


--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel