Attachment 607424 Details for Bug 852234 – patch for pmcollectl.py to compile on epel5

[patch] patch for pmcollectl.py to compile on epel5

pmcollectl_python24.patch (text/plain), 6.44 KB, created by Mark Goodwin on 2012-08-28 07:12:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Goodwin

Created: 2012-08-28 07:12:50 UTC

Size: 6.44 KB

patch

obsolete

>diff --git a/src/pmcollectl/pmcollectl.py b/src/pmcollectl/pmcollectl.py
>index e11dd20..177145a 100644
>--- a/src/pmcollectl/pmcollectl.py
>+++ b/src/pmcollectl/pmcollectl.py
>@@ -77,17 +77,23 @@ def get_atom_value (metric, atom1, atom2, desc, first):
>     # value conversion and diff, if required
>     type = desc.contents.type
>     if type == pmapi.PM_TYPE_32:
>-        return atom1.l - (atom2.l if not first else 0)
>+	if first: return atom.l
>+	else: return atom1.l - atom2.l
>     elif type == pmapi.PM_TYPE_U32:
>-        return atom1.ul - (atom2.ul if not first else 0)
>+	if first: return atom.ul
>+	else: return atom1.ul - atom2.ul
>     elif type == pmapi.PM_TYPE_64:
>-        return atom1.ll - (atom2.ll if not first else 0)
>+	if first: return atom.ll
>+	else: return atom1.ll - atom2.ll
>     elif type == pmapi.PM_TYPE_U64:
>-        return atom1.ull - (atom2.ull if not first else 0)
>+	if first: return atom.ull
>+	else: return atom1.ull - atom2.ull
>     elif type == pmapi.PM_TYPE_FLOAT:
>-        return atom1.f - (atom2.f if not first else 0)
>+	if first: return atom.f
>+	else: return atom1.f - atom2.f
>     elif type == pmapi.PM_TYPE_DOUBLE:
>-        return atom1.d - (atom2.d if not first else 0)
>+	if first: return atom.d
>+	else: return atom1.d - atom2.d
>     else:
>         return 0
> 
>@@ -102,12 +108,15 @@ def get_stats (metric, metric_name, metric_desc, metric_value, old_metric_value)
>     try:
>         (code, metric_result) = pm.pmFetch(metric_name)
>         check_code (code)
>-    except pmErr as e:
>-        if str(e).find("PM_ERR_EOL") != -1:
>+    except pmErr:
>+        if str(pmErr).find("PM_ERR_EOL") != -1:
>             print "\nReached end of archive"
>             sys.exit(1)
> 
>-    first = True if max(old_metric_value) == 0 else False
>+    if max(old_metric_value) == 0:
>+	first = True 
>+    else:
>+    	first = False
>     # list of metric names
>     for i in xrange(len(metric)):
>         # list of metric results, one per metric name
>@@ -134,7 +143,10 @@ def get_stats (metric, metric_name, metric_desc, metric_value, old_metric_value)
> 
>             old_metric_value[j] = copy.copy(atomlist)
>             if metric_result.contents.get_numval(j) == 1:
>-                metric_value[j] = copy.copy(value[0]) if len(value) == 1 else 0
>+		if len(value) == 1:
>+		    metric_value[j] = copy.copy(value[0])
>+		else:
>+		    metric_value[j] = 0
>             elif metric_result.contents.get_numval(j) > 1:
>                 metric_value[j] = copy.copy(value)
> 
>@@ -301,7 +313,7 @@ class _cpu(_subsys):
>             try:
> 
>                 (code, self.int_metric_name) = pm.pmLookupName(self.cpu_metrics[j])
>-            except pmErr as e:
>+            except pmErr:
>                 self.cpu_metrics.remove(self.cpu_metrics[j])
> 
>         (code, self.cpu_metric_name) = pm.pmLookupName(self.cpu_metrics)
>@@ -468,7 +480,7 @@ class _interrupt(_subsys):
>             try:
> 
>                 (code, self.int_metric_name) = pm.pmLookupName(self.interrupt_metrics[j])
>-            except pmErr as e:
>+            except pmErr:
>                 self.interrupt_metrics.remove(self.interrupt_metrics[j])
> 
>         (code, self.int_metric_name) = pm.pmLookupName(self.interrupt_metrics)
>@@ -543,7 +555,7 @@ class _process(_subsys):
>             try:
> 
>                 (code, self.int_metric_name) = pm.pmLookupName(self.process_metrics[j])
>-            except pmErr as e:
>+            except pmErr:
>                 self.process_metrics.remove(self.process_metrics[j])
> 
>         (code, self.process_metric_name) = pm.pmLookupName(self.process_metrics)
>@@ -596,7 +608,7 @@ class _disk(_subsys):
>             try:
> 
>                 (code, self.int_metric_name) = pm.pmLookupName(self.disk_metrics[j])
>-            except pmErr as e:
>+            except pmErr:
>                 self.disk_metrics.remove(self.disk_metrics[j])
> 
>         (code, self.disk_metric_name) = pm.pmLookupName(self.disk_metrics)
>@@ -641,7 +653,7 @@ class _disk(_subsys):
>             try:
>                 (inst, iname) = pm.pmGetInDom(self.disk_metric_desc[j])
>                 break
>-            except pmErr as e:
>+            except pmErr:
>                 iname = iname = "X"
> 
>         # metric values may be scalars or arrays depending on # of disks
>@@ -661,16 +673,22 @@ class _disk(_subsys):
> 
>     def print_verbose(self):
>         _=self.disk_metrics_dict
>+	if self.disk_metric_value[_['disk.all.read_bytes']] == 0:
>+	    rb = 0
>+	else:
>+	    rb = self.disk_metric_value[_['disk.all.read_bytes']] / self.disk_metric_value[_['disk.all.read']]
>+
>+	if self.disk_metric_value[_['disk.all.write_bytes']] == 0:
>+	    wb = 0
>+	else:
>+	    wb = elf.disk_metric_value[_['disk.all.write_bytes']] / self.disk_metric_value[_['disk.all.write']]
>+
>         print '%6d %6d %6d %6d %7d %8d %6d %6d' % (
>-            0 if self.disk_metric_value[_['disk.all.read_bytes']] == 0
>-              else self.disk_metric_value[_['disk.all.read_bytes']]/
>-                   self.disk_metric_value[_['disk.all.read']],
>-            self.disk_metric_value[_['disk.all.read_merge']],
>+	    rb,
>+	    self.disk_metric_value[_['disk.all.read_merge']],
>             self.disk_metric_value[_['disk.all.read']],
>             0,
>-            0 if self.disk_metric_value[_['disk.all.write_bytes']] == 0
>-              else self.disk_metric_value[_['disk.all.write_bytes']]/
>-                   self.disk_metric_value[_['disk.all.write']],
>+	    wb,
>             self.disk_metric_value[_['disk.all.write_merge']],
>             self.disk_metric_value[_['disk.all.write']],
>             0),
>@@ -714,7 +732,7 @@ class _memory(_subsys):
>             try:
> 
>                 (code, self.int_metric_name) = pm.pmLookupName(self.memory_metrics[j])
>-            except pmErr as e:
>+            except pmErr:
>                 self.memory_metrics.remove(self.memory_metrics[j])
> 
>         (code, self.memory_metric_name) = pm.pmLookupName(self.memory_metrics)
>@@ -803,7 +821,7 @@ class _net(_subsys):
>             try:
> 
>                 (code, self.int_metric_name) = pm.pmLookupName(self.net_metrics[j])
>-            except pmErr as e:
>+            except pmErr:
>                 self.net_metrics.remove(self.net_metrics[j])
> 
>         (code, self.net_metric_name) = pm.pmLookupName(self.net_metrics)
>@@ -866,7 +884,7 @@ class _net(_subsys):
>                 try:
>                     (inst, iname) = pm.pmGetInDom(self.net_metric_desc[k])
>                     break
>-                except pmErr as e:
>+                except pmErr:
>                     iname = "X"
> 
>             print '%4d %-7s %6d %5d %6d %6d %6d %6d %6d %6d %6d %6d %7d' % (

Actions: View | Diff

Attachments on bug 852234: 607421 | 607424