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.166 by root, Sat Jan 13 23:06:13 2007 UTC vs.
Revision 1.239 by root, Mon Apr 16 06:23:42 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Storable; 8use Storable;
9use Event;
9use Opcode; 10use Opcode;
10use Safe; 11use Safe;
11use Safe::Hole; 12use Safe::Hole;
12 13
13use Coro 3.3 (); 14use Coro 3.52 ();
15use Coro::State;
14use Coro::Event; 16use Coro::Event;
15use Coro::Timer; 17use Coro::Timer;
16use Coro::Signal; 18use Coro::Signal;
17use Coro::Semaphore; 19use Coro::Semaphore;
18use Coro::AIO; 20use Coro::AIO;
21use Coro::Storable;
19 22
23use BDB ();
20use Data::Dumper; 24use Data::Dumper;
21use Digest::MD5; 25use Digest::MD5;
22use Fcntl; 26use Fcntl;
27use YAML::Syck ();
23use IO::AIO 2.32 (); 28use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 29use Time::HiRes;
30use Compress::LZF;
26 31
32# configure various modules to our taste
33#
34$Storable::canonical = 1; # reduce rsync transfers
35Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
36Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
37
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 38$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 39
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 40# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 41$YAML::Syck::ImplicitUnicode = 1;
33 42
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 43$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
44
45sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35 46
36our %COMMAND = (); 47our %COMMAND = ();
37our %COMMAND_TIME = (); 48our %COMMAND_TIME = ();
38 49
39our @EXTS = (); # list of extension package names 50our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 51our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 52our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 53our %EXT_MAP = (); # pluggable maps
43 54
55our $RELOAD; # number of reloads so far
44our @EVENT; 56our @EVENT;
45our $LIBDIR = datadir . "/ext"; 57our $LIBDIR = datadir . "/ext";
46 58
47our $TICK = MAX_TIME * 1e-6; 59our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 60our $TICK_WATCHER;
61our $AIO_POLL_WATCHER;
62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
49our $NEXT_TICK; 63our $NEXT_TICK;
50our $NOW; 64our $NOW;
65our $USE_FSYNC = 1; # use fsync to write maps - default off
66
67our $BDB_POLL_WATCHER;
68our $DB_ENV;
51 69
52our %CFG; 70our %CFG;
53 71
54our $UPTIME; $UPTIME ||= time; 72our $UPTIME; $UPTIME ||= time;
55our $RUNTIME; 73our $RUNTIME;
56 74
57our %PLAYER; # all users 75our %PLAYER; # all users
58our %MAP; # all maps 76our %MAP; # all maps
59our $LINK_MAP; # the special {link} map, which is always available 77our $LINK_MAP; # the special {link} map, which is always available
60our $RANDOM_MAPS = cf::localdir . "/random"; 78our $RANDOM_MAPS = cf::localdir . "/random";
61 79our $BDB_ENV_DIR = cf::localdir . "/db";
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
64 80
65# used to convert map paths into valid unix filenames by replacing / by ∕ 81# used to convert map paths into valid unix filenames by replacing / by ∕
66our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 82our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
67 83
68binmode STDOUT; 84binmode STDOUT;
78mkdir cf::localdir; 94mkdir cf::localdir;
79mkdir cf::localdir . "/" . cf::playerdir; 95mkdir cf::localdir . "/" . cf::playerdir;
80mkdir cf::localdir . "/" . cf::tmpdir; 96mkdir cf::localdir . "/" . cf::tmpdir;
81mkdir cf::localdir . "/" . cf::uniquedir; 97mkdir cf::localdir . "/" . cf::uniquedir;
82mkdir $RANDOM_MAPS; 98mkdir $RANDOM_MAPS;
99mkdir $BDB_ENV_DIR;
83 100
84our $EMERGENCY_POSITION; 101our $EMERGENCY_POSITION;
102
103sub cf::map::normalise;
85 104
86############################################################################# 105#############################################################################
87 106
88=head2 GLOBAL VARIABLES 107=head2 GLOBAL VARIABLES
89 108
114=item %cf::CFG 133=item %cf::CFG
115 134
116Configuration for the server, loaded from C</etc/crossfire/config>, or 135Configuration for the server, loaded from C</etc/crossfire/config>, or
117from wherever your confdir points to. 136from wherever your confdir points to.
118 137
119=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 138=item cf::wait_for_tick, cf::wait_for_tick_begin
120 139
121These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 140These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
122or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 141returns directly I<after> the tick processing (and consequently, can only wake one process
123processing has been done. Call C<< ->wait >> on them to maximise the 142per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
124window of cpu time available, or simply to synchronise to the server tick.
125 143
126=back 144=back
127 145
128=cut 146=cut
129 147
188 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 206 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
189 $d 207 $d
190 } || "[unable to dump $_[0]: '$@']"; 208 } || "[unable to dump $_[0]: '$@']";
191} 209}
192 210
193use JSON::Syck (); # TODO# replace by JSON::PC once working 211use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
194 212
195=item $ref = cf::from_json $json 213=item $ref = cf::from_json $json
196 214
197Converts a JSON string into the corresponding perl data structure. 215Converts a JSON string into the corresponding perl data structure.
198 216
199=cut
200
201sub from_json($) {
202 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
203 JSON::Syck::Load $_[0]
204}
205
206=item $json = cf::to_json $ref 217=item $json = cf::to_json $ref
207 218
208Converts a perl data structure into its JSON representation. 219Converts a perl data structure into its JSON representation.
209
210=cut
211
212sub to_json($) {
213 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
214 JSON::Syck::Dump $_[0]
215}
216 220
217=item cf::lock_wait $string 221=item cf::lock_wait $string
218 222
219Wait until the given lock is available. See cf::lock_acquire. 223Wait until the given lock is available. See cf::lock_acquire.
220 224
257} 261}
258 262
259sub freeze_mainloop { 263sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active; 264 return unless $TICK_WATCHER->is_active;
261 265
262 my $guard = Coro::guard { $TICK_WATCHER->start }; 266 my $guard = Coro::guard {
267 $TICK_WATCHER->start;
268 };
263 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
264 $guard 270 $guard
265} 271}
266 272
267=item cf::async { BLOCK } 273=item cf::async { BLOCK }
338 344
339 $coro 345 $coro
340} 346}
341 347
342sub write_runtime { 348sub write_runtime {
343 return unless $TICK_WATCHER->is_active; 349 my $guard = cf::lock_acquire "write_runtime";
344 350
345 my $runtime = cf::localdir . "/runtime"; 351 my $runtime = cf::localdir . "/runtime";
346 352
347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
348 or return; 354 or return;
349 355
356 my $value = $cf::RUNTIME + 90 + 10;
350 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 357 # 10 is the runtime save interval, for a monotonic clock
358 # 60 allows for the watchdog to kill the server.
359
351 (aio_write $fh, 0, (length $value), $value, 0) <= 0 360 (aio_write $fh, 0, (length $value), $value, 0) <= 0
352 and return; 361 and return;
353 362
363 # always fsync - this file is important
354 aio_fsync $fh 364 aio_fsync $fh
355 and return; 365 and return;
356 366
357 close $fh 367 close $fh
358 or return; 368 or return;
359 369
360 aio_rename "$runtime~", $runtime 370 aio_rename "$runtime~", $runtime
361 and return; 371 and return;
362 372
363 1 373 1
374}
375
376=item cf::datalog type => key => value, ...
377
378Log a datalog packet of the given type with the given key-value pairs.
379
380=cut
381
382sub datalog($@) {
383 my ($type, %kv) = @_;
384 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
364} 385}
365 386
366=back 387=back
367 388
368=cut 389=cut
499our @CB_TYPE = (); # registry for type (cf-object class) based events 520our @CB_TYPE = (); # registry for type (cf-object class) based events
500our @CB_MAP = (); 521our @CB_MAP = ();
501 522
502my %attachment; 523my %attachment;
503 524
525sub cf::attachable::thawer_merge {
526 # simply override everything except _meta
527 local $_[0]{_meta};
528 %{$_[0]} = %{$_[1]};
529}
530
504sub _attach_cb($$$$) { 531sub _attach_cb($$$$) {
505 my ($registry, $event, $prio, $cb) = @_; 532 my ($registry, $event, $prio, $cb) = @_;
506 533
507 use sort 'stable'; 534 use sort 'stable';
508 535
679# object support 706# object support
680 707
681sub reattach { 708sub reattach {
682 # basically do the same as instantiate, without calling instantiate 709 # basically do the same as instantiate, without calling instantiate
683 my ($obj) = @_; 710 my ($obj) = @_;
711
712 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
684 713
685 my $registry = $obj->registry; 714 my $registry = $obj->registry;
686 715
687 @$registry = (); 716 @$registry = ();
688 717
735 $filename, length $$rdata, scalar @$objs; 764 $filename, length $$rdata, scalar @$objs;
736 765
737 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 766 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
738 chmod SAVE_MODE, $fh; 767 chmod SAVE_MODE, $fh;
739 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 768 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
740 aio_fsync $fh; 769 aio_fsync $fh if $cf::USE_FSYNC;
741 close $fh; 770 close $fh;
742 771
743 if (@$objs) { 772 if (@$objs) {
744 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 773 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
745 chmod SAVE_MODE, $fh; 774 chmod SAVE_MODE, $fh;
746 my $data = Storable::nfreeze { version => 1, objs => $objs }; 775 my $data = Storable::nfreeze { version => 1, objs => $objs };
747 aio_write $fh, 0, (length $data), $data, 0; 776 aio_write $fh, 0, (length $data), $data, 0;
748 aio_fsync $fh; 777 aio_fsync $fh if $cf::USE_FSYNC;
749 close $fh; 778 close $fh;
750 aio_rename "$filename.pst~", "$filename.pst"; 779 aio_rename "$filename.pst~", "$filename.pst";
751 } 780 }
752 } else { 781 } else {
753 aio_unlink "$filename.pst"; 782 aio_unlink "$filename.pst";
900 } or warn "$ext not loaded: $@"; 929 } or warn "$ext not loaded: $@";
901 } 930 }
902} 931}
903 932
904############################################################################# 933#############################################################################
905# load/save/clean perl data associated with a map
906
907*cf::mapsupport::on_clean = sub {
908 my ($map) = @_;
909
910 my $path = $map->tmpname;
911 defined $path or return;
912
913 unlink "$path.pst";
914};
915
916cf::map->attach (prio => -10000, package => cf::mapsupport::);
917
918#############################################################################
919 934
920=head2 CORE EXTENSIONS 935=head2 CORE EXTENSIONS
921 936
922Functions and methods that extend core crossfire objects. 937Functions and methods that extend core crossfire objects.
923 938
946} 961}
947 962
948sub path($) { 963sub path($) {
949 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
950 965
951 (playerdir $login) . "/$login.pl" 966 (playerdir $login) . "/playerdata"
952} 967}
953 968
954sub find_active($) { 969sub find_active($) {
955 $cf::PLAYER{$_[0]} 970 $cf::PLAYER{$_[0]}
956 and $cf::PLAYER{$_[0]}->active 971 and $cf::PLAYER{$_[0]}->active
959 974
960sub exists($) { 975sub exists($) {
961 my ($login) = @_; 976 my ($login) = @_;
962 977
963 $cf::PLAYER{$login} 978 $cf::PLAYER{$login}
964 or cf::sync_job { !aio_stat $login } 979 or cf::sync_job { !aio_stat path $login }
965} 980}
966 981
967sub find($) { 982sub find($) {
968 return $cf::PLAYER{$_[0]} || do { 983 return $cf::PLAYER{$_[0]} || do {
969 my $login = $_[0]; 984 my $login = $_[0];
970 985
971 my $guard = cf::lock_acquire "user_find:$login"; 986 my $guard = cf::lock_acquire "user_find:$login";
972 987
973 $cf::PLAYER{$_[0]} || do { 988 $cf::PLAYER{$_[0]} || do {
989 # rename old playerfiles to new ones
990 #TODO: remove when no longer required
991 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
992 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
993 aio_unlink +(playerdir $login) . "/$login.pl.pst";
994 aio_unlink +(playerdir $login) . "/$login.pl";
995
974 my $pl = load_pl path $login 996 my $pl = load_pl path $login
975 or return; 997 or return;
976 $cf::PLAYER{$login} = $pl 998 $cf::PLAYER{$login} = $pl
977 } 999 }
978 } 1000 }
1015 1037
1016=cut 1038=cut
1017 1039
1018sub quit_character { 1040sub quit_character {
1019 my ($pl) = @_; 1041 my ($pl) = @_;
1042
1043 my $name = $pl->ob->name;
1020 1044
1021 $pl->{deny_save} = 1; 1045 $pl->{deny_save} = 1;
1022 $pl->password ("*"); # this should lock out the player until we nuked the dir 1046 $pl->password ("*"); # this should lock out the player until we nuked the dir
1023 1047
1024 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1048 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1029 my $path = playerdir $pl; 1053 my $path = playerdir $pl;
1030 my $temp = "$path~$cf::RUNTIME~deleting~"; 1054 my $temp = "$path~$cf::RUNTIME~deleting~";
1031 aio_rename $path, $temp; 1055 aio_rename $path, $temp;
1032 delete $cf::PLAYER{$pl->ob->name}; 1056 delete $cf::PLAYER{$pl->ob->name};
1033 $pl->destroy; 1057 $pl->destroy;
1058
1059 my $prefix = qr<^~\Q$name\E/>;
1060
1061 # nuke player maps
1062 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1063
1034 IO::AIO::aio_rmtree $temp; 1064 IO::AIO::aio_rmtree $temp;
1065}
1066
1067=item $pl->kick
1068
1069Kicks a player out of the game. This destroys the connection.
1070
1071=cut
1072
1073sub kick {
1074 my ($pl, $kicker) = @_;
1075
1076 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1077 $pl->killer ("kicked");
1078 $pl->ns->destroy;
1035} 1079}
1036 1080
1037=item cf::player::list_logins 1081=item cf::player::list_logins
1038 1082
1039Returns am arrayref of all valid playernames in the system, can take a 1083Returns am arrayref of all valid playernames in the system, can take a
1067=cut 1111=cut
1068 1112
1069sub maps($) { 1113sub maps($) {
1070 my ($pl) = @_; 1114 my ($pl) = @_;
1071 1115
1116 $pl = ref $pl ? $pl->ob->name : $pl;
1117
1072 my $files = aio_readdir playerdir $pl 1118 my $files = aio_readdir playerdir $pl
1073 or return; 1119 or return;
1074 1120
1075 my @paths; 1121 my @paths;
1076 1122
1077 for (@$files) { 1123 for (@$files) {
1078 utf8::decode $_; 1124 utf8::decode $_;
1079 next if /\.(?:pl|pst)$/; 1125 next if /\.(?:pl|pst)$/;
1080 next unless /^$PATH_SEP/o; 1126 next unless /^$PATH_SEP/o;
1081 1127
1082 push @paths, "~" . $pl->ob->name . "/" . $_; 1128 push @paths, cf::map::normalise "~$pl/$_";
1083 } 1129 }
1084 1130
1085 \@paths 1131 \@paths
1086} 1132}
1087 1133
1088=item $player->ext_reply ($msgid, $msgtype, %msg) 1134=item $player->ext_reply ($msgid, %msg)
1089 1135
1090Sends an ext reply to the player. 1136Sends an ext reply to the player.
1091 1137
1092=cut 1138=cut
1093 1139
1094sub ext_reply($$$%) { 1140sub ext_reply($$%) {
1095 my ($self, $id, %msg) = @_; 1141 my ($self, $id, %msg) = @_;
1096 1142
1097 $msg{msgid} = $id; 1143 $msg{msgid} = $id;
1098 1144
1099 $self->send ("ext " . cf::to_json \%msg); 1145 $self->send ("ext " . cf::to_json \%msg);
1100} 1146}
1101 1147
1102package cf; 1148=item $player->ext_event ($type, %msg)
1149
1150Sends an ext event to the client.
1151
1152=cut
1153
1154sub ext_event($$%) {
1155 my ($self, $type, %msg) = @_;
1156
1157 $self->ns->ext_event ($type, %msg);
1158}
1159
1160=head3 cf::region
1161
1162=over 4
1163
1164=cut
1165
1166package cf::region;
1167
1168=item cf::region::find_by_path $path
1169
1170Tries to decuce the probable region for a map knowing only its path.
1171
1172=cut
1173
1174sub find_by_path($) {
1175 my ($path) = @_;
1176
1177 my ($match, $specificity);
1178
1179 for my $region (list) {
1180 if ($region->match && $path =~ $region->match) {
1181 ($match, $specificity) = ($region, $region->specificity)
1182 if $region->specificity > $specificity;
1183 }
1184 }
1185
1186 $match
1187}
1103 1188
1104=back 1189=back
1105
1106 1190
1107=head3 cf::map 1191=head3 cf::map
1108 1192
1109=over 4 1193=over 4
1110 1194
1114 1198
1115use Fcntl; 1199use Fcntl;
1116use Coro::AIO; 1200use Coro::AIO;
1117 1201
1118use overload 1202use overload
1119 '""' => \&as_string; 1203 '""' => \&as_string,
1204 fallback => 1;
1120 1205
1121our $MAX_RESET = 3600; 1206our $MAX_RESET = 3600;
1122our $DEFAULT_RESET = 3000; 1207our $DEFAULT_RESET = 3000;
1123 1208
1124sub generate_random_map { 1209sub generate_random_map {
1125 my ($self, $rmp) = @_; 1210 my ($self, $rmp) = @_;
1126
1127 # mit "rum" bekleckern, nicht 1211 # mit "rum" bekleckern, nicht
1128 $self->_create_random_map ( 1212 $self->_create_random_map (
1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1213 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1214 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1215 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1222 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1139 (cf::region::find $rmp->{region}), $rmp->{custom} 1223 (cf::region::find $rmp->{region}), $rmp->{custom}
1140 ) 1224 )
1141} 1225}
1142 1226
1227=item cf::map->register ($regex, $prio)
1228
1229Register a handler for the map path matching the given regex at the
1230givne priority (higher is better, built-in handlers have priority 0, the
1231default).
1232
1233=cut
1234
1143sub register { 1235sub register {
1144 my (undef, $regex) = @_; 1236 my (undef, $regex, $prio) = @_;
1145 my $pkg = caller; 1237 my $pkg = caller;
1146 1238
1147 no strict; 1239 no strict;
1148 push @{"$pkg\::ISA"}, __PACKAGE__; 1240 push @{"$pkg\::ISA"}, __PACKAGE__;
1149 1241
1150 $EXT_MAP{$pkg} = qr<$regex>; 1242 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1151} 1243}
1152 1244
1153# also paths starting with '/' 1245# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1246$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1247
1248sub thawer_merge {
1249 my ($self, $merge) = @_;
1250
1251 # we have to keep some variables in memory intact
1252 local $self->{path};
1253 local $self->{load_path};
1254 local $self->{deny_save};
1255 local $self->{deny_reset};
1256
1257 $self->SUPER::thawer_merge ($merge);
1258}
1155 1259
1156sub normalise { 1260sub normalise {
1157 my ($path, $base) = @_; 1261 my ($path, $base) = @_;
1262
1263 $path = "$path"; # make sure its a string
1264
1265 $path =~ s/\.map$//;
1158 1266
1159 # map plan: 1267 # map plan:
1160 # 1268 #
1161 # /! non-realised random map exit (special hack!) 1269 # /! non-realised random map exit (special hack!)
1162 # {... are special paths that are not being touched 1270 # {... are special paths that are not being touched
1190 1298
1191 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1299 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1192 1300
1193 $path = normalise $path, $base; 1301 $path = normalise $path, $base;
1194 1302
1195 for my $pkg (keys %EXT_MAP) { 1303 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1196 if ($path =~ $EXT_MAP{$pkg}) { 1304 if ($path =~ $EXT_MAP{$pkg}[1]) {
1197 my $self = bless cf::map::new, $pkg; 1305 my $self = bless cf::map::new, $pkg;
1198 $self->{path} = $path; $self->path ($path); 1306 $self->{path} = $path; $self->path ($path);
1199 $self->init; # pass $1 etc. 1307 $self->init; # pass $1 etc.
1200 return $self; 1308 return $self;
1201 } 1309 }
1202 } 1310 }
1203 1311
1204 Carp::carp "unable to resolve path '$path'."; 1312 Carp::carp "unable to resolve path '$path' (base '$base').";
1205 () 1313 ()
1206} 1314}
1207 1315
1208sub init { 1316sub init {
1209 my ($self) = @_; 1317 my ($self) = @_;
1220# the displayed name, this is a one way mapping 1328# the displayed name, this is a one way mapping
1221sub visible_name { 1329sub visible_name {
1222 &as_string 1330 &as_string
1223} 1331}
1224 1332
1225# escape the /'s in the path
1226sub _escaped_path {
1227 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1228
1229 $path
1230}
1231
1232# the original (read-only) location 1333# the original (read-only) location
1233sub load_path { 1334sub load_path {
1234 my ($self) = @_; 1335 my ($self) = @_;
1235 1336
1236 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1337 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1237} 1338}
1238 1339
1239# the temporary/swap location 1340# the temporary/swap location
1240sub save_path { 1341sub save_path {
1241 my ($self) = @_; 1342 my ($self) = @_;
1242 1343
1344 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1243 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $self->_escaped_path 1345 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1244} 1346}
1245 1347
1246# the unique path, undef == no special unique path 1348# the unique path, undef == no special unique path
1247sub uniq_path { 1349sub uniq_path {
1248 my ($self) = @_; 1350 my ($self) = @_;
1249 1351
1352 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1250 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 1353 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1251} 1354}
1252 1355
1253# and all this just because we cannot iterate over 1356# and all this just because we cannot iterate over
1254# all maps in C++... 1357# all maps in C++...
1255sub change_all_map_light { 1358sub change_all_map_light {
1261 1364
1262sub unlink_save { 1365sub unlink_save {
1263 my ($self) = @_; 1366 my ($self) = @_;
1264 1367
1265 utf8::encode (my $save = $self->save_path); 1368 utf8::encode (my $save = $self->save_path);
1266 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1369 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1267 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1370 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1268} 1371}
1269 1372
1270sub load_header_from($) { 1373sub load_header_from($) {
1271 my ($self, $path) = @_; 1374 my ($self, $path) = @_;
1272 1375
1273 utf8::encode $path; 1376 utf8::encode $path;
1274 aio_open $path, O_RDONLY, 0 1377 #aio_open $path, O_RDONLY, 0
1275 or return; 1378 # or return;
1276 1379
1277 $self->_load_header ($path) 1380 $self->_load_header ($path)
1278 or return; 1381 or return;
1279 1382
1280 $self->{load_path} = $path; 1383 $self->{load_path} = $path;
1281 1384
1282 1 1385 1
1283} 1386}
1284 1387
1285sub load_orig { 1388sub load_header_orig {
1286 my ($self) = @_; 1389 my ($self) = @_;
1287 1390
1288 $self->load_header_from ($self->load_path) 1391 $self->load_header_from ($self->load_path)
1289} 1392}
1290 1393
1291sub load_temp { 1394sub load_header_temp {
1292 my ($self) = @_; 1395 my ($self) = @_;
1293 1396
1294 $self->load_header_from ($self->save_path) 1397 $self->load_header_from ($self->save_path)
1398}
1399
1400sub prepare_temp {
1401 my ($self) = @_;
1402
1403 $self->last_access ((delete $self->{last_access})
1404 || $cf::RUNTIME); #d#
1405 # safety
1406 $self->{instantiate_time} = $cf::RUNTIME
1407 if $self->{instantiate_time} > $cf::RUNTIME;
1408}
1409
1410sub prepare_orig {
1411 my ($self) = @_;
1412
1413 $self->{load_original} = 1;
1414 $self->{instantiate_time} = $cf::RUNTIME;
1415 $self->last_access ($cf::RUNTIME);
1416 $self->instantiate;
1295} 1417}
1296 1418
1297sub load_header { 1419sub load_header {
1298 my ($self) = @_; 1420 my ($self) = @_;
1299 1421
1300 if ($self->load_temp) { 1422 if ($self->load_header_temp) {
1301 $self->last_access ((delete $self->{last_access}) 1423 $self->prepare_temp;
1302 || $cf::RUNTIME); #d#
1303 # safety
1304 $self->{instantiate_time} = $cf::RUNTIME
1305 if $self->{instantiate_time} > $cf::RUNTIME;
1306 } else { 1424 } else {
1307 $self->load_orig 1425 $self->load_header_orig
1308 or return; 1426 or return;
1309 1427 $self->prepare_orig;
1310 $self->{load_original} = 1;
1311 $self->{instantiate_time} = $cf::RUNTIME;
1312 $self->last_access ($cf::RUNTIME);
1313 $self->instantiate;
1314 } 1428 }
1429
1430 $self->default_region (cf::region::find_by_path $self->{path})
1431 unless $self->default_region;
1315 1432
1316 1 1433 1
1317} 1434}
1318 1435
1319sub find; 1436sub find;
1332 $map->{last_save} = $cf::RUNTIME; 1449 $map->{last_save} = $cf::RUNTIME;
1333 1450
1334 $map->load_header 1451 $map->load_header
1335 or return; 1452 or return;
1336 1453
1337 if ($map->should_reset) { 1454 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1455 # doing this can freeze the server in a sync job, obviously
1456 #$cf::WAIT_FOR_TICK->wait;
1338 $map->reset; 1457 $map->reset;
1339 undef $guard; 1458 undef $guard;
1340 $map = find $path 1459 return find $path;
1341 or return;
1342 } 1460 }
1343 1461
1344 $cf::MAP{$path} = $map 1462 $cf::MAP{$path} = $map
1345 } 1463 }
1346} 1464}
1465
1466sub pre_load { }
1467sub post_load { }
1347 1468
1348sub load { 1469sub load {
1349 my ($self) = @_; 1470 my ($self) = @_;
1350 1471
1472 local $self->{deny_reset} = 1; # loading can take a long time
1473
1351 my $path = $self->{path}; 1474 my $path = $self->{path};
1352 my $guard = cf::lock_acquire "map_load:$path"; 1475 my $guard = cf::lock_acquire "map_load:$path";
1353 1476
1354 return if $self->in_memory != cf::MAP_SWAPPED; 1477 return if $self->in_memory != cf::MAP_SWAPPED;
1355 1478
1356 $self->in_memory (cf::MAP_LOADING); 1479 $self->in_memory (cf::MAP_LOADING);
1357 1480
1358 $self->alloc; 1481 $self->alloc;
1482
1483 $self->pre_load;
1484 Coro::cede;
1485
1359 $self->_load_objects ($self->{load_path}, 1) 1486 $self->_load_objects ($self->{load_path}, 1)
1360 or return; 1487 or return;
1361 1488
1362 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1489 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1363 if delete $self->{load_original}; 1490 if delete $self->{load_original};
1369 $self->_load_objects ($uniq, 0); 1496 $self->_load_objects ($uniq, 0);
1370 } 1497 }
1371 } 1498 }
1372 1499
1373 Coro::cede; 1500 Coro::cede;
1374
1375 # now do the right thing for maps 1501 # now do the right thing for maps
1376 $self->link_multipart_objects; 1502 $self->link_multipart_objects;
1503 Coro::cede;
1377 1504
1378 unless ($self->{deny_activate}) { 1505 unless ($self->{deny_activate}) {
1379 $self->decay_objects; 1506 $self->decay_objects;
1380 $self->fix_auto_apply; 1507 $self->fix_auto_apply;
1381 $self->update_buttons; 1508 $self->update_buttons;
1383 $self->set_darkness_map; 1510 $self->set_darkness_map;
1384 $self->difficulty ($self->estimate_difficulty) 1511 $self->difficulty ($self->estimate_difficulty)
1385 unless $self->difficulty; 1512 unless $self->difficulty;
1386 Coro::cede; 1513 Coro::cede;
1387 $self->activate; 1514 $self->activate;
1515 Coro::cede;
1388 } 1516 }
1517
1518 $self->post_load;
1519 Coro::cede;
1389 1520
1390 $self->in_memory (cf::MAP_IN_MEMORY); 1521 $self->in_memory (cf::MAP_IN_MEMORY);
1391} 1522}
1392 1523
1393sub customise_for { 1524sub customise_for {
1434 1565
1435 cf::sync_job { $map->load }; 1566 cf::sync_job { $map->load };
1436} 1567}
1437 1568
1438our %MAP_PREFETCH; 1569our %MAP_PREFETCH;
1439our $MAP_PREFETCHER = Coro::async { 1570our $MAP_PREFETCHER = undef;
1440 while () {
1441 for my $path (keys %MAP_PREFETCH) {
1442 my $map = find $path
1443 or next;
1444 $map->load;
1445
1446 delete $MAP_PREFETCH{$path};
1447 }
1448 Coro::schedule;
1449 }
1450};
1451 1571
1452sub find_async { 1572sub find_async {
1453 my ($path, $origin) = @_; 1573 my ($path, $origin) = @_;
1454 1574
1455 $path = normalise $path, $origin && $origin->{path}; 1575 $path = normalise $path, $origin && $origin->{path};
1456 1576
1457 if (my $map = $cf::MAP{$path}) { 1577 if (my $map = $cf::MAP{$path}) {
1458 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1578 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1459 } 1579 }
1460 1580
1461 $MAP_PREFETCH{$path} = 0; 1581 undef $MAP_PREFETCH{$path};
1582 $MAP_PREFETCHER ||= cf::async {
1583 while (%MAP_PREFETCH) {
1584 for my $path (keys %MAP_PREFETCH) {
1585 my $map = find $path
1586 or next;
1587 $map->load;
1588
1589 delete $MAP_PREFETCH{$path};
1590 }
1591 }
1592 undef $MAP_PREFETCHER;
1593 };
1462 $MAP_PREFETCHER->ready; 1594 $MAP_PREFETCHER->prio (6);
1463 1595
1464 () 1596 ()
1465} 1597}
1466 1598
1467sub save { 1599sub save {
1512 1644
1513sub reset_at { 1645sub reset_at {
1514 my ($self) = @_; 1646 my ($self) = @_;
1515 1647
1516 # TODO: safety, remove and allow resettable per-player maps 1648 # TODO: safety, remove and allow resettable per-player maps
1517 return 1e99 if $self->isa ("ext::map_per_player"); 1649 return 1e99 if $self->isa ("ext::map_per_player");#d#
1518 return 1e99 if $self->{deny_reset}; 1650 return 1e99 if $self->{deny_reset};
1519 1651
1520 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1652 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1521 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1653 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1522 1654
1527 my ($self) = @_; 1659 my ($self) = @_;
1528 1660
1529 $self->reset_at <= $cf::RUNTIME 1661 $self->reset_at <= $cf::RUNTIME
1530} 1662}
1531 1663
1532sub rename {
1533 my ($self, $new_path) = @_;
1534
1535 normalise $new_path;
1536
1537 $self->unlink_save;
1538
1539 delete $cf::MAP{$self->path};
1540 $self->{path} = $new_path; $self->path ($self->{path});
1541 $cf::MAP{$self->path} = $self;
1542
1543 $self->save;
1544}
1545
1546sub reset { 1664sub reset {
1547 my ($self) = @_; 1665 my ($self) = @_;
1548 1666
1549 my $lock = cf::lock_acquire "map_data:" . $self->path; 1667 my $lock = cf::lock_acquire "map_data:$self->{path}";
1550 1668
1551 return if $self->players; 1669 return if $self->players;
1552 return if $self->isa ("ext::map_per_player");#d# 1670 return if $self->isa ("ext::map_per_player");#d#
1553 1671
1554 warn "resetting map ", $self->path;#d# 1672 warn "resetting map ", $self->path;#d#
1555 1673
1674 $self->in_memory (cf::MAP_SWAPPED);
1675
1676 # need to save uniques path
1677 unless ($self->{deny_save}) {
1678 my $uniq = $self->uniq_path; utf8::encode $uniq;
1679
1680 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1681 if $uniq;
1682 }
1683
1556 delete $cf::MAP{$self->path}; 1684 delete $cf::MAP{$self->path};
1685
1686 $self->clear;
1557 1687
1558 $_->clear_links_to ($self) for values %cf::MAP; 1688 $_->clear_links_to ($self) for values %cf::MAP;
1559 1689
1560 $self->unlink_save; 1690 $self->unlink_save;
1561 $self->destroy; 1691 $self->destroy;
1564my $nuke_counter = "aaaa"; 1694my $nuke_counter = "aaaa";
1565 1695
1566sub nuke { 1696sub nuke {
1567 my ($self) = @_; 1697 my ($self) = @_;
1568 1698
1699 delete $cf::MAP{$self->path};
1700
1701 $self->unlink_save;
1702
1703 bless $self, "cf::map";
1704 delete $self->{deny_reset};
1569 $self->{deny_save} = 1; 1705 $self->{deny_save} = 1;
1570 $self->reset_timeout (1); 1706 $self->reset_timeout (1);
1571 $self->rename ("{nuke}/" . ($nuke_counter++)); 1707 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1708
1709 $cf::MAP{$self->path} = $self;
1710
1572 $self->reset; # polite request, might not happen 1711 $self->reset; # polite request, might not happen
1573} 1712}
1574 1713
1575=item cf::map::unique_maps 1714=item cf::map::unique_maps
1576 1715
1588 for (@$files) { 1727 for (@$files) {
1589 utf8::decode $_; 1728 utf8::decode $_;
1590 next if /\.pst$/; 1729 next if /\.pst$/;
1591 next unless /^$PATH_SEP/o; 1730 next unless /^$PATH_SEP/o;
1592 1731
1593 push @paths, $_; 1732 push @paths, cf::map::normalise $_;
1594 } 1733 }
1595 1734
1596 \@paths 1735 \@paths
1597} 1736}
1598 1737
1692=cut 1831=cut
1693 1832
1694sub link_map { 1833sub link_map {
1695 unless ($LINK_MAP) { 1834 unless ($LINK_MAP) {
1696 $LINK_MAP = cf::map::find "{link}" 1835 $LINK_MAP = cf::map::find "{link}"
1697 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1836 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1698 $LINK_MAP->load; 1837 $LINK_MAP->load;
1699 } 1838 }
1700 1839
1701 $LINK_MAP 1840 $LINK_MAP
1702} 1841}
1709 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1848 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710 1849
1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1850 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712 if $self->map; 1851 if $self->map;
1713 1852
1714 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1853 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1715} 1854}
1716 1855
1717sub cf::object::player::leave_link { 1856sub cf::object::player::leave_link {
1718 my ($self, $map, $x, $y) = @_; 1857 my ($self, $map, $x, $y) = @_;
1719 1858
1741 $map->load; 1880 $map->load;
1742 $map->load_diag; 1881 $map->load_diag;
1743 1882
1744 return unless $self->contr->active; 1883 return unless $self->contr->active;
1745 $self->activate_recursive; 1884 $self->activate_recursive;
1885
1886 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1746 $self->enter_map ($map, $x, $y); 1887 $self->enter_map ($map, $x, $y);
1747} 1888}
1748 1889
1749cf::player->attach ( 1890cf::player->attach (
1750 on_logout => sub { 1891 on_logout => sub {
1763 # try to abort aborted map switching on player login :) 1904 # try to abort aborted map switching on player login :)
1764 # should happen only on crashes 1905 # should happen only on crashes
1765 if ($pl->ob->{_link_pos}) { 1906 if ($pl->ob->{_link_pos}) {
1766 $pl->ob->enter_link; 1907 $pl->ob->enter_link;
1767 (async { 1908 (async {
1768 # we need this sleep as the login has a concurrent enter_exit running
1769 # and this sleep increases chances of the player not ending up in scorn
1770 $pl->ob->reply (undef, 1909 $pl->ob->reply (undef,
1771 "There was an internal problem at your last logout, " 1910 "There was an internal problem at your last logout, "
1772 . "the server will try to bring you to your intended destination in a second.", 1911 . "the server will try to bring you to your intended destination in a second.",
1773 cf::NDI_RED); 1912 cf::NDI_RED);
1913 # we need this sleep as the login has a concurrent enter_exit running
1914 # and this sleep increases chances of the player not ending up in scorn
1774 Coro::Timer::sleep 1; 1915 Coro::Timer::sleep 1;
1775 $pl->ob->leave_link; 1916 $pl->ob->leave_link;
1776 })->prio (2); 1917 })->prio (2);
1777 } 1918 }
1778 }, 1919 },
1786 my ($self, $path, $x, $y) = @_; 1927 my ($self, $path, $x, $y) = @_;
1787 1928
1788 $self->enter_link; 1929 $self->enter_link;
1789 1930
1790 (async { 1931 (async {
1932 my $map = eval {
1791 my $map = cf::map::find $path; 1933 my $map = cf::map::find $path;
1792 $map = $map->customise_for ($self) if $map; 1934 $map = $map->customise_for ($self) if $map;
1793 1935 $map
1794# warn "entering ", $map->path, " at ($x, $y)\n" 1936 } or
1795# if $map;
1796
1797 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1937 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1798 1938
1799 $self->leave_link ($map, $x, $y); 1939 $self->leave_link ($map, $x, $y);
1800 })->prio (1); 1940 })->prio (1);
1801} 1941}
1802 1942
1806 1946
1807sub parse_random_map_params { 1947sub parse_random_map_params {
1808 my ($spec) = @_; 1948 my ($spec) = @_;
1809 1949
1810 my $rmp = { # defaults 1950 my $rmp = { # defaults
1811 xsize => 10, 1951 xsize => (cf::rndm 15, 40),
1812 ysize => 10, 1952 ysize => (cf::rndm 15, 40),
1953 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1954 #layout => string,
1813 }; 1955 };
1814 1956
1815 for (split /\n/, $spec) { 1957 for (split /\n/, $spec) {
1816 my ($k, $v) = split /\s+/, $_, 2; 1958 my ($k, $v) = split /\s+/, $_, 2;
1817 1959
1821 $rmp 1963 $rmp
1822} 1964}
1823 1965
1824sub prepare_random_map { 1966sub prepare_random_map {
1825 my ($exit) = @_; 1967 my ($exit) = @_;
1968
1969 my $guard = cf::lock_acquire "exit_prepare:$exit";
1826 1970
1827 # all this does is basically replace the /! path by 1971 # all this does is basically replace the /! path by
1828 # a new random map path (?random/...) with a seed 1972 # a new random map path (?random/...) with a seed
1829 # that depends on the exit object 1973 # that depends on the exit object
1830 1974
1831 my $rmp = parse_random_map_params $exit->msg; 1975 my $rmp = parse_random_map_params $exit->msg;
1832 1976
1833 if ($exit->map) { 1977 if ($exit->map) {
1834 $rmp->{region} = $exit->map->region_name; 1978 $rmp->{region} = $exit->region->name;
1835 $rmp->{origin_map} = $exit->map->path; 1979 $rmp->{origin_map} = $exit->map->path;
1836 $rmp->{origin_x} = $exit->x; 1980 $rmp->{origin_x} = $exit->x;
1837 $rmp->{origin_y} = $exit->y; 1981 $rmp->{origin_y} = $exit->y;
1838 } 1982 }
1839 1983
1840 $rmp->{random_seed} ||= $exit->random_seed; 1984 $rmp->{random_seed} ||= $exit->random_seed;
1841 1985
1842 my $data = cf::to_json $rmp; 1986 my $data = cf::to_json $rmp;
1843 my $md5 = Digest::MD5::md5_hex $data; 1987 my $md5 = Digest::MD5::md5_hex $data;
1988 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1844 1989
1845 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1990 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1846 aio_write $fh, 0, (length $data), $data, 0; 1991 aio_write $fh, 0, (length $data), $data, 0;
1992 undef $fh;
1993 aio_rename "$meta~", $meta;
1847 1994
1848 $exit->slaying ("?random/$md5"); 1995 $exit->slaying ("?random/$md5");
1849 $exit->msg (undef); 1996 $exit->msg (undef);
1850 } 1997 }
1851} 1998}
1852 1999
1853sub cf::object::player::enter_exit { 2000sub cf::object::player::enter_exit {
1854 my ($self, $exit) = @_; 2001 my ($self, $exit) = @_;
1855 2002
1856 return unless $self->type == cf::PLAYER; 2003 return unless $self->type == cf::PLAYER;
2004
2005 if ($exit->slaying eq "/!") {
2006 #TODO: this should de-fi-ni-te-ly not be a sync-job
2007 # the problem is that $exit might not survive long enough
2008 # so it needs to be done right now, right here
2009 cf::sync_job { prepare_random_map $exit };
2010 }
2011
2012 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2013 my $hp = $exit->stats->hp;
2014 my $sp = $exit->stats->sp;
1857 2015
1858 $self->enter_link; 2016 $self->enter_link;
1859 2017
1860 (async { 2018 (async {
1861 $self->deactivate_recursive; # just to be sure 2019 $self->deactivate_recursive; # just to be sure
1862 unless (eval { 2020 unless (eval {
1863 prepare_random_map $exit 2021 $self->goto ($slaying, $hp, $sp);
1864 if $exit->slaying eq "/!";
1865
1866 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1867 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1868 2022
1869 1; 2023 1;
1870 }) { 2024 }) {
1871 $self->message ("Something went wrong deep within the crossfire server. " 2025 $self->message ("Something went wrong deep within the crossfire server. "
1872 . "I'll try to bring you back to the map you were before. " 2026 . "I'll try to bring you back to the map you were before. "
1873 . "Please report this to the dungeon master!", 2027 . "Please report this to the dungeon master!",
1874 cf::NDI_UNIQUE | cf::NDI_RED); 2028 cf::NDI_UNIQUE | cf::NDI_RED);
1875 2029
1876 warn "ERROR in enter_exit: $@"; 2030 warn "ERROR in enter_exit: $@";
1877 $self->leave_link; 2031 $self->leave_link;
1878 } 2032 }
1879 })->prio (1); 2033 })->prio (1);
1892 2046
1893sub cf::client::send_drawinfo { 2047sub cf::client::send_drawinfo {
1894 my ($self, $text, $flags) = @_; 2048 my ($self, $text, $flags) = @_;
1895 2049
1896 utf8::encode $text; 2050 utf8::encode $text;
1897 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2051 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1898} 2052}
1899 2053
2054=item $client->ext_event ($type, %msg)
2055
2056Sends an exti event to the client.
2057
2058=cut
2059
2060sub cf::client::ext_event($$%) {
2061 my ($self, $type, %msg) = @_;
2062
2063 $msg{msgtype} = "event_$type";
2064 $self->send_packet ("ext " . cf::to_json \%msg);
2065}
1900 2066
1901=item $success = $client->query ($flags, "text", \&cb) 2067=item $success = $client->query ($flags, "text", \&cb)
1902 2068
1903Queues a query to the client, calling the given callback with 2069Queues a query to the client, calling the given callback with
1904the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2070the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1933 # get handled first 2099 # get handled first
1934 my $queue = delete $ns->{query_queue} 2100 my $queue = delete $ns->{query_queue}
1935 or return; # be conservative, not sure how that can happen, but we saw a crash here 2101 or return; # be conservative, not sure how that can happen, but we saw a crash here
1936 2102
1937 (shift @$queue)->[1]->($msg); 2103 (shift @$queue)->[1]->($msg);
2104 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1938 2105
1939 push @{ $ns->{query_queue} }, @$queue; 2106 push @{ $ns->{query_queue} }, @$queue;
1940 2107
1941 if (@{ $ns->{query_queue} } == @$queue) { 2108 if (@{ $ns->{query_queue} } == @$queue) {
1942 if (@$queue) { 2109 if (@$queue) {
2000 2167
2001# here we export the classes and methods available to script code 2168# here we export the classes and methods available to script code
2002 2169
2003=pod 2170=pod
2004 2171
2005The following fucntions and emthods are available within a safe environment: 2172The following functions and methods are available within a safe environment:
2006 2173
2007 cf::object contr pay_amount pay_player map 2174 cf::object contr pay_amount pay_player map
2008 cf::object::player player 2175 cf::object::player player
2009 cf::player peaceful 2176 cf::player peaceful
2010 cf::map trigger 2177 cf::map trigger
2103The parameter C<$family> should best start with the name of the extension 2270The parameter C<$family> should best start with the name of the extension
2104using it, it should be unique. 2271using it, it should be unique.
2105 2272
2106=over 4 2273=over 4
2107 2274
2108=item $hashref = cf::db_get $family
2109
2110Return a hashref for use by the extension C<$family>, which can be
2111modified. After modifications, you have to call C<cf::db_dirty> or
2112C<cf::db_sync>.
2113
2114=item $value = cf::db_get $family => $key 2275=item $value = cf::db_get $family => $key
2115 2276
2116Returns a single value from the database 2277Returns a single value from the database.
2117
2118=item cf::db_put $family => $hashref
2119
2120Stores the given family hashref into the database. Updates are delayed, if
2121you want the data to be synced to disk immediately, use C<cf::db_sync>.
2122 2278
2123=item cf::db_put $family => $key => $value 2279=item cf::db_put $family => $key => $value
2124 2280
2125Stores the given C<$value> in the family hash. Updates are delayed, if you 2281Stores the given C<$value> in the family.
2126want the data to be synced to disk immediately, use C<cf::db_sync>.
2127
2128=item cf::db_dirty
2129
2130Marks the database as dirty, to be updated at a later time.
2131
2132=item cf::db_sync
2133
2134Immediately write the database to disk I<if it is dirty>.
2135 2282
2136=cut 2283=cut
2137 2284
2138our $DB; 2285our $DB;
2139 2286
2140{ 2287sub db_init {
2288 unless ($DB) {
2289 $DB = BDB::db_create $DB_ENV;
2290
2291 cf::sync_job {
2292 eval {
2293 $DB->set_flags (BDB::CHKSUM);
2294
2295 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2296 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2297 cf::cleanup "db_open(db): $!" if $!;
2298 };
2299 cf::cleanup "db_open(db): $@" if $@;
2300 };
2301
2141 my $path = cf::localdir . "/database.pst"; 2302 my $path = cf::localdir . "/database.pst";
2303 if (stat $path) {
2304 cf::sync_job {
2305 my $pst = Storable::retrieve $path;
2142 2306
2143 sub db_load() { 2307 cf::db_put (board => data => $pst->{board});
2144 $DB = stat $path ? Storable::retrieve $path : { }; 2308 cf::db_put (guildrules => data => $pst->{guildrules});
2145 } 2309 cf::db_put (rent => balance => $pst->{rent}{balance});
2310 BDB::db_env_txn_checkpoint $DB_ENV;
2146 2311
2147 my $pid; 2312 unlink $path;
2148
2149 sub db_save() {
2150 waitpid $pid, 0 if $pid;
2151 if (0 == ($pid = fork)) {
2152 $DB->{_meta}{version} = 1;
2153 Storable::nstore $DB, "$path~";
2154 rename "$path~", $path;
2155 cf::_exit 0 if defined $pid;
2156 } 2313 };
2157 }
2158
2159 my $dirty;
2160
2161 sub db_sync() {
2162 db_save if $dirty;
2163 undef $dirty;
2164 }
2165
2166 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2167 db_sync;
2168 });
2169
2170 sub db_dirty() {
2171 $dirty = 1;
2172 $idle->start;
2173 }
2174
2175 sub db_get($;$) {
2176 @_ >= 2
2177 ? $DB->{$_[0]}{$_[1]}
2178 : ($DB->{$_[0]} ||= { })
2179 }
2180
2181 sub db_put($$;$) {
2182 if (@_ >= 3) {
2183 $DB->{$_[0]}{$_[1]} = $_[2];
2184 } else {
2185 $DB->{$_[0]} = $_[1];
2186 }
2187 db_dirty;
2188 }
2189
2190 cf::global->attach (
2191 prio => 10000,
2192 on_cleanup => sub {
2193 db_sync;
2194 }, 2314 }
2195 ); 2315 }
2316}
2317
2318sub db_get($$) {
2319 my $key = "$_[0]/$_[1]";
2320
2321 cf::sync_job {
2322 BDB::db_get $DB, undef, $key, my $data;
2323
2324 $! ? ()
2325 : Compress::LZF::sthaw $data
2326 }
2327}
2328
2329sub db_put($$$) {
2330 BDB::dbreq_pri 4;
2331 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2196} 2332}
2197 2333
2198############################################################################# 2334#############################################################################
2199# the server's main() 2335# the server's init and main functions
2336
2337sub load_facedata {
2338 my $path = sprintf "%s/facedata", cf::datadir;
2339
2340 warn "loading facedata from $path\n";
2341
2342 my $facedata;
2343 0 < aio_load $path, $facedata
2344 or die "$path: $!";
2345
2346 $facedata = Coro::Storable::thaw $facedata;
2347
2348 $facedata->{version} == 2
2349 or cf::cleanup "$path: version mismatch, cannot proceed.";
2350
2351 {
2352 my $faces = $facedata->{faceinfo};
2353
2354 while (my ($face, $info) = each %$faces) {
2355 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2356 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2357 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2358 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2359 Coro::cede;
2360 }
2361
2362 while (my ($face, $info) = each %$faces) {
2363 next unless $info->{smooth};
2364 my $idx = cf::face::find $face
2365 or next;
2366 if (my $smooth = cf::face::find $info->{smooth}) {
2367 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2368 } else {
2369 warn "smooth face '$info->{smooth}' not found for face '$face'";
2370 }
2371 Coro::cede;
2372 }
2373 }
2374
2375 {
2376 my $anims = $facedata->{animinfo};
2377
2378 while (my ($anim, $info) = each %$anims) {
2379 cf::anim::set $anim, $info->{frames}, $info->{facings};
2380 Coro::cede;
2381 }
2382
2383 cf::anim::invalidate_all; # d'oh
2384 }
2385
2386 1
2387}
2388
2389sub reload_resources {
2390 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2391 or die "unable to load regions file\n";#d#
2392 load_facedata
2393 or die "unable to load facedata\n";#d#
2394}
2395
2396sub init {
2397 reload_resources;
2398}
2200 2399
2201sub cfg_load { 2400sub cfg_load {
2202 open my $fh, "<:utf8", cf::confdir . "/config" 2401 open my $fh, "<:utf8", cf::confdir . "/config"
2203 or return; 2402 or return;
2204 2403
2221 2420
2222sub main { 2421sub main {
2223 # we must not ever block the main coroutine 2422 # we must not ever block the main coroutine
2224 local $Coro::idle = sub { 2423 local $Coro::idle = sub {
2225 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2424 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2425 (async {
2226 async { Event::one_event }; 2426 Event::one_event;
2427 })->prio (Coro::PRIO_MAX);
2227 }; 2428 };
2228 2429
2229 cfg_load; 2430 cfg_load;
2230 db_load; 2431 db_init;
2231 load_extensions; 2432 load_extensions;
2433
2434 $TICK_WATCHER->start;
2232 Event::loop; 2435 Event::loop;
2233} 2436}
2234 2437
2235############################################################################# 2438#############################################################################
2236# initialisation and cleanup 2439# initialisation and cleanup
2237 2440
2238# install some emergency cleanup handlers 2441# install some emergency cleanup handlers
2239BEGIN { 2442BEGIN {
2240 for my $signal (qw(INT HUP TERM)) { 2443 for my $signal (qw(INT HUP TERM)) {
2241 Event->signal ( 2444 Event->signal (
2445 reentrant => 0,
2242 data => WF_AUTOCANCEL, 2446 data => WF_AUTOCANCEL,
2243 signal => $signal, 2447 signal => $signal,
2448 prio => 0,
2244 cb => sub { 2449 cb => sub {
2245 cf::cleanup "SIG$signal"; 2450 cf::cleanup "SIG$signal";
2246 }, 2451 },
2247 ); 2452 );
2248 } 2453 }
2249} 2454}
2254 warn "enter emergency perl save\n"; 2459 warn "enter emergency perl save\n";
2255 2460
2256 cf::sync_job { 2461 cf::sync_job {
2257 # use a peculiar iteration method to avoid tripping on perl 2462 # use a peculiar iteration method to avoid tripping on perl
2258 # refcount bugs in for. also avoids problems with players 2463 # refcount bugs in for. also avoids problems with players
2259 # and maps saved/Destroyed asynchronously. 2464 # and maps saved/destroyed asynchronously.
2260 warn "begin emergency player save\n"; 2465 warn "begin emergency player save\n";
2261 for my $login (keys %cf::PLAYER) { 2466 for my $login (keys %cf::PLAYER) {
2262 my $pl = $cf::PLAYER{$login} or next; 2467 my $pl = $cf::PLAYER{$login} or next;
2263 $pl->valid or next; 2468 $pl->valid or next;
2264 $pl->save; 2469 $pl->save;
2270 my $map = $cf::MAP{$path} or next; 2475 my $map = $cf::MAP{$path} or next;
2271 $map->valid or next; 2476 $map->valid or next;
2272 $map->save; 2477 $map->save;
2273 } 2478 }
2274 warn "end emergency map save\n"; 2479 warn "end emergency map save\n";
2480
2481 warn "begin emergency database checkpoint\n";
2482 BDB::db_env_txn_checkpoint $DB_ENV;
2483 warn "end emergency database checkpoint\n";
2275 }; 2484 };
2276 2485
2277 warn "leave emergency perl save\n"; 2486 warn "leave emergency perl save\n";
2487}
2488
2489sub post_cleanup {
2490 my ($make_core) = @_;
2491
2492 warn Carp::longmess "post_cleanup backtrace"
2493 if $make_core;
2278} 2494}
2279 2495
2280sub reload() { 2496sub reload() {
2281 # can/must only be called in main 2497 # can/must only be called in main
2282 if ($Coro::current != $Coro::main) { 2498 if ($Coro::current != $Coro::main) {
2283 warn "can only reload from main coroutine\n"; 2499 warn "can only reload from main coroutine";
2284 return; 2500 return;
2285 } 2501 }
2286 2502
2287 warn "reloading..."; 2503 warn "reloading...";
2288 2504
2289 warn "freezing server"; 2505 warn "entering sync_job";
2290 my $guard = freeze_mainloop; 2506
2507 cf::sync_job {
2508 cf::write_runtime; # external watchdog should not bark
2291 cf::emergency_save; 2509 cf::emergency_save;
2510 cf::write_runtime; # external watchdog should not bark
2292 2511
2293 warn "sync database to disk"; 2512 warn "syncing database to disk";
2294 cf::db_sync; 2513 BDB::db_env_txn_checkpoint $DB_ENV;
2295 IO::AIO::flush;
2296 2514
2297 eval {
2298 # if anything goes wrong in here, we should simply crash as we already saved 2515 # if anything goes wrong in here, we should simply crash as we already saved
2299 2516
2300 warn "cancel all watchers"; 2517 warn "cancelling all WF_AUTOCANCEL watchers";
2301 for (Event::all_watchers) { 2518 for (Event::all_watchers) {
2302 $_->cancel if $_->data & WF_AUTOCANCEL; 2519 $_->cancel if $_->data & WF_AUTOCANCEL;
2303 } 2520 }
2304 2521
2522 warn "flushing outstanding aio requests";
2523 for (;;) {
2524 BDB::flush;
2525 IO::AIO::flush;
2526 Coro::cede;
2527 last unless IO::AIO::nreqs || BDB::nreqs;
2528 warn "iterate...";
2529 }
2530
2531 ++$RELOAD;
2532
2305 warn "cancel all extension coros"; 2533 warn "cancelling all extension coros";
2306 $_->cancel for values %EXT_CORO; 2534 $_->cancel for values %EXT_CORO;
2307 %EXT_CORO = (); 2535 %EXT_CORO = ();
2308 2536
2309 warn "remove commands"; 2537 warn "removing commands";
2310 %COMMAND = (); 2538 %COMMAND = ();
2311 2539
2312 warn "remove ext commands"; 2540 warn "removing ext commands";
2313 %EXTCMD = (); 2541 %EXTCMD = ();
2314 2542
2315 warn "unload/nuke all extensions"; 2543 warn "unloading/nuking all extensions";
2316 for my $pkg (@EXTS) { 2544 for my $pkg (@EXTS) {
2317 warn "... unloading $pkg"; 2545 warn "... unloading $pkg";
2318 2546
2319 if (my $cb = $pkg->can ("unload")) { 2547 if (my $cb = $pkg->can ("unload")) {
2320 eval { 2548 eval {
2325 2553
2326 warn "... nuking $pkg"; 2554 warn "... nuking $pkg";
2327 Symbol::delete_package $pkg; 2555 Symbol::delete_package $pkg;
2328 } 2556 }
2329 2557
2330 warn "unload all perl modules loaded from $LIBDIR"; 2558 warn "unloading all perl modules loaded from $LIBDIR";
2331 while (my ($k, $v) = each %INC) { 2559 while (my ($k, $v) = each %INC) {
2332 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2560 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2333 2561
2334 warn "removing <$k>"; 2562 warn "... unloading $k";
2335 delete $INC{$k}; 2563 delete $INC{$k};
2336 2564
2337 $k =~ s/\.pm$//; 2565 $k =~ s/\.pm$//;
2338 $k =~ s/\//::/g; 2566 $k =~ s/\//::/g;
2339 2567
2342 } 2570 }
2343 2571
2344 Symbol::delete_package $k; 2572 Symbol::delete_package $k;
2345 } 2573 }
2346 2574
2347 warn "get rid of safe::, as good as possible"; 2575 warn "getting rid of safe::, as good as possible";
2348 Symbol::delete_package "safe::$_" 2576 Symbol::delete_package "safe::$_"
2349 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2577 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2350 2578
2351 warn "unload cf.pm \"a bit\""; 2579 warn "unloading cf.pm \"a bit\"";
2352 delete $INC{"cf.pm"}; 2580 delete $INC{"cf.pm"};
2353 2581
2354 # don't, removes xs symbols, too, 2582 # don't, removes xs symbols, too,
2355 # and global variables created in xs 2583 # and global variables created in xs
2356 #Symbol::delete_package __PACKAGE__; 2584 #Symbol::delete_package __PACKAGE__;
2357 2585
2586 warn "unload completed, starting to reload now";
2587
2358 warn "reloading cf.pm"; 2588 warn "reloading cf.pm";
2359 require cf; 2589 require cf;
2360 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2590 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2361 2591
2362 warn "load config and database again"; 2592 warn "loading config and database again";
2363 cf::cfg_load; 2593 cf::cfg_load;
2364 cf::db_load;
2365 2594
2366 warn "load extensions"; 2595 warn "loading extensions";
2367 cf::load_extensions; 2596 cf::load_extensions;
2368 2597
2369 warn "reattach attachments to objects/players"; 2598 warn "reattaching attachments to objects/players";
2370 _global_reattach; 2599 _global_reattach; # objects, sockets
2371 warn "reattach attachments to maps"; 2600 warn "reattaching attachments to maps";
2372 reattach $_ for values %MAP; 2601 reattach $_ for values %MAP;
2373 }; 2602 warn "reattaching attachments to players";
2603 reattach $_ for values %PLAYER;
2374 2604
2375 if ($@) { 2605 warn "loading reloadable resources";
2606 reload_resources;
2607
2608 warn "leaving sync_job";
2609
2610 1
2611 } or do {
2376 warn $@; 2612 warn $@;
2377 warn "error while reloading, exiting."; 2613 warn "error while reloading, exiting.";
2378 exit 1; 2614 exit 1;
2379 } 2615 };
2380 2616
2381 warn "reloaded"; 2617 warn "reloaded";
2382}; 2618};
2383 2619
2620our $RELOAD_WATCHER; # used only during reload
2621
2384register_command "reload" => sub { 2622register_command "reload" => sub {
2385 my ($who, $arg) = @_; 2623 my ($who, $arg) = @_;
2386 2624
2387 if ($who->flag (FLAG_WIZ)) { 2625 if ($who->flag (FLAG_WIZ)) {
2388 $who->message ("start of reload."); 2626 $who->message ("reloading server.");
2627
2628 # doing reload synchronously and two reloads happen back-to-back,
2629 # coro crashes during coro_state_free->destroy here.
2630
2631 $RELOAD_WATCHER ||= Event->timer (
2632 reentrant => 0,
2633 after => 0,
2634 data => WF_AUTOCANCEL,
2635 cb => sub {
2389 reload; 2636 reload;
2390 $who->message ("end of reload."); 2637 undef $RELOAD_WATCHER;
2638 },
2639 );
2391 } 2640 }
2392}; 2641};
2393 2642
2394unshift @INC, $LIBDIR; 2643unshift @INC, $LIBDIR;
2644
2645my $bug_warning = 0;
2646
2647our @WAIT_FOR_TICK;
2648our @WAIT_FOR_TICK_BEGIN;
2649
2650sub wait_for_tick {
2651 my $signal = new Coro::Signal;
2652 push @WAIT_FOR_TICK, $signal;
2653 $signal->wait;
2654}
2655
2656sub wait_for_tick_begin {
2657 my $signal = new Coro::Signal;
2658 push @WAIT_FOR_TICK_BEGIN, $signal;
2659 $signal->wait;
2660}
2395 2661
2396$TICK_WATCHER = Event->timer ( 2662$TICK_WATCHER = Event->timer (
2397 reentrant => 0, 2663 reentrant => 0,
2664 parked => 1,
2398 prio => 0, 2665 prio => 0,
2399 at => $NEXT_TICK || $TICK, 2666 at => $NEXT_TICK || $TICK,
2400 data => WF_AUTOCANCEL, 2667 data => WF_AUTOCANCEL,
2401 cb => sub { 2668 cb => sub {
2669 if ($Coro::current != $Coro::main) {
2670 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2671 unless ++$bug_warning > 10;
2672 return;
2673 }
2674
2402 $NOW = Event::time; 2675 $NOW = Event::time;
2403 2676
2404 cf::server_tick; # one server iteration 2677 cf::server_tick; # one server iteration
2405 $RUNTIME += $TICK; 2678 $RUNTIME += $TICK;
2406 $NEXT_TICK += $TICK; 2679 $NEXT_TICK += $TICK;
2407 2680
2408 $WAIT_FOR_TICK->broadcast; 2681 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2409 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2682 $NEXT_RUNTIME_WRITE = $NOW + 10;
2683 Coro::async_pool {
2684 write_runtime
2685 or warn "ERROR: unable to write runtime file: $!";
2686 };
2687 }
2688
2689 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2690 $sig->send;
2691 }
2692 while (my $sig = shift @WAIT_FOR_TICK) {
2693 $sig->send;
2694 }
2695
2696# my $AFTER = Event::time;
2697# warn $AFTER - $NOW;#d#
2410 2698
2411 # if we are delayed by four ticks or more, skip them all 2699 # if we are delayed by four ticks or more, skip them all
2412 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2700 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2413 2701
2414 $TICK_WATCHER->at ($NEXT_TICK); 2702 $TICK_WATCHER->at ($NEXT_TICK);
2415 $TICK_WATCHER->start; 2703 $TICK_WATCHER->start;
2416 }, 2704 },
2417); 2705);
2418 2706
2707{
2419IO::AIO::max_poll_time $TICK * 0.2; 2708 BDB::max_poll_time $TICK * 0.1;
2420 2709 $BDB_POLL_WATCHER = Event->io (
2421Event->io ( 2710 reentrant => 0,
2422 fd => IO::AIO::poll_fileno, 2711 fd => BDB::poll_fileno,
2423 poll => 'r', 2712 poll => 'r',
2424 prio => 5, 2713 prio => 0,
2425 data => WF_AUTOCANCEL,
2426 cb => \&IO::AIO::poll_cb,
2427);
2428
2429Event->timer (
2430 data => WF_AUTOCANCEL, 2714 data => WF_AUTOCANCEL,
2431 after => 0, 2715 cb => \&BDB::poll_cb,
2432 interval => 10, 2716 );
2433 cb => sub { 2717 BDB::min_parallel 8;
2434 (Coro::unblock_sub { 2718
2435 write_runtime 2719 BDB::set_sync_prepare {
2436 or warn "ERROR: unable to write runtime file: $!"; 2720 my $status;
2721 my $current = $Coro::current;
2722 (
2723 sub {
2724 $status = $!;
2725 $current->ready; undef $current;
2726 },
2727 sub {
2728 Coro::schedule while defined $current;
2729 $! = $status;
2730 },
2731 )
2732 };
2733
2734 unless ($DB_ENV) {
2735 $DB_ENV = BDB::db_env_create;
2736
2737 cf::sync_job {
2738 eval {
2739 BDB::db_env_open
2740 $DB_ENV,
2741 $BDB_ENV_DIR,
2742 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2743 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2744 0666;
2745
2746 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2747
2748 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2749 $DB_ENV->set_lk_detect;
2750 };
2751
2752 cf::cleanup "db_env_open(db): $@" if $@;
2437 })->(); 2753 };
2438 }, 2754 }
2439); 2755}
2756
2757{
2758 IO::AIO::min_parallel 8;
2759
2760 undef $Coro::AIO::WATCHER;
2761 IO::AIO::max_poll_time $TICK * 0.1;
2762 $AIO_POLL_WATCHER = Event->io (
2763 reentrant => 0,
2764 data => WF_AUTOCANCEL,
2765 fd => IO::AIO::poll_fileno,
2766 poll => 'r',
2767 prio => 6,
2768 cb => \&IO::AIO::poll_cb,
2769 );
2770}
2440 2771
2441END { cf::emergency_save } 2772END { cf::emergency_save }
2442 2773
24431 27741
2444 2775

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines