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

Diff Legend

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