Changeset 12399

Timestamp:

05/26/08 02:24:16 (5 years ago)

Author:

topia

Message:

* use runloop singleton only.

Files:

• lang/perl/tiarra/branches/module-reload/main/ReloadTrigger.pm (modified) (4 diffs)

lang/perl/tiarra/branches/module-reload/main/ReloadTrigger.pm

@@ -8 +8 @@
 use warnings;
 use RunLoop;
-use Configuration;
-use ModuleManager;
 use Timer;
 
@@ -17 +15 @@
     # モジュール側で更新された場合になにかの処理をするには、
     # Configuration::Hook の reloaded を使ってください。
-    if (Configuration->shared_conf->check_if_updated) {
-        Configuration->shared_conf->load;
-        RunLoop->shared_loop->update_networks;
-        ModuleManager->shared_manager->update_modules;
+    my $runloop = shift;
+    unless (ref($runloop) && $runloop->isa('RunLoop')){
+        $runloop = RunLoop->shared_loop;
+    }
+    if ($runloop->config->check_if_updated) {
+        $runloop->config->load;
+        $runloop->update_networks;
+        $runloop->mod_manager->update_modules;
     }
 }
 
 sub reload_mods_if_updated {
-    ModuleManager->shared_manager->reload_modules_if_modified;
+    my $runloop = shift;
+    unless (ref($runloop) && $runloop->isa('RunLoop')){
+        $runloop = RunLoop->shared_loop;
+    }
+    $runloop->mod_manager->reload_modules_if_modified;
 }
 
 sub reload_all_if_updated {
-    if (Configuration->shared_conf->check_if_updated) {
-        Configuration->shared_conf->load;
-        RunLoop->shared_loop->update_networks;
+    my $runloop = shift;
+    unless (ref($runloop) && $runloop->isa('RunLoop')){
+        $runloop = RunLoop->shared_loop;
     }
-    ModuleManager->shared_manager->update_modules(
+    if ($runloop->config->check_if_updated) {
+        $runloop->config->load;
+        $runloop->update_networks;
+    }
+    $runloop->mod_manager->update_modules(
         check_module_update => 1,
        );
@@ -39 +49 @@
 
 sub _install_reload_timer {
+    my $runloop = shift;
+    unless (ref($runloop) && $runloop->isa('RunLoop')){
+        $runloop = RunLoop->shared_loop;
+    }
     Timer->new(
         Name => __PACKAGE__.'/reload',
@@ -45 +59 @@
             reload_all_if_updated;
         }
-       )->install;
+       )->install($runloop);
 }