AU: replace sleep/usleep with g_usleep
Also deploying 'using base::TimeDelta' where it is useful.
BUG=chromium-os:33541
TEST=Passes unit tests; update runs on x86-alex
Change-Id: I9478d46d0796b13789878393e3a4086564124d33
Reviewed-on: https://gerrit.chromium.org/gerrit/40904
Commit-Queue: Gilad Arnold <[email protected]>
Reviewed-by: Gilad Arnold <[email protected]>
Tested-by: Gilad Arnold <[email protected]>
diff --git a/utils.cc b/utils.cc
index 5a1d812..e5d7290 100644
--- a/utils.cc
+++ b/utils.cc
@@ -27,6 +27,7 @@
#include <base/string_number_conversions.h>
#include <base/string_util.h>
#include <base/stringprintf.h>
+#include <glib.h>
#include <google/protobuf/stubs/common.h>
#include <rootdev/rootdev.h>
@@ -35,6 +36,7 @@
#include "update_engine/subprocess.h"
using base::Time;
+using base::TimeDelta;
using std::min;
using std::string;
using std::vector;
@@ -517,7 +519,7 @@
TEST_AND_RETURN_FALSE_ERRNO(errno == EBUSY &&
num_retries < kUnmountMaxNumOfRetries);
- usleep(kUnmountRetryIntervalInMicroseconds);
+ g_usleep(kUnmountRetryIntervalInMicroseconds);
}
return true;
}
@@ -661,19 +663,19 @@
}
string FormatSecs(unsigned secs) {
- return FormatTimeDelta(base::TimeDelta::FromSeconds(secs));
+ return FormatTimeDelta(TimeDelta::FromSeconds(secs));
}
-string FormatTimeDelta(base::TimeDelta delta) {
+string FormatTimeDelta(TimeDelta delta) {
// Canonicalize into days, hours, minutes, seconds and microseconds.
unsigned days = delta.InDays();
- delta -= base::TimeDelta::FromDays(days);
+ delta -= TimeDelta::FromDays(days);
unsigned hours = delta.InHours();
- delta -= base::TimeDelta::FromHours(hours);
+ delta -= TimeDelta::FromHours(hours);
unsigned mins = delta.InMinutes();
- delta -= base::TimeDelta::FromMinutes(mins);
+ delta -= TimeDelta::FromMinutes(mins);
unsigned secs = delta.InSeconds();
- delta -= base::TimeDelta::FromSeconds(secs);
+ delta -= TimeDelta::FromSeconds(secs);
unsigned usecs = delta.InMicroseconds();
// Construct and return string.
