--- deliantra/server/lib/cf.pm	2007/01/14 19:55:37	1.174
+++ deliantra/server/lib/cf.pm	2007/01/18 20:39:00	1.179
@@ -10,7 +10,7 @@
 use Safe;
 use Safe::Hole;
 
-use Coro 3.3 ();
+use Coro 3.4 ();
 use Coro::Event;
 use Coro::Timer;
 use Coro::Signal;
@@ -1123,7 +1123,6 @@
 
 sub generate_random_map {
    my ($self, $rmp) = @_;
-
    # mit "rum" bekleckern, nicht
    $self->_create_random_map (
       $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
@@ -1815,8 +1814,8 @@
    my ($spec) = @_;
 
    my $rmp = { # defaults
-      xsize => 10,
-      ysize => 10,
+      xsize => -1,
+      ysize => -1,
    };
 
    for (split /\n/, $spec) {
@@ -1831,6 +1830,8 @@
 sub prepare_random_map {
    my ($exit) = @_;
 
+   my $guard = cf::lock_acquire "exit_prepare:$exit";
+
    # all this does is basically replace the /! path by
    # a new random map path (?random/...) with a seed
    # that depends on the exit object
@@ -1848,9 +1849,12 @@
 
    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);
@@ -2230,7 +2234,9 @@
    # 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 { Event::one_event };
+      (async {
+         Event::one_event;
+      })->prio (Coro::PRIO_MAX);
    };
 
    cfg_load;
@@ -2388,13 +2394,21 @@
    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.");
-      reload;
-      $who->message ("end 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;
+         undef $RELOAD_WATCHER;
+      });
    }
 };