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.466 by root, Thu Jan 8 03:03:24 2009 UTC vs.
Revision 1.605 by root, Sat Nov 17 11:03:28 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# 18# <http://www.gnu.org/licenses/>.
19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict qw(vars subs);
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
36
37use Guard (); 35use Carp ();
36
37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 60use Fcntl;
58use YAML (); 61use YAML::XS ();
59use IO::AIO (); 62use IO::AIO ();
60use Time::HiRes;
61use Compress::LZF; 63use Compress::LZF;
62use Digest::MD5 (); 64use Digest::MD5 ();
63 65
64AnyEvent::detect; 66AnyEvent::detect;
65 67
72 74
73# make sure c-lzf reinitialises itself 75# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 76Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 77Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76 78
79# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
81
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
83
84our @ORIG_INC;
78 85
79our %COMMAND = (); 86our %COMMAND = ();
80our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
81 88
82our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
83our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
84our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
85our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
87 96
88our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 98our @EVENT;
99our @REFLECT; # set by XS
100our %REFLECT; # set by us
90 101
91our $CONFDIR = confdir; 102our $CONFDIR = confdir;
103
92our $DATADIR = datadir; 104our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 105our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 106our $PODDIR = "$DATADIR/pod";
95our $MAPDIR = "$DATADIR/" . mapdir; 107our $MAPDIR = "$DATADIR/" . mapdir;
108
96our $LOCALDIR = localdir; 109our $LOCALDIR = localdir;
97our $TMPDIR = "$LOCALDIR/" . tmpdir; 110our $TMPDIR = "$LOCALDIR/" . tmpdir;
98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 111our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
99our $PLAYERDIR = "$LOCALDIR/" . playerdir; 112our $PLAYERDIR = "$LOCALDIR/" . playerdir;
100our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 115our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 116our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 117
105our %RESOURCE; 118#our %RESOURCE; # unused
119
120our $OUTPUT_RATE_MIN = 3000;
121our $OUTPUT_RATE_MAX = 1000000;
122
123our $MAX_LINKS = 32; # how many chained exits to follow
124our $VERBOSE_IO = 1;
106 125
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 126our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 127our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 128our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 129our $USE_FSYNC = 1; # use fsync to write maps - default on
111 130
112our $BDB_DEADLOCK_WATCHER; 131our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 132our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 133our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 134our $DB_ENV;
116 135
117our @EXTRA_MODULES = qw(pod mapscript); 136our @EXTRA_MODULES = qw(pod match mapscript incloader);
118 137
119our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
120 140
121our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
123our $NOW; 144our $NOW;
124 145
125our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
126our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
127our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
134our $JITTER; # average jitter 155our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 156our $TICK_START; # for load detecting purposes
136 157
137our @POST_INIT; 158our @POST_INIT;
138 159
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 160our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
161our $REALLY_UNLOOP; # never set to true, please :)
162
163our $WAIT_FOR_TICK = new Coro::Signal;
164our @WAIT_FOR_TICK_BEGIN;
140 165
141binmode STDOUT; 166binmode STDOUT;
142binmode STDERR; 167binmode STDERR;
143 168
144# read virtual server time, if available 169# read virtual server time, if available
146 open my $fh, "<", $RUNTIMEFILE 171 open my $fh, "<", $RUNTIMEFILE
147 or die "unable to read $RUNTIMEFILE file: $!"; 172 or die "unable to read $RUNTIMEFILE file: $!";
148 $RUNTIME = <$fh> + 0.; 173 $RUNTIME = <$fh> + 0.;
149} 174}
150 175
176eval "sub TICK() { $TICK } 1" or die;
177
151mkdir $_ 178mkdir $_
152 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 179 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
153 180
154our $EMERGENCY_POSITION; 181our $EMERGENCY_POSITION;
155 182
156sub cf::map::normalise; 183sub cf::map::normalise;
157 184
185sub in_main() {
186 $Coro::current == $Coro::main
187}
188
158############################################################################# 189#############################################################################
159 190
191%REFLECT = ();
192for (@REFLECT) {
193 my $reflect = JSON::XS::decode_json $_;
194 $REFLECT{$reflect->{class}} = $reflect;
195}
196
197# this is decidedly evil
198$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
199
200#############################################################################
201
160=head2 GLOBAL VARIABLES 202=head2 GLOBAL VARIABLES
161 203
162=over 4 204=over 4
163 205
164=item $cf::UPTIME 206=item $cf::UPTIME
165 207
166The timestamp of the server start (so not actually an uptime). 208The timestamp of the server start (so not actually an "uptime").
209
210=item $cf::SERVER_TICK
211
212An unsigned integer that starts at zero when the server is started and is
213incremented on every tick.
214
215=item $cf::NOW
216
217The (real) time of the last (current) server tick - updated before and
218after tick processing, so this is useful only as a rough "what time is it
219now" estimate.
220
221=item $cf::TICK
222
223The interval between each server tick, in seconds.
167 224
168=item $cf::RUNTIME 225=item $cf::RUNTIME
169 226
170The time this server has run, starts at 0 and is increased by $cf::TICK on 227The time this server has run, starts at 0 and is increased by $cf::TICK on
171every server tick. 228every server tick.
172 229
173=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
174$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
175$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
176 233
177Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
178directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
179unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
180database environment. 237database environment.
181 238
182=item $cf::NOW
183
184The time of the last (current) server tick.
185
186=item $cf::TICK
187
188The interval between server ticks, in seconds.
189
190=item $cf::LOADAVG 239=item $cf::LOADAVG
191 240
192The current CPU load on the server (alpha-smoothed), as a value between 0 241The current CPU load on the server (alpha-smoothed), as a value between 0
193(none) and 1 (overloaded), indicating how much time is spent on processing 242(none) and 1 (overloaded), indicating how much time is spent on processing
194objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
202Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
203from wherever your confdir points to. 252from wherever your confdir points to.
204 253
205=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
206 255
207These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 256These are functions that inhibit the current coroutine one tick.
208returns directly I<after> the tick processing (and consequently, can only wake one process 257cf::wait_for_tick_begin only returns directly I<after> the tick
258processing (and consequently, can only wake one thread per tick), while
209per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
260
261Note that cf::wait_for_tick will immediately return when the server is not
262ticking, making it suitable for small pauses in threads that need to run
263when the server is paused. If that is not applicable (i.e. you I<really>
264want to wait, use C<$cf::WAIT_FOR_TICK>).
265
266=item $cf::WAIT_FOR_TICK
267
268Note that C<cf::wait_for_tick> is probably the correct thing to use. This
269variable contains a L<Coro::Signal> that is broadcats after every server
270tick. Calling C<< ->wait >> on it will suspend the caller until after the
271next server tick.
272
273=cut
274
275sub wait_for_tick();
276sub wait_for_tick_begin();
210 277
211=item @cf::INVOKE_RESULTS 278=item @cf::INVOKE_RESULTS
212 279
213This array contains the results of the last C<invoke ()> call. When 280This array contains the results of the last C<invoke ()> call. When
214C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 281C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
215that call. 282that call.
216 283
284=item %cf::REFLECT
285
286Contains, for each (C++) class name, a hash reference with information
287about object members (methods, scalars, arrays and flags) and other
288metadata, which is useful for introspection.
289
217=back 290=back
218 291
219=cut 292=cut
220 293
221BEGIN { 294sub error(@) { LOG llevError, join "", @_ }
222 *CORE::GLOBAL::warn = sub { 295sub warn (@) { LOG llevWarn , join "", @_ }
296sub info (@) { LOG llevInfo , join "", @_ }
297sub debug(@) { LOG llevDebug, join "", @_ }
298sub trace(@) { LOG llevTrace, join "", @_ }
299
300$Coro::State::WARNHOOK = sub {
223 my $msg = join "", @_; 301 my $msg = join "", @_;
224 302
225 $msg .= "\n" 303 $msg .= "\n"
226 unless $msg =~ /\n$/; 304 unless $msg =~ /\n$/;
227 305
228 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 306 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
229 307
230 LOG llevError, $msg; 308 LOG llevWarn, $msg;
231 }; 309};
232}
233 310
234$Coro::State::DIEHOOK = sub { 311$Coro::State::DIEHOOK = sub {
235 return unless $^S eq 0; # "eq", not "==" 312 return unless $^S eq 0; # "eq", not "=="
236 313
237 if ($Coro::current == $Coro::main) {#d# 314 error Carp::longmess $_[0];
315
316 if (in_main) {#d#
238 warn "DIEHOOK called in main context, Coro bug?\n";#d# 317 error "DIEHOOK called in main context, Coro bug?\n";#d#
239 return;#d# 318 return;#d#
240 }#d# 319 }#d#
241 320
242 # kill coroutine otherwise 321 # kill coroutine otherwise
243 warn Carp::longmess $_[0];
244 Coro::terminate 322 Coro::terminate
245}; 323};
246
247$SIG{__DIE__} = sub { }; #d#?
248 324
249@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 325@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
250@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 326@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
251@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 327@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
252@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 328@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
266)) { 342)) {
267 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
268} 344}
269 345
270$EV::DIED = sub { 346$EV::DIED = sub {
271 warn "error in event callback: @_"; 347 warn "error in event callback: $@";
272}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
273 354
274############################################################################# 355#############################################################################
275 356
276=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
277 358
298 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 379 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
299 $d 380 $d
300 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
301} 382}
302 383
384=item $scalar = cf::load_file $path
385
386Loads the given file from path and returns its contents. Croaks on error
387and can block.
388
389=cut
390
391sub load_file($) {
392 0 <= aio_load $_[0], my $data
393 or Carp::croak "$_[0]: $!";
394
395 $data
396}
397
398=item $success = cf::replace_file $path, $data, $sync
399
400Atomically replaces the file at the given $path with new $data, and
401optionally $sync the data to disk before replacing the file.
402
403=cut
404
405sub replace_file($$;$) {
406 my ($path, $data, $sync) = @_;
407
408 my $lock = cf::lock_acquire ("replace_file:$path");
409
410 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
411 or return;
412
413 $data = $data->() if ref $data;
414
415 length $data == aio_write $fh, 0, (length $data), $data, 0
416 or return;
417
418 !$sync
419 or !aio_fsync $fh
420 or return;
421
422 aio_close $fh
423 and return;
424
425 aio_rename "$path~", $path
426 and return;
427
428 if ($sync) {
429 $path =~ s%/[^/]*$%%;
430 aio_pathsync $path;
431 }
432
433 1
434}
435
303=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
304 437
305Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
306 439
307=item $json = cf::encode_json $ref 440=item $json = cf::encode_json $ref
313our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 446our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
314 447
315sub encode_json($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
316sub decode_json($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
317 450
451=item $ref = cf::decode_storable $scalar
452
453Same as Coro::Storable::thaw, so blocks.
454
455=cut
456
457BEGIN { *decode_storable = \&Coro::Storable::thaw }
458
459=item $ref = cf::decode_yaml $scalar
460
461Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
462
463=cut
464
465sub decode_yaml($) {
466 fork_call { YAML::XS::Load $_[0] } @_
467}
468
469=item $scalar = cf::unlzf $scalar
470
471Same as Compress::LZF::compress, but takes server ticks into account, so
472blocks.
473
474=cut
475
476sub unlzf($) {
477 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
478 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
479 Compress::LZF::decompress $_[0]
480}
481
318=item cf::post_init { BLOCK } 482=item cf::post_init { BLOCK }
319 483
320Execute the given codeblock, I<after> all extensions have been (re-)loaded, 484Execute the given codeblock, I<after> all extensions have been (re-)loaded,
321but I<before> the server starts ticking again. 485but I<before> the server starts ticking again.
322 486
323The cdoeblock will have a single boolean argument to indicate whether this 487The codeblock will have a single boolean argument to indicate whether this
324is a reload or not. 488is a reload or not.
325 489
326=cut 490=cut
327 491
328sub post_init(&) { 492sub post_init(&) {
329 push @POST_INIT, shift; 493 push @POST_INIT, shift;
494}
495
496sub _post_init {
497 trace "running post_init jobs";
498
499 # run them in parallel...
500
501 my @join;
502
503 while () {
504 push @join, map &Coro::async ($_, 0), @POST_INIT;
505 @POST_INIT = ();
506
507 @join or last;
508
509 (pop @join)->join;
510 }
330} 511}
331 512
332=item cf::lock_wait $string 513=item cf::lock_wait $string
333 514
334Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
373} 554}
374 555
375=item cf::periodic $interval, $cb 556=item cf::periodic $interval, $cb
376 557
377Like EV::periodic, but randomly selects a starting point so that the actions 558Like EV::periodic, but randomly selects a starting point so that the actions
378get spread over timer. 559get spread over time.
379 560
380=cut 561=cut
381 562
382sub periodic($$) { 563sub periodic($$) {
383 my ($interval, $cb) = @_; 564 my ($interval, $cb) = @_;
387 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
388} 569}
389 570
390=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
391 572
392Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
393This call blocks and returns only when you have at least C<$time> seconds 574(default: 0): This call blocks and returns only when you have at least
394of cpu time till the next tick. The slot is only valid till the next cede. 575C<$time> seconds of cpu time till the next tick. The slot is only valid
576till the next cede.
577
578Background jobs should use a priority less than zero, interactive jobs
579should use 100 or more.
395 580
396The optional C<$name> can be used to identify the job to run. It might be 581The optional C<$name> can be used to identify the job to run. It might be
397used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
398 583
399Useful for short background jobs. 584Useful for short background jobs.
400 585
401=cut 586=cut
402 587
403our @SLOT_QUEUE; 588our @SLOT_QUEUE;
404our $SLOT_QUEUE; 589our $SLOT_QUEUE;
590our $SLOT_DECAY = 0.9;
405 591
406$SLOT_QUEUE->cancel if $SLOT_QUEUE; 592$SLOT_QUEUE->cancel if $SLOT_QUEUE;
407$SLOT_QUEUE = Coro::async { 593$SLOT_QUEUE = Coro::async {
408 $Coro::current->desc ("timeslot manager"); 594 $Coro::current->desc ("timeslot manager");
409 595
410 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
597 my $busy;
411 598
412 while () { 599 while () {
413 next_job: 600 next_job:
601
414 my $avail = cf::till_tick; 602 my $avail = cf::till_tick;
415 if ($avail > 0.01) { 603
416 for (0 .. $#SLOT_QUEUE) { 604 for (0 .. $#SLOT_QUEUE) {
417 if ($SLOT_QUEUE[$_][0] < $avail) { 605 if ($SLOT_QUEUE[$_][0] <= $avail) {
606 $busy = 0;
418 my $job = splice @SLOT_QUEUE, $_, 1, (); 607 my $job = splice @SLOT_QUEUE, $_, 1, ();
419 $job->[2]->send; 608 $job->[2]->send;
420 Coro::cede; 609 Coro::cede;
421 goto next_job; 610 goto next_job;
422 } 611 } else {
612 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
423 } 613 }
424 } 614 }
425 615
426 if (@SLOT_QUEUE) { 616 if (@SLOT_QUEUE) {
427 # we do not use wait_for_tick() as it returns immediately when tick is inactive 617 # we do not use wait_for_tick() as it returns immediately when tick is inactive
428 push @cf::WAIT_FOR_TICK, $signal; 618 $WAIT_FOR_TICK->wait;
429 $signal->wait;
430 } else { 619 } else {
620 $busy = 0;
431 Coro::schedule; 621 Coro::schedule;
432 } 622 }
433 } 623 }
434}; 624};
435 625
436sub get_slot($;$$) { 626sub get_slot($;$$) {
437 return if tick_inhibit || $Coro::current == $Coro::main; 627 return if tick_inhibit || $Coro::current == $Coro::main;
438 628
439 my ($time, $pri, $name) = @_; 629 my ($time, $pri, $name) = @_;
440 630
441 $time = $TICK * .6 if $time > $TICK * .6; 631 $time = clamp $time, 0.01, $TICK * .6;
632
442 my $sig = new Coro::Signal; 633 my $sig = new Coro::Signal;
443 634
444 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 635 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
445 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 636 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
446 $SLOT_QUEUE->ready; 637 $SLOT_QUEUE->ready;
472=cut 663=cut
473 664
474sub sync_job(&) { 665sub sync_job(&) {
475 my ($job) = @_; 666 my ($job) = @_;
476 667
477 if ($Coro::current == $Coro::main) { 668 if (in_main) {
478 my $time = EV::time; 669 my $time = AE::time;
479 670
480 # this is the main coro, too bad, we have to block 671 # this is the main coro, too bad, we have to block
481 # till the operation succeeds, freezing the server :/ 672 # till the operation succeeds, freezing the server :/
482 673
483 LOG llevError, Carp::longmess "sync job";#d# 674 #LOG llevError, Carp::longmess "sync job";#d#
484 675
485 my $freeze_guard = freeze_mainloop; 676 my $freeze_guard = freeze_mainloop;
486 677
487 my $busy = 1; 678 my $busy = 1;
488 my @res; 679 my @res;
489 680
490 (async { 681 (async {
491 $Coro::current->desc ("sync job coro"); 682 $Coro::current->desc ("sync job coro");
492 @res = eval { $job->() }; 683 @res = eval { $job->() };
493 warn $@ if $@; 684 error $@ if $@;
494 undef $busy; 685 undef $busy;
495 })->prio (Coro::PRIO_MAX); 686 })->prio (Coro::PRIO_MAX);
496 687
497 while ($busy) { 688 while ($busy) {
498 if (Coro::nready) { 689 if (Coro::nready) {
500 } else { 691 } else {
501 EV::loop EV::LOOP_ONESHOT; 692 EV::loop EV::LOOP_ONESHOT;
502 } 693 }
503 } 694 }
504 695
505 my $time = EV::time - $time; 696 my $time = AE::time - $time;
506 697
507 $TICK_START += $time; # do not account sync jobs to server load 698 $TICK_START += $time; # do not account sync jobs to server load
508 699
509 wantarray ? @res : $res[0] 700 wantarray ? @res : $res[0]
510 } else { 701 } else {
532 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
533 724
534 $coro 725 $coro
535} 726}
536 727
537=item fork_call { }, $args 728=item fork_call { }, @args
538 729
539Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
540process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
541Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
542never block itself or use any form of event handling. 733never block itself or use any form of event handling.
543 734
544=cut 735=cut
545 736
737sub post_fork {
738 reset_signals;
739}
740
546sub fork_call(&@) { 741sub fork_call(&@) {
547 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
548 743
549 # we seemingly have to make a local copy of the whole thing,
550 # otherwise perl prematurely frees the stuff :/
551 # TODO: investigate and fix (likely this will be rather laborious)
552
553 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
554 reset_signals; 745 cf::post_fork;
555 &$cb 746 &$cb
556 }, @args; 747 } @args;
557 748
558 wantarray ? @res : $res[-1] 749 wantarray ? @res : $res[-1]
750}
751
752sub objinfo {
753 (
754 "counter value" => cf::object::object_count,
755 "objects created" => cf::object::create_count,
756 "objects destroyed" => cf::object::destroy_count,
757 "freelist size" => cf::object::free_count,
758 "allocated objects" => cf::object::objects_size,
759 "active objects" => cf::object::actives_size,
760 )
559} 761}
560 762
561=item $coin = coin_from_name $name 763=item $coin = coin_from_name $name
562 764
563=cut 765=cut
600within each server. 802within each server.
601 803
602=cut 804=cut
603 805
604sub db_table($) { 806sub db_table($) {
807 cf::error "db_get called from main context"
808 if $Coro::current == $Coro::main;
809
605 my ($name) = @_; 810 my ($name) = @_;
606 my $db = BDB::db_create $DB_ENV; 811 my $db = BDB::db_create $DB_ENV;
607 812
608 eval { 813 eval {
609 $db->set_flags (BDB::CHKSUM); 814 $db->set_flags (BDB::CHKSUM);
619} 824}
620 825
621our $DB; 826our $DB;
622 827
623sub db_init { 828sub db_init {
624 cf::sync_job {
625 $DB ||= db_table "db"; 829 $DB ||= db_table "db";
626 };
627} 830}
628 831
629sub db_get($$) { 832sub db_get($$) {
630 my $key = "$_[0]/$_[1]"; 833 my $key = "$_[0]/$_[1]";
631 834
632 cf::sync_job { 835 cf::error "db_get called from main context"
836 if $Coro::current == $Coro::main;
837
633 BDB::db_get $DB, undef, $key, my $data; 838 BDB::db_get $DB, undef, $key, my $data;
634 839
635 $! ? () 840 $! ? ()
636 : $data 841 : $data
637 }
638} 842}
639 843
640sub db_put($$$) { 844sub db_put($$$) {
641 BDB::dbreq_pri 4; 845 BDB::dbreq_pri 4;
642 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 846 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
670 874
671 my @data; 875 my @data;
672 my $md5; 876 my $md5;
673 877
674 for (0 .. $#$src) { 878 for (0 .. $#$src) {
675 0 <= aio_load $src->[$_], $data[$_] 879 $data[$_] = load_file $src->[$_];
676 or Carp::croak "$src->[$_]: $!";
677 } 880 }
678 881
679 # if processing is expensive, check 882 # if processing is expensive, check
680 # checksum first 883 # checksum first
681 if (1) { 884 if (1) {
694 897
695 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
696 } 899 }
697 } 900 }
698 901
699 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
700 my $data = $process->(\@data); 903 my $data = $process->(\@data);
701 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
702 905
703 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
704 907
705 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
706 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
707 db_put cache => "$id/meta", $meta; 910 db_put cache => "$id/meta", $meta;
708 911
718 921
719=cut 922=cut
720 923
721sub datalog($@) { 924sub datalog($@) {
722 my ($type, %kv) = @_; 925 my ($type, %kv) = @_;
723 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 926 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
724} 927}
725 928
726=back 929=back
727 930
728=cut 931=cut
923 1126
924 } elsif (exists $cb_id{$type}) { 1127 } elsif (exists $cb_id{$type}) {
925 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1128 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
926 1129
927 } elsif (ref $type) { 1130 } elsif (ref $type) {
928 warn "attaching objects not supported, ignoring.\n"; 1131 error "attaching objects not supported, ignoring.\n";
929 1132
930 } else { 1133 } else {
931 shift @arg; 1134 shift @arg;
932 warn "attach argument '$type' not supported, ignoring.\n"; 1135 error "attach argument '$type' not supported, ignoring.\n";
933 } 1136 }
934 } 1137 }
935} 1138}
936 1139
937sub _object_attach { 1140sub _object_attach {
947 _attach $registry, $klass, @attach; 1150 _attach $registry, $klass, @attach;
948 } 1151 }
949 1152
950 $obj->{$name} = \%arg; 1153 $obj->{$name} = \%arg;
951 } else { 1154 } else {
952 warn "object uses attachment '$name' which is not available, postponing.\n"; 1155 info "object uses attachment '$name' which is not available, postponing.\n";
953 } 1156 }
954 1157
955 $obj->{_attachment}{$name} = undef; 1158 $obj->{_attachment}{$name} = undef;
956} 1159}
957 1160
1016 1219
1017 for (@$callbacks) { 1220 for (@$callbacks) {
1018 eval { &{$_->[1]} }; 1221 eval { &{$_->[1]} };
1019 1222
1020 if ($@) { 1223 if ($@) {
1021 warn "$@";
1022 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1224 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1023 override; 1225 override;
1024 } 1226 }
1025 1227
1026 return 1 if $override; 1228 return 1 if $override;
1027 } 1229 }
1106 for (@$attach) { 1308 for (@$attach) {
1107 my ($klass, @attach) = @$_; 1309 my ($klass, @attach) = @$_;
1108 _attach $registry, $klass, @attach; 1310 _attach $registry, $klass, @attach;
1109 } 1311 }
1110 } else { 1312 } else {
1111 warn "object uses attachment '$name' that is not available, postponing.\n"; 1313 info "object uses attachment '$name' that is not available, postponing.\n";
1112 } 1314 }
1113 } 1315 }
1114} 1316}
1115 1317
1116cf::attachable->attach ( 1318cf::attachable->attach (
1143 my ($filename, $rdata, $objs) = @_; 1345 my ($filename, $rdata, $objs) = @_;
1144 1346
1145 sync_job { 1347 sync_job {
1146 if (length $$rdata) { 1348 if (length $$rdata) {
1147 utf8::decode (my $decname = $filename); 1349 utf8::decode (my $decname = $filename);
1148 warn sprintf "saving %s (%d,%d)\n", 1350 trace sprintf "saving %s (%d,%d)\n",
1149 $decname, length $$rdata, scalar @$objs; 1351 $decname, length $$rdata, scalar @$objs
1352 if $VERBOSE_IO;
1150 1353
1151 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1354 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1152 aio_chmod $fh, SAVE_MODE; 1355 aio_chmod $fh, SAVE_MODE;
1153 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1356 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1357 if ($cf::USE_FSYNC) {
1358 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1359 aio_fsync $fh;
1360 }
1155 aio_close $fh; 1361 aio_close $fh;
1156 1362
1157 if (@$objs) { 1363 if (@$objs) {
1158 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1364 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1159 aio_chmod $fh, SAVE_MODE; 1365 aio_chmod $fh, SAVE_MODE;
1160 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1366 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1161 aio_write $fh, 0, (length $data), $data, 0; 1367 aio_write $fh, 0, (length $data), $data, 0;
1162 aio_fsync $fh if $cf::USE_FSYNC; 1368 if ($cf::USE_FSYNC) {
1369 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1370 aio_fsync $fh;
1371 }
1163 aio_close $fh; 1372 aio_close $fh;
1164 aio_rename "$filename.pst~", "$filename.pst"; 1373 aio_rename "$filename.pst~", "$filename.pst";
1165 } 1374 }
1166 } else { 1375 } else {
1167 aio_unlink "$filename.pst"; 1376 aio_unlink "$filename.pst";
1170 aio_rename "$filename~", $filename; 1379 aio_rename "$filename~", $filename;
1171 1380
1172 $filename =~ s%/[^/]+$%%; 1381 $filename =~ s%/[^/]+$%%;
1173 aio_pathsync $filename if $cf::USE_FSYNC; 1382 aio_pathsync $filename if $cf::USE_FSYNC;
1174 } else { 1383 } else {
1175 warn "unable to save objects: $filename~: $!\n"; 1384 error "unable to save objects: $filename~: $!\n";
1176 } 1385 }
1177 } else { 1386 } else {
1178 aio_unlink $filename; 1387 aio_unlink $filename;
1179 aio_unlink "$filename.pst"; 1388 aio_unlink "$filename.pst";
1180 } 1389 }
1204 my $st = eval { Coro::Storable::thaw $av }; 1413 my $st = eval { Coro::Storable::thaw $av };
1205 $av = $st->{objs}; 1414 $av = $st->{objs};
1206 } 1415 }
1207 1416
1208 utf8::decode (my $decname = $filename); 1417 utf8::decode (my $decname = $filename);
1209 warn sprintf "loading %s (%d,%d)\n", 1418 trace sprintf "loading %s (%d,%d)\n",
1210 $decname, length $data, scalar @{$av || []}; 1419 $decname, length $data, scalar @{$av || []}
1420 if $VERBOSE_IO;
1211 1421
1212 ($data, $av) 1422 ($data, $av)
1213} 1423}
1214 1424
1215=head2 COMMAND CALLBACKS 1425=head2 COMMAND CALLBACKS
1219=cut 1429=cut
1220 1430
1221############################################################################# 1431#############################################################################
1222# command handling &c 1432# command handling &c
1223 1433
1224=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1225 1435
1226Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1227$name. 1437$name.
1228 1438
1229=cut 1439=cut
1235 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1236 1446
1237 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1238} 1448}
1239 1449
1240=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1241 1451
1242Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1243extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1244received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1245the logged-in player. Ext commands can only be processed after a player 1455the logged-in player. Ext commands can only be processed after a player
1246has logged in successfully. 1456has logged in successfully.
1247 1457
1248If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1249called.
1250 1459
1460=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1461
1462Same as C<cf::register_extcmd>, but instead of returning values, the
1463callback needs to clal the C<$reply> function.
1464
1251=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1252 1466
1253Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1254exticmd packet. Exti commands are processed by the server as soon as they 1468exticmd packet. Exti commands are processed by the server as soon as they
1255are received, i.e. out of order w.r.t. other commands. The first argument 1469are received, i.e. out of order w.r.t. other commands. The first argument
1256is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1257log-in. 1471log-in.
1258 1472
1259If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1260called.
1261 1474
1262=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1263 1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1480=cut
1481
1264sub register_extcmd { 1482sub register_extcmd($$) {
1265 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1266 1484
1267 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1268} 1486}
1269 1487
1270sub register_exticmd { 1488sub register_async_extcmd($$) {
1271 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1272 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1273 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1274} 1498}
1275 1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1504}
1505
1276use File::Glob (); 1506use File::Glob ();
1277 1507
1278cf::player->attach ( 1508cf::player->attach (
1279 on_command => sub { 1509 on_unknown_command => sub {
1280 my ($pl, $name, $params) = @_; 1510 my ($pl, $name, $params) = @_;
1281 1511
1282 my $cb = $COMMAND{$name} 1512 my $cb = $COMMAND{$name}
1283 or return; 1513 or return;
1284 1514
1292 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1293 1523
1294 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1295 1525
1296 if (ref $msg) { 1526 if (ref $msg) {
1297 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1298 "ARRAY" eq ref $msg
1299 ? @$msg
1300 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1301 1528
1302 my @reply;
1303
1304 if (my $cb = $EXTCMD{$type}) { 1529 if (my $cb = $EXTACMD{$type}) {
1530 $cb->(
1531 $pl,
1532 sub {
1533 $pl->ext_msg ("reply-$reply", @_)
1534 if $reply;
1535 },
1536 @payload
1537 );
1538 } else {
1539 my @reply;
1540
1541 if (my $cb = $EXTCMD{$type}) {
1305 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1306 } 1547 }
1307 1548
1308 $pl->ext_reply ($reply, @reply)
1309 if $reply;
1310
1311 } else { 1549 } else {
1312 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1313 } 1551 }
1314 1552
1315 cf::override; 1553 cf::override;
1316 }, 1554 },
1317); 1555);
1318 1556
1319# "readahead" all extensions 1557# "readahead" all extensions
1320sub cache_extensions { 1558sub cache_extensions {
1321 my $grp = IO::AIO::aio_group; 1559 my $grp = IO::AIO::aio_group;
1322 1560
1323 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1561 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1324 for (grep /\.ext$/, @{$_[0]}) { 1562 for (grep /\.ext$/, @{$_[0]}) {
1325 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1563 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1326 } 1564 }
1327 }; 1565 };
1328 1566
1329 $grp 1567 $grp
1330} 1568}
1331 1569
1570sub _ext_cfg_reg($$$$) {
1571 my ($rvar, $varname, $cfgname, $default) = @_;
1572
1573 $cfgname = lc $varname
1574 unless length $cfgname;
1575
1576 $EXT_CFG{$cfgname} = [$rvar, $default];
1577
1578 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1579}
1580
1332sub load_extensions { 1581sub load_extensions {
1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1585
1333 cf::sync_job { 1586 cf::sync_job {
1334 my %todo; 1587 my %todo;
1335 1588
1336 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1337 next unless -r $path; 1590 next unless -r $path;
1355 1608
1356 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1609 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1357 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1610 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1358 1611
1359 $ext{source} = 1612 $ext{source} =
1360 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1613 "package $pkg; use common::sense;\n"
1361 . "#line 1 \"$path\"\n{\n" 1614 . "#line 1 \"$path\"\n{\n"
1362 . $source 1615 . $source
1363 . "\n};\n1"; 1616 . "\n};\n1";
1364 1617
1365 $todo{$base} = \%ext; 1618 $todo{$base} = \%ext;
1366 } 1619 }
1367 1620
1621 my $pass = 0;
1368 my %done; 1622 my %done;
1369 while (%todo) { 1623 while (%todo) {
1370 my $progress; 1624 my $progress;
1371 1625
1626 ++$pass;
1627
1628 ext:
1372 while (my ($k, $v) = each %todo) { 1629 while (my ($k, $v) = each %todo) {
1373 for (split /,\s*/, $v->{meta}{depends}) { 1630 for (split /,\s*/, $v->{meta}{depends}) {
1374 goto skip 1631 next ext
1375 unless exists $done{$_}; 1632 unless exists $done{$_};
1376 } 1633 }
1377 1634
1378 warn "... loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1379 1636
1380 unless (eval $v->{source}) { 1637 my $source = $v->{source};
1638
1639 # support "CONF varname :confname = default" pseudo-statements
1640 $source =~ s{
1641 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1642 }{
1643 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1644 }gmxe;
1645
1646 my $active = eval $source;
1647
1648 if (length $@) {
1381 my $msg = $@ ? "$v->{path}: $@\n" 1649 error "$v->{path}: $@\n";
1382 : "$v->{base}: extension inactive.\n";
1383 1650
1384 if (exists $v->{meta}{mandatory}) {
1385 warn $msg;
1386 cf::cleanup "mandatory extension failed to load, exiting."; 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1387 } 1652 if exists $v->{meta}{mandatory};
1388 1653
1389 warn $msg; 1654 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1655 delete $todo{$k};
1656 } else {
1657 $done{$k} = delete $todo{$k};
1658 push @EXTS, $v->{pkg};
1659 $progress = 1;
1660
1661 info "$v->{base}: extension inactive.\n"
1662 unless $active;
1390 } 1663 }
1391
1392 $done{$k} = delete $todo{$k};
1393 push @EXTS, $v->{pkg};
1394 $progress = 1;
1395 } 1664 }
1396 1665
1397 skip: 1666 unless ($progress) {
1398 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1667 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1399 unless $progress; 1668
1669 while (my ($k, $v) = each %todo) {
1670 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1671 if exists $v->{meta}{mandatory};
1672 }
1673
1674 last;
1675 }
1400 } 1676 }
1401 }; 1677 };
1402} 1678}
1403 1679
1404############################################################################# 1680#############################################################################
1488 $cf::PLAYER{$login} = $pl 1764 $cf::PLAYER{$login} = $pl
1489 } 1765 }
1490 } 1766 }
1491} 1767}
1492 1768
1769cf::player->attach (
1770 on_load => sub {
1771 my ($pl, $path) = @_;
1772
1773 # restore slots saved in save, below
1774 my $slots = delete $pl->{_slots};
1775
1776 $pl->ob->current_weapon ($slots->[0]);
1777 $pl->combat_ob ($slots->[1]);
1778 $pl->ranged_ob ($slots->[2]);
1779 },
1780);
1781
1493sub save($) { 1782sub save($) {
1494 my ($pl) = @_; 1783 my ($pl) = @_;
1495 1784
1496 return if $pl->{deny_save}; 1785 return if $pl->{deny_save};
1497 1786
1502 1791
1503 aio_mkdir playerdir $pl, 0770; 1792 aio_mkdir playerdir $pl, 0770;
1504 $pl->{last_save} = $cf::RUNTIME; 1793 $pl->{last_save} = $cf::RUNTIME;
1505 1794
1506 cf::get_slot 0.01; 1795 cf::get_slot 0.01;
1796
1797 # save slots, to be restored later
1798 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1507 1799
1508 $pl->save_pl ($path); 1800 $pl->save_pl ($path);
1509 cf::cede_to_tick; 1801 cf::cede_to_tick;
1510} 1802}
1511 1803
1545 my $name = $pl->ob->name; 1837 my $name = $pl->ob->name;
1546 1838
1547 $pl->{deny_save} = 1; 1839 $pl->{deny_save} = 1;
1548 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1840 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1549 1841
1550 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1842 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1551 $pl->deactivate; 1843 $pl->deactivate;
1844
1552 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1845 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1553 $pl->ob->check_score;
1554 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1846 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1847 ext::highscore::check ($pl->ob);
1848
1555 $pl->ns->destroy if $pl->ns; 1849 $pl->ns->destroy if $pl->ns;
1556 1850
1557 my $path = playerdir $pl; 1851 my $path = playerdir $pl;
1558 my $temp = "$path~$cf::RUNTIME~deleting~"; 1852 my $temp = "$path~$cf::RUNTIME~deleting~";
1559 aio_rename $path, $temp; 1853 aio_rename $path, $temp;
1613 \@logins 1907 \@logins
1614} 1908}
1615 1909
1616=item $player->maps 1910=item $player->maps
1617 1911
1912=item cf::player::maps $login
1913
1618Returns an arrayref of map paths that are private for this 1914Returns an arrayref of map paths that are private for this
1619player. May block. 1915player. May block.
1620 1916
1621=cut 1917=cut
1622 1918
1643 1939
1644=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1645 1941
1646Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1647 1943
1648=item $player->ext_reply ($msgid, @msg)
1649
1650Sends an ext reply to the player.
1651
1652=cut
1653
1654sub ext_reply($$@) {
1655 my ($self, $id, @msg) = @_;
1656
1657 $self->ns->ext_reply ($id, @msg)
1658}
1659
1660=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1661 1945
1662Sends an ext event to the client. 1946Sends an ext event to the client.
1663 1947
1664=cut 1948=cut
1683 1967
1684=cut 1968=cut
1685 1969
1686sub find_by_path($) { 1970sub find_by_path($) {
1687 my ($path) = @_; 1971 my ($path) = @_;
1972
1973 $path =~ s/^~[^\/]*//; # skip ~login
1688 1974
1689 my ($match, $specificity); 1975 my ($match, $specificity);
1690 1976
1691 for my $region (list) { 1977 for my $region (list) {
1692 if ($region->{match} && $path =~ $region->{match}) { 1978 if ($region->{match} && $path =~ $region->{match}) {
1721sub generate_random_map { 2007sub generate_random_map {
1722 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1723 2009
1724 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2010 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1725 2011
1726 # mit "rum" bekleckern, nicht
1727 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1728 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1729 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1730 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1731 $rmp->{exit_on_final_map},
1732 $rmp->{xsize}, $rmp->{ysize},
1733 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1734 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1735 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1736 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1737 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1738 (cf::region::find $rmp->{region}), $rmp->{custom}
1739 )
1740} 2013}
1741 2014
1742=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1743 2016
1744Register a handler for the map path matching the given regex at the 2017Register a handler for the map path matching the given regex at the
1749 2022
1750sub register { 2023sub register {
1751 my (undef, $regex, $prio) = @_; 2024 my (undef, $regex, $prio) = @_;
1752 my $pkg = caller; 2025 my $pkg = caller;
1753 2026
1754 no strict;
1755 push @{"$pkg\::ISA"}, __PACKAGE__; 2027 push @{"$pkg\::ISA"}, __PACKAGE__;
1756 2028
1757 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2029 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1758} 2030}
1759 2031
1760# also paths starting with '/' 2032# also paths starting with '/'
1761$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2033$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1762 2034
1763sub thawer_merge { 2035sub thawer_merge {
1764 my ($self, $merge) = @_; 2036 my ($self, $merge) = @_;
1765 2037
1766 # we have to keep some variables in memory intact 2038 # we have to keep some variables in memory intact
1771} 2043}
1772 2044
1773sub normalise { 2045sub normalise {
1774 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1775 2047
1776 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1777 2049
1778 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1779 2051
1780 # map plan: 2052 # map plan:
1781 # 2053 #
1796 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1797 $path = "$base/$path"; 2069 $path = "$base/$path";
1798 } 2070 }
1799 2071
1800 for ($path) { 2072 for ($path) {
1801 redo if s{//}{/};
1802 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1803 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1804 } 2075 }
1805 2076
1806 $path 2077 $path
1820 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1821 return $self; 2092 return $self;
1822 } 2093 }
1823 } 2094 }
1824 2095
1825 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1826 () 2097 ()
1827} 2098}
1828 2099
2100# may re-bless or do other evil things
1829sub init { 2101sub init {
1830 my ($self) = @_; 2102 my ($self) = @_;
1831 2103
1832 $self 2104 $self
1833} 2105}
1898 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1899 2171
1900 1 2172 1
1901} 2173}
1902 2174
2175# used to laod the header of an original map
1903sub load_header_orig { 2176sub load_header_orig {
1904 my ($self) = @_; 2177 my ($self) = @_;
1905 2178
1906 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
1907} 2180}
1908 2181
2182# used to laod the header of an instantiated map
1909sub load_header_temp { 2183sub load_header_temp {
1910 my ($self) = @_; 2184 my ($self) = @_;
1911 2185
1912 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
1913} 2187}
1914 2188
2189# called after loading the header from an instantiated map
1915sub prepare_temp { 2190sub prepare_temp {
1916 my ($self) = @_; 2191 my ($self) = @_;
1917 2192
1918 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
1919 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
1920 # safety 2195 # safety
1921 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
1922 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
1923} 2198}
1924 2199
2200# called after loading the header from an original map
1925sub prepare_orig { 2201sub prepare_orig {
1926 my ($self) = @_; 2202 my ($self) = @_;
1927 2203
1928 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
1929 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
1953 2229
1954sub find; 2230sub find;
1955sub find { 2231sub find {
1956 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
1957 2233
2234 cf::cede_to_tick;
2235
1958 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
1959 2237
1960 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1961 my $guard2 = cf::lock_acquire "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
1962 2240
1963 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
1980 2258
1981 $cf::MAP{$path} = $map 2259 $cf::MAP{$path} = $map
1982 } 2260 }
1983} 2261}
1984 2262
1985sub pre_load { } 2263sub pre_load { }
1986sub post_load { } 2264#sub post_load { } # XS
1987 2265
1988sub load { 2266sub load {
1989 my ($self) = @_; 2267 my ($self) = @_;
1990 2268
1991 local $self->{deny_reset} = 1; # loading can take a long time 2269 local $self->{deny_reset} = 1; # loading can take a long time
1994 2272
1995 { 2273 {
1996 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
1997 2275
1998 return unless $self->valid; 2276 return unless $self->valid;
1999 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2000
2001 $self->in_memory (cf::MAP_LOADING);
2002 2278
2003 $self->alloc; 2279 $self->alloc;
2004 2280
2005 $self->pre_load; 2281 $self->pre_load;
2006 cf::cede_to_tick; 2282 cf::cede_to_tick;
2007 2283
2284 if (exists $self->{load_path}) {
2008 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2009 $f->skip_block; 2286 $f->skip_block;
2010 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2011 or return; 2288 or return;
2012 2289
2013 $self->post_load_original 2290 $self->post_load_original
2014 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2015 2292
2016 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2017 utf8::encode $uniq; 2294 utf8::encode $uniq;
2018 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2019 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2020 $self->clear_unique_items; 2297 $self->clear_unique_items;
2021 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2022 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2023 } 2301 }
2024 } 2302 }
2025 }
2026 2303
2027 $f->resolve_delayed_derefs; 2304 $f->resolve_delayed_derefs;
2305 } else {
2306 $self->post_load_original
2307 if delete $self->{load_original};
2308 }
2309
2310 $self->state (cf::MAP_INACTIVE);
2028 2311
2029 cf::cede_to_tick; 2312 cf::cede_to_tick;
2030 # now do the right thing for maps 2313 # now do the right thing for maps
2031 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2032 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2036 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2037 $self->decay_objects; 2320 $self->decay_objects;
2038 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2039 $self->update_buttons; 2322 $self->update_buttons;
2040 cf::cede_to_tick; 2323 cf::cede_to_tick;
2041 $self->activate; 2324 #$self->activate; # no longer activate maps automatically
2042 } 2325 }
2043 2326
2044 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2046
2047 $self->in_memory (cf::MAP_ACTIVE);
2048 } 2329 }
2049 2330
2050 $self->post_load; 2331 $self->post_load;
2051}
2052 2332
2333 1
2334}
2335
2336# customize the map for a given player, i.e.
2337# return the _real_ map. used by e.g. per-player
2338# maps to change the path to ~playername/mappath
2053sub customise_for { 2339sub customise_for {
2054 my ($self, $ob) = @_; 2340 my ($self, $ob) = @_;
2055 2341
2056 return find "~" . $ob->name . "/" . $self->{path} 2342 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2343 if $self->per_player;
2060# if $self->per_party; 2346# if $self->per_party;
2061 2347
2062 $self 2348 $self
2063} 2349}
2064 2350
2065# find and load all maps in the 3x3 area around a map
2066sub load_neighbours {
2067 my ($map) = @_;
2068
2069 my @neigh; # diagonal neighbours
2070
2071 for (0 .. 3) {
2072 my $neigh = $map->tile_path ($_)
2073 or next;
2074 $neigh = find $neigh, $map
2075 or next;
2076 $neigh->load;
2077
2078 push @neigh,
2079 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2080 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2081 }
2082
2083 for (grep defined $_->[0], @neigh) {
2084 my ($path, $origin) = @$_;
2085 my $neigh = find $path, $origin
2086 or next;
2087 $neigh->load;
2088 }
2089}
2090
2091sub find_sync { 2351sub find_sync {
2092 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2093 2353
2094 cf::sync_job { find $path, $origin } 2354 # it's a bug to call this from the main context
2355 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2356 if $Coro::current == $Coro::main;
2357
2358 find $path, $origin
2095} 2359}
2096 2360
2097sub do_load_sync { 2361sub do_load_sync {
2098 my ($map) = @_; 2362 my ($map) = @_;
2099 2363
2364 # it's a bug to call this from the main context
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2102 2367
2103 cf::sync_job { $map->load }; 2368 $map->load;
2104} 2369}
2105 2370
2106our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2107our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2108 2373
2109sub find_async { 2374sub find_async {
2110 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2111 2376
2112 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2113 2378
2114 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2115 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2116 } 2381 }
2117 2382
2118 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2119 2384
2120 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2134 $MAP_PREFETCHER->prio (6); 2399 $MAP_PREFETCHER->prio (6);
2135 2400
2136 () 2401 ()
2137} 2402}
2138 2403
2404# common code, used by both ->save and ->swapout
2139sub save { 2405sub _save {
2140 my ($self) = @_; 2406 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2407
2144 $self->{last_save} = $cf::RUNTIME; 2408 $self->{last_save} = $cf::RUNTIME;
2145 2409
2146 return unless $self->dirty; 2410 return unless $self->dirty;
2147 2411
2167 } else { 2431 } else {
2168 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2432 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2169 } 2433 }
2170} 2434}
2171 2435
2436sub save {
2437 my ($self) = @_;
2438
2439 my $lock = cf::lock_acquire "map_data:$self->{path}";
2440
2441 $self->_save;
2442}
2443
2172sub swap_out { 2444sub swap_out {
2173 my ($self) = @_; 2445 my ($self) = @_;
2174 2446
2175 # save first because save cedes
2176 $self->save;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2448
2449 return if !$self->linkable;
2450 return if $self->{deny_save};
2180 return if $self->players; 2451 return if $self->players;
2181 return if $self->in_memory != cf::MAP_ACTIVE; 2452
2453 # first deactivate the map and "unlink" it from the core
2454 $self->deactivate;
2455 $_->clear_links_to ($self) for values %cf::MAP;
2456 $self->state (cf::MAP_SWAPPED);
2457
2458 # then atomically save
2459 $self->_save;
2460
2461 # then free the map
2462 $self->clear;
2463}
2464
2465sub reset_at {
2466 my ($self) = @_;
2467
2468 # TODO: safety, remove and allow resettable per-player maps
2182 return if $self->{deny_save}; 2469 return 1e99 if $self->{deny_reset};
2183 2470
2471 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2472 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2473
2474 $time + $to
2475}
2476
2477sub should_reset {
2478 my ($self) = @_;
2479
2480 $self->reset_at <= $cf::RUNTIME
2481}
2482
2483sub reset {
2484 my ($self) = @_;
2485
2486 my $lock = cf::lock_acquire "map_data:$self->{path}";
2487
2488 return if $self->players;
2489
2490 cf::trace "resetting map ", $self->path, "\n";
2491
2184 $self->in_memory (cf::MAP_SWAPPED); 2492 $self->state (cf::MAP_SWAPPED);
2493
2494 # need to save uniques path
2495 unless ($self->{deny_save}) {
2496 my $uniq = $self->uniq_path; utf8::encode $uniq;
2497
2498 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2499 if $uniq;
2500 }
2501
2502 delete $cf::MAP{$self->path};
2185 2503
2186 $self->deactivate; 2504 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP; 2505 $_->clear_links_to ($self) for values %cf::MAP;
2188 $self->clear; 2506 $self->clear;
2189}
2190
2191sub reset_at {
2192 my ($self) = @_;
2193
2194 # TODO: safety, remove and allow resettable per-player maps
2195 return 1e99 if $self->{deny_reset};
2196
2197 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2198 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2199
2200 $time + $to
2201}
2202
2203sub should_reset {
2204 my ($self) = @_;
2205
2206 $self->reset_at <= $cf::RUNTIME
2207}
2208
2209sub reset {
2210 my ($self) = @_;
2211
2212 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213
2214 return if $self->players;
2215
2216 warn "resetting map ", $self->path;
2217
2218 $self->in_memory (cf::MAP_SWAPPED);
2219
2220 # need to save uniques path
2221 unless ($self->{deny_save}) {
2222 my $uniq = $self->uniq_path; utf8::encode $uniq;
2223
2224 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2225 if $uniq;
2226 }
2227
2228 delete $cf::MAP{$self->path};
2229
2230 $self->deactivate;
2231 $_->clear_links_to ($self) for values %cf::MAP;
2232 $self->clear;
2233 2507
2234 $self->unlink_save; 2508 $self->unlink_save;
2235 $self->destroy; 2509 $self->destroy;
2236} 2510}
2237 2511
2245 2519
2246 delete $cf::MAP{$self->path}; 2520 delete $cf::MAP{$self->path};
2247 2521
2248 $self->unlink_save; 2522 $self->unlink_save;
2249 2523
2250 bless $self, "cf::map"; 2524 bless $self, "cf::map::wrap";
2251 delete $self->{deny_reset}; 2525 delete $self->{deny_reset};
2252 $self->{deny_save} = 1; 2526 $self->{deny_save} = 1;
2253 $self->reset_timeout (1); 2527 $self->reset_timeout (1);
2254 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2528 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2255 2529
2312 : normalise $_ 2586 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2587 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2588 ]
2315} 2589}
2316 2590
2591=item cf::map::static_maps
2592
2593Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2594file in the shared directory excluding F</styles> and F</editor>). May
2595block.
2596
2597=cut
2598
2599sub static_maps() {
2600 my @dirs = "";
2601 my @maps;
2602
2603 while (@dirs) {
2604 my $dir = shift @dirs;
2605
2606 next if $dir eq "/styles" || $dir eq "/editor";
2607
2608 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2609 or return;
2610
2611 for (@$files) {
2612 s/\.map$// or next;
2613 utf8::decode $_;
2614 push @maps, "$dir/$_";
2615 }
2616
2617 push @dirs, map "$dir/$_", @$dirs;
2618 }
2619
2620 \@maps
2621}
2622
2317=back 2623=back
2318 2624
2319=head3 cf::object 2625=head3 cf::object
2320 2626
2321=cut 2627=cut
2344 2650
2345Creates and returns a persistent reference to an object that can be stored as a string. 2651Creates and returns a persistent reference to an object that can be stored as a string.
2346 2652
2347=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2348 2654
2349returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2655returns the objetc referenced by refstring. may return undef when it cannot find the object,
2350even if the object actually exists. May block. 2656even if the object actually exists. May block.
2351 2657
2352=cut 2658=cut
2353 2659
2354sub deref { 2660sub deref {
2386 2692
2387our $SAY_CHANNEL = { 2693our $SAY_CHANNEL = {
2388 id => "say", 2694 id => "say",
2389 title => "Map", 2695 title => "Map",
2390 reply => "say ", 2696 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2697 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2392}; 2698};
2393 2699
2394our $CHAT_CHANNEL = { 2700our $CHAT_CHANNEL = {
2395 id => "chat", 2701 id => "chat",
2396 title => "Chat", 2702 title => "Chat",
2453 2759
2454Freezes the player and moves him/her to a special map (C<{link}>). 2760Freezes the player and moves him/her to a special map (C<{link}>).
2455 2761
2456The player should be reasonably safe there for short amounts of time (e.g. 2762The player should be reasonably safe there for short amounts of time (e.g.
2457for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2763for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2458though, as the palyer cannot control the character while it is on the link 2764though, as the player cannot control the character while it is on the link
2459map. 2765map.
2460 2766
2461Will never block. 2767Will never block.
2462 2768
2463=item $player_object->leave_link ($map, $x, $y) 2769=item $player_object->leave_link ($map, $x, $y)
2484sub cf::object::player::enter_link { 2790sub cf::object::player::enter_link {
2485 my ($self) = @_; 2791 my ($self) = @_;
2486 2792
2487 $self->deactivate_recursive; 2793 $self->deactivate_recursive;
2488 2794
2795 ++$self->{_link_recursion};
2796
2489 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2797 return if UNIVERSAL::isa $self->map, "ext::map_link";
2490 2798
2491 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2799 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2492 if $self->map && $self->map->{path} ne "{link}"; 2800 if $self->map && $self->map->{path} ne "{link}";
2493 2801
2494 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2802 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2495} 2803}
2496 2804
2497sub cf::object::player::leave_link { 2805sub cf::object::player::leave_link {
2498 my ($self, $map, $x, $y) = @_; 2806 my ($self, $map, $x, $y) = @_;
2499 2807
2516 ($x, $y) = (-1, -1) 2824 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2825 unless (defined $x) && (defined $y);
2518 2826
2519 # use -1 or undef as default coordinates, not 0, 0 2827 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2828 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2829 if $x <= 0 && $y <= 0;
2522 2830
2523 $map->load; 2831 $map->load;
2524 $map->load_neighbours;
2525 2832
2526 return unless $self->contr->active; 2833 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2834
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $self->enter_map ($map, $x, $y); 2836 if ($self->enter_map ($map, $x, $y)) {
2532} 2837 # entering was successful
2838 delete $self->{_link_recursion};
2839 # only activate afterwards, to support waiting in hooks
2840 $self->activate_recursive;
2841 }
2533 2842
2843}
2844
2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2845=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2535 2846
2536Moves the player to the given map-path and coordinates by first freezing 2847Moves the player to the given map-path and coordinates by first freezing
2537her, loading and preparing them map, calling the provided $check callback 2848her, loading and preparing them map, calling the provided $check callback
2538that has to return the map if sucecssful, and then unfreezes the player on 2849that has to return the map if sucecssful, and then unfreezes the player on
2539the new (success) or old (failed) map position. In either case, $done will 2850the new (success) or old (failed) map position. In either case, $done will
2546 2857
2547our $GOTOGEN; 2858our $GOTOGEN;
2548 2859
2549sub cf::object::player::goto { 2860sub cf::object::player::goto {
2550 my ($self, $path, $x, $y, $check, $done) = @_; 2861 my ($self, $path, $x, $y, $check, $done) = @_;
2862
2863 if ($self->{_link_recursion} >= $MAX_LINKS) {
2864 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2865 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2866 ($path, $x, $y) = @$EMERGENCY_POSITION;
2867 }
2551 2868
2552 # do generation counting so two concurrent goto's will be executed in-order 2869 # do generation counting so two concurrent goto's will be executed in-order
2553 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2870 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2554 2871
2555 $self->enter_link; 2872 $self->enter_link;
2575 ($path, $x, $y) = (undef, undef, undef); 2892 ($path, $x, $y) = (undef, undef, undef);
2576 } 2893 }
2577 } 2894 }
2578 2895
2579 my $map = eval { 2896 my $map = eval {
2580 my $map = defined $path ? cf::map::find $path : undef; 2897 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2581 2898
2582 if ($map) { 2899 if ($map) {
2583 $map = $map->customise_for ($self); 2900 $map = $map->customise_for ($self);
2584 $map = $check->($map) if $check && $map; 2901 $map = $check->($map, $x, $y, $self) if $check && $map;
2585 } else { 2902 } else {
2586 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2903 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2587 } 2904 }
2588 2905
2589 $map 2906 $map
2597 if ($gen == $self->{_goto_generation}) { 2914 if ($gen == $self->{_goto_generation}) {
2598 delete $self->{_goto_generation}; 2915 delete $self->{_goto_generation};
2599 $self->leave_link ($map, $x, $y); 2916 $self->leave_link ($map, $x, $y);
2600 } 2917 }
2601 2918
2602 $done->() if $done; 2919 $done->($self) if $done;
2603 })->prio (1); 2920 })->prio (1);
2604} 2921}
2605 2922
2606=item $player_object->enter_exit ($exit_object) 2923=item $player_object->enter_exit ($exit_object)
2607 2924
2675 $Coro::current->{desc} = "enter_exit"; 2992 $Coro::current->{desc} = "enter_exit";
2676 2993
2677 unless (eval { 2994 unless (eval {
2678 $self->deactivate_recursive; # just to be sure 2995 $self->deactivate_recursive; # just to be sure
2679 2996
2680 # random map handling
2681 {
2682 my $guard = cf::lock_acquire "exit_prepare:$exit";
2683
2684 prepare_random_map $exit
2685 if $exit->slaying eq "/!";
2686 }
2687
2688 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2997 my $map = cf::map::normalise $exit->slaying, $exit->map;
2689 my $x = $exit->stats->hp; 2998 my $x = $exit->stats->hp;
2690 my $y = $exit->stats->sp; 2999 my $y = $exit->stats->sp;
3000
3001 # special map handling
3002 my $slaying = $exit->slaying;
3003
3004 # special map handling
3005 if ($slaying eq "/!") {
3006 my $guard = cf::lock_acquire "exit_prepare:$exit";
3007
3008 prepare_random_map $exit
3009 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3010
3011 $map = $exit->slaying;
3012
3013 } elsif ($slaying eq '!up') {
3014 $map = $exit->map->tile_path (cf::TILE_UP);
3015 $x = $exit->x;
3016 $y = $exit->y;
3017
3018 } elsif ($slaying eq '!down') {
3019 $map = $exit->map->tile_path (cf::TILE_DOWN);
3020 $x = $exit->x;
3021 $y = $exit->y;
3022 }
2691 3023
2692 $self->goto ($map, $x, $y); 3024 $self->goto ($map, $x, $y);
2693 3025
2694 # if exit is damned, update players death & WoR home-position 3026 # if exit is damned, update players death & WoR home-position
2695 $self->contr->savebed ($map, $x, $y) 3027 $self->contr->savebed ($map, $x, $y)
2700 $self->message ("Something went wrong deep within the deliantra server. " 3032 $self->message ("Something went wrong deep within the deliantra server. "
2701 . "I'll try to bring you back to the map you were before. " 3033 . "I'll try to bring you back to the map you were before. "
2702 . "Please report this to the dungeon master!", 3034 . "Please report this to the dungeon master!",
2703 cf::NDI_UNIQUE | cf::NDI_RED); 3035 cf::NDI_UNIQUE | cf::NDI_RED);
2704 3036
2705 warn "ERROR in enter_exit: $@"; 3037 error "ERROR in enter_exit: $@";
2706 $self->leave_link; 3038 $self->leave_link;
2707 } 3039 }
2708 })->prio (1); 3040 })->prio (1);
2709} 3041}
2710 3042
2722sub cf::client::send_drawinfo { 3054sub cf::client::send_drawinfo {
2723 my ($self, $text, $flags) = @_; 3055 my ($self, $text, $flags) = @_;
2724 3056
2725 utf8::encode $text; 3057 utf8::encode $text;
2726 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3058 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3059}
3060
3061=item $client->send_big_packet ($pkt)
3062
3063Like C<send_packet>, but tries to compress large packets, and fragments
3064them as required.
3065
3066=cut
3067
3068our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3069
3070sub cf::client::send_big_packet {
3071 my ($self, $pkt) = @_;
3072
3073 # try lzf for large packets
3074 $pkt = "lzf " . Compress::LZF::compress $pkt
3075 if 1024 <= length $pkt and $self->{can_lzf};
3076
3077 # split very large packets
3078 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3079 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3080 $pkt = "frag";
3081 }
3082
3083 $self->send_packet ($pkt);
2727} 3084}
2728 3085
2729=item $client->send_msg ($channel, $msg, $color, [extra...]) 3086=item $client->send_msg ($channel, $msg, $color, [extra...])
2730 3087
2731Send a drawinfo or msg packet to the client, formatting the msg for the 3088Send a drawinfo or msg packet to the client, formatting the msg for the
2735 3092
2736=cut 3093=cut
2737 3094
2738# non-persistent channels (usually the info channel) 3095# non-persistent channels (usually the info channel)
2739our %CHANNEL = ( 3096our %CHANNEL = (
3097 "c/motd" => {
3098 id => "infobox",
3099 title => "MOTD",
3100 reply => undef,
3101 tooltip => "The message of the day",
3102 },
2740 "c/identify" => { 3103 "c/identify" => {
2741 id => "infobox", 3104 id => "infobox",
2742 title => "Identify", 3105 title => "Identify",
2743 reply => undef, 3106 reply => undef,
2744 tooltip => "Items recently identified", 3107 tooltip => "Items recently identified",
2746 "c/examine" => { 3109 "c/examine" => {
2747 id => "infobox", 3110 id => "infobox",
2748 title => "Examine", 3111 title => "Examine",
2749 reply => undef, 3112 reply => undef,
2750 tooltip => "Signs and other items you examined", 3113 tooltip => "Signs and other items you examined",
3114 },
3115 "c/shopinfo" => {
3116 id => "infobox",
3117 title => "Shop Info",
3118 reply => undef,
3119 tooltip => "What your bargaining skill tells you about the shop",
2751 }, 3120 },
2752 "c/book" => { 3121 "c/book" => {
2753 id => "infobox", 3122 id => "infobox",
2754 title => "Book", 3123 title => "Book",
2755 reply => undef, 3124 reply => undef,
2783 id => "infobox", 3152 id => "infobox",
2784 title => "Skills", 3153 title => "Skills",
2785 reply => undef, 3154 reply => undef,
2786 tooltip => "Shows your experience per skill and item power", 3155 tooltip => "Shows your experience per skill and item power",
2787 }, 3156 },
3157 "c/shopitems" => {
3158 id => "infobox",
3159 title => "Shop Items",
3160 reply => undef,
3161 tooltip => "Shows the items currently for sale in this shop",
3162 },
2788 "c/resistances" => { 3163 "c/resistances" => {
2789 id => "infobox", 3164 id => "infobox",
2790 title => "Resistances", 3165 title => "Resistances",
2791 reply => undef, 3166 reply => undef,
2792 tooltip => "Shows your resistances", 3167 tooltip => "Shows your resistances",
2794 "c/pets" => { 3169 "c/pets" => {
2795 id => "infobox", 3170 id => "infobox",
2796 title => "Pets", 3171 title => "Pets",
2797 reply => undef, 3172 reply => undef,
2798 tooltip => "Shows information abotu your pets/a specific pet", 3173 tooltip => "Shows information abotu your pets/a specific pet",
3174 },
3175 "c/perceiveself" => {
3176 id => "infobox",
3177 title => "Perceive Self",
3178 reply => undef,
3179 tooltip => "You gained detailed knowledge about yourself",
2799 }, 3180 },
2800 "c/uptime" => { 3181 "c/uptime" => {
2801 id => "infobox", 3182 id => "infobox",
2802 title => "Uptime", 3183 title => "Uptime",
2803 reply => undef, 3184 reply => undef,
2819 id => "death", 3200 id => "death",
2820 title => "Death", 3201 title => "Death",
2821 reply => undef, 3202 reply => undef,
2822 tooltip => "Reason for and more info about your most recent death", 3203 tooltip => "Reason for and more info about your most recent death",
2823 }, 3204 },
3205 "c/fatal" => {
3206 id => "fatal",
3207 title => "Fatal Error",
3208 reply => undef,
3209 tooltip => "Reason for the server disconnect",
3210 },
2824 "c/say" => $SAY_CHANNEL, 3211 "c/say" => $SAY_CHANNEL,
2825 "c/chat" => $CHAT_CHANNEL, 3212 "c/chat" => $CHAT_CHANNEL,
2826); 3213);
2827 3214
2828sub cf::client::send_msg { 3215sub cf::client::send_msg {
2859 my $pkt = "msg " 3246 my $pkt = "msg "
2860 . $self->{json_coder}->encode ( 3247 . $self->{json_coder}->encode (
2861 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3248 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2862 ); 3249 );
2863 3250
2864 # try lzf for large packets
2865 $pkt = "lzf " . Compress::LZF::compress $pkt
2866 if 1024 <= length $pkt and $self->{can_lzf};
2867
2868 # split very large packets
2869 if (8192 < length $pkt and $self->{can_lzf}) {
2870 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2871 $pkt = "frag";
2872 }
2873
2874 $self->send_packet ($pkt); 3251 $self->send_big_packet ($pkt);
2875} 3252}
2876 3253
2877=item $client->ext_msg ($type, @msg) 3254=item $client->ext_msg ($type, @msg)
2878 3255
2879Sends an ext event to the client. 3256Sends an ext event to the client.
2881=cut 3258=cut
2882 3259
2883sub cf::client::ext_msg($$@) { 3260sub cf::client::ext_msg($$@) {
2884 my ($self, $type, @msg) = @_; 3261 my ($self, $type, @msg) = @_;
2885 3262
2886 if ($self->extcmd == 2) {
2887 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3263 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2888 } elsif ($self->extcmd == 1) { # TODO: remove
2889 push @msg, msgtype => "event_$type";
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2891 }
2892}
2893
2894=item $client->ext_reply ($msgid, @msg)
2895
2896Sends an ext reply to the client.
2897
2898=cut
2899
2900sub cf::client::ext_reply($$@) {
2901 my ($self, $id, @msg) = @_;
2902
2903 if ($self->extcmd == 2) {
2904 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2905 } elsif ($self->extcmd == 1) {
2906 #TODO: version 1, remove
2907 unshift @msg, msgtype => "reply", msgid => $id;
2908 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2909 }
2910} 3264}
2911 3265
2912=item $success = $client->query ($flags, "text", \&cb) 3266=item $success = $client->query ($flags, "text", \&cb)
2913 3267
2914Queues a query to the client, calling the given callback with 3268Queues a query to the client, calling the given callback with
2969 my ($ns, $buf) = @_; 3323 my ($ns, $buf) = @_;
2970 3324
2971 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3325 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2972 3326
2973 if (ref $msg) { 3327 if (ref $msg) {
2974 my ($type, $reply, @payload) = 3328 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2975 "ARRAY" eq ref $msg
2976 ? @$msg
2977 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2978 3329
2979 my @reply;
2980
2981 if (my $cb = $EXTICMD{$type}) { 3330 if (my $cb = $EXTIACMD{$type}) {
3331 $cb->(
3332 $ns,
3333 sub {
3334 $ns->ext_msg ("reply-$reply", @_)
3335 if $reply;
3336 },
3337 @payload
3338 );
3339 } else {
3340 my @reply;
3341
3342 if (my $cb = $EXTICMD{$type}) {
2982 @reply = $cb->($ns, @payload); 3343 @reply = $cb->($ns, @payload);
3344 }
3345
3346 $ns->ext_msg ("reply-$reply", @reply)
3347 if $reply;
2983 } 3348 }
2984
2985 $ns->ext_reply ($reply, @reply)
2986 if $reply;
2987
2988 } else { 3349 } else {
2989 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3350 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2990 } 3351 }
2991 3352
2992 cf::override; 3353 cf::override;
2993 }, 3354 },
2994); 3355);
3014 3375
3015 $coro 3376 $coro
3016} 3377}
3017 3378
3018cf::client->attach ( 3379cf::client->attach (
3019 on_destroy => sub { 3380 on_client_destroy => sub {
3020 my ($ns) = @_; 3381 my ($ns) = @_;
3021 3382
3022 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3383 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3023 }, 3384 },
3024); 3385);
3040our $safe_hole = new Safe::Hole; 3401our $safe_hole = new Safe::Hole;
3041 3402
3042$SIG{FPE} = 'IGNORE'; 3403$SIG{FPE} = 'IGNORE';
3043 3404
3044$safe->permit_only (Opcode::opset qw( 3405$safe->permit_only (Opcode::opset qw(
3045 :base_core :base_mem :base_orig :base_math 3406 :base_core :base_mem :base_orig :base_math :base_loop
3046 grepstart grepwhile mapstart mapwhile 3407 grepstart grepwhile mapstart mapwhile
3047 sort time 3408 sort time
3048)); 3409));
3049 3410
3050# here we export the classes and methods available to script code 3411# here we export the classes and methods available to script code
3075 decrease split destroy change_exp value msg lore send_msg)], 3436 decrease split destroy change_exp value msg lore send_msg)],
3076 ["cf::object::player" => qw(player)], 3437 ["cf::object::player" => qw(player)],
3077 ["cf::player" => qw(peaceful send_msg)], 3438 ["cf::player" => qw(peaceful send_msg)],
3078 ["cf::map" => qw(trigger)], 3439 ["cf::map" => qw(trigger)],
3079) { 3440) {
3080 no strict 'refs';
3081 my ($pkg, @funs) = @$_; 3441 my ($pkg, @funs) = @$_;
3082 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3442 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3083 for @funs; 3443 for @funs;
3084} 3444}
3085 3445
3102 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3462 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3103 $qcode =~ s/\n/\\n/g; 3463 $qcode =~ s/\n/\\n/g;
3104 3464
3105 %vars = (_dummy => 0) unless %vars; 3465 %vars = (_dummy => 0) unless %vars;
3106 3466
3467 my @res;
3107 local $_; 3468 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars;
3109 3469
3110 my $eval = 3470 my $eval =
3111 "do {\n" 3471 "do {\n"
3112 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3472 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3113 . "#line 0 \"{$qcode}\"\n" 3473 . "#line 0 \"{$qcode}\"\n"
3114 . $code 3474 . $code
3115 . "\n}" 3475 . "\n}"
3116 ; 3476 ;
3117 3477
3478 if ($CFG{safe_eval}) {
3118 sub_generation_inc; 3479 sub_generation_inc;
3480 local @safe::cf::_safe_eval_args = values %vars;
3119 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3481 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3120 sub_generation_inc; 3482 sub_generation_inc;
3483 } else {
3484 local @cf::_safe_eval_args = values %vars;
3485 @res = wantarray ? eval eval : scalar eval $eval;
3486 }
3121 3487
3122 if ($@) { 3488 if ($@) {
3123 warn "$@"; 3489 warn "$@",
3124 warn "while executing safe code '$code'\n"; 3490 "while executing safe code '$code'\n",
3125 warn "with arguments " . (join " ", %vars) . "\n"; 3491 "with arguments " . (join " ", %vars) . "\n";
3126 } 3492 }
3127 3493
3128 wantarray ? @res : $res[0] 3494 wantarray ? @res : $res[0]
3129} 3495}
3130 3496
3144=cut 3510=cut
3145 3511
3146sub register_script_function { 3512sub register_script_function {
3147 my ($fun, $cb) = @_; 3513 my ($fun, $cb) = @_;
3148 3514
3149 no strict 'refs'; 3515 $fun = "safe::$fun" if $CFG{safe_eval};
3150 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3516 *$fun = $safe_hole->wrap ($cb);
3151} 3517}
3152 3518
3153=back 3519=back
3154 3520
3155=cut 3521=cut
3156 3522
3157############################################################################# 3523#############################################################################
3158# the server's init and main functions 3524# the server's init and main functions
3159 3525
3526{
3527 package cf::face;
3528
3529 our %HASH; # hash => idx
3530 our @DATA; # dynamically-created facedata, only faceste 0 used
3531 our @FOFS; # file offset, if > 0
3532 our @SIZE; # size of face, in octets
3533 our @META; # meta hash of face, if any
3534 our $DATAFH; # facedata filehandle
3535
3536 # internal api, not finalised
3537 sub set {
3538 my ($name, $type, $data) = @_;
3539
3540 my $idx = cf::face::find $name;
3541
3542 if ($idx) {
3543 delete $HASH{cf::face::get_csum $idx};
3544 } else {
3545 $idx = cf::face::alloc $name;
3546 }
3547
3548 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3549
3550 cf::face::set_type $idx, $type;
3551 cf::face::set_csum $idx, 0, $hash;
3552
3553 # we need to destroy the SV itself, not just modify it, as a running ix
3554 # might hold a reference to it: "delete" achieves that.
3555 delete $FOFS[0][$idx];
3556 delete $DATA[0][$idx];
3557 $DATA[0][$idx] = $data;
3558 $SIZE[0][$idx] = length $data;
3559 delete $META[$idx];
3560 $HASH{$hash} = $idx;#d#
3561
3562 $idx
3563 }
3564
3565 sub _get_data($$$) {
3566 my ($idx, $set, $cb) = @_;
3567
3568 if (defined $DATA[$set][$idx]) {
3569 $cb->($DATA[$set][$idx]);
3570 } elsif (my $fofs = $FOFS[$set][$idx]) {
3571 my $size = $SIZE[$set][$idx];
3572 my $buf;
3573 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3574 if ($_[0] == $size) {
3575 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3576 $cb->($buf);
3577 } else {
3578 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3579 }
3580 };
3581 } else {
3582 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3583 }
3584 }
3585
3586 # rather ineffient
3587 sub cf::face::get_data($;$) {
3588 my ($idx, $set) = @_;
3589
3590 _get_data $idx, $set, Coro::rouse_cb;
3591 Coro::rouse_wait
3592 }
3593
3594 sub cf::face::ix {
3595 my ($ns, $set, $idx, $pri) = @_;
3596
3597 _get_data $idx, $set, sub {
3598 $ns->ix_send ($idx, $pri, $_[0]);
3599 };
3600 }
3601}
3602
3160sub load_facedata($) { 3603sub load_facedata($) {
3161 my ($path) = @_; 3604 my ($path) = @_;
3162 3605
3163 # HACK to clear player env face cache, we need some signal framework
3164 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = ();
3166
3167 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3606 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3168 3607
3169 warn "loading facedata from $path\n"; 3608 trace "loading facedata from $path\n";
3170 3609
3171 my $facedata; 3610 my $facedata = decode_storable load_file "$path/faceinfo";
3172 0 < aio_load $path, $facedata
3173 or die "$path: $!";
3174
3175 $facedata = Coro::Storable::thaw $facedata;
3176 3611
3177 $facedata->{version} == 2 3612 $facedata->{version} == 2
3178 or cf::cleanup "$path: version mismatch, cannot proceed."; 3613 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3179 3614
3180 # patch in the exptable 3615 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3181 $facedata->{resource}{"res/exp_table"} = { 3616 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3182 type => FT_RSRC, 3617
3183 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3618 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3184 }; 3619
3185 cf::cede_to_tick; 3620 # BEGIN ATOMIC
3621 # from here on, everything must be atomic - no thread switch allowed
3622 my $t1 = EV::time;
3186 3623
3187 { 3624 {
3188 my $faces = $facedata->{faceinfo}; 3625 my $faces = $facedata->{faceinfo};
3189 3626
3190 while (my ($face, $info) = each %$faces) { 3627 for my $face (sort keys %$faces) {
3628 my $info = $faces->{$face};
3191 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3629 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192 3630
3193 cf::face::set_visibility $idx, $info->{visibility}; 3631 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap}; 3632 cf::face::set_magicmap $idx, $info->{magicmap};
3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3633 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3634 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3197 3635 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3198 cf::cede_to_tick; 3636 $cf::face::HASH{$info->{hash64}} = $idx;
3637 delete $cf::face::META[$idx];
3199 } 3638 }
3200 3639
3201 while (my ($face, $info) = each %$faces) { 3640 while (my ($face, $info) = each %$faces) {
3202 next unless $info->{smooth}; 3641 next unless $info->{smooth};
3203 3642
3206 3645
3207 if (my $smooth = cf::face::find $info->{smooth}) { 3646 if (my $smooth = cf::face::find $info->{smooth}) {
3208 cf::face::set_smooth $idx, $smooth; 3647 cf::face::set_smooth $idx, $smooth;
3209 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3648 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3210 } else { 3649 } else {
3211 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3650 error "smooth face '$info->{smooth}' not found for face '$face'";
3212 } 3651 }
3213
3214 cf::cede_to_tick;
3215 } 3652 }
3216 } 3653 }
3217 3654
3218 { 3655 {
3219 my $anims = $facedata->{animinfo}; 3656 my $anims = $facedata->{animinfo};
3220 3657
3221 while (my ($anim, $info) = each %$anims) { 3658 while (my ($anim, $info) = each %$anims) {
3222 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3659 cf::anim::set $anim, $info->{frames}, $info->{facings};
3223 cf::cede_to_tick;
3224 } 3660 }
3225 3661
3226 cf::anim::invalidate_all; # d'oh 3662 cf::anim::invalidate_all; # d'oh
3227 } 3663 }
3228 3664
3229 { 3665 {
3230 # TODO: for gcfclient pleasure, we should give resources
3231 # that gcfclient doesn't grok a >10000 face index.
3232 my $res = $facedata->{resource}; 3666 my $res = $facedata->{resource};
3233 3667
3234 while (my ($name, $info) = each %$res) { 3668 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) { 3669 if (defined (my $type = $info->{type})) {
3670 # TODO: different hash - must free and use new index, or cache ixface data queue
3236 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3671 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
3238 3672
3239 if ($info->{type} & 1) {
3240 # prepend meta info
3241
3242 my $meta = $enc->encode ({
3243 name => $name,
3244 %{ $info->{meta} || {} },
3245 });
3246
3247 $data = pack "(w/a*)*", $meta, $info->{data};
3248 } else {
3249 $data = $info->{data};
3250 }
3251
3252 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3253 cf::face::set_type $idx, $info->{type}; 3673 cf::face::set_type $idx, $type;
3674 cf::face::set_csum $idx, 0, $info->{hash};
3675 $cf::face::SIZE[0][$idx] = $info->{size};
3676 $cf::face::FOFS[0][$idx] = $info->{fofs};
3677 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3678 $cf::face::HASH{$info->{hash}} = $idx;
3254 } else { 3679 } else {
3255 $RESOURCE{$name} = $info; 3680# $RESOURCE{$name} = $info; # unused
3256 } 3681 }
3257
3258 cf::cede_to_tick;
3259 } 3682 }
3260 } 3683 }
3684
3685 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3686
3687 # HACK to clear player env face cache, we need some signal framework
3688 # for this (global event?)
3689 %ext::player_env::MUSIC_FACE_CACHE = ();
3690
3691 # END ATOMIC
3692
3693 cf::debug "facedata atomic update time ", EV::time - $t1;
3261 3694
3262 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3695 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3263 3696
3697 aio_close $fh if $fh; # close old facedata
3698
3264 1 3699 1
3265} 3700}
3266
3267cf::global->attach (on_resource_update => sub {
3268 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3269 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3270
3271 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3272 my $sound = $soundconf->{compat}[$_]
3273 or next;
3274
3275 my $face = cf::face::find "sound/$sound->[1]";
3276 cf::sound::set $sound->[0] => $face;
3277 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3278 }
3279
3280 while (my ($k, $v) = each %{$soundconf->{event}}) {
3281 my $face = cf::face::find "sound/$v";
3282 cf::sound::set $k => $face;
3283 }
3284 }
3285});
3286 3701
3287register_exticmd fx_want => sub { 3702register_exticmd fx_want => sub {
3288 my ($ns, $want) = @_; 3703 my ($ns, $want) = @_;
3289 3704
3290 while (my ($k, $v) = each %$want) { 3705 while (my ($k, $v) = each %$want) {
3298 my $status = load_resource_file_ $_[0]; 3713 my $status = load_resource_file_ $_[0];
3299 get_slot 0.1, 100; 3714 get_slot 0.1, 100;
3300 cf::arch::commit_load; 3715 cf::arch::commit_load;
3301 3716
3302 $status 3717 $status
3718}
3719
3720sub reload_exp_table {
3721 _reload_exp_table;
3722
3723 cf::face::set
3724 "res/exp_table" => FT_RSRC,
3725 JSON::XS->new->utf8->canonical->encode (
3726 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3727 );
3728}
3729
3730sub reload_materials {
3731 _reload_materials;
3303} 3732}
3304 3733
3305sub reload_regions { 3734sub reload_regions {
3306 # HACK to clear player env face cache, we need some signal framework 3735 # HACK to clear player env face cache, we need some signal framework
3307 # for this (global event?) 3736 # for this (global event?)
3315 if exists $_->{match}; 3744 if exists $_->{match};
3316 } 3745 }
3317} 3746}
3318 3747
3319sub reload_facedata { 3748sub reload_facedata {
3320 load_facedata "$DATADIR/facedata" 3749 load_facedata $DATADIR
3321 or die "unable to load facedata\n"; 3750 or die "unable to load facedata\n";
3322} 3751}
3323 3752
3324sub reload_archetypes { 3753sub reload_archetypes {
3325 load_resource_file "$DATADIR/archetypes" 3754 load_resource_file "$DATADIR/archetypes"
3326 or die "unable to load archetypes\n"; 3755 or die "unable to load archetypes\n";
3756
3757 cf::face::set
3758 "res/skill_info" => FT_RSRC,
3759 JSON::XS->new->utf8->canonical->encode (
3760 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3761 );
3762
3763 cf::face::set
3764 "res/spell_paths" => FT_RSRC,
3765 JSON::XS->new->utf8->canonical->encode (
3766 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3767 );
3327} 3768}
3328 3769
3329sub reload_treasures { 3770sub reload_treasures {
3330 load_resource_file "$DATADIR/treasures" 3771 load_resource_file "$DATADIR/treasures"
3331 or die "unable to load treasurelists\n"; 3772 or die "unable to load treasurelists\n";
3332} 3773}
3333 3774
3775sub reload_sound {
3776 trace "loading sound config from $DATADIR/sound\n";
3777
3778 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3779
3780 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3781 my $sound = $soundconf->{compat}[$_]
3782 or next;
3783
3784 my $face = cf::face::find "sound/$sound->[1]";
3785 cf::sound::set $sound->[0] => $face;
3786 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3787 }
3788
3789 while (my ($k, $v) = each %{$soundconf->{event}}) {
3790 my $face = cf::face::find "sound/$v";
3791 cf::sound::set $k => $face;
3792 }
3793}
3794
3334sub reload_resources { 3795sub reload_resources {
3335 warn "reloading resource files...\n"; 3796 trace "reloading resource files...\n";
3336 3797
3798 reload_materials;
3337 reload_facedata; 3799 reload_facedata;
3800 reload_exp_table;
3801 reload_sound;
3338 reload_archetypes; 3802 reload_archetypes;
3339 reload_regions; 3803 reload_regions;
3340 reload_treasures; 3804 reload_treasures;
3341 3805
3342 warn "finished reloading resource files\n"; 3806 trace "finished reloading resource files\n";
3343} 3807}
3344 3808
3345sub reload_config { 3809sub reload_config {
3346 open my $fh, "<:utf8", "$CONFDIR/config" 3810 trace "reloading config file...\n";
3347 or return;
3348 3811
3349 local $/; 3812 my $config = load_file "$CONFDIR/config";
3350 *CFG = YAML::Load <$fh>; 3813 utf8::decode $config;
3814 *CFG = decode_yaml $config;
3351 3815
3352 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3816 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3353 3817
3354 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3818 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3355 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3819 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3356 3820
3357 if (exists $CFG{mlockall}) { 3821 if (exists $CFG{mlockall}) {
3380 3844
3381 seek $fh, 0, 0; 3845 seek $fh, 0, 0;
3382 print $fh $$; 3846 print $fh $$;
3383} 3847}
3384 3848
3849sub main_loop {
3850 trace "EV::loop starting\n";
3851 if (1) {
3852 EV::loop;
3853 }
3854 trace "EV::loop returned\n";
3855 goto &main_loop unless $REALLY_UNLOOP;
3856}
3857
3385sub main { 3858sub main {
3386 cf::init_globals; # initialise logging 3859 cf::init_globals; # initialise logging
3387 3860
3388 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3861 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3389 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3862 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3390 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3863 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3391 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3864 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3392 3865
3393 cf::init_experience;
3394 cf::init_anim;
3395 cf::init_attackmess;
3396 cf::init_dynamic;
3397
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3866 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 3867
3400 # we must not ever block the main coroutine 3868 # we must not ever block the main coroutine
3401 local $Coro::idle = sub { 3869 $Coro::idle = sub {
3402 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3870 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3403 (async { 3871 (async {
3404 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3872 $Coro::current->{desc} = "IDLE BUG HANDLER";
3405 EV::loop EV::LOOP_ONESHOT; 3873 EV::loop EV::LOOP_ONESHOT;
3406 })->prio (Coro::PRIO_MAX); 3874 })->prio (Coro::PRIO_MAX);
3407 }; 3875 };
3408 3876
3409 evthread_start IO::AIO::poll_fileno; 3877 evthread_start IO::AIO::poll_fileno;
3410 3878
3411 cf::sync_job { 3879 cf::sync_job {
3880 cf::incloader::init ();
3881
3882 db_init;
3883
3884 cf::init_anim;
3885 cf::init_attackmess;
3886 cf::init_dynamic;
3887
3888 cf::load_settings;
3889
3412 reload_resources; 3890 reload_resources;
3413 reload_config; 3891 reload_config;
3414 db_init;
3415 3892
3416 cf::load_settings;
3417 cf::load_materials;
3418 cf::init_uuid; 3893 cf::init_uuid;
3419 cf::init_signals; 3894 cf::init_signals;
3420 cf::init_commands;
3421 cf::init_skills; 3895 cf::init_skills;
3422 3896
3423 cf::init_beforeplay; 3897 cf::init_beforeplay;
3424 3898
3425 atomic; 3899 atomic;
3427 load_extensions; 3901 load_extensions;
3428 3902
3429 utime time, time, $RUNTIMEFILE; 3903 utime time, time, $RUNTIMEFILE;
3430 3904
3431 # no (long-running) fork's whatsoever before this point(!) 3905 # no (long-running) fork's whatsoever before this point(!)
3906 use POSIX ();
3432 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3907 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3433 3908
3434 (pop @POST_INIT)->(0) while @POST_INIT; 3909 cf::_post_init 0;
3435 }; 3910 };
3436 3911
3437 EV::loop; 3912 cf::object::thawer::errors_are_fatal 0;
3913 info "parse errors in files are no longer fatal from this point on.\n";
3914
3915 AE::postpone {
3916 undef &main; # free gobs of memory :)
3917 };
3918
3919 goto &main_loop;
3438} 3920}
3439 3921
3440############################################################################# 3922#############################################################################
3441# initialisation and cleanup 3923# initialisation and cleanup
3442 3924
3443# install some emergency cleanup handlers 3925# install some emergency cleanup handlers
3444BEGIN { 3926BEGIN {
3445 our %SIGWATCHER = (); 3927 our %SIGWATCHER = ();
3446 for my $signal (qw(INT HUP TERM)) { 3928 for my $signal (qw(INT HUP TERM)) {
3447 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3929 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3448 cf::cleanup "SIG$signal"; 3930 cf::cleanup "SIG$signal";
3449 }; 3931 };
3450 } 3932 }
3451} 3933}
3452 3934
3453sub write_runtime_sync { 3935sub write_runtime_sync {
3936 my $t0 = AE::time;
3937
3454 # first touch the runtime file to show we are still running: 3938 # first touch the runtime file to show we are still running:
3455 # the fsync below can take a very very long time. 3939 # the fsync below can take a very very long time.
3456 3940
3457 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3941 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3458 3942
3459 my $guard = cf::lock_acquire "write_runtime"; 3943 my $guard = cf::lock_acquire "write_runtime";
3460 3944
3461 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3945 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3462 or return; 3946 or return;
3463 3947
3464 my $value = $cf::RUNTIME + 90 + 10; 3948 my $value = $cf::RUNTIME + 90 + 10;
3465 # 10 is the runtime save interval, for a monotonic clock 3949 # 10 is the runtime save interval, for a monotonic clock
3466 # 60 allows for the watchdog to kill the server. 3950 # 60 allows for the watchdog to kill the server.
3479 or return; 3963 or return;
3480 3964
3481 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3965 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3482 and return; 3966 and return;
3483 3967
3484 warn "runtime file written.\n"; 3968 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3485 3969
3486 1 3970 1
3487} 3971}
3488 3972
3489our $uuid_lock; 3973our $uuid_lock;
3501 or return; 3985 or return;
3502 3986
3503 my $value = uuid_seq uuid_cur; 3987 my $value = uuid_seq uuid_cur;
3504 3988
3505 unless ($value) { 3989 unless ($value) {
3506 warn "cowardly refusing to write zero uuid value!\n"; 3990 info "cowardly refusing to write zero uuid value!\n";
3507 return; 3991 return;
3508 } 3992 }
3509 3993
3510 my $value = uuid_str $value + $uuid_skip; 3994 my $value = uuid_str $value + $uuid_skip;
3511 $uuid_skip = 0; 3995 $uuid_skip = 0;
3521 or return; 4005 or return;
3522 4006
3523 aio_rename "$uuid~", $uuid 4007 aio_rename "$uuid~", $uuid
3524 and return; 4008 and return;
3525 4009
3526 warn "uuid file written ($value).\n"; 4010 trace "uuid file written ($value).\n";
3527 4011
3528 1 4012 1
3529 4013
3530} 4014}
3531 4015
3537} 4021}
3538 4022
3539sub emergency_save() { 4023sub emergency_save() {
3540 my $freeze_guard = cf::freeze_mainloop; 4024 my $freeze_guard = cf::freeze_mainloop;
3541 4025
3542 warn "emergency_perl_save: enter\n"; 4026 info "emergency_perl_save: enter\n";
4027
4028 # this is a trade-off: we want to be very quick here, so
4029 # save all maps without fsync, and later call a global sync
4030 # (which in turn might be very very slow)
4031 local $USE_FSYNC = 0;
3543 4032
3544 cf::sync_job { 4033 cf::sync_job {
3545 # this is a trade-off: we want to be very quick here, so 4034 cf::write_runtime_sync; # external watchdog should not bark
3546 # save all maps without fsync, and later call a global sync
3547 # (which in turn might be very very slow)
3548 local $USE_FSYNC = 0;
3549 4035
3550 # use a peculiar iteration method to avoid tripping on perl 4036 # use a peculiar iteration method to avoid tripping on perl
3551 # refcount bugs in for. also avoids problems with players 4037 # refcount bugs in for. also avoids problems with players
3552 # and maps saved/destroyed asynchronously. 4038 # and maps saved/destroyed asynchronously.
3553 warn "emergency_perl_save: begin player save\n"; 4039 info "emergency_perl_save: begin player save\n";
3554 for my $login (keys %cf::PLAYER) { 4040 for my $login (keys %cf::PLAYER) {
3555 my $pl = $cf::PLAYER{$login} or next; 4041 my $pl = $cf::PLAYER{$login} or next;
3556 $pl->valid or next; 4042 $pl->valid or next;
3557 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4043 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3558 $pl->save; 4044 $pl->save;
3559 } 4045 }
3560 warn "emergency_perl_save: end player save\n"; 4046 info "emergency_perl_save: end player save\n";
3561 4047
4048 cf::write_runtime_sync; # external watchdog should not bark
4049
3562 warn "emergency_perl_save: begin map save\n"; 4050 info "emergency_perl_save: begin map save\n";
3563 for my $path (keys %cf::MAP) { 4051 for my $path (keys %cf::MAP) {
3564 my $map = $cf::MAP{$path} or next; 4052 my $map = $cf::MAP{$path} or next;
3565 $map->valid or next; 4053 $map->valid or next;
3566 $map->save; 4054 $map->save;
3567 } 4055 }
3568 warn "emergency_perl_save: end map save\n"; 4056 info "emergency_perl_save: end map save\n";
3569 4057
4058 cf::write_runtime_sync; # external watchdog should not bark
4059
3570 warn "emergency_perl_save: begin database checkpoint\n"; 4060 info "emergency_perl_save: begin database checkpoint\n";
3571 BDB::db_env_txn_checkpoint $DB_ENV; 4061 BDB::db_env_txn_checkpoint $DB_ENV;
3572 warn "emergency_perl_save: end database checkpoint\n"; 4062 info "emergency_perl_save: end database checkpoint\n";
3573 4063
3574 warn "emergency_perl_save: begin write uuid\n"; 4064 info "emergency_perl_save: begin write uuid\n";
3575 write_uuid_sync 1; 4065 write_uuid_sync 1;
3576 warn "emergency_perl_save: end write uuid\n"; 4066 info "emergency_perl_save: end write uuid\n";
4067
4068 cf::write_runtime_sync; # external watchdog should not bark
4069
4070 trace "emergency_perl_save: syncing database to disk";
4071 BDB::db_env_txn_checkpoint $DB_ENV;
4072
4073 info "emergency_perl_save: starting sync\n";
4074 IO::AIO::aio_sync sub {
4075 info "emergency_perl_save: finished sync\n";
4076 };
4077
4078 cf::write_runtime_sync; # external watchdog should not bark
4079
4080 trace "emergency_perl_save: flushing outstanding aio requests";
4081 while (IO::AIO::nreqs || BDB::nreqs) {
4082 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4083 }
4084
4085 cf::write_runtime_sync; # external watchdog should not bark
3577 }; 4086 };
3578 4087
3579 warn "emergency_perl_save: starting sync()\n";
3580 IO::AIO::aio_sync sub {
3581 warn "emergency_perl_save: finished sync()\n";
3582 };
3583
3584 warn "emergency_perl_save: leave\n"; 4088 info "emergency_perl_save: leave\n";
3585} 4089}
3586 4090
3587sub post_cleanup { 4091sub post_cleanup {
3588 my ($make_core) = @_; 4092 my ($make_core) = @_;
3589 4093
4094 IO::AIO::flush;
4095
3590 warn Carp::longmess "post_cleanup backtrace" 4096 error Carp::longmess "post_cleanup backtrace"
3591 if $make_core; 4097 if $make_core;
3592 4098
3593 my $fh = pidfile; 4099 my $fh = pidfile;
3594 unlink $PIDFILE if <$fh> == $$; 4100 unlink $PIDFILE if <$fh> == $$;
3595} 4101}
3615 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4121 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3616 for my $name (keys %$leaf_symtab) { 4122 for my $name (keys %$leaf_symtab) {
3617 _gv_clear *{"$pkg$name"}; 4123 _gv_clear *{"$pkg$name"};
3618# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4124# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3619 } 4125 }
3620 warn "cleared package $pkg\n";#d#
3621} 4126}
3622 4127
3623sub do_reload_perl() { 4128sub do_reload_perl() {
3624 # can/must only be called in main 4129 # can/must only be called in main
3625 if ($Coro::current != $Coro::main) { 4130 unless (in_main) {
3626 warn "can only reload from main coroutine"; 4131 error "can only reload from main coroutine";
3627 return; 4132 return;
3628 } 4133 }
3629 4134
3630 return if $RELOAD++; 4135 return if $RELOAD++;
3631 4136
3632 my $t1 = EV::time; 4137 my $t1 = AE::time;
3633 4138
3634 while ($RELOAD) { 4139 while ($RELOAD) {
3635 warn "reloading..."; 4140 cf::get_slot 0.1, -1, "reload_perl";
4141 info "perl_reload: reloading...";
3636 4142
3637 warn "entering sync_job"; 4143 trace "perl_reload: entering sync_job";
3638 4144
3639 cf::sync_job { 4145 cf::sync_job {
3640 cf::write_runtime_sync; # external watchdog should not bark
3641 cf::emergency_save; 4146 #cf::emergency_save;
3642 cf::write_runtime_sync; # external watchdog should not bark
3643 4147
3644 warn "syncing database to disk";
3645 BDB::db_env_txn_checkpoint $DB_ENV;
3646
3647 # if anything goes wrong in here, we should simply crash as we already saved
3648
3649 warn "flushing outstanding aio requests";
3650 while (IO::AIO::nreqs || BDB::nreqs) {
3651 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3652 }
3653
3654 warn "cancelling all extension coros"; 4148 trace "perl_reload: cancelling all extension coros";
3655 $_->cancel for values %EXT_CORO; 4149 $_->cancel for values %EXT_CORO;
3656 %EXT_CORO = (); 4150 %EXT_CORO = ();
3657 4151
3658 warn "removing commands"; 4152 trace "perl_reload: removing commands";
3659 %COMMAND = (); 4153 %COMMAND = ();
3660 4154
3661 warn "removing ext/exti commands"; 4155 trace "perl_reload: removing ext/exti commands";
3662 %EXTCMD = (); 4156 %EXTCMD = ();
3663 %EXTICMD = (); 4157 %EXTICMD = ();
3664 4158
3665 warn "unloading/nuking all extensions"; 4159 trace "perl_reload: unloading/nuking all extensions";
3666 for my $pkg (@EXTS) { 4160 for my $pkg (@EXTS) {
3667 warn "... unloading $pkg"; 4161 trace "... unloading $pkg";
3668 4162
3669 if (my $cb = $pkg->can ("unload")) { 4163 if (my $cb = $pkg->can ("unload")) {
3670 eval { 4164 eval {
3671 $cb->($pkg); 4165 $cb->($pkg);
3672 1 4166 1
3673 } or warn "$pkg unloaded, but with errors: $@"; 4167 } or error "$pkg unloaded, but with errors: $@";
3674 } 4168 }
3675 4169
3676 warn "... clearing $pkg"; 4170 trace "... clearing $pkg";
3677 clear_package $pkg; 4171 clear_package $pkg;
3678 } 4172 }
3679 4173
3680 warn "unloading all perl modules loaded from $LIBDIR"; 4174 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3681 while (my ($k, $v) = each %INC) { 4175 while (my ($k, $v) = each %INC) {
3682 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4176 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3683 4177
3684 warn "... unloading $k"; 4178 trace "... unloading $k";
3685 delete $INC{$k}; 4179 delete $INC{$k};
3686 4180
3687 $k =~ s/\.pm$//; 4181 $k =~ s/\.pm$//;
3688 $k =~ s/\//::/g; 4182 $k =~ s/\//::/g;
3689 4183
3692 } 4186 }
3693 4187
3694 clear_package $k; 4188 clear_package $k;
3695 } 4189 }
3696 4190
3697 warn "getting rid of safe::, as good as possible"; 4191 trace "perl_reload: getting rid of safe::, as good as possible";
3698 clear_package "safe::$_" 4192 clear_package "safe::$_"
3699 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4193 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3700 4194
3701 warn "unloading cf.pm \"a bit\""; 4195 trace "perl_reload: unloading cf.pm \"a bit\"";
3702 delete $INC{"cf.pm"}; 4196 delete $INC{"cf.pm"};
3703 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4197 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3704 4198
3705 # don't, removes xs symbols, too, 4199 # don't, removes xs symbols, too,
3706 # and global variables created in xs 4200 # and global variables created in xs
3707 #clear_package __PACKAGE__; 4201 #clear_package __PACKAGE__;
3708 4202
3709 warn "unload completed, starting to reload now"; 4203 info "perl_reload: unload completed, starting to reload now";
3710 4204
3711 warn "reloading cf.pm"; 4205 trace "perl_reload: reloading cf.pm";
3712 require cf; 4206 require cf;
3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4207 cf::_connect_to_perl_1;
3714 4208
3715 warn "loading config and database again"; 4209 trace "perl_reload: loading config and database again";
3716 cf::reload_config; 4210 cf::reload_config;
3717 4211
3718 warn "loading extensions"; 4212 trace "perl_reload: loading extensions";
3719 cf::load_extensions; 4213 cf::load_extensions;
3720 4214
3721 if ($REATTACH_ON_RELOAD) { 4215 if ($REATTACH_ON_RELOAD) {
3722 warn "reattaching attachments to objects/players"; 4216 trace "perl_reload: reattaching attachments to objects/players";
3723 _global_reattach; # objects, sockets 4217 _global_reattach; # objects, sockets
3724 warn "reattaching attachments to maps"; 4218 trace "perl_reload: reattaching attachments to maps";
3725 reattach $_ for values %MAP; 4219 reattach $_ for values %MAP;
3726 warn "reattaching attachments to players"; 4220 trace "perl_reload: reattaching attachments to players";
3727 reattach $_ for values %PLAYER; 4221 reattach $_ for values %PLAYER;
3728 } 4222 }
3729 4223
3730 warn "running post_init jobs"; 4224 cf::_post_init 1;
3731 (pop @POST_INIT)->(1) while @POST_INIT;
3732 4225
3733 warn "leaving sync_job"; 4226 trace "perl_reload: leaving sync_job";
3734 4227
3735 1 4228 1
3736 } or do { 4229 } or do {
3737 warn $@; 4230 error $@;
3738 cf::cleanup "error while reloading, exiting."; 4231 cf::cleanup "perl_reload: error, exiting.";
3739 }; 4232 };
3740 4233
3741 warn "reloaded";
3742 --$RELOAD; 4234 --$RELOAD;
3743 } 4235 }
3744 4236
3745 $t1 = EV::time - $t1; 4237 $t1 = AE::time - $t1;
3746 warn "reload completed in ${t1}s\n"; 4238 info "perl_reload: completed in ${t1}s\n";
3747}; 4239};
3748 4240
3749our $RELOAD_WATCHER; # used only during reload 4241our $RELOAD_WATCHER; # used only during reload
3750 4242
3751sub reload_perl() { 4243sub reload_perl() {
3753 # coro crashes during coro_state_free->destroy here. 4245 # coro crashes during coro_state_free->destroy here.
3754 4246
3755 $RELOAD_WATCHER ||= cf::async { 4247 $RELOAD_WATCHER ||= cf::async {
3756 Coro::AIO::aio_wait cache_extensions; 4248 Coro::AIO::aio_wait cache_extensions;
3757 4249
3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4250 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3759 do_reload_perl; 4251 do_reload_perl;
3760 undef $RELOAD_WATCHER; 4252 undef $RELOAD_WATCHER;
3761 }; 4253 };
3762 }; 4254 };
3763} 4255}
3772 reload_perl; 4264 reload_perl;
3773 }; 4265 };
3774 } 4266 }
3775}; 4267};
3776 4268
3777unshift @INC, $LIBDIR; 4269#############################################################################
3778 4270
3779my $bug_warning = 0; 4271my $bug_warning = 0;
3780 4272
3781our @WAIT_FOR_TICK;
3782our @WAIT_FOR_TICK_BEGIN;
3783
3784sub wait_for_tick { 4273sub wait_for_tick() {
3785 return if tick_inhibit || $Coro::current == $Coro::main; 4274 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3786 4275
3787 my $signal = new Coro::Signal; 4276 $WAIT_FOR_TICK->wait;
3788 push @WAIT_FOR_TICK, $signal;
3789 $signal->wait;
3790} 4277}
3791 4278
3792sub wait_for_tick_begin { 4279sub wait_for_tick_begin() {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 4280 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3794 4281
3795 my $signal = new Coro::Signal; 4282 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK_BEGIN, $signal; 4283 push @WAIT_FOR_TICK_BEGIN, $signal;
3797 $signal->wait; 4284 $signal->wait;
3798} 4285}
3802 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4289 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3803 unless ++$bug_warning > 10; 4290 unless ++$bug_warning > 10;
3804 return; 4291 return;
3805 } 4292 }
3806 4293
3807 cf::server_tick; # one server iteration 4294 cf::one_tick; # one server iteration
4295
4296 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3808 4297
3809 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4298 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4299 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3811 Coro::async_pool { 4300 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver"; 4301 $Coro::current->{desc} = "runtime saver";
3813 write_runtime_sync 4302 write_runtime_sync
3814 or warn "ERROR: unable to write runtime file: $!"; 4303 or error "ERROR: unable to write runtime file: $!";
3815 }; 4304 };
3816 } 4305 }
3817 4306
3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4307 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3819 $sig->send; 4308 $sig->send;
3820 } 4309 }
3821 while (my $sig = shift @WAIT_FOR_TICK) { 4310 $WAIT_FOR_TICK->broadcast;
3822 $sig->send;
3823 }
3824 4311
3825 $LOAD = ($NOW - $TICK_START) / $TICK; 4312 $LOAD = ($NOW - $TICK_START) / $TICK;
3826 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4313 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3827 4314
3828 if (0) { 4315 if (0) {
3829 if ($NEXT_TICK) { 4316 if ($NEXT_TICK) {
3830 my $jitter = $TICK_START - $NEXT_TICK; 4317 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4318 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d# 4319 debug "jitter $JITTER\n";#d#
3833 } 4320 }
3834 } 4321 }
3835} 4322}
3836 4323
3837{ 4324{
3838 # configure BDB 4325 # configure BDB
4326 info "initialising database";
3839 4327
3840 BDB::min_parallel 8; 4328 BDB::min_parallel 16;
3841 BDB::max_poll_reqs $TICK * 0.1; 4329 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1); 4330 #$AnyEvent::BDB::WATCHER->priority (1);
3843 4331
3844 unless ($DB_ENV) { 4332 unless ($DB_ENV) {
3845 $DB_ENV = BDB::db_env_create; 4333 $DB_ENV = BDB::db_env_create;
3846 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4334 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3847 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4335 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3872 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4360 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3873 }; 4361 };
3874 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4362 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3875 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4363 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3876 }; 4364 };
4365
4366 info "database initialised";
3877} 4367}
3878 4368
3879{ 4369{
3880 # configure IO::AIO 4370 # configure IO::AIO
3881 4371
4372 info "initialising aio";
3882 IO::AIO::min_parallel 8; 4373 IO::AIO::min_parallel 8;
3883 IO::AIO::max_poll_time $TICK * 0.1; 4374 IO::AIO::max_poll_time $TICK * 0.1;
3884 undef $AnyEvent::AIO::WATCHER; 4375 undef $AnyEvent::AIO::WATCHER;
4376 info "aio initialised";
3885} 4377}
3886 4378
3887my $_log_backtrace; 4379our $_log_backtrace;
4380our $_log_backtrace_last;
3888 4381
3889sub _log_backtrace { 4382sub _log_backtrace {
3890 my ($msg, @addr) = @_; 4383 my ($msg, @addr) = @_;
3891 4384
3892 $msg =~ s/\n//; 4385 $msg =~ s/\n$//;
3893 4386
4387 if ($_log_backtrace_last eq $msg) {
4388 LOG llevInfo, "[ABT] $msg\n";
4389 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3894 # limit the # of concurrent backtraces 4390 # limit the # of concurrent backtraces
3895 if ($_log_backtrace < 2) { 4391 } elsif ($_log_backtrace < 2) {
4392 $_log_backtrace_last = $msg;
3896 ++$_log_backtrace; 4393 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg; 4394 my $perl_bt = Carp::longmess $msg;
3898 async { 4395 async {
3899 $Coro::current->{desc} = "abt $msg"; 4396 $Coro::current->{desc} = "abt $msg";
3900 4397
3920 LOG llevInfo, "[ABT] $_\n" for @bt; 4417 LOG llevInfo, "[ABT] $_\n" for @bt;
3921 --$_log_backtrace; 4418 --$_log_backtrace;
3922 }; 4419 };
3923 } else { 4420 } else {
3924 LOG llevInfo, "[ABT] $msg\n"; 4421 LOG llevInfo, "[ABT] $msg\n";
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4422 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3926 } 4423 }
3927} 4424}
3928 4425
3929# load additional modules 4426# load additional modules
3930eval "use cf::$_" for @EXTRA_MODULES; 4427require "cf/$_.pm" for @EXTRA_MODULES;
4428cf::_connect_to_perl_2;
3931 4429
3932END { cf::emergency_save } 4430END { cf::emergency_save }
3933 4431
39341 44321
3935 4433

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines