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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.157 by root, Wed Jan 10 01:16:54 2007 UTC vs.
Revision 1.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
372# used to convert map paths into valid unix filenames by repalcing / by ∕
373our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
374
375sub new {
376 my ($class, $path, $base) = @_;
377
378 $path = $path->as_string if ref $path;
379
380 my $self = bless { }, $class;
381
382 # {... are special paths that are not touched
383 # ?xxx/... are special absolute paths
384 # ?random/... random maps
385 # /! non-realised random map exit
386 # /... normal maps
387 # ~/... per-player maps without a specific player (DO NOT USE)
388 # ~user/... per-player map of a specific user
389
390 if ($path =~ /^{/) {
391 # fine as it is
392 } elsif ($path =~ s{^\?random/}{}) {
393 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
394 $self->{random} = cf::from_json $data;
395 } else {
396 if ($path =~ s{^~([^/]+)?}{}) {
397 $self->{user_rel} = 1;
398
399 if (defined $1) {
400 $self->{user} = $1;
401 } elsif ($base =~ m{^~([^/]+)/}) {
402 $self->{user} = $1;
403 } else {
404 warn "cannot resolve user-relative path without user <$path,$base>\n";
405 }
406 } elsif ($path =~ /^\//) {
407 # already absolute
408 } else {
409 $base =~ s{[^/]+/?$}{};
410 return $class->new ("$base/$path");
411 }
412
413 for ($path) {
414 redo if s{/\.?/}{/};
415 redo if s{/[^/]+/\.\./}{/};
416 }
417 }
418
419 $self->{path} = $path;
420
421 $self
422}
423
424# the name / primary key / in-game path
425sub as_string {
426 my ($self) = @_;
427
428 $self->{user_rel} ? "~$self->{user}$self->{path}"
429 : $self->{random} ? "?random/$self->{path}"
430 : $self->{path}
431}
432
433# the displayed name, this is a one way mapping
434sub visible_name {
435 my ($self) = @_;
436
437# if (my $rmp = $self->{random}) {
438# # todo: be more intelligent about this
439# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
440# } else {
441 $self->as_string
442# }
443}
444
445# escape the /'s in the path
446sub _escaped_path {
447 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
448 $path
449}
450
451# the original (read-only) location
452sub load_path {
453 my ($self) = @_;
454
455 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
456}
457
458# the temporary/swap location
459sub save_path {
460 my ($self) = @_;
461
462 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
463 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
464 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
465}
466
467# the unique path, might be eq to save_path
468sub uniq_path {
469 my ($self) = @_;
470
471 $self->{user_rel} || $self->{random}
472 ? undef
473 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
474}
475
476# return random map parameters, or undef
477sub random_map_params {
478 my ($self) = @_;
479
480 $self->{random}
481}
482
483# this is somewhat ugly, but style maps do need special treatment
484sub is_style_map {
485 $_[0]{path} =~ m{^/styles/}
486}
487
488package cf;
489 387
490############################################################################# 388#############################################################################
491 389
492=head2 ATTACHABLE OBJECTS 390=head2 ATTACHABLE OBJECTS
493 391
… …
619our @CB_TYPE = (); # registry for type (cf-object class) based events 517our @CB_TYPE = (); # registry for type (cf-object class) based events
620our @CB_MAP = (); 518our @CB_MAP = ();
621 519
622my %attachment; 520my %attachment;
623 521
522sub cf::attachable::thawer_merge {
523 # simply override everything except _meta
524 local $_[0]{_meta};
525 %{$_[0]} = %{$_[1]};
526}
527
624sub _attach_cb($$$$) { 528sub _attach_cb($$$$) {
625 my ($registry, $event, $prio, $cb) = @_; 529 my ($registry, $event, $prio, $cb) = @_;
626 530
627 use sort 'stable'; 531 use sort 'stable';
628 532
… …
799# object support 703# object support
800 704
801sub reattach { 705sub reattach {
802 # basically do the same as instantiate, without calling instantiate 706 # basically do the same as instantiate, without calling instantiate
803 my ($obj) = @_; 707 my ($obj) = @_;
708
709 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
804 710
805 my $registry = $obj->registry; 711 my $registry = $obj->registry;
806 712
807 @$registry = (); 713 @$registry = ();
808 714
… …
855 $filename, length $$rdata, scalar @$objs; 761 $filename, length $$rdata, scalar @$objs;
856 762
857 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 763 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
858 chmod SAVE_MODE, $fh; 764 chmod SAVE_MODE, $fh;
859 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 765 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
860 aio_fsync $fh; 766 aio_fsync $fh if $cf::USE_FSYNC;
861 close $fh; 767 close $fh;
862 768
863 if (@$objs) { 769 if (@$objs) {
864 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 770 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
865 chmod SAVE_MODE, $fh; 771 chmod SAVE_MODE, $fh;
866 my $data = Storable::nfreeze { version => 1, objs => $objs }; 772 my $data = Storable::nfreeze { version => 1, objs => $objs };
867 aio_write $fh, 0, (length $data), $data, 0; 773 aio_write $fh, 0, (length $data), $data, 0;
868 aio_fsync $fh; 774 aio_fsync $fh if $cf::USE_FSYNC;
869 close $fh; 775 close $fh;
870 aio_rename "$filename.pst~", "$filename.pst"; 776 aio_rename "$filename.pst~", "$filename.pst";
871 } 777 }
872 } else { 778 } else {
873 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
… …
940=cut 846=cut
941 847
942sub register_extcmd { 848sub register_extcmd {
943 my ($name, $cb) = @_; 849 my ($name, $cb) = @_;
944 850
945 my $caller = caller;
946 #warn "registering extcmd '$name' to '$caller'";
947
948 $EXTCMD{$name} = [$cb, $caller]; 851 $EXTCMD{$name} = $cb;
949} 852}
950 853
951cf::player->attach ( 854cf::player->attach (
952 on_command => sub { 855 on_command => sub {
953 my ($pl, $name, $params) = @_; 856 my ($pl, $name, $params) = @_;
… …
966 869
967 my $msg = eval { from_json $buf }; 870 my $msg = eval { from_json $buf };
968 871
969 if (ref $msg) { 872 if (ref $msg) {
970 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 873 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
971 if (my %reply = $cb->[0]->($pl, $msg)) { 874 if (my %reply = $cb->($pl, $msg)) {
972 $pl->ext_reply ($msg->{msgid}, %reply); 875 $pl->ext_reply ($msg->{msgid}, %reply);
973 } 876 }
974 } 877 }
975 } else { 878 } else {
976 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 879 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
… …
978 881
979 cf::override; 882 cf::override;
980 }, 883 },
981); 884);
982 885
983sub register {
984 my ($base, $pkg) = @_;
985
986 #TODO
987}
988
989sub load_extension { 886sub load_extension {
990 my ($path) = @_; 887 my ($path) = @_;
991 888
992 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 889 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
993 my $base = $1; 890 my $base = $1;
994 my $pkg = $1; 891 my $pkg = $1;
995 $pkg =~ s/[^[:word:]]/_/g; 892 $pkg =~ s/[^[:word:]]/_/g;
996 $pkg = "ext::$pkg"; 893 $pkg = "ext::$pkg";
997 894
998 warn "loading '$path' into '$pkg'\n"; 895 warn "... loading '$path' into '$pkg'\n";
999 896
1000 open my $fh, "<:utf8", $path 897 open my $fh, "<:utf8", $path
1001 or die "$path: $!"; 898 or die "$path: $!";
1002 899
1003 my $source = 900 my $source =
1004 "package $pkg; use strict; use utf8;\n" 901 "package $pkg; use strict; use utf8;\n"
1005 . "#line 1 \"$path\"\n{\n" 902 . "#line 1 \"$path\"\n{\n"
1006 . (do { local $/; <$fh> }) 903 . (do { local $/; <$fh> })
1007 . "\n};\n1"; 904 . "\n};\n1";
1008 905
1009 eval $source 906 unless (eval $source) {
1010 or die $@ ? "$path: $@\n" 907 my $msg = $@ ? "$path: $@\n"
1011 : "extension disabled.\n"; 908 : "extension disabled.\n";
1012 909 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
1013 push @exts, $pkg; 910 warn $@;
1014 $ext_pkg{$base} = $pkg; 911 warn "mandatory extension failed to load, exiting.\n";
1015 912 exit 1;
1016# no strict 'refs'; 913 }
1017# @{"$pkg\::ISA"} = ext::; 914 die $@;
1018
1019 register $base, $pkg;
1020}
1021
1022sub unload_extension {
1023 my ($pkg) = @_;
1024
1025 warn "removing extension $pkg\n";
1026
1027 # remove hooks
1028 #TODO
1029# for my $idx (0 .. $#PLUGIN_EVENT) {
1030# delete $hook[$idx]{$pkg};
1031# } 915 }
1032 916
1033 # remove commands 917 push @EXTS, $pkg;
1034 for my $name (keys %COMMAND) {
1035 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1036
1037 if (@cb) {
1038 $COMMAND{$name} = \@cb;
1039 } else {
1040 delete $COMMAND{$name};
1041 }
1042 }
1043
1044 # remove extcmds
1045 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1046 delete $EXTCMD{$name};
1047 }
1048
1049 if (my $cb = $pkg->can ("unload")) {
1050 eval {
1051 $cb->($pkg);
1052 1
1053 } or warn "$pkg unloaded, but with errors: $@";
1054 }
1055
1056 Symbol::delete_package $pkg;
1057} 918}
1058 919
1059sub load_extensions { 920sub load_extensions {
1060 for my $ext (<$LIBDIR/*.ext>) { 921 for my $ext (<$LIBDIR/*.ext>) {
1061 next unless -r $ext; 922 next unless -r $ext;
… …
1065 } or warn "$ext not loaded: $@"; 926 } or warn "$ext not loaded: $@";
1066 } 927 }
1067} 928}
1068 929
1069############################################################################# 930#############################################################################
1070# load/save/clean perl data associated with a map
1071
1072*cf::mapsupport::on_clean = sub {
1073 my ($map) = @_;
1074
1075 my $path = $map->tmpname;
1076 defined $path or return;
1077
1078 unlink "$path.pst";
1079};
1080
1081cf::map->attach (prio => -10000, package => cf::mapsupport::);
1082
1083#############################################################################
1084 931
1085=head2 CORE EXTENSIONS 932=head2 CORE EXTENSIONS
1086 933
1087Functions and methods that extend core crossfire objects. 934Functions and methods that extend core crossfire objects.
1088 935
… …
1124 971
1125sub exists($) { 972sub exists($) {
1126 my ($login) = @_; 973 my ($login) = @_;
1127 974
1128 $cf::PLAYER{$login} 975 $cf::PLAYER{$login}
1129 or cf::sync_job { !aio_stat $login } 976 or cf::sync_job { !aio_stat path $login }
1130} 977}
1131 978
1132sub find($) { 979sub find($) {
1133 return $cf::PLAYER{$_[0]} || do { 980 return $cf::PLAYER{$_[0]} || do {
1134 my $login = $_[0]; 981 my $login = $_[0];
… …
1224 \@logins 1071 \@logins
1225} 1072}
1226 1073
1227=item $player->maps 1074=item $player->maps
1228 1075
1229Returns 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
1230player. May block. 1077player. May block.
1231 1078
1232=cut 1079=cut
1233 1080
1234sub maps($) { 1081sub maps($) {
1235 my ($pl) = @_; 1082 my ($pl) = @_;
1083
1084 $pl = ref $pl ? $pl->ob->name : $pl;
1236 1085
1237 my $files = aio_readdir playerdir $pl 1086 my $files = aio_readdir playerdir $pl
1238 or return; 1087 or return;
1239 1088
1240 my @paths; 1089 my @paths;
1241 1090
1242 for (@$files) { 1091 for (@$files) {
1243 utf8::decode $_; 1092 utf8::decode $_;
1244 next if /\.(?:pl|pst)$/; 1093 next if /\.(?:pl|pst)$/;
1245 next unless /^$PATH_SEP/; 1094 next unless /^$PATH_SEP/o;
1246 1095
1247 s/$PATH_SEP/\//g; 1096 push @paths, cf::map::normalise "~$pl/$_";
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1249 } 1097 }
1250 1098
1251 \@paths 1099 \@paths
1252} 1100}
1253 1101
… …
1279package cf::map; 1127package cf::map;
1280 1128
1281use Fcntl; 1129use Fcntl;
1282use Coro::AIO; 1130use Coro::AIO;
1283 1131
1132use overload
1133 '""' => \&as_string,
1134 fallback => 1;
1135
1284our $MAX_RESET = 3600; 1136our $MAX_RESET = 3600;
1285our $DEFAULT_RESET = 3000; 1137our $DEFAULT_RESET = 3000;
1286 1138
1287sub generate_random_map { 1139sub generate_random_map {
1288 my ($path, $rmp) = @_; 1140 my ($self, $rmp) = @_;
1289
1290 # mit "rum" bekleckern, nicht 1141 # mit "rum" bekleckern, nicht
1291 cf::map::_create_random_map 1142 $self->_create_random_map (
1292 $path,
1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1143 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1144 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1145 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296 $rmp->{exit_on_final_map}, 1146 $rmp->{exit_on_final_map},
1297 $rmp->{xsize}, $rmp->{ysize}, 1147 $rmp->{xsize}, $rmp->{ysize},
1298 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1148 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1299 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1149 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1300 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1150 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1301 $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},
1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1152 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303 (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
1304} 1284}
1305 1285
1306# and all this just because we cannot iterate over 1286# and all this just because we cannot iterate over
1307# all maps in C++... 1287# all maps in C++...
1308sub change_all_map_light { 1288sub change_all_map_light {
… …
1310 1290
1311 $_->change_map_light ($change) 1291 $_->change_map_light ($change)
1312 for grep $_->outdoor, values %cf::MAP; 1292 for grep $_->outdoor, values %cf::MAP;
1313} 1293}
1314 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
1315sub try_load_header($) { 1303sub load_header_from($) {
1316 my ($path) = @_; 1304 my ($self, $path) = @_;
1317 1305
1318 utf8::encode $path; 1306 utf8::encode $path;
1319 aio_open $path, O_RDONLY, 0 1307 #aio_open $path, O_RDONLY, 0
1308 # or return;
1309
1310 $self->_load_header ($path)
1320 or return; 1311 or return;
1321 1312
1322 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
1323 or return; 1356 or return;
1357 $self->prepare_orig;
1358 }
1324 1359
1325 # for better error messages only, will be overwritten 1360 1
1326 $map->path ($path);
1327
1328 $map->load_header ($path)
1329 or return;
1330
1331 $map->{load_path} = $path;
1332
1333 $map
1334} 1361}
1335 1362
1336sub find; 1363sub find;
1337sub find { 1364sub find {
1338 my ($path, $origin) = @_; 1365 my ($path, $origin) = @_;
1339 1366
1340 #warn "find<$path,$origin>\n";#d#
1341
1342 $path = new cf::path $path, $origin && $origin->path; 1367 $path = normalise $path, $origin && $origin->path;
1343 my $key = $path->as_string;
1344 1368
1345 cf::lock_wait "map_find:$key"; 1369 cf::lock_wait "map_find:$path";
1346 1370
1347 $cf::MAP{$key} || do { 1371 $cf::MAP{$path} || do {
1348 my $guard = cf::lock_acquire "map_find:$key"; 1372 my $guard = cf::lock_acquire "map_find:$path";
1349 1373 my $map = new_from_path cf::map $path
1350 # do it the slow way
1351 my $map = try_load_header $path->save_path;
1352
1353 Coro::cede;
1354
1355 if ($map) {
1356 $map->last_access ((delete $map->{last_access})
1357 || $cf::RUNTIME); #d#
1358 # safety
1359 $map->{instantiate_time} = $cf::RUNTIME
1360 if $map->{instantiate_time} > $cf::RUNTIME;
1361 } else {
1362 if (my $rmp = $path->random_map_params) {
1363 $map = generate_random_map $key, $rmp;
1364 } else {
1365 $map = try_load_header $path->load_path;
1366 }
1367
1368 $map or return; 1374 or return;
1369 1375
1370 $map->{load_original} = 1;
1371 $map->{instantiate_time} = $cf::RUNTIME;
1372 $map->last_access ($cf::RUNTIME);
1373 $map->instantiate;
1374
1375 # per-player maps become, after loading, normal maps
1376 $map->per_player (0) if $path->{user_rel};
1377 }
1378
1379 $map->path ($key);
1380 $map->{path} = $path;
1381 $map->{last_save} = $cf::RUNTIME; 1376 $map->{last_save} = $cf::RUNTIME;
1382 1377
1383 Coro::cede; 1378 $map->load_header
1379 or return;
1384 1380
1385 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;
1386 $map->reset; 1384 $map->reset;
1387 undef $guard; 1385 undef $guard;
1388 $map = find $path 1386 return find $path;
1389 or return;
1390 } 1387 }
1391 1388
1392 $cf::MAP{$key} = $map 1389 $cf::MAP{$path} = $map
1393 } 1390 }
1394} 1391}
1392
1393sub pre_load { }
1394sub post_load { }
1395 1395
1396sub load { 1396sub load {
1397 my ($self) = @_; 1397 my ($self) = @_;
1398 1398
1399 local $self->{deny_reset} = 1; # loading can take a long time
1400
1399 my $path = $self->{path}; 1401 my $path = $self->{path};
1400 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1402 my $guard = cf::lock_acquire "map_load:$path";
1401 1403
1402 return if $self->in_memory != cf::MAP_SWAPPED; 1404 return if $self->in_memory != cf::MAP_SWAPPED;
1403 1405
1404 $self->in_memory (cf::MAP_LOADING); 1406 $self->in_memory (cf::MAP_LOADING);
1405 1407
1406 $self->alloc; 1408 $self->alloc;
1409
1410 $self->pre_load;
1411
1407 $self->load_objects ($self->{load_path}, 1) 1412 $self->_load_objects ($self->{load_path}, 1)
1408 or return; 1413 or return;
1409 1414
1410 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1415 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1411 if delete $self->{load_original}; 1416 if delete $self->{load_original};
1412 1417
1413 if (my $uniq = $path->uniq_path) { 1418 if (my $uniq = $self->uniq_path) {
1414 utf8::encode $uniq; 1419 utf8::encode $uniq;
1415 if (aio_open $uniq, O_RDONLY, 0) { 1420 if (aio_open $uniq, O_RDONLY, 0) {
1416 $self->clear_unique_items; 1421 $self->clear_unique_items;
1417 $self->load_objects ($uniq, 0); 1422 $self->_load_objects ($uniq, 0);
1418 } 1423 }
1419 } 1424 }
1420 1425
1421 Coro::cede; 1426 Coro::cede;
1422 1427
1423 # now do the right thing for maps 1428 # now do the right thing for maps
1424 $self->link_multipart_objects; 1429 $self->link_multipart_objects;
1425 1430
1426 if ($self->{path}->is_style_map) { 1431 unless ($self->{deny_activate}) {
1427 $self->{deny_save} = 1; 1432 $self->decay_objects;
1428 $self->{deny_reset} = 1;
1429 } else {
1430 $self->fix_auto_apply; 1433 $self->fix_auto_apply;
1431 $self->decay_objects;
1432 $self->update_buttons; 1434 $self->update_buttons;
1435 Coro::cede;
1433 $self->set_darkness_map; 1436 $self->set_darkness_map;
1434 $self->difficulty ($self->estimate_difficulty) 1437 $self->difficulty ($self->estimate_difficulty)
1435 unless $self->difficulty; 1438 unless $self->difficulty;
1439 Coro::cede;
1436 $self->activate; 1440 $self->activate;
1437 } 1441 }
1438 1442
1439 Coro::cede; 1443 $self->post_load;
1440 1444
1441 $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
1442} 1455}
1443 1456
1444# 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
1445sub load_diag { 1458sub load_diag {
1446 my ($map) = @_; 1459 my ($map) = @_;
… …
1476 1489
1477 cf::sync_job { $map->load }; 1490 cf::sync_job { $map->load };
1478} 1491}
1479 1492
1480our %MAP_PREFETCH; 1493our %MAP_PREFETCH;
1481our $MAP_PREFETCHER = Coro::async { 1494our $MAP_PREFETCHER = undef;
1482 while () {
1483 while (%MAP_PREFETCH) {
1484 my $key = each %MAP_PREFETCH
1485 or next;
1486 my $path = delete $MAP_PREFETCH{$key};
1487
1488 my $map = find $path
1489 or next;
1490 $map->load;
1491 }
1492 Coro::schedule;
1493 }
1494};
1495 1495
1496sub find_async { 1496sub find_async {
1497 my ($path, $origin) = @_; 1497 my ($path, $origin) = @_;
1498 1498
1499 $path = new cf::path $path, $origin && $origin->path; 1499 $path = normalise $path, $origin && $origin->{path};
1500 my $key = $path->as_string;
1501 1500
1502 if (my $map = $cf::MAP{$key}) { 1501 if (my $map = $cf::MAP{$path}) {
1503 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1502 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1504 } 1503 }
1505 1504
1506 $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 };
1507 $MAP_PREFETCHER->ready; 1518 $MAP_PREFETCHER->prio (6);
1508 1519
1509 () 1520 ()
1510} 1521}
1511 1522
1512sub save { 1523sub save {
… …
1516 1527
1517 $self->{last_save} = $cf::RUNTIME; 1528 $self->{last_save} = $cf::RUNTIME;
1518 1529
1519 return unless $self->dirty; 1530 return unless $self->dirty;
1520 1531
1521 my $save = $self->{path}->save_path; utf8::encode $save; 1532 my $save = $self->save_path; utf8::encode $save;
1522 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1533 my $uniq = $self->uniq_path; utf8::encode $uniq;
1523 1534
1524 $self->{load_path} = $save; 1535 $self->{load_path} = $save;
1525 1536
1526 return if $self->{deny_save}; 1537 return if $self->{deny_save};
1527 1538
… …
1530 cf::async { 1541 cf::async {
1531 $_->contr->save for $self->players; 1542 $_->contr->save for $self->players;
1532 }; 1543 };
1533 1544
1534 if ($uniq) { 1545 if ($uniq) {
1535 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1546 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1536 $self->save_objects ($uniq, cf::IO_UNIQUES); 1547 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1537 } else { 1548 } else {
1538 $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);
1539 } 1550 }
1540} 1551}
1541 1552
1542sub swap_out { 1553sub swap_out {
1543 my ($self) = @_; 1554 my ($self) = @_;
… …
1557 1568
1558sub reset_at { 1569sub reset_at {
1559 my ($self) = @_; 1570 my ($self) = @_;
1560 1571
1561 # TODO: safety, remove and allow resettable per-player maps 1572 # TODO: safety, remove and allow resettable per-player maps
1562 return 1e99 if $self->{path}{user_rel}; 1573 return 1e99 if $self->isa ("ext::map_per_player");#d#
1563 return 1e99 if $self->{deny_reset}; 1574 return 1e99 if $self->{deny_reset};
1564 1575
1565 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1576 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1566 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;
1567 1578
… …
1572 my ($self) = @_; 1583 my ($self) = @_;
1573 1584
1574 $self->reset_at <= $cf::RUNTIME 1585 $self->reset_at <= $cf::RUNTIME
1575} 1586}
1576 1587
1577sub unlink_save {
1578 my ($self) = @_;
1579
1580 utf8::encode (my $save = $self->{path}->save_path);
1581 aioreq_pri 3; IO::AIO::aio_unlink $save;
1582 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1583}
1584
1585sub rename {
1586 my ($self, $new_path) = @_;
1587
1588 $self->unlink_save;
1589
1590 delete $cf::MAP{$self->path};
1591 $self->{path} = new cf::path $new_path;
1592 $self->path ($self->{path}->as_string);
1593 $cf::MAP{$self->path} = $self;
1594
1595 $self->save;
1596}
1597
1598sub reset { 1588sub reset {
1599 my ($self) = @_; 1589 my ($self) = @_;
1600 1590
1601 my $lock = cf::lock_acquire "map_data:" . $self->path; 1591 my $lock = cf::lock_acquire "map_data:$self->{path}";
1602 1592
1603 return if $self->players; 1593 return if $self->players;
1604 return if $self->{path}{user_rel};#d# 1594 return if $self->isa ("ext::map_per_player");#d#
1605 1595
1606 warn "resetting map ", $self->path;#d# 1596 warn "resetting map ", $self->path;#d#
1607 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
1608 delete $cf::MAP{$self->path}; 1608 delete $cf::MAP{$self->path};
1609
1610 $self->clear;
1609 1611
1610 $_->clear_links_to ($self) for values %cf::MAP; 1612 $_->clear_links_to ($self) for values %cf::MAP;
1611 1613
1612 $self->unlink_save; 1614 $self->unlink_save;
1613 $self->destroy; 1615 $self->destroy;
… …
1616my $nuke_counter = "aaaa"; 1618my $nuke_counter = "aaaa";
1617 1619
1618sub nuke { 1620sub nuke {
1619 my ($self) = @_; 1621 my ($self) = @_;
1620 1622
1623 delete $cf::MAP{$self->path};
1624
1625 $self->unlink_save;
1626
1627 bless $self, "cf::map";
1628 delete $self->{deny_reset};
1621 $self->{deny_save} = 1; 1629 $self->{deny_save} = 1;
1622 $self->reset_timeout (1); 1630 $self->reset_timeout (1);
1623 $self->rename ("{nuke}/" . ($nuke_counter++)); 1631 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1632
1633 $cf::MAP{$self->path} = $self;
1634
1624 $self->reset; # polite request, might not happen 1635 $self->reset; # polite request, might not happen
1625} 1636}
1626 1637
1627sub customise_for { 1638=item cf::map::unique_maps
1628 my ($map, $ob) = @_;
1629 1639
1630 if ($map->per_player) { 1640Returns an arrayref of paths of all shared maps that have
1631 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1641instantiated unique items. May block.
1632 }
1633 1642
1634 $map 1643=cut
1644
1645sub unique_maps() {
1646 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1647 or return;
1648
1649 my @paths;
1650
1651 for (@$files) {
1652 utf8::decode $_;
1653 next if /\.pst$/;
1654 next unless /^$PATH_SEP/o;
1655
1656 push @paths, cf::map::normalise $_;
1657 }
1658
1659 \@paths
1635} 1660}
1636 1661
1637package cf; 1662package cf;
1638 1663
1639=back 1664=back
… …
1711 1736
1712=item $player_object->enter_link 1737=item $player_object->enter_link
1713 1738
1714Freezes 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}>).
1715 1740
1716The 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
1717I<MUST> call C<leave_link> as soon as possible, though. 1742I<MUST> call C<leave_link> as soon as possible, though.
1718 1743
1744Will never block.
1745
1719=item $player_object->leave_link ($map, $x, $y) 1746=item $player_object->leave_link ($map, $x, $y)
1720 1747
1721Moves 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
1722map 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
1723location 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
1724to the emergency map position. 1751fails, to the emergency map position.
1725 1752
1726Might block. 1753Might block.
1727 1754
1728=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}
1729 1766
1730sub cf::object::player::enter_link { 1767sub cf::object::player::enter_link {
1731 my ($self) = @_; 1768 my ($self) = @_;
1732 1769
1733 $self->deactivate_recursive; 1770 $self->deactivate_recursive;
1734 1771
1735 return if $self->map == $LINK_MAP; 1772 return if UNIVERSAL::isa $self->map, "ext::map_link";
1736 1773
1737 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1774 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1738 if $self->map; 1775 if $self->map;
1739 1776
1740 $self->enter_map ($LINK_MAP, 20, 20); 1777 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1741} 1778}
1742 1779
1743sub cf::object::player::leave_link { 1780sub cf::object::player::leave_link {
1744 my ($self, $map, $x, $y) = @_; 1781 my ($self, $map, $x, $y) = @_;
1745 1782
… …
1767 $map->load; 1804 $map->load;
1768 $map->load_diag; 1805 $map->load_diag;
1769 1806
1770 return unless $self->contr->active; 1807 return unless $self->contr->active;
1771 $self->activate_recursive; 1808 $self->activate_recursive;
1809
1810 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1772 $self->enter_map ($map, $x, $y); 1811 $self->enter_map ($map, $x, $y);
1773} 1812}
1774 1813
1775cf::player->attach ( 1814cf::player->attach (
1776 on_logout => sub { 1815 on_logout => sub {
… …
1789 # try to abort aborted map switching on player login :) 1828 # try to abort aborted map switching on player login :)
1790 # should happen only on crashes 1829 # should happen only on crashes
1791 if ($pl->ob->{_link_pos}) { 1830 if ($pl->ob->{_link_pos}) {
1792 $pl->ob->enter_link; 1831 $pl->ob->enter_link;
1793 (async { 1832 (async {
1794 # we need this sleep as the login has a concurrent enter_exit running
1795 # and this sleep increases chances of the player not ending up in scorn
1796 $pl->ob->reply (undef, 1833 $pl->ob->reply (undef,
1797 "There was an internal problem at your last logout, " 1834 "There was an internal problem at your last logout, "
1798 . "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.",
1799 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
1800 Coro::Timer::sleep 1; 1839 Coro::Timer::sleep 1;
1801 $pl->ob->leave_link; 1840 $pl->ob->leave_link;
1802 })->prio (2); 1841 })->prio (2);
1803 } 1842 }
1804 }, 1843 },
… …
1809=cut 1848=cut
1810 1849
1811sub cf::object::player::goto { 1850sub cf::object::player::goto {
1812 my ($self, $path, $x, $y) = @_; 1851 my ($self, $path, $x, $y) = @_;
1813 1852
1814 $path = new cf::path $path;
1815 $path ne "/" or Carp::cluck ("oy");#d#
1816
1817 $self->enter_link; 1853 $self->enter_link;
1818 1854
1819 (async { 1855 (async {
1856 my $map = eval {
1820 my $map = cf::map::find $path->as_string; 1857 my $map = cf::map::find $path;
1821 $map = $map->customise_for ($self) if $map; 1858 $map = $map->customise_for ($self) if $map;
1822 1859 $map
1823# warn "entering ", $map->path, " at ($x, $y)\n" 1860 } or
1824# if $map;
1825
1826 $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);
1827 1862
1828 $self->leave_link ($map, $x, $y); 1863 $self->leave_link ($map, $x, $y);
1829 })->prio (1); 1864 })->prio (1);
1830} 1865}
1831 1866
… …
1835 1870
1836sub parse_random_map_params { 1871sub parse_random_map_params {
1837 my ($spec) = @_; 1872 my ($spec) = @_;
1838 1873
1839 my $rmp = { # defaults 1874 my $rmp = { # defaults
1840 xsize => 10, 1875 xsize => (cf::rndm 15, 40),
1841 ysize => 10, 1876 ysize => (cf::rndm 15, 40),
1877 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1878 #layout => string,
1842 }; 1879 };
1843 1880
1844 for (split /\n/, $spec) { 1881 for (split /\n/, $spec) {
1845 my ($k, $v) = split /\s+/, $_, 2; 1882 my ($k, $v) = split /\s+/, $_, 2;
1846 1883
… …
1850 $rmp 1887 $rmp
1851} 1888}
1852 1889
1853sub prepare_random_map { 1890sub prepare_random_map {
1854 my ($exit) = @_; 1891 my ($exit) = @_;
1892
1893 my $guard = cf::lock_acquire "exit_prepare:$exit";
1855 1894
1856 # all this does is basically replace the /! path by 1895 # all this does is basically replace the /! path by
1857 # a new random map path (?random/...) with a seed 1896 # a new random map path (?random/...) with a seed
1858 # that depends on the exit object 1897 # that depends on the exit object
1859 1898
1860 my $rmp = parse_random_map_params $exit->msg; 1899 my $rmp = parse_random_map_params $exit->msg;
1861 1900
1862 if ($exit->map) { 1901 if ($exit->map) {
1863 $rmp->{region} = $exit->map->region_name; 1902 $rmp->{region} = $exit->region->name;
1864 $rmp->{origin_map} = $exit->map->path; 1903 $rmp->{origin_map} = $exit->map->path;
1865 $rmp->{origin_x} = $exit->x; 1904 $rmp->{origin_x} = $exit->x;
1866 $rmp->{origin_y} = $exit->y; 1905 $rmp->{origin_y} = $exit->y;
1867 } 1906 }
1868 1907
1869 $rmp->{random_seed} ||= $exit->random_seed; 1908 $rmp->{random_seed} ||= $exit->random_seed;
1870 1909
1871 my $data = cf::to_json $rmp; 1910 my $data = cf::to_json $rmp;
1872 my $md5 = Digest::MD5::md5_hex $data; 1911 my $md5 = Digest::MD5::md5_hex $data;
1912 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1873 1913
1874 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) {
1875 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;
1876 1918
1877 $exit->slaying ("?random/$md5"); 1919 $exit->slaying ("?random/$md5");
1878 $exit->msg (undef); 1920 $exit->msg (undef);
1879 } 1921 }
1880} 1922}
1881 1923
1882sub cf::object::player::enter_exit { 1924sub cf::object::player::enter_exit {
1883 my ($self, $exit) = @_; 1925 my ($self, $exit) = @_;
1884 1926
1885 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;
1886 1937
1887 $self->enter_link; 1938 $self->enter_link;
1888 1939
1889 (async { 1940 (async {
1890 $self->deactivate_recursive; # just to be sure 1941 $self->deactivate_recursive; # just to be sure
1891 unless (eval { 1942 unless (eval {
1892 prepare_random_map $exit 1943 $self->goto ($slaying, $hp, $sp);
1893 if $exit->slaying eq "/!";
1894
1895 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1896 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1897 1944
1898 1; 1945 1;
1899 }) { 1946 }) {
1900 $self->message ("Something went wrong deep within the crossfire server. " 1947 $self->message ("Something went wrong deep within the crossfire server. "
1901 . "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. "
1902 . "Please report this to the dungeon master", 1949 . "Please report this to the dungeon master!",
1903 cf::NDI_UNIQUE | cf::NDI_RED); 1950 cf::NDI_UNIQUE | cf::NDI_RED);
1904 1951
1905 warn "ERROR in enter_exit: $@"; 1952 warn "ERROR in enter_exit: $@";
1906 $self->leave_link; 1953 $self->leave_link;
1907 } 1954 }
… …
1962 # get handled first 2009 # get handled first
1963 my $queue = delete $ns->{query_queue} 2010 my $queue = delete $ns->{query_queue}
1964 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
1965 2012
1966 (shift @$queue)->[1]->($msg); 2013 (shift @$queue)->[1]->($msg);
2014 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1967 2015
1968 push @{ $ns->{query_queue} }, @$queue; 2016 push @{ $ns->{query_queue} }, @$queue;
1969 2017
1970 if (@{ $ns->{query_queue} } == @$queue) { 2018 if (@{ $ns->{query_queue} } == @$queue) {
1971 if (@$queue) { 2019 if (@$queue) {
… …
2132The 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
2133using it, it should be unique. 2181using it, it should be unique.
2134 2182
2135=over 4 2183=over 4
2136 2184
2137=item $hashref = cf::db_get $family
2138
2139Return a hashref for use by the extension C<$family>, which can be
2140modified. After modifications, you have to call C<cf::db_dirty> or
2141C<cf::db_sync>.
2142
2143=item $value = cf::db_get $family => $key 2185=item $value = cf::db_get $family => $key
2144 2186
2145Returns a single value from the database 2187Returns a single value from the database.
2146
2147=item cf::db_put $family => $hashref
2148
2149Stores the given family hashref into the database. Updates are delayed, if
2150you want the data to be synced to disk immediately, use C<cf::db_sync>.
2151 2188
2152=item cf::db_put $family => $key => $value 2189=item cf::db_put $family => $key => $value
2153 2190
2154Stores the given C<$value> in the family hash. Updates are delayed, if you 2191Stores the given C<$value> in the family.
2155want the data to be synced to disk immediately, use C<cf::db_sync>.
2156
2157=item cf::db_dirty
2158
2159Marks the database as dirty, to be updated at a later time.
2160
2161=item cf::db_sync
2162
2163Immediately write the database to disk I<if it is dirty>.
2164 2192
2165=cut 2193=cut
2166 2194
2167our $DB; 2195our $DB;
2168 2196
2169{ 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
2170 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;
2171 2216
2172 sub db_load() { 2217 cf::db_put (board => data => $pst->{board});
2173 $DB = stat $path ? Storable::retrieve $path : { }; 2218 cf::db_put (guildrules => data => $pst->{guildrules});
2174 } 2219 cf::db_put (rent => balance => $pst->{rent}{balance});
2220 BDB::db_env_txn_checkpoint $DB_ENV;
2175 2221
2176 my $pid; 2222 unlink $path;
2177
2178 sub db_save() {
2179 waitpid $pid, 0 if $pid;
2180 if (0 == ($pid = fork)) {
2181 $DB->{_meta}{version} = 1;
2182 Storable::nstore $DB, "$path~";
2183 rename "$path~", $path;
2184 cf::_exit 0 if defined $pid;
2185 } 2223 };
2186 }
2187
2188 my $dirty;
2189
2190 sub db_sync() {
2191 db_save if $dirty;
2192 undef $dirty;
2193 }
2194
2195 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2196 db_sync;
2197 });
2198
2199 sub db_dirty() {
2200 $dirty = 1;
2201 $idle->start;
2202 }
2203
2204 sub db_get($;$) {
2205 @_ >= 2
2206 ? $DB->{$_[0]}{$_[1]}
2207 : ($DB->{$_[0]} ||= { })
2208 }
2209
2210 sub db_put($$;$) {
2211 if (@_ >= 3) {
2212 $DB->{$_[0]}{$_[1]} = $_[2];
2213 } else {
2214 $DB->{$_[0]} = $_[1];
2215 }
2216 db_dirty;
2217 }
2218
2219 cf::global->attach (
2220 prio => 10000,
2221 on_cleanup => sub {
2222 db_sync;
2223 }, 2224 }
2224 ); 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 { };
2225} 2242}
2226 2243
2227############################################################################# 2244#############################################################################
2228# 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}
2229 2251
2230sub cfg_load { 2252sub cfg_load {
2231 open my $fh, "<:utf8", cf::confdir . "/config" 2253 open my $fh, "<:utf8", cf::confdir . "/config"
2232 or return; 2254 or return;
2233 2255
… …
2246 }; 2268 };
2247 warn $@ if $@; 2269 warn $@ if $@;
2248 } 2270 }
2249} 2271}
2250 2272
2273sub init {
2274 init_resources;
2275}
2276
2251sub main { 2277sub main {
2252 # we must not ever block the main coroutine 2278 # we must not ever block the main coroutine
2253 local $Coro::idle = sub { 2279 local $Coro::idle = sub {
2254 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 {
2255 async { Event::one_event }; 2282 Event::one_event;
2283 })->prio (Coro::PRIO_MAX);
2256 }; 2284 };
2257 2285
2258 cfg_load; 2286 cfg_load;
2259 db_load; 2287 db_init;
2260 load_extensions; 2288 load_extensions;
2289
2290 $TICK_WATCHER->start;
2261 Event::loop; 2291 Event::loop;
2262} 2292}
2263 2293
2264############################################################################# 2294#############################################################################
2265# initialisation and cleanup 2295# initialisation and cleanup
2266 2296
2267# install some emergency cleanup handlers 2297# install some emergency cleanup handlers
2268BEGIN { 2298BEGIN {
2269 for my $signal (qw(INT HUP TERM)) { 2299 for my $signal (qw(INT HUP TERM)) {
2270 Event->signal ( 2300 Event->signal (
2301 reentrant => 0,
2271 data => WF_AUTOCANCEL, 2302 data => WF_AUTOCANCEL,
2272 signal => $signal, 2303 signal => $signal,
2304 prio => 0,
2273 cb => sub { 2305 cb => sub {
2274 cf::cleanup "SIG$signal"; 2306 cf::cleanup "SIG$signal";
2275 }, 2307 },
2276 ); 2308 );
2277 } 2309 }
2278} 2310}
… …
2283 warn "enter emergency perl save\n"; 2315 warn "enter emergency perl save\n";
2284 2316
2285 cf::sync_job { 2317 cf::sync_job {
2286 # use a peculiar iteration method to avoid tripping on perl 2318 # use a peculiar iteration method to avoid tripping on perl
2287 # refcount bugs in for. also avoids problems with players 2319 # refcount bugs in for. also avoids problems with players
2288 # and maps saved/Destroyed asynchronously. 2320 # and maps saved/destroyed asynchronously.
2289 warn "begin emergency player save\n"; 2321 warn "begin emergency player save\n";
2290 for my $login (keys %cf::PLAYER) { 2322 for my $login (keys %cf::PLAYER) {
2291 my $pl = $cf::PLAYER{$login} or next; 2323 my $pl = $cf::PLAYER{$login} or next;
2292 $pl->valid or next; 2324 $pl->valid or next;
2293 $pl->save; 2325 $pl->save;
… …
2299 my $map = $cf::MAP{$path} or next; 2331 my $map = $cf::MAP{$path} or next;
2300 $map->valid or next; 2332 $map->valid or next;
2301 $map->save; 2333 $map->save;
2302 } 2334 }
2303 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";
2304 }; 2340 };
2305 2341
2306 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;
2307} 2350}
2308 2351
2309sub reload() { 2352sub reload() {
2310 # can/must only be called in main 2353 # can/must only be called in main
2311 if ($Coro::current != $Coro::main) { 2354 if ($Coro::current != $Coro::main) {
2312 warn "can only reload from main coroutine\n"; 2355 warn "can only reload from main coroutine";
2313 return; 2356 return;
2314 } 2357 }
2315 2358
2316 warn "reloading..."; 2359 warn "reloading...";
2317 2360
2318 my $guard = freeze_mainloop; 2361 warn "entering sync_job";
2362
2363 cf::sync_job {
2364 cf::write_runtime; # external watchdog should not bark
2319 cf::emergency_save; 2365 cf::emergency_save;
2366 cf::write_runtime; # external watchdog should not bark
2320 2367
2321 eval { 2368 warn "syncing database to disk";
2369 BDB::db_env_txn_checkpoint $DB_ENV;
2370
2322 # 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
2323 2372
2324 # cancel all watchers 2373 warn "cancelling all WF_AUTOCANCEL watchers";
2325 for (Event::all_watchers) { 2374 for (Event::all_watchers) {
2326 $_->cancel if $_->data & WF_AUTOCANCEL; 2375 $_->cancel if $_->data & WF_AUTOCANCEL;
2327 } 2376 }
2328 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
2329 # cancel all extension coros 2387 warn "cancelling all extension coros";
2330 $_->cancel for values %EXT_CORO; 2388 $_->cancel for values %EXT_CORO;
2331 %EXT_CORO = (); 2389 %EXT_CORO = ();
2332 2390
2333 # unload all extensions 2391 warn "removing commands";
2334 for (@exts) { 2392 %COMMAND = ();
2393
2394 warn "removing ext commands";
2395 %EXTCMD = ();
2396
2397 warn "unloading/nuking all extensions";
2398 for my $pkg (@EXTS) {
2335 warn "unloading <$_>"; 2399 warn "... unloading $pkg";
2336 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: $@";
2337 } 2406 }
2338 2407
2408 warn "... nuking $pkg";
2409 Symbol::delete_package $pkg;
2410 }
2411
2339 # unload all modules loaded from $LIBDIR 2412 warn "unloading all perl modules loaded from $LIBDIR";
2340 while (my ($k, $v) = each %INC) { 2413 while (my ($k, $v) = each %INC) {
2341 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2414 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2342 2415
2343 warn "removing <$k>"; 2416 warn "... unloading $k";
2344 delete $INC{$k}; 2417 delete $INC{$k};
2345 2418
2346 $k =~ s/\.pm$//; 2419 $k =~ s/\.pm$//;
2347 $k =~ s/\//::/g; 2420 $k =~ s/\//::/g;
2348 2421
… …
2351 } 2424 }
2352 2425
2353 Symbol::delete_package $k; 2426 Symbol::delete_package $k;
2354 } 2427 }
2355 2428
2356 # sync database to disk
2357 cf::db_sync;
2358 IO::AIO::flush;
2359
2360 # get rid of safe::, as good as possible 2429 warn "getting rid of safe::, as good as possible";
2361 Symbol::delete_package "safe::$_" 2430 Symbol::delete_package "safe::$_"
2362 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);
2363 2432
2364 # remove register_script_function callbacks
2365 # TODO
2366
2367 # unload cf.pm "a bit" 2433 warn "unloading cf.pm \"a bit\"";
2368 delete $INC{"cf.pm"}; 2434 delete $INC{"cf.pm"};
2369 2435
2370 # don't, removes xs symbols, too, 2436 # don't, removes xs symbols, too,
2371 # and global variables created in xs 2437 # and global variables created in xs
2372 #Symbol::delete_package __PACKAGE__; 2438 #Symbol::delete_package __PACKAGE__;
2373 2439
2374 # reload cf.pm 2440 warn "unload completed, starting to reload now";
2441
2375 warn "reloading cf.pm"; 2442 warn "reloading cf.pm";
2376 require cf; 2443 require cf;
2377 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2444 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2378 2445
2379 # load config and database again 2446 warn "loading config and database again";
2380 cf::cfg_load; 2447 cf::cfg_load;
2381 cf::db_load;
2382 2448
2383 # load extensions
2384 warn "load extensions"; 2449 warn "loading extensions";
2385 cf::load_extensions; 2450 cf::load_extensions;
2386 2451
2387 # reattach attachments to objects 2452 warn "reattaching attachments to objects/players";
2388 warn "reattach";
2389 _global_reattach; 2453 _global_reattach;
2454 warn "reattaching attachments to maps";
2390 reattach $_ for values %MAP; 2455 reattach $_ for values %MAP;
2391 };
2392 2456
2393 if ($@) { 2457 warn "loading reloadable resources";
2458 init_resources;
2459
2460 warn "leaving sync_job";
2461
2462 1
2463 } or do {
2394 warn $@; 2464 warn $@;
2395 warn "error while reloading, exiting."; 2465 warn "error while reloading, exiting.";
2396 exit 1; 2466 exit 1;
2397 } 2467 };
2398 2468
2399 warn "reloaded successfully"; 2469 warn "reloaded";
2400}; 2470};
2401 2471
2402############################################################################# 2472our $RELOAD_WATCHER; # used only during reload
2403
2404unless ($LINK_MAP) {
2405 $LINK_MAP = cf::map::new;
2406
2407 $LINK_MAP->width (41);
2408 $LINK_MAP->height (41);
2409 $LINK_MAP->alloc;
2410 $LINK_MAP->path ("{link}");
2411 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2412 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2413
2414 # dirty hack because... archetypes are not yet loaded
2415 Event->timer (
2416 after => 10,
2417 cb => sub {
2418 $_[0]->w->cancel;
2419
2420 # provide some exits "home"
2421 my $exit = cf::object::new "exit";
2422
2423 $exit->slaying ($EMERGENCY_POSITION->[0]);
2424 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2425 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2426
2427 $LINK_MAP->insert ($exit->clone, 19, 19);
2428 $LINK_MAP->insert ($exit->clone, 19, 20);
2429 $LINK_MAP->insert ($exit->clone, 19, 21);
2430 $LINK_MAP->insert ($exit->clone, 20, 19);
2431 $LINK_MAP->insert ($exit->clone, 20, 21);
2432 $LINK_MAP->insert ($exit->clone, 21, 19);
2433 $LINK_MAP->insert ($exit->clone, 21, 20);
2434 $LINK_MAP->insert ($exit->clone, 21, 21);
2435
2436 $exit->destroy;
2437 });
2438
2439 $LINK_MAP->{deny_save} = 1;
2440 $LINK_MAP->{deny_reset} = 1;
2441
2442 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2443}
2444
2445register "<global>", __PACKAGE__;
2446 2473
2447register_command "reload" => sub { 2474register_command "reload" => sub {
2448 my ($who, $arg) = @_; 2475 my ($who, $arg) = @_;
2449 2476
2450 if ($who->flag (FLAG_WIZ)) { 2477 if ($who->flag (FLAG_WIZ)) {
2451 $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 {
2452 reload; 2488 reload;
2453 $who->message ("end of reload."); 2489 undef $RELOAD_WATCHER;
2490 },
2491 );
2454 } 2492 }
2455}; 2493};
2456 2494
2457unshift @INC, $LIBDIR; 2495unshift @INC, $LIBDIR;
2496
2497my $bug_warning = 0;
2458 2498
2459$TICK_WATCHER = Event->timer ( 2499$TICK_WATCHER = Event->timer (
2460 reentrant => 0, 2500 reentrant => 0,
2501 parked => 1,
2461 prio => 0, 2502 prio => 0,
2462 at => $NEXT_TICK || $TICK, 2503 at => $NEXT_TICK || $TICK,
2463 data => WF_AUTOCANCEL, 2504 data => WF_AUTOCANCEL,
2464 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
2465 cf::server_tick; # one server iteration 2514 cf::server_tick; # one server iteration
2466 $RUNTIME += $TICK; 2515 $RUNTIME += $TICK;
2467 $NEXT_TICK += $TICK; 2516 $NEXT_TICK += $TICK;
2468 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
2469 $WAIT_FOR_TICK->broadcast; 2526 $WAIT_FOR_TICK->broadcast;
2470 $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#
2471 2531
2472 # 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
2473 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2533 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2474 2534
2475 $TICK_WATCHER->at ($NEXT_TICK); 2535 $TICK_WATCHER->at ($NEXT_TICK);
2476 $TICK_WATCHER->start; 2536 $TICK_WATCHER->start;
2477 }, 2537 },
2478); 2538);
2479 2539
2540{
2480IO::AIO::max_poll_time $TICK * 0.2; 2541 BDB::max_poll_time $TICK * 0.1;
2481 2542 $BDB_POLL_WATCHER = Event->io (
2482Event->io ( 2543 reentrant => 0,
2483 fd => IO::AIO::poll_fileno, 2544 fd => BDB::poll_fileno,
2484 poll => 'r', 2545 poll => 'r',
2485 prio => 5, 2546 prio => 0,
2486 data => WF_AUTOCANCEL,
2487 cb => \&IO::AIO::poll_cb,
2488);
2489
2490Event->timer (
2491 data => WF_AUTOCANCEL, 2547 data => WF_AUTOCANCEL,
2492 after => 0, 2548 cb => \&BDB::poll_cb,
2493 interval => 10, 2549 );
2494 cb => sub { 2550 BDB::min_parallel 8;
2495 (Coro::unblock_sub { 2551
2496 write_runtime 2552 BDB::set_sync_prepare {
2497 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 $@;
2498 })->(); 2586 };
2499 }, 2587 }
2500); 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}
2501 2604
2502END { cf::emergency_save } 2605END { cf::emergency_save }
2503 2606
25041 26071
2505 2608

Diff Legend

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