--- deliantra/server/lib/cf.pm	2007/01/10 19:52:43	1.158
+++ deliantra/server/lib/cf.pm	2007/01/10 22:50:12	1.159
@@ -35,7 +35,10 @@
 
 our %COMMAND      = ();
 our %COMMAND_TIME = ();
+
+our @EXTS         = (); # list of extension package names
 our %EXTCMD       = ();
+our %EXT_CORO     = (); # coroutines bound to extensions
 
 our @EVENT;
 our $LIBDIR = datadir . "/ext";
@@ -54,7 +57,6 @@
 our %MAP;    # all maps
 our $LINK_MAP; # the special {link} map
 our $RANDOM_MAPS = cf::localdir . "/random";
-our %EXT_CORO; # coroutines bound to extensions
 
 our $WAIT_FOR_TICK;     $WAIT_FOR_TICK     ||= new Coro::Signal;
 our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
@@ -159,10 +161,6 @@
    warn "error in event callback: @_";
 };
 
-my %ext_pkg;
-my @exts;
-my @hook;
-
 =head2 UTILITY FUNCTIONS
 
 =over 4
@@ -321,7 +319,7 @@
 
 =item $coro = cf::async_ext { BLOCK }
 
-Like async, but this coro is automcatially being canceled when the
+Like async, but this coro is automatically being canceled when the
 extension calling this is being unloaded.
 
 =cut
@@ -947,10 +945,7 @@
 sub register_extcmd {
    my ($name, $cb) = @_;
 
-   my $caller = caller;
-   #warn "registering extcmd '$name' to '$caller'";
-
-   $EXTCMD{$name} = [$cb, $caller];
+   $EXTCMD{$name} = $cb;
 }
 
 cf::player->attach (
@@ -973,7 +968,7 @@
 
       if (ref $msg) {
          if (my $cb = $EXTCMD{$msg->{msgtype}}) {
-            if (my %reply = $cb->[0]->($pl, $msg)) {
+            if (my %reply = $cb->($pl, $msg)) {
                $pl->ext_reply ($msg->{msgid}, %reply);
             }
          }
@@ -985,12 +980,6 @@
    },
 );
 
-sub register {
-   my ($base, $pkg) = @_;
-
-   #TODO
-}
-
 sub load_extension {
    my ($path) = @_;
 
@@ -1015,50 +1004,7 @@
       or die $@ ? "$path: $@\n"
                 : "extension disabled.\n";
 
-   push @exts, $pkg;
-   $ext_pkg{$base} = $pkg;
-
-#   no strict 'refs';
-#   @{"$pkg\::ISA"} = ext::;
-
-   register $base, $pkg;
-}
-
-sub unload_extension {
-   my ($pkg) = @_;
-
-   warn "removing extension $pkg\n";
-
-   # remove hooks
-   #TODO
-#   for my $idx (0 .. $#PLUGIN_EVENT) {
-#      delete $hook[$idx]{$pkg};
-#   }
-
-   # remove commands
-   for my $name (keys %COMMAND) {
-      my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
-
-      if (@cb) {
-         $COMMAND{$name} = \@cb;
-      } else {
-         delete $COMMAND{$name};
-      }
-   }
-
-   # remove extcmds
-   for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
-      delete $EXTCMD{$name};
-   }
-
-   if (my $cb = $pkg->can ("unload")) {
-      eval {
-         $cb->($pkg);
-         1
-      } or warn "$pkg unloaded, but with errors: $@";
-   }
-
-   Symbol::delete_package $pkg;
+   push @EXTS, $pkg;
 }
 
 sub load_extensions {
@@ -2342,28 +2288,47 @@
 
    warn "reloading...";
 
+   warn "freezing server";
    my $guard = freeze_mainloop;
    cf::emergency_save;
 
+   warn "sync database to disk";
+   cf::db_sync;
+   IO::AIO::flush;
+
    eval {
       # if anything goes wrong in here, we should simply crash as we already saved
 
-      # cancel all watchers
+      warn "cancel all watchers";
       for (Event::all_watchers) {
          $_->cancel if $_->data & WF_AUTOCANCEL;
       }
 
-      # cancel all extension coros
+      warn "cancel all extension coros";
       $_->cancel for values %EXT_CORO;
       %EXT_CORO = ();
 
-      # unload all extensions
-      for (@exts) {
-         warn "unloading <$_>";
-         unload_extension $_;
+      warn "remove commands";
+      %COMMAND = ();
+
+      warn "remove ext commands";
+      %EXTCMD = ();
+
+      warn "unload/nuke all extensions";
+      for my $pkg (@EXTS) {
+         warn "unloading <$pkg>";
+
+         if (my $cb = $pkg->can ("unload")) {
+            eval {
+               $cb->($pkg);
+               1
+            } or warn "$pkg unloaded, but with errors: $@";
+         }
+
+         Symbol::delete_package $pkg;
       }
 
-      # unload all modules loaded from $LIBDIR
+      warn "unload all perl modules loaded from $LIBDIR";
       while (my ($k, $v) = each %INC) {
          next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
 
@@ -2380,40 +2345,31 @@
          Symbol::delete_package $k;
       }
 
-      # sync database to disk
-      cf::db_sync;
-      IO::AIO::flush;
-
-      # get rid of safe::, as good as possible
+      warn "get rid of safe::, as good as possible";
       Symbol::delete_package "safe::$_"
          for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
 
-      # remove register_script_function callbacks
-      # TODO
-      
-      # unload cf.pm "a bit"
+      warn "unload cf.pm \"a bit\"";
       delete $INC{"cf.pm"};
 
       # don't, removes xs symbols, too,
       # and global variables created in xs
       #Symbol::delete_package __PACKAGE__;
 
-      # reload cf.pm
       warn "reloading cf.pm";
       require cf;
       cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
 
-      # load config and database again
+      warn "load config and database again";
       cf::cfg_load;
       cf::db_load;
 
-      # load extensions
       warn "load extensions";
       cf::load_extensions;
 
-      # reattach attachments to objects
-      warn "reattach";
+      warn "reattach attachments to objects/players";
       _global_reattach;
+      warn "reattach attachments to maps";
       reattach $_ for values %MAP;
    };
 
@@ -2423,7 +2379,7 @@
       exit 1;
    }
 
-   warn "reloaded successfully";
+   warn "reloaded";
 };
 
 #############################################################################
@@ -2469,8 +2425,6 @@
    $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
 }
 
-register "<global>", __PACKAGE__;
-
 register_command "reload" => sub {
    my ($who, $arg) = @_;