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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.161 by root, Thu Jan 11 00:16:58 2007 UTC vs.
Revision 1.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 $path
478}
479
480# the original (read-only) location
481sub load_path {
482 my ($self) = @_;
483
484 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
485}
486
487# the temporary/swap location
488sub save_path {
489 my ($self) = @_;
490
491 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
492 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
493 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
494}
495
496# the unique path, undef == no special unique path
497sub uniq_path {
498 my ($self) = @_;
499
500 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
501}
502
503# this is somewhat ugly, but style maps do need special treatment
504sub is_style_map {
505 $_[0]{path} =~ m{^/styles/}
506}
507
508sub load_orig {
509 my ($self) = @_;
510
511 &cf::map::load_map_header ($self->load_path)
512}
513
514sub load_temp {
515 my ($self) = @_;
516
517 &cf::map::load_map_header ($self->save_path)
518}
519
520package cf;
521 386
522############################################################################# 387#############################################################################
523 388
524=head2 ATTACHABLE OBJECTS 389=head2 ATTACHABLE OBJECTS
525 390
… …
651our @CB_TYPE = (); # registry for type (cf-object class) based events 516our @CB_TYPE = (); # registry for type (cf-object class) based events
652our @CB_MAP = (); 517our @CB_MAP = ();
653 518
654my %attachment; 519my %attachment;
655 520
521sub cf::attachable::thawer_merge {
522 # simply override everything except _meta
523 local $_[0]{_meta};
524 %{$_[0]} = %{$_[1]};
525}
526
656sub _attach_cb($$$$) { 527sub _attach_cb($$$$) {
657 my ($registry, $event, $prio, $cb) = @_; 528 my ($registry, $event, $prio, $cb) = @_;
658 529
659 use sort 'stable'; 530 use sort 'stable';
660 531
… …
831# object support 702# object support
832 703
833sub reattach { 704sub reattach {
834 # basically do the same as instantiate, without calling instantiate 705 # basically do the same as instantiate, without calling instantiate
835 my ($obj) = @_; 706 my ($obj) = @_;
707
708 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
836 709
837 my $registry = $obj->registry; 710 my $registry = $obj->registry;
838 711
839 @$registry = (); 712 @$registry = ();
840 713
… …
887 $filename, length $$rdata, scalar @$objs; 760 $filename, length $$rdata, scalar @$objs;
888 761
889 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 762 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
890 chmod SAVE_MODE, $fh; 763 chmod SAVE_MODE, $fh;
891 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 764 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
892 aio_fsync $fh; 765 aio_fsync $fh if $cf::USE_FSYNC;
893 close $fh; 766 close $fh;
894 767
895 if (@$objs) { 768 if (@$objs) {
896 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) {
897 chmod SAVE_MODE, $fh; 770 chmod SAVE_MODE, $fh;
898 my $data = Storable::nfreeze { version => 1, objs => $objs }; 771 my $data = Storable::nfreeze { version => 1, objs => $objs };
899 aio_write $fh, 0, (length $data), $data, 0; 772 aio_write $fh, 0, (length $data), $data, 0;
900 aio_fsync $fh; 773 aio_fsync $fh if $cf::USE_FSYNC;
901 close $fh; 774 close $fh;
902 aio_rename "$filename.pst~", "$filename.pst"; 775 aio_rename "$filename.pst~", "$filename.pst";
903 } 776 }
904 } else { 777 } else {
905 aio_unlink "$filename.pst"; 778 aio_unlink "$filename.pst";
… …
911 } 784 }
912 } else { 785 } else {
913 aio_unlink $filename; 786 aio_unlink $filename;
914 aio_unlink "$filename.pst"; 787 aio_unlink "$filename.pst";
915 } 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 }
916 } 795 }
917} 796}
918 797
919sub object_freezer_as_string { 798sub object_freezer_as_string {
920 my ($rdata, $objs) = @_; 799 my ($rdata, $objs) = @_;
… …
926 805
927sub object_thawer_load { 806sub object_thawer_load {
928 my ($filename) = @_; 807 my ($filename) = @_;
929 808
930 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$//;
931 813
932 (aio_load $filename, $data) >= 0 814 (aio_load $filename, $data) >= 0
933 or return; 815 or return;
934 816
935 unless (aio_stat "$filename.pst") { 817 unless (aio_stat "$filename.pst") {
… …
1027 "package $pkg; use strict; use utf8;\n" 909 "package $pkg; use strict; use utf8;\n"
1028 . "#line 1 \"$path\"\n{\n" 910 . "#line 1 \"$path\"\n{\n"
1029 . (do { local $/; <$fh> }) 911 . (do { local $/; <$fh> })
1030 . "\n};\n1"; 912 . "\n};\n1";
1031 913
1032 eval $source 914 unless (eval $source) {
1033 or die $@ ? "$path: $@\n" 915 my $msg = $@ ? "$path: $@\n"
1034 : "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 }
1035 924
1036 push @EXTS, $pkg; 925 push @EXTS, $pkg;
1037} 926}
1038 927
1039sub load_extensions { 928sub load_extensions {
… …
1045 } or warn "$ext not loaded: $@"; 934 } or warn "$ext not loaded: $@";
1046 } 935 }
1047} 936}
1048 937
1049############################################################################# 938#############################################################################
1050# load/save/clean perl data associated with a map
1051
1052*cf::mapsupport::on_clean = sub {
1053 my ($map) = @_;
1054
1055 my $path = $map->tmpname;
1056 defined $path or return;
1057
1058 unlink "$path.pst";
1059};
1060
1061cf::map->attach (prio => -10000, package => cf::mapsupport::);
1062
1063#############################################################################
1064 939
1065=head2 CORE EXTENSIONS 940=head2 CORE EXTENSIONS
1066 941
1067Functions and methods that extend core crossfire objects. 942Functions and methods that extend core crossfire objects.
1068 943
… …
1104 979
1105sub exists($) { 980sub exists($) {
1106 my ($login) = @_; 981 my ($login) = @_;
1107 982
1108 $cf::PLAYER{$login} 983 $cf::PLAYER{$login}
1109 or cf::sync_job { !aio_stat $login } 984 or cf::sync_job { !aio_stat path $login }
1110} 985}
1111 986
1112sub find($) { 987sub find($) {
1113 return $cf::PLAYER{$_[0]} || do { 988 return $cf::PLAYER{$_[0]} || do {
1114 my $login = $_[0]; 989 my $login = $_[0];
… …
1204 \@logins 1079 \@logins
1205} 1080}
1206 1081
1207=item $player->maps 1082=item $player->maps
1208 1083
1209Returns 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
1210player. May block. 1085player. May block.
1211 1086
1212=cut 1087=cut
1213 1088
1214sub maps($) { 1089sub maps($) {
1215 my ($pl) = @_; 1090 my ($pl) = @_;
1091
1092 $pl = ref $pl ? $pl->ob->name : $pl;
1216 1093
1217 my $files = aio_readdir playerdir $pl 1094 my $files = aio_readdir playerdir $pl
1218 or return; 1095 or return;
1219 1096
1220 my @paths; 1097 my @paths;
… …
1222 for (@$files) { 1099 for (@$files) {
1223 utf8::decode $_; 1100 utf8::decode $_;
1224 next if /\.(?:pl|pst)$/; 1101 next if /\.(?:pl|pst)$/;
1225 next unless /^$PATH_SEP/o; 1102 next unless /^$PATH_SEP/o;
1226 1103
1227 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1104 push @paths, cf::map::normalise "~$pl/$_";
1228 } 1105 }
1229 1106
1230 \@paths 1107 \@paths
1231} 1108}
1232 1109
… …
1258package cf::map; 1135package cf::map;
1259 1136
1260use Fcntl; 1137use Fcntl;
1261use Coro::AIO; 1138use Coro::AIO;
1262 1139
1140use overload
1141 '""' => \&as_string,
1142 fallback => 1;
1143
1263our $MAX_RESET = 3600; 1144our $MAX_RESET = 3600;
1264our $DEFAULT_RESET = 3000; 1145our $DEFAULT_RESET = 3000;
1265 1146
1266sub generate_random_map { 1147sub generate_random_map {
1267 my ($path, $rmp) = @_; 1148 my ($self, $rmp) = @_;
1268
1269 # mit "rum" bekleckern, nicht 1149 # mit "rum" bekleckern, nicht
1270 cf::map::_create_random_map 1150 $self->_create_random_map (
1271 $path,
1272 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1151 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1273 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1152 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1274 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1153 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1275 $rmp->{exit_on_final_map}, 1154 $rmp->{exit_on_final_map},
1276 $rmp->{xsize}, $rmp->{ysize}, 1155 $rmp->{xsize}, $rmp->{ysize},
1277 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1156 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1278 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1157 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1279 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1158 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1280 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1159 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1281 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1160 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1282 (cf::region::find $rmp->{region}) 1161 (cf::region::find $rmp->{region}), $rmp->{custom}
1162 )
1163}
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
1283} 1292}
1284 1293
1285# and all this just because we cannot iterate over 1294# and all this just because we cannot iterate over
1286# all maps in C++... 1295# all maps in C++...
1287sub change_all_map_light { 1296sub change_all_map_light {
… …
1289 1298
1290 $_->change_map_light ($change) 1299 $_->change_map_light ($change)
1291 for grep $_->outdoor, values %cf::MAP; 1300 for grep $_->outdoor, values %cf::MAP;
1292} 1301}
1293 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
1294sub load_map_header($) { 1316sub load_header_from($) {
1295 my ($path) = @_; 1317 my ($self, $path) = @_;
1296 1318
1297 utf8::encode $path; 1319 utf8::encode $path;
1298 aio_open $path, O_RDONLY, 0 1320 #aio_open $path, O_RDONLY, 0
1321 # or return;
1322
1323 $self->_load_header ($path)
1299 or return; 1324 or return;
1300 1325
1301 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
1302 or return; 1369 or return;
1370 $self->prepare_orig;
1371 }
1303 1372
1304 # for better error messages only, will be overwritten later 1373 1
1305 $map->path ($path);
1306
1307 $map->load_header ($path)
1308 or return;
1309
1310 $map->{load_path} = $path;
1311
1312 $map
1313} 1374}
1314 1375
1315sub find; 1376sub find;
1316sub find { 1377sub find {
1317 my ($path, $origin) = @_; 1378 my ($path, $origin) = @_;
1318 1379
1319 #warn "find<$path,$origin>\n";#d#
1320
1321 $path = new cf::path $path, $origin && $origin->path; 1380 $path = normalise $path, $origin && $origin->path;
1322 my $key = $path->as_string;
1323 1381
1324 cf::lock_wait "map_find:$key"; 1382 cf::lock_wait "map_find:$path";
1325 1383
1326 $cf::MAP{$key} || do { 1384 $cf::MAP{$path} || do {
1327 my $guard = cf::lock_acquire "map_find:$key"; 1385 my $guard = cf::lock_acquire "map_find:$path";
1328 1386 my $map = new_from_path cf::map $path
1329 # do it the slow way
1330 my $map = $path->load_temp;
1331
1332 Coro::cede;
1333
1334 if ($map) {
1335 $map->last_access ((delete $map->{last_access})
1336 || $cf::RUNTIME); #d#
1337 # safety
1338 $map->{instantiate_time} = $cf::RUNTIME
1339 if $map->{instantiate_time} > $cf::RUNTIME;
1340 } else {
1341 $map = $path->load_orig
1342 or return; 1387 or return;
1343 1388
1344 $map->{load_original} = 1;
1345 $map->{instantiate_time} = $cf::RUNTIME;
1346 $map->last_access ($cf::RUNTIME);
1347 $map->instantiate;
1348
1349 # per-player maps become, after loading, normal maps
1350 $map->per_player (0) if $path->{user_rel};
1351 }
1352
1353 $map->path ($key);
1354 $map->{path} = $path;
1355 $map->{last_save} = $cf::RUNTIME; 1389 $map->{last_save} = $cf::RUNTIME;
1356 1390
1357 Coro::cede; 1391 $map->load_header
1392 or return;
1358 1393
1359 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;
1360 $map->reset; 1397 $map->reset;
1361 undef $guard; 1398 undef $guard;
1362 $map = find $path 1399 return find $path;
1363 or return;
1364 } 1400 }
1365 1401
1366 $cf::MAP{$key} = $map 1402 $cf::MAP{$path} = $map
1367 } 1403 }
1368} 1404}
1405
1406sub pre_load { }
1407sub post_load { }
1369 1408
1370sub load { 1409sub load {
1371 my ($self) = @_; 1410 my ($self) = @_;
1372 1411
1412 local $self->{deny_reset} = 1; # loading can take a long time
1413
1373 my $path = $self->{path}; 1414 my $path = $self->{path};
1374 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1415 my $guard = cf::lock_acquire "map_load:$path";
1375 1416
1376 return if $self->in_memory != cf::MAP_SWAPPED; 1417 return if $self->in_memory != cf::MAP_SWAPPED;
1377 1418
1378 $self->in_memory (cf::MAP_LOADING); 1419 $self->in_memory (cf::MAP_LOADING);
1379 1420
1380 $self->alloc; 1421 $self->alloc;
1422
1423 $self->pre_load;
1424
1381 $self->load_objects ($self->{load_path}, 1) 1425 $self->_load_objects ($self->{load_path}, 1)
1382 or return; 1426 or return;
1383 1427
1384 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1428 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1385 if delete $self->{load_original}; 1429 if delete $self->{load_original};
1386 1430
1387 if (my $uniq = $path->uniq_path) { 1431 if (my $uniq = $self->uniq_path) {
1388 utf8::encode $uniq; 1432 utf8::encode $uniq;
1389 if (aio_open $uniq, O_RDONLY, 0) { 1433 if (aio_open $uniq, O_RDONLY, 0) {
1390 $self->clear_unique_items; 1434 $self->clear_unique_items;
1391 $self->load_objects ($uniq, 0); 1435 $self->_load_objects ($uniq, 0);
1392 } 1436 }
1393 } 1437 }
1394 1438
1395 Coro::cede; 1439 Coro::cede;
1396 1440
1397 # now do the right thing for maps 1441 # now do the right thing for maps
1398 $self->link_multipart_objects; 1442 $self->link_multipart_objects;
1399 1443
1400 if ($self->{path}->is_style_map) { 1444 unless ($self->{deny_activate}) {
1401 $self->{deny_save} = 1; 1445 $self->decay_objects;
1402 $self->{deny_reset} = 1;
1403 } else {
1404 $self->fix_auto_apply; 1446 $self->fix_auto_apply;
1405 $self->decay_objects;
1406 $self->update_buttons; 1447 $self->update_buttons;
1448 Coro::cede;
1407 $self->set_darkness_map; 1449 $self->set_darkness_map;
1408 $self->difficulty ($self->estimate_difficulty) 1450 $self->difficulty ($self->estimate_difficulty)
1409 unless $self->difficulty; 1451 unless $self->difficulty;
1452 Coro::cede;
1410 $self->activate; 1453 $self->activate;
1411 } 1454 }
1412 1455
1413 Coro::cede; 1456 $self->post_load;
1414 1457
1415 $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
1416} 1468}
1417 1469
1418# 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
1419sub load_diag { 1471sub load_diag {
1420 my ($map) = @_; 1472 my ($map) = @_;
… …
1450 1502
1451 cf::sync_job { $map->load }; 1503 cf::sync_job { $map->load };
1452} 1504}
1453 1505
1454our %MAP_PREFETCH; 1506our %MAP_PREFETCH;
1455our $MAP_PREFETCHER = Coro::async { 1507our $MAP_PREFETCHER = undef;
1456 while () {
1457 while (%MAP_PREFETCH) {
1458 my $key = each %MAP_PREFETCH
1459 or next;
1460 my $path = delete $MAP_PREFETCH{$key};
1461
1462 my $map = find $path
1463 or next;
1464 $map->load;
1465 }
1466 Coro::schedule;
1467 }
1468};
1469 1508
1470sub find_async { 1509sub find_async {
1471 my ($path, $origin) = @_; 1510 my ($path, $origin) = @_;
1472 1511
1473 $path = new cf::path $path, $origin && $origin->path; 1512 $path = normalise $path, $origin && $origin->{path};
1474 my $key = $path->as_string;
1475 1513
1476 if (my $map = $cf::MAP{$key}) { 1514 if (my $map = $cf::MAP{$path}) {
1477 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1515 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1478 } 1516 }
1479 1517
1480 $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 };
1481 $MAP_PREFETCHER->ready; 1531 $MAP_PREFETCHER->prio (6);
1482 1532
1483 () 1533 ()
1484} 1534}
1485 1535
1486sub save { 1536sub save {
… …
1490 1540
1491 $self->{last_save} = $cf::RUNTIME; 1541 $self->{last_save} = $cf::RUNTIME;
1492 1542
1493 return unless $self->dirty; 1543 return unless $self->dirty;
1494 1544
1495 my $save = $self->{path}->save_path; utf8::encode $save; 1545 my $save = $self->save_path; utf8::encode $save;
1496 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1546 my $uniq = $self->uniq_path; utf8::encode $uniq;
1497 1547
1498 $self->{load_path} = $save; 1548 $self->{load_path} = $save;
1499 1549
1500 return if $self->{deny_save}; 1550 return if $self->{deny_save};
1501 1551
… …
1504 cf::async { 1554 cf::async {
1505 $_->contr->save for $self->players; 1555 $_->contr->save for $self->players;
1506 }; 1556 };
1507 1557
1508 if ($uniq) { 1558 if ($uniq) {
1509 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1559 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1510 $self->save_objects ($uniq, cf::IO_UNIQUES); 1560 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1511 } else { 1561 } else {
1512 $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);
1513 } 1563 }
1514} 1564}
1515 1565
1516sub swap_out { 1566sub swap_out {
1517 my ($self) = @_; 1567 my ($self) = @_;
… …
1531 1581
1532sub reset_at { 1582sub reset_at {
1533 my ($self) = @_; 1583 my ($self) = @_;
1534 1584
1535 # TODO: safety, remove and allow resettable per-player maps 1585 # TODO: safety, remove and allow resettable per-player maps
1536 return 1e99 if $self->{path}{user_rel}; 1586 return 1e99 if $self->isa ("ext::map_per_player");#d#
1537 return 1e99 if $self->{deny_reset}; 1587 return 1e99 if $self->{deny_reset};
1538 1588
1539 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1589 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1540 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;
1541 1591
… …
1546 my ($self) = @_; 1596 my ($self) = @_;
1547 1597
1548 $self->reset_at <= $cf::RUNTIME 1598 $self->reset_at <= $cf::RUNTIME
1549} 1599}
1550 1600
1551sub unlink_save {
1552 my ($self) = @_;
1553
1554 utf8::encode (my $save = $self->{path}->save_path);
1555 aioreq_pri 3; IO::AIO::aio_unlink $save;
1556 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1557}
1558
1559sub rename {
1560 my ($self, $new_path) = @_;
1561
1562 $self->unlink_save;
1563
1564 delete $cf::MAP{$self->path};
1565 $self->{path} = new cf::path $new_path;
1566 $self->path ($self->{path}->as_string);
1567 $cf::MAP{$self->path} = $self;
1568
1569 $self->save;
1570}
1571
1572sub reset { 1601sub reset {
1573 my ($self) = @_; 1602 my ($self) = @_;
1574 1603
1575 my $lock = cf::lock_acquire "map_data:" . $self->path; 1604 my $lock = cf::lock_acquire "map_data:$self->{path}";
1576 1605
1577 return if $self->players; 1606 return if $self->players;
1578 return if $self->{path}{user_rel};#d# 1607 return if $self->isa ("ext::map_per_player");#d#
1579 1608
1580 warn "resetting map ", $self->path;#d# 1609 warn "resetting map ", $self->path;#d#
1581 1610
1582 delete $cf::MAP{$self->path}; 1611 delete $cf::MAP{$self->path};
1612
1613 $self->in_memory (cf::MAP_SWAPPED);
1614 $self->clear;
1583 1615
1584 $_->clear_links_to ($self) for values %cf::MAP; 1616 $_->clear_links_to ($self) for values %cf::MAP;
1585 1617
1586 $self->unlink_save; 1618 $self->unlink_save;
1587 $self->destroy; 1619 $self->destroy;
… …
1590my $nuke_counter = "aaaa"; 1622my $nuke_counter = "aaaa";
1591 1623
1592sub nuke { 1624sub nuke {
1593 my ($self) = @_; 1625 my ($self) = @_;
1594 1626
1627 delete $cf::MAP{$self->path};
1628
1629 $self->unlink_save;
1630
1631 bless $self, "cf::map";
1632 delete $self->{deny_reset};
1595 $self->{deny_save} = 1; 1633 $self->{deny_save} = 1;
1596 $self->reset_timeout (1); 1634 $self->reset_timeout (1);
1597 $self->rename ("{nuke}/" . ($nuke_counter++)); 1635 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1636
1637 $cf::MAP{$self->path} = $self;
1638
1598 $self->reset; # polite request, might not happen 1639 $self->reset; # polite request, might not happen
1599} 1640}
1600 1641
1601sub customise_for {
1602 my ($map, $ob) = @_;
1603
1604 if ($map->per_player) {
1605 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1606 }
1607
1608 $map
1609}
1610
1611=item cf::map::unique_maps 1642=item cf::map::unique_maps
1612 1643
1613Returns an arrayref of cf::path's of all shared maps that have 1644Returns an arrayref of paths of all shared maps that have
1614instantiated unique items. May block. 1645instantiated unique items. May block.
1615 1646
1616=cut 1647=cut
1617 1648
1618sub unique_maps() { 1649sub unique_maps() {
… …
1624 for (@$files) { 1655 for (@$files) {
1625 utf8::decode $_; 1656 utf8::decode $_;
1626 next if /\.pst$/; 1657 next if /\.pst$/;
1627 next unless /^$PATH_SEP/o; 1658 next unless /^$PATH_SEP/o;
1628 1659
1629 push @paths, new cf::path $_; 1660 push @paths, cf::map::normalise $_;
1630 } 1661 }
1631 1662
1632 \@paths 1663 \@paths
1633} 1664}
1634 1665
… …
1709 1740
1710=item $player_object->enter_link 1741=item $player_object->enter_link
1711 1742
1712Freezes 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}>).
1713 1744
1714The 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
1715I<MUST> call C<leave_link> as soon as possible, though. 1746I<MUST> call C<leave_link> as soon as possible, though.
1716 1747
1748Will never block.
1749
1717=item $player_object->leave_link ($map, $x, $y) 1750=item $player_object->leave_link ($map, $x, $y)
1718 1751
1719Moves 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
1720map 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
1721location 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
1722to the emergency map position. 1755fails, to the emergency map position.
1723 1756
1724Might block. 1757Might block.
1725 1758
1726=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}
1727 1770
1728sub cf::object::player::enter_link { 1771sub cf::object::player::enter_link {
1729 my ($self) = @_; 1772 my ($self) = @_;
1730 1773
1731 $self->deactivate_recursive; 1774 $self->deactivate_recursive;
1732 1775
1733 return if $self->map == $LINK_MAP; 1776 return if UNIVERSAL::isa $self->map, "ext::map_link";
1734 1777
1735 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1736 if $self->map; 1779 if $self->map;
1737 1780
1738 $self->enter_map ($LINK_MAP, 20, 20); 1781 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1739} 1782}
1740 1783
1741sub cf::object::player::leave_link { 1784sub cf::object::player::leave_link {
1742 my ($self, $map, $x, $y) = @_; 1785 my ($self, $map, $x, $y) = @_;
1743 1786
… …
1807=cut 1850=cut
1808 1851
1809sub cf::object::player::goto { 1852sub cf::object::player::goto {
1810 my ($self, $path, $x, $y) = @_; 1853 my ($self, $path, $x, $y) = @_;
1811 1854
1812 $path = new cf::path $path;
1813
1814 $self->enter_link; 1855 $self->enter_link;
1815 1856
1816 (async { 1857 (async {
1858 my $map = eval {
1817 my $map = cf::map::find $path->as_string; 1859 my $map = cf::map::find $path;
1818 $map = $map->customise_for ($self) if $map; 1860 $map = $map->customise_for ($self) if $map;
1819 1861 $map
1820# warn "entering ", $map->path, " at ($x, $y)\n" 1862 } or
1821# if $map;
1822
1823 $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);
1824 1864
1825 $self->leave_link ($map, $x, $y); 1865 $self->leave_link ($map, $x, $y);
1826 })->prio (1); 1866 })->prio (1);
1827} 1867}
1828 1868
… …
1832 1872
1833sub parse_random_map_params { 1873sub parse_random_map_params {
1834 my ($spec) = @_; 1874 my ($spec) = @_;
1835 1875
1836 my $rmp = { # defaults 1876 my $rmp = { # defaults
1837 xsize => 10, 1877 xsize => (cf::rndm 15, 40),
1838 ysize => 10, 1878 ysize => (cf::rndm 15, 40),
1879 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1880 #layout => string,
1839 }; 1881 };
1840 1882
1841 for (split /\n/, $spec) { 1883 for (split /\n/, $spec) {
1842 my ($k, $v) = split /\s+/, $_, 2; 1884 my ($k, $v) = split /\s+/, $_, 2;
1843 1885
… …
1847 $rmp 1889 $rmp
1848} 1890}
1849 1891
1850sub prepare_random_map { 1892sub prepare_random_map {
1851 my ($exit) = @_; 1893 my ($exit) = @_;
1894
1895 my $guard = cf::lock_acquire "exit_prepare:$exit";
1852 1896
1853 # all this does is basically replace the /! path by 1897 # all this does is basically replace the /! path by
1854 # a new random map path (?random/...) with a seed 1898 # a new random map path (?random/...) with a seed
1855 # that depends on the exit object 1899 # that depends on the exit object
1856 1900
1857 my $rmp = parse_random_map_params $exit->msg; 1901 my $rmp = parse_random_map_params $exit->msg;
1858 1902
1859 if ($exit->map) { 1903 if ($exit->map) {
1860 $rmp->{region} = $exit->map->region_name; 1904 $rmp->{region} = $exit->region->name;
1861 $rmp->{origin_map} = $exit->map->path; 1905 $rmp->{origin_map} = $exit->map->path;
1862 $rmp->{origin_x} = $exit->x; 1906 $rmp->{origin_x} = $exit->x;
1863 $rmp->{origin_y} = $exit->y; 1907 $rmp->{origin_y} = $exit->y;
1864 } 1908 }
1865 1909
1866 $rmp->{random_seed} ||= $exit->random_seed; 1910 $rmp->{random_seed} ||= $exit->random_seed;
1867 1911
1868 my $data = cf::to_json $rmp; 1912 my $data = cf::to_json $rmp;
1869 my $md5 = Digest::MD5::md5_hex $data; 1913 my $md5 = Digest::MD5::md5_hex $data;
1914 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1870 1915
1871 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) {
1872 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;
1873 1920
1874 $exit->slaying ("?random/$md5"); 1921 $exit->slaying ("?random/$md5");
1875 $exit->msg (undef); 1922 $exit->msg (undef);
1876 } 1923 }
1877} 1924}
1878 1925
1879sub cf::object::player::enter_exit { 1926sub cf::object::player::enter_exit {
1880 my ($self, $exit) = @_; 1927 my ($self, $exit) = @_;
1881 1928
1882 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;
1883 1939
1884 $self->enter_link; 1940 $self->enter_link;
1885 1941
1886 (async { 1942 (async {
1887 $self->deactivate_recursive; # just to be sure 1943 $self->deactivate_recursive; # just to be sure
1888 unless (eval { 1944 unless (eval {
1889 prepare_random_map $exit 1945 $self->goto ($slaying, $hp, $sp);
1890 if $exit->slaying eq "/!";
1891
1892 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1893 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1894 1946
1895 1; 1947 1;
1896 }) { 1948 }) {
1897 $self->message ("Something went wrong deep within the crossfire server. " 1949 $self->message ("Something went wrong deep within the crossfire server. "
1898 . "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. "
… …
1959 # get handled first 2011 # get handled first
1960 my $queue = delete $ns->{query_queue} 2012 my $queue = delete $ns->{query_queue}
1961 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
1962 2014
1963 (shift @$queue)->[1]->($msg); 2015 (shift @$queue)->[1]->($msg);
2016 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1964 2017
1965 push @{ $ns->{query_queue} }, @$queue; 2018 push @{ $ns->{query_queue} }, @$queue;
1966 2019
1967 if (@{ $ns->{query_queue} } == @$queue) { 2020 if (@{ $ns->{query_queue} } == @$queue) {
1968 if (@$queue) { 2021 if (@$queue) {
… …
2187 sub db_sync() { 2240 sub db_sync() {
2188 db_save if $dirty; 2241 db_save if $dirty;
2189 undef $dirty; 2242 undef $dirty;
2190 } 2243 }
2191 2244
2192 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2245 my $idle = Event->idle (
2193 db_sync; 2246 reentrant => 0,
2247 min => 10,
2248 max => 20,
2249 repeat => 0,
2250 data => WF_AUTOCANCEL,
2251 cb => \&db_sync,
2194 }); 2252 );
2195 2253
2196 sub db_dirty() { 2254 sub db_dirty() {
2197 $dirty = 1; 2255 $dirty = 1;
2198 $idle->start; 2256 $idle->start;
2199 } 2257 }
… …
2220 }, 2278 },
2221 ); 2279 );
2222} 2280}
2223 2281
2224############################################################################# 2282#############################################################################
2225# 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}
2226 2289
2227sub cfg_load { 2290sub cfg_load {
2228 open my $fh, "<:utf8", cf::confdir . "/config" 2291 open my $fh, "<:utf8", cf::confdir . "/config"
2229 or return; 2292 or return;
2230 2293
… …
2243 }; 2306 };
2244 warn $@ if $@; 2307 warn $@ if $@;
2245 } 2308 }
2246} 2309}
2247 2310
2311sub init {
2312 load_resources;
2313}
2314
2248sub main { 2315sub main {
2249 # we must not ever block the main coroutine 2316 # we must not ever block the main coroutine
2250 local $Coro::idle = sub { 2317 local $Coro::idle = sub {
2251 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 {
2252 async { Event::one_event }; 2320 Event::one_event;
2321 })->prio (Coro::PRIO_MAX);
2253 }; 2322 };
2254 2323
2255 cfg_load; 2324 cfg_load;
2256 db_load; 2325 db_load;
2257 load_extensions; 2326 load_extensions;
2327
2328 $TICK_WATCHER->start;
2258 Event::loop; 2329 Event::loop;
2259} 2330}
2260 2331
2261############################################################################# 2332#############################################################################
2262# initialisation and cleanup 2333# initialisation and cleanup
2263 2334
2264# install some emergency cleanup handlers 2335# install some emergency cleanup handlers
2265BEGIN { 2336BEGIN {
2266 for my $signal (qw(INT HUP TERM)) { 2337 for my $signal (qw(INT HUP TERM)) {
2267 Event->signal ( 2338 Event->signal (
2339 reentrant => 0,
2268 data => WF_AUTOCANCEL, 2340 data => WF_AUTOCANCEL,
2269 signal => $signal, 2341 signal => $signal,
2342 prio => 0,
2270 cb => sub { 2343 cb => sub {
2271 cf::cleanup "SIG$signal"; 2344 cf::cleanup "SIG$signal";
2272 }, 2345 },
2273 ); 2346 );
2274 } 2347 }
2275} 2348}
… …
2280 warn "enter emergency perl save\n"; 2353 warn "enter emergency perl save\n";
2281 2354
2282 cf::sync_job { 2355 cf::sync_job {
2283 # use a peculiar iteration method to avoid tripping on perl 2356 # use a peculiar iteration method to avoid tripping on perl
2284 # refcount bugs in for. also avoids problems with players 2357 # refcount bugs in for. also avoids problems with players
2285 # and maps saved/Destroyed asynchronously. 2358 # and maps saved/destroyed asynchronously.
2286 warn "begin emergency player save\n"; 2359 warn "begin emergency player save\n";
2287 for my $login (keys %cf::PLAYER) { 2360 for my $login (keys %cf::PLAYER) {
2288 my $pl = $cf::PLAYER{$login} or next; 2361 my $pl = $cf::PLAYER{$login} or next;
2289 $pl->valid or next; 2362 $pl->valid or next;
2290 $pl->save; 2363 $pl->save;
… …
2304} 2377}
2305 2378
2306sub reload() { 2379sub reload() {
2307 # can/must only be called in main 2380 # can/must only be called in main
2308 if ($Coro::current != $Coro::main) { 2381 if ($Coro::current != $Coro::main) {
2309 warn "can only reload from main coroutine\n"; 2382 warn "can only reload from main coroutine";
2310 return; 2383 return;
2311 } 2384 }
2312 2385
2313 warn "reloading..."; 2386 warn "reloading...";
2314 2387
2315 warn "freezing server"; 2388 warn "cancelling server ticker";
2316 my $guard = freeze_mainloop; 2389 $TICK_WATCHER->cancel;
2390
2317 cf::emergency_save; 2391 cf::emergency_save;
2318
2319 warn "sync database to disk";
2320 cf::db_sync;
2321 IO::AIO::flush;
2322 2392
2323 eval { 2393 eval {
2324 # 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
2325 2395
2396 warn "syncing database to disk";
2397 cf::db_sync;
2398
2326 warn "cancel all watchers"; 2399 warn "cancelling all WF_AUTOCANCEL watchers";
2327 for (Event::all_watchers) { 2400 for (Event::all_watchers) {
2328 $_->cancel if $_->data & WF_AUTOCANCEL; 2401 $_->cancel if $_->data & WF_AUTOCANCEL;
2329 } 2402 }
2330 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
2331 warn "cancel all extension coros"; 2412 warn "cancelling all extension coros";
2332 $_->cancel for values %EXT_CORO; 2413 $_->cancel for values %EXT_CORO;
2333 %EXT_CORO = (); 2414 %EXT_CORO = ();
2334 2415
2335 warn "remove commands"; 2416 warn "removing commands";
2336 %COMMAND = (); 2417 %COMMAND = ();
2337 2418
2338 warn "remove ext commands"; 2419 warn "removing ext commands";
2339 %EXTCMD = (); 2420 %EXTCMD = ();
2340 2421
2341 warn "unload/nuke all extensions"; 2422 warn "unloading/nuking all extensions";
2342 for my $pkg (@EXTS) { 2423 for my $pkg (@EXTS) {
2343 warn "... unloading $pkg"; 2424 warn "... unloading $pkg";
2344 2425
2345 if (my $cb = $pkg->can ("unload")) { 2426 if (my $cb = $pkg->can ("unload")) {
2346 eval { 2427 eval {
… …
2351 2432
2352 warn "... nuking $pkg"; 2433 warn "... nuking $pkg";
2353 Symbol::delete_package $pkg; 2434 Symbol::delete_package $pkg;
2354 } 2435 }
2355 2436
2356 warn "unload all perl modules loaded from $LIBDIR"; 2437 warn "unloading all perl modules loaded from $LIBDIR";
2357 while (my ($k, $v) = each %INC) { 2438 while (my ($k, $v) = each %INC) {
2358 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2439 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2359 2440
2360 warn "removing <$k>"; 2441 warn "... unloading $k";
2361 delete $INC{$k}; 2442 delete $INC{$k};
2362 2443
2363 $k =~ s/\.pm$//; 2444 $k =~ s/\.pm$//;
2364 $k =~ s/\//::/g; 2445 $k =~ s/\//::/g;
2365 2446
… …
2368 } 2449 }
2369 2450
2370 Symbol::delete_package $k; 2451 Symbol::delete_package $k;
2371 } 2452 }
2372 2453
2373 warn "get rid of safe::, as good as possible"; 2454 warn "getting rid of safe::, as good as possible";
2374 Symbol::delete_package "safe::$_" 2455 Symbol::delete_package "safe::$_"
2375 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);
2376 2457
2377 warn "unload cf.pm \"a bit\""; 2458 warn "unloading cf.pm \"a bit\"";
2378 delete $INC{"cf.pm"}; 2459 delete $INC{"cf.pm"};
2379 2460
2380 # don't, removes xs symbols, too, 2461 # don't, removes xs symbols, too,
2381 # and global variables created in xs 2462 # and global variables created in xs
2382 #Symbol::delete_package __PACKAGE__; 2463 #Symbol::delete_package __PACKAGE__;
2383 2464
2465 warn "unload completed, starting to reload now";
2466
2384 warn "reloading cf.pm"; 2467 warn "reloading cf.pm";
2385 require cf; 2468 require cf;
2386 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2469 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2387 2470
2388 warn "load config and database again"; 2471 warn "loading config and database again";
2389 cf::cfg_load; 2472 cf::cfg_load;
2390 cf::db_load; 2473 cf::db_load;
2391 2474
2392 warn "load extensions"; 2475 warn "loading extensions";
2393 cf::load_extensions; 2476 cf::load_extensions;
2394 2477
2395 warn "reattach attachments to objects/players"; 2478 warn "reattaching attachments to objects/players";
2396 _global_reattach; 2479 _global_reattach;
2397 warn "reattach attachments to maps"; 2480 warn "reattaching attachments to maps";
2398 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;
2399 }; 2489 };
2400 2490
2401 if ($@) { 2491 if ($@) {
2402 warn $@; 2492 warn $@;
2403 warn "error while reloading, exiting."; 2493 warn "error while reloading, exiting.";
… …
2405 } 2495 }
2406 2496
2407 warn "reloaded"; 2497 warn "reloaded";
2408}; 2498};
2409 2499
2410############################################################################# 2500our $RELOAD_WATCHER; # used only during reload
2411
2412unless ($LINK_MAP) {
2413 $LINK_MAP = cf::map::new;
2414
2415 $LINK_MAP->width (41);
2416 $LINK_MAP->height (41);
2417 $LINK_MAP->alloc;
2418 $LINK_MAP->path ("{link}");
2419 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2420 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2421
2422 # dirty hack because... archetypes are not yet loaded
2423 Event->timer (
2424 after => 10,
2425 cb => sub {
2426 $_[0]->w->cancel;
2427
2428 # provide some exits "home"
2429 my $exit = cf::object::new "exit";
2430
2431 $exit->slaying ($EMERGENCY_POSITION->[0]);
2432 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2433 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2434
2435 $LINK_MAP->insert ($exit->clone, 19, 19);
2436 $LINK_MAP->insert ($exit->clone, 19, 20);
2437 $LINK_MAP->insert ($exit->clone, 19, 21);
2438 $LINK_MAP->insert ($exit->clone, 20, 19);
2439 $LINK_MAP->insert ($exit->clone, 20, 21);
2440 $LINK_MAP->insert ($exit->clone, 21, 19);
2441 $LINK_MAP->insert ($exit->clone, 21, 20);
2442 $LINK_MAP->insert ($exit->clone, 21, 21);
2443
2444 $exit->destroy;
2445 });
2446
2447 $LINK_MAP->{deny_save} = 1;
2448 $LINK_MAP->{deny_reset} = 1;
2449
2450 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2451}
2452 2501
2453register_command "reload" => sub { 2502register_command "reload" => sub {
2454 my ($who, $arg) = @_; 2503 my ($who, $arg) = @_;
2455 2504
2456 if ($who->flag (FLAG_WIZ)) { 2505 if ($who->flag (FLAG_WIZ)) {
2457 $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 {
2458 reload; 2516 reload;
2459 $who->message ("end of reload."); 2517 undef $RELOAD_WATCHER;
2518 },
2519 );
2460 } 2520 }
2461}; 2521};
2462 2522
2463unshift @INC, $LIBDIR; 2523unshift @INC, $LIBDIR;
2524
2525my $bug_warning = 0;
2464 2526
2465$TICK_WATCHER = Event->timer ( 2527$TICK_WATCHER = Event->timer (
2466 reentrant => 0, 2528 reentrant => 0,
2529 parked => 1,
2467 prio => 0, 2530 prio => 0,
2468 at => $NEXT_TICK || $TICK, 2531 at => $NEXT_TICK || $TICK,
2469 data => WF_AUTOCANCEL, 2532 data => WF_AUTOCANCEL,
2470 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
2540 $NOW = Event::time;
2541
2471 cf::server_tick; # one server iteration 2542 cf::server_tick; # one server iteration
2472 $RUNTIME += $TICK; 2543 $RUNTIME += $TICK;
2473 $NEXT_TICK += $TICK; 2544 $NEXT_TICK += $TICK;
2474 2545
2475 $WAIT_FOR_TICK->broadcast; 2546 $WAIT_FOR_TICK->broadcast;
2476 $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#
2477 2554
2478 # 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
2479 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2556 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2480 2557
2481 $TICK_WATCHER->at ($NEXT_TICK); 2558 $TICK_WATCHER->at ($NEXT_TICK);
2482 $TICK_WATCHER->start; 2559 $TICK_WATCHER->start;
2483 }, 2560 },
2484); 2561);
2485 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;
2486IO::AIO::max_poll_time $TICK * 0.2; 2613 IO::AIO::max_poll_time $TICK * 0.1;
2487 2614 $AIO_POLL_WATCHER = Event->io (
2488Event->io ( 2615 reentrant => 0,
2489 fd => IO::AIO::poll_fileno, 2616 fd => IO::AIO::poll_fileno,
2490 poll => 'r', 2617 poll => 'r',
2491 prio => 5, 2618 prio => 6,
2492 data => WF_AUTOCANCEL, 2619 data => WF_AUTOCANCEL,
2493 cb => \&IO::AIO::poll_cb, 2620 cb => \&IO::AIO::poll_cb,
2494); 2621 );
2622}
2495 2623
2496Event->timer ( 2624$WRITE_RUNTIME_WATCHER = Event->timer (
2625 reentrant => 0,
2497 data => WF_AUTOCANCEL, 2626 data => WF_AUTOCANCEL,
2498 after => 0, 2627 after => 1,
2499 interval => 10, 2628 interval => 10,
2500 cb => sub { 2629 prio => 6, # keep it lowest so it acts like a watchdog
2501 (Coro::unblock_sub { 2630 cb => Coro::unblock_sub {
2502 write_runtime 2631 write_runtime
2503 or warn "ERROR: unable to write runtime file: $!"; 2632 or warn "ERROR: unable to write runtime file: $!";
2504 })->();
2505 }, 2633 },
2506); 2634);
2507 2635
2508END { cf::emergency_save } 2636END { cf::emergency_save }
2509 2637

Diff Legend

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