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

Diff Legend

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