Changeset 12490

Timestamp:

05/27/08 02:09:49 (5 years ago)

Author:

topia

Message:

* use weakref.

Files:

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

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

@@ -10 +10 @@
 use warnings;
 use UNIVERSAL;
-use Scalar::Util qw(refaddr);
+use Scalar::Util qw(refaddr weaken);
 use Tiarra::SharedMixin qw(shared shared_manager);
 use Tiarra::ShorthandConfMixin;
@@ -29 +29 @@
     my ($class, $runloop) = @_;
     croak 'runloop is not specified!' unless defined $runloop;
+    weaken($runloop);
     my $obj = {
         runloop => $runloop,
@@ -166 +167 @@
     $modname = ref($modname) || $modname;
 
-    push @{$this->{mod_disposables}->{$modname}}, @disposables;
+    my ($foo);
+    push @{$this->{mod_disposables}->{$modname}},
+        map { $foo = \$_; weaken($_); $foo } @disposables;
 
     $this;
@@ -178 +181 @@
     return unless $this->{mod_disposables}->{$modname};
 
+    my $arr = $this->{mod_disposables}->{$modname};
+    @$arr = grep { defined $$_ } @$arr;
+
     my %targets = map { refaddr($_) => 1 } @disposables;
-    @{$this->{mod_disposables}->{$modname}} =
-        grep { !$targets{refaddr($_)} } @{$this->{mod_disposables}->{$modname}};
+    @$arr = grep { !$targets{refaddr($$_)} } @$arr;
+
+    if (!@$arr) {
+        delete $this->{mod_disposables}->{$modname};
+    }
 
     $this;
@@ -196 +205 @@
     foreach my $object (@$arr) {
         eval {
-            $object->module_destruct($module);
+            $$object->module_destruct($module);
         }; if ($@) {
             $this->_runloop->notify_error($@);