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.203 by root, Thu Feb 1 19:40:42 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;
87
88sub cf::map::normalise;
84 89
85############################################################################# 90#############################################################################
86 91
87=head2 GLOBAL VARIABLES 92=head2 GLOBAL VARIABLES
88 93
… …
256} 261}
257 262
258sub freeze_mainloop { 263sub freeze_mainloop {
259 return unless $TICK_WATCHER->is_active; 264 return unless $TICK_WATCHER->is_active;
260 265
261 my $guard = Coro::guard { $TICK_WATCHER->start }; 266 my $guard = Coro::guard {
267 $TICK_WATCHER->start;
268 $WRITE_RUNTIME_WATCHER->start;
269 };
270 $WRITE_RUNTIME_WATCHER->stop;
262 $TICK_WATCHER->stop; 271 $TICK_WATCHER->stop;
263 $guard 272 $guard
264} 273}
265 274
266=item cf::async { BLOCK } 275=item cf::async { BLOCK }
… …
342 my $runtime = cf::localdir . "/runtime"; 351 my $runtime = cf::localdir . "/runtime";
343 352
344 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
345 or return; 354 or return;
346 355
356 my $value = $cf::RUNTIME + 90 + 10;
347 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 357 # 10 is the runtime save interval, for a monotonic clock
358 # 60 allows for the watchdog to kill the server.
359
348 (aio_write $fh, 0, (length $value), $value, 0) <= 0 360 (aio_write $fh, 0, (length $value), $value, 0) <= 0
349 and return; 361 and return;
350 362
351 aio_fsync $fh 363 aio_fsync $fh
352 and return; 364 and return;
… …
361} 373}
362 374
363=back 375=back
364 376
365=cut 377=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 378
543############################################################################# 379#############################################################################
544 380
545=head2 ATTACHABLE OBJECTS 381=head2 ATTACHABLE OBJECTS
546 382
… …
672our @CB_TYPE = (); # registry for type (cf-object class) based events 508our @CB_TYPE = (); # registry for type (cf-object class) based events
673our @CB_MAP = (); 509our @CB_MAP = ();
674 510
675my %attachment; 511my %attachment;
676 512
513sub cf::attachable::thawer_merge {
514 # simply override everything except _meta
515 local $_[0]{_meta};
516 %{$_[0]} = %{$_[1]};
517}
518
677sub _attach_cb($$$$) { 519sub _attach_cb($$$$) {
678 my ($registry, $event, $prio, $cb) = @_; 520 my ($registry, $event, $prio, $cb) = @_;
679 521
680 use sort 'stable'; 522 use sort 'stable';
681 523
… …
852# object support 694# object support
853 695
854sub reattach { 696sub reattach {
855 # basically do the same as instantiate, without calling instantiate 697 # basically do the same as instantiate, without calling instantiate
856 my ($obj) = @_; 698 my ($obj) = @_;
699
700 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
857 701
858 my $registry = $obj->registry; 702 my $registry = $obj->registry;
859 703
860 @$registry = (); 704 @$registry = ();
861 705
… …
932 } 776 }
933 } else { 777 } else {
934 aio_unlink $filename; 778 aio_unlink $filename;
935 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
936 } 780 }
781
782 #d##TODO# nuke non .map-files if exist
783 if ($filename =~ s/\.map$//) {
784 aio_unlink $filename;
785 aio_unlink "$filename.pst";
786 }
937 } 787 }
938} 788}
939 789
940sub object_freezer_as_string { 790sub object_freezer_as_string {
941 my ($rdata, $objs) = @_; 791 my ($rdata, $objs) = @_;
… …
947 797
948sub object_thawer_load { 798sub object_thawer_load {
949 my ($filename) = @_; 799 my ($filename) = @_;
950 800
951 my ($data, $av); 801 my ($data, $av);
802
803 #d#TODO remove .map if file does not exist
804 aio_stat $filename and $filename =~ s/\.map$//;
952 805
953 (aio_load $filename, $data) >= 0 806 (aio_load $filename, $data) >= 0
954 or return; 807 or return;
955 808
956 unless (aio_stat "$filename.pst") { 809 unless (aio_stat "$filename.pst") {
… …
1048 "package $pkg; use strict; use utf8;\n" 901 "package $pkg; use strict; use utf8;\n"
1049 . "#line 1 \"$path\"\n{\n" 902 . "#line 1 \"$path\"\n{\n"
1050 . (do { local $/; <$fh> }) 903 . (do { local $/; <$fh> })
1051 . "\n};\n1"; 904 . "\n};\n1";
1052 905
1053 eval $source 906 unless (eval $source) {
1054 or die $@ ? "$path: $@\n" 907 my $msg = $@ ? "$path: $@\n"
1055 : "extension disabled.\n"; 908 : "extension disabled.\n";
909 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
910 warn $@;
911 warn "mandatory extension failed to load, exiting.\n";
912 exit 1;
913 }
914 die $@;
915 }
1056 916
1057 push @EXTS, $pkg; 917 push @EXTS, $pkg;
1058} 918}
1059 919
1060sub load_extensions { 920sub load_extensions {
… …
1066 } or warn "$ext not loaded: $@"; 926 } or warn "$ext not loaded: $@";
1067 } 927 }
1068} 928}
1069 929
1070############################################################################# 930#############################################################################
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 931
1086=head2 CORE EXTENSIONS 932=head2 CORE EXTENSIONS
1087 933
1088Functions and methods that extend core crossfire objects. 934Functions and methods that extend core crossfire objects.
1089 935
… …
1125 971
1126sub exists($) { 972sub exists($) {
1127 my ($login) = @_; 973 my ($login) = @_;
1128 974
1129 $cf::PLAYER{$login} 975 $cf::PLAYER{$login}
1130 or cf::sync_job { !aio_stat $login } 976 or cf::sync_job { !aio_stat path $login }
1131} 977}
1132 978
1133sub find($) { 979sub find($) {
1134 return $cf::PLAYER{$_[0]} || do { 980 return $cf::PLAYER{$_[0]} || do {
1135 my $login = $_[0]; 981 my $login = $_[0];
… …
1225 \@logins 1071 \@logins
1226} 1072}
1227 1073
1228=item $player->maps 1074=item $player->maps
1229 1075
1230Returns an arrayref of cf::path's of all maps that are private for this 1076Returns an arrayref of map paths that are private for this
1231player. May block. 1077player. May block.
1232 1078
1233=cut 1079=cut
1234 1080
1235sub maps($) { 1081sub maps($) {
1236 my ($pl) = @_; 1082 my ($pl) = @_;
1083
1084 $pl = ref $pl ? $pl->ob->name : $pl;
1237 1085
1238 my $files = aio_readdir playerdir $pl 1086 my $files = aio_readdir playerdir $pl
1239 or return; 1087 or return;
1240 1088
1241 my @paths; 1089 my @paths;
… …
1243 for (@$files) { 1091 for (@$files) {
1244 utf8::decode $_; 1092 utf8::decode $_;
1245 next if /\.(?:pl|pst)$/; 1093 next if /\.(?:pl|pst)$/;
1246 next unless /^$PATH_SEP/o; 1094 next unless /^$PATH_SEP/o;
1247 1095
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1096 push @paths, cf::map::normalise "~$pl/$_";
1249 } 1097 }
1250 1098
1251 \@paths 1099 \@paths
1252} 1100}
1253 1101
… …
1279package cf::map; 1127package cf::map;
1280 1128
1281use Fcntl; 1129use Fcntl;
1282use Coro::AIO; 1130use Coro::AIO;
1283 1131
1132use overload
1133 '""' => \&as_string,
1134 fallback => 1;
1135
1284our $MAX_RESET = 3600; 1136our $MAX_RESET = 3600;
1285our $DEFAULT_RESET = 3000; 1137our $DEFAULT_RESET = 3000;
1286 1138
1287sub generate_random_map { 1139sub generate_random_map {
1288 my ($path, $rmp) = @_; 1140 my ($self, $rmp) = @_;
1289
1290 # mit "rum" bekleckern, nicht 1141 # mit "rum" bekleckern, nicht
1291 cf::map::_create_random_map ( 1142 $self->_create_random_map (
1292 $path,
1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1143 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1144 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1145 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296 $rmp->{exit_on_final_map}, 1146 $rmp->{exit_on_final_map},
1297 $rmp->{xsize}, $rmp->{ysize}, 1147 $rmp->{xsize}, $rmp->{ysize},
… …
1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1152 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303 (cf::region::find $rmp->{region}), $rmp->{custom} 1153 (cf::region::find $rmp->{region}), $rmp->{custom}
1304 ) 1154 )
1305} 1155}
1306 1156
1157=item cf::map->register ($regex, $prio)
1158
1159Register a handler for the map path matching the given regex at the
1160givne priority (higher is better, built-in handlers have priority 0, the
1161default).
1162
1163=cut
1164
1165sub register {
1166 my (undef, $regex, $prio) = @_;
1167 my $pkg = caller;
1168
1169 no strict;
1170 push @{"$pkg\::ISA"}, __PACKAGE__;
1171
1172 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1173}
1174
1175# also paths starting with '/'
1176$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1177
1178sub thawer_merge {
1179 my ($self, $merge) = @_;
1180
1181 # we have to keep some variables in memory intact
1182 local $self->{path};
1183 local $self->{load_path};
1184 local $self->{deny_save};
1185 local $self->{deny_reset};
1186
1187 $self->SUPER::thawer_merge ($merge);
1188}
1189
1190sub normalise {
1191 my ($path, $base) = @_;
1192
1193 $path = "$path"; # make sure its a string
1194
1195 $path =~ s/\.map$//;
1196
1197 # map plan:
1198 #
1199 # /! non-realised random map exit (special hack!)
1200 # {... are special paths that are not being touched
1201 # ?xxx/... are special absolute paths
1202 # ?random/... random maps
1203 # /... normal maps
1204 # ~user/... per-player map of a specific user
1205
1206 $path =~ s/$PATH_SEP/\//go;
1207
1208 # treat it as relative path if it starts with
1209 # something that looks reasonable
1210 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1211 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1212
1213 $base =~ s{[^/]+/?$}{};
1214 $path = "$base/$path";
1215 }
1216
1217 for ($path) {
1218 redo if s{//}{/};
1219 redo if s{/\.?/}{/};
1220 redo if s{/[^/]+/\.\./}{/};
1221 }
1222
1223 $path
1224}
1225
1226sub new_from_path {
1227 my (undef, $path, $base) = @_;
1228
1229 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1230
1231 $path = normalise $path, $base;
1232
1233 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1234 if ($path =~ $EXT_MAP{$pkg}[1]) {
1235 my $self = bless cf::map::new, $pkg;
1236 $self->{path} = $path; $self->path ($path);
1237 $self->init; # pass $1 etc.
1238 return $self;
1239 }
1240 }
1241
1242 Carp::carp "unable to resolve path '$path' (base '$base').";
1243 ()
1244}
1245
1246sub init {
1247 my ($self) = @_;
1248
1249 $self
1250}
1251
1252sub as_string {
1253 my ($self) = @_;
1254
1255 "$self->{path}"
1256}
1257
1258# the displayed name, this is a one way mapping
1259sub visible_name {
1260 &as_string
1261}
1262
1263# the original (read-only) location
1264sub load_path {
1265 my ($self) = @_;
1266
1267 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1268}
1269
1270# the temporary/swap location
1271sub save_path {
1272 my ($self) = @_;
1273
1274 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1275 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1276}
1277
1278# the unique path, undef == no special unique path
1279sub uniq_path {
1280 my ($self) = @_;
1281
1282 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1283 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1284}
1285
1307# and all this just because we cannot iterate over 1286# and all this just because we cannot iterate over
1308# all maps in C++... 1287# all maps in C++...
1309sub change_all_map_light { 1288sub change_all_map_light {
1310 my ($change) = @_; 1289 my ($change) = @_;
1311 1290
1312 $_->change_map_light ($change) 1291 $_->change_map_light ($change)
1313 for grep $_->outdoor, values %cf::MAP; 1292 for grep $_->outdoor, values %cf::MAP;
1314} 1293}
1315 1294
1295sub unlink_save {
1296 my ($self) = @_;
1297
1298 utf8::encode (my $save = $self->save_path);
1299 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1300 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1301
1302 #d#TODO remove .map and also nuke
1303 $save =~ s/\.map// or return;#d#
1304 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1305 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1306}
1307
1316sub load_map_header($) { 1308sub load_header_from($) {
1317 my ($path) = @_; 1309 my ($self, $path) = @_;
1318 1310
1319 utf8::encode $path; 1311 utf8::encode $path;
1320 aio_open $path, O_RDONLY, 0 1312 #aio_open $path, O_RDONLY, 0
1313 # or return;
1314
1315 $self->_load_header ($path)
1321 or return; 1316 or return;
1322 1317
1323 my $map = cf::map::new 1318 $self->{load_path} = $path;
1319
1320 1
1321}
1322
1323sub load_header_orig {
1324 my ($self) = @_;
1325
1326 $self->load_header_from ($self->load_path)
1327}
1328
1329sub load_header_temp {
1330 my ($self) = @_;
1331
1332 $self->load_header_from ($self->save_path)
1333}
1334
1335sub prepare_temp {
1336 my ($self) = @_;
1337
1338 $self->last_access ((delete $self->{last_access})
1339 || $cf::RUNTIME); #d#
1340 # safety
1341 $self->{instantiate_time} = $cf::RUNTIME
1342 if $self->{instantiate_time} > $cf::RUNTIME;
1343}
1344
1345sub prepare_orig {
1346 my ($self) = @_;
1347
1348 $self->{load_original} = 1;
1349 $self->{instantiate_time} = $cf::RUNTIME;
1350 $self->last_access ($cf::RUNTIME);
1351 $self->instantiate;
1352}
1353
1354sub load_header {
1355 my ($self) = @_;
1356
1357 if ($self->load_header_temp) {
1358 $self->prepare_temp;
1359 } else {
1360 $self->load_header_orig
1324 or return; 1361 or return;
1362 $self->prepare_orig;
1363 }
1325 1364
1326 # for better error messages only, will be overwritten later 1365 1
1327 $map->path ($path);
1328
1329 $map->load_header ($path)
1330 or return;
1331
1332 $map->{load_path} = $path;
1333
1334 $map
1335} 1366}
1336 1367
1337sub find; 1368sub find;
1338sub find { 1369sub find {
1339 my ($path, $origin) = @_; 1370 my ($path, $origin) = @_;
1340 1371
1341 #warn "find<$path,$origin>\n";#d#
1342
1343 $path = new cf::path $path, $origin && $origin->path; 1372 $path = normalise $path, $origin && $origin->path;
1344 my $key = $path->as_string;
1345 1373
1346 cf::lock_wait "map_find:$key"; 1374 cf::lock_wait "map_find:$path";
1347 1375
1348 $cf::MAP{$key} || do { 1376 $cf::MAP{$path} || do {
1349 my $guard = cf::lock_acquire "map_find:$key"; 1377 my $guard = cf::lock_acquire "map_find:$path";
1350 1378 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; 1379 or return;
1365 1380
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; 1381 $map->{last_save} = $cf::RUNTIME;
1378 1382
1379 Coro::cede; 1383 $map->load_header
1384 or return;
1380 1385
1381 if ($map->should_reset) { 1386 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1387 # doing this can freeze the server in a sync job, obviously
1388 #$cf::WAIT_FOR_TICK->wait;
1382 $map->reset; 1389 $map->reset;
1383 undef $guard; 1390 undef $guard;
1384 $map = find $path 1391 return find $path;
1385 or return;
1386 } 1392 }
1387 1393
1388 $cf::MAP{$key} = $map 1394 $cf::MAP{$path} = $map
1389 } 1395 }
1390} 1396}
1397
1398sub pre_load { }
1399sub post_load { }
1391 1400
1392sub load { 1401sub load {
1393 my ($self) = @_; 1402 my ($self) = @_;
1394 1403
1404 local $self->{deny_reset} = 1; # loading can take a long time
1405
1395 my $path = $self->{path}; 1406 my $path = $self->{path};
1396 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1407 my $guard = cf::lock_acquire "map_load:$path";
1397 1408
1398 return if $self->in_memory != cf::MAP_SWAPPED; 1409 return if $self->in_memory != cf::MAP_SWAPPED;
1399 1410
1400 $self->in_memory (cf::MAP_LOADING); 1411 $self->in_memory (cf::MAP_LOADING);
1401 1412
1402 $self->alloc; 1413 $self->alloc;
1414
1415 $self->pre_load;
1416
1403 $self->load_objects ($self->{load_path}, 1) 1417 $self->_load_objects ($self->{load_path}, 1)
1404 or return; 1418 or return;
1405 1419
1406 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1420 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1407 if delete $self->{load_original}; 1421 if delete $self->{load_original};
1408 1422
1409 if (my $uniq = $path->uniq_path) { 1423 if (my $uniq = $self->uniq_path) {
1410 utf8::encode $uniq; 1424 utf8::encode $uniq;
1411 if (aio_open $uniq, O_RDONLY, 0) { 1425 if (aio_open $uniq, O_RDONLY, 0) {
1412 $self->clear_unique_items; 1426 $self->clear_unique_items;
1413 $self->load_objects ($uniq, 0); 1427 $self->_load_objects ($uniq, 0);
1414 } 1428 }
1415 } 1429 }
1416 1430
1417 Coro::cede; 1431 Coro::cede;
1418 1432
1419 # now do the right thing for maps 1433 # now do the right thing for maps
1420 $self->link_multipart_objects; 1434 $self->link_multipart_objects;
1421 1435
1422 if ($self->{path}->is_style_map) { 1436 unless ($self->{deny_activate}) {
1423 $self->{deny_save} = 1;
1424 $self->{deny_reset} = 1;
1425 } else {
1426 $self->decay_objects; 1437 $self->decay_objects;
1427 $self->fix_auto_apply; 1438 $self->fix_auto_apply;
1428 $self->update_buttons; 1439 $self->update_buttons;
1440 Coro::cede;
1429 $self->set_darkness_map; 1441 $self->set_darkness_map;
1430 $self->difficulty ($self->estimate_difficulty) 1442 $self->difficulty ($self->estimate_difficulty)
1431 unless $self->difficulty; 1443 unless $self->difficulty;
1444 Coro::cede;
1432 $self->activate; 1445 $self->activate;
1433 } 1446 }
1434 1447
1435 Coro::cede; 1448 $self->post_load;
1436 1449
1437 $self->in_memory (cf::MAP_IN_MEMORY); 1450 $self->in_memory (cf::MAP_IN_MEMORY);
1451}
1452
1453sub customise_for {
1454 my ($self, $ob) = @_;
1455
1456 return find "~" . $ob->name . "/" . $self->{path}
1457 if $self->per_player;
1458
1459 $self
1438} 1460}
1439 1461
1440# find and load all maps in the 3x3 area around a map 1462# find and load all maps in the 3x3 area around a map
1441sub load_diag { 1463sub load_diag {
1442 my ($map) = @_; 1464 my ($map) = @_;
… …
1472 1494
1473 cf::sync_job { $map->load }; 1495 cf::sync_job { $map->load };
1474} 1496}
1475 1497
1476our %MAP_PREFETCH; 1498our %MAP_PREFETCH;
1477our $MAP_PREFETCHER = Coro::async { 1499our $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 1500
1492sub find_async { 1501sub find_async {
1493 my ($path, $origin) = @_; 1502 my ($path, $origin) = @_;
1494 1503
1495 $path = new cf::path $path, $origin && $origin->path; 1504 $path = normalise $path, $origin && $origin->{path};
1496 my $key = $path->as_string;
1497 1505
1498 if (my $map = $cf::MAP{$key}) { 1506 if (my $map = $cf::MAP{$path}) {
1499 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1507 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1500 } 1508 }
1501 1509
1502 $MAP_PREFETCH{$key} = $path; 1510 undef $MAP_PREFETCH{$path};
1511 $MAP_PREFETCHER ||= cf::async {
1512 while (%MAP_PREFETCH) {
1513 for my $path (keys %MAP_PREFETCH) {
1514 my $map = find $path
1515 or next;
1516 $map->load;
1517
1518 delete $MAP_PREFETCH{$path};
1519 }
1520 }
1521 undef $MAP_PREFETCHER;
1522 };
1503 $MAP_PREFETCHER->ready; 1523 $MAP_PREFETCHER->prio (6);
1504 1524
1505 () 1525 ()
1506} 1526}
1507 1527
1508sub save { 1528sub save {
… …
1512 1532
1513 $self->{last_save} = $cf::RUNTIME; 1533 $self->{last_save} = $cf::RUNTIME;
1514 1534
1515 return unless $self->dirty; 1535 return unless $self->dirty;
1516 1536
1517 my $save = $self->{path}->save_path; utf8::encode $save; 1537 my $save = $self->save_path; utf8::encode $save;
1518 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1538 my $uniq = $self->uniq_path; utf8::encode $uniq;
1519 1539
1520 $self->{load_path} = $save; 1540 $self->{load_path} = $save;
1521 1541
1522 return if $self->{deny_save}; 1542 return if $self->{deny_save};
1523 1543
… …
1526 cf::async { 1546 cf::async {
1527 $_->contr->save for $self->players; 1547 $_->contr->save for $self->players;
1528 }; 1548 };
1529 1549
1530 if ($uniq) { 1550 if ($uniq) {
1531 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1551 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1532 $self->save_objects ($uniq, cf::IO_UNIQUES); 1552 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1533 } else { 1553 } else {
1534 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1554 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1535 } 1555 }
1536} 1556}
1537 1557
1538sub swap_out { 1558sub swap_out {
1539 my ($self) = @_; 1559 my ($self) = @_;
… …
1553 1573
1554sub reset_at { 1574sub reset_at {
1555 my ($self) = @_; 1575 my ($self) = @_;
1556 1576
1557 # TODO: safety, remove and allow resettable per-player maps 1577 # TODO: safety, remove and allow resettable per-player maps
1558 return 1e99 if $self->{path}{user_rel}; 1578 return 1e99 if $self->isa ("ext::map_per_player");#d#
1559 return 1e99 if $self->{deny_reset}; 1579 return 1e99 if $self->{deny_reset};
1560 1580
1561 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1581 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1562 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1582 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1563 1583
… …
1568 my ($self) = @_; 1588 my ($self) = @_;
1569 1589
1570 $self->reset_at <= $cf::RUNTIME 1590 $self->reset_at <= $cf::RUNTIME
1571} 1591}
1572 1592
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 { 1593sub reset {
1587 my ($self) = @_; 1594 my ($self) = @_;
1588 1595
1589 my $lock = cf::lock_acquire "map_data:" . $self->path; 1596 my $lock = cf::lock_acquire "map_data:$self->{path}";
1590 1597
1591 return if $self->players; 1598 return if $self->players;
1592 return if $self->{path}{user_rel};#d# 1599 return if $self->isa ("ext::map_per_player");#d#
1593 1600
1594 warn "resetting map ", $self->path;#d# 1601 warn "resetting map ", $self->path;#d#
1595 1602
1596 delete $cf::MAP{$self->path}; 1603 delete $cf::MAP{$self->path};
1597 1604
1605 $self->in_memory (cf::MAP_SWAPPED);
1606 $self->clear;
1607
1598 $_->clear_links_to ($self) for values %cf::MAP; 1608 $_->clear_links_to ($self) for values %cf::MAP;
1599 1609
1600 $self->{path}->unlink_save; 1610 $self->unlink_save;
1601 $self->destroy; 1611 $self->destroy;
1602} 1612}
1603 1613
1604my $nuke_counter = "aaaa"; 1614my $nuke_counter = "aaaa";
1605 1615
1606sub nuke { 1616sub nuke {
1607 my ($self) = @_; 1617 my ($self) = @_;
1608 1618
1619 delete $cf::MAP{$self->path};
1620
1621 $self->unlink_save;
1622
1623 bless $self, "cf::map";
1624 delete $self->{deny_reset};
1609 $self->{deny_save} = 1; 1625 $self->{deny_save} = 1;
1610 $self->reset_timeout (1); 1626 $self->reset_timeout (1);
1611 $self->rename ("{nuke}/" . ($nuke_counter++)); 1627 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1628
1629 $cf::MAP{$self->path} = $self;
1630
1612 $self->reset; # polite request, might not happen 1631 $self->reset; # polite request, might not happen
1613} 1632}
1614 1633
1615=item cf::map::unique_maps 1634=item cf::map::unique_maps
1616 1635
1617Returns an arrayref of cf::path's of all shared maps that have 1636Returns an arrayref of paths of all shared maps that have
1618instantiated unique items. May block. 1637instantiated unique items. May block.
1619 1638
1620=cut 1639=cut
1621 1640
1622sub unique_maps() { 1641sub unique_maps() {
… …
1628 for (@$files) { 1647 for (@$files) {
1629 utf8::decode $_; 1648 utf8::decode $_;
1630 next if /\.pst$/; 1649 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o; 1650 next unless /^$PATH_SEP/o;
1632 1651
1633 push @paths, new cf::path $_; 1652 push @paths, cf::map::normalise $_;
1634 } 1653 }
1635 1654
1636 \@paths 1655 \@paths
1637} 1656}
1638 1657
… …
1713 1732
1714=item $player_object->enter_link 1733=item $player_object->enter_link
1715 1734
1716Freezes the player and moves him/her to a special map (C<{link}>). 1735Freezes the player and moves him/her to a special map (C<{link}>).
1717 1736
1718The player should be reaosnably safe there for short amounts of time. You 1737The player should be reasonably safe there for short amounts of time. You
1719I<MUST> call C<leave_link> as soon as possible, though. 1738I<MUST> call C<leave_link> as soon as possible, though.
1720 1739
1740Will never block.
1741
1721=item $player_object->leave_link ($map, $x, $y) 1742=item $player_object->leave_link ($map, $x, $y)
1722 1743
1723Moves the player out of the specila link map onto the given map. If the 1744Moves 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 1745map. 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, 1746to the location he/she was before the call to C<enter_link>, or, if that
1726to the emergency map position. 1747fails, to the emergency map position.
1727 1748
1728Might block. 1749Might block.
1729 1750
1730=cut 1751=cut
1752
1753sub link_map {
1754 unless ($LINK_MAP) {
1755 $LINK_MAP = cf::map::find "{link}"
1756 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1757 $LINK_MAP->load;
1758 }
1759
1760 $LINK_MAP
1761}
1731 1762
1732sub cf::object::player::enter_link { 1763sub cf::object::player::enter_link {
1733 my ($self) = @_; 1764 my ($self) = @_;
1734 1765
1735 $self->deactivate_recursive; 1766 $self->deactivate_recursive;
1736 1767
1737 return if $self->map == $LINK_MAP; 1768 return if UNIVERSAL::isa $self->map, "ext::map_link";
1738 1769
1739 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1770 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1740 if $self->map; 1771 if $self->map;
1741 1772
1742 $self->enter_map ($LINK_MAP, 20, 20); 1773 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1743} 1774}
1744 1775
1745sub cf::object::player::leave_link { 1776sub cf::object::player::leave_link {
1746 my ($self, $map, $x, $y) = @_; 1777 my ($self, $map, $x, $y) = @_;
1747 1778
… …
1811=cut 1842=cut
1812 1843
1813sub cf::object::player::goto { 1844sub cf::object::player::goto {
1814 my ($self, $path, $x, $y) = @_; 1845 my ($self, $path, $x, $y) = @_;
1815 1846
1816 $path = new cf::path $path;
1817
1818 $self->enter_link; 1847 $self->enter_link;
1819 1848
1820 (async { 1849 (async {
1850 my $map = eval {
1821 my $map = cf::map::find $path->as_string; 1851 my $map = cf::map::find $path;
1822 $map = $map->{path}->customise_for ($map, $self) if $map; 1852 $map = $map->customise_for ($self) if $map;
1823 1853 $map
1824# warn "entering ", $map->path, " at ($x, $y)\n" 1854 } or
1825# if $map;
1826
1827 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1855 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1828 1856
1829 $self->leave_link ($map, $x, $y); 1857 $self->leave_link ($map, $x, $y);
1830 })->prio (1); 1858 })->prio (1);
1831} 1859}
1832 1860
… …
1836 1864
1837sub parse_random_map_params { 1865sub parse_random_map_params {
1838 my ($spec) = @_; 1866 my ($spec) = @_;
1839 1867
1840 my $rmp = { # defaults 1868 my $rmp = { # defaults
1841 xsize => 10, 1869 xsize => (cf::rndm 15, 40),
1842 ysize => 10, 1870 ysize => (cf::rndm 15, 40),
1871 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1872 #layout => string,
1843 }; 1873 };
1844 1874
1845 for (split /\n/, $spec) { 1875 for (split /\n/, $spec) {
1846 my ($k, $v) = split /\s+/, $_, 2; 1876 my ($k, $v) = split /\s+/, $_, 2;
1847 1877
… …
1851 $rmp 1881 $rmp
1852} 1882}
1853 1883
1854sub prepare_random_map { 1884sub prepare_random_map {
1855 my ($exit) = @_; 1885 my ($exit) = @_;
1886
1887 my $guard = cf::lock_acquire "exit_prepare:$exit";
1856 1888
1857 # all this does is basically replace the /! path by 1889 # all this does is basically replace the /! path by
1858 # a new random map path (?random/...) with a seed 1890 # a new random map path (?random/...) with a seed
1859 # that depends on the exit object 1891 # that depends on the exit object
1860 1892
1861 my $rmp = parse_random_map_params $exit->msg; 1893 my $rmp = parse_random_map_params $exit->msg;
1862 1894
1863 if ($exit->map) { 1895 if ($exit->map) {
1864 $rmp->{region} = $exit->map->region_name; 1896 $rmp->{region} = $exit->region->name;
1865 $rmp->{origin_map} = $exit->map->path; 1897 $rmp->{origin_map} = $exit->map->path;
1866 $rmp->{origin_x} = $exit->x; 1898 $rmp->{origin_x} = $exit->x;
1867 $rmp->{origin_y} = $exit->y; 1899 $rmp->{origin_y} = $exit->y;
1868 } 1900 }
1869 1901
1870 $rmp->{random_seed} ||= $exit->random_seed; 1902 $rmp->{random_seed} ||= $exit->random_seed;
1871 1903
1872 my $data = cf::to_json $rmp; 1904 my $data = cf::to_json $rmp;
1873 my $md5 = Digest::MD5::md5_hex $data; 1905 my $md5 = Digest::MD5::md5_hex $data;
1906 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1874 1907
1875 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1908 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1876 aio_write $fh, 0, (length $data), $data, 0; 1909 aio_write $fh, 0, (length $data), $data, 0;
1910 undef $fh;
1911 aio_rename "$meta~", $meta;
1877 1912
1878 $exit->slaying ("?random/$md5"); 1913 $exit->slaying ("?random/$md5");
1879 $exit->msg (undef); 1914 $exit->msg (undef);
1880 } 1915 }
1881} 1916}
1882 1917
1883sub cf::object::player::enter_exit { 1918sub cf::object::player::enter_exit {
1884 my ($self, $exit) = @_; 1919 my ($self, $exit) = @_;
1885 1920
1886 return unless $self->type == cf::PLAYER; 1921 return unless $self->type == cf::PLAYER;
1922
1923 if ($exit->slaying eq "/!") {
1924 #TODO: this should de-fi-ni-te-ly not be a sync-job
1925 cf::sync_job { prepare_random_map $exit };
1926 }
1927
1928 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1929 my $hp = $exit->stats->hp;
1930 my $sp = $exit->stats->sp;
1887 1931
1888 $self->enter_link; 1932 $self->enter_link;
1889 1933
1890 (async { 1934 (async {
1891 $self->deactivate_recursive; # just to be sure 1935 $self->deactivate_recursive; # just to be sure
1892 unless (eval { 1936 unless (eval {
1893 prepare_random_map $exit 1937 $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 1938
1899 1; 1939 1;
1900 }) { 1940 }) {
1901 $self->message ("Something went wrong deep within the crossfire server. " 1941 $self->message ("Something went wrong deep within the crossfire server. "
1902 . "I'll try to bring you back to the map you were before. " 1942 . "I'll try to bring you back to the map you were before. "
… …
1963 # get handled first 2003 # get handled first
1964 my $queue = delete $ns->{query_queue} 2004 my $queue = delete $ns->{query_queue}
1965 or return; # be conservative, not sure how that can happen, but we saw a crash here 2005 or return; # be conservative, not sure how that can happen, but we saw a crash here
1966 2006
1967 (shift @$queue)->[1]->($msg); 2007 (shift @$queue)->[1]->($msg);
2008 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1968 2009
1969 push @{ $ns->{query_queue} }, @$queue; 2010 push @{ $ns->{query_queue} }, @$queue;
1970 2011
1971 if (@{ $ns->{query_queue} } == @$queue) { 2012 if (@{ $ns->{query_queue} } == @$queue) {
1972 if (@$queue) { 2013 if (@$queue) {
… …
2191 sub db_sync() { 2232 sub db_sync() {
2192 db_save if $dirty; 2233 db_save if $dirty;
2193 undef $dirty; 2234 undef $dirty;
2194 } 2235 }
2195 2236
2196 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2237 my $idle = Event->idle (
2197 db_sync; 2238 reentrant => 0,
2239 min => 10,
2240 max => 20,
2241 repeat => 0,
2242 data => WF_AUTOCANCEL,
2243 cb => \&db_sync,
2198 }); 2244 );
2199 2245
2200 sub db_dirty() { 2246 sub db_dirty() {
2201 $dirty = 1; 2247 $dirty = 1;
2202 $idle->start; 2248 $idle->start;
2203 } 2249 }
… …
2224 }, 2270 },
2225 ); 2271 );
2226} 2272}
2227 2273
2228############################################################################# 2274#############################################################################
2229# the server's main() 2275# the server's init and main functions
2276
2277sub load_resources {
2278 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2279 or die "unable to load regions file\n";#d#
2280}
2230 2281
2231sub cfg_load { 2282sub cfg_load {
2232 open my $fh, "<:utf8", cf::confdir . "/config" 2283 open my $fh, "<:utf8", cf::confdir . "/config"
2233 or return; 2284 or return;
2234 2285
… …
2247 }; 2298 };
2248 warn $@ if $@; 2299 warn $@ if $@;
2249 } 2300 }
2250} 2301}
2251 2302
2303sub init {
2304 load_resources;
2305}
2306
2252sub main { 2307sub main {
2253 # we must not ever block the main coroutine 2308 # we must not ever block the main coroutine
2254 local $Coro::idle = sub { 2309 local $Coro::idle = sub {
2255 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2310 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2311 (async {
2256 async { Event::one_event }; 2312 Event::one_event;
2313 })->prio (Coro::PRIO_MAX);
2257 }; 2314 };
2258 2315
2259 cfg_load; 2316 cfg_load;
2260 db_load; 2317 db_load;
2261 load_extensions; 2318 load_extensions;
2319
2320 $TICK_WATCHER->start;
2262 Event::loop; 2321 Event::loop;
2263} 2322}
2264 2323
2265############################################################################# 2324#############################################################################
2266# initialisation and cleanup 2325# initialisation and cleanup
2267 2326
2268# install some emergency cleanup handlers 2327# install some emergency cleanup handlers
2269BEGIN { 2328BEGIN {
2270 for my $signal (qw(INT HUP TERM)) { 2329 for my $signal (qw(INT HUP TERM)) {
2271 Event->signal ( 2330 Event->signal (
2331 reentrant => 0,
2272 data => WF_AUTOCANCEL, 2332 data => WF_AUTOCANCEL,
2273 signal => $signal, 2333 signal => $signal,
2334 prio => 0,
2274 cb => sub { 2335 cb => sub {
2275 cf::cleanup "SIG$signal"; 2336 cf::cleanup "SIG$signal";
2276 }, 2337 },
2277 ); 2338 );
2278 } 2339 }
2279} 2340}
… …
2284 warn "enter emergency perl save\n"; 2345 warn "enter emergency perl save\n";
2285 2346
2286 cf::sync_job { 2347 cf::sync_job {
2287 # use a peculiar iteration method to avoid tripping on perl 2348 # use a peculiar iteration method to avoid tripping on perl
2288 # refcount bugs in for. also avoids problems with players 2349 # refcount bugs in for. also avoids problems with players
2289 # and maps saved/Destroyed asynchronously. 2350 # and maps saved/destroyed asynchronously.
2290 warn "begin emergency player save\n"; 2351 warn "begin emergency player save\n";
2291 for my $login (keys %cf::PLAYER) { 2352 for my $login (keys %cf::PLAYER) {
2292 my $pl = $cf::PLAYER{$login} or next; 2353 my $pl = $cf::PLAYER{$login} or next;
2293 $pl->valid or next; 2354 $pl->valid or next;
2294 $pl->save; 2355 $pl->save;
… …
2308} 2369}
2309 2370
2310sub reload() { 2371sub reload() {
2311 # can/must only be called in main 2372 # can/must only be called in main
2312 if ($Coro::current != $Coro::main) { 2373 if ($Coro::current != $Coro::main) {
2313 warn "can only reload from main coroutine\n"; 2374 warn "can only reload from main coroutine";
2314 return; 2375 return;
2315 } 2376 }
2316 2377
2317 warn "reloading..."; 2378 warn "reloading...";
2318 2379
2319 warn "freezing server"; 2380 warn "cancelling server ticker";
2320 my $guard = freeze_mainloop; 2381 $TICK_WATCHER->cancel;
2382
2321 cf::emergency_save; 2383 cf::emergency_save;
2322
2323 warn "sync database to disk";
2324 cf::db_sync;
2325 IO::AIO::flush;
2326 2384
2327 eval { 2385 eval {
2328 # if anything goes wrong in here, we should simply crash as we already saved 2386 # if anything goes wrong in here, we should simply crash as we already saved
2329 2387
2388 warn "syncing database to disk";
2389 cf::db_sync;
2390
2330 warn "cancel all watchers"; 2391 warn "cancelling all WF_AUTOCANCEL watchers";
2331 for (Event::all_watchers) { 2392 for (Event::all_watchers) {
2332 $_->cancel if $_->data & WF_AUTOCANCEL; 2393 $_->cancel if $_->data & WF_AUTOCANCEL;
2333 } 2394 }
2334 2395
2396 warn "flushing outstanding aio requests";
2397 for (;;) {
2398 IO::AIO::flush;
2399 Coro::cede;
2400 last unless IO::AIO::nreqs;
2401 warn "iterate...";
2402 }
2403
2335 warn "cancel all extension coros"; 2404 warn "cancelling all extension coros";
2336 $_->cancel for values %EXT_CORO; 2405 $_->cancel for values %EXT_CORO;
2337 %EXT_CORO = (); 2406 %EXT_CORO = ();
2338 2407
2339 warn "remove commands"; 2408 warn "removing commands";
2340 %COMMAND = (); 2409 %COMMAND = ();
2341 2410
2342 warn "remove ext commands"; 2411 warn "removing ext commands";
2343 %EXTCMD = (); 2412 %EXTCMD = ();
2344 2413
2345 warn "unload/nuke all extensions"; 2414 warn "unloading/nuking all extensions";
2346 for my $pkg (@EXTS) { 2415 for my $pkg (@EXTS) {
2347 warn "... unloading $pkg"; 2416 warn "... unloading $pkg";
2348 2417
2349 if (my $cb = $pkg->can ("unload")) { 2418 if (my $cb = $pkg->can ("unload")) {
2350 eval { 2419 eval {
… …
2355 2424
2356 warn "... nuking $pkg"; 2425 warn "... nuking $pkg";
2357 Symbol::delete_package $pkg; 2426 Symbol::delete_package $pkg;
2358 } 2427 }
2359 2428
2360 warn "unload all perl modules loaded from $LIBDIR"; 2429 warn "unloading all perl modules loaded from $LIBDIR";
2361 while (my ($k, $v) = each %INC) { 2430 while (my ($k, $v) = each %INC) {
2362 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2431 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2363 2432
2364 warn "removing <$k>"; 2433 warn "... unloading $k";
2365 delete $INC{$k}; 2434 delete $INC{$k};
2366 2435
2367 $k =~ s/\.pm$//; 2436 $k =~ s/\.pm$//;
2368 $k =~ s/\//::/g; 2437 $k =~ s/\//::/g;
2369 2438
… …
2372 } 2441 }
2373 2442
2374 Symbol::delete_package $k; 2443 Symbol::delete_package $k;
2375 } 2444 }
2376 2445
2377 warn "get rid of safe::, as good as possible"; 2446 warn "getting rid of safe::, as good as possible";
2378 Symbol::delete_package "safe::$_" 2447 Symbol::delete_package "safe::$_"
2379 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2448 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2380 2449
2381 warn "unload cf.pm \"a bit\""; 2450 warn "unloading cf.pm \"a bit\"";
2382 delete $INC{"cf.pm"}; 2451 delete $INC{"cf.pm"};
2383 2452
2384 # don't, removes xs symbols, too, 2453 # don't, removes xs symbols, too,
2385 # and global variables created in xs 2454 # and global variables created in xs
2386 #Symbol::delete_package __PACKAGE__; 2455 #Symbol::delete_package __PACKAGE__;
2387 2456
2457 warn "unload completed, starting to reload now";
2458
2388 warn "reloading cf.pm"; 2459 warn "reloading cf.pm";
2389 require cf; 2460 require cf;
2390 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2461 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2391 2462
2392 warn "load config and database again"; 2463 warn "loading config and database again";
2393 cf::cfg_load; 2464 cf::cfg_load;
2394 cf::db_load; 2465 cf::db_load;
2395 2466
2396 warn "load extensions"; 2467 warn "loading extensions";
2397 cf::load_extensions; 2468 cf::load_extensions;
2398 2469
2399 warn "reattach attachments to objects/players"; 2470 warn "reattaching attachments to objects/players";
2400 _global_reattach; 2471 _global_reattach;
2401 warn "reattach attachments to maps"; 2472 warn "reattaching attachments to maps";
2402 reattach $_ for values %MAP; 2473 reattach $_ for values %MAP;
2474
2475 warn "loading reloadable resources";
2476 load_resources;
2477
2478 warn "restarting server ticker";
2479
2480 $TICK_WATCHER->start;
2403 }; 2481 };
2404 2482
2405 if ($@) { 2483 if ($@) {
2406 warn $@; 2484 warn $@;
2407 warn "error while reloading, exiting."; 2485 warn "error while reloading, exiting.";
… …
2409 } 2487 }
2410 2488
2411 warn "reloaded"; 2489 warn "reloaded";
2412}; 2490};
2413 2491
2414############################################################################# 2492our $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 2493
2457register_command "reload" => sub { 2494register_command "reload" => sub {
2458 my ($who, $arg) = @_; 2495 my ($who, $arg) = @_;
2459 2496
2460 if ($who->flag (FLAG_WIZ)) { 2497 if ($who->flag (FLAG_WIZ)) {
2461 $who->message ("start of reload."); 2498 $who->message ("reloading server.");
2499
2500 # doing reload synchronously and two reloads happen back-to-back,
2501 # coro crashes during coro_state_free->destroy here.
2502
2503 $RELOAD_WATCHER ||= Event->timer (
2504 reentrant => 0,
2505 after => 0,
2506 data => WF_AUTOCANCEL,
2507 cb => sub {
2462 reload; 2508 reload;
2463 $who->message ("end of reload."); 2509 undef $RELOAD_WATCHER;
2510 },
2511 );
2464 } 2512 }
2465}; 2513};
2466 2514
2467unshift @INC, $LIBDIR; 2515unshift @INC, $LIBDIR;
2516
2517my $bug_warning = 0;
2468 2518
2469$TICK_WATCHER = Event->timer ( 2519$TICK_WATCHER = Event->timer (
2470 reentrant => 0, 2520 reentrant => 0,
2521 parked => 1,
2471 prio => 0, 2522 prio => 0,
2472 at => $NEXT_TICK || $TICK, 2523 at => $NEXT_TICK || $TICK,
2473 data => WF_AUTOCANCEL, 2524 data => WF_AUTOCANCEL,
2474 cb => sub { 2525 cb => sub {
2526 if ($Coro::current != $Coro::main) {
2527 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2528 unless ++$bug_warning > 10;
2529 return;
2530 }
2531
2475 $NOW = Event::time; 2532 $NOW = Event::time;
2476 2533
2477 cf::server_tick; # one server iteration 2534 cf::server_tick; # one server iteration
2478 $RUNTIME += $TICK; 2535 $RUNTIME += $TICK;
2479 $NEXT_TICK += $TICK; 2536 $NEXT_TICK += $TICK;
2480 2537
2481 $WAIT_FOR_TICK->broadcast; 2538 $WAIT_FOR_TICK->broadcast;
2482 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2539 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2540
2541 Event::sweep;
2542 Coro::cede_notself;
2543
2544# my $AFTER = Event::time;
2545# warn $AFTER - $NOW;#d#
2483 2546
2484 # if we are delayed by four ticks or more, skip them all 2547 # if we are delayed by four ticks or more, skip them all
2485 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2548 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2486 2549
2487 $TICK_WATCHER->at ($NEXT_TICK); 2550 $TICK_WATCHER->at ($NEXT_TICK);
2488 $TICK_WATCHER->start; 2551 $TICK_WATCHER->start;
2489 }, 2552 },
2490); 2553);
2491 2554
2492IO::AIO::max_poll_time $TICK * 0.2; 2555IO::AIO::max_poll_time $TICK * 0.1;
2493 2556
2494Event->io ( 2557undef $Coro::AIO::WATCHER;
2558$AIO_POLL_WATCHER = Event->io (
2559 reentrant => 0,
2495 fd => IO::AIO::poll_fileno, 2560 fd => IO::AIO::poll_fileno,
2496 poll => 'r', 2561 poll => 'r',
2497 prio => 5, 2562 prio => 6,
2498 data => WF_AUTOCANCEL, 2563 data => WF_AUTOCANCEL,
2499 cb => \&IO::AIO::poll_cb, 2564 cb => \&IO::AIO::poll_cb,
2500); 2565);
2501 2566
2502Event->timer ( 2567$WRITE_RUNTIME_WATCHER = Event->timer (
2568 reentrant => 0,
2503 data => WF_AUTOCANCEL, 2569 data => WF_AUTOCANCEL,
2504 after => 0, 2570 after => 1,
2505 interval => 10, 2571 interval => 10,
2506 cb => sub { 2572 prio => 6, # keep it lowest so it acts like a watchdog
2507 (Coro::unblock_sub { 2573 cb => Coro::unblock_sub {
2508 write_runtime 2574 write_runtime
2509 or warn "ERROR: unable to write runtime file: $!"; 2575 or warn "ERROR: unable to write runtime file: $!";
2510 })->();
2511 }, 2576 },
2512); 2577);
2513 2578
2514END { cf::emergency_save } 2579END { cf::emergency_save }
2515 2580

Diff Legend

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