Changeset 12582 for lang/perl/tiarra

Timestamp:

05/28/08 04:30:37 (5 years ago)

Author:

topia

Message:

cleanup module_object related code.
* get rid of outside strong ref.
* do canonicalize objects on add.

Files:

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

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

@@ -168 +168 @@
 
     my ($foo);
-    push @{$this->{mod_disposables}->{$modname}},
-        map { $foo = \$_; weaken($_); $foo } @disposables;
+    my (%addrs);
+    @{$this->{mod_disposables}->{$modname}} = grep {
+        defined $_ && !($addrs{refaddr($_)}++)
+    } (@{$this->{mod_disposables}->{$modname}},
+       map { weaken($_); $_ } @disposables);
 
     $this;
@@ -182 +185 @@
 
     my $arr = $this->{mod_disposables}->{$modname};
-    @$arr = grep { defined $$_ } @$arr;
+    @$arr = grep { defined $_ } @$arr;
 
     my %targets = map { refaddr($_) => 1 } @disposables;
-    @$arr = grep { !$targets{refaddr($$_)} } @$arr;
+    @$arr = grep { !$targets{refaddr($_)} } @$arr;
 
     if (!@$arr) {
@@ -203 +206 @@
     return unless $arr;
 
-    foreach my $object (grep { defined $$_ } @$arr) {
+    foreach my $object (grep { defined $_ } @$arr) {
         eval {
-            $$object->module_destruct($module);
+            $object->module_destruct($module);
         }; if ($@) {
             $this->_runloop->notify_error($@);