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

Diff Legend

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