Merge lp:~jamesh/mediascanner/bug-1237484 into lp:mediascanner

[James Henstridge]

Create the GNetworkMonitor object earlier to avoid thread safety problems in its constructor, fixing bug #1237484.

Fix the "g_source_unref: assertion 'source != NULL' failed" warning coming from the media scanner.

The origin of the warning is inside the GNetworkMonitorBase class from libgio, and appears to be from a piece of code that assumes it is running in the main loop: an idle function is queued in the constructor and it doesn't expect it to run until the constructor finishes.

This branch just makes sure the GNetworkMonitor is created earlier on to avoid the problem.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:394
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jamesh/mediascanner/bug-1237484/+merge/190882/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mediascanner-ci/77/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-saucy-amd64-ci/77
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-saucy-armhf-ci/77
        deb: http://jenkins.qa.ubuntu.com/job/mediascanner-saucy-armhf-ci/77/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-saucy-i386-ci/77

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mediascanner-ci/77/rebuild

review: Needs Fixing (continuous-integration)

[Michal Hruby (mhr3)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/mediascanner-service/main.cpp'
--- src/mediascanner-service/main.cpp	2013-10-08 14:44:18 +0000
+++ src/mediascanner-service/main.cpp	2013-10-14 08:04:58 +0000
@@ -806,6 +806,14 @@
         return false;
     }
 
+    // Make sure the network monitor is initialised early, since it is
+    // not reliable if initialised from a thread.
+    GNetworkMonitor *network_monitor = g_network_monitor_get_default();
+    if (not network_monitor) {
+        kError("Could not initialize GNetworkMonitor");
+        return false;
+    }
+
     // Really check all plugins. Avoid lazy evaluation.
     // Don't abort on missing codecs. We already print a warning.
     VerifyMediaFeatures(list_gst_demuxers(), settings_.mandatory_containers());

=== modified file 'tests/auto/filesystemscannertest.cpp'
--- tests/auto/filesystemscannertest.cpp	2013-10-08 14:44:18 +0000
+++ tests/auto/filesystemscannertest.cpp	2013-10-14 08:04:58 +0000
@@ -353,6 +353,11 @@
     grl_init(&argc, &argv);
     gst_init(&argc, &argv);
 
+    // Initialise GNetworkMonitor early so it doesn't get initialised
+    // in a thread other than than the main loop.
+    GNetworkMonitor *network_monitor = g_network_monitor_get_default();
+    g_assert(network_monitor != NULL);
+
     mediascanner::filesystemscannertest::SetupTestEnvironments();
 
     return RUN_ALL_TESTS();