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.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
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 387
490############################################################################# 388#############################################################################
491 389
492=head2 ATTACHABLE OBJECTS 390=head2 ATTACHABLE OBJECTS
493 391
… …
619our @CB_TYPE = (); # registry for type (cf-object class) based events 517our @CB_TYPE = (); # registry for type (cf-object class) based events
620our @CB_MAP = (); 518our @CB_MAP = ();
621 519
622my %attachment; 520my %attachment;
623 521
522sub cf::attachable::thawer_merge {
523 # simply override everything except _meta
524 local $_[0]{_meta};
525 %{$_[0]} = %{$_[1]};
526}
527
624sub _attach_cb($$$$) { 528sub _attach_cb($$$$) {
625 my ($registry, $event, $prio, $cb) = @_; 529 my ($registry, $event, $prio, $cb) = @_;
626 530
627 use sort 'stable'; 531 use sort 'stable';
628 532
… …
799# object support 703# object support
800 704
801sub reattach { 705sub reattach {
802 # basically do the same as instantiate, without calling instantiate 706 # basically do the same as instantiate, without calling instantiate
803 my ($obj) = @_; 707 my ($obj) = @_;
708
709 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
804 710
805 my $registry = $obj->registry; 711 my $registry = $obj->registry;
806 712
807 @$registry = (); 713 @$registry = ();
808 714
… …
855 $filename, length $$rdata, scalar @$objs; 761 $filename, length $$rdata, scalar @$objs;
856 762
857 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 763 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
858 chmod SAVE_MODE, $fh; 764 chmod SAVE_MODE, $fh;
859 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 765 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
860 aio_fsync $fh; 766 aio_fsync $fh if $cf::USE_FSYNC;
861 close $fh; 767 close $fh;
862 768
863 if (@$objs) { 769 if (@$objs) {
864 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) {
865 chmod SAVE_MODE, $fh; 771 chmod SAVE_MODE, $fh;
866 my $data = Storable::nfreeze { version => 1, objs => $objs }; 772 my $data = Storable::nfreeze { version => 1, objs => $objs };
867 aio_write $fh, 0, (length $data), $data, 0; 773 aio_write $fh, 0, (length $data), $data, 0;
868 aio_fsync $fh; 774 aio_fsync $fh if $cf::USE_FSYNC;
869 close $fh; 775 close $fh;
870 aio_rename "$filename.pst~", "$filename.pst"; 776 aio_rename "$filename.pst~", "$filename.pst";
871 } 777 }
872 } else { 778 } else {
873 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
… …
879 } 785 }
880 } else { 786 } else {
881 aio_unlink $filename; 787 aio_unlink $filename;
882 aio_unlink "$filename.pst"; 788 aio_unlink "$filename.pst";
883 } 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 }
884 } 796 }
885} 797}
886 798
887sub object_freezer_as_string { 799sub object_freezer_as_string {
888 my ($rdata, $objs) = @_; 800 my ($rdata, $objs) = @_;
… …
894 806
895sub object_thawer_load { 807sub object_thawer_load {
896 my ($filename) = @_; 808 my ($filename) = @_;
897 809
898 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$//;
899 814
900 (aio_load $filename, $data) >= 0 815 (aio_load $filename, $data) >= 0
901 or return; 816 or return;
902 817
903 unless (aio_stat "$filename.pst") { 818 unless (aio_stat "$filename.pst") {
… …
940=cut 855=cut
941 856
942sub register_extcmd { 857sub register_extcmd {
943 my ($name, $cb) = @_; 858 my ($name, $cb) = @_;
944 859
945 my $caller = caller;
946 #warn "registering extcmd '$name' to '$caller'";
947
948 $EXTCMD{$name} = [$cb, $caller]; 860 $EXTCMD{$name} = $cb;
949} 861}
950 862
951cf::player->attach ( 863cf::player->attach (
952 on_command => sub { 864 on_command => sub {
953 my ($pl, $name, $params) = @_; 865 my ($pl, $name, $params) = @_;
… …
966 878
967 my $msg = eval { from_json $buf }; 879 my $msg = eval { from_json $buf };
968 880
969 if (ref $msg) { 881 if (ref $msg) {
970 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 882 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
971 if (my %reply = $cb->[0]->($pl, $msg)) { 883 if (my %reply = $cb->($pl, $msg)) {
972 $pl->ext_reply ($msg->{msgid}, %reply); 884 $pl->ext_reply ($msg->{msgid}, %reply);
973 } 885 }
974 } 886 }
975 } else { 887 } else {
976 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 888 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
… …
978 890
979 cf::override; 891 cf::override;
980 }, 892 },
981); 893);
982 894
983sub register {
984 my ($base, $pkg) = @_;
985
986 #TODO
987}
988
989sub load_extension { 895sub load_extension {
990 my ($path) = @_; 896 my ($path) = @_;
991 897
992 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 898 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
993 my $base = $1; 899 my $base = $1;
994 my $pkg = $1; 900 my $pkg = $1;
995 $pkg =~ s/[^[:word:]]/_/g; 901 $pkg =~ s/[^[:word:]]/_/g;
996 $pkg = "ext::$pkg"; 902 $pkg = "ext::$pkg";
997 903
998 warn "loading '$path' into '$pkg'\n"; 904 warn "... loading '$path' into '$pkg'\n";
999 905
1000 open my $fh, "<:utf8", $path 906 open my $fh, "<:utf8", $path
1001 or die "$path: $!"; 907 or die "$path: $!";
1002 908
1003 my $source = 909 my $source =
1004 "package $pkg; use strict; use utf8;\n" 910 "package $pkg; use strict; use utf8;\n"
1005 . "#line 1 \"$path\"\n{\n" 911 . "#line 1 \"$path\"\n{\n"
1006 . (do { local $/; <$fh> }) 912 . (do { local $/; <$fh> })
1007 . "\n};\n1"; 913 . "\n};\n1";
1008 914
1009 eval $source 915 unless (eval $source) {
1010 or die $@ ? "$path: $@\n" 916 my $msg = $@ ? "$path: $@\n"
1011 : "extension disabled.\n"; 917 : "extension disabled.\n";
1012 918 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
1013 push @exts, $pkg; 919 warn $@;
1014 $ext_pkg{$base} = $pkg; 920 warn "mandatory extension failed to load, exiting.\n";
1015 921 exit 1;
1016# no strict 'refs'; 922 }
1017# @{"$pkg\::ISA"} = ext::; 923 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# } 924 }
1032 925
1033 # remove commands 926 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} 927}
1058 928
1059sub load_extensions { 929sub load_extensions {
1060 for my $ext (<$LIBDIR/*.ext>) { 930 for my $ext (<$LIBDIR/*.ext>) {
1061 next unless -r $ext; 931 next unless -r $ext;
… …
1065 } or warn "$ext not loaded: $@"; 935 } or warn "$ext not loaded: $@";
1066 } 936 }
1067} 937}
1068 938
1069############################################################################# 939#############################################################################
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 940
1085=head2 CORE EXTENSIONS 941=head2 CORE EXTENSIONS
1086 942
1087Functions and methods that extend core crossfire objects. 943Functions and methods that extend core crossfire objects.
1088 944
… …
1124 980
1125sub exists($) { 981sub exists($) {
1126 my ($login) = @_; 982 my ($login) = @_;
1127 983
1128 $cf::PLAYER{$login} 984 $cf::PLAYER{$login}
1129 or cf::sync_job { !aio_stat $login } 985 or cf::sync_job { !aio_stat path $login }
1130} 986}
1131 987
1132sub find($) { 988sub find($) {
1133 return $cf::PLAYER{$_[0]} || do { 989 return $cf::PLAYER{$_[0]} || do {
1134 my $login = $_[0]; 990 my $login = $_[0];
… …
1224 \@logins 1080 \@logins
1225} 1081}
1226 1082
1227=item $player->maps 1083=item $player->maps
1228 1084
1229Returns 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
1230player. May block. 1086player. May block.
1231 1087
1232=cut 1088=cut
1233 1089
1234sub maps($) { 1090sub maps($) {
1235 my ($pl) = @_; 1091 my ($pl) = @_;
1092
1093 $pl = ref $pl ? $pl->ob->name : $pl;
1236 1094
1237 my $files = aio_readdir playerdir $pl 1095 my $files = aio_readdir playerdir $pl
1238 or return; 1096 or return;
1239 1097
1240 my @paths; 1098 my @paths;
1241 1099
1242 for (@$files) { 1100 for (@$files) {
1243 utf8::decode $_; 1101 utf8::decode $_;
1244 next if /\.(?:pl|pst)$/; 1102 next if /\.(?:pl|pst)$/;
1245 next unless /^$PATH_SEP/; 1103 next unless /^$PATH_SEP/o;
1246 1104
1247 s/$PATH_SEP/\//g; 1105 push @paths, cf::map::normalise "~$pl/$_";
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1249 } 1106 }
1250 1107
1251 \@paths 1108 \@paths
1252} 1109}
1253 1110
… …
1279package cf::map; 1136package cf::map;
1280 1137
1281use Fcntl; 1138use Fcntl;
1282use Coro::AIO; 1139use Coro::AIO;
1283 1140
1141use overload
1142 '""' => \&as_string,
1143 fallback => 1;
1144
1284our $MAX_RESET = 3600; 1145our $MAX_RESET = 3600;
1285our $DEFAULT_RESET = 3000; 1146our $DEFAULT_RESET = 3000;
1286 1147
1287sub generate_random_map { 1148sub generate_random_map {
1288 my ($path, $rmp) = @_; 1149 my ($self, $rmp) = @_;
1289
1290 # mit "rum" bekleckern, nicht 1150 # mit "rum" bekleckern, nicht
1291 cf::map::_create_random_map 1151 $self->_create_random_map (
1292 $path,
1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1152 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1153 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1154 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296 $rmp->{exit_on_final_map}, 1155 $rmp->{exit_on_final_map},
1297 $rmp->{xsize}, $rmp->{ysize}, 1156 $rmp->{xsize}, $rmp->{ysize},
1298 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1157 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1299 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1158 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1300 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1159 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1301 $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},
1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1161 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303 (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
1304} 1293}
1305 1294
1306# and all this just because we cannot iterate over 1295# and all this just because we cannot iterate over
1307# all maps in C++... 1296# all maps in C++...
1308sub change_all_map_light { 1297sub change_all_map_light {
… …
1310 1299
1311 $_->change_map_light ($change) 1300 $_->change_map_light ($change)
1312 for grep $_->outdoor, values %cf::MAP; 1301 for grep $_->outdoor, values %cf::MAP;
1313} 1302}
1314 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
1315sub try_load_header($) { 1317sub load_header_from($) {
1316 my ($path) = @_; 1318 my ($self, $path) = @_;
1317 1319
1318 utf8::encode $path; 1320 utf8::encode $path;
1319 aio_open $path, O_RDONLY, 0 1321 #aio_open $path, O_RDONLY, 0
1322 # or return;
1323
1324 $self->_load_header ($path)
1320 or return; 1325 or return;
1321 1326
1322 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
1323 or return; 1370 or return;
1371 $self->prepare_orig;
1372 }
1324 1373
1325 # for better error messages only, will be overwritten 1374 1
1326 $map->path ($path);
1327
1328 $map->load_header ($path)
1329 or return;
1330
1331 $map->{load_path} = $path;
1332
1333 $map
1334} 1375}
1335 1376
1336sub find; 1377sub find;
1337sub find { 1378sub find {
1338 my ($path, $origin) = @_; 1379 my ($path, $origin) = @_;
1339 1380
1340 #warn "find<$path,$origin>\n";#d#
1341
1342 $path = new cf::path $path, $origin && $origin->path; 1381 $path = normalise $path, $origin && $origin->path;
1343 my $key = $path->as_string;
1344 1382
1345 cf::lock_wait "map_find:$key"; 1383 cf::lock_wait "map_find:$path";
1346 1384
1347 $cf::MAP{$key} || do { 1385 $cf::MAP{$path} || do {
1348 my $guard = cf::lock_acquire "map_find:$key"; 1386 my $guard = cf::lock_acquire "map_find:$path";
1349 1387 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; 1388 or return;
1369 1389
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; 1390 $map->{last_save} = $cf::RUNTIME;
1382 1391
1383 Coro::cede; 1392 $map->load_header
1393 or return;
1384 1394
1385 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;
1386 $map->reset; 1398 $map->reset;
1387 undef $guard; 1399 undef $guard;
1388 $map = find $path 1400 return find $path;
1389 or return;
1390 } 1401 }
1391 1402
1392 $cf::MAP{$key} = $map 1403 $cf::MAP{$path} = $map
1393 } 1404 }
1394} 1405}
1406
1407sub pre_load { }
1408sub post_load { }
1395 1409
1396sub load { 1410sub load {
1397 my ($self) = @_; 1411 my ($self) = @_;
1398 1412
1413 local $self->{deny_reset} = 1; # loading can take a long time
1414
1399 my $path = $self->{path}; 1415 my $path = $self->{path};
1400 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1416 my $guard = cf::lock_acquire "map_load:$path";
1401 1417
1402 return if $self->in_memory != cf::MAP_SWAPPED; 1418 return if $self->in_memory != cf::MAP_SWAPPED;
1403 1419
1404 $self->in_memory (cf::MAP_LOADING); 1420 $self->in_memory (cf::MAP_LOADING);
1405 1421
1406 $self->alloc; 1422 $self->alloc;
1423
1424 $self->pre_load;
1425
1407 $self->load_objects ($self->{load_path}, 1) 1426 $self->_load_objects ($self->{load_path}, 1)
1408 or return; 1427 or return;
1409 1428
1410 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1429 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1411 if delete $self->{load_original}; 1430 if delete $self->{load_original};
1412 1431
1413 if (my $uniq = $path->uniq_path) { 1432 if (my $uniq = $self->uniq_path) {
1414 utf8::encode $uniq; 1433 utf8::encode $uniq;
1415 if (aio_open $uniq, O_RDONLY, 0) { 1434 if (aio_open $uniq, O_RDONLY, 0) {
1416 $self->clear_unique_items; 1435 $self->clear_unique_items;
1417 $self->load_objects ($uniq, 0); 1436 $self->_load_objects ($uniq, 0);
1418 } 1437 }
1419 } 1438 }
1420 1439
1421 Coro::cede; 1440 Coro::cede;
1422 1441
1423 # now do the right thing for maps 1442 # now do the right thing for maps
1424 $self->link_multipart_objects; 1443 $self->link_multipart_objects;
1425 1444
1426 if ($self->{path}->is_style_map) { 1445 unless ($self->{deny_activate}) {
1427 $self->{deny_save} = 1; 1446 $self->decay_objects;
1428 $self->{deny_reset} = 1;
1429 } else {
1430 $self->fix_auto_apply; 1447 $self->fix_auto_apply;
1431 $self->decay_objects;
1432 $self->update_buttons; 1448 $self->update_buttons;
1449 Coro::cede;
1433 $self->set_darkness_map; 1450 $self->set_darkness_map;
1434 $self->difficulty ($self->estimate_difficulty) 1451 $self->difficulty ($self->estimate_difficulty)
1435 unless $self->difficulty; 1452 unless $self->difficulty;
1453 Coro::cede;
1436 $self->activate; 1454 $self->activate;
1437 } 1455 }
1438 1456
1439 Coro::cede; 1457 $self->post_load;
1440 1458
1441 $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
1442} 1469}
1443 1470
1444# 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
1445sub load_diag { 1472sub load_diag {
1446 my ($map) = @_; 1473 my ($map) = @_;
… …
1476 1503
1477 cf::sync_job { $map->load }; 1504 cf::sync_job { $map->load };
1478} 1505}
1479 1506
1480our %MAP_PREFETCH; 1507our %MAP_PREFETCH;
1481our $MAP_PREFETCHER = Coro::async { 1508our $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 1509
1496sub find_async { 1510sub find_async {
1497 my ($path, $origin) = @_; 1511 my ($path, $origin) = @_;
1498 1512
1499 $path = new cf::path $path, $origin && $origin->path; 1513 $path = normalise $path, $origin && $origin->{path};
1500 my $key = $path->as_string;
1501 1514
1502 if (my $map = $cf::MAP{$key}) { 1515 if (my $map = $cf::MAP{$path}) {
1503 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1516 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1504 } 1517 }
1505 1518
1506 $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 };
1507 $MAP_PREFETCHER->ready; 1532 $MAP_PREFETCHER->prio (6);
1508 1533
1509 () 1534 ()
1510} 1535}
1511 1536
1512sub save { 1537sub save {
… …
1516 1541
1517 $self->{last_save} = $cf::RUNTIME; 1542 $self->{last_save} = $cf::RUNTIME;
1518 1543
1519 return unless $self->dirty; 1544 return unless $self->dirty;
1520 1545
1521 my $save = $self->{path}->save_path; utf8::encode $save; 1546 my $save = $self->save_path; utf8::encode $save;
1522 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1547 my $uniq = $self->uniq_path; utf8::encode $uniq;
1523 1548
1524 $self->{load_path} = $save; 1549 $self->{load_path} = $save;
1525 1550
1526 return if $self->{deny_save}; 1551 return if $self->{deny_save};
1527 1552
… …
1530 cf::async { 1555 cf::async {
1531 $_->contr->save for $self->players; 1556 $_->contr->save for $self->players;
1532 }; 1557 };
1533 1558
1534 if ($uniq) { 1559 if ($uniq) {
1535 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1560 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1536 $self->save_objects ($uniq, cf::IO_UNIQUES); 1561 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1537 } else { 1562 } else {
1538 $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);
1539 } 1564 }
1540} 1565}
1541 1566
1542sub swap_out { 1567sub swap_out {
1543 my ($self) = @_; 1568 my ($self) = @_;
… …
1557 1582
1558sub reset_at { 1583sub reset_at {
1559 my ($self) = @_; 1584 my ($self) = @_;
1560 1585
1561 # TODO: safety, remove and allow resettable per-player maps 1586 # TODO: safety, remove and allow resettable per-player maps
1562 return 1e99 if $self->{path}{user_rel}; 1587 return 1e99 if $self->isa ("ext::map_per_player");#d#
1563 return 1e99 if $self->{deny_reset}; 1588 return 1e99 if $self->{deny_reset};
1564 1589
1565 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1590 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1566 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;
1567 1592
… …
1572 my ($self) = @_; 1597 my ($self) = @_;
1573 1598
1574 $self->reset_at <= $cf::RUNTIME 1599 $self->reset_at <= $cf::RUNTIME
1575} 1600}
1576 1601
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 { 1602sub reset {
1599 my ($self) = @_; 1603 my ($self) = @_;
1600 1604
1601 my $lock = cf::lock_acquire "map_data:" . $self->path; 1605 my $lock = cf::lock_acquire "map_data:$self->{path}";
1602 1606
1603 return if $self->players; 1607 return if $self->players;
1604 return if $self->{path}{user_rel};#d# 1608 return if $self->isa ("ext::map_per_player");#d#
1605 1609
1606 warn "resetting map ", $self->path;#d# 1610 warn "resetting map ", $self->path;#d#
1607 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
1608 delete $cf::MAP{$self->path}; 1622 delete $cf::MAP{$self->path};
1623
1624 $self->clear;
1609 1625
1610 $_->clear_links_to ($self) for values %cf::MAP; 1626 $_->clear_links_to ($self) for values %cf::MAP;
1611 1627
1612 $self->unlink_save; 1628 $self->unlink_save;
1613 $self->destroy; 1629 $self->destroy;
… …
1616my $nuke_counter = "aaaa"; 1632my $nuke_counter = "aaaa";
1617 1633
1618sub nuke { 1634sub nuke {
1619 my ($self) = @_; 1635 my ($self) = @_;
1620 1636
1637 delete $cf::MAP{$self->path};
1638
1639 $self->unlink_save;
1640
1641 bless $self, "cf::map";
1642 delete $self->{deny_reset};
1621 $self->{deny_save} = 1; 1643 $self->{deny_save} = 1;
1622 $self->reset_timeout (1); 1644 $self->reset_timeout (1);
1623 $self->rename ("{nuke}/" . ($nuke_counter++)); 1645 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1646
1647 $cf::MAP{$self->path} = $self;
1648
1624 $self->reset; # polite request, might not happen 1649 $self->reset; # polite request, might not happen
1625} 1650}
1626 1651
1627sub customise_for { 1652=item cf::map::unique_maps
1628 my ($map, $ob) = @_;
1629 1653
1630 if ($map->per_player) { 1654Returns an arrayref of paths of all shared maps that have
1631 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1655instantiated unique items. May block.
1632 }
1633 1656
1634 $map 1657=cut
1658
1659sub unique_maps() {
1660 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1661 or return;
1662
1663 my @paths;
1664
1665 for (@$files) {
1666 utf8::decode $_;
1667 next if /\.pst$/;
1668 next unless /^$PATH_SEP/o;
1669
1670 push @paths, cf::map::normalise $_;
1671 }
1672
1673 \@paths
1635} 1674}
1636 1675
1637package cf; 1676package cf;
1638 1677
1639=back 1678=back
… …
1711 1750
1712=item $player_object->enter_link 1751=item $player_object->enter_link
1713 1752
1714Freezes 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}>).
1715 1754
1716The 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
1717I<MUST> call C<leave_link> as soon as possible, though. 1756I<MUST> call C<leave_link> as soon as possible, though.
1718 1757
1758Will never block.
1759
1719=item $player_object->leave_link ($map, $x, $y) 1760=item $player_object->leave_link ($map, $x, $y)
1720 1761
1721Moves 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
1722map 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
1723location 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
1724to the emergency map position. 1765fails, to the emergency map position.
1725 1766
1726Might block. 1767Might block.
1727 1768
1728=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}
1729 1780
1730sub cf::object::player::enter_link { 1781sub cf::object::player::enter_link {
1731 my ($self) = @_; 1782 my ($self) = @_;
1732 1783
1733 $self->deactivate_recursive; 1784 $self->deactivate_recursive;
1734 1785
1735 return if $self->map == $LINK_MAP; 1786 return if UNIVERSAL::isa $self->map, "ext::map_link";
1736 1787
1737 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1788 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1738 if $self->map; 1789 if $self->map;
1739 1790
1740 $self->enter_map ($LINK_MAP, 20, 20); 1791 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1741} 1792}
1742 1793
1743sub cf::object::player::leave_link { 1794sub cf::object::player::leave_link {
1744 my ($self, $map, $x, $y) = @_; 1795 my ($self, $map, $x, $y) = @_;
1745 1796
… …
1809=cut 1860=cut
1810 1861
1811sub cf::object::player::goto { 1862sub cf::object::player::goto {
1812 my ($self, $path, $x, $y) = @_; 1863 my ($self, $path, $x, $y) = @_;
1813 1864
1814 $path = new cf::path $path;
1815 $path ne "/" or Carp::cluck ("oy");#d#
1816
1817 $self->enter_link; 1865 $self->enter_link;
1818 1866
1819 (async { 1867 (async {
1868 my $map = eval {
1820 my $map = cf::map::find $path->as_string; 1869 my $map = cf::map::find $path;
1821 $map = $map->customise_for ($self) if $map; 1870 $map = $map->customise_for ($self) if $map;
1822 1871 $map
1823# warn "entering ", $map->path, " at ($x, $y)\n" 1872 } or
1824# if $map;
1825
1826 $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);
1827 1874
1828 $self->leave_link ($map, $x, $y); 1875 $self->leave_link ($map, $x, $y);
1829 })->prio (1); 1876 })->prio (1);
1830} 1877}
1831 1878
… …
1835 1882
1836sub parse_random_map_params { 1883sub parse_random_map_params {
1837 my ($spec) = @_; 1884 my ($spec) = @_;
1838 1885
1839 my $rmp = { # defaults 1886 my $rmp = { # defaults
1840 xsize => 10, 1887 xsize => (cf::rndm 15, 40),
1841 ysize => 10, 1888 ysize => (cf::rndm 15, 40),
1889 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1890 #layout => string,
1842 }; 1891 };
1843 1892
1844 for (split /\n/, $spec) { 1893 for (split /\n/, $spec) {
1845 my ($k, $v) = split /\s+/, $_, 2; 1894 my ($k, $v) = split /\s+/, $_, 2;
1846 1895
… …
1850 $rmp 1899 $rmp
1851} 1900}
1852 1901
1853sub prepare_random_map { 1902sub prepare_random_map {
1854 my ($exit) = @_; 1903 my ($exit) = @_;
1904
1905 my $guard = cf::lock_acquire "exit_prepare:$exit";
1855 1906
1856 # all this does is basically replace the /! path by 1907 # all this does is basically replace the /! path by
1857 # a new random map path (?random/...) with a seed 1908 # a new random map path (?random/...) with a seed
1858 # that depends on the exit object 1909 # that depends on the exit object
1859 1910
1860 my $rmp = parse_random_map_params $exit->msg; 1911 my $rmp = parse_random_map_params $exit->msg;
1861 1912
1862 if ($exit->map) { 1913 if ($exit->map) {
1863 $rmp->{region} = $exit->map->region_name; 1914 $rmp->{region} = $exit->region->name;
1864 $rmp->{origin_map} = $exit->map->path; 1915 $rmp->{origin_map} = $exit->map->path;
1865 $rmp->{origin_x} = $exit->x; 1916 $rmp->{origin_x} = $exit->x;
1866 $rmp->{origin_y} = $exit->y; 1917 $rmp->{origin_y} = $exit->y;
1867 } 1918 }
1868 1919
1869 $rmp->{random_seed} ||= $exit->random_seed; 1920 $rmp->{random_seed} ||= $exit->random_seed;
1870 1921
1871 my $data = cf::to_json $rmp; 1922 my $data = cf::to_json $rmp;
1872 my $md5 = Digest::MD5::md5_hex $data; 1923 my $md5 = Digest::MD5::md5_hex $data;
1924 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1873 1925
1874 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) {
1875 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;
1876 1930
1877 $exit->slaying ("?random/$md5"); 1931 $exit->slaying ("?random/$md5");
1878 $exit->msg (undef); 1932 $exit->msg (undef);
1879 } 1933 }
1880} 1934}
1881 1935
1882sub cf::object::player::enter_exit { 1936sub cf::object::player::enter_exit {
1883 my ($self, $exit) = @_; 1937 my ($self, $exit) = @_;
1884 1938
1885 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;
1886 1949
1887 $self->enter_link; 1950 $self->enter_link;
1888 1951
1889 (async { 1952 (async {
1890 $self->deactivate_recursive; # just to be sure 1953 $self->deactivate_recursive; # just to be sure
1891 unless (eval { 1954 unless (eval {
1892 prepare_random_map $exit 1955 $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 1956
1898 1; 1957 1;
1899 }) { 1958 }) {
1900 $self->message ("Something went wrong deep within the crossfire server. " 1959 $self->message ("Something went wrong deep within the crossfire server. "
1901 . "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. "
1902 . "Please report this to the dungeon master", 1961 . "Please report this to the dungeon master!",
1903 cf::NDI_UNIQUE | cf::NDI_RED); 1962 cf::NDI_UNIQUE | cf::NDI_RED);
1904 1963
1905 warn "ERROR in enter_exit: $@"; 1964 warn "ERROR in enter_exit: $@";
1906 $self->leave_link; 1965 $self->leave_link;
1907 } 1966 }
… …
1962 # get handled first 2021 # get handled first
1963 my $queue = delete $ns->{query_queue} 2022 my $queue = delete $ns->{query_queue}
1964 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
1965 2024
1966 (shift @$queue)->[1]->($msg); 2025 (shift @$queue)->[1]->($msg);
2026 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1967 2027
1968 push @{ $ns->{query_queue} }, @$queue; 2028 push @{ $ns->{query_queue} }, @$queue;
1969 2029
1970 if (@{ $ns->{query_queue} } == @$queue) { 2030 if (@{ $ns->{query_queue} } == @$queue) {
1971 if (@$queue) { 2031 if (@$queue) {
… …
2132The 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
2133using it, it should be unique. 2193using it, it should be unique.
2134 2194
2135=over 4 2195=over 4
2136 2196
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 2197=item $value = cf::db_get $family => $key
2144 2198
2145Returns a single value from the database 2199Returns 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 2200
2152=item cf::db_put $family => $key => $value 2201=item cf::db_put $family => $key => $value
2153 2202
2154Stores the given C<$value> in the family hash. Updates are delayed, if you 2203Stores 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 2204
2165=cut 2205=cut
2166 2206
2167our $DB; 2207our $DB;
2168 2208
2169{ 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
2170 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;
2171 2228
2172 sub db_load() { 2229 cf::db_put (board => data => $pst->{board});
2173 $DB = stat $path ? Storable::retrieve $path : { }; 2230 cf::db_put (guildrules => data => $pst->{guildrules});
2174 } 2231 cf::db_put (rent => balance => $pst->{rent}{balance});
2232 BDB::db_env_txn_checkpoint $DB_ENV;
2175 2233
2176 my $pid; 2234 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 } 2235 };
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 });
2198
2199 sub db_dirty() {
2200 $dirty = 1;
2201 $idle->start;
2202 }
2203
2204 sub db_get($;$) {
2205 @_ >= 2
2206 ? $DB->{$_[0]}{$_[1]}
2207 : ($DB->{$_[0]} ||= { })
2208 }
2209
2210 sub db_put($$;$) {
2211 if (@_ >= 3) {
2212 $DB->{$_[0]}{$_[1]} = $_[2];
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 }, 2236 }
2224 ); 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 { };
2225} 2254}
2226 2255
2227############################################################################# 2256#############################################################################
2228# 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}
2229 2263
2230sub cfg_load { 2264sub cfg_load {
2231 open my $fh, "<:utf8", cf::confdir . "/config" 2265 open my $fh, "<:utf8", cf::confdir . "/config"
2232 or return; 2266 or return;
2233 2267
… …
2246 }; 2280 };
2247 warn $@ if $@; 2281 warn $@ if $@;
2248 } 2282 }
2249} 2283}
2250 2284
2285sub init {
2286 load_resources;
2287}
2288
2251sub main { 2289sub main {
2252 # we must not ever block the main coroutine 2290 # we must not ever block the main coroutine
2253 local $Coro::idle = sub { 2291 local $Coro::idle = sub {
2254 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 {
2255 async { Event::one_event }; 2294 Event::one_event;
2295 })->prio (Coro::PRIO_MAX);
2256 }; 2296 };
2257 2297
2258 cfg_load; 2298 cfg_load;
2259 db_load; 2299 db_init;
2260 load_extensions; 2300 load_extensions;
2301
2302 $TICK_WATCHER->start;
2261 Event::loop; 2303 Event::loop;
2262} 2304}
2263 2305
2264############################################################################# 2306#############################################################################
2265# initialisation and cleanup 2307# initialisation and cleanup
2266 2308
2267# install some emergency cleanup handlers 2309# install some emergency cleanup handlers
2268BEGIN { 2310BEGIN {
2269 for my $signal (qw(INT HUP TERM)) { 2311 for my $signal (qw(INT HUP TERM)) {
2270 Event->signal ( 2312 Event->signal (
2313 reentrant => 0,
2271 data => WF_AUTOCANCEL, 2314 data => WF_AUTOCANCEL,
2272 signal => $signal, 2315 signal => $signal,
2316 prio => 0,
2273 cb => sub { 2317 cb => sub {
2274 cf::cleanup "SIG$signal"; 2318 cf::cleanup "SIG$signal";
2275 }, 2319 },
2276 ); 2320 );
2277 } 2321 }
2278} 2322}
… …
2283 warn "enter emergency perl save\n"; 2327 warn "enter emergency perl save\n";
2284 2328
2285 cf::sync_job { 2329 cf::sync_job {
2286 # use a peculiar iteration method to avoid tripping on perl 2330 # use a peculiar iteration method to avoid tripping on perl
2287 # refcount bugs in for. also avoids problems with players 2331 # refcount bugs in for. also avoids problems with players
2288 # and maps saved/Destroyed asynchronously. 2332 # and maps saved/destroyed asynchronously.
2289 warn "begin emergency player save\n"; 2333 warn "begin emergency player save\n";
2290 for my $login (keys %cf::PLAYER) { 2334 for my $login (keys %cf::PLAYER) {
2291 my $pl = $cf::PLAYER{$login} or next; 2335 my $pl = $cf::PLAYER{$login} or next;
2292 $pl->valid or next; 2336 $pl->valid or next;
2293 $pl->save; 2337 $pl->save;
… …
2299 my $map = $cf::MAP{$path} or next; 2343 my $map = $cf::MAP{$path} or next;
2300 $map->valid or next; 2344 $map->valid or next;
2301 $map->save; 2345 $map->save;
2302 } 2346 }
2303 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";
2304 }; 2352 };
2305 2353
2306 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;
2307} 2362}
2308 2363
2309sub reload() { 2364sub reload() {
2310 # can/must only be called in main 2365 # can/must only be called in main
2311 if ($Coro::current != $Coro::main) { 2366 if ($Coro::current != $Coro::main) {
2312 warn "can only reload from main coroutine\n"; 2367 warn "can only reload from main coroutine";
2313 return; 2368 return;
2314 } 2369 }
2315 2370
2316 warn "reloading..."; 2371 warn "reloading...";
2317 2372
2318 my $guard = freeze_mainloop; 2373 warn "entering sync_job";
2374
2375 cf::sync_job {
2376 cf::write_runtime; # external watchdog should not bark
2319 cf::emergency_save; 2377 cf::emergency_save;
2378 cf::write_runtime; # external watchdog should not bark
2320 2379
2321 eval { 2380 warn "syncing database to disk";
2381 BDB::db_env_txn_checkpoint $DB_ENV;
2382
2322 # 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
2323 2384
2324 # cancel all watchers 2385 warn "cancelling all WF_AUTOCANCEL watchers";
2325 for (Event::all_watchers) { 2386 for (Event::all_watchers) {
2326 $_->cancel if $_->data & WF_AUTOCANCEL; 2387 $_->cancel if $_->data & WF_AUTOCANCEL;
2327 } 2388 }
2328 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
2329 # cancel all extension coros 2399 warn "cancelling all extension coros";
2330 $_->cancel for values %EXT_CORO; 2400 $_->cancel for values %EXT_CORO;
2331 %EXT_CORO = (); 2401 %EXT_CORO = ();
2332 2402
2333 # unload all extensions 2403 warn "removing commands";
2334 for (@exts) { 2404 %COMMAND = ();
2405
2406 warn "removing ext commands";
2407 %EXTCMD = ();
2408
2409 warn "unloading/nuking all extensions";
2410 for my $pkg (@EXTS) {
2335 warn "unloading <$_>"; 2411 warn "... unloading $pkg";
2336 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: $@";
2337 } 2418 }
2338 2419
2420 warn "... nuking $pkg";
2421 Symbol::delete_package $pkg;
2422 }
2423
2339 # unload all modules loaded from $LIBDIR 2424 warn "unloading all perl modules loaded from $LIBDIR";
2340 while (my ($k, $v) = each %INC) { 2425 while (my ($k, $v) = each %INC) {
2341 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2426 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2342 2427
2343 warn "removing <$k>"; 2428 warn "... unloading $k";
2344 delete $INC{$k}; 2429 delete $INC{$k};
2345 2430
2346 $k =~ s/\.pm$//; 2431 $k =~ s/\.pm$//;
2347 $k =~ s/\//::/g; 2432 $k =~ s/\//::/g;
2348 2433
… …
2351 } 2436 }
2352 2437
2353 Symbol::delete_package $k; 2438 Symbol::delete_package $k;
2354 } 2439 }
2355 2440
2356 # sync database to disk
2357 cf::db_sync;
2358 IO::AIO::flush;
2359
2360 # get rid of safe::, as good as possible 2441 warn "getting rid of safe::, as good as possible";
2361 Symbol::delete_package "safe::$_" 2442 Symbol::delete_package "safe::$_"
2362 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);
2363 2444
2364 # remove register_script_function callbacks
2365 # TODO
2366
2367 # unload cf.pm "a bit" 2445 warn "unloading cf.pm \"a bit\"";
2368 delete $INC{"cf.pm"}; 2446 delete $INC{"cf.pm"};
2369 2447
2370 # don't, removes xs symbols, too, 2448 # don't, removes xs symbols, too,
2371 # and global variables created in xs 2449 # and global variables created in xs
2372 #Symbol::delete_package __PACKAGE__; 2450 #Symbol::delete_package __PACKAGE__;
2373 2451
2374 # reload cf.pm 2452 warn "unload completed, starting to reload now";
2453
2375 warn "reloading cf.pm"; 2454 warn "reloading cf.pm";
2376 require cf; 2455 require cf;
2377 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2456 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2378 2457
2379 # load config and database again 2458 warn "loading config and database again";
2380 cf::cfg_load; 2459 cf::cfg_load;
2381 cf::db_load;
2382 2460
2383 # load extensions
2384 warn "load extensions"; 2461 warn "loading extensions";
2385 cf::load_extensions; 2462 cf::load_extensions;
2386 2463
2387 # reattach attachments to objects 2464 warn "reattaching attachments to objects/players";
2388 warn "reattach";
2389 _global_reattach; 2465 _global_reattach;
2466 warn "reattaching attachments to maps";
2390 reattach $_ for values %MAP; 2467 reattach $_ for values %MAP;
2391 };
2392 2468
2393 if ($@) { 2469 warn "loading reloadable resources";
2470 load_resources;
2471
2472 warn "leaving sync_job";
2473
2474 1
2475 } or do {
2394 warn $@; 2476 warn $@;
2395 warn "error while reloading, exiting."; 2477 warn "error while reloading, exiting.";
2396 exit 1; 2478 exit 1;
2397 } 2479 };
2398 2480
2399 warn "reloaded successfully"; 2481 warn "reloaded";
2400}; 2482};
2401 2483
2402############################################################################# 2484our $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 2485
2447register_command "reload" => sub { 2486register_command "reload" => sub {
2448 my ($who, $arg) = @_; 2487 my ($who, $arg) = @_;
2449 2488
2450 if ($who->flag (FLAG_WIZ)) { 2489 if ($who->flag (FLAG_WIZ)) {
2451 $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 {
2452 reload; 2500 reload;
2453 $who->message ("end of reload."); 2501 undef $RELOAD_WATCHER;
2502 },
2503 );
2454 } 2504 }
2455}; 2505};
2456 2506
2457unshift @INC, $LIBDIR; 2507unshift @INC, $LIBDIR;
2508
2509my $bug_warning = 0;
2458 2510
2459$TICK_WATCHER = Event->timer ( 2511$TICK_WATCHER = Event->timer (
2460 reentrant => 0, 2512 reentrant => 0,
2513 parked => 1,
2461 prio => 0, 2514 prio => 0,
2462 at => $NEXT_TICK || $TICK, 2515 at => $NEXT_TICK || $TICK,
2463 data => WF_AUTOCANCEL, 2516 data => WF_AUTOCANCEL,
2464 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
2465 cf::server_tick; # one server iteration 2526 cf::server_tick; # one server iteration
2466 $RUNTIME += $TICK; 2527 $RUNTIME += $TICK;
2467 $NEXT_TICK += $TICK; 2528 $NEXT_TICK += $TICK;
2468 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
2469 $WAIT_FOR_TICK->broadcast; 2539 $WAIT_FOR_TICK->broadcast;
2470 $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#
2471 2544
2472 # 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
2473 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2546 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2474 2547
2475 $TICK_WATCHER->at ($NEXT_TICK); 2548 $TICK_WATCHER->at ($NEXT_TICK);
2476 $TICK_WATCHER->start; 2549 $TICK_WATCHER->start;
2477 }, 2550 },
2478); 2551);
2479 2552
2553{
2480IO::AIO::max_poll_time $TICK * 0.2; 2554 BDB::max_poll_time $TICK * 0.1;
2481 2555 $BDB_POLL_WATCHER = Event->io (
2482Event->io ( 2556 reentrant => 0,
2483 fd => IO::AIO::poll_fileno, 2557 fd => BDB::poll_fileno,
2484 poll => 'r', 2558 poll => 'r',
2485 prio => 5, 2559 prio => 0,
2486 data => WF_AUTOCANCEL,
2487 cb => \&IO::AIO::poll_cb,
2488);
2489
2490Event->timer (
2491 data => WF_AUTOCANCEL, 2560 data => WF_AUTOCANCEL,
2492 after => 0, 2561 cb => \&BDB::poll_cb,
2493 interval => 10, 2562 );
2494 cb => sub { 2563 BDB::min_parallel 8;
2495 (Coro::unblock_sub { 2564
2496 write_runtime 2565 BDB::set_sync_prepare {
2497 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 $@;
2498 })->(); 2599 };
2499 }, 2600 }
2500); 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}
2501 2617
2502END { cf::emergency_save } 2618END { cf::emergency_save }
2503 2619
25041 26201
2505 2621

Diff Legend

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