Merge lp:~dobey/url-dispatcher/initial-cpp into lp:url-dispatcher

[dobey]

Convert service main process and url-dispatcher tool code to C++.

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:118
https://jenkins.canonical.com/unity-api-1/job/lp-url-dispatcher-ci/56/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1822/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1829
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1605
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1605/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1605
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1605/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1605
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1605/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1605
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1605/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1605/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1605/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-url-dispatcher-ci/56/rebuild

review: Needs Fixing (continuous-integration)

[Ted Gould (ted)]

No issue with this code, but I think it might be a good time to introduce the GLib/GObject pointer helpers that Pete wrote. They're not needed here, but we'll want them in future branches anyways.

review: Approve

=== modified file 'service/CMakeLists.txt'
--- service/CMakeLists.txt	2017-03-17 14:45:26 +0000
+++ service/CMakeLists.txt	2017-03-17 14:45:27 +0000
@@ -87,7 +87,7 @@
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-add_executable(service-exec service.c)
+add_executable(service-exec service.cpp)
 
 set_target_properties(service-exec PROPERTIES OUTPUT_NAME "url-dispatcher")
 

=== renamed file 'service/service.c' => 'service/service.cpp'
--- service/service.c	2016-08-10 18:38:30 +0000
+++ service/service.cpp	2017-03-17 14:45:27 +0000
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2017 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -13,53 +13,47 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Author: Ted Gould <[e-mail]>
- *
  */
 
+extern "C" {
+#include "dispatcher.h"
+}
+
 #include <glib.h>
 #include <glib-unix.h>
-#include "dispatcher.h"
-
-GMainLoop * mainloop = NULL;
-
-static gboolean
-sig_term (gpointer user_data)
-{
-	g_debug("SIGTERM");
-	g_main_loop_quit((GMainLoop *)user_data);
-	return G_SOURCE_CONTINUE;
-}
+#include <memory>
 
 /* Where it all begins */
-int
-main (int argc, char * argv[])
+int main (int argc, char * argv[])
 {
-	mainloop = g_main_loop_new(NULL, FALSE);
-
-	guint term_source = g_unix_signal_add(SIGTERM, sig_term, mainloop);
-
-	OverlayTracker * tracker = overlay_tracker_new();
-
-	ScopeChecker * checker = NULL;
-	/* Allow disabing for testing */
-	if (g_getenv("URL_DISPATCHER_DISABLE_SCOPE_CHECKING") == NULL)
-		checker = scope_checker_new();
-
-	/* Initialize Dispatcher */
-	if (!dispatcher_init(mainloop, tracker, checker)) {
-		return -1;
-	}
-
-	/* Run Main */
-	g_main_loop_run(mainloop);
-
-	/* Clean up globals */
-	dispatcher_shutdown();
-	overlay_tracker_delete(tracker);
-	scope_checker_delete(checker);
-	g_source_remove(term_source);
-	g_main_loop_unref(mainloop);
-
-	return 0;
+    auto mainloop = g_main_loop_new(nullptr, false);
+
+    g_unix_signal_add(SIGTERM, [](gpointer user_data) {
+            g_main_loop_quit(static_cast<GMainLoop*>(user_data));
+            return G_SOURCE_REMOVE;
+        }, mainloop);
+
+    auto tracker = overlay_tracker_new();
+
+    ScopeChecker* checker = nullptr;
+    /* Allow disabing for testing */
+    if (g_getenv("URL_DISPATCHER_DISABLE_SCOPE_CHECKING") == nullptr) {
+        checker = scope_checker_new();
+    }
+
+    /* Initialize Dispatcher */
+    if (!dispatcher_init(mainloop, tracker, checker)) {
+        return -1;
+    }
+
+    /* Run Main */
+    g_main_loop_run(mainloop);
+
+    /* Clean up globals */
+    dispatcher_shutdown();
+    overlay_tracker_delete(tracker);
+    scope_checker_delete(checker);
+    g_main_loop_unref(mainloop);
+
+    return 0;
 }

=== modified file 'tests/url_dispatcher_testability/test_fake_dispatcher.py.in'
--- tests/url_dispatcher_testability/test_fake_dispatcher.py.in	2014-07-22 13:09:42 +0000
+++ tests/url_dispatcher_testability/test_fake_dispatcher.py.in	2017-03-17 14:45:27 +0000
@@ -29,9 +29,15 @@
 
     def test_url_dispatcher(self):
         bin_dir = "@PROJECT_BINARY_DIR@"
-        call([bin_dir + '/tools/url-dispatcher', 'test://testurl'])
+        result = call([bin_dir + '/tools/url-dispatcher', 'test://testurl'])
+        self.assertEqual(0, result)
         try:
             last_url = self.dispatcher.get_last_dispatch_url_call_parameter()
         except fake_dispatcher.FakeDispatcherException:
             last_url = None
         self.assertEqual(last_url, 'test://testurl')
+
+    def test_url_dispatcher_no_args(self):
+        bin_dir = "@PROJECT_BINARY_DIR@"
+        result = call([bin_dir + '/tools/url-dispatcher'])
+        self.assertEqual(1, result)

=== modified file 'tools/CMakeLists.txt'
--- tools/CMakeLists.txt	2017-03-03 21:40:40 +0000
+++ tools/CMakeLists.txt	2017-03-17 14:45:27 +0000
@@ -5,7 +5,7 @@
 
 include_directories(${CMAKE_SOURCE_DIR}/liburl-dispatcher)
 
-add_executable(url-dispatcher url-dispatcher.c)
+add_executable(url-dispatcher url-dispatcher.cpp)
 
 target_link_libraries(url-dispatcher
   dispatcher

=== renamed file 'tools/url-dispatcher.c' => 'tools/url-dispatcher.cpp'
--- tools/url-dispatcher.c	2013-07-10 11:37:31 +0000
+++ tools/url-dispatcher.cpp	2017-03-17 14:45:27 +0000
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2017 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -17,33 +17,30 @@
 
 #include "url-dispatcher.h"
 
-static gboolean global_success = FALSE;
-
-static void
-callback (const gchar * url, gboolean success, gpointer user_data)
-{
-	global_success = success;
-	g_main_loop_quit((GMainLoop *)user_data);
-	return;
-}
-
-int
-main (int argc, char * argv[])
-{
-	if (argc != 2) {
-		g_printerr("Usage: %s <url>\n", argv[0]);
-		return 1;
-	}
-
-	GMainLoop * mainloop = g_main_loop_new(NULL, FALSE);
-
-	url_dispatch_send(argv[1], callback, mainloop);
-
-	g_main_loop_run(mainloop);
-
-	if (global_success) {
-		return 0;
-	} else {
-		return 1;
-	}
+int main (int argc, char * argv[])
+{
+    struct Data {
+        GMainLoop* loop = nullptr;
+        bool success = false;
+    };
+
+    if (argc != 2) {
+        g_printerr("Usage: %s <url>\n", argv[0]);
+        return 1;
+    }
+
+    Data data;
+    data.loop = g_main_loop_new(nullptr, FALSE);
+
+    url_dispatch_send(argv[1], [](const gchar* url, gboolean success,
+                                  gpointer user_data) {
+                          auto cbdata = static_cast<Data*>(user_data);
+                          cbdata->success = success;
+                          g_main_loop_quit(cbdata->loop);
+                      },
+                      &data);
+
+    g_main_loop_run(data.loop);
+
+    return !data.success;
 }