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.181 by root, Fri Jan 19 15:29:52 2007 UTC vs.
Revision 1.257 by root, Sat Apr 21 17:34:24 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.4 (); 15use Coro 3.61 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::Event;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
19 24
25use BDB ();
20use Data::Dumper; 26use Data::Dumper;
21use Digest::MD5; 27use Digest::MD5;
22use Fcntl; 28use Fcntl;
29use YAML::Syck ();
23use IO::AIO 2.32 (); 30use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 31use Time::HiRes;
32use Compress::LZF;
26 33
34# configure various modules to our taste
35#
36$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 40$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 41
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 43$YAML::Syck::ImplicitUnicode = 1;
33 44
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35 48
36our %COMMAND = (); 49our %COMMAND = ();
37our %COMMAND_TIME = (); 50our %COMMAND_TIME = ();
38 51
39our @EXTS = (); # list of extension package names 52our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 53our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
43 56
57our $RELOAD; # number of reloads so far
44our @EVENT; 58our @EVENT;
45our $LIBDIR = datadir . "/ext";
46 59
47our $TICK = MAX_TIME * 1e-6; 60our $CONFDIR = confdir;
61our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db";
71
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
48our $TICK_WATCHER; 73our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 76our $NEXT_TICK;
52our $NOW; 77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off
79
80our $BDB_POLL_WATCHER;
81our $DB_ENV;
53 82
54our %CFG; 83our %CFG;
55 84
56our $UPTIME; $UPTIME ||= time; 85our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 86our $RUNTIME;
58 87
59our %PLAYER; # all users 88our %PLAYER; # all users
60our %MAP; # all maps 89our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random";
63
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 91
67# used to convert map paths into valid unix filenames by replacing / by ∕ 92# used to convert map paths into valid unix filenames by replacing / by ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
69 94
70binmode STDOUT; 95binmode STDOUT;
71binmode STDERR; 96binmode STDERR;
72 97
73# read virtual server time, if available 98# read virtual server time, if available
74unless ($RUNTIME || !-e cf::localdir . "/runtime") { 99unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
75 open my $fh, "<", cf::localdir . "/runtime" 100 open my $fh, "<", "$LOCALDIR/runtime"
76 or die "unable to read runtime file: $!"; 101 or die "unable to read runtime file: $!";
77 $RUNTIME = <$fh> + 0.; 102 $RUNTIME = <$fh> + 0.;
78} 103}
79 104
80mkdir cf::localdir; 105mkdir $_
81mkdir cf::localdir . "/" . cf::playerdir; 106 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
82mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS;
85 107
86our $EMERGENCY_POSITION; 108our $EMERGENCY_POSITION;
109
110sub cf::map::normalise;
87 111
88############################################################################# 112#############################################################################
89 113
90=head2 GLOBAL VARIABLES 114=head2 GLOBAL VARIABLES
91 115
98=item $cf::RUNTIME 122=item $cf::RUNTIME
99 123
100The time this server has run, starts at 0 and is increased by $cf::TICK on 124The time this server has run, starts at 0 and is increased by $cf::TICK on
101every server tick. 125every server tick.
102 126
103=item $cf::LIBDIR 127=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
128$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
129$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
104 130
105The perl library directory, where extensions and cf-specific modules can 131Various directories - "/etc", read-only install directory, perl-library
106be found. It will be added to C<@INC> automatically. 132directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
133unique-items directory, player file directory, random maps directory and
134database environment.
107 135
108=item $cf::NOW 136=item $cf::NOW
109 137
110The time of the last (current) server tick. 138The time of the last (current) server tick.
111 139
116=item %cf::CFG 144=item %cf::CFG
117 145
118Configuration for the server, loaded from C</etc/crossfire/config>, or 146Configuration for the server, loaded from C</etc/crossfire/config>, or
119from wherever your confdir points to. 147from wherever your confdir points to.
120 148
121=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 149=item cf::wait_for_tick, cf::wait_for_tick_begin
122 150
123These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 151These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
124or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 152returns directly I<after> the tick processing (and consequently, can only wake one process
125processing has been done. Call C<< ->wait >> on them to maximise the 153per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
126window of cpu time available, or simply to synchronise to the server tick.
127 154
128=back 155=back
129 156
130=cut 157=cut
131 158
132BEGIN { 159BEGIN {
133 *CORE::GLOBAL::warn = sub { 160 *CORE::GLOBAL::warn = sub {
134 my $msg = join "", @_; 161 my $msg = join "", @_;
135 utf8::encode $msg;
136 162
137 $msg .= "\n" 163 $msg .= "\n"
138 unless $msg =~ /\n$/; 164 unless $msg =~ /\n$/;
139 165
166 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
167
168 utf8::encode $msg;
140 LOG llevError, $msg; 169 LOG llevError, $msg;
141 }; 170 };
142} 171}
143 172
144@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 219 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d 220 $d
192 } || "[unable to dump $_[0]: '$@']"; 221 } || "[unable to dump $_[0]: '$@']";
193} 222}
194 223
195use JSON::Syck (); # TODO# replace by JSON::PC once working 224use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
196 225
197=item $ref = cf::from_json $json 226=item $ref = cf::from_json $json
198 227
199Converts a JSON string into the corresponding perl data structure. 228Converts a JSON string into the corresponding perl data structure.
200 229
201=cut
202
203sub from_json($) {
204 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
205 JSON::Syck::Load $_[0]
206}
207
208=item $json = cf::to_json $ref 230=item $json = cf::to_json $ref
209 231
210Converts a perl data structure into its JSON representation. 232Converts a perl data structure into its JSON representation.
211
212=cut
213
214sub to_json($) {
215 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
216 JSON::Syck::Dump $_[0]
217}
218 233
219=item cf::lock_wait $string 234=item cf::lock_wait $string
220 235
221Wait until the given lock is available. See cf::lock_acquire. 236Wait until the given lock is available. See cf::lock_acquire.
222 237
228returned. 243returned.
229 244
230Lock names should begin with a unique identifier (for example, cf::map::find 245Lock names should begin with a unique identifier (for example, cf::map::find
231uses map_find and cf::map::load uses map_load). 246uses map_find and cf::map::load uses map_load).
232 247
248=item $locked = cf::lock_active $string
249
250Return true if the lock is currently active, i.e. somebody has locked it.
251
233=cut 252=cut
234 253
235our %LOCK; 254our %LOCK;
236 255
237sub lock_wait($) { 256sub lock_wait($) {
256 # wake up all waiters, to be on the safe side 275 # wake up all waiters, to be on the safe side
257 $_->ready for @{ delete $LOCK{$key} }; 276 $_->ready for @{ delete $LOCK{$key} };
258 } 277 }
259} 278}
260 279
280sub lock_active($) {
281 my ($key) = @_;
282
283 ! ! $LOCK{$key}
284}
285
261sub freeze_mainloop { 286sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 287 return unless $TICK_WATCHER->is_active;
263 288
264 my $guard = Coro::guard { 289 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 290 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 291 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 292 $TICK_WATCHER->stop;
270 $guard 293 $guard
271} 294}
272 295
273=item cf::async { BLOCK } 296=item cf::async { BLOCK }
344 367
345 $coro 368 $coro
346} 369}
347 370
348sub write_runtime { 371sub write_runtime {
349 my $runtime = cf::localdir . "/runtime"; 372 my $guard = cf::lock_acquire "write_runtime";
373
374 my $runtime = "$LOCALDIR/runtime";
350 375
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 377 or return;
353 378
379 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 380 # 10 is the runtime save interval, for a monotonic clock
381 # 60 allows for the watchdog to kill the server.
382
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 383 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 384 and return;
357 385
386 # always fsync - this file is important
358 aio_fsync $fh 387 aio_fsync $fh
359 and return; 388 and return;
360 389
361 close $fh 390 close $fh
362 or return; 391 or return;
363 392
364 aio_rename "$runtime~", $runtime 393 aio_rename "$runtime~", $runtime
365 and return; 394 and return;
366 395
367 1 396 1
397}
398
399=item cf::datalog type => key => value, ...
400
401Log a datalog packet of the given type with the given key-value pairs.
402
403=cut
404
405sub datalog($@) {
406 my ($type, %kv) = @_;
407 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
368} 408}
369 409
370=back 410=back
371 411
372=cut 412=cut
747 $filename, length $$rdata, scalar @$objs; 787 $filename, length $$rdata, scalar @$objs;
748 788
749 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 789 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
750 chmod SAVE_MODE, $fh; 790 chmod SAVE_MODE, $fh;
751 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 791 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
752 aio_fsync $fh; 792 aio_fsync $fh if $cf::USE_FSYNC;
753 close $fh; 793 close $fh;
754 794
755 if (@$objs) { 795 if (@$objs) {
756 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 796 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
757 chmod SAVE_MODE, $fh; 797 chmod SAVE_MODE, $fh;
758 my $data = Storable::nfreeze { version => 1, objs => $objs }; 798 my $data = Storable::nfreeze { version => 1, objs => $objs };
759 aio_write $fh, 0, (length $data), $data, 0; 799 aio_write $fh, 0, (length $data), $data, 0;
760 aio_fsync $fh; 800 aio_fsync $fh if $cf::USE_FSYNC;
761 close $fh; 801 close $fh;
762 aio_rename "$filename.pst~", "$filename.pst"; 802 aio_rename "$filename.pst~", "$filename.pst";
763 } 803 }
764 } else { 804 } else {
765 aio_unlink "$filename.pst"; 805 aio_unlink "$filename.pst";
934Returns the given player object, loading it if necessary (might block). 974Returns the given player object, loading it if necessary (might block).
935 975
936=cut 976=cut
937 977
938sub playerdir($) { 978sub playerdir($) {
939 cf::localdir 979 "$PLAYERDIR/"
940 . "/"
941 . cf::playerdir
942 . "/"
943 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 980 . (ref $_[0] ? $_[0]->ob->name : $_[0])
944} 981}
945 982
946sub path($) { 983sub path($) {
947 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 984 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
948 985
949 (playerdir $login) . "/$login.pl" 986 (playerdir $login) . "/playerdata"
950} 987}
951 988
952sub find_active($) { 989sub find_active($) {
953 $cf::PLAYER{$_[0]} 990 $cf::PLAYER{$_[0]}
954 and $cf::PLAYER{$_[0]}->active 991 and $cf::PLAYER{$_[0]}->active
967 my $login = $_[0]; 1004 my $login = $_[0];
968 1005
969 my $guard = cf::lock_acquire "user_find:$login"; 1006 my $guard = cf::lock_acquire "user_find:$login";
970 1007
971 $cf::PLAYER{$_[0]} || do { 1008 $cf::PLAYER{$_[0]} || do {
1009 # rename old playerfiles to new ones
1010 #TODO: remove when no longer required
1011 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1012 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1013 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1014 aio_unlink +(playerdir $login) . "/$login.pl";
1015
972 my $pl = load_pl path $login 1016 my $pl = load_pl path $login
973 or return; 1017 or return;
974 $cf::PLAYER{$login} = $pl 1018 $cf::PLAYER{$login} = $pl
975 } 1019 }
976 } 1020 }
1013 1057
1014=cut 1058=cut
1015 1059
1016sub quit_character { 1060sub quit_character {
1017 my ($pl) = @_; 1061 my ($pl) = @_;
1062
1063 my $name = $pl->ob->name;
1018 1064
1019 $pl->{deny_save} = 1; 1065 $pl->{deny_save} = 1;
1020 $pl->password ("*"); # this should lock out the player until we nuked the dir 1066 $pl->password ("*"); # this should lock out the player until we nuked the dir
1021 1067
1022 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1068 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1027 my $path = playerdir $pl; 1073 my $path = playerdir $pl;
1028 my $temp = "$path~$cf::RUNTIME~deleting~"; 1074 my $temp = "$path~$cf::RUNTIME~deleting~";
1029 aio_rename $path, $temp; 1075 aio_rename $path, $temp;
1030 delete $cf::PLAYER{$pl->ob->name}; 1076 delete $cf::PLAYER{$pl->ob->name};
1031 $pl->destroy; 1077 $pl->destroy;
1078
1079 my $prefix = qr<^~\Q$name\E/>;
1080
1081 # nuke player maps
1082 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1083
1032 IO::AIO::aio_rmtree $temp; 1084 IO::AIO::aio_rmtree $temp;
1085}
1086
1087=item $pl->kick
1088
1089Kicks a player out of the game. This destroys the connection.
1090
1091=cut
1092
1093sub kick {
1094 my ($pl, $kicker) = @_;
1095
1096 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1097 $pl->killer ("kicked");
1098 $pl->ns->destroy;
1033} 1099}
1034 1100
1035=item cf::player::list_logins 1101=item cf::player::list_logins
1036 1102
1037Returns am arrayref of all valid playernames in the system, can take a 1103Returns am arrayref of all valid playernames in the system, can take a
1038while and may block, so not sync_job-capable, ever. 1104while and may block, so not sync_job-capable, ever.
1039 1105
1040=cut 1106=cut
1041 1107
1042sub list_logins { 1108sub list_logins {
1043 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1109 my $dirs = aio_readdir $PLAYERDIR
1044 or return []; 1110 or return [];
1045 1111
1046 my @logins; 1112 my @logins;
1047 1113
1048 for my $login (@$dirs) { 1114 for my $login (@$dirs) {
1065=cut 1131=cut
1066 1132
1067sub maps($) { 1133sub maps($) {
1068 my ($pl) = @_; 1134 my ($pl) = @_;
1069 1135
1136 $pl = ref $pl ? $pl->ob->name : $pl;
1137
1070 my $files = aio_readdir playerdir $pl 1138 my $files = aio_readdir playerdir $pl
1071 or return; 1139 or return;
1072 1140
1073 my @paths; 1141 my @paths;
1074 1142
1075 for (@$files) { 1143 for (@$files) {
1076 utf8::decode $_; 1144 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1145 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1146 next unless /^$PATH_SEP/o;
1079 1147
1080 s/\.map$//; 1148 push @paths, cf::map::normalise "~$pl/$_";
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 } 1149 }
1083 1150
1084 \@paths 1151 \@paths
1085} 1152}
1086 1153
1087=item $player->ext_reply ($msgid, $msgtype, %msg) 1154=item $player->ext_reply ($msgid, %msg)
1088 1155
1089Sends an ext reply to the player. 1156Sends an ext reply to the player.
1090 1157
1091=cut 1158=cut
1092 1159
1093sub ext_reply($$$%) { 1160sub ext_reply($$%) {
1094 my ($self, $id, %msg) = @_; 1161 my ($self, $id, %msg) = @_;
1095 1162
1096 $msg{msgid} = $id; 1163 $msg{msgid} = $id;
1097 1164
1098 $self->send ("ext " . cf::to_json \%msg); 1165 $self->send ("ext " . cf::to_json \%msg);
1099} 1166}
1100 1167
1101package cf; 1168=item $player->ext_event ($type, %msg)
1169
1170Sends an ext event to the client.
1171
1172=cut
1173
1174sub ext_event($$%) {
1175 my ($self, $type, %msg) = @_;
1176
1177 $self->ns->ext_event ($type, %msg);
1178}
1179
1180=head3 cf::region
1181
1182=over 4
1183
1184=cut
1185
1186package cf::region;
1187
1188=item cf::region::find_by_path $path
1189
1190Tries to decuce the probable region for a map knowing only its path.
1191
1192=cut
1193
1194sub find_by_path($) {
1195 my ($path) = @_;
1196
1197 my ($match, $specificity);
1198
1199 for my $region (list) {
1200 if ($region->match && $path =~ $region->match) {
1201 ($match, $specificity) = ($region, $region->specificity)
1202 if $region->specificity > $specificity;
1203 }
1204 }
1205
1206 $match
1207}
1102 1208
1103=back 1209=back
1104
1105 1210
1106=head3 cf::map 1211=head3 cf::map
1107 1212
1108=over 4 1213=over 4
1109 1214
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1242 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1243 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1244 )
1140} 1245}
1141 1246
1247=item cf::map->register ($regex, $prio)
1248
1249Register a handler for the map path matching the given regex at the
1250givne priority (higher is better, built-in handlers have priority 0, the
1251default).
1252
1253=cut
1254
1142sub register { 1255sub register {
1143 my (undef, $regex) = @_; 1256 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1257 my $pkg = caller;
1145 1258
1146 no strict; 1259 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1260 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1261
1149 $EXT_MAP{$pkg} = qr<$regex>; 1262 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1263}
1151 1264
1152# also paths starting with '/' 1265# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1266$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1267
1155sub thawer_merge { 1268sub thawer_merge {
1156 my ($self, $merge) = @_; 1269 my ($self, $merge) = @_;
1157 1270
1158 # we have to keep some variables in memory intact 1271 # we have to keep some variables in memory intact
1164 $self->SUPER::thawer_merge ($merge); 1277 $self->SUPER::thawer_merge ($merge);
1165} 1278}
1166 1279
1167sub normalise { 1280sub normalise {
1168 my ($path, $base) = @_; 1281 my ($path, $base) = @_;
1282
1283 $path = "$path"; # make sure its a string
1284
1285 $path =~ s/\.map$//;
1169 1286
1170 # map plan: 1287 # map plan:
1171 # 1288 #
1172 # /! non-realised random map exit (special hack!) 1289 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched 1290 # {... are special paths that are not being touched
1201 1318
1202 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1319 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1203 1320
1204 $path = normalise $path, $base; 1321 $path = normalise $path, $base;
1205 1322
1206 for my $pkg (keys %EXT_MAP) { 1323 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1324 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1325 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1326 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1327 $self->init; # pass $1 etc.
1211 return $self; 1328 return $self;
1212 } 1329 }
1213 } 1330 }
1214 1331
1215 Carp::carp "unable to resolve path '$path'."; 1332 Carp::carp "unable to resolve path '$path' (base '$base').";
1216 () 1333 ()
1217} 1334}
1218 1335
1219sub init { 1336sub init {
1220 my ($self) = @_; 1337 my ($self) = @_;
1235 1352
1236# the original (read-only) location 1353# the original (read-only) location
1237sub load_path { 1354sub load_path {
1238 my ($self) = @_; 1355 my ($self) = @_;
1239 1356
1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1357 "$MAPDIR/$self->{path}.map"
1241} 1358}
1242 1359
1243# the temporary/swap location 1360# the temporary/swap location
1244sub save_path { 1361sub save_path {
1245 my ($self) = @_; 1362 my ($self) = @_;
1246 1363
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1364 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1365 "$TMPDIR/$path.map"
1249} 1366}
1250 1367
1251# the unique path, undef == no special unique path 1368# the unique path, undef == no special unique path
1252sub uniq_path { 1369sub uniq_path {
1253 my ($self) = @_; 1370 my ($self) = @_;
1254 1371
1255 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1372 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1256 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1373 "$UNIQUEDIR/$path"
1257} 1374}
1258 1375
1259# and all this just because we cannot iterate over 1376# and all this just because we cannot iterate over
1260# all maps in C++... 1377# all maps in C++...
1261sub change_all_map_light { 1378sub change_all_map_light {
1275 1392
1276sub load_header_from($) { 1393sub load_header_from($) {
1277 my ($self, $path) = @_; 1394 my ($self, $path) = @_;
1278 1395
1279 utf8::encode $path; 1396 utf8::encode $path;
1280 aio_open $path, O_RDONLY, 0 1397 #aio_open $path, O_RDONLY, 0
1281 or return; 1398 # or return;
1282 1399
1283 $self->_load_header ($path) 1400 $self->_load_header ($path)
1284 or return; 1401 or return;
1285 1402
1286 $self->{load_path} = $path; 1403 $self->{load_path} = $path;
1287 1404
1288 1 1405 1
1289} 1406}
1290 1407
1291sub load_orig { 1408sub load_header_orig {
1292 my ($self) = @_; 1409 my ($self) = @_;
1293 1410
1294 $self->load_header_from ($self->load_path) 1411 $self->load_header_from ($self->load_path)
1295} 1412}
1296 1413
1297sub load_temp { 1414sub load_header_temp {
1298 my ($self) = @_; 1415 my ($self) = @_;
1299 1416
1300 $self->load_header_from ($self->save_path) 1417 $self->load_header_from ($self->save_path)
1418}
1419
1420sub prepare_temp {
1421 my ($self) = @_;
1422
1423 $self->last_access ((delete $self->{last_access})
1424 || $cf::RUNTIME); #d#
1425 # safety
1426 $self->{instantiate_time} = $cf::RUNTIME
1427 if $self->{instantiate_time} > $cf::RUNTIME;
1428}
1429
1430sub prepare_orig {
1431 my ($self) = @_;
1432
1433 $self->{load_original} = 1;
1434 $self->{instantiate_time} = $cf::RUNTIME;
1435 $self->last_access ($cf::RUNTIME);
1436 $self->instantiate;
1301} 1437}
1302 1438
1303sub load_header { 1439sub load_header {
1304 my ($self) = @_; 1440 my ($self) = @_;
1305 1441
1306 if ($self->load_temp) { 1442 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1443 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1444 } else {
1313 $self->load_orig 1445 $self->load_header_orig
1314 or return; 1446 or return;
1315 1447 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1448 }
1449
1450 $self->default_region (cf::region::find_by_path $self->{path})
1451 unless $self->default_region;
1321 1452
1322 1 1453 1
1323} 1454}
1324 1455
1325sub find; 1456sub find;
1338 $map->{last_save} = $cf::RUNTIME; 1469 $map->{last_save} = $cf::RUNTIME;
1339 1470
1340 $map->load_header 1471 $map->load_header
1341 or return; 1472 or return;
1342 1473
1343 if ($map->should_reset) { 1474 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1475 # doing this can freeze the server in a sync job, obviously
1344 $cf::WAIT_FOR_TICK->wait; 1476 #$cf::WAIT_FOR_TICK->wait;
1345 $map->reset; 1477 $map->reset;
1346 undef $guard; 1478 undef $guard;
1347 $map = find $path 1479 return find $path;
1348 or return;
1349 } 1480 }
1350 1481
1351 $cf::MAP{$path} = $map 1482 $cf::MAP{$path} = $map
1352 } 1483 }
1353} 1484}
1485
1486sub pre_load { }
1487sub post_load { }
1354 1488
1355sub load { 1489sub load {
1356 my ($self) = @_; 1490 my ($self) = @_;
1357 1491
1492 local $self->{deny_reset} = 1; # loading can take a long time
1493
1358 my $path = $self->{path}; 1494 my $path = $self->{path};
1495
1496 {
1359 my $guard = cf::lock_acquire "map_load:$path"; 1497 my $guard = cf::lock_acquire "map_load:$path";
1360 1498
1361 return if $self->in_memory != cf::MAP_SWAPPED; 1499 return if $self->in_memory != cf::MAP_SWAPPED;
1362 1500
1363 $self->in_memory (cf::MAP_LOADING); 1501 $self->in_memory (cf::MAP_LOADING);
1364 1502
1365 $self->alloc; 1503 $self->alloc;
1366 $self->_load_objects ($self->{load_path}, 1)
1367 or return;
1368 1504
1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1505 $self->pre_load;
1370 if delete $self->{load_original};
1371
1372 if (my $uniq = $self->uniq_path) {
1373 utf8::encode $uniq;
1374 if (aio_open $uniq, O_RDONLY, 0) {
1375 $self->clear_unique_items;
1376 $self->_load_objects ($uniq, 0);
1377 }
1378 }
1379
1380 Coro::cede;
1381
1382 # now do the right thing for maps
1383 $self->link_multipart_objects;
1384
1385 unless ($self->{deny_activate}) {
1386 $self->decay_objects;
1387 $self->fix_auto_apply;
1388 $self->update_buttons;
1389 Coro::cede; 1506 Coro::cede;
1390 $self->set_darkness_map; 1507
1508 $self->_load_objects ($self->{load_path}, 1)
1509 or return;
1510
1511 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1512 if delete $self->{load_original};
1513
1514 if (my $uniq = $self->uniq_path) {
1515 utf8::encode $uniq;
1516 if (aio_open $uniq, O_RDONLY, 0) {
1517 $self->clear_unique_items;
1518 $self->_load_objects ($uniq, 0);
1519 }
1520 }
1521
1522 Coro::cede;
1523 # now do the right thing for maps
1524 $self->link_multipart_objects;
1391 $self->difficulty ($self->estimate_difficulty) 1525 $self->difficulty ($self->estimate_difficulty)
1392 unless $self->difficulty; 1526 unless $self->difficulty;
1393 Coro::cede; 1527 Coro::cede;
1528
1529 unless ($self->{deny_activate}) {
1530 $self->decay_objects;
1531 $self->fix_auto_apply;
1532 $self->update_buttons;
1533 Coro::cede;
1534 $self->set_darkness_map;
1535 Coro::cede;
1394 $self->activate; 1536 $self->activate;
1395 } 1537 }
1396 1538
1397 $self->in_memory (cf::MAP_IN_MEMORY); 1539 $self->in_memory (cf::MAP_IN_MEMORY);
1540 }
1541
1542 $self->post_load;
1398} 1543}
1399 1544
1400sub customise_for { 1545sub customise_for {
1401 my ($self, $ob) = @_; 1546 my ($self, $ob) = @_;
1402 1547
1441 1586
1442 cf::sync_job { $map->load }; 1587 cf::sync_job { $map->load };
1443} 1588}
1444 1589
1445our %MAP_PREFETCH; 1590our %MAP_PREFETCH;
1446our $MAP_PREFETCHER = Coro::async { 1591our $MAP_PREFETCHER = undef;
1447 while () {
1448 for my $path (keys %MAP_PREFETCH) {
1449 my $map = find $path
1450 or next;
1451 $map->load;
1452
1453 delete $MAP_PREFETCH{$path};
1454 }
1455 Coro::schedule;
1456 }
1457};
1458 1592
1459sub find_async { 1593sub find_async {
1460 my ($path, $origin) = @_; 1594 my ($path, $origin) = @_;
1461 1595
1462 $path = normalise $path, $origin && $origin->{path}; 1596 $path = normalise $path, $origin && $origin->{path};
1463 1597
1464 if (my $map = $cf::MAP{$path}) { 1598 if (my $map = $cf::MAP{$path}) {
1465 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1599 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1466 } 1600 }
1467 1601
1468 $MAP_PREFETCH{$path} = 0; 1602 undef $MAP_PREFETCH{$path};
1603 $MAP_PREFETCHER ||= cf::async {
1604 while (%MAP_PREFETCH) {
1605 for my $path (keys %MAP_PREFETCH) {
1606 my $map = find $path
1607 or next;
1608 $map->load;
1609
1610 delete $MAP_PREFETCH{$path};
1611 }
1612 }
1613 undef $MAP_PREFETCHER;
1614 };
1469 $MAP_PREFETCHER->ready; 1615 $MAP_PREFETCHER->prio (6);
1470 1616
1471 () 1617 ()
1472} 1618}
1473 1619
1474sub save { 1620sub save {
1544 return if $self->players; 1690 return if $self->players;
1545 return if $self->isa ("ext::map_per_player");#d# 1691 return if $self->isa ("ext::map_per_player");#d#
1546 1692
1547 warn "resetting map ", $self->path;#d# 1693 warn "resetting map ", $self->path;#d#
1548 1694
1695 $self->in_memory (cf::MAP_SWAPPED);
1696
1697 # need to save uniques path
1698 unless ($self->{deny_save}) {
1699 my $uniq = $self->uniq_path; utf8::encode $uniq;
1700
1701 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1702 if $uniq;
1703 }
1704
1549 delete $cf::MAP{$self->path}; 1705 delete $cf::MAP{$self->path};
1550 1706
1551 $self->in_memory (cf::MAP_SWAPPED);
1552 $self->clear; 1707 $self->clear;
1553 1708
1554 $_->clear_links_to ($self) for values %cf::MAP; 1709 $_->clear_links_to ($self) for values %cf::MAP;
1555 1710
1556 $self->unlink_save; 1711 $self->unlink_save;
1583instantiated unique items. May block. 1738instantiated unique items. May block.
1584 1739
1585=cut 1740=cut
1586 1741
1587sub unique_maps() { 1742sub unique_maps() {
1588 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1743 my $files = aio_readdir $UNIQUEDIR
1589 or return; 1744 or return;
1590 1745
1591 my @paths; 1746 my @paths;
1592 1747
1593 for (@$files) { 1748 for (@$files) {
1594 utf8::decode $_; 1749 utf8::decode $_;
1595 next if /\.pst$/; 1750 next if /\.pst$/;
1596 next unless /^$PATH_SEP/o; 1751 next unless /^$PATH_SEP/o;
1597 1752
1598 s/\.map$//; 1753 push @paths, cf::map::normalise $_;
1599 push @paths, $_;
1600 } 1754 }
1601 1755
1602 \@paths 1756 \@paths
1603} 1757}
1604 1758
1698=cut 1852=cut
1699 1853
1700sub link_map { 1854sub link_map {
1701 unless ($LINK_MAP) { 1855 unless ($LINK_MAP) {
1702 $LINK_MAP = cf::map::find "{link}" 1856 $LINK_MAP = cf::map::find "{link}"
1703 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1857 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1704 $LINK_MAP->load; 1858 $LINK_MAP->load;
1705 } 1859 }
1706 1860
1707 $LINK_MAP 1861 $LINK_MAP
1708} 1862}
1709 1863
1710sub cf::object::player::enter_link { 1864sub cf::object::player::enter_link {
1711 my ($self) = @_; 1865 my ($self) = @_;
1712 1866
1713 $self->deactivate_recursive;
1714
1715 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1867 return if UNIVERSAL::isa $self->map, "ext::map_link";
1716 1868
1717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1869 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1718 if $self->map; 1870 if $self->map;
1719 1871
1720 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1872 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1721} 1873}
1722 1874
1723sub cf::object::player::leave_link { 1875sub cf::object::player::leave_link {
1724 my ($self, $map, $x, $y) = @_; 1876 my ($self, $map, $x, $y) = @_;
1725 1877
1747 $map->load; 1899 $map->load;
1748 $map->load_diag; 1900 $map->load_diag;
1749 1901
1750 return unless $self->contr->active; 1902 return unless $self->contr->active;
1751 $self->activate_recursive; 1903 $self->activate_recursive;
1904
1905 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1752 $self->enter_map ($map, $x, $y); 1906 $self->enter_map ($map, $x, $y);
1753} 1907}
1754 1908
1755cf::player->attach ( 1909cf::player->attach (
1756 on_logout => sub { 1910 on_logout => sub {
1769 # try to abort aborted map switching on player login :) 1923 # try to abort aborted map switching on player login :)
1770 # should happen only on crashes 1924 # should happen only on crashes
1771 if ($pl->ob->{_link_pos}) { 1925 if ($pl->ob->{_link_pos}) {
1772 $pl->ob->enter_link; 1926 $pl->ob->enter_link;
1773 (async { 1927 (async {
1774 # we need this sleep as the login has a concurrent enter_exit running
1775 # and this sleep increases chances of the player not ending up in scorn
1776 $pl->ob->reply (undef, 1928 $pl->ob->reply (undef,
1777 "There was an internal problem at your last logout, " 1929 "There was an internal problem at your last logout, "
1778 . "the server will try to bring you to your intended destination in a second.", 1930 . "the server will try to bring you to your intended destination in a second.",
1779 cf::NDI_RED); 1931 cf::NDI_RED);
1932 # we need this sleep as the login has a concurrent enter_exit running
1933 # and this sleep increases chances of the player not ending up in scorn
1780 Coro::Timer::sleep 1; 1934 Coro::Timer::sleep 1;
1781 $pl->ob->leave_link; 1935 $pl->ob->leave_link;
1782 })->prio (2); 1936 })->prio (2);
1783 } 1937 }
1784 }, 1938 },
1792 my ($self, $path, $x, $y) = @_; 1946 my ($self, $path, $x, $y) = @_;
1793 1947
1794 $self->enter_link; 1948 $self->enter_link;
1795 1949
1796 (async { 1950 (async {
1951 my $map = eval {
1797 my $map = cf::map::find $path; 1952 my $map = cf::map::find $path;
1798 $map = $map->customise_for ($self) if $map; 1953 $map = $map->customise_for ($self) if $map;
1799 1954 $map
1800# warn "entering ", $map->path, " at ($x, $y)\n" 1955 } or
1801# if $map;
1802
1803 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1956 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1804 1957
1805 $self->leave_link ($map, $x, $y); 1958 $self->leave_link ($map, $x, $y);
1806 })->prio (1); 1959 })->prio (1);
1807} 1960}
1808 1961
1815 1968
1816 my $rmp = { # defaults 1969 my $rmp = { # defaults
1817 xsize => (cf::rndm 15, 40), 1970 xsize => (cf::rndm 15, 40),
1818 ysize => (cf::rndm 15, 40), 1971 ysize => (cf::rndm 15, 40),
1819 symmetry => (cf::rndm 1, cf::SYMMETRY_XY), 1972 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1820 #layout => string 1973 #layout => string,
1821 }; 1974 };
1822 1975
1823 for (split /\n/, $spec) { 1976 for (split /\n/, $spec) {
1824 my ($k, $v) = split /\s+/, $_, 2; 1977 my ($k, $v) = split /\s+/, $_, 2;
1825 1978
1839 # that depends on the exit object 1992 # that depends on the exit object
1840 1993
1841 my $rmp = parse_random_map_params $exit->msg; 1994 my $rmp = parse_random_map_params $exit->msg;
1842 1995
1843 if ($exit->map) { 1996 if ($exit->map) {
1844 $rmp->{region} = $exit->map->region_name; 1997 $rmp->{region} = $exit->region->name;
1845 $rmp->{origin_map} = $exit->map->path; 1998 $rmp->{origin_map} = $exit->map->path;
1846 $rmp->{origin_x} = $exit->x; 1999 $rmp->{origin_x} = $exit->x;
1847 $rmp->{origin_y} = $exit->y; 2000 $rmp->{origin_y} = $exit->y;
1848 } 2001 }
1849 2002
1850 $rmp->{random_seed} ||= $exit->random_seed; 2003 $rmp->{random_seed} ||= $exit->random_seed;
1851 2004
1852 my $data = cf::to_json $rmp; 2005 my $data = cf::to_json $rmp;
1853 my $md5 = Digest::MD5::md5_hex $data; 2006 my $md5 = Digest::MD5::md5_hex $data;
1854 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2007 my $meta = "$RANDOMDIR/$md5.meta";
1855 2008
1856 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2009 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1857 aio_write $fh, 0, (length $data), $data, 0; 2010 aio_write $fh, 0, (length $data), $data, 0;
1858 undef $fh; 2011 undef $fh;
1859 aio_rename "$meta~", $meta; 2012 aio_rename "$meta~", $meta;
1866sub cf::object::player::enter_exit { 2019sub cf::object::player::enter_exit {
1867 my ($self, $exit) = @_; 2020 my ($self, $exit) = @_;
1868 2021
1869 return unless $self->type == cf::PLAYER; 2022 return unless $self->type == cf::PLAYER;
1870 2023
2024 if ($exit->slaying eq "/!") {
2025 #TODO: this should de-fi-ni-te-ly not be a sync-job
2026 # the problem is that $exit might not survive long enough
2027 # so it needs to be done right now, right here
2028 cf::sync_job { prepare_random_map $exit };
2029 }
2030
2031 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2032 my $hp = $exit->stats->hp;
2033 my $sp = $exit->stats->sp;
2034
1871 $self->enter_link; 2035 $self->enter_link;
1872 2036
1873 (async { 2037 (async {
1874 $self->deactivate_recursive; # just to be sure 2038 $self->deactivate_recursive; # just to be sure
1875 unless (eval { 2039 unless (eval {
1876 prepare_random_map $exit 2040 $self->goto ($slaying, $hp, $sp);
1877 if $exit->slaying eq "/!";
1878
1879 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1880 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1881 2041
1882 1; 2042 1;
1883 }) { 2043 }) {
1884 $self->message ("Something went wrong deep within the crossfire server. " 2044 $self->message ("Something went wrong deep within the crossfire server. "
1885 . "I'll try to bring you back to the map you were before. " 2045 . "I'll try to bring you back to the map you were before. "
1886 . "Please report this to the dungeon master!", 2046 . "Please report this to the dungeon master!",
1887 cf::NDI_UNIQUE | cf::NDI_RED); 2047 cf::NDI_UNIQUE | cf::NDI_RED);
1888 2048
1889 warn "ERROR in enter_exit: $@"; 2049 warn "ERROR in enter_exit: $@";
1890 $self->leave_link; 2050 $self->leave_link;
1891 } 2051 }
1892 })->prio (1); 2052 })->prio (1);
1905 2065
1906sub cf::client::send_drawinfo { 2066sub cf::client::send_drawinfo {
1907 my ($self, $text, $flags) = @_; 2067 my ($self, $text, $flags) = @_;
1908 2068
1909 utf8::encode $text; 2069 utf8::encode $text;
1910 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2070 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1911} 2071}
1912 2072
2073=item $client->ext_event ($type, %msg)
2074
2075Sends an exti event to the client.
2076
2077=cut
2078
2079sub cf::client::ext_event($$%) {
2080 my ($self, $type, %msg) = @_;
2081
2082 $msg{msgtype} = "event_$type";
2083 $self->send_packet ("ext " . cf::to_json \%msg);
2084}
1913 2085
1914=item $success = $client->query ($flags, "text", \&cb) 2086=item $success = $client->query ($flags, "text", \&cb)
1915 2087
1916Queues a query to the client, calling the given callback with 2088Queues a query to the client, calling the given callback with
1917the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2089the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1946 # get handled first 2118 # get handled first
1947 my $queue = delete $ns->{query_queue} 2119 my $queue = delete $ns->{query_queue}
1948 or return; # be conservative, not sure how that can happen, but we saw a crash here 2120 or return; # be conservative, not sure how that can happen, but we saw a crash here
1949 2121
1950 (shift @$queue)->[1]->($msg); 2122 (shift @$queue)->[1]->($msg);
2123 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1951 2124
1952 push @{ $ns->{query_queue} }, @$queue; 2125 push @{ $ns->{query_queue} }, @$queue;
1953 2126
1954 if (@{ $ns->{query_queue} } == @$queue) { 2127 if (@{ $ns->{query_queue} } == @$queue) {
1955 if (@$queue) { 2128 if (@$queue) {
2013 2186
2014# here we export the classes and methods available to script code 2187# here we export the classes and methods available to script code
2015 2188
2016=pod 2189=pod
2017 2190
2018The following fucntions and emthods are available within a safe environment: 2191The following functions and methods are available within a safe environment:
2019 2192
2020 cf::object contr pay_amount pay_player map 2193 cf::object contr pay_amount pay_player map
2021 cf::object::player player 2194 cf::object::player player
2022 cf::player peaceful 2195 cf::player peaceful
2023 cf::map trigger 2196 cf::map trigger
2108############################################################################# 2281#############################################################################
2109 2282
2110=head2 EXTENSION DATABASE SUPPORT 2283=head2 EXTENSION DATABASE SUPPORT
2111 2284
2112Crossfire maintains a very simple database for extension use. It can 2285Crossfire maintains a very simple database for extension use. It can
2113currently store anything that can be serialised using Storable, which 2286currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2114excludes objects. 2287convert to/from binary).
2115 2288
2116The parameter C<$family> should best start with the name of the extension 2289The parameter C<$family> should best start with the name of the extension
2117using it, it should be unique. 2290using it, it should be unique.
2118 2291
2119=over 4 2292=over 4
2120 2293
2121=item $hashref = cf::db_get $family
2122
2123Return a hashref for use by the extension C<$family>, which can be
2124modified. After modifications, you have to call C<cf::db_dirty> or
2125C<cf::db_sync>.
2126
2127=item $value = cf::db_get $family => $key 2294=item $value = cf::db_get $family => $key
2128 2295
2129Returns a single value from the database 2296Returns a single value from the database.
2130
2131=item cf::db_put $family => $hashref
2132
2133Stores the given family hashref into the database. Updates are delayed, if
2134you want the data to be synced to disk immediately, use C<cf::db_sync>.
2135 2297
2136=item cf::db_put $family => $key => $value 2298=item cf::db_put $family => $key => $value
2137 2299
2138Stores the given C<$value> in the family hash. Updates are delayed, if you 2300Stores the given C<$value> in the family.
2139want the data to be synced to disk immediately, use C<cf::db_sync>.
2140
2141=item cf::db_dirty
2142
2143Marks the database as dirty, to be updated at a later time.
2144
2145=item cf::db_sync
2146
2147Immediately write the database to disk I<if it is dirty>.
2148 2301
2149=cut 2302=cut
2150 2303
2151our $DB; 2304our $DB;
2152 2305
2153{ 2306sub db_init {
2154 my $path = cf::localdir . "/database.pst"; 2307 unless ($DB) {
2308 $DB = BDB::db_create $DB_ENV;
2155 2309
2156 sub db_load() { 2310 cf::sync_job {
2157 $DB = stat $path ? Storable::retrieve $path : { }; 2311 eval {
2158 } 2312 $DB->set_flags (BDB::CHKSUM);
2159 2313
2160 my $pid; 2314 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2161 2315 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2162 sub db_save() { 2316 cf::cleanup "db_open(db): $!" if $!;
2163 waitpid $pid, 0 if $pid; 2317 };
2164 if (0 == ($pid = fork)) { 2318 cf::cleanup "db_open(db): $@" if $@;
2165 $DB->{_meta}{version} = 1;
2166 Storable::nstore $DB, "$path~";
2167 rename "$path~", $path;
2168 cf::_exit 0 if defined $pid;
2169 } 2319 };
2170 }
2171
2172 my $dirty;
2173
2174 sub db_sync() {
2175 db_save if $dirty;
2176 undef $dirty;
2177 }
2178
2179 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2180 db_sync;
2181 }); 2320 }
2321}
2182 2322
2183 sub db_dirty() {
2184 $dirty = 1;
2185 $idle->start;
2186 }
2187
2188 sub db_get($;$) { 2323sub db_get($$) {
2189 @_ >= 2 2324 my $key = "$_[0]/$_[1]";
2190 ? $DB->{$_[0]}{$_[1]}
2191 : ($DB->{$_[0]} ||= { })
2192 }
2193 2325
2326 cf::sync_job {
2327 BDB::db_get $DB, undef, $key, my $data;
2328
2329 $! ? ()
2330 : $data
2331 }
2332}
2333
2194 sub db_put($$;$) { 2334sub db_put($$$) {
2195 if (@_ >= 3) { 2335 BDB::dbreq_pri 4;
2196 $DB->{$_[0]}{$_[1]} = $_[2]; 2336 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2197 } else { 2337}
2198 $DB->{$_[0]} = $_[1];
2199 }
2200 db_dirty;
2201 }
2202 2338
2203 cf::global->attach ( 2339=item cf::cache $id => [$paths...], $processversion => $process
2204 prio => 10000, 2340
2205 on_cleanup => sub { 2341Generic caching function that returns the value of the resource $id,
2206 db_sync; 2342caching and regenerating as required.
2343
2344This function can block.
2345
2346=cut
2347
2348sub cache {
2349 my ($id, $src, $processversion, $process) = @_;
2350
2351 my $meta =
2352 join "\x00",
2353 $processversion,
2354 map {
2355 aio_stat $_
2356 and Carp::croak "$_: $!";
2357
2358 ($_, (stat _)[7,9])
2359 } @$src;
2360
2361 my $dbmeta = db_get cache => "$id/meta";
2362 if ($dbmeta ne $meta) {
2363 # changed, we may need to process
2364
2365 my @data;
2366 my $md5;
2367
2368 for (0 .. $#$src) {
2369 0 <= aio_load $src->[$_], $data[$_]
2370 or Carp::croak "$src->[$_]: $!";
2207 }, 2371 }
2208 ); 2372
2373 # if processing is expensive, check
2374 # checksum first
2375 if (1) {
2376 $md5 =
2377 join "\x00",
2378 $processversion,
2379 map {
2380 Coro::cede;
2381 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2382 } 0.. $#$src;
2383
2384
2385 my $dbmd5 = db_get cache => "$id/md5";
2386 if ($dbmd5 eq $md5) {
2387 db_put cache => "$id/meta", $meta;
2388
2389 return db_get cache => "$id/data";
2390 }
2391 }
2392
2393 my $t1 = Time::HiRes::time;
2394 my $data = $process->(\@data);
2395 my $t2 = Time::HiRes::time;
2396
2397 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2398
2399 db_put cache => "$id/data", $data;
2400 db_put cache => "$id/md5" , $md5;
2401 db_put cache => "$id/meta", $meta;
2402
2403 return $data;
2404 }
2405
2406 db_get cache => "$id/data"
2209} 2407}
2408
2409=item fork_call { }, $args
2410
2411Executes the given code block with the given arguments in a seperate
2412process, returning the results. Everything must be serialisable with
2413Coro::Storable. May, of course, block. Note that the executed sub may
2414never block itself or use any form of Event handling.
2415
2416=cut
2417
2418sub fork_call(&@) {
2419 my ($cb, @args) = @_;
2420
2421# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2422# or die "socketpair: $!";
2423 pipe my $fh1, my $fh2
2424 or die "pipe: $!";
2425
2426 if (my $pid = fork) {
2427 close $fh2;
2428
2429 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2430 $res = Coro::Storable::thaw $res;
2431
2432 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2433
2434 die $$res unless "ARRAY" eq ref $res;
2435
2436 return wantarray ? @$res : $res->[-1];
2437 } else {
2438 local $SIG{__WARN__};
2439 eval {
2440 local $SIG{__DIE__};
2441 close $fh1;
2442
2443 my @res = eval { $cb->(@args) };
2444 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2445 };
2446
2447 warn $@ if $@;
2448 _exit 0;
2449 }
2450}
2451
2452
2210 2453
2211############################################################################# 2454#############################################################################
2212# the server's main() 2455# the server's init and main functions
2456
2457sub load_facedata($) {
2458 my ($path) = @_;
2459
2460 warn "loading facedata from $path\n";
2461
2462 my $facedata;
2463 0 < aio_load $path, $facedata
2464 or die "$path: $!";
2465
2466 $facedata = Coro::Storable::thaw $facedata;
2467
2468 $facedata->{version} == 2
2469 or cf::cleanup "$path: version mismatch, cannot proceed.";
2470
2471 {
2472 my $faces = $facedata->{faceinfo};
2473
2474 while (my ($face, $info) = each %$faces) {
2475 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2476 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2477 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2478 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2479 Coro::cede;
2480 }
2481
2482 while (my ($face, $info) = each %$faces) {
2483 next unless $info->{smooth};
2484 my $idx = cf::face::find $face
2485 or next;
2486 if (my $smooth = cf::face::find $info->{smooth}) {
2487 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2488 } else {
2489 warn "smooth face '$info->{smooth}' not found for face '$face'";
2490 }
2491 Coro::cede;
2492 }
2493 }
2494
2495 {
2496 my $anims = $facedata->{animinfo};
2497
2498 while (my ($anim, $info) = each %$anims) {
2499 cf::anim::set $anim, $info->{frames}, $info->{facings};
2500 Coro::cede;
2501 }
2502
2503 cf::anim::invalidate_all; # d'oh
2504 }
2505
2506 1
2507}
2508
2509sub reload_regions {
2510 load_resource_file "$MAPDIR/regions"
2511 or die "unable to load regions file\n";
2512}
2513
2514sub reload_facedata {
2515 load_facedata "$DATADIR/facedata"
2516 or die "unable to load facedata\n";
2517}
2518
2519sub reload_archetypes {
2520 load_resource_file "$DATADIR/archetypes"
2521 or die "unable to load archetypes\n";
2522}
2523
2524sub reload_treasures {
2525 load_resource_file "$DATADIR/treasures"
2526 or die "unable to load treasurelists\n";
2527}
2528
2529sub reload_resources {
2530 warn "reloading resource files...\n";
2531
2532 reload_regions;
2533 reload_facedata;
2534 reload_archetypes;
2535 reload_treasures;
2536
2537 warn "finished reloading resource files\n";
2538}
2539
2540sub init {
2541 reload_resources;
2542}
2213 2543
2214sub cfg_load { 2544sub cfg_load {
2215 open my $fh, "<:utf8", cf::confdir . "/config" 2545 open my $fh, "<:utf8", "$CONFDIR/config"
2216 or return; 2546 or return;
2217 2547
2218 local $/; 2548 local $/;
2219 *CFG = YAML::Syck::Load <$fh>; 2549 *CFG = YAML::Syck::Load <$fh>;
2220 2550
2240 Event::one_event; 2570 Event::one_event;
2241 })->prio (Coro::PRIO_MAX); 2571 })->prio (Coro::PRIO_MAX);
2242 }; 2572 };
2243 2573
2244 cfg_load; 2574 cfg_load;
2245 db_load; 2575 db_init;
2246 load_extensions; 2576 load_extensions;
2577
2578 $TICK_WATCHER->start;
2247 Event::loop; 2579 Event::loop;
2248} 2580}
2249 2581
2250############################################################################# 2582#############################################################################
2251# initialisation and cleanup 2583# initialisation and cleanup
2252 2584
2253# install some emergency cleanup handlers 2585# install some emergency cleanup handlers
2254BEGIN { 2586BEGIN {
2255 for my $signal (qw(INT HUP TERM)) { 2587 for my $signal (qw(INT HUP TERM)) {
2256 Event->signal ( 2588 Event->signal (
2589 reentrant => 0,
2257 data => WF_AUTOCANCEL, 2590 data => WF_AUTOCANCEL,
2258 signal => $signal, 2591 signal => $signal,
2592 prio => 0,
2259 cb => sub { 2593 cb => sub {
2260 cf::cleanup "SIG$signal"; 2594 cf::cleanup "SIG$signal";
2261 }, 2595 },
2262 ); 2596 );
2263 } 2597 }
2264} 2598}
2285 my $map = $cf::MAP{$path} or next; 2619 my $map = $cf::MAP{$path} or next;
2286 $map->valid or next; 2620 $map->valid or next;
2287 $map->save; 2621 $map->save;
2288 } 2622 }
2289 warn "end emergency map save\n"; 2623 warn "end emergency map save\n";
2624
2625 warn "begin emergency database checkpoint\n";
2626 BDB::db_env_txn_checkpoint $DB_ENV;
2627 warn "end emergency database checkpoint\n";
2290 }; 2628 };
2291 2629
2292 warn "leave emergency perl save\n"; 2630 warn "leave emergency perl save\n";
2293} 2631}
2294 2632
2633sub post_cleanup {
2634 my ($make_core) = @_;
2635
2636 warn Carp::longmess "post_cleanup backtrace"
2637 if $make_core;
2638}
2639
2295sub reload() { 2640sub do_reload_perl() {
2296 # can/must only be called in main 2641 # can/must only be called in main
2297 if ($Coro::current != $Coro::main) { 2642 if ($Coro::current != $Coro::main) {
2298 warn "can only reload from main coroutine\n"; 2643 warn "can only reload from main coroutine";
2299 return; 2644 return;
2300 } 2645 }
2301 2646
2302 warn "reloading..."; 2647 warn "reloading...";
2303 2648
2304 warn "freezing server"; 2649 warn "entering sync_job";
2305 my $guard = freeze_mainloop; 2650
2651 cf::sync_job {
2652 cf::write_runtime; # external watchdog should not bark
2306 cf::emergency_save; 2653 cf::emergency_save;
2654 cf::write_runtime; # external watchdog should not bark
2307 2655
2308 warn "sync database to disk"; 2656 warn "syncing database to disk";
2309 cf::db_sync; 2657 BDB::db_env_txn_checkpoint $DB_ENV;
2310 IO::AIO::flush;
2311 2658
2312 eval {
2313 # if anything goes wrong in here, we should simply crash as we already saved 2659 # if anything goes wrong in here, we should simply crash as we already saved
2314 2660
2315 warn "cancel all watchers"; 2661 warn "cancelling all WF_AUTOCANCEL watchers";
2316 for (Event::all_watchers) { 2662 for (Event::all_watchers) {
2317 $_->cancel if $_->data & WF_AUTOCANCEL; 2663 $_->cancel if $_->data & WF_AUTOCANCEL;
2318 } 2664 }
2319 2665
2666 warn "flushing outstanding aio requests";
2667 for (;;) {
2668 BDB::flush;
2669 IO::AIO::flush;
2670 Coro::cede;
2671 last unless IO::AIO::nreqs || BDB::nreqs;
2672 warn "iterate...";
2673 }
2674
2675 ++$RELOAD;
2676
2320 warn "cancel all extension coros"; 2677 warn "cancelling all extension coros";
2321 $_->cancel for values %EXT_CORO; 2678 $_->cancel for values %EXT_CORO;
2322 %EXT_CORO = (); 2679 %EXT_CORO = ();
2323 2680
2324 warn "remove commands"; 2681 warn "removing commands";
2325 %COMMAND = (); 2682 %COMMAND = ();
2326 2683
2327 warn "remove ext commands"; 2684 warn "removing ext commands";
2328 %EXTCMD = (); 2685 %EXTCMD = ();
2329 2686
2330 warn "unload/nuke all extensions"; 2687 warn "unloading/nuking all extensions";
2331 for my $pkg (@EXTS) { 2688 for my $pkg (@EXTS) {
2332 warn "... unloading $pkg"; 2689 warn "... unloading $pkg";
2333 2690
2334 if (my $cb = $pkg->can ("unload")) { 2691 if (my $cb = $pkg->can ("unload")) {
2335 eval { 2692 eval {
2340 2697
2341 warn "... nuking $pkg"; 2698 warn "... nuking $pkg";
2342 Symbol::delete_package $pkg; 2699 Symbol::delete_package $pkg;
2343 } 2700 }
2344 2701
2345 warn "unload all perl modules loaded from $LIBDIR"; 2702 warn "unloading all perl modules loaded from $LIBDIR";
2346 while (my ($k, $v) = each %INC) { 2703 while (my ($k, $v) = each %INC) {
2347 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2704 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2348 2705
2349 warn "removing <$k>"; 2706 warn "... unloading $k";
2350 delete $INC{$k}; 2707 delete $INC{$k};
2351 2708
2352 $k =~ s/\.pm$//; 2709 $k =~ s/\.pm$//;
2353 $k =~ s/\//::/g; 2710 $k =~ s/\//::/g;
2354 2711
2357 } 2714 }
2358 2715
2359 Symbol::delete_package $k; 2716 Symbol::delete_package $k;
2360 } 2717 }
2361 2718
2362 warn "get rid of safe::, as good as possible"; 2719 warn "getting rid of safe::, as good as possible";
2363 Symbol::delete_package "safe::$_" 2720 Symbol::delete_package "safe::$_"
2364 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2721 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2365 2722
2366 warn "unload cf.pm \"a bit\""; 2723 warn "unloading cf.pm \"a bit\"";
2367 delete $INC{"cf.pm"}; 2724 delete $INC{"cf.pm"};
2725 delete $INC{"cf/pod.pm"};
2368 2726
2369 # don't, removes xs symbols, too, 2727 # don't, removes xs symbols, too,
2370 # and global variables created in xs 2728 # and global variables created in xs
2371 #Symbol::delete_package __PACKAGE__; 2729 #Symbol::delete_package __PACKAGE__;
2372 2730
2731 warn "unload completed, starting to reload now";
2732
2373 warn "reloading cf.pm"; 2733 warn "reloading cf.pm";
2374 require cf; 2734 require cf;
2375 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2735 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2376 2736
2377 warn "load config and database again"; 2737 warn "loading config and database again";
2378 cf::cfg_load; 2738 cf::cfg_load;
2379 cf::db_load;
2380 2739
2381 warn "load extensions"; 2740 warn "loading extensions";
2382 cf::load_extensions; 2741 cf::load_extensions;
2383 2742
2384 warn "reattach attachments to objects/players"; 2743 warn "reattaching attachments to objects/players";
2385 _global_reattach; 2744 _global_reattach; # objects, sockets
2386 warn "reattach attachments to maps"; 2745 warn "reattaching attachments to maps";
2387 reattach $_ for values %MAP; 2746 reattach $_ for values %MAP;
2388 }; 2747 warn "reattaching attachments to players";
2748 reattach $_ for values %PLAYER;
2389 2749
2390 if ($@) { 2750 warn "leaving sync_job";
2751
2752 1
2753 } or do {
2391 warn $@; 2754 warn $@;
2392 warn "error while reloading, exiting."; 2755 warn "error while reloading, exiting.";
2393 exit 1; 2756 exit 1;
2394 } 2757 };
2395 2758
2396 warn "reloaded"; 2759 warn "reloaded";
2397}; 2760};
2398 2761
2399our $RELOAD_WATCHER; # used only during reload 2762our $RELOAD_WATCHER; # used only during reload
2400 2763
2764sub reload_perl() {
2765 # doing reload synchronously and two reloads happen back-to-back,
2766 # coro crashes during coro_state_free->destroy here.
2767
2768 $RELOAD_WATCHER ||= Event->timer (
2769 reentrant => 0,
2770 after => 0,
2771 data => WF_AUTOCANCEL,
2772 cb => sub {
2773 do_reload_perl;
2774 undef $RELOAD_WATCHER;
2775 },
2776 );
2777}
2778
2401register_command "reload" => sub { 2779register_command "reload" => sub {
2402 my ($who, $arg) = @_; 2780 my ($who, $arg) = @_;
2403 2781
2404 if ($who->flag (FLAG_WIZ)) { 2782 if ($who->flag (FLAG_WIZ)) {
2405 $who->message ("reloading server."); 2783 $who->message ("reloading server.");
2406 2784 async { reload_perl };
2407 # doing reload synchronously and two reloads happen back-to-back,
2408 # coro crashes during coro_state_free->destroy here.
2409
2410 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2411 reload;
2412 undef $RELOAD_WATCHER;
2413 });
2414 } 2785 }
2415}; 2786};
2416 2787
2417unshift @INC, $LIBDIR; 2788unshift @INC, $LIBDIR;
2789
2790my $bug_warning = 0;
2791
2792our @WAIT_FOR_TICK;
2793our @WAIT_FOR_TICK_BEGIN;
2794
2795sub wait_for_tick {
2796 return unless $TICK_WATCHER->is_active;
2797 return if $Coro::current == $Coro::main;
2798
2799 my $signal = new Coro::Signal;
2800 push @WAIT_FOR_TICK, $signal;
2801 $signal->wait;
2802}
2803
2804sub wait_for_tick_begin {
2805 return unless $TICK_WATCHER->is_active;
2806 return if $Coro::current == $Coro::main;
2807
2808 my $signal = new Coro::Signal;
2809 push @WAIT_FOR_TICK_BEGIN, $signal;
2810 $signal->wait;
2811}
2418 2812
2419$TICK_WATCHER = Event->timer ( 2813$TICK_WATCHER = Event->timer (
2420 reentrant => 0, 2814 reentrant => 0,
2815 parked => 1,
2421 prio => 0, 2816 prio => 0,
2422 at => $NEXT_TICK || $TICK, 2817 at => $NEXT_TICK || $TICK,
2423 data => WF_AUTOCANCEL, 2818 data => WF_AUTOCANCEL,
2424 cb => sub { 2819 cb => sub {
2820 if ($Coro::current != $Coro::main) {
2821 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2822 unless ++$bug_warning > 10;
2823 return;
2824 }
2825
2425 $NOW = Event::time; 2826 $NOW = Event::time;
2426 2827
2427 cf::server_tick; # one server iteration 2828 cf::server_tick; # one server iteration
2829
2428 $RUNTIME += $TICK; 2830 $RUNTIME += $TICK;
2429 $NEXT_TICK += $TICK; 2831 $NEXT_TICK += $TICK;
2430 2832
2431 $WAIT_FOR_TICK->broadcast; 2833 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2432 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2834 $NEXT_RUNTIME_WRITE = $NOW + 10;
2835 Coro::async_pool {
2836 write_runtime
2837 or warn "ERROR: unable to write runtime file: $!";
2838 };
2839 }
2840
2841# my $AFTER = Event::time;
2842# warn $AFTER - $NOW;#d#
2433 2843
2434 # if we are delayed by four ticks or more, skip them all 2844 # if we are delayed by four ticks or more, skip them all
2435 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2845 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2436 2846
2437 $TICK_WATCHER->at ($NEXT_TICK); 2847 $TICK_WATCHER->at ($NEXT_TICK);
2438 $TICK_WATCHER->start; 2848 $TICK_WATCHER->start;
2849
2850 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2851 $sig->send;
2852 }
2853 while (my $sig = shift @WAIT_FOR_TICK) {
2854 $sig->send;
2855 }
2856
2857 _post_tick;
2439 }, 2858 },
2440); 2859);
2441 2860
2861{
2862 BDB::max_poll_time $TICK * 0.1;
2863 $BDB_POLL_WATCHER = Event->io (
2864 reentrant => 0,
2865 fd => BDB::poll_fileno,
2866 poll => 'r',
2867 prio => 0,
2868 data => WF_AUTOCANCEL,
2869 cb => \&BDB::poll_cb,
2870 );
2871 BDB::min_parallel 8;
2872
2873 BDB::set_sync_prepare {
2874 my $status;
2875 my $current = $Coro::current;
2876 (
2877 sub {
2878 $status = $!;
2879 $current->ready; undef $current;
2880 },
2881 sub {
2882 Coro::schedule while defined $current;
2883 $! = $status;
2884 },
2885 )
2886 };
2887
2888 unless ($DB_ENV) {
2889 $DB_ENV = BDB::db_env_create;
2890
2891 cf::sync_job {
2892 eval {
2893 BDB::db_env_open
2894 $DB_ENV,
2895 $BDBDIR,
2896 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2897 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2898 0666;
2899
2900 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2901
2902 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2903 $DB_ENV->set_lk_detect;
2904 };
2905
2906 cf::cleanup "db_env_open(db): $@" if $@;
2907 };
2908 }
2909}
2910
2911{
2912 IO::AIO::min_parallel 8;
2913
2914 undef $Coro::AIO::WATCHER;
2442IO::AIO::max_poll_time $TICK * 0.2; 2915 IO::AIO::max_poll_time $TICK * 0.1;
2443
2444$AIO_POLL_WATCHER = Event->io ( 2916 $AIO_POLL_WATCHER = Event->io (
2445 fd => IO::AIO::poll_fileno, 2917 reentrant => 0,
2446 poll => 'r',
2447 prio => 5,
2448 data => WF_AUTOCANCEL,
2449 cb => \&IO::AIO::poll_cb,
2450);
2451
2452$WRITE_RUNTIME_WATCHER = Event->timer (
2453 data => WF_AUTOCANCEL, 2918 data => WF_AUTOCANCEL,
2454 after => 0, 2919 fd => IO::AIO::poll_fileno,
2455 interval => 10, 2920 poll => 'r',
2456 cb => sub { 2921 prio => 6,
2457 (Coro::unblock_sub { 2922 cb => \&IO::AIO::poll_cb,
2458 write_runtime 2923 );
2459 or warn "ERROR: unable to write runtime file: $!"; 2924}
2460 })->(); 2925
2461 }, 2926# load additional modules
2462); 2927use cf::pod;
2463 2928
2464END { cf::emergency_save } 2929END { cf::emergency_save }
2465 2930
24661 29311
2467 2932

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines