[Cluster-devel] conga/ricci/modules/storage parted_wrapper.cpp

[rmccabe@sourceware.org <rmccabe@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-03-09 04:15:57

Modified files:
	ricci/modules/storage: parted_wrapper.cpp 

Log message:
	work around parted brain damage (it uses "new," 10^n" $prefixbytes)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/parted_wrapper.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.8&r2=1.8.2.1

--- conga/ricci/modules/storage/parted_wrapper.cpp	2006/10/06 03:10:13	1.8
+++ conga/ricci/modules/storage/parted_wrapper.cpp	2007/03/09 04:15:57	1.8.2.1
@@ -242,6 +242,8 @@
 {
   vector<String> args;
   args.push_back(pt_path);
+  args.push_back("unit");
+  args.push_back("B");
   args.push_back("print");
   args.push_back("-s");
   String out, err;
@@ -594,8 +596,8 @@
   long long bbb;
   list<PartedPartition> parts = plain_partitions(pt_path, aaa, bbb);
   
-  seg_begin = seg_begin / 1024 / 1024;
-  long long seg_end   = seg_begin + size / 1024 / 1024;
+  seg_begin = seg_begin / 1000000;
+  long long seg_end   = seg_begin + size / 1000000;
   
   vector<String> args;
   args.push_back("-s");
@@ -663,20 +665,21 @@
 {
   String s = utils::to_lower(utils::strip(size_str));
   long long multiplier;
+  // parted defines 1KB as 1000 bytes.
   if (s.find("b") == s.npos)
-    multiplier = 1024 * 1024;  // by old parted behavior, size is in MB
+    multiplier = 1000000;  // by old parted behavior, size is in MB
   else {
     if (s.size() < 3)
       throw String("parted size has an invalid value: ") + s;
     multiplier = 1;
     if (s[s.size()-2] == 'k')
-      multiplier = 1024;
+      multiplier = 1000;
     else if (s[s.size()-2] == 'm')
-      multiplier = 1024 * 1024;
+      multiplier = 1000000;
     else if (s[s.size()-2] == 'g')
-      multiplier = 1024 * 1024 * 1024;
+      multiplier = 1000000000;
     else if (s[s.size()-2] == 't')
-      multiplier = 1024 * 1024 * 1024 * 1024;
+      multiplier = 1000000000000;
   }
   
   return (long long) utils::to_float(s) * multiplier;