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

Diff Legend

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