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.158 by root, Wed Jan 10 19:52:43 2007 UTC vs.
Revision 1.214 by root, Wed Feb 14 00:40:05 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 ();
25use Time::HiRes; 26use Time::HiRes;
27use Compress::LZF;
28
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
26 30
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 31use Event; $Event::Eval = 1; # no idea why this is required, but it is
28 32
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 34
… …
33 37
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 38$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
35 39
36our %COMMAND = (); 40our %COMMAND = ();
37our %COMMAND_TIME = (); 41our %COMMAND_TIME = ();
42
43our @EXTS = (); # list of extension package names
38our %EXTCMD = (); 44our %EXTCMD = ();
45our %EXT_CORO = (); # coroutines bound to extensions
46our %EXT_MAP = (); # pluggable maps
39 47
40our @EVENT; 48our @EVENT;
41our $LIBDIR = datadir . "/ext"; 49our $LIBDIR = datadir . "/ext";
42 50
43our $TICK = MAX_TIME * 1e-6; 51our $TICK = MAX_TIME * 1e-6;
44our $TICK_WATCHER; 52our $TICK_WATCHER;
53our $AIO_POLL_WATCHER;
54our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
45our $NEXT_TICK; 55our $NEXT_TICK;
46our $NOW; 56our $NOW;
57our $USE_FSYNC = 1; # use fsync to write maps - default off
58
59our $BDB_POLL_WATCHER;
60our $DB_ENV;
47 61
48our %CFG; 62our %CFG;
49 63
50our $UPTIME; $UPTIME ||= time; 64our $UPTIME; $UPTIME ||= time;
51our $RUNTIME; 65our $RUNTIME;
52 66
53our %PLAYER; # all users 67our %PLAYER; # all users
54our %MAP; # all maps 68our %MAP; # all maps
55our $LINK_MAP; # the special {link} map 69our $LINK_MAP; # the special {link} map, which is always available
56our $RANDOM_MAPS = cf::localdir . "/random"; 70our $RANDOM_MAPS = cf::localdir . "/random";
57our %EXT_CORO; # coroutines bound to extensions 71our $BDB_ENV_DIR = cf::localdir . "/db";
58 72
59our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
60our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
75
76# used to convert map paths into valid unix filenames by replacing / by ∕
77our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
61 78
62binmode STDOUT; 79binmode STDOUT;
63binmode STDERR; 80binmode STDERR;
64 81
65# read virtual server time, if available 82# read virtual server time, if available
… …
72mkdir cf::localdir; 89mkdir cf::localdir;
73mkdir cf::localdir . "/" . cf::playerdir; 90mkdir cf::localdir . "/" . cf::playerdir;
74mkdir cf::localdir . "/" . cf::tmpdir; 91mkdir cf::localdir . "/" . cf::tmpdir;
75mkdir cf::localdir . "/" . cf::uniquedir; 92mkdir cf::localdir . "/" . cf::uniquedir;
76mkdir $RANDOM_MAPS; 93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
77 95
78# a special map that is always available
79our $LINK_MAP;
80our $EMERGENCY_POSITION; 96our $EMERGENCY_POSITION;
97
98sub cf::map::normalise;
81 99
82############################################################################# 100#############################################################################
83 101
84=head2 GLOBAL VARIABLES 102=head2 GLOBAL VARIABLES
85 103
… …
156} 174}
157 175
158$Event::DIED = sub { 176$Event::DIED = sub {
159 warn "error in event callback: @_"; 177 warn "error in event callback: @_";
160}; 178};
161
162my %ext_pkg;
163my @exts;
164my @hook;
165 179
166=head2 UTILITY FUNCTIONS 180=head2 UTILITY FUNCTIONS
167 181
168=over 4 182=over 4
169 183
… …
257} 271}
258 272
259sub freeze_mainloop { 273sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active; 274 return unless $TICK_WATCHER->is_active;
261 275
262 my $guard = Coro::guard { $TICK_WATCHER->start }; 276 my $guard = Coro::guard {
277 $TICK_WATCHER->start;
278 };
263 $TICK_WATCHER->stop; 279 $TICK_WATCHER->stop;
264 $guard 280 $guard
265} 281}
266 282
267=item cf::async { BLOCK } 283=item cf::async { BLOCK }
… …
319 } 335 }
320} 336}
321 337
322=item $coro = cf::async_ext { BLOCK } 338=item $coro = cf::async_ext { BLOCK }
323 339
324Like async, but this coro is automcatially being canceled when the 340Like async, but this coro is automatically being canceled when the
325extension calling this is being unloaded. 341extension calling this is being unloaded.
326 342
327=cut 343=cut
328 344
329sub async_ext(&) { 345sub async_ext(&) {
… …
343 my $runtime = cf::localdir . "/runtime"; 359 my $runtime = cf::localdir . "/runtime";
344 360
345 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
346 or return; 362 or return;
347 363
364 my $value = $cf::RUNTIME + 90 + 10;
348 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 365 # 10 is the runtime save interval, for a monotonic clock
366 # 60 allows for the watchdog to kill the server.
367
349 (aio_write $fh, 0, (length $value), $value, 0) <= 0 368 (aio_write $fh, 0, (length $value), $value, 0) <= 0
350 and return; 369 and return;
351 370
371 # always fsync - this file is important
352 aio_fsync $fh 372 aio_fsync $fh
353 and return; 373 and return;
354 374
355 close $fh 375 close $fh
356 or return; 376 or return;
… …
362} 382}
363 383
364=back 384=back
365 385
366=cut 386=cut
367
368#############################################################################
369
370package cf::path;
371
372use overload
373 '""' => \&as_string;
374
375# used to convert map paths into valid unix filenames by repalcing / by ∕
376our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
377
378sub new {
379 my ($class, $path, $base) = @_;
380
381 $path = $path->as_string if ref $path;
382
383 my $self = bless { }, $class;
384
385 # {... are special paths that are not touched
386 # ?xxx/... are special absolute paths
387 # ?random/... random maps
388 # /! non-realised random map exit
389 # /... normal maps
390 # ~/... per-player maps without a specific player (DO NOT USE)
391 # ~user/... per-player map of a specific user
392
393 $path =~ s/$PATH_SEP/\//go;
394
395 if ($path =~ /^{/) {
396 # fine as it is
397 } elsif ($path =~ s{^\?random/}{}) {
398 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
399 $self->{random} = cf::from_json $data;
400 } else {
401 if ($path =~ s{^~([^/]+)?}{}) {
402 $self->{user_rel} = 1;
403
404 if (defined $1) {
405 $self->{user} = $1;
406 } elsif ($base =~ m{^~([^/]+)/}) {
407 $self->{user} = $1;
408 } else {
409 warn "cannot resolve user-relative path without user <$path,$base>\n";
410 }
411 } elsif ($path =~ /^\//) {
412 # already absolute
413 } else {
414 $base =~ s{[^/]+/?$}{};
415 return $class->new ("$base/$path");
416 }
417
418 for ($path) {
419 redo if s{/\.?/}{/};
420 redo if s{/[^/]+/\.\./}{/};
421 }
422 }
423
424 $self->{path} = $path;
425
426 $self
427}
428
429# the name / primary key / in-game path
430sub as_string {
431 my ($self) = @_;
432
433 $self->{user_rel} ? "~$self->{user}$self->{path}"
434 : $self->{random} ? "?random/$self->{path}"
435 : $self->{path}
436}
437
438# the displayed name, this is a one way mapping
439sub visible_name {
440 my ($self) = @_;
441
442# if (my $rmp = $self->{random}) {
443# # todo: be more intelligent about this
444# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
445# } else {
446 $self->as_string
447# }
448}
449
450# escape the /'s in the path
451sub _escaped_path {
452 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
453 $path
454}
455
456# the original (read-only) location
457sub load_path {
458 my ($self) = @_;
459
460 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
461}
462
463# the temporary/swap location
464sub save_path {
465 my ($self) = @_;
466
467 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
468 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
469 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
470}
471
472# the unique path, might be eq to save_path
473sub uniq_path {
474 my ($self) = @_;
475
476 $self->{user_rel} || $self->{random}
477 ? undef
478 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
479}
480
481# return random map parameters, or undef
482sub random_map_params {
483 my ($self) = @_;
484
485 $self->{random}
486}
487
488# this is somewhat ugly, but style maps do need special treatment
489sub is_style_map {
490 $_[0]{path} =~ m{^/styles/}
491}
492
493package cf;
494 387
495############################################################################# 388#############################################################################
496 389
497=head2 ATTACHABLE OBJECTS 390=head2 ATTACHABLE OBJECTS
498 391
… …
624our @CB_TYPE = (); # registry for type (cf-object class) based events 517our @CB_TYPE = (); # registry for type (cf-object class) based events
625our @CB_MAP = (); 518our @CB_MAP = ();
626 519
627my %attachment; 520my %attachment;
628 521
522sub cf::attachable::thawer_merge {
523 # simply override everything except _meta
524 local $_[0]{_meta};
525 %{$_[0]} = %{$_[1]};
526}
527
629sub _attach_cb($$$$) { 528sub _attach_cb($$$$) {
630 my ($registry, $event, $prio, $cb) = @_; 529 my ($registry, $event, $prio, $cb) = @_;
631 530
632 use sort 'stable'; 531 use sort 'stable';
633 532
… …
804# object support 703# object support
805 704
806sub reattach { 705sub reattach {
807 # basically do the same as instantiate, without calling instantiate 706 # basically do the same as instantiate, without calling instantiate
808 my ($obj) = @_; 707 my ($obj) = @_;
708
709 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
809 710
810 my $registry = $obj->registry; 711 my $registry = $obj->registry;
811 712
812 @$registry = (); 713 @$registry = ();
813 714
… …
860 $filename, length $$rdata, scalar @$objs; 761 $filename, length $$rdata, scalar @$objs;
861 762
862 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 763 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
863 chmod SAVE_MODE, $fh; 764 chmod SAVE_MODE, $fh;
864 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 765 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
865 aio_fsync $fh; 766 aio_fsync $fh if $cf::USE_FSYNC;
866 close $fh; 767 close $fh;
867 768
868 if (@$objs) { 769 if (@$objs) {
869 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 770 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
870 chmod SAVE_MODE, $fh; 771 chmod SAVE_MODE, $fh;
871 my $data = Storable::nfreeze { version => 1, objs => $objs }; 772 my $data = Storable::nfreeze { version => 1, objs => $objs };
872 aio_write $fh, 0, (length $data), $data, 0; 773 aio_write $fh, 0, (length $data), $data, 0;
873 aio_fsync $fh; 774 aio_fsync $fh if $cf::USE_FSYNC;
874 close $fh; 775 close $fh;
875 aio_rename "$filename.pst~", "$filename.pst"; 776 aio_rename "$filename.pst~", "$filename.pst";
876 } 777 }
877 } else { 778 } else {
878 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
… …
884 } 785 }
885 } else { 786 } else {
886 aio_unlink $filename; 787 aio_unlink $filename;
887 aio_unlink "$filename.pst"; 788 aio_unlink "$filename.pst";
888 } 789 }
790
791 #d##TODO# nuke non .map-files if exist
792 if ($filename =~ s/\.map$//) {
793 aio_unlink $filename;
794 aio_unlink "$filename.pst";
795 }
889 } 796 }
890} 797}
891 798
892sub object_freezer_as_string { 799sub object_freezer_as_string {
893 my ($rdata, $objs) = @_; 800 my ($rdata, $objs) = @_;
… …
899 806
900sub object_thawer_load { 807sub object_thawer_load {
901 my ($filename) = @_; 808 my ($filename) = @_;
902 809
903 my ($data, $av); 810 my ($data, $av);
811
812 #d#TODO remove .map if file does not exist
813 aio_stat $filename and $filename =~ s/\.map$//;
904 814
905 (aio_load $filename, $data) >= 0 815 (aio_load $filename, $data) >= 0
906 or return; 816 or return;
907 817
908 unless (aio_stat "$filename.pst") { 818 unless (aio_stat "$filename.pst") {
… …
945=cut 855=cut
946 856
947sub register_extcmd { 857sub register_extcmd {
948 my ($name, $cb) = @_; 858 my ($name, $cb) = @_;
949 859
950 my $caller = caller;
951 #warn "registering extcmd '$name' to '$caller'";
952
953 $EXTCMD{$name} = [$cb, $caller]; 860 $EXTCMD{$name} = $cb;
954} 861}
955 862
956cf::player->attach ( 863cf::player->attach (
957 on_command => sub { 864 on_command => sub {
958 my ($pl, $name, $params) = @_; 865 my ($pl, $name, $params) = @_;
… …
971 878
972 my $msg = eval { from_json $buf }; 879 my $msg = eval { from_json $buf };
973 880
974 if (ref $msg) { 881 if (ref $msg) {
975 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 882 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
976 if (my %reply = $cb->[0]->($pl, $msg)) { 883 if (my %reply = $cb->($pl, $msg)) {
977 $pl->ext_reply ($msg->{msgid}, %reply); 884 $pl->ext_reply ($msg->{msgid}, %reply);
978 } 885 }
979 } 886 }
980 } else { 887 } else {
981 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 888 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
… …
983 890
984 cf::override; 891 cf::override;
985 }, 892 },
986); 893);
987 894
988sub register {
989 my ($base, $pkg) = @_;
990
991 #TODO
992}
993
994sub load_extension { 895sub load_extension {
995 my ($path) = @_; 896 my ($path) = @_;
996 897
997 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 898 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
998 my $base = $1; 899 my $base = $1;
999 my $pkg = $1; 900 my $pkg = $1;
1000 $pkg =~ s/[^[:word:]]/_/g; 901 $pkg =~ s/[^[:word:]]/_/g;
1001 $pkg = "ext::$pkg"; 902 $pkg = "ext::$pkg";
1002 903
1003 warn "loading '$path' into '$pkg'\n"; 904 warn "... loading '$path' into '$pkg'\n";
1004 905
1005 open my $fh, "<:utf8", $path 906 open my $fh, "<:utf8", $path
1006 or die "$path: $!"; 907 or die "$path: $!";
1007 908
1008 my $source = 909 my $source =
1009 "package $pkg; use strict; use utf8;\n" 910 "package $pkg; use strict; use utf8;\n"
1010 . "#line 1 \"$path\"\n{\n" 911 . "#line 1 \"$path\"\n{\n"
1011 . (do { local $/; <$fh> }) 912 . (do { local $/; <$fh> })
1012 . "\n};\n1"; 913 . "\n};\n1";
1013 914
1014 eval $source 915 unless (eval $source) {
1015 or die $@ ? "$path: $@\n" 916 my $msg = $@ ? "$path: $@\n"
1016 : "extension disabled.\n"; 917 : "extension disabled.\n";
1017 918 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
1018 push @exts, $pkg; 919 warn $@;
1019 $ext_pkg{$base} = $pkg; 920 warn "mandatory extension failed to load, exiting.\n";
1020 921 exit 1;
1021# no strict 'refs'; 922 }
1022# @{"$pkg\::ISA"} = ext::; 923 die $@;
1023
1024 register $base, $pkg;
1025}
1026
1027sub unload_extension {
1028 my ($pkg) = @_;
1029
1030 warn "removing extension $pkg\n";
1031
1032 # remove hooks
1033 #TODO
1034# for my $idx (0 .. $#PLUGIN_EVENT) {
1035# delete $hook[$idx]{$pkg};
1036# } 924 }
1037 925
1038 # remove commands 926 push @EXTS, $pkg;
1039 for my $name (keys %COMMAND) {
1040 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1041
1042 if (@cb) {
1043 $COMMAND{$name} = \@cb;
1044 } else {
1045 delete $COMMAND{$name};
1046 }
1047 }
1048
1049 # remove extcmds
1050 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1051 delete $EXTCMD{$name};
1052 }
1053
1054 if (my $cb = $pkg->can ("unload")) {
1055 eval {
1056 $cb->($pkg);
1057 1
1058 } or warn "$pkg unloaded, but with errors: $@";
1059 }
1060
1061 Symbol::delete_package $pkg;
1062} 927}
1063 928
1064sub load_extensions { 929sub load_extensions {
1065 for my $ext (<$LIBDIR/*.ext>) { 930 for my $ext (<$LIBDIR/*.ext>) {
1066 next unless -r $ext; 931 next unless -r $ext;
… …
1070 } or warn "$ext not loaded: $@"; 935 } or warn "$ext not loaded: $@";
1071 } 936 }
1072} 937}
1073 938
1074############################################################################# 939#############################################################################
1075# load/save/clean perl data associated with a map
1076
1077*cf::mapsupport::on_clean = sub {
1078 my ($map) = @_;
1079
1080 my $path = $map->tmpname;
1081 defined $path or return;
1082
1083 unlink "$path.pst";
1084};
1085
1086cf::map->attach (prio => -10000, package => cf::mapsupport::);
1087
1088#############################################################################
1089 940
1090=head2 CORE EXTENSIONS 941=head2 CORE EXTENSIONS
1091 942
1092Functions and methods that extend core crossfire objects. 943Functions and methods that extend core crossfire objects.
1093 944
… …
1129 980
1130sub exists($) { 981sub exists($) {
1131 my ($login) = @_; 982 my ($login) = @_;
1132 983
1133 $cf::PLAYER{$login} 984 $cf::PLAYER{$login}
1134 or cf::sync_job { !aio_stat $login } 985 or cf::sync_job { !aio_stat path $login }
1135} 986}
1136 987
1137sub find($) { 988sub find($) {
1138 return $cf::PLAYER{$_[0]} || do { 989 return $cf::PLAYER{$_[0]} || do {
1139 my $login = $_[0]; 990 my $login = $_[0];
… …
1229 \@logins 1080 \@logins
1230} 1081}
1231 1082
1232=item $player->maps 1083=item $player->maps
1233 1084
1234Returns an arrayref of cf::path's of all maps that are private for this 1085Returns an arrayref of map paths that are private for this
1235player. May block. 1086player. May block.
1236 1087
1237=cut 1088=cut
1238 1089
1239sub maps($) { 1090sub maps($) {
1240 my ($pl) = @_; 1091 my ($pl) = @_;
1092
1093 $pl = ref $pl ? $pl->ob->name : $pl;
1241 1094
1242 my $files = aio_readdir playerdir $pl 1095 my $files = aio_readdir playerdir $pl
1243 or return; 1096 or return;
1244 1097
1245 my @paths; 1098 my @paths;
… …
1247 for (@$files) { 1100 for (@$files) {
1248 utf8::decode $_; 1101 utf8::decode $_;
1249 next if /\.(?:pl|pst)$/; 1102 next if /\.(?:pl|pst)$/;
1250 next unless /^$PATH_SEP/o; 1103 next unless /^$PATH_SEP/o;
1251 1104
1252 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1105 push @paths, cf::map::normalise "~$pl/$_";
1253 } 1106 }
1254 1107
1255 \@paths 1108 \@paths
1256} 1109}
1257 1110
… …
1283package cf::map; 1136package cf::map;
1284 1137
1285use Fcntl; 1138use Fcntl;
1286use Coro::AIO; 1139use Coro::AIO;
1287 1140
1141use overload
1142 '""' => \&as_string,
1143 fallback => 1;
1144
1288our $MAX_RESET = 3600; 1145our $MAX_RESET = 3600;
1289our $DEFAULT_RESET = 3000; 1146our $DEFAULT_RESET = 3000;
1290 1147
1291sub generate_random_map { 1148sub generate_random_map {
1292 my ($path, $rmp) = @_; 1149 my ($self, $rmp) = @_;
1293
1294 # mit "rum" bekleckern, nicht 1150 # mit "rum" bekleckern, nicht
1295 cf::map::_create_random_map 1151 $self->_create_random_map (
1296 $path,
1297 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1152 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1298 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1153 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1299 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1154 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1300 $rmp->{exit_on_final_map}, 1155 $rmp->{exit_on_final_map},
1301 $rmp->{xsize}, $rmp->{ysize}, 1156 $rmp->{xsize}, $rmp->{ysize},
1302 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1157 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1303 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1158 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1304 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1159 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1305 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1160 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1306 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1161 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1307 (cf::region::find $rmp->{region}) 1162 (cf::region::find $rmp->{region}), $rmp->{custom}
1163 )
1164}
1165
1166=item cf::map->register ($regex, $prio)
1167
1168Register a handler for the map path matching the given regex at the
1169givne priority (higher is better, built-in handlers have priority 0, the
1170default).
1171
1172=cut
1173
1174sub register {
1175 my (undef, $regex, $prio) = @_;
1176 my $pkg = caller;
1177
1178 no strict;
1179 push @{"$pkg\::ISA"}, __PACKAGE__;
1180
1181 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1182}
1183
1184# also paths starting with '/'
1185$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1186
1187sub thawer_merge {
1188 my ($self, $merge) = @_;
1189
1190 # we have to keep some variables in memory intact
1191 local $self->{path};
1192 local $self->{load_path};
1193 local $self->{deny_save};
1194 local $self->{deny_reset};
1195
1196 $self->SUPER::thawer_merge ($merge);
1197}
1198
1199sub normalise {
1200 my ($path, $base) = @_;
1201
1202 $path = "$path"; # make sure its a string
1203
1204 $path =~ s/\.map$//;
1205
1206 # map plan:
1207 #
1208 # /! non-realised random map exit (special hack!)
1209 # {... are special paths that are not being touched
1210 # ?xxx/... are special absolute paths
1211 # ?random/... random maps
1212 # /... normal maps
1213 # ~user/... per-player map of a specific user
1214
1215 $path =~ s/$PATH_SEP/\//go;
1216
1217 # treat it as relative path if it starts with
1218 # something that looks reasonable
1219 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1220 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1221
1222 $base =~ s{[^/]+/?$}{};
1223 $path = "$base/$path";
1224 }
1225
1226 for ($path) {
1227 redo if s{//}{/};
1228 redo if s{/\.?/}{/};
1229 redo if s{/[^/]+/\.\./}{/};
1230 }
1231
1232 $path
1233}
1234
1235sub new_from_path {
1236 my (undef, $path, $base) = @_;
1237
1238 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1239
1240 $path = normalise $path, $base;
1241
1242 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1243 if ($path =~ $EXT_MAP{$pkg}[1]) {
1244 my $self = bless cf::map::new, $pkg;
1245 $self->{path} = $path; $self->path ($path);
1246 $self->init; # pass $1 etc.
1247 return $self;
1248 }
1249 }
1250
1251 Carp::carp "unable to resolve path '$path' (base '$base').";
1252 ()
1253}
1254
1255sub init {
1256 my ($self) = @_;
1257
1258 $self
1259}
1260
1261sub as_string {
1262 my ($self) = @_;
1263
1264 "$self->{path}"
1265}
1266
1267# the displayed name, this is a one way mapping
1268sub visible_name {
1269 &as_string
1270}
1271
1272# the original (read-only) location
1273sub load_path {
1274 my ($self) = @_;
1275
1276 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1277}
1278
1279# the temporary/swap location
1280sub save_path {
1281 my ($self) = @_;
1282
1283 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1284 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1285}
1286
1287# the unique path, undef == no special unique path
1288sub uniq_path {
1289 my ($self) = @_;
1290
1291 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1292 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1308} 1293}
1309 1294
1310# and all this just because we cannot iterate over 1295# and all this just because we cannot iterate over
1311# all maps in C++... 1296# all maps in C++...
1312sub change_all_map_light { 1297sub change_all_map_light {
… …
1314 1299
1315 $_->change_map_light ($change) 1300 $_->change_map_light ($change)
1316 for grep $_->outdoor, values %cf::MAP; 1301 for grep $_->outdoor, values %cf::MAP;
1317} 1302}
1318 1303
1304sub unlink_save {
1305 my ($self) = @_;
1306
1307 utf8::encode (my $save = $self->save_path);
1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1309 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1310
1311 #d#TODO remove .map and also nuke
1312 $save =~ s/\.map// or return;#d#
1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1314 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1315}
1316
1319sub try_load_header($) { 1317sub load_header_from($) {
1320 my ($path) = @_; 1318 my ($self, $path) = @_;
1321 1319
1322 utf8::encode $path; 1320 utf8::encode $path;
1323 aio_open $path, O_RDONLY, 0 1321 #aio_open $path, O_RDONLY, 0
1322 # or return;
1323
1324 $self->_load_header ($path)
1324 or return; 1325 or return;
1325 1326
1326 my $map = cf::map::new 1327 $self->{load_path} = $path;
1328
1329 1
1330}
1331
1332sub load_header_orig {
1333 my ($self) = @_;
1334
1335 $self->load_header_from ($self->load_path)
1336}
1337
1338sub load_header_temp {
1339 my ($self) = @_;
1340
1341 $self->load_header_from ($self->save_path)
1342}
1343
1344sub prepare_temp {
1345 my ($self) = @_;
1346
1347 $self->last_access ((delete $self->{last_access})
1348 || $cf::RUNTIME); #d#
1349 # safety
1350 $self->{instantiate_time} = $cf::RUNTIME
1351 if $self->{instantiate_time} > $cf::RUNTIME;
1352}
1353
1354sub prepare_orig {
1355 my ($self) = @_;
1356
1357 $self->{load_original} = 1;
1358 $self->{instantiate_time} = $cf::RUNTIME;
1359 $self->last_access ($cf::RUNTIME);
1360 $self->instantiate;
1361}
1362
1363sub load_header {
1364 my ($self) = @_;
1365
1366 if ($self->load_header_temp) {
1367 $self->prepare_temp;
1368 } else {
1369 $self->load_header_orig
1327 or return; 1370 or return;
1371 $self->prepare_orig;
1372 }
1328 1373
1329 # for better error messages only, will be overwritten 1374 1
1330 $map->path ($path);
1331
1332 $map->load_header ($path)
1333 or return;
1334
1335 $map->{load_path} = $path;
1336
1337 $map
1338} 1375}
1339 1376
1340sub find; 1377sub find;
1341sub find { 1378sub find {
1342 my ($path, $origin) = @_; 1379 my ($path, $origin) = @_;
1343 1380
1344 #warn "find<$path,$origin>\n";#d#
1345
1346 $path = new cf::path $path, $origin && $origin->path; 1381 $path = normalise $path, $origin && $origin->path;
1347 my $key = $path->as_string;
1348 1382
1349 cf::lock_wait "map_find:$key"; 1383 cf::lock_wait "map_find:$path";
1350 1384
1351 $cf::MAP{$key} || do { 1385 $cf::MAP{$path} || do {
1352 my $guard = cf::lock_acquire "map_find:$key"; 1386 my $guard = cf::lock_acquire "map_find:$path";
1353 1387 my $map = new_from_path cf::map $path
1354 # do it the slow way
1355 my $map = try_load_header $path->save_path;
1356
1357 Coro::cede;
1358
1359 if ($map) {
1360 $map->last_access ((delete $map->{last_access})
1361 || $cf::RUNTIME); #d#
1362 # safety
1363 $map->{instantiate_time} = $cf::RUNTIME
1364 if $map->{instantiate_time} > $cf::RUNTIME;
1365 } else {
1366 if (my $rmp = $path->random_map_params) {
1367 $map = generate_random_map $key, $rmp;
1368 } else {
1369 $map = try_load_header $path->load_path;
1370 }
1371
1372 $map or return; 1388 or return;
1373 1389
1374 $map->{load_original} = 1;
1375 $map->{instantiate_time} = $cf::RUNTIME;
1376 $map->last_access ($cf::RUNTIME);
1377 $map->instantiate;
1378
1379 # per-player maps become, after loading, normal maps
1380 $map->per_player (0) if $path->{user_rel};
1381 }
1382
1383 $map->path ($key);
1384 $map->{path} = $path;
1385 $map->{last_save} = $cf::RUNTIME; 1390 $map->{last_save} = $cf::RUNTIME;
1386 1391
1387 Coro::cede; 1392 $map->load_header
1393 or return;
1388 1394
1389 if ($map->should_reset) { 1395 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1396 # doing this can freeze the server in a sync job, obviously
1397 #$cf::WAIT_FOR_TICK->wait;
1390 $map->reset; 1398 $map->reset;
1391 undef $guard; 1399 undef $guard;
1392 $map = find $path 1400 return find $path;
1393 or return;
1394 } 1401 }
1395 1402
1396 $cf::MAP{$key} = $map 1403 $cf::MAP{$path} = $map
1397 } 1404 }
1398} 1405}
1406
1407sub pre_load { }
1408sub post_load { }
1399 1409
1400sub load { 1410sub load {
1401 my ($self) = @_; 1411 my ($self) = @_;
1402 1412
1413 local $self->{deny_reset} = 1; # loading can take a long time
1414
1403 my $path = $self->{path}; 1415 my $path = $self->{path};
1404 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1416 my $guard = cf::lock_acquire "map_load:$path";
1405 1417
1406 return if $self->in_memory != cf::MAP_SWAPPED; 1418 return if $self->in_memory != cf::MAP_SWAPPED;
1407 1419
1408 $self->in_memory (cf::MAP_LOADING); 1420 $self->in_memory (cf::MAP_LOADING);
1409 1421
1410 $self->alloc; 1422 $self->alloc;
1423
1424 $self->pre_load;
1425
1411 $self->load_objects ($self->{load_path}, 1) 1426 $self->_load_objects ($self->{load_path}, 1)
1412 or return; 1427 or return;
1413 1428
1414 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1429 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1415 if delete $self->{load_original}; 1430 if delete $self->{load_original};
1416 1431
1417 if (my $uniq = $path->uniq_path) { 1432 if (my $uniq = $self->uniq_path) {
1418 utf8::encode $uniq; 1433 utf8::encode $uniq;
1419 if (aio_open $uniq, O_RDONLY, 0) { 1434 if (aio_open $uniq, O_RDONLY, 0) {
1420 $self->clear_unique_items; 1435 $self->clear_unique_items;
1421 $self->load_objects ($uniq, 0); 1436 $self->_load_objects ($uniq, 0);
1422 } 1437 }
1423 } 1438 }
1424 1439
1425 Coro::cede; 1440 Coro::cede;
1426 1441
1427 # now do the right thing for maps 1442 # now do the right thing for maps
1428 $self->link_multipart_objects; 1443 $self->link_multipart_objects;
1429 1444
1430 if ($self->{path}->is_style_map) { 1445 unless ($self->{deny_activate}) {
1431 $self->{deny_save} = 1; 1446 $self->decay_objects;
1432 $self->{deny_reset} = 1;
1433 } else {
1434 $self->fix_auto_apply; 1447 $self->fix_auto_apply;
1435 $self->decay_objects;
1436 $self->update_buttons; 1448 $self->update_buttons;
1449 Coro::cede;
1437 $self->set_darkness_map; 1450 $self->set_darkness_map;
1438 $self->difficulty ($self->estimate_difficulty) 1451 $self->difficulty ($self->estimate_difficulty)
1439 unless $self->difficulty; 1452 unless $self->difficulty;
1453 Coro::cede;
1440 $self->activate; 1454 $self->activate;
1441 } 1455 }
1442 1456
1443 Coro::cede; 1457 $self->post_load;
1444 1458
1445 $self->in_memory (cf::MAP_IN_MEMORY); 1459 $self->in_memory (cf::MAP_IN_MEMORY);
1460}
1461
1462sub customise_for {
1463 my ($self, $ob) = @_;
1464
1465 return find "~" . $ob->name . "/" . $self->{path}
1466 if $self->per_player;
1467
1468 $self
1446} 1469}
1447 1470
1448# find and load all maps in the 3x3 area around a map 1471# find and load all maps in the 3x3 area around a map
1449sub load_diag { 1472sub load_diag {
1450 my ($map) = @_; 1473 my ($map) = @_;
… …
1480 1503
1481 cf::sync_job { $map->load }; 1504 cf::sync_job { $map->load };
1482} 1505}
1483 1506
1484our %MAP_PREFETCH; 1507our %MAP_PREFETCH;
1485our $MAP_PREFETCHER = Coro::async { 1508our $MAP_PREFETCHER = undef;
1486 while () {
1487 while (%MAP_PREFETCH) {
1488 my $key = each %MAP_PREFETCH
1489 or next;
1490 my $path = delete $MAP_PREFETCH{$key};
1491
1492 my $map = find $path
1493 or next;
1494 $map->load;
1495 }
1496 Coro::schedule;
1497 }
1498};
1499 1509
1500sub find_async { 1510sub find_async {
1501 my ($path, $origin) = @_; 1511 my ($path, $origin) = @_;
1502 1512
1503 $path = new cf::path $path, $origin && $origin->path; 1513 $path = normalise $path, $origin && $origin->{path};
1504 my $key = $path->as_string;
1505 1514
1506 if (my $map = $cf::MAP{$key}) { 1515 if (my $map = $cf::MAP{$path}) {
1507 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1516 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1508 } 1517 }
1509 1518
1510 $MAP_PREFETCH{$key} = $path; 1519 undef $MAP_PREFETCH{$path};
1520 $MAP_PREFETCHER ||= cf::async {
1521 while (%MAP_PREFETCH) {
1522 for my $path (keys %MAP_PREFETCH) {
1523 my $map = find $path
1524 or next;
1525 $map->load;
1526
1527 delete $MAP_PREFETCH{$path};
1528 }
1529 }
1530 undef $MAP_PREFETCHER;
1531 };
1511 $MAP_PREFETCHER->ready; 1532 $MAP_PREFETCHER->prio (6);
1512 1533
1513 () 1534 ()
1514} 1535}
1515 1536
1516sub save { 1537sub save {
… …
1520 1541
1521 $self->{last_save} = $cf::RUNTIME; 1542 $self->{last_save} = $cf::RUNTIME;
1522 1543
1523 return unless $self->dirty; 1544 return unless $self->dirty;
1524 1545
1525 my $save = $self->{path}->save_path; utf8::encode $save; 1546 my $save = $self->save_path; utf8::encode $save;
1526 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1547 my $uniq = $self->uniq_path; utf8::encode $uniq;
1527 1548
1528 $self->{load_path} = $save; 1549 $self->{load_path} = $save;
1529 1550
1530 return if $self->{deny_save}; 1551 return if $self->{deny_save};
1531 1552
… …
1534 cf::async { 1555 cf::async {
1535 $_->contr->save for $self->players; 1556 $_->contr->save for $self->players;
1536 }; 1557 };
1537 1558
1538 if ($uniq) { 1559 if ($uniq) {
1539 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1560 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1540 $self->save_objects ($uniq, cf::IO_UNIQUES); 1561 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1541 } else { 1562 } else {
1542 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1563 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1543 } 1564 }
1544} 1565}
1545 1566
1546sub swap_out { 1567sub swap_out {
1547 my ($self) = @_; 1568 my ($self) = @_;
… …
1561 1582
1562sub reset_at { 1583sub reset_at {
1563 my ($self) = @_; 1584 my ($self) = @_;
1564 1585
1565 # TODO: safety, remove and allow resettable per-player maps 1586 # TODO: safety, remove and allow resettable per-player maps
1566 return 1e99 if $self->{path}{user_rel}; 1587 return 1e99 if $self->isa ("ext::map_per_player");#d#
1567 return 1e99 if $self->{deny_reset}; 1588 return 1e99 if $self->{deny_reset};
1568 1589
1569 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1590 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1570 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1591 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1571 1592
… …
1576 my ($self) = @_; 1597 my ($self) = @_;
1577 1598
1578 $self->reset_at <= $cf::RUNTIME 1599 $self->reset_at <= $cf::RUNTIME
1579} 1600}
1580 1601
1581sub unlink_save {
1582 my ($self) = @_;
1583
1584 utf8::encode (my $save = $self->{path}->save_path);
1585 aioreq_pri 3; IO::AIO::aio_unlink $save;
1586 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1587}
1588
1589sub rename {
1590 my ($self, $new_path) = @_;
1591
1592 $self->unlink_save;
1593
1594 delete $cf::MAP{$self->path};
1595 $self->{path} = new cf::path $new_path;
1596 $self->path ($self->{path}->as_string);
1597 $cf::MAP{$self->path} = $self;
1598
1599 $self->save;
1600}
1601
1602sub reset { 1602sub reset {
1603 my ($self) = @_; 1603 my ($self) = @_;
1604 1604
1605 my $lock = cf::lock_acquire "map_data:" . $self->path; 1605 my $lock = cf::lock_acquire "map_data:$self->{path}";
1606 1606
1607 return if $self->players; 1607 return if $self->players;
1608 return if $self->{path}{user_rel};#d# 1608 return if $self->isa ("ext::map_per_player");#d#
1609 1609
1610 warn "resetting map ", $self->path;#d# 1610 warn "resetting map ", $self->path;#d#
1611 1611
1612 $self->in_memory (cf::MAP_SWAPPED);
1613
1614 # need to save uniques path
1615 unless ($self->{deny_save}) {
1616 my $uniq = $self->uniq_path; utf8::encode $uniq;
1617
1618 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1619 if $uniq;
1620 }
1621
1612 delete $cf::MAP{$self->path}; 1622 delete $cf::MAP{$self->path};
1623
1624 $self->clear;
1613 1625
1614 $_->clear_links_to ($self) for values %cf::MAP; 1626 $_->clear_links_to ($self) for values %cf::MAP;
1615 1627
1616 $self->unlink_save; 1628 $self->unlink_save;
1617 $self->destroy; 1629 $self->destroy;
… …
1620my $nuke_counter = "aaaa"; 1632my $nuke_counter = "aaaa";
1621 1633
1622sub nuke { 1634sub nuke {
1623 my ($self) = @_; 1635 my ($self) = @_;
1624 1636
1637 delete $cf::MAP{$self->path};
1638
1639 $self->unlink_save;
1640
1641 bless $self, "cf::map";
1642 delete $self->{deny_reset};
1625 $self->{deny_save} = 1; 1643 $self->{deny_save} = 1;
1626 $self->reset_timeout (1); 1644 $self->reset_timeout (1);
1627 $self->rename ("{nuke}/" . ($nuke_counter++)); 1645 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1646
1647 $cf::MAP{$self->path} = $self;
1648
1628 $self->reset; # polite request, might not happen 1649 $self->reset; # polite request, might not happen
1629} 1650}
1630 1651
1631sub customise_for {
1632 my ($map, $ob) = @_;
1633
1634 if ($map->per_player) {
1635 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1636 }
1637
1638 $map
1639}
1640
1641=item cf::map::unique_maps 1652=item cf::map::unique_maps
1642 1653
1643Returns an arrayref of cf::path's of all shared maps that have 1654Returns an arrayref of paths of all shared maps that have
1644instantiated unique items. May block. 1655instantiated unique items. May block.
1645 1656
1646=cut 1657=cut
1647 1658
1648sub unique_maps() { 1659sub unique_maps() {
… …
1654 for (@$files) { 1665 for (@$files) {
1655 utf8::decode $_; 1666 utf8::decode $_;
1656 next if /\.pst$/; 1667 next if /\.pst$/;
1657 next unless /^$PATH_SEP/o; 1668 next unless /^$PATH_SEP/o;
1658 1669
1659 push @paths, new cf::path $_; 1670 push @paths, cf::map::normalise $_;
1660 } 1671 }
1661 1672
1662 \@paths 1673 \@paths
1663} 1674}
1664 1675
… …
1739 1750
1740=item $player_object->enter_link 1751=item $player_object->enter_link
1741 1752
1742Freezes the player and moves him/her to a special map (C<{link}>). 1753Freezes the player and moves him/her to a special map (C<{link}>).
1743 1754
1744The player should be reaosnably safe there for short amounts of time. You 1755The player should be reasonably safe there for short amounts of time. You
1745I<MUST> call C<leave_link> as soon as possible, though. 1756I<MUST> call C<leave_link> as soon as possible, though.
1746 1757
1758Will never block.
1759
1747=item $player_object->leave_link ($map, $x, $y) 1760=item $player_object->leave_link ($map, $x, $y)
1748 1761
1749Moves the player out of the specila link map onto the given map. If the 1762Moves the player out of the special C<{link}> map onto the specified
1750map is not valid (or omitted), the player will be moved back to the 1763map. If the map is not valid (or omitted), the player will be moved back
1751location he/she was before the call to C<enter_link>, or, if that fails, 1764to the location he/she was before the call to C<enter_link>, or, if that
1752to the emergency map position. 1765fails, to the emergency map position.
1753 1766
1754Might block. 1767Might block.
1755 1768
1756=cut 1769=cut
1770
1771sub link_map {
1772 unless ($LINK_MAP) {
1773 $LINK_MAP = cf::map::find "{link}"
1774 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1775 $LINK_MAP->load;
1776 }
1777
1778 $LINK_MAP
1779}
1757 1780
1758sub cf::object::player::enter_link { 1781sub cf::object::player::enter_link {
1759 my ($self) = @_; 1782 my ($self) = @_;
1760 1783
1761 $self->deactivate_recursive; 1784 $self->deactivate_recursive;
1762 1785
1763 return if $self->map == $LINK_MAP; 1786 return if UNIVERSAL::isa $self->map, "ext::map_link";
1764 1787
1765 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1788 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1766 if $self->map; 1789 if $self->map;
1767 1790
1768 $self->enter_map ($LINK_MAP, 20, 20); 1791 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1769} 1792}
1770 1793
1771sub cf::object::player::leave_link { 1794sub cf::object::player::leave_link {
1772 my ($self, $map, $x, $y) = @_; 1795 my ($self, $map, $x, $y) = @_;
1773 1796
… …
1837=cut 1860=cut
1838 1861
1839sub cf::object::player::goto { 1862sub cf::object::player::goto {
1840 my ($self, $path, $x, $y) = @_; 1863 my ($self, $path, $x, $y) = @_;
1841 1864
1842 $path = new cf::path $path;
1843
1844 $self->enter_link; 1865 $self->enter_link;
1845 1866
1846 (async { 1867 (async {
1868 my $map = eval {
1847 my $map = cf::map::find $path->as_string; 1869 my $map = cf::map::find $path;
1848 $map = $map->customise_for ($self) if $map; 1870 $map = $map->customise_for ($self) if $map;
1849 1871 $map
1850# warn "entering ", $map->path, " at ($x, $y)\n" 1872 } or
1851# if $map;
1852
1853 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1873 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1854 1874
1855 $self->leave_link ($map, $x, $y); 1875 $self->leave_link ($map, $x, $y);
1856 })->prio (1); 1876 })->prio (1);
1857} 1877}
1858 1878
… …
1862 1882
1863sub parse_random_map_params { 1883sub parse_random_map_params {
1864 my ($spec) = @_; 1884 my ($spec) = @_;
1865 1885
1866 my $rmp = { # defaults 1886 my $rmp = { # defaults
1867 xsize => 10, 1887 xsize => (cf::rndm 15, 40),
1868 ysize => 10, 1888 ysize => (cf::rndm 15, 40),
1889 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1890 #layout => string,
1869 }; 1891 };
1870 1892
1871 for (split /\n/, $spec) { 1893 for (split /\n/, $spec) {
1872 my ($k, $v) = split /\s+/, $_, 2; 1894 my ($k, $v) = split /\s+/, $_, 2;
1873 1895
… …
1877 $rmp 1899 $rmp
1878} 1900}
1879 1901
1880sub prepare_random_map { 1902sub prepare_random_map {
1881 my ($exit) = @_; 1903 my ($exit) = @_;
1904
1905 my $guard = cf::lock_acquire "exit_prepare:$exit";
1882 1906
1883 # all this does is basically replace the /! path by 1907 # all this does is basically replace the /! path by
1884 # a new random map path (?random/...) with a seed 1908 # a new random map path (?random/...) with a seed
1885 # that depends on the exit object 1909 # that depends on the exit object
1886 1910
1887 my $rmp = parse_random_map_params $exit->msg; 1911 my $rmp = parse_random_map_params $exit->msg;
1888 1912
1889 if ($exit->map) { 1913 if ($exit->map) {
1890 $rmp->{region} = $exit->map->region_name; 1914 $rmp->{region} = $exit->region->name;
1891 $rmp->{origin_map} = $exit->map->path; 1915 $rmp->{origin_map} = $exit->map->path;
1892 $rmp->{origin_x} = $exit->x; 1916 $rmp->{origin_x} = $exit->x;
1893 $rmp->{origin_y} = $exit->y; 1917 $rmp->{origin_y} = $exit->y;
1894 } 1918 }
1895 1919
1896 $rmp->{random_seed} ||= $exit->random_seed; 1920 $rmp->{random_seed} ||= $exit->random_seed;
1897 1921
1898 my $data = cf::to_json $rmp; 1922 my $data = cf::to_json $rmp;
1899 my $md5 = Digest::MD5::md5_hex $data; 1923 my $md5 = Digest::MD5::md5_hex $data;
1924 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1900 1925
1901 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1926 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1902 aio_write $fh, 0, (length $data), $data, 0; 1927 aio_write $fh, 0, (length $data), $data, 0;
1928 undef $fh;
1929 aio_rename "$meta~", $meta;
1903 1930
1904 $exit->slaying ("?random/$md5"); 1931 $exit->slaying ("?random/$md5");
1905 $exit->msg (undef); 1932 $exit->msg (undef);
1906 } 1933 }
1907} 1934}
1908 1935
1909sub cf::object::player::enter_exit { 1936sub cf::object::player::enter_exit {
1910 my ($self, $exit) = @_; 1937 my ($self, $exit) = @_;
1911 1938
1912 return unless $self->type == cf::PLAYER; 1939 return unless $self->type == cf::PLAYER;
1940
1941 if ($exit->slaying eq "/!") {
1942 #TODO: this should de-fi-ni-te-ly not be a sync-job
1943 cf::sync_job { prepare_random_map $exit };
1944 }
1945
1946 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1947 my $hp = $exit->stats->hp;
1948 my $sp = $exit->stats->sp;
1913 1949
1914 $self->enter_link; 1950 $self->enter_link;
1915 1951
1916 (async { 1952 (async {
1917 $self->deactivate_recursive; # just to be sure 1953 $self->deactivate_recursive; # just to be sure
1918 unless (eval { 1954 unless (eval {
1919 prepare_random_map $exit 1955 $self->goto ($slaying, $hp, $sp);
1920 if $exit->slaying eq "/!";
1921
1922 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1923 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1924 1956
1925 1; 1957 1;
1926 }) { 1958 }) {
1927 $self->message ("Something went wrong deep within the crossfire server. " 1959 $self->message ("Something went wrong deep within the crossfire server. "
1928 . "I'll try to bring you back to the map you were before. " 1960 . "I'll try to bring you back to the map you were before. "
… …
1989 # get handled first 2021 # get handled first
1990 my $queue = delete $ns->{query_queue} 2022 my $queue = delete $ns->{query_queue}
1991 or return; # be conservative, not sure how that can happen, but we saw a crash here 2023 or return; # be conservative, not sure how that can happen, but we saw a crash here
1992 2024
1993 (shift @$queue)->[1]->($msg); 2025 (shift @$queue)->[1]->($msg);
2026 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1994 2027
1995 push @{ $ns->{query_queue} }, @$queue; 2028 push @{ $ns->{query_queue} }, @$queue;
1996 2029
1997 if (@{ $ns->{query_queue} } == @$queue) { 2030 if (@{ $ns->{query_queue} } == @$queue) {
1998 if (@$queue) { 2031 if (@$queue) {
… …
2159The parameter C<$family> should best start with the name of the extension 2192The parameter C<$family> should best start with the name of the extension
2160using it, it should be unique. 2193using it, it should be unique.
2161 2194
2162=over 4 2195=over 4
2163 2196
2164=item $hashref = cf::db_get $family
2165
2166Return a hashref for use by the extension C<$family>, which can be
2167modified. After modifications, you have to call C<cf::db_dirty> or
2168C<cf::db_sync>.
2169
2170=item $value = cf::db_get $family => $key 2197=item $value = cf::db_get $family => $key
2171 2198
2172Returns a single value from the database 2199Returns a single value from the database.
2173
2174=item cf::db_put $family => $hashref
2175
2176Stores the given family hashref into the database. Updates are delayed, if
2177you want the data to be synced to disk immediately, use C<cf::db_sync>.
2178 2200
2179=item cf::db_put $family => $key => $value 2201=item cf::db_put $family => $key => $value
2180 2202
2181Stores the given C<$value> in the family hash. Updates are delayed, if you 2203Stores the given C<$value> in the family.
2182want the data to be synced to disk immediately, use C<cf::db_sync>.
2183
2184=item cf::db_dirty
2185
2186Marks the database as dirty, to be updated at a later time.
2187
2188=item cf::db_sync
2189
2190Immediately write the database to disk I<if it is dirty>.
2191 2204
2192=cut 2205=cut
2193 2206
2194our $DB; 2207our $DB;
2195 2208
2196{ 2209sub db_init {
2210 unless ($DB) {
2211 $DB = BDB::db_create $DB_ENV;
2212
2213 cf::sync_job {
2214 eval {
2215 $DB->set_flags (BDB::CHKSUM);
2216
2217 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2218 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2219 cf::cleanup "db_open(db): $!" if $!;
2220 };
2221 cf::cleanup "db_open(db): $@" if $@;
2222 };
2223
2197 my $path = cf::localdir . "/database.pst"; 2224 my $path = cf::localdir . "/database.pst";
2225 if (stat $path) {
2226 cf::sync_job {
2227 my $pst = Storable::retrieve $path;
2198 2228
2199 sub db_load() { 2229 cf::db_put (board => data => $pst->{board});
2200 $DB = stat $path ? Storable::retrieve $path : { }; 2230 cf::db_put (guildrules => data => $pst->{guildrules});
2201 } 2231 cf::db_put (rent => balance => $pst->{rent}{balance});
2232 BDB::db_env_txn_checkpoint $DB_ENV;
2202 2233
2203 my $pid; 2234 unlink $path;
2204
2205 sub db_save() {
2206 waitpid $pid, 0 if $pid;
2207 if (0 == ($pid = fork)) {
2208 $DB->{_meta}{version} = 1;
2209 Storable::nstore $DB, "$path~";
2210 rename "$path~", $path;
2211 cf::_exit 0 if defined $pid;
2212 } 2235 };
2213 }
2214
2215 my $dirty;
2216
2217 sub db_sync() {
2218 db_save if $dirty;
2219 undef $dirty;
2220 }
2221
2222 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2223 db_sync;
2224 });
2225
2226 sub db_dirty() {
2227 $dirty = 1;
2228 $idle->start;
2229 }
2230
2231 sub db_get($;$) {
2232 @_ >= 2
2233 ? $DB->{$_[0]}{$_[1]}
2234 : ($DB->{$_[0]} ||= { })
2235 }
2236
2237 sub db_put($$;$) {
2238 if (@_ >= 3) {
2239 $DB->{$_[0]}{$_[1]} = $_[2];
2240 } else {
2241 $DB->{$_[0]} = $_[1];
2242 }
2243 db_dirty;
2244 }
2245
2246 cf::global->attach (
2247 prio => 10000,
2248 on_cleanup => sub {
2249 db_sync;
2250 }, 2236 }
2251 ); 2237 }
2238}
2239
2240sub db_get($$) {
2241 my $key = "$_[0]/$_[1]";
2242
2243 cf::sync_job {
2244 BDB::db_get $DB, undef, $key, my $data;
2245
2246 $! ? ()
2247 : Compress::LZF::sthaw $data
2248 }
2249}
2250
2251sub db_put($$$) {
2252 BDB::dbreq_pri 4;
2253 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2252} 2254}
2253 2255
2254############################################################################# 2256#############################################################################
2255# the server's main() 2257# the server's init and main functions
2258
2259sub load_resources {
2260 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2261 or die "unable to load regions file\n";#d#
2262}
2256 2263
2257sub cfg_load { 2264sub cfg_load {
2258 open my $fh, "<:utf8", cf::confdir . "/config" 2265 open my $fh, "<:utf8", cf::confdir . "/config"
2259 or return; 2266 or return;
2260 2267
… …
2273 }; 2280 };
2274 warn $@ if $@; 2281 warn $@ if $@;
2275 } 2282 }
2276} 2283}
2277 2284
2285sub init {
2286 load_resources;
2287}
2288
2278sub main { 2289sub main {
2279 # we must not ever block the main coroutine 2290 # we must not ever block the main coroutine
2280 local $Coro::idle = sub { 2291 local $Coro::idle = sub {
2281 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2292 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2293 (async {
2282 async { Event::one_event }; 2294 Event::one_event;
2295 })->prio (Coro::PRIO_MAX);
2283 }; 2296 };
2284 2297
2285 cfg_load; 2298 cfg_load;
2286 db_load; 2299 db_init;
2287 load_extensions; 2300 load_extensions;
2301
2302 $TICK_WATCHER->start;
2288 Event::loop; 2303 Event::loop;
2289} 2304}
2290 2305
2291############################################################################# 2306#############################################################################
2292# initialisation and cleanup 2307# initialisation and cleanup
2293 2308
2294# install some emergency cleanup handlers 2309# install some emergency cleanup handlers
2295BEGIN { 2310BEGIN {
2296 for my $signal (qw(INT HUP TERM)) { 2311 for my $signal (qw(INT HUP TERM)) {
2297 Event->signal ( 2312 Event->signal (
2313 reentrant => 0,
2298 data => WF_AUTOCANCEL, 2314 data => WF_AUTOCANCEL,
2299 signal => $signal, 2315 signal => $signal,
2316 prio => 0,
2300 cb => sub { 2317 cb => sub {
2301 cf::cleanup "SIG$signal"; 2318 cf::cleanup "SIG$signal";
2302 }, 2319 },
2303 ); 2320 );
2304 } 2321 }
2305} 2322}
… …
2310 warn "enter emergency perl save\n"; 2327 warn "enter emergency perl save\n";
2311 2328
2312 cf::sync_job { 2329 cf::sync_job {
2313 # use a peculiar iteration method to avoid tripping on perl 2330 # use a peculiar iteration method to avoid tripping on perl
2314 # refcount bugs in for. also avoids problems with players 2331 # refcount bugs in for. also avoids problems with players
2315 # and maps saved/Destroyed asynchronously. 2332 # and maps saved/destroyed asynchronously.
2316 warn "begin emergency player save\n"; 2333 warn "begin emergency player save\n";
2317 for my $login (keys %cf::PLAYER) { 2334 for my $login (keys %cf::PLAYER) {
2318 my $pl = $cf::PLAYER{$login} or next; 2335 my $pl = $cf::PLAYER{$login} or next;
2319 $pl->valid or next; 2336 $pl->valid or next;
2320 $pl->save; 2337 $pl->save;
… …
2326 my $map = $cf::MAP{$path} or next; 2343 my $map = $cf::MAP{$path} or next;
2327 $map->valid or next; 2344 $map->valid or next;
2328 $map->save; 2345 $map->save;
2329 } 2346 }
2330 warn "end emergency map save\n"; 2347 warn "end emergency map save\n";
2348
2349 warn "begin emergency database checkpoint\n";
2350 BDB::db_env_txn_checkpoint $DB_ENV;
2351 warn "end emergency database checkpoint\n";
2331 }; 2352 };
2332 2353
2333 warn "leave emergency perl save\n"; 2354 warn "leave emergency perl save\n";
2355}
2356
2357sub post_cleanup {
2358 my ($make_core) = @_;
2359
2360 warn Carp::longmess "post_cleanup backtrace"
2361 if $make_core;
2334} 2362}
2335 2363
2336sub reload() { 2364sub reload() {
2337 # can/must only be called in main 2365 # can/must only be called in main
2338 if ($Coro::current != $Coro::main) { 2366 if ($Coro::current != $Coro::main) {
2339 warn "can only reload from main coroutine\n"; 2367 warn "can only reload from main coroutine";
2340 return; 2368 return;
2341 } 2369 }
2342 2370
2343 warn "reloading..."; 2371 warn "reloading...";
2344 2372
2345 my $guard = freeze_mainloop; 2373 warn "entering sync_job";
2374
2375 cf::sync_job {
2376 cf::write_runtime; # external watchdog should not bark
2346 cf::emergency_save; 2377 cf::emergency_save;
2378 cf::write_runtime; # external watchdog should not bark
2347 2379
2348 eval { 2380 warn "syncing database to disk";
2381 BDB::db_env_txn_checkpoint $DB_ENV;
2382
2349 # if anything goes wrong in here, we should simply crash as we already saved 2383 # if anything goes wrong in here, we should simply crash as we already saved
2350 2384
2351 # cancel all watchers 2385 warn "cancelling all WF_AUTOCANCEL watchers";
2352 for (Event::all_watchers) { 2386 for (Event::all_watchers) {
2353 $_->cancel if $_->data & WF_AUTOCANCEL; 2387 $_->cancel if $_->data & WF_AUTOCANCEL;
2354 } 2388 }
2355 2389
2390 warn "flushing outstanding aio requests";
2391 for (;;) {
2392 BDB::flush;
2393 IO::AIO::flush;
2394 Coro::cede;
2395 last unless IO::AIO::nreqs || BDB::nreqs;
2396 warn "iterate...";
2397 }
2398
2356 # cancel all extension coros 2399 warn "cancelling all extension coros";
2357 $_->cancel for values %EXT_CORO; 2400 $_->cancel for values %EXT_CORO;
2358 %EXT_CORO = (); 2401 %EXT_CORO = ();
2359 2402
2360 # unload all extensions 2403 warn "removing commands";
2361 for (@exts) { 2404 %COMMAND = ();
2405
2406 warn "removing ext commands";
2407 %EXTCMD = ();
2408
2409 warn "unloading/nuking all extensions";
2410 for my $pkg (@EXTS) {
2362 warn "unloading <$_>"; 2411 warn "... unloading $pkg";
2363 unload_extension $_; 2412
2413 if (my $cb = $pkg->can ("unload")) {
2414 eval {
2415 $cb->($pkg);
2416 1
2417 } or warn "$pkg unloaded, but with errors: $@";
2364 } 2418 }
2365 2419
2420 warn "... nuking $pkg";
2421 Symbol::delete_package $pkg;
2422 }
2423
2366 # unload all modules loaded from $LIBDIR 2424 warn "unloading all perl modules loaded from $LIBDIR";
2367 while (my ($k, $v) = each %INC) { 2425 while (my ($k, $v) = each %INC) {
2368 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2426 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2369 2427
2370 warn "removing <$k>"; 2428 warn "... unloading $k";
2371 delete $INC{$k}; 2429 delete $INC{$k};
2372 2430
2373 $k =~ s/\.pm$//; 2431 $k =~ s/\.pm$//;
2374 $k =~ s/\//::/g; 2432 $k =~ s/\//::/g;
2375 2433
… …
2378 } 2436 }
2379 2437
2380 Symbol::delete_package $k; 2438 Symbol::delete_package $k;
2381 } 2439 }
2382 2440
2383 # sync database to disk
2384 cf::db_sync;
2385 IO::AIO::flush;
2386
2387 # get rid of safe::, as good as possible 2441 warn "getting rid of safe::, as good as possible";
2388 Symbol::delete_package "safe::$_" 2442 Symbol::delete_package "safe::$_"
2389 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2443 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2390 2444
2391 # remove register_script_function callbacks
2392 # TODO
2393
2394 # unload cf.pm "a bit" 2445 warn "unloading cf.pm \"a bit\"";
2395 delete $INC{"cf.pm"}; 2446 delete $INC{"cf.pm"};
2396 2447
2397 # don't, removes xs symbols, too, 2448 # don't, removes xs symbols, too,
2398 # and global variables created in xs 2449 # and global variables created in xs
2399 #Symbol::delete_package __PACKAGE__; 2450 #Symbol::delete_package __PACKAGE__;
2400 2451
2401 # reload cf.pm 2452 warn "unload completed, starting to reload now";
2453
2402 warn "reloading cf.pm"; 2454 warn "reloading cf.pm";
2403 require cf; 2455 require cf;
2404 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2456 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2405 2457
2406 # load config and database again 2458 warn "loading config and database again";
2407 cf::cfg_load; 2459 cf::cfg_load;
2408 cf::db_load;
2409 2460
2410 # load extensions
2411 warn "load extensions"; 2461 warn "loading extensions";
2412 cf::load_extensions; 2462 cf::load_extensions;
2413 2463
2414 # reattach attachments to objects 2464 warn "reattaching attachments to objects/players";
2415 warn "reattach";
2416 _global_reattach; 2465 _global_reattach;
2466 warn "reattaching attachments to maps";
2417 reattach $_ for values %MAP; 2467 reattach $_ for values %MAP;
2418 };
2419 2468
2420 if ($@) { 2469 warn "loading reloadable resources";
2470 load_resources;
2471
2472 warn "leaving sync_job";
2473
2474 1
2475 } or do {
2421 warn $@; 2476 warn $@;
2422 warn "error while reloading, exiting."; 2477 warn "error while reloading, exiting.";
2423 exit 1; 2478 exit 1;
2424 } 2479 };
2425 2480
2426 warn "reloaded successfully"; 2481 warn "reloaded";
2427}; 2482};
2428 2483
2429############################################################################# 2484our $RELOAD_WATCHER; # used only during reload
2430
2431unless ($LINK_MAP) {
2432 $LINK_MAP = cf::map::new;
2433
2434 $LINK_MAP->width (41);
2435 $LINK_MAP->height (41);
2436 $LINK_MAP->alloc;
2437 $LINK_MAP->path ("{link}");
2438 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2439 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2440
2441 # dirty hack because... archetypes are not yet loaded
2442 Event->timer (
2443 after => 10,
2444 cb => sub {
2445 $_[0]->w->cancel;
2446
2447 # provide some exits "home"
2448 my $exit = cf::object::new "exit";
2449
2450 $exit->slaying ($EMERGENCY_POSITION->[0]);
2451 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2452 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2453
2454 $LINK_MAP->insert ($exit->clone, 19, 19);
2455 $LINK_MAP->insert ($exit->clone, 19, 20);
2456 $LINK_MAP->insert ($exit->clone, 19, 21);
2457 $LINK_MAP->insert ($exit->clone, 20, 19);
2458 $LINK_MAP->insert ($exit->clone, 20, 21);
2459 $LINK_MAP->insert ($exit->clone, 21, 19);
2460 $LINK_MAP->insert ($exit->clone, 21, 20);
2461 $LINK_MAP->insert ($exit->clone, 21, 21);
2462
2463 $exit->destroy;
2464 });
2465
2466 $LINK_MAP->{deny_save} = 1;
2467 $LINK_MAP->{deny_reset} = 1;
2468
2469 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2470}
2471
2472register "<global>", __PACKAGE__;
2473 2485
2474register_command "reload" => sub { 2486register_command "reload" => sub {
2475 my ($who, $arg) = @_; 2487 my ($who, $arg) = @_;
2476 2488
2477 if ($who->flag (FLAG_WIZ)) { 2489 if ($who->flag (FLAG_WIZ)) {
2478 $who->message ("start of reload."); 2490 $who->message ("reloading server.");
2491
2492 # doing reload synchronously and two reloads happen back-to-back,
2493 # coro crashes during coro_state_free->destroy here.
2494
2495 $RELOAD_WATCHER ||= Event->timer (
2496 reentrant => 0,
2497 after => 0,
2498 data => WF_AUTOCANCEL,
2499 cb => sub {
2479 reload; 2500 reload;
2480 $who->message ("end of reload."); 2501 undef $RELOAD_WATCHER;
2502 },
2503 );
2481 } 2504 }
2482}; 2505};
2483 2506
2484unshift @INC, $LIBDIR; 2507unshift @INC, $LIBDIR;
2508
2509my $bug_warning = 0;
2485 2510
2486$TICK_WATCHER = Event->timer ( 2511$TICK_WATCHER = Event->timer (
2487 reentrant => 0, 2512 reentrant => 0,
2513 parked => 1,
2488 prio => 0, 2514 prio => 0,
2489 at => $NEXT_TICK || $TICK, 2515 at => $NEXT_TICK || $TICK,
2490 data => WF_AUTOCANCEL, 2516 data => WF_AUTOCANCEL,
2491 cb => sub { 2517 cb => sub {
2518 if ($Coro::current != $Coro::main) {
2519 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2520 unless ++$bug_warning > 10;
2521 return;
2522 }
2523
2524 $NOW = Event::time;
2525
2492 cf::server_tick; # one server iteration 2526 cf::server_tick; # one server iteration
2493 $RUNTIME += $TICK; 2527 $RUNTIME += $TICK;
2494 $NEXT_TICK += $TICK; 2528 $NEXT_TICK += $TICK;
2495 2529
2530 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2531 $NEXT_RUNTIME_WRITE = $NOW + 10;
2532 Coro::async_pool {
2533 write_runtime
2534 or warn "ERROR: unable to write runtime file: $!";
2535 };
2536 }
2537
2538
2496 $WAIT_FOR_TICK->broadcast; 2539 $WAIT_FOR_TICK->broadcast;
2497 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2540 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2541
2542# my $AFTER = Event::time;
2543# warn $AFTER - $NOW;#d#
2498 2544
2499 # if we are delayed by four ticks or more, skip them all 2545 # if we are delayed by four ticks or more, skip them all
2500 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2546 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2501 2547
2502 $TICK_WATCHER->at ($NEXT_TICK); 2548 $TICK_WATCHER->at ($NEXT_TICK);
2503 $TICK_WATCHER->start; 2549 $TICK_WATCHER->start;
2504 }, 2550 },
2505); 2551);
2506 2552
2553{
2507IO::AIO::max_poll_time $TICK * 0.2; 2554 BDB::max_poll_time $TICK * 0.1;
2508 2555 $BDB_POLL_WATCHER = Event->io (
2509Event->io ( 2556 reentrant => 0,
2510 fd => IO::AIO::poll_fileno, 2557 fd => BDB::poll_fileno,
2511 poll => 'r', 2558 poll => 'r',
2512 prio => 5, 2559 prio => 0,
2513 data => WF_AUTOCANCEL,
2514 cb => \&IO::AIO::poll_cb,
2515);
2516
2517Event->timer (
2518 data => WF_AUTOCANCEL, 2560 data => WF_AUTOCANCEL,
2519 after => 0, 2561 cb => \&BDB::poll_cb,
2520 interval => 10, 2562 );
2521 cb => sub { 2563 BDB::min_parallel 8;
2522 (Coro::unblock_sub { 2564
2523 write_runtime 2565 BDB::set_sync_prepare {
2524 or warn "ERROR: unable to write runtime file: $!"; 2566 my $status;
2567 my $current = $Coro::current;
2568 (
2569 sub {
2570 $status = $!;
2571 $current->ready; undef $current;
2572 },
2573 sub {
2574 Coro::schedule while defined $current;
2575 $! = $status;
2576 },
2577 )
2578 };
2579
2580 unless ($DB_ENV) {
2581 $DB_ENV = BDB::db_env_create;
2582
2583 cf::sync_job {
2584 eval {
2585 BDB::db_env_open
2586 $DB_ENV,
2587 $BDB_ENV_DIR,
2588 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2589 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2590 0666;
2591
2592 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2593
2594 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2595 $DB_ENV->set_lk_detect;
2596 };
2597
2598 cf::cleanup "db_env_open(db): $@" if $@;
2525 })->(); 2599 };
2526 }, 2600 }
2527); 2601}
2602
2603{
2604 IO::AIO::min_parallel 8;
2605
2606 undef $Coro::AIO::WATCHER;
2607 IO::AIO::max_poll_time $TICK * 0.1;
2608 $AIO_POLL_WATCHER = Event->io (
2609 reentrant => 0,
2610 data => WF_AUTOCANCEL,
2611 fd => IO::AIO::poll_fileno,
2612 poll => 'r',
2613 prio => 6,
2614 cb => \&IO::AIO::poll_cb,
2615 );
2616}
2528 2617
2529END { cf::emergency_save } 2618END { cf::emergency_save }
2530 2619
25311 26201
2532 2621

Diff Legend

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