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.161 by root, Thu Jan 11 00:16:58 2007 UTC vs.
Revision 1.187 by root, Sat Jan 20 21:06:52 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.4 ();
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;
… …
44our @EVENT; 44our @EVENT;
45our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
46 46
47our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
49our $NEXT_TICK; 51our $NEXT_TICK;
50our $NOW; 52our $NOW;
51 53
52our %CFG; 54our %CFG;
53 55
54our $UPTIME; $UPTIME ||= time; 56our $UPTIME; $UPTIME ||= time;
55our $RUNTIME; 57our $RUNTIME;
56 58
57our %PLAYER; # all users 59our %PLAYER; # all users
58our %MAP; # all maps 60our %MAP; # all maps
59our $LINK_MAP; # the special {link} map 61our $LINK_MAP; # the special {link} map, which is always available
60our $RANDOM_MAPS = cf::localdir . "/random"; 62our $RANDOM_MAPS = cf::localdir . "/random";
61 63
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66
67# used to convert map paths into valid unix filenames by replacing / by ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
64 69
65binmode STDOUT; 70binmode STDOUT;
66binmode STDERR; 71binmode STDERR;
67 72
68# read virtual server time, if available 73# read virtual server time, if available
… …
76mkdir cf::localdir . "/" . cf::playerdir; 81mkdir cf::localdir . "/" . cf::playerdir;
77mkdir cf::localdir . "/" . cf::tmpdir; 82mkdir cf::localdir . "/" . cf::tmpdir;
78mkdir cf::localdir . "/" . cf::uniquedir; 83mkdir cf::localdir . "/" . cf::uniquedir;
79mkdir $RANDOM_MAPS; 84mkdir $RANDOM_MAPS;
80 85
81# a special map that is always available
82our $LINK_MAP;
83our $EMERGENCY_POSITION; 86our $EMERGENCY_POSITION;
84 87
85############################################################################# 88#############################################################################
86 89
87=head2 GLOBAL VARIABLES 90=head2 GLOBAL VARIABLES
… …
256} 259}
257 260
258sub freeze_mainloop { 261sub freeze_mainloop {
259 return unless $TICK_WATCHER->is_active; 262 return unless $TICK_WATCHER->is_active;
260 263
261 my $guard = Coro::guard { $TICK_WATCHER->start }; 264 my $guard = Coro::guard {
265 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 };
268 $WRITE_RUNTIME_WATCHER->stop;
262 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
263 $guard 270 $guard
264} 271}
265 272
266=item cf::async { BLOCK } 273=item cf::async { BLOCK }
… …
342 my $runtime = cf::localdir . "/runtime"; 349 my $runtime = cf::localdir . "/runtime";
343 350
344 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
345 or return; 352 or return;
346 353
354 my $value = $cf::RUNTIME + 90 + 10;
347 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 355 # 10 is the runtime save interval, for a monotonic clock
356 # 60 allows for the watchdog to kill the server.
357
348 (aio_write $fh, 0, (length $value), $value, 0) <= 0 358 (aio_write $fh, 0, (length $value), $value, 0) <= 0
349 and return; 359 and return;
350 360
351 aio_fsync $fh 361 aio_fsync $fh
352 and return; 362 and return;
… …
361} 371}
362 372
363=back 373=back
364 374
365=cut 375=cut
366
367#############################################################################
368
369package cf::path;
370
371use overload
372 '""' => \&as_string;
373
374# used to convert map paths into valid unix filenames by repalcing / by ∕
375our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
376
377sub register {
378 my ($pkg, $prefix) = @_;
379
380 $EXT_MAP{$prefix} = $pkg;
381}
382
383sub new {
384 my ($class, $path, $base) = @_;
385
386 return $path if ref $path;
387
388 my $self = {};
389
390 # {... are special paths that are not being touched
391 # ?xxx/... are special absolute paths
392 # ?random/... random maps
393 # /! non-realised random map exit
394 # /... normal maps
395 # ~/... per-player maps without a specific player (DO NOT USE)
396 # ~user/... per-player map of a specific user
397
398 $path =~ s/$PATH_SEP/\//go;
399
400 if ($path =~ /^{/) {
401 # fine as it is
402 } else {
403 if ($path =~ s{^~([^/]+)?}{}) {
404 # ~user
405 $self->{user_rel} = 1;
406
407 if (defined $1) {
408 $self->{user} = $1;
409 } elsif ($base =~ m{^~([^/]+)/}) {
410 $self->{user} = $1;
411 } else {
412 warn "cannot resolve user-relative path without user <$path,$base>\n";
413 }
414 } elsif ($path =~ s{^\?([^/]+)/}{}) {
415 # ?...
416 $self->{ext} = $1;
417 if (my $ext = $EXT_MAP{$1}) {
418 bless $self, $ext;
419 }
420 } elsif ($path =~ /^\//) {
421 # /...
422 # already absolute
423 } else {
424 # relative
425 $base =~ s{[^/]+/?$}{};
426 return $class->new ("$base/$path");
427 }
428
429 for ($path) {
430 redo if s{/\.?/}{/};
431 redo if s{/[^/]+/\.\./}{/};
432 }
433 }
434
435 $self->{path} = $path;
436
437 if ("HASH" eq ref $self) {
438 bless $self, $class;
439 } else {
440 $self->init;
441 }
442
443 for my $ext (values %EXT_MAP) {
444 if (my $subst = $ext->substitute ($self)) {
445 return $subst;
446 }
447 }
448
449 $self
450}
451
452sub init {
453 # nop
454}
455
456sub substitute {
457 ()
458}
459
460# the name / primary key / in-game path
461sub as_string {
462 my ($self) = @_;
463
464 $self->{user_rel} ? "~$self->{user}$self->{path}"
465 : $self->{ext} ? "?$self->{ext}/$self->{path}"
466 : $self->{path}
467}
468
469# the displayed name, this is a one way mapping
470sub visible_name {
471 &as_string
472}
473
474# escape the /'s in the path
475sub _escaped_path {
476 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
477 $path
478}
479
480# the original (read-only) location
481sub load_path {
482 my ($self) = @_;
483
484 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
485}
486
487# the temporary/swap location
488sub save_path {
489 my ($self) = @_;
490
491 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
492 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
493 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
494}
495
496# the unique path, undef == no special unique path
497sub uniq_path {
498 my ($self) = @_;
499
500 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
501}
502
503# this is somewhat ugly, but style maps do need special treatment
504sub is_style_map {
505 $_[0]{path} =~ m{^/styles/}
506}
507
508sub load_orig {
509 my ($self) = @_;
510
511 &cf::map::load_map_header ($self->load_path)
512}
513
514sub load_temp {
515 my ($self) = @_;
516
517 &cf::map::load_map_header ($self->save_path)
518}
519
520package cf;
521 376
522############################################################################# 377#############################################################################
523 378
524=head2 ATTACHABLE OBJECTS 379=head2 ATTACHABLE OBJECTS
525 380
… …
651our @CB_TYPE = (); # registry for type (cf-object class) based events 506our @CB_TYPE = (); # registry for type (cf-object class) based events
652our @CB_MAP = (); 507our @CB_MAP = ();
653 508
654my %attachment; 509my %attachment;
655 510
511sub cf::attachable::thawer_merge {
512 # simply override everything except _meta
513 local $_[0]{_meta};
514 %{$_[0]} = %{$_[1]};
515}
516
656sub _attach_cb($$$$) { 517sub _attach_cb($$$$) {
657 my ($registry, $event, $prio, $cb) = @_; 518 my ($registry, $event, $prio, $cb) = @_;
658 519
659 use sort 'stable'; 520 use sort 'stable';
660 521
… …
831# object support 692# object support
832 693
833sub reattach { 694sub reattach {
834 # basically do the same as instantiate, without calling instantiate 695 # basically do the same as instantiate, without calling instantiate
835 my ($obj) = @_; 696 my ($obj) = @_;
697
698 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
836 699
837 my $registry = $obj->registry; 700 my $registry = $obj->registry;
838 701
839 @$registry = (); 702 @$registry = ();
840 703
… …
1027 "package $pkg; use strict; use utf8;\n" 890 "package $pkg; use strict; use utf8;\n"
1028 . "#line 1 \"$path\"\n{\n" 891 . "#line 1 \"$path\"\n{\n"
1029 . (do { local $/; <$fh> }) 892 . (do { local $/; <$fh> })
1030 . "\n};\n1"; 893 . "\n};\n1";
1031 894
1032 eval $source 895 unless (eval $source) {
1033 or die $@ ? "$path: $@\n" 896 my $msg = $@ ? "$path: $@\n"
1034 : "extension disabled.\n"; 897 : "extension disabled.\n";
898 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
899 warn $@;
900 warn "mandatory extension failed to load, exiting.\n";
901 exit 1;
902 }
903 die $@;
904 }
1035 905
1036 push @EXTS, $pkg; 906 push @EXTS, $pkg;
1037} 907}
1038 908
1039sub load_extensions { 909sub load_extensions {
… …
1045 } or warn "$ext not loaded: $@"; 915 } or warn "$ext not loaded: $@";
1046 } 916 }
1047} 917}
1048 918
1049############################################################################# 919#############################################################################
1050# load/save/clean perl data associated with a map
1051
1052*cf::mapsupport::on_clean = sub {
1053 my ($map) = @_;
1054
1055 my $path = $map->tmpname;
1056 defined $path or return;
1057
1058 unlink "$path.pst";
1059};
1060
1061cf::map->attach (prio => -10000, package => cf::mapsupport::);
1062
1063#############################################################################
1064 920
1065=head2 CORE EXTENSIONS 921=head2 CORE EXTENSIONS
1066 922
1067Functions and methods that extend core crossfire objects. 923Functions and methods that extend core crossfire objects.
1068 924
… …
1104 960
1105sub exists($) { 961sub exists($) {
1106 my ($login) = @_; 962 my ($login) = @_;
1107 963
1108 $cf::PLAYER{$login} 964 $cf::PLAYER{$login}
1109 or cf::sync_job { !aio_stat $login } 965 or cf::sync_job { !aio_stat path $login }
1110} 966}
1111 967
1112sub find($) { 968sub find($) {
1113 return $cf::PLAYER{$_[0]} || do { 969 return $cf::PLAYER{$_[0]} || do {
1114 my $login = $_[0]; 970 my $login = $_[0];
… …
1204 \@logins 1060 \@logins
1205} 1061}
1206 1062
1207=item $player->maps 1063=item $player->maps
1208 1064
1209Returns an arrayref of cf::path's of all maps that are private for this 1065Returns an arrayref of map paths that are private for this
1210player. May block. 1066player. May block.
1211 1067
1212=cut 1068=cut
1213 1069
1214sub maps($) { 1070sub maps($) {
… …
1222 for (@$files) { 1078 for (@$files) {
1223 utf8::decode $_; 1079 utf8::decode $_;
1224 next if /\.(?:pl|pst)$/; 1080 next if /\.(?:pl|pst)$/;
1225 next unless /^$PATH_SEP/o; 1081 next unless /^$PATH_SEP/o;
1226 1082
1083 s/\.map$//;
1227 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1228 } 1085 }
1229 1086
1230 \@paths 1087 \@paths
1231} 1088}
1232 1089
… …
1258package cf::map; 1115package cf::map;
1259 1116
1260use Fcntl; 1117use Fcntl;
1261use Coro::AIO; 1118use Coro::AIO;
1262 1119
1120use overload
1121 '""' => \&as_string,
1122 fallback => 1;
1123
1263our $MAX_RESET = 3600; 1124our $MAX_RESET = 3600;
1264our $DEFAULT_RESET = 3000; 1125our $DEFAULT_RESET = 3000;
1265 1126
1266sub generate_random_map { 1127sub generate_random_map {
1267 my ($path, $rmp) = @_; 1128 my ($self, $rmp) = @_;
1268
1269 # mit "rum" bekleckern, nicht 1129 # mit "rum" bekleckern, nicht
1270 cf::map::_create_random_map 1130 $self->_create_random_map (
1271 $path,
1272 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1131 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1273 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1132 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1274 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1133 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1275 $rmp->{exit_on_final_map}, 1134 $rmp->{exit_on_final_map},
1276 $rmp->{xsize}, $rmp->{ysize}, 1135 $rmp->{xsize}, $rmp->{ysize},
1277 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1136 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1278 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1137 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1279 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1138 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1280 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1139 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1281 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1282 (cf::region::find $rmp->{region}) 1141 (cf::region::find $rmp->{region}), $rmp->{custom}
1142 )
1143}
1144
1145=item cf::map->register ($regex, $prio)
1146
1147Register a handler for the map path matching the given regex at the
1148givne priority (higher is better, built-in handlers have priority 0, the
1149default).
1150
1151=cut
1152
1153sub register {
1154 my (undef, $regex, $prio) = @_;
1155 my $pkg = caller;
1156
1157 no strict;
1158 push @{"$pkg\::ISA"}, __PACKAGE__;
1159
1160 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1161}
1162
1163# also paths starting with '/'
1164$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1165
1166sub thawer_merge {
1167 my ($self, $merge) = @_;
1168
1169 # we have to keep some variables in memory intact
1170 local $self->{path};
1171 local $self->{load_path};
1172 local $self->{deny_save};
1173 local $self->{deny_reset};
1174
1175 $self->SUPER::thawer_merge ($merge);
1176}
1177
1178sub normalise {
1179 my ($path, $base) = @_;
1180
1181 # map plan:
1182 #
1183 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched
1185 # ?xxx/... are special absolute paths
1186 # ?random/... random maps
1187 # /... normal maps
1188 # ~user/... per-player map of a specific user
1189
1190 $path =~ s/$PATH_SEP/\//go;
1191
1192 # treat it as relative path if it starts with
1193 # something that looks reasonable
1194 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1195 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1196
1197 $base =~ s{[^/]+/?$}{};
1198 $path = "$base/$path";
1199 }
1200
1201 for ($path) {
1202 redo if s{//}{/};
1203 redo if s{/\.?/}{/};
1204 redo if s{/[^/]+/\.\./}{/};
1205 }
1206
1207 $path
1208}
1209
1210sub new_from_path {
1211 my (undef, $path, $base) = @_;
1212
1213 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1214
1215 $path = normalise $path, $base;
1216
1217 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1218 if ($path =~ $EXT_MAP{$pkg}[1]) {
1219 my $self = bless cf::map::new, $pkg;
1220 $self->{path} = $path; $self->path ($path);
1221 $self->init; # pass $1 etc.
1222 return $self;
1223 }
1224 }
1225
1226 Carp::carp "unable to resolve path '$path'.";
1227 ()
1228}
1229
1230sub init {
1231 my ($self) = @_;
1232
1233 $self
1234}
1235
1236sub as_string {
1237 my ($self) = @_;
1238
1239 "$self->{path}"
1240}
1241
1242# the displayed name, this is a one way mapping
1243sub visible_name {
1244 &as_string
1245}
1246
1247# the original (read-only) location
1248sub load_path {
1249 my ($self) = @_;
1250
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1252}
1253
1254# the temporary/swap location
1255sub save_path {
1256 my ($self) = @_;
1257
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1260}
1261
1262# the unique path, undef == no special unique path
1263sub uniq_path {
1264 my ($self) = @_;
1265
1266 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1267 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1283} 1268}
1284 1269
1285# and all this just because we cannot iterate over 1270# and all this just because we cannot iterate over
1286# all maps in C++... 1271# all maps in C++...
1287sub change_all_map_light { 1272sub change_all_map_light {
… …
1289 1274
1290 $_->change_map_light ($change) 1275 $_->change_map_light ($change)
1291 for grep $_->outdoor, values %cf::MAP; 1276 for grep $_->outdoor, values %cf::MAP;
1292} 1277}
1293 1278
1279sub unlink_save {
1280 my ($self) = @_;
1281
1282 utf8::encode (my $save = $self->save_path);
1283 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1284 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1285}
1286
1294sub load_map_header($) { 1287sub load_header_from($) {
1295 my ($path) = @_; 1288 my ($self, $path) = @_;
1296 1289
1297 utf8::encode $path; 1290 utf8::encode $path;
1298 aio_open $path, O_RDONLY, 0 1291 aio_open $path, O_RDONLY, 0
1299 or return; 1292 or return;
1300 1293
1301 my $map = cf::map::new 1294 $self->_load_header ($path)
1302 or return; 1295 or return;
1303 1296
1304 # for better error messages only, will be overwritten later 1297 $self->{load_path} = $path;
1305 $map->path ($path);
1306 1298
1307 $map->load_header ($path) 1299 1
1300}
1301
1302sub load_orig {
1303 my ($self) = @_;
1304
1305 $self->load_header_from ($self->load_path)
1306}
1307
1308sub load_temp {
1309 my ($self) = @_;
1310
1311 $self->load_header_from ($self->save_path)
1312}
1313
1314sub load_header {
1315 my ($self) = @_;
1316
1317 if ($self->load_temp) {
1318 $self->last_access ((delete $self->{last_access})
1319 || $cf::RUNTIME); #d#
1320 # safety
1321 $self->{instantiate_time} = $cf::RUNTIME
1322 if $self->{instantiate_time} > $cf::RUNTIME;
1323 } else {
1324 $self->load_orig
1308 or return; 1325 or return;
1309 1326
1310 $map->{load_path} = $path; 1327 $self->{load_original} = 1;
1328 $self->{instantiate_time} = $cf::RUNTIME;
1329 $self->last_access ($cf::RUNTIME);
1330 $self->instantiate;
1331 }
1311 1332
1312 $map 1333 1
1313} 1334}
1314 1335
1315sub find; 1336sub find;
1316sub find { 1337sub find {
1317 my ($path, $origin) = @_; 1338 my ($path, $origin) = @_;
1318 1339
1319 #warn "find<$path,$origin>\n";#d#
1320
1321 $path = new cf::path $path, $origin && $origin->path; 1340 $path = normalise $path, $origin && $origin->path;
1322 my $key = $path->as_string;
1323 1341
1324 cf::lock_wait "map_find:$key"; 1342 cf::lock_wait "map_find:$path";
1325 1343
1326 $cf::MAP{$key} || do { 1344 $cf::MAP{$path} || do {
1327 my $guard = cf::lock_acquire "map_find:$key"; 1345 my $guard = cf::lock_acquire "map_find:$path";
1328 1346 my $map = new_from_path cf::map $path
1329 # do it the slow way
1330 my $map = $path->load_temp;
1331
1332 Coro::cede;
1333
1334 if ($map) {
1335 $map->last_access ((delete $map->{last_access})
1336 || $cf::RUNTIME); #d#
1337 # safety
1338 $map->{instantiate_time} = $cf::RUNTIME
1339 if $map->{instantiate_time} > $cf::RUNTIME;
1340 } else {
1341 $map = $path->load_orig
1342 or return; 1347 or return;
1343 1348
1344 $map->{load_original} = 1;
1345 $map->{instantiate_time} = $cf::RUNTIME;
1346 $map->last_access ($cf::RUNTIME);
1347 $map->instantiate;
1348
1349 # per-player maps become, after loading, normal maps
1350 $map->per_player (0) if $path->{user_rel};
1351 }
1352
1353 $map->path ($key);
1354 $map->{path} = $path;
1355 $map->{last_save} = $cf::RUNTIME; 1349 $map->{last_save} = $cf::RUNTIME;
1356 1350
1357 Coro::cede; 1351 $map->load_header
1352 or return;
1358 1353
1359 if ($map->should_reset) { 1354 if ($map->should_reset) {
1355 # doing this can freeze the server in a sync job, obviously
1356 #$cf::WAIT_FOR_TICK->wait;
1360 $map->reset; 1357 $map->reset;
1361 undef $guard; 1358 undef $guard;
1362 $map = find $path 1359 $map = find $path
1363 or return; 1360 or return;
1364 } 1361 }
1365 1362
1366 $cf::MAP{$key} = $map 1363 $cf::MAP{$path} = $map
1367 } 1364 }
1368} 1365}
1369 1366
1370sub load { 1367sub load {
1371 my ($self) = @_; 1368 my ($self) = @_;
1372 1369
1373 my $path = $self->{path}; 1370 my $path = $self->{path};
1374 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1371 my $guard = cf::lock_acquire "map_load:$path";
1375 1372
1376 return if $self->in_memory != cf::MAP_SWAPPED; 1373 return if $self->in_memory != cf::MAP_SWAPPED;
1377 1374
1378 $self->in_memory (cf::MAP_LOADING); 1375 $self->in_memory (cf::MAP_LOADING);
1379 1376
1380 $self->alloc; 1377 $self->alloc;
1381 $self->load_objects ($self->{load_path}, 1) 1378 $self->_load_objects ($self->{load_path}, 1)
1382 or return; 1379 or return;
1383 1380
1384 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1381 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1385 if delete $self->{load_original}; 1382 if delete $self->{load_original};
1386 1383
1387 if (my $uniq = $path->uniq_path) { 1384 if (my $uniq = $self->uniq_path) {
1388 utf8::encode $uniq; 1385 utf8::encode $uniq;
1389 if (aio_open $uniq, O_RDONLY, 0) { 1386 if (aio_open $uniq, O_RDONLY, 0) {
1390 $self->clear_unique_items; 1387 $self->clear_unique_items;
1391 $self->load_objects ($uniq, 0); 1388 $self->_load_objects ($uniq, 0);
1392 } 1389 }
1393 } 1390 }
1394 1391
1395 Coro::cede; 1392 Coro::cede;
1396 1393
1397 # now do the right thing for maps 1394 # now do the right thing for maps
1398 $self->link_multipart_objects; 1395 $self->link_multipart_objects;
1399 1396
1400 if ($self->{path}->is_style_map) { 1397 unless ($self->{deny_activate}) {
1401 $self->{deny_save} = 1; 1398 $self->decay_objects;
1402 $self->{deny_reset} = 1;
1403 } else {
1404 $self->fix_auto_apply; 1399 $self->fix_auto_apply;
1405 $self->decay_objects;
1406 $self->update_buttons; 1400 $self->update_buttons;
1401 Coro::cede;
1407 $self->set_darkness_map; 1402 $self->set_darkness_map;
1408 $self->difficulty ($self->estimate_difficulty) 1403 $self->difficulty ($self->estimate_difficulty)
1409 unless $self->difficulty; 1404 unless $self->difficulty;
1405 Coro::cede;
1410 $self->activate; 1406 $self->activate;
1411 } 1407 }
1412 1408
1413 Coro::cede;
1414
1415 $self->in_memory (cf::MAP_IN_MEMORY); 1409 $self->in_memory (cf::MAP_IN_MEMORY);
1410}
1411
1412sub customise_for {
1413 my ($self, $ob) = @_;
1414
1415 return find "~" . $ob->name . "/" . $self->{path}
1416 if $self->per_player;
1417
1418 $self
1416} 1419}
1417 1420
1418# find and load all maps in the 3x3 area around a map 1421# find and load all maps in the 3x3 area around a map
1419sub load_diag { 1422sub load_diag {
1420 my ($map) = @_; 1423 my ($map) = @_;
… …
1450 1453
1451 cf::sync_job { $map->load }; 1454 cf::sync_job { $map->load };
1452} 1455}
1453 1456
1454our %MAP_PREFETCH; 1457our %MAP_PREFETCH;
1455our $MAP_PREFETCHER = Coro::async { 1458our $MAP_PREFETCHER = undef;
1456 while () {
1457 while (%MAP_PREFETCH) {
1458 my $key = each %MAP_PREFETCH
1459 or next;
1460 my $path = delete $MAP_PREFETCH{$key};
1461
1462 my $map = find $path
1463 or next;
1464 $map->load;
1465 }
1466 Coro::schedule;
1467 }
1468};
1469 1459
1470sub find_async { 1460sub find_async {
1471 my ($path, $origin) = @_; 1461 my ($path, $origin) = @_;
1472 1462
1473 $path = new cf::path $path, $origin && $origin->path; 1463 $path = normalise $path, $origin && $origin->{path};
1474 my $key = $path->as_string;
1475 1464
1476 if (my $map = $cf::MAP{$key}) { 1465 if (my $map = $cf::MAP{$path}) {
1477 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1466 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1478 } 1467 }
1479 1468
1480 $MAP_PREFETCH{$key} = $path; 1469 undef $MAP_PREFETCH{$path};
1481 $MAP_PREFETCHER->ready; 1470 $MAP_PREFETCHER ||= cf::async {
1471 while (%MAP_PREFETCH) {
1472 for my $path (keys %MAP_PREFETCH) {
1473 my $map = find $path
1474 or next;
1475 $map->load;
1476
1477 delete $MAP_PREFETCH{$path};
1478 }
1479 }
1480 undef $MAP_PREFETCHER;
1481 };
1482 1482
1483 () 1483 ()
1484} 1484}
1485 1485
1486sub save { 1486sub save {
… …
1490 1490
1491 $self->{last_save} = $cf::RUNTIME; 1491 $self->{last_save} = $cf::RUNTIME;
1492 1492
1493 return unless $self->dirty; 1493 return unless $self->dirty;
1494 1494
1495 my $save = $self->{path}->save_path; utf8::encode $save; 1495 my $save = $self->save_path; utf8::encode $save;
1496 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1496 my $uniq = $self->uniq_path; utf8::encode $uniq;
1497 1497
1498 $self->{load_path} = $save; 1498 $self->{load_path} = $save;
1499 1499
1500 return if $self->{deny_save}; 1500 return if $self->{deny_save};
1501 1501
… …
1504 cf::async { 1504 cf::async {
1505 $_->contr->save for $self->players; 1505 $_->contr->save for $self->players;
1506 }; 1506 };
1507 1507
1508 if ($uniq) { 1508 if ($uniq) {
1509 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1509 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1510 $self->save_objects ($uniq, cf::IO_UNIQUES); 1510 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1511 } else { 1511 } else {
1512 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1512 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1513 } 1513 }
1514} 1514}
1515 1515
1516sub swap_out { 1516sub swap_out {
1517 my ($self) = @_; 1517 my ($self) = @_;
… …
1531 1531
1532sub reset_at { 1532sub reset_at {
1533 my ($self) = @_; 1533 my ($self) = @_;
1534 1534
1535 # TODO: safety, remove and allow resettable per-player maps 1535 # TODO: safety, remove and allow resettable per-player maps
1536 return 1e99 if $self->{path}{user_rel}; 1536 return 1e99 if $self->isa ("ext::map_per_player");#d#
1537 return 1e99 if $self->{deny_reset}; 1537 return 1e99 if $self->{deny_reset};
1538 1538
1539 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1539 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1540 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1540 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1541 1541
… …
1546 my ($self) = @_; 1546 my ($self) = @_;
1547 1547
1548 $self->reset_at <= $cf::RUNTIME 1548 $self->reset_at <= $cf::RUNTIME
1549} 1549}
1550 1550
1551sub unlink_save {
1552 my ($self) = @_;
1553
1554 utf8::encode (my $save = $self->{path}->save_path);
1555 aioreq_pri 3; IO::AIO::aio_unlink $save;
1556 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1557}
1558
1559sub rename {
1560 my ($self, $new_path) = @_;
1561
1562 $self->unlink_save;
1563
1564 delete $cf::MAP{$self->path};
1565 $self->{path} = new cf::path $new_path;
1566 $self->path ($self->{path}->as_string);
1567 $cf::MAP{$self->path} = $self;
1568
1569 $self->save;
1570}
1571
1572sub reset { 1551sub reset {
1573 my ($self) = @_; 1552 my ($self) = @_;
1574 1553
1575 my $lock = cf::lock_acquire "map_data:" . $self->path; 1554 my $lock = cf::lock_acquire "map_data:$self->{path}";
1576 1555
1577 return if $self->players; 1556 return if $self->players;
1578 return if $self->{path}{user_rel};#d# 1557 return if $self->isa ("ext::map_per_player");#d#
1579 1558
1580 warn "resetting map ", $self->path;#d# 1559 warn "resetting map ", $self->path;#d#
1581 1560
1582 delete $cf::MAP{$self->path}; 1561 delete $cf::MAP{$self->path};
1562
1563 $self->in_memory (cf::MAP_SWAPPED);
1564 $self->clear;
1583 1565
1584 $_->clear_links_to ($self) for values %cf::MAP; 1566 $_->clear_links_to ($self) for values %cf::MAP;
1585 1567
1586 $self->unlink_save; 1568 $self->unlink_save;
1587 $self->destroy; 1569 $self->destroy;
… …
1590my $nuke_counter = "aaaa"; 1572my $nuke_counter = "aaaa";
1591 1573
1592sub nuke { 1574sub nuke {
1593 my ($self) = @_; 1575 my ($self) = @_;
1594 1576
1577 delete $cf::MAP{$self->path};
1578
1579 $self->unlink_save;
1580
1581 bless $self, "cf::map";
1582 delete $self->{deny_reset};
1595 $self->{deny_save} = 1; 1583 $self->{deny_save} = 1;
1596 $self->reset_timeout (1); 1584 $self->reset_timeout (1);
1597 $self->rename ("{nuke}/" . ($nuke_counter++)); 1585 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1586
1587 $cf::MAP{$self->path} = $self;
1588
1598 $self->reset; # polite request, might not happen 1589 $self->reset; # polite request, might not happen
1599} 1590}
1600 1591
1601sub customise_for {
1602 my ($map, $ob) = @_;
1603
1604 if ($map->per_player) {
1605 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1606 }
1607
1608 $map
1609}
1610
1611=item cf::map::unique_maps 1592=item cf::map::unique_maps
1612 1593
1613Returns an arrayref of cf::path's of all shared maps that have 1594Returns an arrayref of paths of all shared maps that have
1614instantiated unique items. May block. 1595instantiated unique items. May block.
1615 1596
1616=cut 1597=cut
1617 1598
1618sub unique_maps() { 1599sub unique_maps() {
… …
1624 for (@$files) { 1605 for (@$files) {
1625 utf8::decode $_; 1606 utf8::decode $_;
1626 next if /\.pst$/; 1607 next if /\.pst$/;
1627 next unless /^$PATH_SEP/o; 1608 next unless /^$PATH_SEP/o;
1628 1609
1610 s/\.map$//;
1629 push @paths, new cf::path $_; 1611 push @paths, $_;
1630 } 1612 }
1631 1613
1632 \@paths 1614 \@paths
1633} 1615}
1634 1616
… …
1709 1691
1710=item $player_object->enter_link 1692=item $player_object->enter_link
1711 1693
1712Freezes the player and moves him/her to a special map (C<{link}>). 1694Freezes the player and moves him/her to a special map (C<{link}>).
1713 1695
1714The player should be reaosnably safe there for short amounts of time. You 1696The player should be reasonably safe there for short amounts of time. You
1715I<MUST> call C<leave_link> as soon as possible, though. 1697I<MUST> call C<leave_link> as soon as possible, though.
1716 1698
1699Will never block.
1700
1717=item $player_object->leave_link ($map, $x, $y) 1701=item $player_object->leave_link ($map, $x, $y)
1718 1702
1719Moves the player out of the specila link map onto the given map. If the 1703Moves the player out of the special C<{link}> map onto the specified
1720map is not valid (or omitted), the player will be moved back to the 1704map. If the map is not valid (or omitted), the player will be moved back
1721location he/she was before the call to C<enter_link>, or, if that fails, 1705to the location he/she was before the call to C<enter_link>, or, if that
1722to the emergency map position. 1706fails, to the emergency map position.
1723 1707
1724Might block. 1708Might block.
1725 1709
1726=cut 1710=cut
1711
1712sub link_map {
1713 unless ($LINK_MAP) {
1714 $LINK_MAP = cf::map::find "{link}"
1715 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1716 $LINK_MAP->load;
1717 }
1718
1719 $LINK_MAP
1720}
1727 1721
1728sub cf::object::player::enter_link { 1722sub cf::object::player::enter_link {
1729 my ($self) = @_; 1723 my ($self) = @_;
1730 1724
1731 $self->deactivate_recursive; 1725 $self->deactivate_recursive;
1732 1726
1733 return if $self->map == $LINK_MAP; 1727 return if UNIVERSAL::isa $self->map, "ext::map_link";
1734 1728
1735 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1729 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1736 if $self->map; 1730 if $self->map;
1737 1731
1738 $self->enter_map ($LINK_MAP, 20, 20); 1732 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1739} 1733}
1740 1734
1741sub cf::object::player::leave_link { 1735sub cf::object::player::leave_link {
1742 my ($self, $map, $x, $y) = @_; 1736 my ($self, $map, $x, $y) = @_;
1743 1737
… …
1807=cut 1801=cut
1808 1802
1809sub cf::object::player::goto { 1803sub cf::object::player::goto {
1810 my ($self, $path, $x, $y) = @_; 1804 my ($self, $path, $x, $y) = @_;
1811 1805
1812 $path = new cf::path $path;
1813
1814 $self->enter_link; 1806 $self->enter_link;
1815 1807
1816 (async { 1808 (async {
1817 my $map = cf::map::find $path->as_string; 1809 my $map = cf::map::find $path;
1818 $map = $map->customise_for ($self) if $map; 1810 $map = $map->customise_for ($self) if $map;
1819 1811
1820# warn "entering ", $map->path, " at ($x, $y)\n" 1812# warn "entering ", $map->path, " at ($x, $y)\n"
1821# if $map; 1813# if $map;
1822 1814
… …
1832 1824
1833sub parse_random_map_params { 1825sub parse_random_map_params {
1834 my ($spec) = @_; 1826 my ($spec) = @_;
1835 1827
1836 my $rmp = { # defaults 1828 my $rmp = { # defaults
1837 xsize => 10, 1829 xsize => (cf::rndm 15, 40),
1838 ysize => 10, 1830 ysize => (cf::rndm 15, 40),
1831 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1832 #layout => string,
1839 }; 1833 };
1840 1834
1841 for (split /\n/, $spec) { 1835 for (split /\n/, $spec) {
1842 my ($k, $v) = split /\s+/, $_, 2; 1836 my ($k, $v) = split /\s+/, $_, 2;
1843 1837
… …
1847 $rmp 1841 $rmp
1848} 1842}
1849 1843
1850sub prepare_random_map { 1844sub prepare_random_map {
1851 my ($exit) = @_; 1845 my ($exit) = @_;
1846
1847 my $guard = cf::lock_acquire "exit_prepare:$exit";
1852 1848
1853 # all this does is basically replace the /! path by 1849 # all this does is basically replace the /! path by
1854 # a new random map path (?random/...) with a seed 1850 # a new random map path (?random/...) with a seed
1855 # that depends on the exit object 1851 # that depends on the exit object
1856 1852
… …
1865 1861
1866 $rmp->{random_seed} ||= $exit->random_seed; 1862 $rmp->{random_seed} ||= $exit->random_seed;
1867 1863
1868 my $data = cf::to_json $rmp; 1864 my $data = cf::to_json $rmp;
1869 my $md5 = Digest::MD5::md5_hex $data; 1865 my $md5 = Digest::MD5::md5_hex $data;
1866 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1870 1867
1871 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1868 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1872 aio_write $fh, 0, (length $data), $data, 0; 1869 aio_write $fh, 0, (length $data), $data, 0;
1870 undef $fh;
1871 aio_rename "$meta~", $meta;
1873 1872
1874 $exit->slaying ("?random/$md5"); 1873 $exit->slaying ("?random/$md5");
1875 $exit->msg (undef); 1874 $exit->msg (undef);
1876 } 1875 }
1877} 1876}
… …
1887 $self->deactivate_recursive; # just to be sure 1886 $self->deactivate_recursive; # just to be sure
1888 unless (eval { 1887 unless (eval {
1889 prepare_random_map $exit 1888 prepare_random_map $exit
1890 if $exit->slaying eq "/!"; 1889 if $exit->slaying eq "/!";
1891 1890
1892 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1891 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1893 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1892 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1894 1893
1895 1; 1894 1;
1896 }) { 1895 }) {
1897 $self->message ("Something went wrong deep within the crossfire server. " 1896 $self->message ("Something went wrong deep within the crossfire server. "
… …
2187 sub db_sync() { 2186 sub db_sync() {
2188 db_save if $dirty; 2187 db_save if $dirty;
2189 undef $dirty; 2188 undef $dirty;
2190 } 2189 }
2191 2190
2192 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2191 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2193 db_sync; 2192 db_sync;
2194 }); 2193 });
2195 2194
2196 sub db_dirty() { 2195 sub db_dirty() {
2197 $dirty = 1; 2196 $dirty = 1;
… …
2247 2246
2248sub main { 2247sub main {
2249 # we must not ever block the main coroutine 2248 # we must not ever block the main coroutine
2250 local $Coro::idle = sub { 2249 local $Coro::idle = sub {
2251 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2250 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2251 (async {
2252 async { Event::one_event }; 2252 Event::one_event;
2253 })->prio (Coro::PRIO_MAX);
2253 }; 2254 };
2254 2255
2255 cfg_load; 2256 cfg_load;
2256 db_load; 2257 db_load;
2257 load_extensions; 2258 load_extensions;
2259
2260 $TICK_WATCHER->start;
2258 Event::loop; 2261 Event::loop;
2259} 2262}
2260 2263
2261############################################################################# 2264#############################################################################
2262# initialisation and cleanup 2265# initialisation and cleanup
… …
2280 warn "enter emergency perl save\n"; 2283 warn "enter emergency perl save\n";
2281 2284
2282 cf::sync_job { 2285 cf::sync_job {
2283 # use a peculiar iteration method to avoid tripping on perl 2286 # use a peculiar iteration method to avoid tripping on perl
2284 # refcount bugs in for. also avoids problems with players 2287 # refcount bugs in for. also avoids problems with players
2285 # and maps saved/Destroyed asynchronously. 2288 # and maps saved/destroyed asynchronously.
2286 warn "begin emergency player save\n"; 2289 warn "begin emergency player save\n";
2287 for my $login (keys %cf::PLAYER) { 2290 for my $login (keys %cf::PLAYER) {
2288 my $pl = $cf::PLAYER{$login} or next; 2291 my $pl = $cf::PLAYER{$login} or next;
2289 $pl->valid or next; 2292 $pl->valid or next;
2290 $pl->save; 2293 $pl->save;
… …
2304} 2307}
2305 2308
2306sub reload() { 2309sub reload() {
2307 # can/must only be called in main 2310 # can/must only be called in main
2308 if ($Coro::current != $Coro::main) { 2311 if ($Coro::current != $Coro::main) {
2309 warn "can only reload from main coroutine\n"; 2312 warn "can only reload from main coroutine";
2310 return; 2313 return;
2311 } 2314 }
2312 2315
2313 warn "reloading..."; 2316 warn "reloading...";
2314 2317
2315 warn "freezing server"; 2318 warn "cancelling server ticker";
2316 my $guard = freeze_mainloop; 2319 $TICK_WATCHER->cancel;
2320
2317 cf::emergency_save; 2321 cf::emergency_save;
2318
2319 warn "sync database to disk";
2320 cf::db_sync;
2321 IO::AIO::flush;
2322 2322
2323 eval { 2323 eval {
2324 # if anything goes wrong in here, we should simply crash as we already saved 2324 # if anything goes wrong in here, we should simply crash as we already saved
2325 2325
2326 warn "syncing database to disk";
2327 cf::db_sync;
2328
2326 warn "cancel all watchers"; 2329 warn "cancelling all WF_AUTOCANCEL watchers";
2327 for (Event::all_watchers) { 2330 for (Event::all_watchers) {
2328 $_->cancel if $_->data & WF_AUTOCANCEL; 2331 $_->cancel if $_->data & WF_AUTOCANCEL;
2329 } 2332 }
2330 2333
2334 warn "flushing outstanding aio requests";
2335 for (;;) {
2336 IO::AIO::flush;
2337 Coro::cede;
2338 last unless IO::AIO::nreqs;
2339 warn "iterate...";
2340 }
2341
2331 warn "cancel all extension coros"; 2342 warn "cancelling all extension coros";
2332 $_->cancel for values %EXT_CORO; 2343 $_->cancel for values %EXT_CORO;
2333 %EXT_CORO = (); 2344 %EXT_CORO = ();
2334 2345
2335 warn "remove commands"; 2346 warn "removing commands";
2336 %COMMAND = (); 2347 %COMMAND = ();
2337 2348
2338 warn "remove ext commands"; 2349 warn "removing ext commands";
2339 %EXTCMD = (); 2350 %EXTCMD = ();
2340 2351
2341 warn "unload/nuke all extensions"; 2352 warn "unloading/nuking all extensions";
2342 for my $pkg (@EXTS) { 2353 for my $pkg (@EXTS) {
2343 warn "... unloading $pkg"; 2354 warn "... unloading $pkg";
2344 2355
2345 if (my $cb = $pkg->can ("unload")) { 2356 if (my $cb = $pkg->can ("unload")) {
2346 eval { 2357 eval {
… …
2351 2362
2352 warn "... nuking $pkg"; 2363 warn "... nuking $pkg";
2353 Symbol::delete_package $pkg; 2364 Symbol::delete_package $pkg;
2354 } 2365 }
2355 2366
2356 warn "unload all perl modules loaded from $LIBDIR"; 2367 warn "unloading all perl modules loaded from $LIBDIR";
2357 while (my ($k, $v) = each %INC) { 2368 while (my ($k, $v) = each %INC) {
2358 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2369 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2359 2370
2360 warn "removing <$k>"; 2371 warn "... unloading $k";
2361 delete $INC{$k}; 2372 delete $INC{$k};
2362 2373
2363 $k =~ s/\.pm$//; 2374 $k =~ s/\.pm$//;
2364 $k =~ s/\//::/g; 2375 $k =~ s/\//::/g;
2365 2376
… …
2368 } 2379 }
2369 2380
2370 Symbol::delete_package $k; 2381 Symbol::delete_package $k;
2371 } 2382 }
2372 2383
2373 warn "get rid of safe::, as good as possible"; 2384 warn "getting rid of safe::, as good as possible";
2374 Symbol::delete_package "safe::$_" 2385 Symbol::delete_package "safe::$_"
2375 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2386 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2376 2387
2377 warn "unload cf.pm \"a bit\""; 2388 warn "unloading cf.pm \"a bit\"";
2378 delete $INC{"cf.pm"}; 2389 delete $INC{"cf.pm"};
2379 2390
2380 # don't, removes xs symbols, too, 2391 # don't, removes xs symbols, too,
2381 # and global variables created in xs 2392 # and global variables created in xs
2382 #Symbol::delete_package __PACKAGE__; 2393 #Symbol::delete_package __PACKAGE__;
2383 2394
2395 warn "unload completed, starting to reload now";
2396
2384 warn "reloading cf.pm"; 2397 warn "reloading cf.pm";
2385 require cf; 2398 require cf;
2386 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2399 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2387 2400
2388 warn "load config and database again"; 2401 warn "loading config and database again";
2389 cf::cfg_load; 2402 cf::cfg_load;
2390 cf::db_load; 2403 cf::db_load;
2391 2404
2392 warn "load extensions"; 2405 warn "loading extensions";
2393 cf::load_extensions; 2406 cf::load_extensions;
2394 2407
2395 warn "reattach attachments to objects/players"; 2408 warn "reattaching attachments to objects/players";
2396 _global_reattach; 2409 _global_reattach;
2397 warn "reattach attachments to maps"; 2410 warn "reattaching attachments to maps";
2398 reattach $_ for values %MAP; 2411 reattach $_ for values %MAP;
2412
2413 warn "restarting server ticker";
2414
2415 $TICK_WATCHER->start;
2399 }; 2416 };
2400 2417
2401 if ($@) { 2418 if ($@) {
2402 warn $@; 2419 warn $@;
2403 warn "error while reloading, exiting."; 2420 warn "error while reloading, exiting.";
… …
2405 } 2422 }
2406 2423
2407 warn "reloaded"; 2424 warn "reloaded";
2408}; 2425};
2409 2426
2410############################################################################# 2427our $RELOAD_WATCHER; # used only during reload
2411
2412unless ($LINK_MAP) {
2413 $LINK_MAP = cf::map::new;
2414
2415 $LINK_MAP->width (41);
2416 $LINK_MAP->height (41);
2417 $LINK_MAP->alloc;
2418 $LINK_MAP->path ("{link}");
2419 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2420 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2421
2422 # dirty hack because... archetypes are not yet loaded
2423 Event->timer (
2424 after => 10,
2425 cb => sub {
2426 $_[0]->w->cancel;
2427
2428 # provide some exits "home"
2429 my $exit = cf::object::new "exit";
2430
2431 $exit->slaying ($EMERGENCY_POSITION->[0]);
2432 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2433 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2434
2435 $LINK_MAP->insert ($exit->clone, 19, 19);
2436 $LINK_MAP->insert ($exit->clone, 19, 20);
2437 $LINK_MAP->insert ($exit->clone, 19, 21);
2438 $LINK_MAP->insert ($exit->clone, 20, 19);
2439 $LINK_MAP->insert ($exit->clone, 20, 21);
2440 $LINK_MAP->insert ($exit->clone, 21, 19);
2441 $LINK_MAP->insert ($exit->clone, 21, 20);
2442 $LINK_MAP->insert ($exit->clone, 21, 21);
2443
2444 $exit->destroy;
2445 });
2446
2447 $LINK_MAP->{deny_save} = 1;
2448 $LINK_MAP->{deny_reset} = 1;
2449
2450 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2451}
2452 2428
2453register_command "reload" => sub { 2429register_command "reload" => sub {
2454 my ($who, $arg) = @_; 2430 my ($who, $arg) = @_;
2455 2431
2456 if ($who->flag (FLAG_WIZ)) { 2432 if ($who->flag (FLAG_WIZ)) {
2457 $who->message ("start of reload."); 2433 $who->message ("reloading server.");
2434
2435 # doing reload synchronously and two reloads happen back-to-back,
2436 # coro crashes during coro_state_free->destroy here.
2437
2438 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2458 reload; 2439 reload;
2459 $who->message ("end of reload."); 2440 undef $RELOAD_WATCHER;
2441 });
2460 } 2442 }
2461}; 2443};
2462 2444
2463unshift @INC, $LIBDIR; 2445unshift @INC, $LIBDIR;
2446
2447my $bug_warning = 0;
2464 2448
2465$TICK_WATCHER = Event->timer ( 2449$TICK_WATCHER = Event->timer (
2466 reentrant => 0, 2450 reentrant => 0,
2451 parked => 1,
2467 prio => 0, 2452 prio => 0,
2468 at => $NEXT_TICK || $TICK, 2453 at => $NEXT_TICK || $TICK,
2469 data => WF_AUTOCANCEL, 2454 data => WF_AUTOCANCEL,
2470 cb => sub { 2455 cb => sub {
2456 if ($Coro::current != $Coro::main) {
2457 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2458 unless ++$bug_warning > 10;
2459 return;
2460 }
2461
2462 $NOW = Event::time;
2463
2471 cf::server_tick; # one server iteration 2464 cf::server_tick; # one server iteration
2472 $RUNTIME += $TICK; 2465 $RUNTIME += $TICK;
2473 $NEXT_TICK += $TICK; 2466 $NEXT_TICK += $TICK;
2474 2467
2475 $WAIT_FOR_TICK->broadcast; 2468 $WAIT_FOR_TICK->broadcast;
… …
2483 }, 2476 },
2484); 2477);
2485 2478
2486IO::AIO::max_poll_time $TICK * 0.2; 2479IO::AIO::max_poll_time $TICK * 0.2;
2487 2480
2488Event->io ( 2481$AIO_POLL_WATCHER = Event->io (
2489 fd => IO::AIO::poll_fileno, 2482 fd => IO::AIO::poll_fileno,
2490 poll => 'r', 2483 poll => 'r',
2491 prio => 5, 2484 prio => 5,
2492 data => WF_AUTOCANCEL, 2485 data => WF_AUTOCANCEL,
2493 cb => \&IO::AIO::poll_cb, 2486 cb => \&IO::AIO::poll_cb,
2494); 2487);
2495 2488
2496Event->timer ( 2489$WRITE_RUNTIME_WATCHER = Event->timer (
2497 data => WF_AUTOCANCEL, 2490 data => WF_AUTOCANCEL,
2498 after => 0, 2491 after => 1,
2499 interval => 10, 2492 interval => 10,
2500 cb => sub { 2493 prio => 6, # keep it lowest so it acts like a watchdog
2501 (Coro::unblock_sub { 2494 cb => Coro::unblock_sub {
2502 write_runtime 2495 write_runtime
2503 or warn "ERROR: unable to write runtime file: $!"; 2496 or warn "ERROR: unable to write runtime file: $!";
2504 })->();
2505 }, 2497 },
2506); 2498);
2507 2499
2508END { cf::emergency_save } 2500END { cf::emergency_save }
2509 2501

Diff Legend

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