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.473 by root, Fri Jun 26 16:32:10 2009 UTC vs.
Revision 1.573 by root, Sun May 8 12:40:42 2011 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 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# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict qw(vars subs);
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard (); 37use Guard ();
38use Coro (); 38use Coro ();
39use Coro::State; 39use Coro::State;
40use Coro::Handle; 40use Coro::Handle;
51use Coro::Util (); 51use Coro::Util ();
52 52
53use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
54use BDB (); 54use BDB ();
55use Data::Dumper; 55use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 56use Fcntl;
58use YAML (); 57use YAML::XS ();
59use IO::AIO (); 58use IO::AIO ();
60use Time::HiRes; 59use Time::HiRes;
61use Compress::LZF; 60use Compress::LZF;
62use Digest::MD5 (); 61use Digest::MD5 ();
63 62
72 71
73# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
81 85
82our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
92our $DATADIR = datadir; 99our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
95our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
96our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
97our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
99our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
100our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 112
105our %RESOURCE; 113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
106 120
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 123our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
112our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 129our $DB_ENV;
116 130
117our @EXTRA_MODULES = qw(pod mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
118 132
119our %CFG; 133our %CFG;
120 134
121our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
123our $NOW; 138our $NOW;
124 139
125our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
126our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
127our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
134our $JITTER; # average jitter 149our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 150our $TICK_START; # for load detecting purposes
136 151
137our @POST_INIT; 152our @POST_INIT;
138 153
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
140 159
141binmode STDOUT; 160binmode STDOUT;
142binmode STDERR; 161binmode STDERR;
143 162
144# read virtual server time, if available 163# read virtual server time, if available
155 174
156our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
157 176
158sub cf::map::normalise; 177sub cf::map::normalise;
159 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
160############################################################################# 183#############################################################################
161 184
185%REFLECT = ();
186for (@REFLECT) {
187 my $reflect = JSON::XS::decode_json $_;
188 $REFLECT{$reflect->{class}} = $reflect;
189}
190
191# this is decidedly evil
192$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
193
194#############################################################################
195
162=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
163 197
164=over 4 198=over 4
165 199
166=item $cf::UPTIME 200=item $cf::UPTIME
167 201
168The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
169 218
170=item $cf::RUNTIME 219=item $cf::RUNTIME
171 220
172The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
173every server tick. 222every server tick.
179Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
180directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
181unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
182database environment. 231database environment.
183 232
184=item $cf::NOW
185
186The time of the last (current) server tick.
187
188=item $cf::TICK
189
190The interval between server ticks, in seconds.
191
192=item $cf::LOADAVG 233=item $cf::LOADAVG
193 234
194The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
195(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
196objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
205from wherever your confdir points to. 246from wherever your confdir points to.
206 247
207=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
208 249
209These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
210returns directly I<after> the tick processing (and consequently, can only wake one process 251returns directly I<after> the tick processing (and consequently, can only wake one thread
211per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
212 253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
265
266=cut
267
268sub wait_for_tick();
269sub wait_for_tick_begin();
270
213=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
214 272
215This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
216C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 274C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
217that call. 275that call.
218 276
277=item %cf::REFLECT
278
279Contains, for each (C++) class name, a hash reference with information
280about object members (methods, scalars, arrays and flags) and other
281metadata, which is useful for introspection.
282
219=back 283=back
220 284
221=cut 285=cut
222 286
223BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
224 *CORE::GLOBAL::warn = sub { 288sub warn (@) { LOG llevWarn , join "", @_ }
289sub info (@) { LOG llevInfo , join "", @_ }
290sub debug(@) { LOG llevDebug, join "", @_ }
291sub trace(@) { LOG llevTrace, join "", @_ }
292
293$Coro::State::WARNHOOK = sub {
225 my $msg = join "", @_; 294 my $msg = join "", @_;
226 295
227 $msg .= "\n" 296 $msg .= "\n"
228 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
229 298
230 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 299 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
231 300
232 LOG llevError, $msg; 301 LOG llevWarn, $msg;
233 }; 302};
234}
235 303
236$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
238 306
239 if ($Coro::current == $Coro::main) {#d# 307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 311 return;#d#
242 }#d# 312 }#d#
243 313
244 # kill coroutine otherwise 314 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 315 Coro::terminate
247}; 316};
248
249$SIG{__DIE__} = sub { }; #d#?
250 317
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
268)) { 335)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 337}
271 338
272$EV::DIED = sub { 339$EV::DIED = sub {
273 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
274}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
275 347
276############################################################################# 348#############################################################################
277 349
278=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
279 351
300 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
301 $d 373 $d
302 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
303} 375}
304 376
377=item $scalar = load_file $path
378
379Loads the given file from path and returns its contents. Croaks on error
380and can block.
381
382=cut
383
384sub load_file($) {
385 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!";
387
388 $data
389}
390
305=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
306 392
307Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
308 394
309=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
315our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 401our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
316 402
317sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
318sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
319 405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
414=item $ref = cf::decode_yaml $scalar
415
416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
417
418=cut
419
420sub decode_yaml($) {
421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
435}
436
320=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
321 438
322Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
324 441
325The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
326is a reload or not. 443is a reload or not.
327 444
328=cut 445=cut
329 446
330sub post_init(&) { 447sub post_init(&) {
331 push @POST_INIT, shift; 448 push @POST_INIT, shift;
449}
450
451sub _post_init {
452 trace "running post_init jobs";
453
454 # run them in parallel...
455
456 my @join;
457
458 while () {
459 push @join, map &Coro::async ($_, 0), @POST_INIT;
460 @POST_INIT = ();
461
462 @join or last;
463
464 (pop @join)->join;
465 }
332} 466}
333 467
334=item cf::lock_wait $string 468=item cf::lock_wait $string
335 469
336Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
375} 509}
376 510
377=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
378 512
379Like EV::periodic, but randomly selects a starting point so that the actions 513Like EV::periodic, but randomly selects a starting point so that the actions
380get spread over timer. 514get spread over time.
381 515
382=cut 516=cut
383 517
384sub periodic($$) { 518sub periodic($$) {
385 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
389 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
390} 524}
391 525
392=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
393 527
394Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
395This call blocks and returns only when you have at least C<$time> seconds 529(default: 0): This call blocks and returns only when you have at least
396of cpu time till the next tick. The slot is only valid till the next cede. 530C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede.
532
533Background jobs should use a priority les than zero, interactive jobs
534should use 100 or more.
397 535
398The optional C<$name> can be used to identify the job to run. It might be 536The optional C<$name> can be used to identify the job to run. It might be
399used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
400 538
401Useful for short background jobs. 539Useful for short background jobs.
402 540
403=cut 541=cut
404 542
405our @SLOT_QUEUE; 543our @SLOT_QUEUE;
406our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
407 546
408$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
411 550
412 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
413 553
414 while () { 554 while () {
415 next_job: 555 next_job:
556
416 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
417 if ($avail > 0.01) { 558
418 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
420 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send; 563 $job->[2]->send;
422 Coro::cede; 564 Coro::cede;
423 goto next_job; 565 goto next_job;
424 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425 } 568 }
426 } 569 }
427 570
428 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
429 # we do not use wait_for_tick() as it returns immediately when tick is inactive 572 # we do not use wait_for_tick() as it returns immediately when tick is inactive
430 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
431 $signal->wait;
432 } else { 574 } else {
575 $busy = 0;
433 Coro::schedule; 576 Coro::schedule;
434 } 577 }
435 } 578 }
436}; 579};
437 580
438sub get_slot($;$$) { 581sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main; 582 return if tick_inhibit || $Coro::current == $Coro::main;
440 583
441 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
442 585
443 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
444 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
445 589
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
474=cut 618=cut
475 619
476sub sync_job(&) { 620sub sync_job(&) {
477 my ($job) = @_; 621 my ($job) = @_;
478 622
479 if ($Coro::current == $Coro::main) { 623 if (in_main) {
480 my $time = EV::time; 624 my $time = AE::time;
481 625
482 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
483 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
484 628
485 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
486 630
487 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
488 632
489 my $busy = 1; 633 my $busy = 1;
490 my @res; 634 my @res;
491 635
492 (async { 636 (async {
493 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
494 @res = eval { $job->() }; 638 @res = eval { $job->() };
495 warn $@ if $@; 639 error $@ if $@;
496 undef $busy; 640 undef $busy;
497 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
498 642
499 while ($busy) { 643 while ($busy) {
500 if (Coro::nready) { 644 if (Coro::nready) {
502 } else { 646 } else {
503 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
504 } 648 }
505 } 649 }
506 650
507 my $time = EV::time - $time; 651 my $time = AE::time - $time;
508 652
509 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
510 654
511 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
512 } else { 656 } else {
534 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
535 679
536 $coro 680 $coro
537} 681}
538 682
539=item fork_call { }, $args 683=item fork_call { }, @args
540 684
541Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
542process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
543Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
544never block itself or use any form of event handling. 688never block itself or use any form of event handling.
545 689
546=cut 690=cut
547 691
692sub post_fork {
693 reset_signals;
694}
695
548sub fork_call(&@) { 696sub fork_call(&@) {
549 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
550 698
551 # we seemingly have to make a local copy of the whole thing, 699 # we seemingly have to make a local copy of the whole thing,
552 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
553 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
554 702
555 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
556 reset_signals; 704 cf::post_fork;
557 &$cb 705 &$cb
558 }, @args; 706 } @args;
559 707
560 wantarray ? @res : $res[-1] 708 wantarray ? @res : $res[-1]
709}
710
711sub objinfo {
712 (
713 "counter value" => cf::object::object_count,
714 "objects created" => cf::object::create_count,
715 "objects destroyed" => cf::object::destroy_count,
716 "freelist size" => cf::object::free_count,
717 "allocated objects" => cf::object::objects_size,
718 "active objects" => cf::object::actives_size,
719 )
561} 720}
562 721
563=item $coin = coin_from_name $name 722=item $coin = coin_from_name $name
564 723
565=cut 724=cut
602within each server. 761within each server.
603 762
604=cut 763=cut
605 764
606sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
607 my ($name) = @_; 769 my ($name) = @_;
608 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
609 771
610 eval { 772 eval {
611 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
621} 783}
622 784
623our $DB; 785our $DB;
624 786
625sub db_init { 787sub db_init {
626 cf::sync_job {
627 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
628 };
629} 789}
630 790
631sub db_get($$) { 791sub db_get($$) {
632 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
633 793
634 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
635 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
636 798
637 $! ? () 799 $! ? ()
638 : $data 800 : $data
639 }
640} 801}
641 802
642sub db_put($$$) { 803sub db_put($$$) {
643 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
644 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
672 833
673 my @data; 834 my @data;
674 my $md5; 835 my $md5;
675 836
676 for (0 .. $#$src) { 837 for (0 .. $#$src) {
677 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
678 or Carp::croak "$src->[$_]: $!";
679 } 839 }
680 840
681 # if processing is expensive, check 841 # if processing is expensive, check
682 # checksum first 842 # checksum first
683 if (1) { 843 if (1) {
700 860
701 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
702 my $data = $process->(\@data); 862 my $data = $process->(\@data);
703 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
704 864
705 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
706 866
707 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
708 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
709 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
710 870
720 880
721=cut 881=cut
722 882
723sub datalog($@) { 883sub datalog($@) {
724 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
725 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
726} 886}
727 887
728=back 888=back
729 889
730=cut 890=cut
925 1085
926 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
927 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
928 1088
929 } elsif (ref $type) { 1089 } elsif (ref $type) {
930 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
931 1091
932 } else { 1092 } else {
933 shift @arg; 1093 shift @arg;
934 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
935 } 1095 }
936 } 1096 }
937} 1097}
938 1098
939sub _object_attach { 1099sub _object_attach {
949 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
950 } 1110 }
951 1111
952 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
953 } else { 1113 } else {
954 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
955 } 1115 }
956 1116
957 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
958} 1118}
959 1119
1018 1178
1019 for (@$callbacks) { 1179 for (@$callbacks) {
1020 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1021 1181
1022 if ($@) { 1182 if ($@) {
1023 warn "$@";
1024 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1025 override; 1184 override;
1026 } 1185 }
1027 1186
1028 return 1 if $override; 1187 return 1 if $override;
1029 } 1188 }
1108 for (@$attach) { 1267 for (@$attach) {
1109 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1110 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1111 } 1270 }
1112 } else { 1271 } else {
1113 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1114 } 1273 }
1115 } 1274 }
1116} 1275}
1117 1276
1118cf::attachable->attach ( 1277cf::attachable->attach (
1145 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1146 1305
1147 sync_job { 1306 sync_job {
1148 if (length $$rdata) { 1307 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1150 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1151 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1152 1312
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 if ($cf::USE_FSYNC) { 1316 if ($cf::USE_FSYNC) {
1178 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1179 1339
1180 $filename =~ s%/[^/]+$%%; 1340 $filename =~ s%/[^/]+$%%;
1181 aio_pathsync $filename if $cf::USE_FSYNC; 1341 aio_pathsync $filename if $cf::USE_FSYNC;
1182 } else { 1342 } else {
1183 warn "unable to save objects: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1184 } 1344 }
1185 } else { 1345 } else {
1186 aio_unlink $filename; 1346 aio_unlink $filename;
1187 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1188 } 1348 }
1212 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1213 $av = $st->{objs}; 1373 $av = $st->{objs};
1214 } 1374 }
1215 1375
1216 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1217 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1218 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1219 1380
1220 ($data, $av) 1381 ($data, $av)
1221} 1382}
1222 1383
1223=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1282} 1443}
1283 1444
1284use File::Glob (); 1445use File::Glob ();
1285 1446
1286cf::player->attach ( 1447cf::player->attach (
1287 on_command => sub { 1448 on_unknown_command => sub {
1288 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1289 1450
1290 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1291 or return; 1452 or return;
1292 1453
1315 1476
1316 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1317 if $reply; 1478 if $reply;
1318 1479
1319 } else { 1480 } else {
1320 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1321 } 1482 }
1322 1483
1323 cf::override; 1484 cf::override;
1324 }, 1485 },
1325); 1486);
1336 1497
1337 $grp 1498 $grp
1338} 1499}
1339 1500
1340sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1341 cf::sync_job { 1504 cf::sync_job {
1342 my %todo; 1505 my %todo;
1343 1506
1344 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1345 next unless -r $path; 1508 next unless -r $path;
1363 1526
1364 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1365 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1366 1529
1367 $ext{source} = 1530 $ext{source} =
1368 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1369 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1370 . $source 1533 . $source
1371 . "\n};\n1"; 1534 . "\n};\n1";
1372 1535
1373 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
1374 } 1537 }
1375 1538
1539 my $pass = 0;
1376 my %done; 1540 my %done;
1377 while (%todo) { 1541 while (%todo) {
1378 my $progress; 1542 my $progress;
1379 1543
1544 ++$pass;
1545
1546 ext:
1380 while (my ($k, $v) = each %todo) { 1547 while (my ($k, $v) = each %todo) {
1381 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1382 goto skip 1549 next ext
1383 unless exists $done{$_}; 1550 unless exists $done{$_};
1384 } 1551 }
1385 1552
1386 warn "... loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1387 1554
1388 unless (eval $v->{source}) { 1555 my $active = eval $v->{source};
1556
1557 if (length $@) {
1389 my $msg = $@ ? "$v->{path}: $@\n" 1558 error "$v->{path}: $@\n";
1390 : "$v->{base}: extension inactive.\n";
1391 1559
1392 if (exists $v->{meta}{mandatory}) {
1393 warn $msg;
1394 cf::cleanup "mandatory extension failed to load, exiting."; 1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1395 } 1561 if exists $v->{meta}{mandatory};
1396 1562
1397 warn $msg; 1563 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1564 delete $todo{$k};
1565 } else {
1566 $done{$k} = delete $todo{$k};
1567 push @EXTS, $v->{pkg};
1568 $progress = 1;
1569
1570 info "$v->{base}: extension inactive.\n"
1571 unless $active;
1398 } 1572 }
1399
1400 $done{$k} = delete $todo{$k};
1401 push @EXTS, $v->{pkg};
1402 $progress = 1;
1403 } 1573 }
1404 1574
1405 skip: 1575 unless ($progress) {
1406 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1576 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1407 unless $progress; 1577
1578 while (my ($k, $v) = each %todo) {
1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1580 if exists $v->{meta}{mandatory};
1581 }
1582
1583 last;
1584 }
1408 } 1585 }
1409 }; 1586 };
1410} 1587}
1411 1588
1412############################################################################# 1589#############################################################################
1496 $cf::PLAYER{$login} = $pl 1673 $cf::PLAYER{$login} = $pl
1497 } 1674 }
1498 } 1675 }
1499} 1676}
1500 1677
1678cf::player->attach (
1679 on_load => sub {
1680 my ($pl, $path) = @_;
1681
1682 # restore slots saved in save, below
1683 my $slots = delete $pl->{_slots};
1684
1685 $pl->ob->current_weapon ($slots->[0]);
1686 $pl->combat_ob ($slots->[1]);
1687 $pl->ranged_ob ($slots->[2]);
1688 },
1689);
1690
1501sub save($) { 1691sub save($) {
1502 my ($pl) = @_; 1692 my ($pl) = @_;
1503 1693
1504 return if $pl->{deny_save}; 1694 return if $pl->{deny_save};
1505 1695
1510 1700
1511 aio_mkdir playerdir $pl, 0770; 1701 aio_mkdir playerdir $pl, 0770;
1512 $pl->{last_save} = $cf::RUNTIME; 1702 $pl->{last_save} = $cf::RUNTIME;
1513 1703
1514 cf::get_slot 0.01; 1704 cf::get_slot 0.01;
1705
1706 # save slots, to be restored later
1707 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1515 1708
1516 $pl->save_pl ($path); 1709 $pl->save_pl ($path);
1517 cf::cede_to_tick; 1710 cf::cede_to_tick;
1518} 1711}
1519 1712
1553 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1554 1747
1555 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1556 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1749 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1557 1750
1558 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1559 $pl->deactivate; 1752 $pl->deactivate;
1753
1560 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1754 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1561 $pl->ob->check_score;
1562 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1563 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1564 1759
1565 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1566 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1567 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
1621 \@logins 1816 \@logins
1622} 1817}
1623 1818
1624=item $player->maps 1819=item $player->maps
1625 1820
1821=item cf::player::maps $login
1822
1626Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1627player. May block. 1824player. May block.
1628 1825
1629=cut 1826=cut
1630 1827
1692=cut 1889=cut
1693 1890
1694sub find_by_path($) { 1891sub find_by_path($) {
1695 my ($path) = @_; 1892 my ($path) = @_;
1696 1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1895
1697 my ($match, $specificity); 1896 my ($match, $specificity);
1698 1897
1699 for my $region (list) { 1898 for my $region (list) {
1700 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1701 ($match, $specificity) = ($region, $region->specificity) 1900 ($match, $specificity) = ($region, $region->specificity)
1729sub generate_random_map { 1928sub generate_random_map {
1730 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1731 1930
1732 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1733 1932
1734 # mit "rum" bekleckern, nicht
1735 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1736 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1737 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1738 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1739 $rmp->{exit_on_final_map},
1740 $rmp->{xsize}, $rmp->{ysize},
1741 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1742 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1743 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1744 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1745 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1746 (cf::region::find $rmp->{region}), $rmp->{custom}
1747 )
1748} 1934}
1749 1935
1750=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1751 1937
1752Register a handler for the map path matching the given regex at the 1938Register a handler for the map path matching the given regex at the
1757 1943
1758sub register { 1944sub register {
1759 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1760 my $pkg = caller; 1946 my $pkg = caller;
1761 1947
1762 no strict;
1763 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1764 1949
1765 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1766} 1951}
1767 1952
1768# also paths starting with '/' 1953# also paths starting with '/'
1769$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1770 1955
1771sub thawer_merge { 1956sub thawer_merge {
1772 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1773 1958
1774 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
1779} 1964}
1780 1965
1781sub normalise { 1966sub normalise {
1782 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1783 1968
1784 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1785 1970
1786 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1787 1972
1788 # map plan: 1973 # map plan:
1789 # 1974 #
1804 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1805 $path = "$base/$path"; 1990 $path = "$base/$path";
1806 } 1991 }
1807 1992
1808 for ($path) { 1993 for ($path) {
1809 redo if s{//}{/};
1810 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1811 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1812 } 1996 }
1813 1997
1814 $path 1998 $path
1828 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1829 return $self; 2013 return $self;
1830 } 2014 }
1831 } 2015 }
1832 2016
1833 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1834 () 2018 ()
1835} 2019}
1836 2020
2021# may re-bless or do other evil things
1837sub init { 2022sub init {
1838 my ($self) = @_; 2023 my ($self) = @_;
1839 2024
1840 $self 2025 $self
1841} 2026}
1906 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1907 2092
1908 1 2093 1
1909} 2094}
1910 2095
2096# used to laod the header of an original map
1911sub load_header_orig { 2097sub load_header_orig {
1912 my ($self) = @_; 2098 my ($self) = @_;
1913 2099
1914 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1915} 2101}
1916 2102
2103# used to laod the header of an instantiated map
1917sub load_header_temp { 2104sub load_header_temp {
1918 my ($self) = @_; 2105 my ($self) = @_;
1919 2106
1920 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1921} 2108}
1922 2109
2110# called after loading the header from an instantiated map
1923sub prepare_temp { 2111sub prepare_temp {
1924 my ($self) = @_; 2112 my ($self) = @_;
1925 2113
1926 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1927 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1928 # safety 2116 # safety
1929 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1930 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1931} 2119}
1932 2120
2121# called after loading the header from an original map
1933sub prepare_orig { 2122sub prepare_orig {
1934 my ($self) = @_; 2123 my ($self) = @_;
1935 2124
1936 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1937 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
1961 2150
1962sub find; 2151sub find;
1963sub find { 2152sub find {
1964 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
1965 2154
2155 cf::cede_to_tick;
2156
1966 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
1967 2158
1968 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1969 my $guard2 = cf::lock_acquire "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
1970 2161
1971 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
1988 2179
1989 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
1990 } 2181 }
1991} 2182}
1992 2183
1993sub pre_load { } 2184sub pre_load { }
1994sub post_load { } 2185#sub post_load { } # XS
1995 2186
1996sub load { 2187sub load {
1997 my ($self) = @_; 2188 my ($self) = @_;
1998 2189
1999 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
2002 2193
2003 { 2194 {
2004 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2005 2196
2006 return unless $self->valid; 2197 return unless $self->valid;
2007 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2008
2009 $self->in_memory (cf::MAP_LOADING);
2010 2199
2011 $self->alloc; 2200 $self->alloc;
2012 2201
2013 $self->pre_load; 2202 $self->pre_load;
2014 cf::cede_to_tick; 2203 cf::cede_to_tick;
2015 2204
2205 if (exists $self->{load_path}) {
2016 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2017 $f->skip_block; 2207 $f->skip_block;
2018 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2019 or return; 2209 or return;
2020 2210
2021 $self->post_load_original 2211 $self->post_load_original
2022 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2023 2213
2024 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2025 utf8::encode $uniq; 2215 utf8::encode $uniq;
2026 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2027 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2028 $self->clear_unique_items; 2218 $self->clear_unique_items;
2029 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2030 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2031 } 2222 }
2032 } 2223 }
2033 }
2034 2224
2035 $f->resolve_delayed_derefs; 2225 $f->resolve_delayed_derefs;
2226 } else {
2227 $self->post_load_original
2228 if delete $self->{load_original};
2229 }
2230
2231 $self->state (cf::MAP_INACTIVE);
2036 2232
2037 cf::cede_to_tick; 2233 cf::cede_to_tick;
2038 # now do the right thing for maps 2234 # now do the right thing for maps
2039 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2040 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
2044 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2045 $self->decay_objects; 2241 $self->decay_objects;
2046 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2047 $self->update_buttons; 2243 $self->update_buttons;
2048 cf::cede_to_tick; 2244 cf::cede_to_tick;
2049 $self->activate; 2245 #$self->activate; # no longer activate maps automatically
2050 } 2246 }
2051 2247
2052 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2053 $self->last_access ($cf::RUNTIME); 2249 $self->last_access ($cf::RUNTIME);
2054
2055 $self->in_memory (cf::MAP_ACTIVE);
2056 } 2250 }
2057 2251
2058 $self->post_load; 2252 $self->post_load;
2059}
2060 2253
2254 1
2255}
2256
2257# customize the map for a given player, i.e.
2258# return the _real_ map. used by e.g. per-player
2259# maps to change the path to ~playername/mappath
2061sub customise_for { 2260sub customise_for {
2062 my ($self, $ob) = @_; 2261 my ($self, $ob) = @_;
2063 2262
2064 return find "~" . $ob->name . "/" . $self->{path} 2263 return find "~" . $ob->name . "/" . $self->{path}
2065 if $self->per_player; 2264 if $self->per_player;
2081 or next; 2280 or next;
2082 $neigh = find $neigh, $map 2281 $neigh = find $neigh, $map
2083 or next; 2282 or next;
2084 $neigh->load; 2283 $neigh->load;
2085 2284
2285 # now find the diagonal neighbours
2086 push @neigh, 2286 push @neigh,
2087 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2287 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2088 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2288 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2089 } 2289 }
2090 2290
2097} 2297}
2098 2298
2099sub find_sync { 2299sub find_sync {
2100 my ($path, $origin) = @_; 2300 my ($path, $origin) = @_;
2101 2301
2102 cf::sync_job { find $path, $origin } 2302 # it's a bug to call this from the main context
2303 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2304 if $Coro::current == $Coro::main;
2305
2306 find $path, $origin
2103} 2307}
2104 2308
2105sub do_load_sync { 2309sub do_load_sync {
2106 my ($map) = @_; 2310 my ($map) = @_;
2107 2311
2312 # it's a bug to call this from the main context
2108 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2313 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2109 if $Coro::current == $Coro::main; 2314 if $Coro::current == $Coro::main;
2110 2315
2111 cf::sync_job { $map->load }; 2316 $map->load;
2112} 2317}
2113 2318
2114our %MAP_PREFETCH; 2319our %MAP_PREFETCH;
2115our $MAP_PREFETCHER = undef; 2320our $MAP_PREFETCHER = undef;
2116 2321
2117sub find_async { 2322sub find_async {
2118 my ($path, $origin, $load) = @_; 2323 my ($path, $origin, $load) = @_;
2119 2324
2120 $path = normalise $path, $origin && $origin->{path}; 2325 $path = normalise $path, $origin;
2121 2326
2122 if (my $map = $cf::MAP{$path}) { 2327 if (my $map = $cf::MAP{$path}) {
2123 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2328 return $map if !$load || $map->linkable;
2124 } 2329 }
2125 2330
2126 $MAP_PREFETCH{$path} |= $load; 2331 $MAP_PREFETCH{$path} |= $load;
2127 2332
2128 $MAP_PREFETCHER ||= cf::async { 2333 $MAP_PREFETCHER ||= cf::async {
2142 $MAP_PREFETCHER->prio (6); 2347 $MAP_PREFETCHER->prio (6);
2143 2348
2144 () 2349 ()
2145} 2350}
2146 2351
2352# common code, used by both ->save and ->swapout
2147sub save { 2353sub _save {
2148 my ($self) = @_; 2354 my ($self) = @_;
2149
2150 my $lock = cf::lock_acquire "map_data:$self->{path}";
2151 2355
2152 $self->{last_save} = $cf::RUNTIME; 2356 $self->{last_save} = $cf::RUNTIME;
2153 2357
2154 return unless $self->dirty; 2358 return unless $self->dirty;
2155 2359
2175 } else { 2379 } else {
2176 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2380 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2177 } 2381 }
2178} 2382}
2179 2383
2384sub save {
2385 my ($self) = @_;
2386
2387 my $lock = cf::lock_acquire "map_data:$self->{path}";
2388
2389 $self->_save;
2390}
2391
2180sub swap_out { 2392sub swap_out {
2181 my ($self) = @_; 2393 my ($self) = @_;
2182 2394
2183 # save first because save cedes
2184 $self->save;
2185
2186 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2395 my $lock = cf::lock_acquire "map_data:$self->{path}";
2187 2396
2397 return if !$self->linkable;
2398 return if $self->{deny_save};
2188 return if $self->players; 2399 return if $self->players;
2189 return if $self->in_memory != cf::MAP_ACTIVE; 2400
2401 # first deactivate the map and "unlink" it from the core
2402 $self->deactivate;
2403 $_->clear_links_to ($self) for values %cf::MAP;
2404 $self->state (cf::MAP_SWAPPED);
2405
2406 # then atomically save
2407 $self->_save;
2408
2409 # then free the map
2410 $self->clear;
2411}
2412
2413sub reset_at {
2414 my ($self) = @_;
2415
2416 # TODO: safety, remove and allow resettable per-player maps
2190 return if $self->{deny_save}; 2417 return 1e99 if $self->{deny_reset};
2191 2418
2419 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2420 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2421
2422 $time + $to
2423}
2424
2425sub should_reset {
2426 my ($self) = @_;
2427
2428 $self->reset_at <= $cf::RUNTIME
2429}
2430
2431sub reset {
2432 my ($self) = @_;
2433
2434 my $lock = cf::lock_acquire "map_data:$self->{path}";
2435
2436 return if $self->players;
2437
2438 cf::trace "resetting map ", $self->path, "\n";
2439
2192 $self->in_memory (cf::MAP_SWAPPED); 2440 $self->state (cf::MAP_SWAPPED);
2441
2442 # need to save uniques path
2443 unless ($self->{deny_save}) {
2444 my $uniq = $self->uniq_path; utf8::encode $uniq;
2445
2446 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2447 if $uniq;
2448 }
2449
2450 delete $cf::MAP{$self->path};
2193 2451
2194 $self->deactivate; 2452 $self->deactivate;
2195 $_->clear_links_to ($self) for values %cf::MAP; 2453 $_->clear_links_to ($self) for values %cf::MAP;
2196 $self->clear; 2454 $self->clear;
2197}
2198
2199sub reset_at {
2200 my ($self) = @_;
2201
2202 # TODO: safety, remove and allow resettable per-player maps
2203 return 1e99 if $self->{deny_reset};
2204
2205 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2206 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2207
2208 $time + $to
2209}
2210
2211sub should_reset {
2212 my ($self) = @_;
2213
2214 $self->reset_at <= $cf::RUNTIME
2215}
2216
2217sub reset {
2218 my ($self) = @_;
2219
2220 my $lock = cf::lock_acquire "map_data:$self->{path}";
2221
2222 return if $self->players;
2223
2224 warn "resetting map ", $self->path;
2225
2226 $self->in_memory (cf::MAP_SWAPPED);
2227
2228 # need to save uniques path
2229 unless ($self->{deny_save}) {
2230 my $uniq = $self->uniq_path; utf8::encode $uniq;
2231
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2233 if $uniq;
2234 }
2235
2236 delete $cf::MAP{$self->path};
2237
2238 $self->deactivate;
2239 $_->clear_links_to ($self) for values %cf::MAP;
2240 $self->clear;
2241 2455
2242 $self->unlink_save; 2456 $self->unlink_save;
2243 $self->destroy; 2457 $self->destroy;
2244} 2458}
2245 2459
2253 2467
2254 delete $cf::MAP{$self->path}; 2468 delete $cf::MAP{$self->path};
2255 2469
2256 $self->unlink_save; 2470 $self->unlink_save;
2257 2471
2258 bless $self, "cf::map"; 2472 bless $self, "cf::map::wrap";
2259 delete $self->{deny_reset}; 2473 delete $self->{deny_reset};
2260 $self->{deny_save} = 1; 2474 $self->{deny_save} = 1;
2261 $self->reset_timeout (1); 2475 $self->reset_timeout (1);
2262 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2476 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2263 2477
2320 : normalise $_ 2534 : normalise $_
2321 } @{ aio_readdir $UNIQUEDIR or [] } 2535 } @{ aio_readdir $UNIQUEDIR or [] }
2322 ] 2536 ]
2323} 2537}
2324 2538
2539=item cf::map::static_maps
2540
2541Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2542file in the shared directory excluding F</styles> and F</editor>). May
2543block.
2544
2545=cut
2546
2547sub static_maps() {
2548 my @dirs = "";
2549 my @maps;
2550
2551 while (@dirs) {
2552 my $dir = shift @dirs;
2553
2554 next if $dir eq "/styles" || $dir eq "/editor";
2555
2556 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2557 or return;
2558
2559 for (@$files) {
2560 s/\.map$// or next;
2561 utf8::decode $_;
2562 push @maps, "$dir/$_";
2563 }
2564
2565 push @dirs, map "$dir/$_", @$dirs;
2566 }
2567
2568 \@maps
2569}
2570
2325=back 2571=back
2326 2572
2327=head3 cf::object 2573=head3 cf::object
2328 2574
2329=cut 2575=cut
2461 2707
2462Freezes the player and moves him/her to a special map (C<{link}>). 2708Freezes the player and moves him/her to a special map (C<{link}>).
2463 2709
2464The player should be reasonably safe there for short amounts of time (e.g. 2710The player should be reasonably safe there for short amounts of time (e.g.
2465for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2711for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2466though, as the palyer cannot control the character while it is on the link 2712though, as the player cannot control the character while it is on the link
2467map. 2713map.
2468 2714
2469Will never block. 2715Will never block.
2470 2716
2471=item $player_object->leave_link ($map, $x, $y) 2717=item $player_object->leave_link ($map, $x, $y)
2492sub cf::object::player::enter_link { 2738sub cf::object::player::enter_link {
2493 my ($self) = @_; 2739 my ($self) = @_;
2494 2740
2495 $self->deactivate_recursive; 2741 $self->deactivate_recursive;
2496 2742
2743 ++$self->{_link_recursion};
2744
2497 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2745 return if UNIVERSAL::isa $self->map, "ext::map_link";
2498 2746
2499 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2747 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2500 if $self->map && $self->map->{path} ne "{link}"; 2748 if $self->map && $self->map->{path} ne "{link}";
2501 2749
2502 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2750 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2503} 2751}
2504 2752
2505sub cf::object::player::leave_link { 2753sub cf::object::player::leave_link {
2506 my ($self, $map, $x, $y) = @_; 2754 my ($self, $map, $x, $y) = @_;
2507 2755
2524 ($x, $y) = (-1, -1) 2772 ($x, $y) = (-1, -1)
2525 unless (defined $x) && (defined $y); 2773 unless (defined $x) && (defined $y);
2526 2774
2527 # use -1 or undef as default coordinates, not 0, 0 2775 # use -1 or undef as default coordinates, not 0, 0
2528 ($x, $y) = ($map->enter_x, $map->enter_y) 2776 ($x, $y) = ($map->enter_x, $map->enter_y)
2529 if $x <=0 && $y <= 0; 2777 if $x <= 0 && $y <= 0;
2530 2778
2531 $map->load; 2779 $map->load;
2532 $map->load_neighbours; 2780 $map->load_neighbours;
2533 2781
2534 return unless $self->contr->active; 2782 return unless $self->contr->active;
2535 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2536 $self->activate_recursive;
2537 2783
2538 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2784 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2539 $self->enter_map ($map, $x, $y); 2785 if ($self->enter_map ($map, $x, $y)) {
2540} 2786 # entering was successful
2787 delete $self->{_link_recursion};
2788 # only activate afterwards, to support waiting in hooks
2789 $self->activate_recursive;
2790 }
2541 2791
2792}
2793
2542=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2794=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2543 2795
2544Moves the player to the given map-path and coordinates by first freezing 2796Moves the player to the given map-path and coordinates by first freezing
2545her, loading and preparing them map, calling the provided $check callback 2797her, loading and preparing them map, calling the provided $check callback
2546that has to return the map if sucecssful, and then unfreezes the player on 2798that has to return the map if sucecssful, and then unfreezes the player on
2547the new (success) or old (failed) map position. In either case, $done will 2799the new (success) or old (failed) map position. In either case, $done will
2554 2806
2555our $GOTOGEN; 2807our $GOTOGEN;
2556 2808
2557sub cf::object::player::goto { 2809sub cf::object::player::goto {
2558 my ($self, $path, $x, $y, $check, $done) = @_; 2810 my ($self, $path, $x, $y, $check, $done) = @_;
2811
2812 if ($self->{_link_recursion} >= $MAX_LINKS) {
2813 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2814 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2815 ($path, $x, $y) = @$EMERGENCY_POSITION;
2816 }
2559 2817
2560 # do generation counting so two concurrent goto's will be executed in-order 2818 # do generation counting so two concurrent goto's will be executed in-order
2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2819 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2562 2820
2563 $self->enter_link; 2821 $self->enter_link;
2583 ($path, $x, $y) = (undef, undef, undef); 2841 ($path, $x, $y) = (undef, undef, undef);
2584 } 2842 }
2585 } 2843 }
2586 2844
2587 my $map = eval { 2845 my $map = eval {
2588 my $map = defined $path ? cf::map::find $path : undef; 2846 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2589 2847
2590 if ($map) { 2848 if ($map) {
2591 $map = $map->customise_for ($self); 2849 $map = $map->customise_for ($self);
2592 $map = $check->($map) if $check && $map; 2850 $map = $check->($map, $x, $y, $self) if $check && $map;
2593 } else { 2851 } else {
2594 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2852 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2595 } 2853 }
2596 2854
2597 $map 2855 $map
2605 if ($gen == $self->{_goto_generation}) { 2863 if ($gen == $self->{_goto_generation}) {
2606 delete $self->{_goto_generation}; 2864 delete $self->{_goto_generation};
2607 $self->leave_link ($map, $x, $y); 2865 $self->leave_link ($map, $x, $y);
2608 } 2866 }
2609 2867
2610 $done->() if $done; 2868 $done->($self) if $done;
2611 })->prio (1); 2869 })->prio (1);
2612} 2870}
2613 2871
2614=item $player_object->enter_exit ($exit_object) 2872=item $player_object->enter_exit ($exit_object)
2615 2873
2683 $Coro::current->{desc} = "enter_exit"; 2941 $Coro::current->{desc} = "enter_exit";
2684 2942
2685 unless (eval { 2943 unless (eval {
2686 $self->deactivate_recursive; # just to be sure 2944 $self->deactivate_recursive; # just to be sure
2687 2945
2688 # random map handling
2689 {
2690 my $guard = cf::lock_acquire "exit_prepare:$exit";
2691
2692 prepare_random_map $exit
2693 if $exit->slaying eq "/!";
2694 }
2695
2696 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2946 my $map = cf::map::normalise $exit->slaying, $exit->map;
2697 my $x = $exit->stats->hp; 2947 my $x = $exit->stats->hp;
2698 my $y = $exit->stats->sp; 2948 my $y = $exit->stats->sp;
2949
2950 # special map handling
2951 my $slaying = $exit->slaying;
2952
2953 # special map handling
2954 if ($slaying eq "/!") {
2955 my $guard = cf::lock_acquire "exit_prepare:$exit";
2956
2957 prepare_random_map $exit
2958 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2959
2960 $map = $exit->slaying;
2961
2962 } elsif ($slaying eq '!up') {
2963 $map = $exit->map->tile_path (cf::TILE_UP);
2964 $x = $exit->x;
2965 $y = $exit->y;
2966
2967 } elsif ($slaying eq '!down') {
2968 $map = $exit->map->tile_path (cf::TILE_DOWN);
2969 $x = $exit->x;
2970 $y = $exit->y;
2971 }
2699 2972
2700 $self->goto ($map, $x, $y); 2973 $self->goto ($map, $x, $y);
2701 2974
2702 # if exit is damned, update players death & WoR home-position 2975 # if exit is damned, update players death & WoR home-position
2703 $self->contr->savebed ($map, $x, $y) 2976 $self->contr->savebed ($map, $x, $y)
2708 $self->message ("Something went wrong deep within the deliantra server. " 2981 $self->message ("Something went wrong deep within the deliantra server. "
2709 . "I'll try to bring you back to the map you were before. " 2982 . "I'll try to bring you back to the map you were before. "
2710 . "Please report this to the dungeon master!", 2983 . "Please report this to the dungeon master!",
2711 cf::NDI_UNIQUE | cf::NDI_RED); 2984 cf::NDI_UNIQUE | cf::NDI_RED);
2712 2985
2713 warn "ERROR in enter_exit: $@"; 2986 error "ERROR in enter_exit: $@";
2714 $self->leave_link; 2987 $self->leave_link;
2715 } 2988 }
2716 })->prio (1); 2989 })->prio (1);
2717} 2990}
2718 2991
2730sub cf::client::send_drawinfo { 3003sub cf::client::send_drawinfo {
2731 my ($self, $text, $flags) = @_; 3004 my ($self, $text, $flags) = @_;
2732 3005
2733 utf8::encode $text; 3006 utf8::encode $text;
2734 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3007 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3008}
3009
3010=item $client->send_big_packet ($pkt)
3011
3012Like C<send_packet>, but tries to compress large packets, and fragments
3013them as required.
3014
3015=cut
3016
3017our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3018
3019sub cf::client::send_big_packet {
3020 my ($self, $pkt) = @_;
3021
3022 # try lzf for large packets
3023 $pkt = "lzf " . Compress::LZF::compress $pkt
3024 if 1024 <= length $pkt and $self->{can_lzf};
3025
3026 # split very large packets
3027 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3028 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3029 $pkt = "frag";
3030 }
3031
3032 $self->send_packet ($pkt);
2735} 3033}
2736 3034
2737=item $client->send_msg ($channel, $msg, $color, [extra...]) 3035=item $client->send_msg ($channel, $msg, $color, [extra...])
2738 3036
2739Send a drawinfo or msg packet to the client, formatting the msg for the 3037Send a drawinfo or msg packet to the client, formatting the msg for the
2743 3041
2744=cut 3042=cut
2745 3043
2746# non-persistent channels (usually the info channel) 3044# non-persistent channels (usually the info channel)
2747our %CHANNEL = ( 3045our %CHANNEL = (
3046 "c/motd" => {
3047 id => "infobox",
3048 title => "MOTD",
3049 reply => undef,
3050 tooltip => "The message of the day",
3051 },
2748 "c/identify" => { 3052 "c/identify" => {
2749 id => "infobox", 3053 id => "infobox",
2750 title => "Identify", 3054 title => "Identify",
2751 reply => undef, 3055 reply => undef,
2752 tooltip => "Items recently identified", 3056 tooltip => "Items recently identified",
2754 "c/examine" => { 3058 "c/examine" => {
2755 id => "infobox", 3059 id => "infobox",
2756 title => "Examine", 3060 title => "Examine",
2757 reply => undef, 3061 reply => undef,
2758 tooltip => "Signs and other items you examined", 3062 tooltip => "Signs and other items you examined",
3063 },
3064 "c/shopinfo" => {
3065 id => "infobox",
3066 title => "Shop Info",
3067 reply => undef,
3068 tooltip => "What your bargaining skill tells you about the shop",
2759 }, 3069 },
2760 "c/book" => { 3070 "c/book" => {
2761 id => "infobox", 3071 id => "infobox",
2762 title => "Book", 3072 title => "Book",
2763 reply => undef, 3073 reply => undef,
2879 my $pkt = "msg " 3189 my $pkt = "msg "
2880 . $self->{json_coder}->encode ( 3190 . $self->{json_coder}->encode (
2881 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3191 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2882 ); 3192 );
2883 3193
2884 # try lzf for large packets
2885 $pkt = "lzf " . Compress::LZF::compress $pkt
2886 if 1024 <= length $pkt and $self->{can_lzf};
2887
2888 # split very large packets
2889 if (8192 < length $pkt and $self->{can_lzf}) {
2890 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2891 $pkt = "frag";
2892 }
2893
2894 $self->send_packet ($pkt); 3194 $self->send_big_packet ($pkt);
2895} 3195}
2896 3196
2897=item $client->ext_msg ($type, @msg) 3197=item $client->ext_msg ($type, @msg)
2898 3198
2899Sends an ext event to the client. 3199Sends an ext event to the client.
2902 3202
2903sub cf::client::ext_msg($$@) { 3203sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3204 my ($self, $type, @msg) = @_;
2905 3205
2906 if ($self->extcmd == 2) { 3206 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3207 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove 3208 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type"; 3209 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3210 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3211 }
2912} 3212}
2913 3213
2914=item $client->ext_reply ($msgid, @msg) 3214=item $client->ext_reply ($msgid, @msg)
2915 3215
2919 3219
2920sub cf::client::ext_reply($$@) { 3220sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_; 3221 my ($self, $id, @msg) = @_;
2922 3222
2923 if ($self->extcmd == 2) { 3223 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3224 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) { 3225 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove 3226 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id; 3227 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3228 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3229 }
2930} 3230}
2931 3231
2932=item $success = $client->query ($flags, "text", \&cb) 3232=item $success = $client->query ($flags, "text", \&cb)
2933 3233
3004 3304
3005 $ns->ext_reply ($reply, @reply) 3305 $ns->ext_reply ($reply, @reply)
3006 if $reply; 3306 if $reply;
3007 3307
3008 } else { 3308 } else {
3009 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3309 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3010 } 3310 }
3011 3311
3012 cf::override; 3312 cf::override;
3013 }, 3313 },
3014); 3314);
3034 3334
3035 $coro 3335 $coro
3036} 3336}
3037 3337
3038cf::client->attach ( 3338cf::client->attach (
3039 on_destroy => sub { 3339 on_client_destroy => sub {
3040 my ($ns) = @_; 3340 my ($ns) = @_;
3041 3341
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3342 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3343 },
3044); 3344);
3060our $safe_hole = new Safe::Hole; 3360our $safe_hole = new Safe::Hole;
3061 3361
3062$SIG{FPE} = 'IGNORE'; 3362$SIG{FPE} = 'IGNORE';
3063 3363
3064$safe->permit_only (Opcode::opset qw( 3364$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3365 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3366 grepstart grepwhile mapstart mapwhile
3067 sort time 3367 sort time
3068)); 3368));
3069 3369
3070# here we export the classes and methods available to script code 3370# here we export the classes and methods available to script code
3095 decrease split destroy change_exp value msg lore send_msg)], 3395 decrease split destroy change_exp value msg lore send_msg)],
3096 ["cf::object::player" => qw(player)], 3396 ["cf::object::player" => qw(player)],
3097 ["cf::player" => qw(peaceful send_msg)], 3397 ["cf::player" => qw(peaceful send_msg)],
3098 ["cf::map" => qw(trigger)], 3398 ["cf::map" => qw(trigger)],
3099) { 3399) {
3100 no strict 'refs';
3101 my ($pkg, @funs) = @$_; 3400 my ($pkg, @funs) = @$_;
3102 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3401 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3103 for @funs; 3402 for @funs;
3104} 3403}
3105 3404
3122 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3421 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3123 $qcode =~ s/\n/\\n/g; 3422 $qcode =~ s/\n/\\n/g;
3124 3423
3125 %vars = (_dummy => 0) unless %vars; 3424 %vars = (_dummy => 0) unless %vars;
3126 3425
3426 my @res;
3127 local $_; 3427 local $_;
3128 local @safe::cf::_safe_eval_args = values %vars;
3129 3428
3130 my $eval = 3429 my $eval =
3131 "do {\n" 3430 "do {\n"
3132 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3431 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3133 . "#line 0 \"{$qcode}\"\n" 3432 . "#line 0 \"{$qcode}\"\n"
3134 . $code 3433 . $code
3135 . "\n}" 3434 . "\n}"
3136 ; 3435 ;
3137 3436
3437 if ($CFG{safe_eval}) {
3138 sub_generation_inc; 3438 sub_generation_inc;
3439 local @safe::cf::_safe_eval_args = values %vars;
3139 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3440 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3140 sub_generation_inc; 3441 sub_generation_inc;
3442 } else {
3443 local @cf::_safe_eval_args = values %vars;
3444 @res = wantarray ? eval eval : scalar eval $eval;
3445 }
3141 3446
3142 if ($@) { 3447 if ($@) {
3143 warn "$@"; 3448 warn "$@",
3144 warn "while executing safe code '$code'\n"; 3449 "while executing safe code '$code'\n",
3145 warn "with arguments " . (join " ", %vars) . "\n"; 3450 "with arguments " . (join " ", %vars) . "\n";
3146 } 3451 }
3147 3452
3148 wantarray ? @res : $res[0] 3453 wantarray ? @res : $res[0]
3149} 3454}
3150 3455
3164=cut 3469=cut
3165 3470
3166sub register_script_function { 3471sub register_script_function {
3167 my ($fun, $cb) = @_; 3472 my ($fun, $cb) = @_;
3168 3473
3169 no strict 'refs'; 3474 $fun = "safe::$fun" if $CFG{safe_eval};
3170 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3475 *$fun = $safe_hole->wrap ($cb);
3171} 3476}
3172 3477
3173=back 3478=back
3174 3479
3175=cut 3480=cut
3184 # for this (global event?) 3489 # for this (global event?)
3185 %ext::player_env::MUSIC_FACE_CACHE = (); 3490 %ext::player_env::MUSIC_FACE_CACHE = ();
3186 3491
3187 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3492 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3188 3493
3189 warn "loading facedata from $path\n"; 3494 trace "loading facedata from $path\n";
3190 3495
3191 my $facedata; 3496 my $facedata = decode_storable load_file $path;
3192 0 < aio_load $path, $facedata
3193 or die "$path: $!";
3194
3195 $facedata = Coro::Storable::thaw $facedata;
3196 3497
3197 $facedata->{version} == 2 3498 $facedata->{version} == 2
3198 or cf::cleanup "$path: version mismatch, cannot proceed."; 3499 or cf::cleanup "$path: version mismatch, cannot proceed.";
3199 3500
3200 # patch in the exptable 3501 # patch in the exptable
3502 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3201 $facedata->{resource}{"res/exp_table"} = { 3503 $facedata->{resource}{"res/exp_table"} = {
3202 type => FT_RSRC, 3504 type => FT_RSRC,
3203 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3505 data => $exp_table,
3506 hash => (Digest::MD5::md5 $exp_table),
3204 }; 3507 };
3205 cf::cede_to_tick; 3508 cf::cede_to_tick;
3206 3509
3207 { 3510 {
3208 my $faces = $facedata->{faceinfo}; 3511 my $faces = $facedata->{faceinfo};
3210 while (my ($face, $info) = each %$faces) { 3513 while (my ($face, $info) = each %$faces) {
3211 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3514 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212 3515
3213 cf::face::set_visibility $idx, $info->{visibility}; 3516 cf::face::set_visibility $idx, $info->{visibility};
3214 cf::face::set_magicmap $idx, $info->{magicmap}; 3517 cf::face::set_magicmap $idx, $info->{magicmap};
3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3518 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3519 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3520 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3217 3521
3218 cf::cede_to_tick; 3522 cf::cede_to_tick;
3219 } 3523 }
3220 3524
3221 while (my ($face, $info) = each %$faces) { 3525 while (my ($face, $info) = each %$faces) {
3226 3530
3227 if (my $smooth = cf::face::find $info->{smooth}) { 3531 if (my $smooth = cf::face::find $info->{smooth}) {
3228 cf::face::set_smooth $idx, $smooth; 3532 cf::face::set_smooth $idx, $smooth;
3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3533 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3230 } else { 3534 } else {
3231 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3535 error "smooth face '$info->{smooth}' not found for face '$face'";
3232 } 3536 }
3233 3537
3234 cf::cede_to_tick; 3538 cf::cede_to_tick;
3235 } 3539 }
3236 } 3540 }
3245 3549
3246 cf::anim::invalidate_all; # d'oh 3550 cf::anim::invalidate_all; # d'oh
3247 } 3551 }
3248 3552
3249 { 3553 {
3250 # TODO: for gcfclient pleasure, we should give resources
3251 # that gcfclient doesn't grok a >10000 face index.
3252 my $res = $facedata->{resource}; 3554 my $res = $facedata->{resource};
3253 3555
3254 while (my ($name, $info) = each %$res) { 3556 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) { 3557 if (defined $info->{type}) {
3256 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3558 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
3258 3559
3259 if ($info->{type} & 1) { 3560 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3260 # prepend meta info
3261
3262 my $meta = $enc->encode ({
3263 name => $name,
3264 %{ $info->{meta} || {} },
3265 });
3266
3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type}; 3561 cf::face::set_type $idx, $info->{type};
3274 } else { 3562 } else {
3275 $RESOURCE{$name} = $info; 3563 $RESOURCE{$name} = $info; # unused
3276 } 3564 }
3277 3565
3278 cf::cede_to_tick; 3566 cf::cede_to_tick;
3279 } 3567 }
3280 } 3568 }
3281 3569
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3570 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3283 3571
3284 1 3572 1
3285} 3573}
3286
3287cf::global->attach (on_resource_update => sub {
3288 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3289 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3290
3291 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3292 my $sound = $soundconf->{compat}[$_]
3293 or next;
3294
3295 my $face = cf::face::find "sound/$sound->[1]";
3296 cf::sound::set $sound->[0] => $face;
3297 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3298 }
3299
3300 while (my ($k, $v) = each %{$soundconf->{event}}) {
3301 my $face = cf::face::find "sound/$v";
3302 cf::sound::set $k => $face;
3303 }
3304 }
3305});
3306 3574
3307register_exticmd fx_want => sub { 3575register_exticmd fx_want => sub {
3308 my ($ns, $want) = @_; 3576 my ($ns, $want) = @_;
3309 3577
3310 while (my ($k, $v) = each %$want) { 3578 while (my ($k, $v) = each %$want) {
3349sub reload_treasures { 3617sub reload_treasures {
3350 load_resource_file "$DATADIR/treasures" 3618 load_resource_file "$DATADIR/treasures"
3351 or die "unable to load treasurelists\n"; 3619 or die "unable to load treasurelists\n";
3352} 3620}
3353 3621
3622sub reload_sound {
3623 trace "loading sound config from $DATADIR/sound\n";
3624
3625 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3626
3627 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3628 my $sound = $soundconf->{compat}[$_]
3629 or next;
3630
3631 my $face = cf::face::find "sound/$sound->[1]";
3632 cf::sound::set $sound->[0] => $face;
3633 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3634 }
3635
3636 while (my ($k, $v) = each %{$soundconf->{event}}) {
3637 my $face = cf::face::find "sound/$v";
3638 cf::sound::set $k => $face;
3639 }
3640}
3641
3354sub reload_resources { 3642sub reload_resources {
3355 warn "reloading resource files...\n"; 3643 trace "reloading resource files...\n";
3356 3644
3645 reload_exp_table;
3646 reload_materials;
3357 reload_facedata; 3647 reload_facedata;
3648 reload_sound;
3358 reload_archetypes; 3649 reload_archetypes;
3359 reload_regions; 3650 reload_regions;
3360 reload_treasures; 3651 reload_treasures;
3361 3652
3362 warn "finished reloading resource files\n"; 3653 trace "finished reloading resource files\n";
3363} 3654}
3364 3655
3365sub reload_config { 3656sub reload_config {
3366 open my $fh, "<:utf8", "$CONFDIR/config" 3657 trace "reloading config file...\n";
3367 or return;
3368 3658
3369 local $/; 3659 my $config = load_file "$CONFDIR/config";
3370 *CFG = YAML::Load <$fh>; 3660 utf8::decode $config;
3661 *CFG = decode_yaml $config;
3371 3662
3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3663 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3373 3664
3374 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3665 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3375 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3666 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3376 3667
3377 if (exists $CFG{mlockall}) { 3668 if (exists $CFG{mlockall}) {
3400 3691
3401 seek $fh, 0, 0; 3692 seek $fh, 0, 0;
3402 print $fh $$; 3693 print $fh $$;
3403} 3694}
3404 3695
3696sub main_loop {
3697 trace "EV::loop starting\n";
3698 if (1) {
3699 EV::loop;
3700 }
3701 trace "EV::loop returned\n";
3702 goto &main_loop unless $REALLY_UNLOOP;
3703}
3704
3405sub main { 3705sub main {
3406 cf::init_globals; # initialise logging 3706 cf::init_globals; # initialise logging
3407 3707
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3708 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3709 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3710 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3711 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417 3712
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3713 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 3714
3420 # we must not ever block the main coroutine 3715 # we must not ever block the main coroutine
3421 local $Coro::idle = sub { 3716 local $Coro::idle = sub {
3427 }; 3722 };
3428 3723
3429 evthread_start IO::AIO::poll_fileno; 3724 evthread_start IO::AIO::poll_fileno;
3430 3725
3431 cf::sync_job { 3726 cf::sync_job {
3727 cf::incloader::init ();
3728
3729 cf::init_anim;
3730 cf::init_attackmess;
3731 cf::init_dynamic;
3732
3733 cf::load_settings;
3734
3432 reload_resources; 3735 reload_resources;
3433 reload_config; 3736 reload_config;
3434 db_init; 3737 db_init;
3435 3738
3436 cf::load_settings;
3437 cf::load_materials;
3438 cf::init_uuid; 3739 cf::init_uuid;
3439 cf::init_signals; 3740 cf::init_signals;
3440 cf::init_commands;
3441 cf::init_skills; 3741 cf::init_skills;
3442 3742
3443 cf::init_beforeplay; 3743 cf::init_beforeplay;
3444 3744
3445 atomic; 3745 atomic;
3447 load_extensions; 3747 load_extensions;
3448 3748
3449 utime time, time, $RUNTIMEFILE; 3749 utime time, time, $RUNTIMEFILE;
3450 3750
3451 # no (long-running) fork's whatsoever before this point(!) 3751 # no (long-running) fork's whatsoever before this point(!)
3752 use POSIX ();
3452 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3753 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3453 3754
3454 (pop @POST_INIT)->(0) while @POST_INIT; 3755 cf::_post_init 0;
3455 }; 3756 };
3456 3757
3457 EV::loop; 3758 cf::object::thawer::errors_are_fatal 0;
3759 info "parse errors in files are no longer fatal from this point on.\n";
3760
3761 my $free_main; $free_main = EV::idle sub {
3762 undef $free_main;
3763 undef &main; # free gobs of memory :)
3764 };
3765
3766 goto &main_loop;
3458} 3767}
3459 3768
3460############################################################################# 3769#############################################################################
3461# initialisation and cleanup 3770# initialisation and cleanup
3462 3771
3463# install some emergency cleanup handlers 3772# install some emergency cleanup handlers
3464BEGIN { 3773BEGIN {
3465 our %SIGWATCHER = (); 3774 our %SIGWATCHER = ();
3466 for my $signal (qw(INT HUP TERM)) { 3775 for my $signal (qw(INT HUP TERM)) {
3467 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3776 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3468 cf::cleanup "SIG$signal"; 3777 cf::cleanup "SIG$signal";
3469 }; 3778 };
3470 } 3779 }
3471} 3780}
3472 3781
3473sub write_runtime_sync { 3782sub write_runtime_sync {
3783 my $t0 = AE::time;
3784
3474 # first touch the runtime file to show we are still running: 3785 # first touch the runtime file to show we are still running:
3475 # the fsync below can take a very very long time. 3786 # the fsync below can take a very very long time.
3476 3787
3477 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3788 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3478 3789
3479 my $guard = cf::lock_acquire "write_runtime"; 3790 my $guard = cf::lock_acquire "write_runtime";
3480 3791
3481 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3792 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3482 or return; 3793 or return;
3483 3794
3484 my $value = $cf::RUNTIME + 90 + 10; 3795 my $value = $cf::RUNTIME + 90 + 10;
3485 # 10 is the runtime save interval, for a monotonic clock 3796 # 10 is the runtime save interval, for a monotonic clock
3486 # 60 allows for the watchdog to kill the server. 3797 # 60 allows for the watchdog to kill the server.
3499 or return; 3810 or return;
3500 3811
3501 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3812 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3502 and return; 3813 and return;
3503 3814
3504 warn "runtime file written.\n"; 3815 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3505 3816
3506 1 3817 1
3507} 3818}
3508 3819
3509our $uuid_lock; 3820our $uuid_lock;
3521 or return; 3832 or return;
3522 3833
3523 my $value = uuid_seq uuid_cur; 3834 my $value = uuid_seq uuid_cur;
3524 3835
3525 unless ($value) { 3836 unless ($value) {
3526 warn "cowardly refusing to write zero uuid value!\n"; 3837 info "cowardly refusing to write zero uuid value!\n";
3527 return; 3838 return;
3528 } 3839 }
3529 3840
3530 my $value = uuid_str $value + $uuid_skip; 3841 my $value = uuid_str $value + $uuid_skip;
3531 $uuid_skip = 0; 3842 $uuid_skip = 0;
3541 or return; 3852 or return;
3542 3853
3543 aio_rename "$uuid~", $uuid 3854 aio_rename "$uuid~", $uuid
3544 and return; 3855 and return;
3545 3856
3546 warn "uuid file written ($value).\n"; 3857 trace "uuid file written ($value).\n";
3547 3858
3548 1 3859 1
3549 3860
3550} 3861}
3551 3862
3557} 3868}
3558 3869
3559sub emergency_save() { 3870sub emergency_save() {
3560 my $freeze_guard = cf::freeze_mainloop; 3871 my $freeze_guard = cf::freeze_mainloop;
3561 3872
3562 warn "emergency_perl_save: enter\n"; 3873 info "emergency_perl_save: enter\n";
3874
3875 # this is a trade-off: we want to be very quick here, so
3876 # save all maps without fsync, and later call a global sync
3877 # (which in turn might be very very slow)
3878 local $USE_FSYNC = 0;
3563 3879
3564 cf::sync_job { 3880 cf::sync_job {
3565 # this is a trade-off: we want to be very quick here, so 3881 cf::write_runtime_sync; # external watchdog should not bark
3566 # save all maps without fsync, and later call a global sync
3567 # (which in turn might be very very slow)
3568 local $USE_FSYNC = 0;
3569 3882
3570 # use a peculiar iteration method to avoid tripping on perl 3883 # use a peculiar iteration method to avoid tripping on perl
3571 # refcount bugs in for. also avoids problems with players 3884 # refcount bugs in for. also avoids problems with players
3572 # and maps saved/destroyed asynchronously. 3885 # and maps saved/destroyed asynchronously.
3573 warn "emergency_perl_save: begin player save\n"; 3886 info "emergency_perl_save: begin player save\n";
3574 for my $login (keys %cf::PLAYER) { 3887 for my $login (keys %cf::PLAYER) {
3575 my $pl = $cf::PLAYER{$login} or next; 3888 my $pl = $cf::PLAYER{$login} or next;
3576 $pl->valid or next; 3889 $pl->valid or next;
3577 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3890 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3578 $pl->save; 3891 $pl->save;
3579 } 3892 }
3580 warn "emergency_perl_save: end player save\n"; 3893 info "emergency_perl_save: end player save\n";
3581 3894
3895 cf::write_runtime_sync; # external watchdog should not bark
3896
3582 warn "emergency_perl_save: begin map save\n"; 3897 info "emergency_perl_save: begin map save\n";
3583 for my $path (keys %cf::MAP) { 3898 for my $path (keys %cf::MAP) {
3584 my $map = $cf::MAP{$path} or next; 3899 my $map = $cf::MAP{$path} or next;
3585 $map->valid or next; 3900 $map->valid or next;
3586 $map->save; 3901 $map->save;
3587 } 3902 }
3588 warn "emergency_perl_save: end map save\n"; 3903 info "emergency_perl_save: end map save\n";
3589 3904
3905 cf::write_runtime_sync; # external watchdog should not bark
3906
3590 warn "emergency_perl_save: begin database checkpoint\n"; 3907 info "emergency_perl_save: begin database checkpoint\n";
3591 BDB::db_env_txn_checkpoint $DB_ENV; 3908 BDB::db_env_txn_checkpoint $DB_ENV;
3592 warn "emergency_perl_save: end database checkpoint\n"; 3909 info "emergency_perl_save: end database checkpoint\n";
3593 3910
3594 warn "emergency_perl_save: begin write uuid\n"; 3911 info "emergency_perl_save: begin write uuid\n";
3595 write_uuid_sync 1; 3912 write_uuid_sync 1;
3596 warn "emergency_perl_save: end write uuid\n"; 3913 info "emergency_perl_save: end write uuid\n";
3914
3915 cf::write_runtime_sync; # external watchdog should not bark
3916
3917 trace "emergency_perl_save: syncing database to disk";
3918 BDB::db_env_txn_checkpoint $DB_ENV;
3919
3920 info "emergency_perl_save: starting sync\n";
3921 IO::AIO::aio_sync sub {
3922 info "emergency_perl_save: finished sync\n";
3923 };
3924
3925 cf::write_runtime_sync; # external watchdog should not bark
3926
3927 trace "emergency_perl_save: flushing outstanding aio requests";
3928 while (IO::AIO::nreqs || BDB::nreqs) {
3929 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3930 }
3931
3932 cf::write_runtime_sync; # external watchdog should not bark
3597 }; 3933 };
3598 3934
3599 warn "emergency_perl_save: starting sync()\n";
3600 IO::AIO::aio_sync sub {
3601 warn "emergency_perl_save: finished sync()\n";
3602 };
3603
3604 warn "emergency_perl_save: leave\n"; 3935 info "emergency_perl_save: leave\n";
3605} 3936}
3606 3937
3607sub post_cleanup { 3938sub post_cleanup {
3608 my ($make_core) = @_; 3939 my ($make_core) = @_;
3609 3940
3941 IO::AIO::flush;
3942
3610 warn Carp::longmess "post_cleanup backtrace" 3943 error Carp::longmess "post_cleanup backtrace"
3611 if $make_core; 3944 if $make_core;
3612 3945
3613 my $fh = pidfile; 3946 my $fh = pidfile;
3614 unlink $PIDFILE if <$fh> == $$; 3947 unlink $PIDFILE if <$fh> == $$;
3615} 3948}
3635 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3968 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3636 for my $name (keys %$leaf_symtab) { 3969 for my $name (keys %$leaf_symtab) {
3637 _gv_clear *{"$pkg$name"}; 3970 _gv_clear *{"$pkg$name"};
3638# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3971# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3639 } 3972 }
3640 warn "cleared package $pkg\n";#d#
3641} 3973}
3642 3974
3643sub do_reload_perl() { 3975sub do_reload_perl() {
3644 # can/must only be called in main 3976 # can/must only be called in main
3645 if ($Coro::current != $Coro::main) { 3977 unless (in_main) {
3646 warn "can only reload from main coroutine"; 3978 error "can only reload from main coroutine";
3647 return; 3979 return;
3648 } 3980 }
3649 3981
3650 return if $RELOAD++; 3982 return if $RELOAD++;
3651 3983
3652 my $t1 = EV::time; 3984 my $t1 = AE::time;
3653 3985
3654 while ($RELOAD) { 3986 while ($RELOAD) {
3655 warn "reloading..."; 3987 cf::get_slot 0.1, -1, "reload_perl";
3988 info "perl_reload: reloading...";
3656 3989
3657 warn "entering sync_job"; 3990 trace "perl_reload: entering sync_job";
3658 3991
3659 cf::sync_job { 3992 cf::sync_job {
3660 cf::write_runtime_sync; # external watchdog should not bark
3661 cf::emergency_save; 3993 #cf::emergency_save;
3662 cf::write_runtime_sync; # external watchdog should not bark
3663 3994
3664 warn "syncing database to disk";
3665 BDB::db_env_txn_checkpoint $DB_ENV;
3666
3667 # if anything goes wrong in here, we should simply crash as we already saved
3668
3669 warn "flushing outstanding aio requests";
3670 while (IO::AIO::nreqs || BDB::nreqs) {
3671 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3672 }
3673
3674 warn "cancelling all extension coros"; 3995 trace "perl_reload: cancelling all extension coros";
3675 $_->cancel for values %EXT_CORO; 3996 $_->cancel for values %EXT_CORO;
3676 %EXT_CORO = (); 3997 %EXT_CORO = ();
3677 3998
3678 warn "removing commands"; 3999 trace "perl_reload: removing commands";
3679 %COMMAND = (); 4000 %COMMAND = ();
3680 4001
3681 warn "removing ext/exti commands"; 4002 trace "perl_reload: removing ext/exti commands";
3682 %EXTCMD = (); 4003 %EXTCMD = ();
3683 %EXTICMD = (); 4004 %EXTICMD = ();
3684 4005
3685 warn "unloading/nuking all extensions"; 4006 trace "perl_reload: unloading/nuking all extensions";
3686 for my $pkg (@EXTS) { 4007 for my $pkg (@EXTS) {
3687 warn "... unloading $pkg"; 4008 trace "... unloading $pkg";
3688 4009
3689 if (my $cb = $pkg->can ("unload")) { 4010 if (my $cb = $pkg->can ("unload")) {
3690 eval { 4011 eval {
3691 $cb->($pkg); 4012 $cb->($pkg);
3692 1 4013 1
3693 } or warn "$pkg unloaded, but with errors: $@"; 4014 } or error "$pkg unloaded, but with errors: $@";
3694 } 4015 }
3695 4016
3696 warn "... clearing $pkg"; 4017 trace "... clearing $pkg";
3697 clear_package $pkg; 4018 clear_package $pkg;
3698 } 4019 }
3699 4020
3700 warn "unloading all perl modules loaded from $LIBDIR"; 4021 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3701 while (my ($k, $v) = each %INC) { 4022 while (my ($k, $v) = each %INC) {
3702 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4023 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3703 4024
3704 warn "... unloading $k"; 4025 trace "... unloading $k";
3705 delete $INC{$k}; 4026 delete $INC{$k};
3706 4027
3707 $k =~ s/\.pm$//; 4028 $k =~ s/\.pm$//;
3708 $k =~ s/\//::/g; 4029 $k =~ s/\//::/g;
3709 4030
3712 } 4033 }
3713 4034
3714 clear_package $k; 4035 clear_package $k;
3715 } 4036 }
3716 4037
3717 warn "getting rid of safe::, as good as possible"; 4038 trace "perl_reload: getting rid of safe::, as good as possible";
3718 clear_package "safe::$_" 4039 clear_package "safe::$_"
3719 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4040 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3720 4041
3721 warn "unloading cf.pm \"a bit\""; 4042 trace "perl_reload: unloading cf.pm \"a bit\"";
3722 delete $INC{"cf.pm"}; 4043 delete $INC{"cf.pm"};
3723 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4044 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3724 4045
3725 # don't, removes xs symbols, too, 4046 # don't, removes xs symbols, too,
3726 # and global variables created in xs 4047 # and global variables created in xs
3727 #clear_package __PACKAGE__; 4048 #clear_package __PACKAGE__;
3728 4049
3729 warn "unload completed, starting to reload now"; 4050 info "perl_reload: unload completed, starting to reload now";
3730 4051
3731 warn "reloading cf.pm"; 4052 trace "perl_reload: reloading cf.pm";
3732 require cf; 4053 require cf;
3733 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4054 cf::_connect_to_perl_1;
3734 4055
3735 warn "loading config and database again"; 4056 trace "perl_reload: loading config and database again";
3736 cf::reload_config; 4057 cf::reload_config;
3737 4058
3738 warn "loading extensions"; 4059 trace "perl_reload: loading extensions";
3739 cf::load_extensions; 4060 cf::load_extensions;
3740 4061
3741 if ($REATTACH_ON_RELOAD) { 4062 if ($REATTACH_ON_RELOAD) {
3742 warn "reattaching attachments to objects/players"; 4063 trace "perl_reload: reattaching attachments to objects/players";
3743 _global_reattach; # objects, sockets 4064 _global_reattach; # objects, sockets
3744 warn "reattaching attachments to maps"; 4065 trace "perl_reload: reattaching attachments to maps";
3745 reattach $_ for values %MAP; 4066 reattach $_ for values %MAP;
3746 warn "reattaching attachments to players"; 4067 trace "perl_reload: reattaching attachments to players";
3747 reattach $_ for values %PLAYER; 4068 reattach $_ for values %PLAYER;
3748 } 4069 }
3749 4070
3750 warn "running post_init jobs"; 4071 cf::_post_init 1;
3751 (pop @POST_INIT)->(1) while @POST_INIT;
3752 4072
3753 warn "leaving sync_job"; 4073 trace "perl_reload: leaving sync_job";
3754 4074
3755 1 4075 1
3756 } or do { 4076 } or do {
3757 warn $@; 4077 error $@;
3758 cf::cleanup "error while reloading, exiting."; 4078 cf::cleanup "perl_reload: error, exiting.";
3759 }; 4079 };
3760 4080
3761 warn "reloaded";
3762 --$RELOAD; 4081 --$RELOAD;
3763 } 4082 }
3764 4083
3765 $t1 = EV::time - $t1; 4084 $t1 = AE::time - $t1;
3766 warn "reload completed in ${t1}s\n"; 4085 info "perl_reload: completed in ${t1}s\n";
3767}; 4086};
3768 4087
3769our $RELOAD_WATCHER; # used only during reload 4088our $RELOAD_WATCHER; # used only during reload
3770 4089
3771sub reload_perl() { 4090sub reload_perl() {
3773 # coro crashes during coro_state_free->destroy here. 4092 # coro crashes during coro_state_free->destroy here.
3774 4093
3775 $RELOAD_WATCHER ||= cf::async { 4094 $RELOAD_WATCHER ||= cf::async {
3776 Coro::AIO::aio_wait cache_extensions; 4095 Coro::AIO::aio_wait cache_extensions;
3777 4096
3778 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4097 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3779 do_reload_perl; 4098 do_reload_perl;
3780 undef $RELOAD_WATCHER; 4099 undef $RELOAD_WATCHER;
3781 }; 4100 };
3782 }; 4101 };
3783} 4102}
3792 reload_perl; 4111 reload_perl;
3793 }; 4112 };
3794 } 4113 }
3795}; 4114};
3796 4115
3797unshift @INC, $LIBDIR; 4116#############################################################################
3798 4117
3799my $bug_warning = 0; 4118my $bug_warning = 0;
3800 4119
3801our @WAIT_FOR_TICK;
3802our @WAIT_FOR_TICK_BEGIN;
3803
3804sub wait_for_tick { 4120sub wait_for_tick() {
3805 return if tick_inhibit || $Coro::current == $Coro::main; 4121 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3806 4122
3807 my $signal = new Coro::Signal; 4123 $WAIT_FOR_TICK->wait;
3808 push @WAIT_FOR_TICK, $signal;
3809 $signal->wait;
3810} 4124}
3811 4125
3812sub wait_for_tick_begin { 4126sub wait_for_tick_begin() {
3813 return if tick_inhibit || $Coro::current == $Coro::main; 4127 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3814 4128
3815 my $signal = new Coro::Signal; 4129 my $signal = new Coro::Signal;
3816 push @WAIT_FOR_TICK_BEGIN, $signal; 4130 push @WAIT_FOR_TICK_BEGIN, $signal;
3817 $signal->wait; 4131 $signal->wait;
3818} 4132}
3822 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4136 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3823 unless ++$bug_warning > 10; 4137 unless ++$bug_warning > 10;
3824 return; 4138 return;
3825 } 4139 }
3826 4140
3827 cf::server_tick; # one server iteration 4141 cf::one_tick; # one server iteration
4142
4143 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3828 4144
3829 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4145 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3830 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4146 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3831 Coro::async_pool { 4147 Coro::async_pool {
3832 $Coro::current->{desc} = "runtime saver"; 4148 $Coro::current->{desc} = "runtime saver";
3833 write_runtime_sync 4149 write_runtime_sync
3834 or warn "ERROR: unable to write runtime file: $!"; 4150 or error "ERROR: unable to write runtime file: $!";
3835 }; 4151 };
3836 } 4152 }
3837 4153
3838 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4154 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3839 $sig->send; 4155 $sig->send;
3840 } 4156 }
3841 while (my $sig = shift @WAIT_FOR_TICK) { 4157 $WAIT_FOR_TICK->broadcast;
3842 $sig->send;
3843 }
3844 4158
3845 $LOAD = ($NOW - $TICK_START) / $TICK; 4159 $LOAD = ($NOW - $TICK_START) / $TICK;
3846 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4160 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3847 4161
3848 if (0) { 4162 if (0) {
3849 if ($NEXT_TICK) { 4163 if ($NEXT_TICK) {
3850 my $jitter = $TICK_START - $NEXT_TICK; 4164 my $jitter = $TICK_START - $NEXT_TICK;
3851 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4165 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3852 warn "jitter $JITTER\n";#d# 4166 debug "jitter $JITTER\n";#d#
3853 } 4167 }
3854 } 4168 }
3855} 4169}
3856 4170
3857{ 4171{
3858 # configure BDB 4172 # configure BDB
3859 4173
3860 BDB::min_parallel 8; 4174 BDB::min_parallel 16;
3861 BDB::max_poll_reqs $TICK * 0.1; 4175 BDB::max_poll_reqs $TICK * 0.1;
3862 $AnyEvent::BDB::WATCHER->priority (1); 4176 $AnyEvent::BDB::WATCHER->priority (1);
3863 4177
3864 unless ($DB_ENV) { 4178 unless ($DB_ENV) {
3865 $DB_ENV = BDB::db_env_create; 4179 $DB_ENV = BDB::db_env_create;
3902 IO::AIO::min_parallel 8; 4216 IO::AIO::min_parallel 8;
3903 IO::AIO::max_poll_time $TICK * 0.1; 4217 IO::AIO::max_poll_time $TICK * 0.1;
3904 undef $AnyEvent::AIO::WATCHER; 4218 undef $AnyEvent::AIO::WATCHER;
3905} 4219}
3906 4220
3907my $_log_backtrace; 4221our $_log_backtrace;
4222our $_log_backtrace_last;
3908 4223
3909sub _log_backtrace { 4224sub _log_backtrace {
3910 my ($msg, @addr) = @_; 4225 my ($msg, @addr) = @_;
3911 4226
3912 $msg =~ s/\n//; 4227 $msg =~ s/\n$//;
3913 4228
4229 if ($_log_backtrace_last eq $msg) {
4230 LOG llevInfo, "[ABT] $msg\n";
4231 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3914 # limit the # of concurrent backtraces 4232 # limit the # of concurrent backtraces
3915 if ($_log_backtrace < 2) { 4233 } elsif ($_log_backtrace < 2) {
4234 $_log_backtrace_last = $msg;
3916 ++$_log_backtrace; 4235 ++$_log_backtrace;
3917 my $perl_bt = Carp::longmess $msg; 4236 my $perl_bt = Carp::longmess $msg;
3918 async { 4237 async {
3919 $Coro::current->{desc} = "abt $msg"; 4238 $Coro::current->{desc} = "abt $msg";
3920 4239
3940 LOG llevInfo, "[ABT] $_\n" for @bt; 4259 LOG llevInfo, "[ABT] $_\n" for @bt;
3941 --$_log_backtrace; 4260 --$_log_backtrace;
3942 }; 4261 };
3943 } else { 4262 } else {
3944 LOG llevInfo, "[ABT] $msg\n"; 4263 LOG llevInfo, "[ABT] $msg\n";
3945 LOG llevInfo, "[ABT] [suppressed]\n"; 4264 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3946 } 4265 }
3947} 4266}
3948 4267
3949# load additional modules 4268# load additional modules
3950require "cf/$_.pm" for @EXTRA_MODULES; 4269require "cf/$_.pm" for @EXTRA_MODULES;
4270cf::_connect_to_perl_2;
3951 4271
3952END { cf::emergency_save } 4272END { cf::emergency_save }
3953 4273
39541 42741
3955 4275

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines