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

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

Diff Legend

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