[Sblim-commit] Git: cmpi-base - Base OS CMPI Providers branch, master, updated. e37b7403daad73ae928be1915f53fa6178f25e9d

[Dave H. <hel...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "cmpi-base - Base OS CMPI Providers".

The branch, master has been updated
       via  e37b7403daad73ae928be1915f53fa6178f25e9d (commit)
      from  aa228b9cfa96962488afffb662064db0f72b5f84 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e37b7403daad73ae928be1915f53fa6178f25e9d
Author: Dave Heller <hel...@us...>
Date:   Tue Jun 11 19:42:23 2013 -0400

    Fixed SBLIM-2644: wrong UserModeTime and KernelModeTime

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog            |    7 +++++++
 NEWS                 |    1 +
 OSBase_UnixProcess.c |    6 +++---
 contributions.txt    |    1 +
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 319921a..f86db38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-11  Dave Heller <hel...@us...>
+
+	* NEWS, contributions.txt, OSBase_UnixProcess.c:
+
+	Fixed SBLIM-2644: wrong UserModeTime and KernelModeTime
+	(patch by Henning Sackewitz)
+
 2013-05-28  Dave Heller <hel...@us...>
 
 	* NEWS, contributions.txt, OSBase_Processor.c:
diff --git a/NEWS b/NEWS
index dc4e3cd..84680d1 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Changes in Version 1.6.3
 
 Bugs Fixed:
 - SBLIM-2634: incorrect max cpu frequency
+- SBLIM-2644: wrong UserModeTime and KernelModeTime
 
 Changes in Version 1.6.2
 ========================
diff --git a/OSBase_UnixProcess.c b/OSBase_UnixProcess.c
index f974310..b7c050e 100644
--- a/OSBase_UnixProcess.c
+++ b/OSBase_UnixProcess.c
@@ -229,9 +229,9 @@ static int _process_data( char * phd , struct cim_process ** sptr ){
   strcat( cmd, "/stat");
 
   if ( (fpstat=fopen(cmd,"r")) != NULL ) {
-    fscanf(fpstat,"%*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s "
-	   "%lld %lld %*s %*s %*s %*s %*s %ld", 
-	   &umtime,&kmtime,&ctime );
+    fscanf(fpstat,"%*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s "
+       "%lld %lld %*s %*s %*s %*s %*s %*s %ld",
+       &umtime,&kmtime,&ctime );
     fclose(fpstat);
     (*sptr)->kmtime = kmtime*10;
     (*sptr)->umtime = umtime*10;
diff --git a/contributions.txt b/contributions.txt
index 3d674be..5834f5a 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -25,3 +25,4 @@ Michal Hrušecký, Novell
 Henning Sackewitz,
 -----------------------
 05/28/2013 [ SBLIM-2634 ] incorrect max cpu frequency
+06/11/2013 [ SBLIM-2644 ] wrong UserModeTime and KernelModeTime


hooks/post-receive
-- 
cmpi-base - Base OS CMPI Providers