Libcros changes for issue_12743: Add async RequestUpdateCheck call.

chromeos_update_engine.cc

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos_update_engine.h"
 #include <cstring>
 #include "chromeos/dbus/dbus.h"
 #include "chromeos/string.h"
 #include "marshal.glibmarshal.h"
 
@@ skipping 195 matching lines @@
                            kUpdateEngineServiceInterface);
   GError* error = NULL;
 
   gboolean rc = org_chromium_UpdateEngineInterface_attempt_update(
       update_proxy.gproxy(), "", "", &error);
   LOG_IF(ERROR, rc == FALSE) << "Error checking for update: "
                              << GetGErrorMessage(error);
   return rc == TRUE;
 }
 
+namespace {
+
+struct UpdateEngineCallbackData {
+  UpdateEngineCallbackData(UpdateCallback cb, void* data)
+      : callback(cb),
+        user_data(data),
+        proxy(new dbus::Proxy(dbus::GetSystemBusConnection(),
+                              kUpdateEngineServiceName,
+                              kUpdateEngineServicePath,
+                              kUpdateEngineServiceInterface)) {}
+  UpdateCallback callback;
+  void* user_data;
+  scoped_ptr<dbus::Proxy> proxy;

[petkov, 2011/03/09 00:32:09]

actually, does this need to be a pointer at all?

+};
+
+// Note: org_chromium_UpdateEngineInterface wraps the DBus calls and provides
+// its own callback and data, which in turn calls this callback.
+void UpdateEngineNotify(DBusGProxy* gproxy, GError* error, void* user_data) {
+  UpdateEngineCallbackData* cb_data =
+      static_cast<UpdateEngineCallbackData*>(user_data);
+  if (error) {
+    const char* msg = GetGErrorMessage(error);
+    LOG(WARNING) << "UpdateEngine DBus Error: " << msg;
+    if (cb_data->callback)
+      cb_data->callback(cb_data->user_data, UPDATE_RESULT_FAILED, msg);
+  } else {
+    if (cb_data->callback)
+      cb_data->callback(cb_data->user_data, UPDATE_RESULT_SUCCESS, NULL);
+  }
+  delete cb_data;
+}
+
+}  // namespace
+
+extern "C"
+void ChromeOSRequestUpdateCheck(UpdateCallback callback, void* user_data) {
+  UpdateEngineCallbackData* cb_data =
+      new UpdateEngineCallbackData(callback, user_data);
+  DBusGProxyCall* call_id =
+      org_chromium_UpdateEngineInterface_attempt_update_async(
+          cb_data->proxy->gproxy(), "", "", &UpdateEngineNotify, cb_data);
+  if (!call_id) {
+    LOG(ERROR) << "NULL call_id";
+    if (callback)
+      callback(user_data, UPDATE_RESULT_DBUS_FAILED, NULL);
+    delete cb_data;
+  }
+}
+
 extern "C"
 bool ChromeOSRebootIfUpdated() {
   dbus::BusConnection bus = dbus::GetSystemBusConnection();
   dbus::Proxy update_proxy(bus,
                            kUpdateEngineServiceName,
                            kUpdateEngineServicePath,
                            kUpdateEngineServiceInterface);
   GError* error = NULL;
 
   gboolean rc = org_chromium_UpdateEngineInterface_reboot_if_needed(
@@ skipping 37 matching lines @@
                              << GetGErrorMessage(error);
   if (!rc || track == NULL) {
     return "";
   }
   std::string output = track;
   g_free(track);
   return output;
 }
 
 }  // namespace chromeos