[Ganglia-svn] SF.net SVN: ganglia:[1974] branches/monitor-core-3.0

[<ca...@us...>]

Revision: 1974
          http://ganglia.svn.sourceforge.net/ganglia/?rev=1974&view=rev
Author:   carenas
Date:     2009-02-25 05:48:36 +0000 (Wed, 25 Feb 2009)

Log Message:
-----------
libmetrics: misc type fixes

  svn merge -c 1511 trunk;
  svn merge -c 1512 trunk;

Reviewed-by: Brad Nicholes <BNI...@no...>

Modified Paths:
--------------
    branches/monitor-core-3.0/STATUS
    branches/monitor-core-3.0/libmetrics/cygwin/metrics.c
    branches/monitor-core-3.0/libmetrics/interface.c
    branches/monitor-core-3.0/libmetrics/linux/metrics.c

Property Changed:
----------------
    branches/monitor-core-3.0/


Property changes on: branches/monitor-core-3.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/monitor-core:1244,1248-1249,1262,1312,1318,1480,1482,1568,1577
   + /trunk/monitor-core:1244,1248-1249,1262,1312,1318,1480,1482,1511-1512,1568,1577

Modified: branches/monitor-core-3.0/STATUS
===================================================================
--- branches/monitor-core-3.0/STATUS	2009-02-24 10:03:49 UTC (rev 1973)
+++ branches/monitor-core-3.0/STATUS	2009-02-25 05:48:36 UTC (rev 1974)
@@ -50,16 +50,6 @@
     -1: <userid>
     <Optional comments prefixed with user id of comment author>
 
-  * libmetrics: mtu is always positive so use unsigned
-    http://ganglia.svn.sourceforge.net/viewvc/ganglia?view=rev&revision=1511
-    +1: carenas, bnicholes
-    carenas: committed to 3.1 in r1670, released with 3.1.1
-
-  * libmetrics: boottime is an integer not a float
-    http://ganglia.svn.sourceforge.net/viewvc/ganglia?view=rev&revision=1512
-    +1: carenas, bnicholes
-    carenas: committed to 3.1 in r1671, released with 3.1.1
-
   * web: fix metric variable name mismatch
     http://bugzilla.ganglia.info/cgi-bin/bugzilla/show_bug.cgi?id=194
     http://ganglia.svn.sourceforge.net/viewvc/ganglia?view=rev&revision=1567

Modified: branches/monitor-core-3.0/libmetrics/cygwin/metrics.c
===================================================================
--- branches/monitor-core-3.0/libmetrics/cygwin/metrics.c	2009-02-24 10:03:49 UTC (rev 1973)
+++ branches/monitor-core-3.0/libmetrics/cygwin/metrics.c	2009-02-25 05:48:36 UTC (rev 1974)
@@ -376,7 +376,7 @@
    p = strstr ( p, "btime" );
    if(p) { 
      p = skip_token ( p );
-     val.uint32 = strtod ( p, (char **)NULL );
+     val.uint32 = atoi ( p );
    } else {
      val.uint32 = 0;
    }

Modified: branches/monitor-core-3.0/libmetrics/interface.c
===================================================================
--- branches/monitor-core-3.0/libmetrics/interface.c	2009-02-24 10:03:49 UTC (rev 1973)
+++ branches/monitor-core-3.0/libmetrics/interface.c	2009-02-25 05:48:36 UTC (rev 1974)
@@ -8,8 +8,8 @@
 get_min_mtu( void )
 {
   struct ifi_info *info, *n;
-  int min_mtu_set = 0;
-  int min_mtu = 0;
+  unsigned min_mtu_set = 0;
+  unsigned min_mtu = 0;
 
   info = Get_ifi_info(AF_INET, 0);
 

Modified: branches/monitor-core-3.0/libmetrics/linux/metrics.c
===================================================================
--- branches/monitor-core-3.0/libmetrics/linux/metrics.c	2009-02-24 10:03:49 UTC (rev 1973)
+++ branches/monitor-core-3.0/libmetrics/linux/metrics.c	2009-02-25 05:48:36 UTC (rev 1974)
@@ -680,7 +680,7 @@
    p = strstr ( p, "btime" );
    if(p) { 
      p = skip_token ( p );
-     val.uint32 = strtod ( p, (char **)NULL );
+     val.uint32 = atoi ( p );
    } else {
      val.uint32 = 0;
    }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.