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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.174 by root, Sun Jan 14 19:55:37 2007 UTC vs.
Revision 1.178 by root, Thu Jan 18 00:06:55 2007 UTC

 use Storable;
 use Opcode;
 use Safe;
 use Safe::Hole;
-use Coro 3.3 ();
+use Coro 3.4 ();
 use Coro::Event;
 use Coro::Timer;
 use Coro::Signal;
 use Coro::Semaphore;
 use Coro::AIO;
 our $MAX_RESET     = 3600;
 our $DEFAULT_RESET = 3000;
 sub generate_random_map {
    my ($self, $rmp) = @_;
    # mit "rum" bekleckern, nicht
    $self->_create_random_map (
       $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
       $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
       $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
 sub parse_random_map_params {
    my ($spec) = @_;
    my $rmp = { # defaults
-      xsize => 10,
+      xsize => -1,
-      ysize => 10,
+      ysize => -1,
    };
    for (split /\n/, $spec) {
       my ($k, $v) = split /\s+/, $_, 2;
    $rmp->{random_seed} ||= $exit->random_seed;
    my $data = cf::to_json $rmp;
    my $md5 = Digest::MD5::md5_hex $data;
+   my $meta = "$cf::RANDOM_MAPS/$md5.meta";
-   if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) {
+   if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
       aio_write $fh, 0, (length $data), $data, 0;
+      undef $fh;
+      aio_rename "$meta~", $meta;
       $exit->slaying ("?random/$md5");
       $exit->msg (undef);
    }
 }
 sub main {
    # we must not ever block the main coroutine
    local $Coro::idle = sub {
       Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
+      (async {
-      async { Event::one_event };
+         Event::one_event;
+      })->prio (Coro::PRIO_MAX);
    };
    cfg_load;
    db_load;
    load_extensions;
    }
    warn "reloaded";
 };
+our $RELOAD_WATCHER; # used only during reload
 register_command "reload" => sub {
    my ($who, $arg) = @_;
    if ($who->flag (FLAG_WIZ)) {
-      $who->message ("start of reload.");
+      $who->message ("reloading server.");
+      # doing reload synchronously and two reloads happen back-to-back,
+      # coro crashes during coro_state_free->destroy here.
+      $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
-      reload;
+         reload;
-      $who->message ("end of reload.");
+         undef $RELOAD_WATCHER;
+      });
    }
 };
 unshift @INC, $LIBDIR;

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.174 by root, Sun Jan 14 19:55:37 2007 UTC vs. Revision 1.178 by root, Thu Jan 18 00:06:55 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.174 by root, Sun Jan 14 19:55:37 2007 UTC vs.
Revision 1.178 by root, Thu Jan 18 00:06:55 2007 UTC