ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.113 by root, Mon Jan 1 15:32:40 2007 UTC vs.
Revision 1.158 by root, Wed Jan 10 19:52:43 2007 UTC

8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.31 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 32$YAML::Syck::ImplicitUnicode = 1;
30 33
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 35
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
37our %EXTCMD = (); 38our %EXTCMD = ();
38 39
47our %CFG; 48our %CFG;
48 49
49our $UPTIME; $UPTIME ||= time; 50our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 51our $RUNTIME;
51 52
53our %PLAYER; # all users
52our %MAP; # all maps 54our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 55our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 56our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 57our %EXT_CORO; # coroutines bound to extensions
58
59our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
60our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
57 61
58binmode STDOUT; 62binmode STDOUT;
59binmode STDERR; 63binmode STDERR;
60 64
61# read virtual server time, if available 65# read virtual server time, if available
71mkdir cf::localdir . "/" . cf::uniquedir; 75mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 76mkdir $RANDOM_MAPS;
73 77
74# a special map that is always available 78# a special map that is always available
75our $LINK_MAP; 79our $LINK_MAP;
76 80our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 81
79############################################################################# 82#############################################################################
80 83
81=head2 GLOBAL VARIABLES 84=head2 GLOBAL VARIABLES
82 85
106 109
107=item %cf::CFG 110=item %cf::CFG
108 111
109Configuration for the server, loaded from C</etc/crossfire/config>, or 112Configuration for the server, loaded from C</etc/crossfire/config>, or
110from wherever your confdir points to. 113from wherever your confdir points to.
114
115=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
116
117These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
118or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
119processing has been done. Call C<< ->wait >> on them to maximise the
120window of cpu time available, or simply to synchronise to the server tick.
111 121
112=back 122=back
113 123
114=cut 124=cut
115 125
119 utf8::encode $msg; 129 utf8::encode $msg;
120 130
121 $msg .= "\n" 131 $msg .= "\n"
122 unless $msg =~ /\n$/; 132 unless $msg =~ /\n$/;
123 133
124 LOG llevError, "cfperl: $msg"; 134 LOG llevError, $msg;
125 }; 135 };
126} 136}
127 137
128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 138@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 139@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
155 165
156=head2 UTILITY FUNCTIONS 166=head2 UTILITY FUNCTIONS
157 167
158=over 4 168=over 4
159 169
170=item dumpval $ref
171
160=cut 172=cut
173
174sub dumpval {
175 eval {
176 local $SIG{__DIE__};
177 my $d;
178 if (1) {
179 $d = new Data::Dumper([$_[0]], ["*var"]);
180 $d->Terse(1);
181 $d->Indent(2);
182 $d->Quotekeys(0);
183 $d->Useqq(1);
184 #$d->Bless(...);
185 $d->Seen($_[1]) if @_ > 1;
186 $d = $d->Dump();
187 }
188 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
189 $d
190 } || "[unable to dump $_[0]: '$@']";
191}
161 192
162use JSON::Syck (); # TODO# replace by JSON::PC once working 193use JSON::Syck (); # TODO# replace by JSON::PC once working
163 194
164=item $ref = cf::from_json $json 195=item $ref = cf::from_json $json
165 196
180 211
181sub to_json($) { 212sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 213 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 214 JSON::Syck::Dump $_[0]
184} 215}
216
217=item cf::lock_wait $string
218
219Wait until the given lock is available. See cf::lock_acquire.
220
221=item my $lock = cf::lock_acquire $string
222
223Wait until the given lock is available and then acquires it and returns
224a Coro::guard object. If the guard object gets destroyed (goes out of scope,
225for example when the coroutine gets canceled), the lock is automatically
226returned.
227
228Lock names should begin with a unique identifier (for example, cf::map::find
229uses map_find and cf::map::load uses map_load).
230
231=cut
232
233our %LOCK;
234
235sub lock_wait($) {
236 my ($key) = @_;
237
238 # wait for lock, if any
239 while ($LOCK{$key}) {
240 push @{ $LOCK{$key} }, $Coro::current;
241 Coro::schedule;
242 }
243}
244
245sub lock_acquire($) {
246 my ($key) = @_;
247
248 # wait, to be sure we are not locked
249 lock_wait $key;
250
251 $LOCK{$key} = [];
252
253 Coro::guard {
254 # wake up all waiters, to be on the safe side
255 $_->ready for @{ delete $LOCK{$key} };
256 }
257}
258
259sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active;
261
262 my $guard = Coro::guard { $TICK_WATCHER->start };
263 $TICK_WATCHER->stop;
264 $guard
265}
266
267=item cf::async { BLOCK }
268
269Currently the same as Coro::async_pool, meaning you cannot use
270C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
271thing you are allowed to do is call C<prio> on it.
272
273=cut
274
275BEGIN { *async = \&Coro::async_pool }
185 276
186=item cf::sync_job { BLOCK } 277=item cf::sync_job { BLOCK }
187 278
188The design of crossfire+ requires that the main coro ($Coro::main) is 279The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 280always able to handle events or runnable, as crossfire+ is only partly
203 # this is the main coro, too bad, we have to block 294 # this is the main coro, too bad, we have to block
204 # till the operation succeeds, freezing the server :/ 295 # till the operation succeeds, freezing the server :/
205 296
206 # TODO: use suspend/resume instead 297 # TODO: use suspend/resume instead
207 # (but this is cancel-safe) 298 # (but this is cancel-safe)
208 local $FREEZE = 1; 299 my $freeze_guard = freeze_mainloop;
209 300
210 my $busy = 1; 301 my $busy = 1;
211 my @res; 302 my @res;
212 303
213 (Coro::async { 304 (async {
214 @res = eval { $job->() }; 305 @res = eval { $job->() };
215 warn $@ if $@; 306 warn $@ if $@;
216 undef $busy; 307 undef $busy;
217 })->prio (Coro::PRIO_MAX); 308 })->prio (Coro::PRIO_MAX);
218 309
219 while ($busy) { 310 while ($busy) {
220 Coro::cede_notself; 311 Coro::cede or Event::one_event;
221 Event::one_event unless Coro::nready;
222 } 312 }
223 313
224 wantarray ? @res : $res[0] 314 wantarray ? @res : $res[0]
225 } else { 315 } else {
226 # we are in another coroutine, how wonderful, everything just works 316 # we are in another coroutine, how wonderful, everything just works
227 317
228 $job->() 318 $job->()
229 } 319 }
230} 320}
231 321
232=item $coro = cf::coro { BLOCK } 322=item $coro = cf::async_ext { BLOCK }
233 323
234Creates and returns a new coro. This coro is automcatially being canceled 324Like async, but this coro is automcatially being canceled when the
235when the extension calling this is being unloaded. 325extension calling this is being unloaded.
236 326
237=cut 327=cut
238 328
239sub coro(&) { 329sub async_ext(&) {
240 my $cb = shift; 330 my $cb = shift;
241 331
242 my $coro; $coro = async { 332 my $coro = &Coro::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 333
249 $coro->on_destroy (sub { 334 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 335 delete $EXT_CORO{$coro+0};
251 }); 336 });
252 $EXT_CORO{$coro+0} = $coro; 337 $EXT_CORO{$coro+0} = $coro;
282 367
283############################################################################# 368#############################################################################
284 369
285package cf::path; 370package cf::path;
286 371
372use overload
373 '""' => \&as_string;
374
375# used to convert map paths into valid unix filenames by repalcing / by ∕
376our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
377
287sub new { 378sub new {
288 my ($class, $path, $base) = @_; 379 my ($class, $path, $base) = @_;
289 380
290 $path = $path->as_string if ref $path; 381 $path = $path->as_string if ref $path;
291 382
292 my $self = bless { }, $class; 383 my $self = bless { }, $class;
293 384
385 # {... are special paths that are not touched
386 # ?xxx/... are special absolute paths
387 # ?random/... random maps
388 # /! non-realised random map exit
389 # /... normal maps
390 # ~/... per-player maps without a specific player (DO NOT USE)
391 # ~user/... per-player map of a specific user
392
393 $path =~ s/$PATH_SEP/\//go;
394
395 if ($path =~ /^{/) {
396 # fine as it is
294 if ($path =~ s{^\?random/}{}) { 397 } elsif ($path =~ s{^\?random/}{}) {
295 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 398 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
296 $self->{random} = cf::from_json $data; 399 $self->{random} = cf::from_json $data;
297 } else { 400 } else {
298 if ($path =~ s{^~([^/]+)?}{}) { 401 if ($path =~ s{^~([^/]+)?}{}) {
299 $self->{user_rel} = 1; 402 $self->{user_rel} = 1;
344# } 447# }
345} 448}
346 449
347# escape the /'s in the path 450# escape the /'s in the path
348sub _escaped_path { 451sub _escaped_path {
349 # ∕ is U+2215
350 (my $path = $_[0]{path}) =~ s/\///g; 452 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
351 $path 453 $path
352} 454}
353 455
354# the original (read-only) location 456# the original (read-only) location
355sub load_path { 457sub load_path {
807 (aio_load "$filename.pst", $av) >= 0 909 (aio_load "$filename.pst", $av) >= 0
808 or return; 910 or return;
809 $av = eval { (Storable::thaw $av)->{objs} }; 911 $av = eval { (Storable::thaw $av)->{objs} };
810 } 912 }
811 913
914 warn sprintf "loading %s (%d)\n",
915 $filename, length $data, scalar @{$av || []};#d#
812 return ($data, $av); 916 return ($data, $av);
813} 917}
814 918
815############################################################################# 919#############################################################################
816# command handling &c 920# command handling &c
980}; 1084};
981 1085
982cf::map->attach (prio => -10000, package => cf::mapsupport::); 1086cf::map->attach (prio => -10000, package => cf::mapsupport::);
983 1087
984############################################################################# 1088#############################################################################
985# load/save perl data associated with player->ob objects
986
987sub all_objects(@) {
988 @_, map all_objects ($_->inv), @_
989}
990
991# TODO: compatibility cruft, remove when no longer needed
992cf::player->attach (
993 on_load => sub {
994 my ($pl, $path) = @_;
995
996 for my $o (all_objects $pl->ob) {
997 if (my $value = $o->get_ob_key_value ("_perl_data")) {
998 $o->set_ob_key_value ("_perl_data");
999
1000 %$o = %{ Storable::thaw pack "H*", $value };
1001 }
1002 }
1003 },
1004);
1005
1006#############################################################################
1007 1089
1008=head2 CORE EXTENSIONS 1090=head2 CORE EXTENSIONS
1009 1091
1010Functions and methods that extend core crossfire objects. 1092Functions and methods that extend core crossfire objects.
1011 1093
1094=cut
1095
1096package cf::player;
1097
1098use Coro::AIO;
1099
1012=head3 cf::player 1100=head3 cf::player
1013 1101
1014=over 4 1102=over 4
1015 1103
1016=item cf::player::exists $login 1104=item cf::player::find $login
1017 1105
1018Returns true when the given account exists. 1106Returns the given player object, loading it if necessary (might block).
1019 1107
1020=cut 1108=cut
1021 1109
1022sub cf::player::exists($) { 1110sub playerdir($) {
1023 cf::player::find $_[0] 1111 cf::localdir
1024 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1112 . "/"
1113 . cf::playerdir
1114 . "/"
1115 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1116}
1117
1118sub path($) {
1119 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1120
1121 (playerdir $login) . "/$login.pl"
1122}
1123
1124sub find_active($) {
1125 $cf::PLAYER{$_[0]}
1126 and $cf::PLAYER{$_[0]}->active
1127 and $cf::PLAYER{$_[0]}
1128}
1129
1130sub exists($) {
1131 my ($login) = @_;
1132
1133 $cf::PLAYER{$login}
1134 or cf::sync_job { !aio_stat $login }
1135}
1136
1137sub find($) {
1138 return $cf::PLAYER{$_[0]} || do {
1139 my $login = $_[0];
1140
1141 my $guard = cf::lock_acquire "user_find:$login";
1142
1143 $cf::PLAYER{$_[0]} || do {
1144 my $pl = load_pl path $login
1145 or return;
1146 $cf::PLAYER{$login} = $pl
1147 }
1148 }
1149}
1150
1151sub save($) {
1152 my ($pl) = @_;
1153
1154 return if $pl->{deny_save};
1155
1156 my $path = path $pl;
1157 my $guard = cf::lock_acquire "user_save:$path";
1158
1159 return if $pl->{deny_save};
1160
1161 aio_mkdir playerdir $pl, 0770;
1162 $pl->{last_save} = $cf::RUNTIME;
1163
1164 $pl->save_pl ($path);
1165 Coro::cede;
1166}
1167
1168sub new($) {
1169 my ($login) = @_;
1170
1171 my $self = create;
1172
1173 $self->ob->name ($login);
1174 $self->{deny_save} = 1;
1175
1176 $cf::PLAYER{$login} = $self;
1177
1178 $self
1179}
1180
1181=item $pl->quit_character
1182
1183Nukes the player without looking back. If logged in, the connection will
1184be destroyed. May block for a long time.
1185
1186=cut
1187
1188sub quit_character {
1189 my ($pl) = @_;
1190
1191 $pl->{deny_save} = 1;
1192 $pl->password ("*"); # this should lock out the player until we nuked the dir
1193
1194 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1195 $pl->deactivate;
1196 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1197 $pl->ns->destroy if $pl->ns;
1198
1199 my $path = playerdir $pl;
1200 my $temp = "$path~$cf::RUNTIME~deleting~";
1201 aio_rename $path, $temp;
1202 delete $cf::PLAYER{$pl->ob->name};
1203 $pl->destroy;
1204 IO::AIO::aio_rmtree $temp;
1205}
1206
1207=item cf::player::list_logins
1208
1209Returns am arrayref of all valid playernames in the system, can take a
1210while and may block, so not sync_job-capable, ever.
1211
1212=cut
1213
1214sub list_logins {
1215 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1216 or return [];
1217
1218 my @logins;
1219
1220 for my $login (@$dirs) {
1221 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1222 aio_read $fh, 0, 512, my $buf, 0 or next;
1223 $buf !~ /^password -------------$/m or next; # official not-valid tag
1224
1225 utf8::decode $login;
1226 push @logins, $login;
1227 }
1228
1229 \@logins
1230}
1231
1232=item $player->maps
1233
1234Returns an arrayref of cf::path's of all maps that are private for this
1235player. May block.
1236
1237=cut
1238
1239sub maps($) {
1240 my ($pl) = @_;
1241
1242 my $files = aio_readdir playerdir $pl
1243 or return;
1244
1245 my @paths;
1246
1247 for (@$files) {
1248 utf8::decode $_;
1249 next if /\.(?:pl|pst)$/;
1250 next unless /^$PATH_SEP/o;
1251
1252 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1253 }
1254
1255 \@paths
1025} 1256}
1026 1257
1027=item $player->ext_reply ($msgid, $msgtype, %msg) 1258=item $player->ext_reply ($msgid, $msgtype, %msg)
1028 1259
1029Sends an ext reply to the player. 1260Sends an ext reply to the player.
1030 1261
1031=cut 1262=cut
1032 1263
1033sub cf::player::ext_reply($$$%) { 1264sub ext_reply($$$%) {
1034 my ($self, $id, %msg) = @_; 1265 my ($self, $id, %msg) = @_;
1035 1266
1036 $msg{msgid} = $id; 1267 $msg{msgid} = $id;
1037 1268
1038 $self->send ("ext " . to_json \%msg); 1269 $self->send ("ext " . cf::to_json \%msg);
1039} 1270}
1271
1272package cf;
1040 1273
1041=back 1274=back
1042 1275
1043 1276
1044=head3 cf::map 1277=head3 cf::map
1050package cf::map; 1283package cf::map;
1051 1284
1052use Fcntl; 1285use Fcntl;
1053use Coro::AIO; 1286use Coro::AIO;
1054 1287
1055our $MAX_RESET = 7200; 1288our $MAX_RESET = 3600;
1056our $DEFAULT_RESET = 3600; 1289our $DEFAULT_RESET = 3000;
1057 1290
1058sub generate_random_map { 1291sub generate_random_map {
1059 my ($path, $rmp) = @_; 1292 my ($path, $rmp) = @_;
1060 1293
1061 # mit "rum" bekleckern, nicht 1294 # mit "rum" bekleckern, nicht
1077# and all this just because we cannot iterate over 1310# and all this just because we cannot iterate over
1078# all maps in C++... 1311# all maps in C++...
1079sub change_all_map_light { 1312sub change_all_map_light {
1080 my ($change) = @_; 1313 my ($change) = @_;
1081 1314
1082 $_->change_map_light ($change) for values %cf::MAP; 1315 $_->change_map_light ($change)
1316 for grep $_->outdoor, values %cf::MAP;
1083} 1317}
1084 1318
1085sub try_load_header($) { 1319sub try_load_header($) {
1086 my ($path) = @_; 1320 my ($path) = @_;
1087 1321
1090 or return; 1324 or return;
1091 1325
1092 my $map = cf::map::new 1326 my $map = cf::map::new
1093 or return; 1327 or return;
1094 1328
1329 # for better error messages only, will be overwritten
1330 $map->path ($path);
1331
1095 $map->load_header ($path) 1332 $map->load_header ($path)
1096 or return; 1333 or return;
1097 1334
1098 $map->{load_path} = $path; 1335 $map->{load_path} = $path;
1099 1336
1100 $map 1337 $map
1101} 1338}
1102 1339
1340sub find;
1103sub find_map { 1341sub find {
1104 my ($path, $origin) = @_; 1342 my ($path, $origin) = @_;
1105 1343
1106 #warn "find_map<$path,$origin>\n";#d# 1344 #warn "find<$path,$origin>\n";#d#
1107 1345
1108 $path = new cf::path $path, $origin && $origin->path; 1346 $path = new cf::path $path, $origin && $origin->path;
1109 my $key = $path->as_string; 1347 my $key = $path->as_string;
1110 1348
1349 cf::lock_wait "map_find:$key";
1350
1111 $cf::MAP{$key} || do { 1351 $cf::MAP{$key} || do {
1352 my $guard = cf::lock_acquire "map_find:$key";
1353
1112 # do it the slow way 1354 # do it the slow way
1113 my $map = try_load_header $path->save_path; 1355 my $map = try_load_header $path->save_path;
1114 1356
1357 Coro::cede;
1358
1115 if ($map) { 1359 if ($map) {
1360 $map->last_access ((delete $map->{last_access})
1361 || $cf::RUNTIME); #d#
1116 # safety 1362 # safety
1117 $map->{instantiate_time} = $cf::RUNTIME 1363 $map->{instantiate_time} = $cf::RUNTIME
1118 if $map->{instantiate_time} > $cf::RUNTIME; 1364 if $map->{instantiate_time} > $cf::RUNTIME;
1119 } else { 1365 } else {
1120 if (my $rmp = $path->random_map_params) { 1366 if (my $rmp = $path->random_map_params) {
1125 1371
1126 $map or return; 1372 $map or return;
1127 1373
1128 $map->{load_original} = 1; 1374 $map->{load_original} = 1;
1129 $map->{instantiate_time} = $cf::RUNTIME; 1375 $map->{instantiate_time} = $cf::RUNTIME;
1376 $map->last_access ($cf::RUNTIME);
1130 $map->instantiate; 1377 $map->instantiate;
1131 1378
1132 # per-player maps become, after loading, normal maps 1379 # per-player maps become, after loading, normal maps
1133 $map->per_player (0) if $path->{user_rel}; 1380 $map->per_player (0) if $path->{user_rel};
1134 } 1381 }
1135 1382
1136 $map->path ($key); 1383 $map->path ($key);
1137 $map->{path} = $path; 1384 $map->{path} = $path;
1138 $map->last_access ($cf::RUNTIME); 1385 $map->{last_save} = $cf::RUNTIME;
1386
1387 Coro::cede;
1139 1388
1140 if ($map->should_reset) { 1389 if ($map->should_reset) {
1141 $map->reset; 1390 $map->reset;
1391 undef $guard;
1142 $map = find_map $path; 1392 $map = find $path
1393 or return;
1143 } 1394 }
1144 1395
1145 $cf::MAP{$key} = $map 1396 $cf::MAP{$key} = $map
1146 } 1397 }
1147} 1398}
1148 1399
1149sub load { 1400sub load {
1150 my ($self) = @_; 1401 my ($self) = @_;
1151 1402
1403 my $path = $self->{path};
1404 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1405
1152 return if $self->in_memory != cf::MAP_SWAPPED; 1406 return if $self->in_memory != cf::MAP_SWAPPED;
1153 1407
1154 $self->in_memory (cf::MAP_LOADING); 1408 $self->in_memory (cf::MAP_LOADING);
1155
1156 my $path = $self->{path};
1157 1409
1158 $self->alloc; 1410 $self->alloc;
1159 $self->load_objects ($self->{load_path}, 1) 1411 $self->load_objects ($self->{load_path}, 1)
1160 or return; 1412 or return;
1161 1413
1167 if (aio_open $uniq, O_RDONLY, 0) { 1419 if (aio_open $uniq, O_RDONLY, 0) {
1168 $self->clear_unique_items; 1420 $self->clear_unique_items;
1169 $self->load_objects ($uniq, 0); 1421 $self->load_objects ($uniq, 0);
1170 } 1422 }
1171 } 1423 }
1424
1425 Coro::cede;
1172 1426
1173 # now do the right thing for maps 1427 # now do the right thing for maps
1174 $self->link_multipart_objects; 1428 $self->link_multipart_objects;
1175 1429
1176 if ($self->{path}->is_style_map) { 1430 if ($self->{path}->is_style_map) {
1184 $self->difficulty ($self->estimate_difficulty) 1438 $self->difficulty ($self->estimate_difficulty)
1185 unless $self->difficulty; 1439 unless $self->difficulty;
1186 $self->activate; 1440 $self->activate;
1187 } 1441 }
1188 1442
1443 Coro::cede;
1444
1189 $self->in_memory (cf::MAP_IN_MEMORY); 1445 $self->in_memory (cf::MAP_IN_MEMORY);
1190} 1446}
1191 1447
1192sub load_map_sync { 1448# find and load all maps in the 3x3 area around a map
1449sub load_diag {
1450 my ($map) = @_;
1451
1452 my @diag; # diagonal neighbours
1453
1454 for (0 .. 3) {
1455 my $neigh = $map->tile_path ($_)
1456 or next;
1457 $neigh = find $neigh, $map
1458 or next;
1459 $neigh->load;
1460
1461 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1462 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1463 }
1464
1465 for (@diag) {
1466 my $neigh = find @$_
1467 or next;
1468 $neigh->load;
1469 }
1470}
1471
1472sub find_sync {
1193 my ($path, $origin) = @_; 1473 my ($path, $origin) = @_;
1194 1474
1195 #warn "load_map_sync<$path, $origin>\n";#d# 1475 cf::sync_job { find $path, $origin }
1476}
1196 1477
1197 cf::sync_job { 1478sub do_load_sync {
1198 my $map = cf::map::find_map $path, $origin 1479 my ($map) = @_;
1480
1481 cf::sync_job { $map->load };
1482}
1483
1484our %MAP_PREFETCH;
1485our $MAP_PREFETCHER = Coro::async {
1486 while () {
1487 while (%MAP_PREFETCH) {
1488 my $key = each %MAP_PREFETCH
1199 or return; 1489 or next;
1490 my $path = delete $MAP_PREFETCH{$key};
1491
1492 my $map = find $path
1493 or next;
1200 $map->load; 1494 $map->load;
1201 $map 1495 }
1496 Coro::schedule;
1202 } 1497 }
1498};
1499
1500sub find_async {
1501 my ($path, $origin) = @_;
1502
1503 $path = new cf::path $path, $origin && $origin->path;
1504 my $key = $path->as_string;
1505
1506 if (my $map = $cf::MAP{$key}) {
1507 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1508 }
1509
1510 $MAP_PREFETCH{$key} = $path;
1511 $MAP_PREFETCHER->ready;
1512
1513 ()
1203} 1514}
1204 1515
1205sub save { 1516sub save {
1206 my ($self) = @_; 1517 my ($self) = @_;
1207 1518
1519 my $lock = cf::lock_acquire "map_data:" . $self->path;
1520
1521 $self->{last_save} = $cf::RUNTIME;
1522
1523 return unless $self->dirty;
1524
1208 my $save = $self->{path}->save_path; utf8::encode $save; 1525 my $save = $self->{path}->save_path; utf8::encode $save;
1209 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1526 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1210 1527
1211 $self->{last_save} = $cf::RUNTIME;
1212
1213 return unless $self->dirty;
1214
1215 $self->{load_path} = $save; 1528 $self->{load_path} = $save;
1216 1529
1217 return if $self->{deny_save}; 1530 return if $self->{deny_save};
1531
1532 local $self->{last_access} = $self->last_access;#d#
1533
1534 cf::async {
1535 $_->contr->save for $self->players;
1536 };
1218 1537
1219 if ($uniq) { 1538 if ($uniq) {
1220 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1539 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1221 $self->save_objects ($uniq, cf::IO_UNIQUES); 1540 $self->save_objects ($uniq, cf::IO_UNIQUES);
1222 } else { 1541 } else {
1225} 1544}
1226 1545
1227sub swap_out { 1546sub swap_out {
1228 my ($self) = @_; 1547 my ($self) = @_;
1229 1548
1549 # save first because save cedes
1550 $self->save;
1551
1552 my $lock = cf::lock_acquire "map_data:" . $self->path;
1553
1230 return if $self->players; 1554 return if $self->players;
1231 return if $self->in_memory != cf::MAP_IN_MEMORY; 1555 return if $self->in_memory != cf::MAP_IN_MEMORY;
1232 return if $self->{deny_save}; 1556 return if $self->{deny_save};
1233 1557
1234 $self->save;
1235 $self->clear; 1558 $self->clear;
1236 $self->in_memory (cf::MAP_SWAPPED); 1559 $self->in_memory (cf::MAP_SWAPPED);
1237} 1560}
1238 1561
1239sub reset_at { 1562sub reset_at {
1240 my ($self) = @_; 1563 my ($self) = @_;
1241 1564
1242 # TODO: safety, remove and allow resettable per-player maps 1565 # TODO: safety, remove and allow resettable per-player maps
1243 return 1e100 if $self->{path}{user_rel}; 1566 return 1e99 if $self->{path}{user_rel};
1244 return 1e100 if $self->{deny_reset}; 1567 return 1e99 if $self->{deny_reset};
1245 1568
1246 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1569 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1247 my $to = $self->reset_timeout || $DEFAULT_RESET; 1570 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1248 $to = $MAX_RESET if $to > $MAX_RESET;
1249 1571
1250 $time + $to 1572 $time + $to
1251} 1573}
1252 1574
1253sub should_reset { 1575sub should_reset {
1269 1591
1270 $self->unlink_save; 1592 $self->unlink_save;
1271 1593
1272 delete $cf::MAP{$self->path}; 1594 delete $cf::MAP{$self->path};
1273 $self->{path} = new cf::path $new_path; 1595 $self->{path} = new cf::path $new_path;
1274 $self->path ($self->{path}->path); 1596 $self->path ($self->{path}->as_string);
1275 $cf::MAP{$self->path} = $self; 1597 $cf::MAP{$self->path} = $self;
1276 1598
1277 $self->save; 1599 $self->save;
1278} 1600}
1279 1601
1280sub reset { 1602sub reset {
1281 my ($self) = @_; 1603 my ($self) = @_;
1282 1604
1605 my $lock = cf::lock_acquire "map_data:" . $self->path;
1606
1283 return if $self->players; 1607 return if $self->players;
1284 return if $self->{path}{user_rel};#d# 1608 return if $self->{path}{user_rel};#d#
1285 1609
1286 warn "resetting map ", $self->path;#d# 1610 warn "resetting map ", $self->path;#d#
1287 1611
1291 1615
1292 $self->unlink_save; 1616 $self->unlink_save;
1293 $self->destroy; 1617 $self->destroy;
1294} 1618}
1295 1619
1620my $nuke_counter = "aaaa";
1621
1622sub nuke {
1623 my ($self) = @_;
1624
1625 $self->{deny_save} = 1;
1626 $self->reset_timeout (1);
1627 $self->rename ("{nuke}/" . ($nuke_counter++));
1628 $self->reset; # polite request, might not happen
1629}
1630
1296sub customise_for { 1631sub customise_for {
1297 my ($map, $ob) = @_; 1632 my ($map, $ob) = @_;
1298 1633
1299 if ($map->per_player) { 1634 if ($map->per_player) {
1300 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1635 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1301 } 1636 }
1302 1637
1303 $map 1638 $map
1304} 1639}
1305 1640
1306sub emergency_save { 1641=item cf::map::unique_maps
1307 local $cf::FREEZE = 1;
1308 1642
1309 warn "enter emergency map save\n"; 1643Returns an arrayref of cf::path's of all shared maps that have
1644instantiated unique items. May block.
1310 1645
1311 cf::sync_job { 1646=cut
1312 warn "begin emergency map save\n"; 1647
1313 $_->save for values %cf::MAP; 1648sub unique_maps() {
1649 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1650 or return;
1651
1652 my @paths;
1653
1654 for (@$files) {
1655 utf8::decode $_;
1656 next if /\.pst$/;
1657 next unless /^$PATH_SEP/o;
1658
1659 push @paths, new cf::path $_;
1314 }; 1660 }
1315 1661
1316 warn "end emergency map save\n"; 1662 \@paths
1317} 1663}
1318 1664
1319package cf; 1665package cf;
1320 1666
1321=back 1667=back
1322 1668
1669=head3 cf::object
1670
1671=cut
1672
1673package cf::object;
1674
1675=over 4
1676
1677=item $ob->inv_recursive
1678
1679Returns the inventory of the object _and_ their inventories, recursively.
1680
1681=cut
1682
1683sub inv_recursive_;
1684sub inv_recursive_ {
1685 map { $_, inv_recursive_ $_->inv } @_
1686}
1687
1688sub inv_recursive {
1689 inv_recursive_ inv $_[0]
1690}
1691
1692package cf;
1693
1694=back
1323 1695
1324=head3 cf::object::player 1696=head3 cf::object::player
1325 1697
1326=over 4 1698=over 4
1327 1699
1363 (ref $cf::CFG{"may_$access"} 1735 (ref $cf::CFG{"may_$access"}
1364 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1736 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1365 : $cf::CFG{"may_$access"}) 1737 : $cf::CFG{"may_$access"})
1366} 1738}
1367 1739
1740=item $player_object->enter_link
1741
1742Freezes the player and moves him/her to a special map (C<{link}>).
1743
1744The player should be reaosnably safe there for short amounts of time. You
1745I<MUST> call C<leave_link> as soon as possible, though.
1746
1747=item $player_object->leave_link ($map, $x, $y)
1748
1749Moves the player out of the specila link map onto the given map. If the
1750map is not valid (or omitted), the player will be moved back to the
1751location he/she was before the call to C<enter_link>, or, if that fails,
1752to the emergency map position.
1753
1754Might block.
1755
1756=cut
1757
1368sub cf::object::player::enter_link { 1758sub cf::object::player::enter_link {
1369 my ($self) = @_; 1759 my ($self) = @_;
1370 1760
1761 $self->deactivate_recursive;
1762
1371 return if $self->map == $LINK_MAP; 1763 return if $self->map == $LINK_MAP;
1372 1764
1373 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1765 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1374 if $self->map; 1766 if $self->map;
1375 1767
1376 $self->enter_map ($LINK_MAP, 20, 20); 1768 $self->enter_map ($LINK_MAP, 20, 20);
1377 $self->deactivate_recursive;
1378} 1769}
1379 1770
1380sub cf::object::player::leave_link { 1771sub cf::object::player::leave_link {
1381 my ($self, $map, $x, $y) = @_; 1772 my ($self, $map, $x, $y) = @_;
1382 1773
1383 my $link_pos = delete $self->{_link_pos}; 1774 my $link_pos = delete $self->{_link_pos};
1384 1775
1385 unless ($map) { 1776 unless ($map) {
1386 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1387
1388 # restore original map position 1777 # restore original map position
1389 ($map, $x, $y) = @{ $link_pos || [] }; 1778 ($map, $x, $y) = @{ $link_pos || [] };
1390 $map = cf::map::find_map $map; 1779 $map = cf::map::find $map;
1391 1780
1392 unless ($map) { 1781 unless ($map) {
1393 ($map, $x, $y) = @$EMERGENCY_POSITION; 1782 ($map, $x, $y) = @$EMERGENCY_POSITION;
1394 $map = cf::map::find_map $map 1783 $map = cf::map::find $map
1395 or die "FATAL: cannot load emergency map\n"; 1784 or die "FATAL: cannot load emergency map\n";
1396 } 1785 }
1397 } 1786 }
1398 1787
1399 ($x, $y) = (-1, -1) 1788 ($x, $y) = (-1, -1)
1402 # use -1 or undef as default coordinates, not 0, 0 1791 # use -1 or undef as default coordinates, not 0, 0
1403 ($x, $y) = ($map->enter_x, $map->enter_y) 1792 ($x, $y) = ($map->enter_x, $map->enter_y)
1404 if $x <=0 && $y <= 0; 1793 if $x <=0 && $y <= 0;
1405 1794
1406 $map->load; 1795 $map->load;
1796 $map->load_diag;
1407 1797
1798 return unless $self->contr->active;
1408 $self->activate_recursive; 1799 $self->activate_recursive;
1409 $self->enter_map ($map, $x, $y); 1800 $self->enter_map ($map, $x, $y);
1410} 1801}
1411 1802
1803cf::player->attach (
1804 on_logout => sub {
1805 my ($pl) = @_;
1806
1807 # abort map switching before logout
1808 if ($pl->ob->{_link_pos}) {
1809 cf::sync_job {
1810 $pl->ob->leave_link
1811 };
1812 }
1813 },
1814 on_login => sub {
1815 my ($pl) = @_;
1816
1817 # try to abort aborted map switching on player login :)
1818 # should happen only on crashes
1819 if ($pl->ob->{_link_pos}) {
1820 $pl->ob->enter_link;
1821 (async {
1822 # we need this sleep as the login has a concurrent enter_exit running
1823 # and this sleep increases chances of the player not ending up in scorn
1824 $pl->ob->reply (undef,
1825 "There was an internal problem at your last logout, "
1826 . "the server will try to bring you to your intended destination in a second.",
1827 cf::NDI_RED);
1828 Coro::Timer::sleep 1;
1829 $pl->ob->leave_link;
1830 })->prio (2);
1831 }
1832 },
1833);
1834
1412=item $player_object->goto_map ($map, $x, $y) 1835=item $player_object->goto ($path, $x, $y)
1413 1836
1414=cut 1837=cut
1415 1838
1416sub cf::object::player::goto_map { 1839sub cf::object::player::goto {
1417 my ($self, $path, $x, $y) = @_; 1840 my ($self, $path, $x, $y) = @_;
1418 1841
1842 $path = new cf::path $path;
1843
1419 $self->enter_link; 1844 $self->enter_link;
1420 1845
1421 (Coro::async { 1846 (async {
1422 $path = new cf::path $path;
1423
1424 my $map = cf::map::find_map $path->as_string; 1847 my $map = cf::map::find $path->as_string;
1425 $map = $map->customise_for ($self) if $map; 1848 $map = $map->customise_for ($self) if $map;
1426 1849
1427 warn "entering ", $map->path, " at ($x, $y)\n" 1850# warn "entering ", $map->path, " at ($x, $y)\n"
1428 if $map; 1851# if $map;
1852
1853 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1429 1854
1430 $self->leave_link ($map, $x, $y); 1855 $self->leave_link ($map, $x, $y);
1431 })->prio (1); 1856 })->prio (1);
1432} 1857}
1433 1858
1486 1911
1487 return unless $self->type == cf::PLAYER; 1912 return unless $self->type == cf::PLAYER;
1488 1913
1489 $self->enter_link; 1914 $self->enter_link;
1490 1915
1491 (Coro::async { 1916 (async {
1917 $self->deactivate_recursive; # just to be sure
1492 unless (eval { 1918 unless (eval {
1493
1494 prepare_random_map $exit 1919 prepare_random_map $exit
1495 if $exit->slaying eq "/!"; 1920 if $exit->slaying eq "/!";
1496 1921
1497 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1922 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1498 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1923 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1499 1924
1500 1; 1925 1;
1501 }) { 1926 }) {
1502 $self->message ("Something went wrong deep within the crossfire server. " 1927 $self->message ("Something went wrong deep within the crossfire server. "
1503 . "I'll try to bring you back to the map you were before. " 1928 . "I'll try to bring you back to the map you were before. "
1504 . "Please report this to the dungeon master", 1929 . "Please report this to the dungeon master!",
1505 cf::NDI_UNIQUE | cf::NDI_RED); 1930 cf::NDI_UNIQUE | cf::NDI_RED);
1506 1931
1507 warn "ERROR in enter_exit: $@"; 1932 warn "ERROR in enter_exit: $@";
1508 $self->leave_link; 1933 $self->leave_link;
1509 } 1934 }
1560 on_reply => sub { 1985 on_reply => sub {
1561 my ($ns, $msg) = @_; 1986 my ($ns, $msg) = @_;
1562 1987
1563 # this weird shuffling is so that direct followup queries 1988 # this weird shuffling is so that direct followup queries
1564 # get handled first 1989 # get handled first
1565 my $queue = delete $ns->{query_queue}; 1990 my $queue = delete $ns->{query_queue}
1991 or return; # be conservative, not sure how that can happen, but we saw a crash here
1566 1992
1567 (shift @$queue)->[1]->($msg); 1993 (shift @$queue)->[1]->($msg);
1568 1994
1569 push @{ $ns->{query_queue} }, @$queue; 1995 push @{ $ns->{query_queue} }, @$queue;
1570 1996
1576 } 2002 }
1577 } 2003 }
1578 }, 2004 },
1579); 2005);
1580 2006
1581=item $client->coro (\&cb) 2007=item $client->async (\&cb)
1582 2008
1583Create a new coroutine, running the specified callback. The coroutine will 2009Create a new coroutine, running the specified callback. The coroutine will
1584be automatically cancelled when the client gets destroyed (e.g. on logout, 2010be automatically cancelled when the client gets destroyed (e.g. on logout,
1585or loss of connection). 2011or loss of connection).
1586 2012
1587=cut 2013=cut
1588 2014
1589sub cf::client::coro { 2015sub cf::client::async {
1590 my ($self, $cb) = @_; 2016 my ($self, $cb) = @_;
1591 2017
1592 my $coro; $coro = async { 2018 my $coro = &Coro::async ($cb);
1593 eval {
1594 $cb->();
1595 };
1596 warn $@ if $@;
1597 };
1598 2019
1599 $coro->on_destroy (sub { 2020 $coro->on_destroy (sub {
1600 delete $self->{_coro}{$coro+0}; 2021 delete $self->{_coro}{$coro+0};
1601 }); 2022 });
1602 2023
1774 2195
1775{ 2196{
1776 my $path = cf::localdir . "/database.pst"; 2197 my $path = cf::localdir . "/database.pst";
1777 2198
1778 sub db_load() { 2199 sub db_load() {
1779 warn "loading database $path\n";#d# remove later
1780 $DB = stat $path ? Storable::retrieve $path : { }; 2200 $DB = stat $path ? Storable::retrieve $path : { };
1781 } 2201 }
1782 2202
1783 my $pid; 2203 my $pid;
1784 2204
1785 sub db_save() { 2205 sub db_save() {
1786 warn "saving database $path\n";#d# remove later
1787 waitpid $pid, 0 if $pid; 2206 waitpid $pid, 0 if $pid;
1788 if (0 == ($pid = fork)) { 2207 if (0 == ($pid = fork)) {
1789 $DB->{_meta}{version} = 1; 2208 $DB->{_meta}{version} = 1;
1790 Storable::nstore $DB, "$path~"; 2209 Storable::nstore $DB, "$path~";
1791 rename "$path~", $path; 2210 rename "$path~", $path;
1839 open my $fh, "<:utf8", cf::confdir . "/config" 2258 open my $fh, "<:utf8", cf::confdir . "/config"
1840 or return; 2259 or return;
1841 2260
1842 local $/; 2261 local $/;
1843 *CFG = YAML::Syck::Load <$fh>; 2262 *CFG = YAML::Syck::Load <$fh>;
2263
2264 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2265
2266 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2267 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2268
2269 if (exists $CFG{mlockall}) {
2270 eval {
2271 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2272 and die "WARNING: m(un)lockall failed: $!\n";
2273 };
2274 warn $@ if $@;
2275 }
1844} 2276}
1845 2277
1846sub main { 2278sub main {
1847 # we must not ever block the main coroutine 2279 # we must not ever block the main coroutine
1848 local $Coro::idle = sub { 2280 local $Coro::idle = sub {
1849 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 2281 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1850 (Coro::unblock_sub {
1851 Event::one_event; 2282 async { Event::one_event };
1852 })->();
1853 }; 2283 };
1854 2284
1855 cfg_load; 2285 cfg_load;
1856 db_load; 2286 db_load;
1857 load_extensions; 2287 load_extensions;
1858 Event::loop; 2288 Event::loop;
1859} 2289}
1860 2290
1861############################################################################# 2291#############################################################################
1862# initialisation 2292# initialisation and cleanup
2293
2294# install some emergency cleanup handlers
2295BEGIN {
2296 for my $signal (qw(INT HUP TERM)) {
2297 Event->signal (
2298 data => WF_AUTOCANCEL,
2299 signal => $signal,
2300 cb => sub {
2301 cf::cleanup "SIG$signal";
2302 },
2303 );
2304 }
2305}
2306
2307sub emergency_save() {
2308 my $freeze_guard = cf::freeze_mainloop;
2309
2310 warn "enter emergency perl save\n";
2311
2312 cf::sync_job {
2313 # use a peculiar iteration method to avoid tripping on perl
2314 # refcount bugs in for. also avoids problems with players
2315 # and maps saved/Destroyed asynchronously.
2316 warn "begin emergency player save\n";
2317 for my $login (keys %cf::PLAYER) {
2318 my $pl = $cf::PLAYER{$login} or next;
2319 $pl->valid or next;
2320 $pl->save;
2321 }
2322 warn "end emergency player save\n";
2323
2324 warn "begin emergency map save\n";
2325 for my $path (keys %cf::MAP) {
2326 my $map = $cf::MAP{$path} or next;
2327 $map->valid or next;
2328 $map->save;
2329 }
2330 warn "end emergency map save\n";
2331 };
2332
2333 warn "leave emergency perl save\n";
2334}
1863 2335
1864sub reload() { 2336sub reload() {
1865 # can/must only be called in main 2337 # can/must only be called in main
1866 if ($Coro::current != $Coro::main) { 2338 if ($Coro::current != $Coro::main) {
1867 warn "can only reload from main coroutine\n"; 2339 warn "can only reload from main coroutine\n";
1868 return; 2340 return;
1869 } 2341 }
1870 2342
1871 warn "reloading..."; 2343 warn "reloading...";
1872 2344
1873 local $FREEZE = 1; 2345 my $guard = freeze_mainloop;
1874 cf::emergency_save; 2346 cf::emergency_save;
1875 2347
1876 eval { 2348 eval {
1877 # if anything goes wrong in here, we should simply crash as we already saved 2349 # if anything goes wrong in here, we should simply crash as we already saved
1878 2350
1940 cf::load_extensions; 2412 cf::load_extensions;
1941 2413
1942 # reattach attachments to objects 2414 # reattach attachments to objects
1943 warn "reattach"; 2415 warn "reattach";
1944 _global_reattach; 2416 _global_reattach;
2417 reattach $_ for values %MAP;
1945 }; 2418 };
1946 2419
1947 if ($@) { 2420 if ($@) {
1948 warn $@; 2421 warn $@;
1949 warn "error while reloading, exiting."; 2422 warn "error while reloading, exiting.";
1965 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2438 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
1966 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2439 $LINK_MAP->in_memory (MAP_IN_MEMORY);
1967 2440
1968 # dirty hack because... archetypes are not yet loaded 2441 # dirty hack because... archetypes are not yet loaded
1969 Event->timer ( 2442 Event->timer (
1970 after => 2, 2443 after => 10,
1971 cb => sub { 2444 cb => sub {
1972 $_[0]->w->cancel; 2445 $_[0]->w->cancel;
1973 2446
1974 # provide some exits "home" 2447 # provide some exits "home"
1975 my $exit = cf::object::new "exit"; 2448 my $exit = cf::object::new "exit";
2014 reentrant => 0, 2487 reentrant => 0,
2015 prio => 0, 2488 prio => 0,
2016 at => $NEXT_TICK || $TICK, 2489 at => $NEXT_TICK || $TICK,
2017 data => WF_AUTOCANCEL, 2490 data => WF_AUTOCANCEL,
2018 cb => sub { 2491 cb => sub {
2019 unless ($FREEZE) {
2020 cf::server_tick; # one server iteration 2492 cf::server_tick; # one server iteration
2021 $RUNTIME += $TICK; 2493 $RUNTIME += $TICK;
2022 }
2023
2024 $NEXT_TICK += $TICK; 2494 $NEXT_TICK += $TICK;
2495
2496 $WAIT_FOR_TICK->broadcast;
2497 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2025 2498
2026 # if we are delayed by four ticks or more, skip them all 2499 # if we are delayed by four ticks or more, skip them all
2027 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2500 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2028 2501
2029 $TICK_WATCHER->at ($NEXT_TICK); 2502 $TICK_WATCHER->at ($NEXT_TICK);
2051 or warn "ERROR: unable to write runtime file: $!"; 2524 or warn "ERROR: unable to write runtime file: $!";
2052 })->(); 2525 })->();
2053 }, 2526 },
2054); 2527);
2055 2528
2529END { cf::emergency_save }
2530
20561 25311
2057 2532

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines