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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines