[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.216 by root, Thu Feb 15 14:30:21 2007 UTC vs.
Revision 1.219 by root, Sat Feb 17 03:19:44 2007 UTC

    $coro
 }
 sub write_runtime {
+   my $guard = cf::lock_acquire "write_runtime";
    my $runtime = cf::localdir . "/runtime";
    my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
       or return;
 }
 #############################################################################
 # the server's init and main functions
-sub load_resources {
+sub init_resources {
-   load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
+   load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
       or die "unable to load regions file\n";#d#
 }
 sub cfg_load {
    open my $fh, "<:utf8", cf::confdir . "/config"
       warn $@ if $@;
    }
 }
 sub init {
-   load_resources;
+   init_resources;
 }
 sub main {
    # we must not ever block the main coroutine
    local $Coro::idle = sub {
       _global_reattach;
       warn "reattaching attachments to maps";
       reattach $_ for values %MAP;
       warn "loading reloadable resources";
-      load_resources;
+      init_resources;
       warn "leaving sync_job";
       1
    } or do {
          Coro::async_pool {
             write_runtime
                or warn "ERROR: unable to write runtime file: $!";
          };
       }
       $WAIT_FOR_TICK->broadcast;
       $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
 #      my $AFTER = Event::time;

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines