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.165 by root, Fri Jan 12 22:09:22 2007 UTC vs.
Revision 1.195 by root, Fri Jan 26 20:59:57 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.5 ();
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
478 $path
479}
480
481# the original (read-only) location
482sub load_path {
483 my ($self) = @_;
484
485 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
486}
487
488# the temporary/swap location
489sub save_path {
490 my ($self) = @_;
491
492 $self->{user_rel}
493 ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
494 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
495}
496
497# the unique path, undef == no special unique path
498sub uniq_path {
499 my ($self) = @_;
500
501 $self->{user_rel} || $self->{ext}
502 ? undef
503 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
504}
505
506sub customise_for {
507 my ($self, $map, $ob) = @_;
508
509 if ($map->per_player) {
510 return cf::map::find ("~" . $ob->name . "/" . $map->{path}{path});
511 }
512
513 $map
514}
515
516# this is somewhat ugly, but style maps do need special treatment
517sub is_style_map {
518 $_[0]{path} =~ m{^/styles/}
519}
520
521sub load_orig {
522 my ($self) = @_;
523
524 &cf::map::load_map_header ($self->load_path)
525}
526
527sub load_temp {
528 my ($self) = @_;
529
530 &cf::map::load_map_header ($self->save_path)
531}
532
533sub unlink_save {
534 my ($self) = @_;
535
536 utf8::encode (my $save = $self->save_path);
537 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
538 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
539}
540
541package cf;
542 376
543############################################################################# 377#############################################################################
544 378
545=head2 ATTACHABLE OBJECTS 379=head2 ATTACHABLE OBJECTS
546 380
… …
672our @CB_TYPE = (); # registry for type (cf-object class) based events 506our @CB_TYPE = (); # registry for type (cf-object class) based events
673our @CB_MAP = (); 507our @CB_MAP = ();
674 508
675my %attachment; 509my %attachment;
676 510
511sub cf::attachable::thawer_merge {
512 # simply override everything except _meta
513 local $_[0]{_meta};
514 %{$_[0]} = %{$_[1]};
515}
516
677sub _attach_cb($$$$) { 517sub _attach_cb($$$$) {
678 my ($registry, $event, $prio, $cb) = @_; 518 my ($registry, $event, $prio, $cb) = @_;
679 519
680 use sort 'stable'; 520 use sort 'stable';
681 521
… …
852# object support 692# object support
853 693
854sub reattach { 694sub reattach {
855 # basically do the same as instantiate, without calling instantiate 695 # basically do the same as instantiate, without calling instantiate
856 my ($obj) = @_; 696 my ($obj) = @_;
697
698 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
857 699
858 my $registry = $obj->registry; 700 my $registry = $obj->registry;
859 701
860 @$registry = (); 702 @$registry = ();
861 703
… …
1048 "package $pkg; use strict; use utf8;\n" 890 "package $pkg; use strict; use utf8;\n"
1049 . "#line 1 \"$path\"\n{\n" 891 . "#line 1 \"$path\"\n{\n"
1050 . (do { local $/; <$fh> }) 892 . (do { local $/; <$fh> })
1051 . "\n};\n1"; 893 . "\n};\n1";
1052 894
1053 eval $source 895 unless (eval $source) {
1054 or die $@ ? "$path: $@\n" 896 my $msg = $@ ? "$path: $@\n"
1055 : "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 }
1056 905
1057 push @EXTS, $pkg; 906 push @EXTS, $pkg;
1058} 907}
1059 908
1060sub load_extensions { 909sub load_extensions {
… …
1066 } or warn "$ext not loaded: $@"; 915 } or warn "$ext not loaded: $@";
1067 } 916 }
1068} 917}
1069 918
1070############################################################################# 919#############################################################################
1071# load/save/clean perl data associated with a map
1072
1073*cf::mapsupport::on_clean = sub {
1074 my ($map) = @_;
1075
1076 my $path = $map->tmpname;
1077 defined $path or return;
1078
1079 unlink "$path.pst";
1080};
1081
1082cf::map->attach (prio => -10000, package => cf::mapsupport::);
1083
1084#############################################################################
1085 920
1086=head2 CORE EXTENSIONS 921=head2 CORE EXTENSIONS
1087 922
1088Functions and methods that extend core crossfire objects. 923Functions and methods that extend core crossfire objects.
1089 924
… …
1125 960
1126sub exists($) { 961sub exists($) {
1127 my ($login) = @_; 962 my ($login) = @_;
1128 963
1129 $cf::PLAYER{$login} 964 $cf::PLAYER{$login}
1130 or cf::sync_job { !aio_stat $login } 965 or cf::sync_job { !aio_stat path $login }
1131} 966}
1132 967
1133sub find($) { 968sub find($) {
1134 return $cf::PLAYER{$_[0]} || do { 969 return $cf::PLAYER{$_[0]} || do {
1135 my $login = $_[0]; 970 my $login = $_[0];
… …
1225 \@logins 1060 \@logins
1226} 1061}
1227 1062
1228=item $player->maps 1063=item $player->maps
1229 1064
1230Returns 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
1231player. May block. 1066player. May block.
1232 1067
1233=cut 1068=cut
1234 1069
1235sub maps($) { 1070sub maps($) {
… …
1243 for (@$files) { 1078 for (@$files) {
1244 utf8::decode $_; 1079 utf8::decode $_;
1245 next if /\.(?:pl|pst)$/; 1080 next if /\.(?:pl|pst)$/;
1246 next unless /^$PATH_SEP/o; 1081 next unless /^$PATH_SEP/o;
1247 1082
1083 s/\.map$//;
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1249 } 1085 }
1250 1086
1251 \@paths 1087 \@paths
1252} 1088}
1253 1089
… …
1279package cf::map; 1115package cf::map;
1280 1116
1281use Fcntl; 1117use Fcntl;
1282use Coro::AIO; 1118use Coro::AIO;
1283 1119
1120use overload
1121 '""' => \&as_string,
1122 fallback => 1;
1123
1284our $MAX_RESET = 3600; 1124our $MAX_RESET = 3600;
1285our $DEFAULT_RESET = 3000; 1125our $DEFAULT_RESET = 3000;
1286 1126
1287sub generate_random_map { 1127sub generate_random_map {
1288 my ($path, $rmp) = @_; 1128 my ($self, $rmp) = @_;
1289
1290 # mit "rum" bekleckern, nicht 1129 # mit "rum" bekleckern, nicht
1291 cf::map::_create_random_map ( 1130 $self->_create_random_map (
1292 $path,
1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1131 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1132 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1133 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296 $rmp->{exit_on_final_map}, 1134 $rmp->{exit_on_final_map},
1297 $rmp->{xsize}, $rmp->{ysize}, 1135 $rmp->{xsize}, $rmp->{ysize},
… …
1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303 (cf::region::find $rmp->{region}), $rmp->{custom} 1141 (cf::region::find $rmp->{region}), $rmp->{custom}
1304 ) 1142 )
1305} 1143}
1306 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 $path = "$path"; # make sure its a string
1182
1183 # map plan:
1184 #
1185 # /! non-realised random map exit (special hack!)
1186 # {... are special paths that are not being touched
1187 # ?xxx/... are special absolute paths
1188 # ?random/... random maps
1189 # /... normal maps
1190 # ~user/... per-player map of a specific user
1191
1192 $path =~ s/$PATH_SEP/\//go;
1193
1194 # treat it as relative path if it starts with
1195 # something that looks reasonable
1196 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1197 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1198
1199 $base =~ s{[^/]+/?$}{};
1200 $path = "$base/$path";
1201 }
1202
1203 for ($path) {
1204 redo if s{//}{/};
1205 redo if s{/\.?/}{/};
1206 redo if s{/[^/]+/\.\./}{/};
1207 }
1208
1209 $path
1210}
1211
1212sub new_from_path {
1213 my (undef, $path, $base) = @_;
1214
1215 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1216
1217 $path = normalise $path, $base;
1218
1219 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1220 if ($path =~ $EXT_MAP{$pkg}[1]) {
1221 my $self = bless cf::map::new, $pkg;
1222 $self->{path} = $path; $self->path ($path);
1223 $self->init; # pass $1 etc.
1224 return $self;
1225 }
1226 }
1227
1228 Carp::carp "unable to resolve path '$path' (base '$base').";
1229 ()
1230}
1231
1232sub init {
1233 my ($self) = @_;
1234
1235 $self
1236}
1237
1238sub as_string {
1239 my ($self) = @_;
1240
1241 "$self->{path}"
1242}
1243
1244# the displayed name, this is a one way mapping
1245sub visible_name {
1246 &as_string
1247}
1248
1249# the original (read-only) location
1250sub load_path {
1251 my ($self) = @_;
1252
1253 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1254}
1255
1256# the temporary/swap location
1257sub save_path {
1258 my ($self) = @_;
1259
1260 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1261 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1262}
1263
1264# the unique path, undef == no special unique path
1265sub uniq_path {
1266 my ($self) = @_;
1267
1268 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1269 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1270}
1271
1307# and all this just because we cannot iterate over 1272# and all this just because we cannot iterate over
1308# all maps in C++... 1273# all maps in C++...
1309sub change_all_map_light { 1274sub change_all_map_light {
1310 my ($change) = @_; 1275 my ($change) = @_;
1311 1276
1312 $_->change_map_light ($change) 1277 $_->change_map_light ($change)
1313 for grep $_->outdoor, values %cf::MAP; 1278 for grep $_->outdoor, values %cf::MAP;
1314} 1279}
1315 1280
1281sub unlink_save {
1282 my ($self) = @_;
1283
1284 utf8::encode (my $save = $self->save_path);
1285 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1286 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1287}
1288
1316sub load_map_header($) { 1289sub load_header_from($) {
1317 my ($path) = @_; 1290 my ($self, $path) = @_;
1318 1291
1319 utf8::encode $path; 1292 utf8::encode $path;
1320 aio_open $path, O_RDONLY, 0 1293 aio_open $path, O_RDONLY, 0
1321 or return; 1294 or return;
1322 1295
1323 my $map = cf::map::new 1296 $self->_load_header ($path)
1324 or return; 1297 or return;
1325 1298
1326 # for better error messages only, will be overwritten later 1299 $self->{load_path} = $path;
1327 $map->path ($path);
1328 1300
1329 $map->load_header ($path) 1301 1
1302}
1303
1304sub load_header_orig {
1305 my ($self) = @_;
1306
1307 $self->load_header_from ($self->load_path)
1308}
1309
1310sub load_header_temp {
1311 my ($self) = @_;
1312
1313 $self->load_header_from ($self->save_path)
1314}
1315
1316sub prepare_temp {
1317 my ($self) = @_;
1318
1319 $self->last_access ((delete $self->{last_access})
1320 || $cf::RUNTIME); #d#
1321 # safety
1322 $self->{instantiate_time} = $cf::RUNTIME
1323 if $self->{instantiate_time} > $cf::RUNTIME;
1324}
1325
1326sub prepare_orig {
1327 my ($self) = @_;
1328
1329 $self->{load_original} = 1;
1330 $self->{instantiate_time} = $cf::RUNTIME;
1331 $self->last_access ($cf::RUNTIME);
1332 $self->instantiate;
1333}
1334
1335sub load_header {
1336 my ($self) = @_;
1337
1338 if ($self->load_header_temp) {
1339 $self->prepare_temp;
1340 } else {
1341 $self->load_header_orig
1330 or return; 1342 or return;
1343 $self->prepare_orig;
1344 }
1331 1345
1332 $map->{load_path} = $path; 1346 1
1333
1334 $map
1335} 1347}
1336 1348
1337sub find; 1349sub find;
1338sub find { 1350sub find {
1339 my ($path, $origin) = @_; 1351 my ($path, $origin) = @_;
1340 1352
1341 #warn "find<$path,$origin>\n";#d#
1342
1343 $path = new cf::path $path, $origin && $origin->path; 1353 $path = normalise $path, $origin && $origin->path;
1344 my $key = $path->as_string;
1345 1354
1346 cf::lock_wait "map_find:$key"; 1355 cf::lock_wait "map_find:$path";
1347 1356
1348 $cf::MAP{$key} || do { 1357 $cf::MAP{$path} || do {
1349 my $guard = cf::lock_acquire "map_find:$key"; 1358 my $guard = cf::lock_acquire "map_find:$path";
1350 1359 my $map = new_from_path cf::map $path
1351 # do it the slow way
1352 my $map = $path->load_temp;
1353
1354 Coro::cede;
1355
1356 if ($map) {
1357 $map->last_access ((delete $map->{last_access})
1358 || $cf::RUNTIME); #d#
1359 # safety
1360 $map->{instantiate_time} = $cf::RUNTIME
1361 if $map->{instantiate_time} > $cf::RUNTIME;
1362 } else {
1363 $map = $path->load_orig
1364 or return; 1360 or return;
1365 1361
1366 $map->{load_original} = 1;
1367 $map->{instantiate_time} = $cf::RUNTIME;
1368 $map->last_access ($cf::RUNTIME);
1369 $map->instantiate;
1370
1371 # per-player maps become, after loading, normal maps
1372 $map->per_player (0) if $path->{user_rel};
1373 }
1374
1375 $map->path ($key);
1376 $map->{path} = $path;
1377 $map->{last_save} = $cf::RUNTIME; 1362 $map->{last_save} = $cf::RUNTIME;
1378 1363
1379 Coro::cede; 1364 $map->load_header
1365 or return;
1380 1366
1381 if ($map->should_reset) { 1367 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1368 # doing this can freeze the server in a sync job, obviously
1369 #$cf::WAIT_FOR_TICK->wait;
1382 $map->reset; 1370 $map->reset;
1383 undef $guard; 1371 undef $guard;
1384 $map = find $path 1372 return find $path;
1385 or return;
1386 } 1373 }
1387 1374
1388 $cf::MAP{$key} = $map 1375 $cf::MAP{$path} = $map
1389 } 1376 }
1390} 1377}
1378
1379sub pre_load { }
1380sub post_load { }
1391 1381
1392sub load { 1382sub load {
1393 my ($self) = @_; 1383 my ($self) = @_;
1394 1384
1395 my $path = $self->{path}; 1385 my $path = $self->{path};
1396 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1386 my $guard = cf::lock_acquire "map_load:$path";
1397 1387
1398 return if $self->in_memory != cf::MAP_SWAPPED; 1388 return if $self->in_memory != cf::MAP_SWAPPED;
1399 1389
1400 $self->in_memory (cf::MAP_LOADING); 1390 $self->in_memory (cf::MAP_LOADING);
1401 1391
1402 $self->alloc; 1392 $self->alloc;
1393
1394 $self->pre_load;
1395
1403 $self->load_objects ($self->{load_path}, 1) 1396 $self->_load_objects ($self->{load_path}, 1)
1404 or return; 1397 or return;
1405 1398
1406 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1399 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1407 if delete $self->{load_original}; 1400 if delete $self->{load_original};
1408 1401
1409 if (my $uniq = $path->uniq_path) { 1402 if (my $uniq = $self->uniq_path) {
1410 utf8::encode $uniq; 1403 utf8::encode $uniq;
1411 if (aio_open $uniq, O_RDONLY, 0) { 1404 if (aio_open $uniq, O_RDONLY, 0) {
1412 $self->clear_unique_items; 1405 $self->clear_unique_items;
1413 $self->load_objects ($uniq, 0); 1406 $self->_load_objects ($uniq, 0);
1414 } 1407 }
1415 } 1408 }
1416 1409
1417 Coro::cede; 1410 Coro::cede;
1418 1411
1419 # now do the right thing for maps 1412 # now do the right thing for maps
1420 $self->link_multipart_objects; 1413 $self->link_multipart_objects;
1421 1414
1422 if ($self->{path}->is_style_map) { 1415 unless ($self->{deny_activate}) {
1423 $self->{deny_save} = 1;
1424 $self->{deny_reset} = 1;
1425 } else {
1426 $self->decay_objects; 1416 $self->decay_objects;
1427 $self->fix_auto_apply; 1417 $self->fix_auto_apply;
1428 $self->update_buttons; 1418 $self->update_buttons;
1419 Coro::cede;
1429 $self->set_darkness_map; 1420 $self->set_darkness_map;
1430 $self->difficulty ($self->estimate_difficulty) 1421 $self->difficulty ($self->estimate_difficulty)
1431 unless $self->difficulty; 1422 unless $self->difficulty;
1423 Coro::cede;
1432 $self->activate; 1424 $self->activate;
1433 } 1425 }
1434 1426
1435 Coro::cede; 1427 $self->post_load;
1436 1428
1437 $self->in_memory (cf::MAP_IN_MEMORY); 1429 $self->in_memory (cf::MAP_IN_MEMORY);
1430}
1431
1432sub customise_for {
1433 my ($self, $ob) = @_;
1434
1435 return find "~" . $ob->name . "/" . $self->{path}
1436 if $self->per_player;
1437
1438 $self
1438} 1439}
1439 1440
1440# find and load all maps in the 3x3 area around a map 1441# find and load all maps in the 3x3 area around a map
1441sub load_diag { 1442sub load_diag {
1442 my ($map) = @_; 1443 my ($map) = @_;
… …
1472 1473
1473 cf::sync_job { $map->load }; 1474 cf::sync_job { $map->load };
1474} 1475}
1475 1476
1476our %MAP_PREFETCH; 1477our %MAP_PREFETCH;
1477our $MAP_PREFETCHER = Coro::async { 1478our $MAP_PREFETCHER = undef;
1478 while () {
1479 while (%MAP_PREFETCH) {
1480 my $key = each %MAP_PREFETCH
1481 or next;
1482 my $path = delete $MAP_PREFETCH{$key};
1483
1484 my $map = find $path
1485 or next;
1486 $map->load;
1487 }
1488 Coro::schedule;
1489 }
1490};
1491 1479
1492sub find_async { 1480sub find_async {
1493 my ($path, $origin) = @_; 1481 my ($path, $origin) = @_;
1494 1482
1495 $path = new cf::path $path, $origin && $origin->path; 1483 $path = normalise $path, $origin && $origin->{path};
1496 my $key = $path->as_string;
1497 1484
1498 if (my $map = $cf::MAP{$key}) { 1485 if (my $map = $cf::MAP{$path}) {
1499 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1486 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1500 } 1487 }
1501 1488
1502 $MAP_PREFETCH{$key} = $path; 1489 undef $MAP_PREFETCH{$path};
1490 $MAP_PREFETCHER ||= cf::async {
1491 while (%MAP_PREFETCH) {
1492 for my $path (keys %MAP_PREFETCH) {
1493 my $map = find $path
1494 or next;
1495 $map->load;
1496
1497 delete $MAP_PREFETCH{$path};
1498 }
1499 }
1500 undef $MAP_PREFETCHER;
1501 };
1503 $MAP_PREFETCHER->ready; 1502 $MAP_PREFETCHER->prio (6);
1504 1503
1505 () 1504 ()
1506} 1505}
1507 1506
1508sub save { 1507sub save {
… …
1512 1511
1513 $self->{last_save} = $cf::RUNTIME; 1512 $self->{last_save} = $cf::RUNTIME;
1514 1513
1515 return unless $self->dirty; 1514 return unless $self->dirty;
1516 1515
1517 my $save = $self->{path}->save_path; utf8::encode $save; 1516 my $save = $self->save_path; utf8::encode $save;
1518 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1517 my $uniq = $self->uniq_path; utf8::encode $uniq;
1519 1518
1520 $self->{load_path} = $save; 1519 $self->{load_path} = $save;
1521 1520
1522 return if $self->{deny_save}; 1521 return if $self->{deny_save};
1523 1522
… …
1526 cf::async { 1525 cf::async {
1527 $_->contr->save for $self->players; 1526 $_->contr->save for $self->players;
1528 }; 1527 };
1529 1528
1530 if ($uniq) { 1529 if ($uniq) {
1531 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1530 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1532 $self->save_objects ($uniq, cf::IO_UNIQUES); 1531 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1533 } else { 1532 } else {
1534 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1533 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1535 } 1534 }
1536} 1535}
1537 1536
1538sub swap_out { 1537sub swap_out {
1539 my ($self) = @_; 1538 my ($self) = @_;
… …
1553 1552
1554sub reset_at { 1553sub reset_at {
1555 my ($self) = @_; 1554 my ($self) = @_;
1556 1555
1557 # TODO: safety, remove and allow resettable per-player maps 1556 # TODO: safety, remove and allow resettable per-player maps
1558 return 1e99 if $self->{path}{user_rel}; 1557 return 1e99 if $self->isa ("ext::map_per_player");#d#
1559 return 1e99 if $self->{deny_reset}; 1558 return 1e99 if $self->{deny_reset};
1560 1559
1561 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1560 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1562 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1561 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1563 1562
… …
1568 my ($self) = @_; 1567 my ($self) = @_;
1569 1568
1570 $self->reset_at <= $cf::RUNTIME 1569 $self->reset_at <= $cf::RUNTIME
1571} 1570}
1572 1571
1573sub rename {
1574 my ($self, $new_path) = @_;
1575
1576 $self->{path}->unlink_save;
1577
1578 delete $cf::MAP{$self->path};
1579 $self->{path} = new cf::path $new_path;
1580 $self->path ($self->{path}->as_string);
1581 $cf::MAP{$self->path} = $self;
1582
1583 $self->save;
1584}
1585
1586sub reset { 1572sub reset {
1587 my ($self) = @_; 1573 my ($self) = @_;
1588 1574
1589 my $lock = cf::lock_acquire "map_data:" . $self->path; 1575 my $lock = cf::lock_acquire "map_data:$self->{path}";
1590 1576
1591 return if $self->players; 1577 return if $self->players;
1592 return if $self->{path}{user_rel};#d# 1578 return if $self->isa ("ext::map_per_player");#d#
1593 1579
1594 warn "resetting map ", $self->path;#d# 1580 warn "resetting map ", $self->path;#d#
1595 1581
1596 delete $cf::MAP{$self->path}; 1582 delete $cf::MAP{$self->path};
1597 1583
1584 $self->in_memory (cf::MAP_SWAPPED);
1585 $self->clear;
1586
1598 $_->clear_links_to ($self) for values %cf::MAP; 1587 $_->clear_links_to ($self) for values %cf::MAP;
1599 1588
1600 $self->{path}->unlink_save; 1589 $self->unlink_save;
1601 $self->destroy; 1590 $self->destroy;
1602} 1591}
1603 1592
1604my $nuke_counter = "aaaa"; 1593my $nuke_counter = "aaaa";
1605 1594
1606sub nuke { 1595sub nuke {
1607 my ($self) = @_; 1596 my ($self) = @_;
1608 1597
1598 delete $cf::MAP{$self->path};
1599
1600 $self->unlink_save;
1601
1602 bless $self, "cf::map";
1603 delete $self->{deny_reset};
1609 $self->{deny_save} = 1; 1604 $self->{deny_save} = 1;
1610 $self->reset_timeout (1); 1605 $self->reset_timeout (1);
1611 $self->rename ("{nuke}/" . ($nuke_counter++)); 1606 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1607
1608 $cf::MAP{$self->path} = $self;
1609
1612 $self->reset; # polite request, might not happen 1610 $self->reset; # polite request, might not happen
1613} 1611}
1614 1612
1615=item cf::map::unique_maps 1613=item cf::map::unique_maps
1616 1614
1617Returns an arrayref of cf::path's of all shared maps that have 1615Returns an arrayref of paths of all shared maps that have
1618instantiated unique items. May block. 1616instantiated unique items. May block.
1619 1617
1620=cut 1618=cut
1621 1619
1622sub unique_maps() { 1620sub unique_maps() {
… …
1628 for (@$files) { 1626 for (@$files) {
1629 utf8::decode $_; 1627 utf8::decode $_;
1630 next if /\.pst$/; 1628 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o; 1629 next unless /^$PATH_SEP/o;
1632 1630
1631 s/\.map$//;
1633 push @paths, new cf::path $_; 1632 push @paths, $_;
1634 } 1633 }
1635 1634
1636 \@paths 1635 \@paths
1637} 1636}
1638 1637
… …
1713 1712
1714=item $player_object->enter_link 1713=item $player_object->enter_link
1715 1714
1716Freezes the player and moves him/her to a special map (C<{link}>). 1715Freezes the player and moves him/her to a special map (C<{link}>).
1717 1716
1718The player should be reaosnably safe there for short amounts of time. You 1717The player should be reasonably safe there for short amounts of time. You
1719I<MUST> call C<leave_link> as soon as possible, though. 1718I<MUST> call C<leave_link> as soon as possible, though.
1720 1719
1720Will never block.
1721
1721=item $player_object->leave_link ($map, $x, $y) 1722=item $player_object->leave_link ($map, $x, $y)
1722 1723
1723Moves the player out of the specila link map onto the given map. If the 1724Moves the player out of the special C<{link}> map onto the specified
1724map is not valid (or omitted), the player will be moved back to the 1725map. If the map is not valid (or omitted), the player will be moved back
1725location he/she was before the call to C<enter_link>, or, if that fails, 1726to the location he/she was before the call to C<enter_link>, or, if that
1726to the emergency map position. 1727fails, to the emergency map position.
1727 1728
1728Might block. 1729Might block.
1729 1730
1730=cut 1731=cut
1732
1733sub link_map {
1734 unless ($LINK_MAP) {
1735 $LINK_MAP = cf::map::find "{link}"
1736 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1737 $LINK_MAP->load;
1738 }
1739
1740 $LINK_MAP
1741}
1731 1742
1732sub cf::object::player::enter_link { 1743sub cf::object::player::enter_link {
1733 my ($self) = @_; 1744 my ($self) = @_;
1734 1745
1735 $self->deactivate_recursive; 1746 $self->deactivate_recursive;
1736 1747
1737 return if $self->map == $LINK_MAP; 1748 return if UNIVERSAL::isa $self->map, "ext::map_link";
1738 1749
1739 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1750 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1740 if $self->map; 1751 if $self->map;
1741 1752
1742 $self->enter_map ($LINK_MAP, 20, 20); 1753 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1743} 1754}
1744 1755
1745sub cf::object::player::leave_link { 1756sub cf::object::player::leave_link {
1746 my ($self, $map, $x, $y) = @_; 1757 my ($self, $map, $x, $y) = @_;
1747 1758
… …
1811=cut 1822=cut
1812 1823
1813sub cf::object::player::goto { 1824sub cf::object::player::goto {
1814 my ($self, $path, $x, $y) = @_; 1825 my ($self, $path, $x, $y) = @_;
1815 1826
1816 $path = new cf::path $path;
1817
1818 $self->enter_link; 1827 $self->enter_link;
1819 1828
1820 (async { 1829 (async {
1821 my $map = cf::map::find $path->as_string; 1830 my $map = cf::map::find $path;
1822 $map = $map->{path}->customise_for ($map, $self) if $map; 1831 $map = $map->customise_for ($self) if $map;
1823 1832
1824# warn "entering ", $map->path, " at ($x, $y)\n" 1833# warn "entering ", $map->path, " at ($x, $y)\n"
1825# if $map; 1834# if $map;
1826 1835
1827 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1836 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
… …
1836 1845
1837sub parse_random_map_params { 1846sub parse_random_map_params {
1838 my ($spec) = @_; 1847 my ($spec) = @_;
1839 1848
1840 my $rmp = { # defaults 1849 my $rmp = { # defaults
1841 xsize => 10, 1850 xsize => (cf::rndm 15, 40),
1842 ysize => 10, 1851 ysize => (cf::rndm 15, 40),
1852 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1853 #layout => string,
1843 }; 1854 };
1844 1855
1845 for (split /\n/, $spec) { 1856 for (split /\n/, $spec) {
1846 my ($k, $v) = split /\s+/, $_, 2; 1857 my ($k, $v) = split /\s+/, $_, 2;
1847 1858
… …
1851 $rmp 1862 $rmp
1852} 1863}
1853 1864
1854sub prepare_random_map { 1865sub prepare_random_map {
1855 my ($exit) = @_; 1866 my ($exit) = @_;
1867
1868 my $guard = cf::lock_acquire "exit_prepare:$exit";
1856 1869
1857 # all this does is basically replace the /! path by 1870 # all this does is basically replace the /! path by
1858 # a new random map path (?random/...) with a seed 1871 # a new random map path (?random/...) with a seed
1859 # that depends on the exit object 1872 # that depends on the exit object
1860 1873
… …
1869 1882
1870 $rmp->{random_seed} ||= $exit->random_seed; 1883 $rmp->{random_seed} ||= $exit->random_seed;
1871 1884
1872 my $data = cf::to_json $rmp; 1885 my $data = cf::to_json $rmp;
1873 my $md5 = Digest::MD5::md5_hex $data; 1886 my $md5 = Digest::MD5::md5_hex $data;
1887 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1874 1888
1875 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1889 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1876 aio_write $fh, 0, (length $data), $data, 0; 1890 aio_write $fh, 0, (length $data), $data, 0;
1891 undef $fh;
1892 aio_rename "$meta~", $meta;
1877 1893
1878 $exit->slaying ("?random/$md5"); 1894 $exit->slaying ("?random/$md5");
1879 $exit->msg (undef); 1895 $exit->msg (undef);
1880 } 1896 }
1881} 1897}
1882 1898
1883sub cf::object::player::enter_exit { 1899sub cf::object::player::enter_exit {
1884 my ($self, $exit) = @_; 1900 my ($self, $exit) = @_;
1885 1901
1886 return unless $self->type == cf::PLAYER; 1902 return unless $self->type == cf::PLAYER;
1903
1904 if ($exit->slaying eq "/!") {
1905 #TODO: this should de-fi-ni-te-ly not be a sync-job
1906 cf::sync_job { prepare_random_map $exit };
1907 }
1908
1909 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1910 my $hp = $exit->stats->hp;
1911 my $sp = $exit->stats->sp;
1887 1912
1888 $self->enter_link; 1913 $self->enter_link;
1889 1914
1890 (async { 1915 (async {
1891 $self->deactivate_recursive; # just to be sure 1916 $self->deactivate_recursive; # just to be sure
1892 unless (eval { 1917 unless (eval {
1893 prepare_random_map $exit 1918 $self->goto ($slaying, $hp, $sp);
1894 if $exit->slaying eq "/!";
1895
1896 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1897 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1898 1919
1899 1; 1920 1;
1900 }) { 1921 }) {
1901 $self->message ("Something went wrong deep within the crossfire server. " 1922 $self->message ("Something went wrong deep within the crossfire server. "
1902 . "I'll try to bring you back to the map you were before. " 1923 . "I'll try to bring you back to the map you were before. "
… …
2191 sub db_sync() { 2212 sub db_sync() {
2192 db_save if $dirty; 2213 db_save if $dirty;
2193 undef $dirty; 2214 undef $dirty;
2194 } 2215 }
2195 2216
2196 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2217 my $idle = Event->idle (
2197 db_sync; 2218 reentrant => 0,
2219 min => 10,
2220 max => 20,
2221 repeat => 0,
2222 data => WF_AUTOCANCEL,
2223 cb => \&db_sync,
2198 }); 2224 );
2199 2225
2200 sub db_dirty() { 2226 sub db_dirty() {
2201 $dirty = 1; 2227 $dirty = 1;
2202 $idle->start; 2228 $idle->start;
2203 } 2229 }
… …
2251 2277
2252sub main { 2278sub main {
2253 # we must not ever block the main coroutine 2279 # we must not ever block the main coroutine
2254 local $Coro::idle = sub { 2280 local $Coro::idle = sub {
2255 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2281 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2282 (async {
2256 async { Event::one_event }; 2283 Event::one_event;
2284 })->prio (Coro::PRIO_MAX);
2257 }; 2285 };
2258 2286
2259 cfg_load; 2287 cfg_load;
2260 db_load; 2288 db_load;
2261 load_extensions; 2289 load_extensions;
2290
2291 $TICK_WATCHER->start;
2262 Event::loop; 2292 Event::loop;
2263} 2293}
2264 2294
2265############################################################################# 2295#############################################################################
2266# initialisation and cleanup 2296# initialisation and cleanup
2267 2297
2268# install some emergency cleanup handlers 2298# install some emergency cleanup handlers
2269BEGIN { 2299BEGIN {
2270 for my $signal (qw(INT HUP TERM)) { 2300 for my $signal (qw(INT HUP TERM)) {
2271 Event->signal ( 2301 Event->signal (
2302 reentrant => 0,
2272 data => WF_AUTOCANCEL, 2303 data => WF_AUTOCANCEL,
2273 signal => $signal, 2304 signal => $signal,
2305 prio => 0,
2274 cb => sub { 2306 cb => sub {
2275 cf::cleanup "SIG$signal"; 2307 cf::cleanup "SIG$signal";
2276 }, 2308 },
2277 ); 2309 );
2278 } 2310 }
2279} 2311}
… …
2284 warn "enter emergency perl save\n"; 2316 warn "enter emergency perl save\n";
2285 2317
2286 cf::sync_job { 2318 cf::sync_job {
2287 # use a peculiar iteration method to avoid tripping on perl 2319 # use a peculiar iteration method to avoid tripping on perl
2288 # refcount bugs in for. also avoids problems with players 2320 # refcount bugs in for. also avoids problems with players
2289 # and maps saved/Destroyed asynchronously. 2321 # and maps saved/destroyed asynchronously.
2290 warn "begin emergency player save\n"; 2322 warn "begin emergency player save\n";
2291 for my $login (keys %cf::PLAYER) { 2323 for my $login (keys %cf::PLAYER) {
2292 my $pl = $cf::PLAYER{$login} or next; 2324 my $pl = $cf::PLAYER{$login} or next;
2293 $pl->valid or next; 2325 $pl->valid or next;
2294 $pl->save; 2326 $pl->save;
… …
2308} 2340}
2309 2341
2310sub reload() { 2342sub reload() {
2311 # can/must only be called in main 2343 # can/must only be called in main
2312 if ($Coro::current != $Coro::main) { 2344 if ($Coro::current != $Coro::main) {
2313 warn "can only reload from main coroutine\n"; 2345 warn "can only reload from main coroutine";
2314 return; 2346 return;
2315 } 2347 }
2316 2348
2317 warn "reloading..."; 2349 warn "reloading...";
2318 2350
2319 warn "freezing server"; 2351 warn "cancelling server ticker";
2320 my $guard = freeze_mainloop; 2352 $TICK_WATCHER->cancel;
2353
2321 cf::emergency_save; 2354 cf::emergency_save;
2322
2323 warn "sync database to disk";
2324 cf::db_sync;
2325 IO::AIO::flush;
2326 2355
2327 eval { 2356 eval {
2328 # if anything goes wrong in here, we should simply crash as we already saved 2357 # if anything goes wrong in here, we should simply crash as we already saved
2329 2358
2359 warn "syncing database to disk";
2360 cf::db_sync;
2361
2330 warn "cancel all watchers"; 2362 warn "cancelling all WF_AUTOCANCEL watchers";
2331 for (Event::all_watchers) { 2363 for (Event::all_watchers) {
2332 $_->cancel if $_->data & WF_AUTOCANCEL; 2364 $_->cancel if $_->data & WF_AUTOCANCEL;
2333 } 2365 }
2334 2366
2367 warn "flushing outstanding aio requests";
2368 for (;;) {
2369 IO::AIO::flush;
2370 Coro::cede;
2371 last unless IO::AIO::nreqs;
2372 warn "iterate...";
2373 }
2374
2335 warn "cancel all extension coros"; 2375 warn "cancelling all extension coros";
2336 $_->cancel for values %EXT_CORO; 2376 $_->cancel for values %EXT_CORO;
2337 %EXT_CORO = (); 2377 %EXT_CORO = ();
2338 2378
2339 warn "remove commands"; 2379 warn "removing commands";
2340 %COMMAND = (); 2380 %COMMAND = ();
2341 2381
2342 warn "remove ext commands"; 2382 warn "removing ext commands";
2343 %EXTCMD = (); 2383 %EXTCMD = ();
2344 2384
2345 warn "unload/nuke all extensions"; 2385 warn "unloading/nuking all extensions";
2346 for my $pkg (@EXTS) { 2386 for my $pkg (@EXTS) {
2347 warn "... unloading $pkg"; 2387 warn "... unloading $pkg";
2348 2388
2349 if (my $cb = $pkg->can ("unload")) { 2389 if (my $cb = $pkg->can ("unload")) {
2350 eval { 2390 eval {
… …
2355 2395
2356 warn "... nuking $pkg"; 2396 warn "... nuking $pkg";
2357 Symbol::delete_package $pkg; 2397 Symbol::delete_package $pkg;
2358 } 2398 }
2359 2399
2360 warn "unload all perl modules loaded from $LIBDIR"; 2400 warn "unloading all perl modules loaded from $LIBDIR";
2361 while (my ($k, $v) = each %INC) { 2401 while (my ($k, $v) = each %INC) {
2362 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2402 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2363 2403
2364 warn "removing <$k>"; 2404 warn "... unloading $k";
2365 delete $INC{$k}; 2405 delete $INC{$k};
2366 2406
2367 $k =~ s/\.pm$//; 2407 $k =~ s/\.pm$//;
2368 $k =~ s/\//::/g; 2408 $k =~ s/\//::/g;
2369 2409
… …
2372 } 2412 }
2373 2413
2374 Symbol::delete_package $k; 2414 Symbol::delete_package $k;
2375 } 2415 }
2376 2416
2377 warn "get rid of safe::, as good as possible"; 2417 warn "getting rid of safe::, as good as possible";
2378 Symbol::delete_package "safe::$_" 2418 Symbol::delete_package "safe::$_"
2379 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2419 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2380 2420
2381 warn "unload cf.pm \"a bit\""; 2421 warn "unloading cf.pm \"a bit\"";
2382 delete $INC{"cf.pm"}; 2422 delete $INC{"cf.pm"};
2383 2423
2384 # don't, removes xs symbols, too, 2424 # don't, removes xs symbols, too,
2385 # and global variables created in xs 2425 # and global variables created in xs
2386 #Symbol::delete_package __PACKAGE__; 2426 #Symbol::delete_package __PACKAGE__;
2387 2427
2428 warn "unload completed, starting to reload now";
2429
2388 warn "reloading cf.pm"; 2430 warn "reloading cf.pm";
2389 require cf; 2431 require cf;
2390 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2432 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2391 2433
2392 warn "load config and database again"; 2434 warn "loading config and database again";
2393 cf::cfg_load; 2435 cf::cfg_load;
2394 cf::db_load; 2436 cf::db_load;
2395 2437
2396 warn "load extensions"; 2438 warn "loading extensions";
2397 cf::load_extensions; 2439 cf::load_extensions;
2398 2440
2399 warn "reattach attachments to objects/players"; 2441 warn "reattaching attachments to objects/players";
2400 _global_reattach; 2442 _global_reattach;
2401 warn "reattach attachments to maps"; 2443 warn "reattaching attachments to maps";
2402 reattach $_ for values %MAP; 2444 reattach $_ for values %MAP;
2445
2446 warn "restarting server ticker";
2447
2448 $TICK_WATCHER->start;
2403 }; 2449 };
2404 2450
2405 if ($@) { 2451 if ($@) {
2406 warn $@; 2452 warn $@;
2407 warn "error while reloading, exiting."; 2453 warn "error while reloading, exiting.";
… …
2409 } 2455 }
2410 2456
2411 warn "reloaded"; 2457 warn "reloaded";
2412}; 2458};
2413 2459
2414############################################################################# 2460our $RELOAD_WATCHER; # used only during reload
2415
2416unless ($LINK_MAP) {
2417 $LINK_MAP = cf::map::new;
2418
2419 $LINK_MAP->width (41);
2420 $LINK_MAP->height (41);
2421 $LINK_MAP->alloc;
2422 $LINK_MAP->path ("{link}");
2423 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2424 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2425
2426 # dirty hack because... archetypes are not yet loaded
2427 Event->timer (
2428 after => 10,
2429 cb => sub {
2430 $_[0]->w->cancel;
2431
2432 # provide some exits "home"
2433 my $exit = cf::object::new "exit";
2434
2435 $exit->slaying ($EMERGENCY_POSITION->[0]);
2436 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2437 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2438
2439 $LINK_MAP->insert ($exit->clone, 19, 19);
2440 $LINK_MAP->insert ($exit->clone, 19, 20);
2441 $LINK_MAP->insert ($exit->clone, 19, 21);
2442 $LINK_MAP->insert ($exit->clone, 20, 19);
2443 $LINK_MAP->insert ($exit->clone, 20, 21);
2444 $LINK_MAP->insert ($exit->clone, 21, 19);
2445 $LINK_MAP->insert ($exit->clone, 21, 20);
2446 $LINK_MAP->insert ($exit->clone, 21, 21);
2447
2448 $exit->destroy;
2449 });
2450
2451 $LINK_MAP->{deny_save} = 1;
2452 $LINK_MAP->{deny_reset} = 1;
2453
2454 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2455}
2456 2461
2457register_command "reload" => sub { 2462register_command "reload" => sub {
2458 my ($who, $arg) = @_; 2463 my ($who, $arg) = @_;
2459 2464
2460 if ($who->flag (FLAG_WIZ)) { 2465 if ($who->flag (FLAG_WIZ)) {
2461 $who->message ("start of reload."); 2466 $who->message ("reloading server.");
2467
2468 # doing reload synchronously and two reloads happen back-to-back,
2469 # coro crashes during coro_state_free->destroy here.
2470
2471 $RELOAD_WATCHER ||= Event->timer (
2472 reentrant => 0,
2473 after => 0,
2474 data => WF_AUTOCANCEL,
2475 cb => sub {
2462 reload; 2476 reload;
2463 $who->message ("end of reload."); 2477 undef $RELOAD_WATCHER;
2478 },
2479 );
2464 } 2480 }
2465}; 2481};
2466 2482
2467unshift @INC, $LIBDIR; 2483unshift @INC, $LIBDIR;
2484
2485my $bug_warning = 0;
2468 2486
2469$TICK_WATCHER = Event->timer ( 2487$TICK_WATCHER = Event->timer (
2470 reentrant => 0, 2488 reentrant => 0,
2489 parked => 1,
2471 prio => 0, 2490 prio => 0,
2472 at => $NEXT_TICK || $TICK, 2491 at => $NEXT_TICK || $TICK,
2473 data => WF_AUTOCANCEL, 2492 data => WF_AUTOCANCEL,
2474 cb => sub { 2493 cb => sub {
2494 if ($Coro::current != $Coro::main) {
2495 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2496 unless ++$bug_warning > 10;
2497 return;
2498 }
2499
2475 $NOW = Event::time; 2500 $NOW = Event::time;
2476 2501
2477 cf::server_tick; # one server iteration 2502 cf::server_tick; # one server iteration
2478 $RUNTIME += $TICK; 2503 $RUNTIME += $TICK;
2479 $NEXT_TICK += $TICK; 2504 $NEXT_TICK += $TICK;
2480 2505
2481 $WAIT_FOR_TICK->broadcast; 2506 $WAIT_FOR_TICK->broadcast;
2482 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2507 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2508
2509 Event::sweep;
2510 Coro::cede_notself;
2511
2512# my $AFTER = Event::time;
2513# warn $AFTER - $NOW;#d#
2483 2514
2484 # if we are delayed by four ticks or more, skip them all 2515 # if we are delayed by four ticks or more, skip them all
2485 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2516 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2486 2517
2487 $TICK_WATCHER->at ($NEXT_TICK); 2518 $TICK_WATCHER->at ($NEXT_TICK);
2488 $TICK_WATCHER->start; 2519 $TICK_WATCHER->start;
2489 }, 2520 },
2490); 2521);
2491 2522
2492IO::AIO::max_poll_time $TICK * 0.2; 2523IO::AIO::max_poll_time $TICK * 0.1;
2493 2524
2494Event->io ( 2525undef $Coro::AIO::WATCHER;
2526$AIO_POLL_WATCHER = Event->io (
2527 reentrant => 0,
2495 fd => IO::AIO::poll_fileno, 2528 fd => IO::AIO::poll_fileno,
2496 poll => 'r', 2529 poll => 'r',
2497 prio => 5, 2530 prio => 6,
2498 data => WF_AUTOCANCEL, 2531 data => WF_AUTOCANCEL,
2499 cb => \&IO::AIO::poll_cb, 2532 cb => \&IO::AIO::poll_cb,
2500); 2533);
2501 2534
2502Event->timer ( 2535$WRITE_RUNTIME_WATCHER = Event->timer (
2536 reentrant => 0,
2503 data => WF_AUTOCANCEL, 2537 data => WF_AUTOCANCEL,
2504 after => 0, 2538 after => 1,
2505 interval => 10, 2539 interval => 10,
2506 cb => sub { 2540 prio => 6, # keep it lowest so it acts like a watchdog
2507 (Coro::unblock_sub { 2541 cb => Coro::unblock_sub {
2508 write_runtime 2542 write_runtime
2509 or warn "ERROR: unable to write runtime file: $!"; 2543 or warn "ERROR: unable to write runtime file: $!";
2510 })->();
2511 }, 2544 },
2512); 2545);
2513 2546
2514END { cf::emergency_save } 2547END { cf::emergency_save }
2515 2548

Diff Legend

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