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.448 by root, Fri Sep 19 05:30:23 2008 UTC vs.
Revision 1.555 by root, Wed Jun 30 01:32:56 2010 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 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 "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 Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
50 52
51use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
52use BDB (); 54use BDB ();
53use Data::Dumper; 55use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 56use Fcntl;
56use YAML (); 57use YAML::XS ();
57use IO::AIO (); 58use IO::AIO ();
58use Time::HiRes; 59use Time::HiRes;
59use Compress::LZF; 60use Compress::LZF;
60use Digest::MD5 (); 61use Digest::MD5 ();
61 62
66$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68 69
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 71
71{ 72# make sure c-lzf reinitialises itself
72 # very ugly, but ensure we acquire the storable lock
73
74 sub net_mstore {
75 my $guard = Coro::Storable::guard;
76 &Storable::net_mstore
77 }
78
79 sub mretrieve {
80 my $guard = Coro::Storable::guard;
81 &Storable::mretrieve
82 }
83
84 Compress::LZF::set_serializer "Coro::Storable", "cf::net_mstore", "cf::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
85 Compress::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
86} 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
87 78
88sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
89 82
90our %COMMAND = (); 83our %COMMAND = ();
91our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
92 85
93our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
94our %EXTCMD = (); 87our %EXTCMD = ();
95our %EXTICMD = (); 88our %EXTICMD = ();
96our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
97our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
98 91
99our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
100our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
101 96
102our $CONFDIR = confdir; 97our $CONFDIR = confdir;
103our $DATADIR = datadir; 98our $DATADIR = datadir;
104our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
105our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
111our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
112our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
113our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
114our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
115 110
116our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
117 118
118our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
119our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
120our $NEXT_TICK; 121our $NEXT_TICK;
121our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
122 123
123our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
124our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
125our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
126our $DB_ENV; 127our $DB_ENV;
127 128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
128our %CFG; 131our %CFG;
129 132
130our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 134our $RUNTIME;
132our $NOW; 135our $NOW;
140 143
141our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
142our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter 146our $JITTER; # average jitter
144our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
145 153
146binmode STDOUT; 154binmode STDOUT;
147binmode STDERR; 155binmode STDERR;
148 156
149# read virtual server time, if available 157# read virtual server time, if available
151 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
152 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
153 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
154} 162}
155 163
164eval "sub TICK() { $TICK } 1" or die;
165
156mkdir $_ 166mkdir $_
157 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
158 168
159our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
160 170
161sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
162 187
163############################################################################# 188#############################################################################
164 189
165=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
166 191
208from wherever your confdir points to. 233from wherever your confdir points to.
209 234
210=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
211 236
212These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
213returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
214per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
215 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
216=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
217 247
218This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
219C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
220that call. 250that call.
221 251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
222=back 258=back
223 259
224=cut 260=cut
225 261
226BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
227 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
228 my $msg = join "", @_; 269 my $msg = join "", @_;
229 270
230 $msg .= "\n" 271 $msg .= "\n"
231 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
232 273
233 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
234 275
235 LOG llevError, $msg; 276 LOG llevWarn, $msg;
236 }; 277};
237}
238 278
239$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
240 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
241 281
242 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
243 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
244 return;#d# 286 return;#d#
245 }#d# 287 }#d#
246 288
247 # kill coroutine otherwise 289 # kill coroutine otherwise
248 warn Carp::longmess $_[0];
249 Coro::terminate 290 Coro::terminate
250}; 291};
251
252$SIG{__DIE__} = sub { }; #d#?
253 292
254@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
255@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
256@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
257@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
271)) { 310)) {
272 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
273} 312}
274 313
275$EV::DIED = sub { 314$EV::DIED = sub {
276 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
277}; 316};
278 317
279############################################################################# 318#############################################################################
280 319
281=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
318our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
319 358
320sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
321sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
322 361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
374=item cf::post_init { BLOCK }
375
376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
377but I<before> the server starts ticking again.
378
379The codeblock will have a single boolean argument to indicate whether this
380is a reload or not.
381
382=cut
383
384sub post_init(&) {
385 push @POST_INIT, shift;
386}
387
388sub _post_init {
389 trace "running post_init jobs";
390
391 # run them in parallel...
392
393 my @join;
394
395 while () {
396 push @join, map &Coro::async ($_, 0), @POST_INIT;
397 @POST_INIT = ();
398
399 @join or last;
400
401 (pop @join)->join;
402 }
403}
404
323=item cf::lock_wait $string 405=item cf::lock_wait $string
324 406
325Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
326 408
327=item my $lock = cf::lock_acquire $string 409=item my $lock = cf::lock_acquire $string
328 410
329Wait until the given lock is available and then acquires it and returns 411Wait until the given lock is available and then acquires it and returns
330a Coro::guard object. If the guard object gets destroyed (goes out of scope, 412a L<Guard> object. If the guard object gets destroyed (goes out of scope,
331for example when the coroutine gets canceled), the lock is automatically 413for example when the coroutine gets canceled), the lock is automatically
332returned. 414returned.
333 415
334Locks are *not* recursive, locking from the same coro twice results in a 416Locks are *not* recursive, locking from the same coro twice results in a
335deadlocked coro. 417deadlocked coro.
341 423
342Return true if the lock is currently active, i.e. somebody has locked it. 424Return true if the lock is currently active, i.e. somebody has locked it.
343 425
344=cut 426=cut
345 427
346our %LOCK; 428our $LOCKS = new Coro::SemaphoreSet;
347our %LOCKER;#d#
348 429
349sub lock_wait($) { 430sub lock_wait($) {
350 my ($key) = @_; 431 $LOCKS->wait ($_[0]);
351
352 if ($LOCKER{$key} == $Coro::current) {#d#
353 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
354 return;#d#
355 }#d#
356
357 # wait for lock, if any
358 while ($LOCK{$key}) {
359 push @{ $LOCK{$key} }, $Coro::current;
360 Coro::schedule;
361 }
362} 432}
363 433
364sub lock_acquire($) { 434sub lock_acquire($) {
365 my ($key) = @_; 435 $LOCKS->guard ($_[0])
366
367 # wait, to be sure we are not locked
368 lock_wait $key;
369
370 $LOCK{$key} = [];
371 $LOCKER{$key} = $Coro::current;#d#
372
373 Coro::guard {
374 delete $LOCKER{$key};#d#
375 # wake up all waiters, to be on the safe side
376 $_->ready for @{ delete $LOCK{$key} };
377 }
378} 436}
379 437
380sub lock_active($) { 438sub lock_active($) {
381 my ($key) = @_; 439 $LOCKS->count ($_[0]) < 1
382
383 ! ! $LOCK{$key}
384} 440}
385 441
386sub freeze_mainloop { 442sub freeze_mainloop {
387 tick_inhibit_inc; 443 tick_inhibit_inc;
388 444
389 Coro::guard \&tick_inhibit_dec; 445 &Guard::guard (\&tick_inhibit_dec);
390} 446}
391 447
392=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
393 449
394Like EV::periodic, but randomly selects a starting point so that the actions 450Like EV::periodic, but randomly selects a starting point so that the actions
395get spread over timer. 451get spread over time.
396 452
397=cut 453=cut
398 454
399sub periodic($$) { 455sub periodic($$) {
400 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
417 473
418=cut 474=cut
419 475
420our @SLOT_QUEUE; 476our @SLOT_QUEUE;
421our $SLOT_QUEUE; 477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
422 479
423$SLOT_QUEUE->cancel if $SLOT_QUEUE; 480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
424$SLOT_QUEUE = Coro::async { 481$SLOT_QUEUE = Coro::async {
425 $Coro::current->desc ("timeslot manager"); 482 $Coro::current->desc ("timeslot manager");
426 483
427 my $signal = new Coro::Signal; 484 my $signal = new Coro::Signal;
485 my $busy;
428 486
429 while () { 487 while () {
430 next_job: 488 next_job:
489
431 my $avail = cf::till_tick; 490 my $avail = cf::till_tick;
432 if ($avail > 0.01) { 491
433 for (0 .. $#SLOT_QUEUE) { 492 for (0 .. $#SLOT_QUEUE) {
434 if ($SLOT_QUEUE[$_][0] < $avail) { 493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
435 my $job = splice @SLOT_QUEUE, $_, 1, (); 495 my $job = splice @SLOT_QUEUE, $_, 1, ();
436 $job->[2]->send; 496 $job->[2]->send;
437 Coro::cede; 497 Coro::cede;
438 goto next_job; 498 goto next_job;
439 } 499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
440 } 501 }
441 } 502 }
442 503
443 if (@SLOT_QUEUE) { 504 if (@SLOT_QUEUE) {
444 # we do not use wait_for_tick() as it returns immediately when tick is inactive 505 # we do not use wait_for_tick() as it returns immediately when tick is inactive
445 push @cf::WAIT_FOR_TICK, $signal; 506 push @cf::WAIT_FOR_TICK, $signal;
446 $signal->wait; 507 $signal->wait;
447 } else { 508 } else {
509 $busy = 0;
448 Coro::schedule; 510 Coro::schedule;
449 } 511 }
450 } 512 }
451}; 513};
452 514
453sub get_slot($;$$) { 515sub get_slot($;$$) {
454 return if tick_inhibit || $Coro::current == $Coro::main; 516 return if tick_inhibit || $Coro::current == $Coro::main;
455 517
456 my ($time, $pri, $name) = @_; 518 my ($time, $pri, $name) = @_;
457 519
458 $time = $TICK * .6 if $time > $TICK * .6; 520 $time = clamp $time, 0.01, $TICK * .6;
521
459 my $sig = new Coro::Signal; 522 my $sig = new Coro::Signal;
460 523
461 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
462 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
463 $SLOT_QUEUE->ready; 526 $SLOT_QUEUE->ready;
489=cut 552=cut
490 553
491sub sync_job(&) { 554sub sync_job(&) {
492 my ($job) = @_; 555 my ($job) = @_;
493 556
494 if ($Coro::current == $Coro::main) { 557 if (in_main) {
495 my $time = EV::time; 558 my $time = AE::time;
496 559
497 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
498 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
499 562
500 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
501 564
502 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
503 566
504 my $busy = 1; 567 my $busy = 1;
505 my @res; 568 my @res;
506 569
507 (async { 570 (async {
508 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
509 @res = eval { $job->() }; 572 @res = eval { $job->() };
510 warn $@ if $@; 573 error $@ if $@;
511 undef $busy; 574 undef $busy;
512 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
513 576
514 while ($busy) { 577 while ($busy) {
515 if (Coro::nready) { 578 if (Coro::nready) {
517 } else { 580 } else {
518 EV::loop EV::LOOP_ONESHOT; 581 EV::loop EV::LOOP_ONESHOT;
519 } 582 }
520 } 583 }
521 584
522 my $time = EV::time - $time; 585 my $time = AE::time - $time;
523 586
524 $TICK_START += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
525 588
526 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
527 } else { 590 } else {
549 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
550 613
551 $coro 614 $coro
552} 615}
553 616
554=item fork_call { }, $args 617=item fork_call { }, @args
555 618
556Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
557process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
558Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
559never block itself or use any form of event handling. 622never block itself or use any form of event handling.
560 623
561=cut 624=cut
562 625
626sub post_fork {
627 reset_signals;
628}
629
563sub fork_call(&@) { 630sub fork_call(&@) {
564 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
565 632
566 # we seemingly have to make a local copy of the whole thing, 633 # we seemingly have to make a local copy of the whole thing,
567 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
568 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
569 636
570 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
571 reset_signals; 638 cf::post_fork;
572 &$cb 639 &$cb
573 }, @args; 640 } @args;
574 641
575 wantarray ? @res : $res[-1] 642 wantarray ? @res : $res[-1]
643}
644
645sub objinfo {
646 (
647 "counter value" => cf::object::object_count,
648 "objects created" => cf::object::create_count,
649 "objects destroyed" => cf::object::destroy_count,
650 "freelist size" => cf::object::free_count,
651 "allocated objects" => cf::object::objects_size,
652 "active objects" => cf::object::actives_size,
653 )
576} 654}
577 655
578=item $coin = coin_from_name $name 656=item $coin = coin_from_name $name
579 657
580=cut 658=cut
617within each server. 695within each server.
618 696
619=cut 697=cut
620 698
621sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
622 my ($name) = @_; 703 my ($name) = @_;
623 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
624 705
625 eval { 706 eval {
626 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
636} 717}
637 718
638our $DB; 719our $DB;
639 720
640sub db_init { 721sub db_init {
641 cf::sync_job {
642 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
643 };
644} 723}
645 724
646sub db_get($$) { 725sub db_get($$) {
647 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
648 727
649 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
650 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
651 732
652 $! ? () 733 $! ? ()
653 : $data 734 : $data
654 }
655} 735}
656 736
657sub db_put($$$) { 737sub db_put($$$) {
658 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
659 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
715 795
716 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
717 my $data = $process->(\@data); 797 my $data = $process->(\@data);
718 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
719 799
720 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
721 801
722 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
723 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
724 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
725 805
735 815
736=cut 816=cut
737 817
738sub datalog($@) { 818sub datalog($@) {
739 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
740 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
741} 821}
742 822
743=back 823=back
744 824
745=cut 825=cut
940 1020
941 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
942 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
943 1023
944 } elsif (ref $type) { 1024 } elsif (ref $type) {
945 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
946 1026
947 } else { 1027 } else {
948 shift @arg; 1028 shift @arg;
949 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
950 } 1030 }
951 } 1031 }
952} 1032}
953 1033
954sub _object_attach { 1034sub _object_attach {
964 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
965 } 1045 }
966 1046
967 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
968 } else { 1048 } else {
969 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
970 } 1050 }
971 1051
972 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
973} 1053}
974 1054
1033 1113
1034 for (@$callbacks) { 1114 for (@$callbacks) {
1035 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1036 1116
1037 if ($@) { 1117 if ($@) {
1038 warn "$@";
1039 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1040 override; 1119 override;
1041 } 1120 }
1042 1121
1043 return 1 if $override; 1122 return 1 if $override;
1044 } 1123 }
1123 for (@$attach) { 1202 for (@$attach) {
1124 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1125 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1126 } 1205 }
1127 } else { 1206 } else {
1128 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1129 } 1208 }
1130 } 1209 }
1131} 1210}
1132 1211
1133cf::attachable->attach ( 1212cf::attachable->attach (
1160 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1161 1240
1162 sync_job { 1241 sync_job {
1163 if (length $$rdata) { 1242 if (length $$rdata) {
1164 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1165 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1166 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1167 1247
1168 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1169 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1170 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1171 aio_fsync $fh if $cf::USE_FSYNC; 1251 if ($cf::USE_FSYNC) {
1252 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1253 aio_fsync $fh;
1254 }
1172 aio_close $fh; 1255 aio_close $fh;
1173 1256
1174 if (@$objs) { 1257 if (@$objs) {
1175 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1258 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1259 aio_chmod $fh, SAVE_MODE;
1177 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1260 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1178 aio_write $fh, 0, (length $data), $data, 0; 1261 aio_write $fh, 0, (length $data), $data, 0;
1179 aio_fsync $fh if $cf::USE_FSYNC; 1262 if ($cf::USE_FSYNC) {
1263 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1264 aio_fsync $fh;
1265 }
1180 aio_close $fh; 1266 aio_close $fh;
1181 aio_rename "$filename.pst~", "$filename.pst"; 1267 aio_rename "$filename.pst~", "$filename.pst";
1182 } 1268 }
1183 } else { 1269 } else {
1184 aio_unlink "$filename.pst"; 1270 aio_unlink "$filename.pst";
1185 } 1271 }
1186 1272
1187 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1274
1275 $filename =~ s%/[^/]+$%%;
1276 aio_pathsync $filename if $cf::USE_FSYNC;
1188 } else { 1277 } else {
1189 warn "FATAL: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1190 } 1279 }
1191 } else { 1280 } else {
1192 aio_unlink $filename; 1281 aio_unlink $filename;
1193 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1194 } 1283 }
1218 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1219 $av = $st->{objs}; 1308 $av = $st->{objs};
1220 } 1309 }
1221 1310
1222 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1223 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1224 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1225 1315
1226 ($data, $av) 1316 ($data, $av)
1227} 1317}
1228 1318
1229=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
1285 my ($name, $cb) = @_; 1375 my ($name, $cb) = @_;
1286 1376
1287 $EXTICMD{$name} = $cb; 1377 $EXTICMD{$name} = $cb;
1288} 1378}
1289 1379
1380use File::Glob ();
1381
1290cf::player->attach ( 1382cf::player->attach (
1291 on_command => sub { 1383 on_unknown_command => sub {
1292 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1293 1385
1294 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1295 or return; 1387 or return;
1296 1388
1319 1411
1320 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1321 if $reply; 1413 if $reply;
1322 1414
1323 } else { 1415 } else {
1324 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1325 } 1417 }
1326 1418
1327 cf::override; 1419 cf::override;
1328 }, 1420 },
1329); 1421);
1330 1422
1423# "readahead" all extensions
1424sub cache_extensions {
1425 my $grp = IO::AIO::aio_group;
1426
1427 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1428 for (grep /\.ext$/, @{$_[0]}) {
1429 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1430 }
1431 };
1432
1433 $grp
1434}
1435
1331sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1332 cf::sync_job { 1439 cf::sync_job {
1333 my %todo; 1440 my %todo;
1334 1441
1335 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1336 next unless -r $path; 1443 next unless -r $path;
1354 1461
1355 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1356 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1357 1464
1358 $ext{source} = 1465 $ext{source} =
1359 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1360 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1361 . $source 1468 . $source
1362 . "\n};\n1"; 1469 . "\n};\n1";
1363 1470
1364 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1365 } 1472 }
1366 1473
1474 my $pass = 0;
1367 my %done; 1475 my %done;
1368 while (%todo) { 1476 while (%todo) {
1369 my $progress; 1477 my $progress;
1370 1478
1479 ++$pass;
1480
1481 ext:
1371 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1372 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1373 goto skip 1484 next ext
1374 unless exists $done{$_}; 1485 unless exists $done{$_};
1375 } 1486 }
1376 1487
1377 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1378 1489
1379 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1380 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1381 : "$v->{base}: extension inactive.\n";
1382 1494
1383 if (exists $v->{meta}{mandatory}) {
1384 warn $msg;
1385 cf::cleanup "mandatory extension failed to load, exiting."; 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1386 } 1496 if exists $v->{meta}{mandatory};
1387 1497
1388 warn $msg; 1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1499 delete $todo{$k};
1500 } else {
1501 $done{$k} = delete $todo{$k};
1502 push @EXTS, $v->{pkg};
1503 $progress = 1;
1504
1505 info "$v->{base}: extension inactive.\n"
1506 unless $active;
1389 } 1507 }
1390
1391 $done{$k} = delete $todo{$k};
1392 push @EXTS, $v->{pkg};
1393 $progress = 1;
1394 } 1508 }
1395 1509
1396 skip: 1510 unless ($progress) {
1397 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1398 unless $progress; 1512
1513 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory};
1516 }
1517 }
1399 } 1518 }
1400 }; 1519 };
1401} 1520}
1402 1521
1403############################################################################# 1522#############################################################################
1457 1576
1458sub exists($) { 1577sub exists($) {
1459 my ($login) = @_; 1578 my ($login) = @_;
1460 1579
1461 $cf::PLAYER{$login} 1580 $cf::PLAYER{$login}
1462 or cf::sync_job { !aio_stat path $login } 1581 or !aio_stat path $login
1463} 1582}
1464 1583
1465sub find($) { 1584sub find($) {
1466 return $cf::PLAYER{$_[0]} || do { 1585 return $cf::PLAYER{$_[0]} || do {
1467 my $login = $_[0]; 1586 my $login = $_[0];
1487 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1488 } 1607 }
1489 } 1608 }
1490} 1609}
1491 1610
1611cf::player->attach (
1612 on_load => sub {
1613 my ($pl, $path) = @_;
1614
1615 # restore slots saved in save, below
1616 my $slots = delete $pl->{_slots};
1617
1618 $pl->ob->current_weapon ($slots->[0]);
1619 $pl->combat_ob ($slots->[1]);
1620 $pl->ranged_ob ($slots->[2]);
1621 },
1622);
1623
1492sub save($) { 1624sub save($) {
1493 my ($pl) = @_; 1625 my ($pl) = @_;
1494 1626
1495 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1496 1628
1501 1633
1502 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1503 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1504 1636
1505 cf::get_slot 0.01; 1637 cf::get_slot 0.01;
1638
1639 # save slots, to be restored later
1640 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1506 1641
1507 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1508 cf::cede_to_tick; 1643 cf::cede_to_tick;
1509} 1644}
1510 1645
1544 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1545 1680
1546 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1547 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1682 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1548 1683
1549 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1550 $pl->deactivate; 1685 $pl->deactivate;
1686
1551 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1552 $pl->ob->check_score;
1553 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1554 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1555 1692
1556 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1557 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1558 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
1612 \@logins 1749 \@logins
1613} 1750}
1614 1751
1615=item $player->maps 1752=item $player->maps
1616 1753
1754=item cf::player::maps $login
1755
1617Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1618player. May block. 1757player. May block.
1619 1758
1620=cut 1759=cut
1621 1760
1683=cut 1822=cut
1684 1823
1685sub find_by_path($) { 1824sub find_by_path($) {
1686 my ($path) = @_; 1825 my ($path) = @_;
1687 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1688 my ($match, $specificity); 1829 my ($match, $specificity);
1689 1830
1690 for my $region (list) { 1831 for my $region (list) {
1691 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1692 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
1722 1863
1723 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1724 1865
1725 # mit "rum" bekleckern, nicht 1866 # mit "rum" bekleckern, nicht
1726 $self->_create_random_map ( 1867 $self->_create_random_map (
1727 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp, $rmp->{total_map_hp},
1728 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1729 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1730 $rmp->{exit_on_final_map},
1731 $rmp->{xsize}, $rmp->{ysize},
1732 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1733 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1734 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1735 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1736 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1737 (cf::region::find $rmp->{region}), $rmp->{custom} 1869 (cf::region::find $rmp->{region})
1738 ) 1870 )
1739} 1871}
1740 1872
1741=item cf::map->register ($regex, $prio) 1873=item cf::map->register ($regex, $prio)
1742 1874
1748 1880
1749sub register { 1881sub register {
1750 my (undef, $regex, $prio) = @_; 1882 my (undef, $regex, $prio) = @_;
1751 my $pkg = caller; 1883 my $pkg = caller;
1752 1884
1753 no strict;
1754 push @{"$pkg\::ISA"}, __PACKAGE__; 1885 push @{"$pkg\::ISA"}, __PACKAGE__;
1755 1886
1756 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1887 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1757} 1888}
1758 1889
1759# also paths starting with '/' 1890# also paths starting with '/'
1760$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1891$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1761 1892
1762sub thawer_merge { 1893sub thawer_merge {
1763 my ($self, $merge) = @_; 1894 my ($self, $merge) = @_;
1764 1895
1765 # we have to keep some variables in memory intact 1896 # we have to keep some variables in memory intact
1770} 1901}
1771 1902
1772sub normalise { 1903sub normalise {
1773 my ($path, $base) = @_; 1904 my ($path, $base) = @_;
1774 1905
1775 $path = "$path"; # make sure its a string 1906 $path = "$path"; # make sure it's a string
1776 1907
1777 $path =~ s/\.map$//; 1908 $path =~ s/\.map$//;
1778 1909
1779 # map plan: 1910 # map plan:
1780 # 1911 #
1795 $base =~ s{[^/]+/?$}{}; 1926 $base =~ s{[^/]+/?$}{};
1796 $path = "$base/$path"; 1927 $path = "$base/$path";
1797 } 1928 }
1798 1929
1799 for ($path) { 1930 for ($path) {
1800 redo if s{//}{/};
1801 redo if s{/\.?/}{/}; 1931 redo if s{/\.?/}{/};
1802 redo if s{/[^/]+/\.\./}{/}; 1932 redo if s{/[^/]+/\.\./}{/};
1803 } 1933 }
1804 1934
1805 $path 1935 $path
1819 $self->init; # pass $1 etc. 1949 $self->init; # pass $1 etc.
1820 return $self; 1950 return $self;
1821 } 1951 }
1822 } 1952 }
1823 1953
1824 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1954 Carp::cluck "unable to resolve path '$path' (base '$base')";
1825 () 1955 ()
1826} 1956}
1827 1957
1828sub init { 1958sub init {
1829 my ($self) = @_; 1959 my ($self) = @_;
1861sub uniq_path { 1991sub uniq_path {
1862 my ($self) = @_; 1992 my ($self) = @_;
1863 1993
1864 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1994 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1865 "$UNIQUEDIR/$path" 1995 "$UNIQUEDIR/$path"
1866}
1867
1868# and all this just because we cannot iterate over
1869# all maps in C++...
1870sub change_all_map_light {
1871 my ($change) = @_;
1872
1873 $_->change_map_light ($change)
1874 for grep $_->outdoor, values %cf::MAP;
1875} 1996}
1876 1997
1877sub decay_objects { 1998sub decay_objects {
1878 my ($self) = @_; 1999 my ($self) = @_;
1879 2000
1961 2082
1962sub find; 2083sub find;
1963sub find { 2084sub find {
1964 my ($path, $origin) = @_; 2085 my ($path, $origin) = @_;
1965 2086
2087 cf::cede_to_tick;
2088
1966 $path = normalise $path, $origin && $origin->path; 2089 $path = normalise $path, $origin && $origin->path;
1967 2090
1968 cf::lock_wait "map_data:$path";#d#remove 2091 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1969 cf::lock_wait "map_find:$path"; 2092 my $guard2 = cf::lock_acquire "map_find:$path";
1970 2093
1971 $cf::MAP{$path} || do { 2094 $cf::MAP{$path} || do {
1972 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1973 my $guard2 = cf::lock_acquire "map_find:$path";
1974
1975 my $map = new_from_path cf::map $path 2095 my $map = new_from_path cf::map $path
1976 or return; 2096 or return;
1977 2097
1978 $map->{last_save} = $cf::RUNTIME; 2098 $map->{last_save} = $cf::RUNTIME;
1979 2099
1991 2111
1992 $cf::MAP{$path} = $map 2112 $cf::MAP{$path} = $map
1993 } 2113 }
1994} 2114}
1995 2115
1996sub pre_load { } 2116sub pre_load { }
1997sub post_load { } 2117#sub post_load { } # XS
1998 2118
1999sub load { 2119sub load {
2000 my ($self) = @_; 2120 my ($self) = @_;
2001 2121
2002 local $self->{deny_reset} = 1; # loading can take a long time 2122 local $self->{deny_reset} = 1; # loading can take a long time
2047 unless ($self->{deny_activate}) { 2167 unless ($self->{deny_activate}) {
2048 $self->decay_objects; 2168 $self->decay_objects;
2049 $self->fix_auto_apply; 2169 $self->fix_auto_apply;
2050 $self->update_buttons; 2170 $self->update_buttons;
2051 cf::cede_to_tick; 2171 cf::cede_to_tick;
2052 $self->set_darkness_map;
2053 cf::cede_to_tick;
2054 $self->activate; 2172 $self->activate;
2055 } 2173 }
2056 2174
2057 $self->{last_save} = $cf::RUNTIME; 2175 $self->{last_save} = $cf::RUNTIME;
2058 $self->last_access ($cf::RUNTIME); 2176 $self->last_access ($cf::RUNTIME);
2059 2177
2060 $self->in_memory (cf::MAP_ACTIVE); 2178 $self->in_memory (cf::MAP_ACTIVE);
2061 } 2179 }
2062 2180
2063 $self->post_load; 2181 $self->post_load;
2064}
2065 2182
2183 1
2184}
2185
2186# customize the map for a given player, i.e.
2187# return the _real_ map. used by e.g. per-player
2188# maps to change the path to ~playername/mappath
2066sub customise_for { 2189sub customise_for {
2067 my ($self, $ob) = @_; 2190 my ($self, $ob) = @_;
2068 2191
2069 return find "~" . $ob->name . "/" . $self->{path} 2192 return find "~" . $ob->name . "/" . $self->{path}
2070 if $self->per_player; 2193 if $self->per_player;
2086 or next; 2209 or next;
2087 $neigh = find $neigh, $map 2210 $neigh = find $neigh, $map
2088 or next; 2211 or next;
2089 $neigh->load; 2212 $neigh->load;
2090 2213
2214 # now find the diagonal neighbours
2091 push @neigh, 2215 push @neigh,
2092 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2216 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2093 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2217 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2094 } 2218 }
2095 2219
2102} 2226}
2103 2227
2104sub find_sync { 2228sub find_sync {
2105 my ($path, $origin) = @_; 2229 my ($path, $origin) = @_;
2106 2230
2107 cf::sync_job { find $path, $origin } 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2232 if $Coro::current == $Coro::main;
2233
2234 find $path, $origin
2108} 2235}
2109 2236
2110sub do_load_sync { 2237sub do_load_sync {
2111 my ($map) = @_; 2238 my ($map) = @_;
2112 2239
2113 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2240 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2114 if $Coro::current == $Coro::main; 2241 if $Coro::current == $Coro::main;
2115 2242
2116 cf::sync_job { $map->load }; 2243 $map->load;
2117} 2244}
2118 2245
2119our %MAP_PREFETCH; 2246our %MAP_PREFETCH;
2120our $MAP_PREFETCHER = undef; 2247our $MAP_PREFETCHER = undef;
2121 2248
2147 $MAP_PREFETCHER->prio (6); 2274 $MAP_PREFETCHER->prio (6);
2148 2275
2149 () 2276 ()
2150} 2277}
2151 2278
2279# common code, used by both ->save and ->swapout
2152sub save { 2280sub _save {
2153 my ($self) = @_; 2281 my ($self) = @_;
2154
2155 my $lock = cf::lock_acquire "map_data:$self->{path}";
2156 2282
2157 $self->{last_save} = $cf::RUNTIME; 2283 $self->{last_save} = $cf::RUNTIME;
2158 2284
2159 return unless $self->dirty; 2285 return unless $self->dirty;
2160 2286
2180 } else { 2306 } else {
2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2307 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2182 } 2308 }
2183} 2309}
2184 2310
2311sub save {
2312 my ($self) = @_;
2313
2314 my $lock = cf::lock_acquire "map_data:$self->{path}";
2315
2316 $self->_save;
2317}
2318
2185sub swap_out { 2319sub swap_out {
2186 my ($self) = @_; 2320 my ($self) = @_;
2187 2321
2188 # save first because save cedes
2189 $self->save;
2190
2191 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2322 my $lock = cf::lock_acquire "map_data:$self->{path}";
2192 2323
2193 return if $self->players;
2194 return if $self->in_memory != cf::MAP_ACTIVE; 2324 return if $self->in_memory != cf::MAP_ACTIVE;
2195 return if $self->{deny_save}; 2325 return if $self->{deny_save};
2326 return if $self->players;
2196 2327
2328 # first deactivate the map and "unlink" it from the core
2329 $self->deactivate;
2330 $_->clear_links_to ($self) for values %cf::MAP;
2197 $self->in_memory (cf::MAP_SWAPPED); 2331 $self->in_memory (cf::MAP_SWAPPED);
2332
2333 # then atomically save
2334 $self->_save;
2335
2336 # then free the map
2337 $self->clear;
2338}
2339
2340sub reset_at {
2341 my ($self) = @_;
2342
2343 # TODO: safety, remove and allow resettable per-player maps
2344 return 1e99 if $self->{deny_reset};
2345
2346 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2347 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2348
2349 $time + $to
2350}
2351
2352sub should_reset {
2353 my ($self) = @_;
2354
2355 $self->reset_at <= $cf::RUNTIME
2356}
2357
2358sub reset {
2359 my ($self) = @_;
2360
2361 my $lock = cf::lock_acquire "map_data:$self->{path}";
2362
2363 return if $self->players;
2364
2365 cf::trace "resetting map ", $self->path, "\n";
2366
2367 $self->in_memory (cf::MAP_SWAPPED);
2368
2369 # need to save uniques path
2370 unless ($self->{deny_save}) {
2371 my $uniq = $self->uniq_path; utf8::encode $uniq;
2372
2373 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2374 if $uniq;
2375 }
2376
2377 delete $cf::MAP{$self->path};
2198 2378
2199 $self->deactivate; 2379 $self->deactivate;
2200 $_->clear_links_to ($self) for values %cf::MAP; 2380 $_->clear_links_to ($self) for values %cf::MAP;
2201 $self->clear; 2381 $self->clear;
2202}
2203
2204sub reset_at {
2205 my ($self) = @_;
2206
2207 # TODO: safety, remove and allow resettable per-player maps
2208 return 1e99 if $self->{deny_reset};
2209
2210 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2211 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2212
2213 $time + $to
2214}
2215
2216sub should_reset {
2217 my ($self) = @_;
2218
2219 $self->reset_at <= $cf::RUNTIME
2220}
2221
2222sub reset {
2223 my ($self) = @_;
2224
2225 my $lock = cf::lock_acquire "map_data:$self->{path}";
2226
2227 return if $self->players;
2228
2229 warn "resetting map ", $self->path;
2230
2231 $self->in_memory (cf::MAP_SWAPPED);
2232
2233 # need to save uniques path
2234 unless ($self->{deny_save}) {
2235 my $uniq = $self->uniq_path; utf8::encode $uniq;
2236
2237 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2238 if $uniq;
2239 }
2240
2241 delete $cf::MAP{$self->path};
2242
2243 $self->deactivate;
2244 $_->clear_links_to ($self) for values %cf::MAP;
2245 $self->clear;
2246 2382
2247 $self->unlink_save; 2383 $self->unlink_save;
2248 $self->destroy; 2384 $self->destroy;
2249} 2385}
2250 2386
2258 2394
2259 delete $cf::MAP{$self->path}; 2395 delete $cf::MAP{$self->path};
2260 2396
2261 $self->unlink_save; 2397 $self->unlink_save;
2262 2398
2263 bless $self, "cf::map"; 2399 bless $self, "cf::map::wrap";
2264 delete $self->{deny_reset}; 2400 delete $self->{deny_reset};
2265 $self->{deny_save} = 1; 2401 $self->{deny_save} = 1;
2266 $self->reset_timeout (1); 2402 $self->reset_timeout (1);
2267 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2403 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2268 2404
2325 : normalise $_ 2461 : normalise $_
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2462 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2463 ]
2328} 2464}
2329 2465
2466=item cf::map::static_maps
2467
2468Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2469file in the shared directory excluding F</styles> and F</editor>). May
2470block.
2471
2472=cut
2473
2474sub static_maps() {
2475 my @dirs = "";
2476 my @maps;
2477
2478 while (@dirs) {
2479 my $dir = shift @dirs;
2480
2481 next if $dir eq "/styles" || $dir eq "/editor";
2482
2483 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2484 or return;
2485
2486 for (@$files) {
2487 s/\.map$// or next;
2488 utf8::decode $_;
2489 push @maps, "$dir/$_";
2490 }
2491
2492 push @dirs, map "$dir/$_", @$dirs;
2493 }
2494
2495 \@maps
2496}
2497
2330=back 2498=back
2331 2499
2332=head3 cf::object 2500=head3 cf::object
2333 2501
2334=cut 2502=cut
2399 2567
2400our $SAY_CHANNEL = { 2568our $SAY_CHANNEL = {
2401 id => "say", 2569 id => "say",
2402 title => "Map", 2570 title => "Map",
2403 reply => "say ", 2571 reply => "say ",
2404 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2572 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2405}; 2573};
2406 2574
2407our $CHAT_CHANNEL = { 2575our $CHAT_CHANNEL = {
2408 id => "chat", 2576 id => "chat",
2409 title => "Chat", 2577 title => "Chat",
2466 2634
2467Freezes the player and moves him/her to a special map (C<{link}>). 2635Freezes the player and moves him/her to a special map (C<{link}>).
2468 2636
2469The player should be reasonably safe there for short amounts of time (e.g. 2637The player should be reasonably safe there for short amounts of time (e.g.
2470for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2638for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2471though, as the palyer cannot control the character while it is on the link 2639though, as the player cannot control the character while it is on the link
2472map. 2640map.
2473 2641
2474Will never block. 2642Will never block.
2475 2643
2476=item $player_object->leave_link ($map, $x, $y) 2644=item $player_object->leave_link ($map, $x, $y)
2497sub cf::object::player::enter_link { 2665sub cf::object::player::enter_link {
2498 my ($self) = @_; 2666 my ($self) = @_;
2499 2667
2500 $self->deactivate_recursive; 2668 $self->deactivate_recursive;
2501 2669
2670 ++$self->{_link_recursion};
2671
2502 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2672 return if UNIVERSAL::isa $self->map, "ext::map_link";
2503 2673
2504 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2674 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2505 if $self->map && $self->map->{path} ne "{link}"; 2675 if $self->map && $self->map->{path} ne "{link}";
2506 2676
2507 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2677 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2508} 2678}
2509 2679
2510sub cf::object::player::leave_link { 2680sub cf::object::player::leave_link {
2511 my ($self, $map, $x, $y) = @_; 2681 my ($self, $map, $x, $y) = @_;
2512 2682
2529 ($x, $y) = (-1, -1) 2699 ($x, $y) = (-1, -1)
2530 unless (defined $x) && (defined $y); 2700 unless (defined $x) && (defined $y);
2531 2701
2532 # use -1 or undef as default coordinates, not 0, 0 2702 # use -1 or undef as default coordinates, not 0, 0
2533 ($x, $y) = ($map->enter_x, $map->enter_y) 2703 ($x, $y) = ($map->enter_x, $map->enter_y)
2534 if $x <=0 && $y <= 0; 2704 if $x <= 0 && $y <= 0;
2535 2705
2536 $map->load; 2706 $map->load;
2537 $map->load_neighbours; 2707 $map->load_neighbours;
2538 2708
2539 return unless $self->contr->active; 2709 return unless $self->contr->active;
2540 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2541 $self->activate_recursive;
2542 2710
2543 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2711 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2544 $self->enter_map ($map, $x, $y); 2712 if ($self->enter_map ($map, $x, $y)) {
2545} 2713 # entering was successful
2714 delete $self->{_link_recursion};
2715 # only activate afterwards, to support waiting in hooks
2716 $self->activate_recursive;
2717 }
2546 2718
2719}
2720
2547=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2721=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2548 2722
2549Moves the player to the given map-path and coordinates by first freezing 2723Moves the player to the given map-path and coordinates by first freezing
2550her, loading and preparing them map, calling the provided $check callback 2724her, loading and preparing them map, calling the provided $check callback
2551that has to return the map if sucecssful, and then unfreezes the player on 2725that has to return the map if sucecssful, and then unfreezes the player on
2552the new (success) or old (failed) map position. In either case, $done will 2726the new (success) or old (failed) map position. In either case, $done will
2559 2733
2560our $GOTOGEN; 2734our $GOTOGEN;
2561 2735
2562sub cf::object::player::goto { 2736sub cf::object::player::goto {
2563 my ($self, $path, $x, $y, $check, $done) = @_; 2737 my ($self, $path, $x, $y, $check, $done) = @_;
2738
2739 if ($self->{_link_recursion} >= $MAX_LINKS) {
2740 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2741 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2742 ($path, $x, $y) = @$EMERGENCY_POSITION;
2743 }
2564 2744
2565 # do generation counting so two concurrent goto's will be executed in-order 2745 # do generation counting so two concurrent goto's will be executed in-order
2566 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2746 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2567 2747
2568 $self->enter_link; 2748 $self->enter_link;
2592 my $map = eval { 2772 my $map = eval {
2593 my $map = defined $path ? cf::map::find $path : undef; 2773 my $map = defined $path ? cf::map::find $path : undef;
2594 2774
2595 if ($map) { 2775 if ($map) {
2596 $map = $map->customise_for ($self); 2776 $map = $map->customise_for ($self);
2597 $map = $check->($map) if $check && $map; 2777 $map = $check->($map, $x, $y, $self) if $check && $map;
2598 } else { 2778 } else {
2599 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2779 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2600 } 2780 }
2601 2781
2602 $map 2782 $map
2610 if ($gen == $self->{_goto_generation}) { 2790 if ($gen == $self->{_goto_generation}) {
2611 delete $self->{_goto_generation}; 2791 delete $self->{_goto_generation};
2612 $self->leave_link ($map, $x, $y); 2792 $self->leave_link ($map, $x, $y);
2613 } 2793 }
2614 2794
2615 $done->() if $done; 2795 $done->($self) if $done;
2616 })->prio (1); 2796 })->prio (1);
2617} 2797}
2618 2798
2619=item $player_object->enter_exit ($exit_object) 2799=item $player_object->enter_exit ($exit_object)
2620 2800
2713 $self->message ("Something went wrong deep within the deliantra server. " 2893 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "I'll try to bring you back to the map you were before. " 2894 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 2895 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2896 cf::NDI_UNIQUE | cf::NDI_RED);
2717 2897
2718 warn "ERROR in enter_exit: $@"; 2898 error "ERROR in enter_exit: $@";
2719 $self->leave_link; 2899 $self->leave_link;
2720 } 2900 }
2721 })->prio (1); 2901 })->prio (1);
2722} 2902}
2723 2903
2735sub cf::client::send_drawinfo { 2915sub cf::client::send_drawinfo {
2736 my ($self, $text, $flags) = @_; 2916 my ($self, $text, $flags) = @_;
2737 2917
2738 utf8::encode $text; 2918 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2919 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2920}
2921
2922=item $client->send_big_packet ($pkt)
2923
2924Like C<send_packet>, but tries to compress large packets, and fragments
2925them as required.
2926
2927=cut
2928
2929our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2930
2931sub cf::client::send_big_packet {
2932 my ($self, $pkt) = @_;
2933
2934 # try lzf for large packets
2935 $pkt = "lzf " . Compress::LZF::compress $pkt
2936 if 1024 <= length $pkt and $self->{can_lzf};
2937
2938 # split very large packets
2939 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2940 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2941 $pkt = "frag";
2942 }
2943
2944 $self->send_packet ($pkt);
2740} 2945}
2741 2946
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 2947=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 2948
2744Send a drawinfo or msg packet to the client, formatting the msg for the 2949Send a drawinfo or msg packet to the client, formatting the msg for the
2748 2953
2749=cut 2954=cut
2750 2955
2751# non-persistent channels (usually the info channel) 2956# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 2957our %CHANNEL = (
2958 "c/motd" => {
2959 id => "infobox",
2960 title => "MOTD",
2961 reply => undef,
2962 tooltip => "The message of the day",
2963 },
2753 "c/identify" => { 2964 "c/identify" => {
2754 id => "infobox", 2965 id => "infobox",
2755 title => "Identify", 2966 title => "Identify",
2756 reply => undef, 2967 reply => undef,
2757 tooltip => "Items recently identified", 2968 tooltip => "Items recently identified",
2759 "c/examine" => { 2970 "c/examine" => {
2760 id => "infobox", 2971 id => "infobox",
2761 title => "Examine", 2972 title => "Examine",
2762 reply => undef, 2973 reply => undef,
2763 tooltip => "Signs and other items you examined", 2974 tooltip => "Signs and other items you examined",
2975 },
2976 "c/shopinfo" => {
2977 id => "infobox",
2978 title => "Shop Info",
2979 reply => undef,
2980 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 2981 },
2765 "c/book" => { 2982 "c/book" => {
2766 id => "infobox", 2983 id => "infobox",
2767 title => "Book", 2984 title => "Book",
2768 reply => undef, 2985 reply => undef,
2784 id => "infobox", 3001 id => "infobox",
2785 title => "Body Parts", 3002 title => "Body Parts",
2786 reply => undef, 3003 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 3004 tooltip => "Shows which body parts you posess and are available",
2788 }, 3005 },
3006 "c/statistics" => {
3007 id => "infobox",
3008 title => "Statistics",
3009 reply => undef,
3010 tooltip => "Shows your primary statistics",
3011 },
3012 "c/skills" => {
3013 id => "infobox",
3014 title => "Skills",
3015 reply => undef,
3016 tooltip => "Shows your experience per skill and item power",
3017 },
3018 "c/shopitems" => {
3019 id => "infobox",
3020 title => "Shop Items",
3021 reply => undef,
3022 tooltip => "Shows the items currently for sale in this shop",
3023 },
3024 "c/resistances" => {
3025 id => "infobox",
3026 title => "Resistances",
3027 reply => undef,
3028 tooltip => "Shows your resistances",
3029 },
3030 "c/pets" => {
3031 id => "infobox",
3032 title => "Pets",
3033 reply => undef,
3034 tooltip => "Shows information abotu your pets/a specific pet",
3035 },
3036 "c/perceiveself" => {
3037 id => "infobox",
3038 title => "Perceive Self",
3039 reply => undef,
3040 tooltip => "You gained detailed knowledge about yourself",
3041 },
2789 "c/uptime" => { 3042 "c/uptime" => {
2790 id => "infobox", 3043 id => "infobox",
2791 title => "Uptime", 3044 title => "Uptime",
2792 reply => undef, 3045 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 3046 tooltip => "How long the server has been running since last restart",
2802 id => "party", 3055 id => "party",
2803 title => "Party", 3056 title => "Party",
2804 reply => "gsay ", 3057 reply => "gsay ",
2805 tooltip => "Messages and chat related to your party", 3058 tooltip => "Messages and chat related to your party",
2806 }, 3059 },
3060 "c/death" => {
3061 id => "death",
3062 title => "Death",
3063 reply => undef,
3064 tooltip => "Reason for and more info about your most recent death",
3065 },
3066 "c/say" => $SAY_CHANNEL,
3067 "c/chat" => $CHAT_CHANNEL,
2807); 3068);
2808 3069
2809sub cf::client::send_msg { 3070sub cf::client::send_msg {
2810 my ($self, $channel, $msg, $color, @extra) = @_; 3071 my ($self, $channel, $msg, $color, @extra) = @_;
2811 3072
2816 3077
2817 # check predefined channels, for the benefit of C 3078 # check predefined channels, for the benefit of C
2818 if ($CHANNEL{$channel}) { 3079 if ($CHANNEL{$channel}) {
2819 $channel = $CHANNEL{$channel}; 3080 $channel = $CHANNEL{$channel};
2820 3081
2821 $self->ext_msg (channel_info => $channel) 3082 $self->ext_msg (channel_info => $channel);
2822 if $self->can_msg;
2823
2824 $channel = $channel->{id}; 3083 $channel = $channel->{id};
2825 3084
2826 } elsif (ref $channel) { 3085 } elsif (ref $channel) {
2827 # send meta info to client, if not yet sent 3086 # send meta info to client, if not yet sent
2828 unless (exists $self->{channel}{$channel->{id}}) { 3087 unless (exists $self->{channel}{$channel->{id}}) {
2829 $self->{channel}{$channel->{id}} = $channel; 3088 $self->{channel}{$channel->{id}} = $channel;
2830 $self->ext_msg (channel_info => $channel) 3089 $self->ext_msg (channel_info => $channel);
2831 if $self->can_msg;
2832 } 3090 }
2833 3091
2834 $channel = $channel->{id}; 3092 $channel = $channel->{id};
2835 } 3093 }
2836 3094
2837 return unless @extra || length $msg; 3095 return unless @extra || length $msg;
2838 3096
2839 if ($self->can_msg) {
2840 # default colour, mask it out 3097 # default colour, mask it out
2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3098 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2842 if $color & cf::NDI_DEF; 3099 if $color & cf::NDI_DEF;
2843 3100
2844 my $pkt = "msg " 3101 my $pkt = "msg "
2845 . $self->{json_coder}->encode ( 3102 . $self->{json_coder}->encode (
2846 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3103 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2847 ); 3104 );
2848 3105
2849 # try lzf for large packets
2850 $pkt = "lzf " . Compress::LZF::compress $pkt
2851 if 1024 <= length $pkt and $self->{can_lzf};
2852
2853 # split very large packets
2854 if (8192 < length $pkt and $self->{can_lzf}) {
2855 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 $pkt = "frag";
2857 }
2858
2859 $self->send_packet ($pkt); 3106 $self->send_big_packet ($pkt);
2860 } else {
2861 if ($color >= 0) {
2862 # replace some tags by gcfclient-compatible ones
2863 for ($msg) {
2864 1 while
2865 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2866 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2867 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2868 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2869 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2870 }
2871
2872 $color &= cf::NDI_COLOR_MASK;
2873
2874 utf8::encode $msg;
2875
2876 if (0 && $msg =~ /\[/) {
2877 # COMMAND/INFO
2878 $self->send_packet ("drawextinfo $color 10 8 $msg")
2879 } else {
2880 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2881 $self->send_packet ("drawinfo $color $msg")
2882 }
2883 }
2884 }
2885} 3107}
2886 3108
2887=item $client->ext_msg ($type, @msg) 3109=item $client->ext_msg ($type, @msg)
2888 3110
2889Sends an ext event to the client. 3111Sends an ext event to the client.
2892 3114
2893sub cf::client::ext_msg($$@) { 3115sub cf::client::ext_msg($$@) {
2894 my ($self, $type, @msg) = @_; 3116 my ($self, $type, @msg) = @_;
2895 3117
2896 if ($self->extcmd == 2) { 3118 if ($self->extcmd == 2) {
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2898 } elsif ($self->extcmd == 1) { # TODO: remove 3120 } elsif ($self->extcmd == 1) { # TODO: remove
2899 push @msg, msgtype => "event_$type"; 3121 push @msg, msgtype => "event_$type";
2900 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3122 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2901 } 3123 }
2902} 3124}
2903 3125
2904=item $client->ext_reply ($msgid, @msg) 3126=item $client->ext_reply ($msgid, @msg)
2905 3127
2909 3131
2910sub cf::client::ext_reply($$@) { 3132sub cf::client::ext_reply($$@) {
2911 my ($self, $id, @msg) = @_; 3133 my ($self, $id, @msg) = @_;
2912 3134
2913 if ($self->extcmd == 2) { 3135 if ($self->extcmd == 2) {
2914 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2915 } elsif ($self->extcmd == 1) { 3137 } elsif ($self->extcmd == 1) {
2916 #TODO: version 1, remove 3138 #TODO: version 1, remove
2917 unshift @msg, msgtype => "reply", msgid => $id; 3139 unshift @msg, msgtype => "reply", msgid => $id;
2918 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3140 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2919 } 3141 }
2920} 3142}
2921 3143
2922=item $success = $client->query ($flags, "text", \&cb) 3144=item $success = $client->query ($flags, "text", \&cb)
2923 3145
2994 3216
2995 $ns->ext_reply ($reply, @reply) 3217 $ns->ext_reply ($reply, @reply)
2996 if $reply; 3218 if $reply;
2997 3219
2998 } else { 3220 } else {
2999 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3221 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3000 } 3222 }
3001 3223
3002 cf::override; 3224 cf::override;
3003 }, 3225 },
3004); 3226);
3024 3246
3025 $coro 3247 $coro
3026} 3248}
3027 3249
3028cf::client->attach ( 3250cf::client->attach (
3029 on_destroy => sub { 3251 on_client_destroy => sub {
3030 my ($ns) = @_; 3252 my ($ns) = @_;
3031 3253
3032 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3254 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3033 }, 3255 },
3034); 3256);
3050our $safe_hole = new Safe::Hole; 3272our $safe_hole = new Safe::Hole;
3051 3273
3052$SIG{FPE} = 'IGNORE'; 3274$SIG{FPE} = 'IGNORE';
3053 3275
3054$safe->permit_only (Opcode::opset qw( 3276$safe->permit_only (Opcode::opset qw(
3055 :base_core :base_mem :base_orig :base_math 3277 :base_core :base_mem :base_orig :base_math :base_loop
3056 grepstart grepwhile mapstart mapwhile 3278 grepstart grepwhile mapstart mapwhile
3057 sort time 3279 sort time
3058)); 3280));
3059 3281
3060# here we export the classes and methods available to script code 3282# here we export the classes and methods available to script code
3064The following functions and methods are available within a safe environment: 3286The following functions and methods are available within a safe environment:
3065 3287
3066 cf::object 3288 cf::object
3067 contr pay_amount pay_player map x y force_find force_add destroy 3289 contr pay_amount pay_player map x y force_find force_add destroy
3068 insert remove name archname title slaying race decrease split 3290 insert remove name archname title slaying race decrease split
3291 value
3069 3292
3070 cf::object::player 3293 cf::object::player
3071 player 3294 player
3072 3295
3073 cf::player 3296 cf::player
3079=cut 3302=cut
3080 3303
3081for ( 3304for (
3082 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3305 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3083 insert remove inv nrof name archname title slaying race 3306 insert remove inv nrof name archname title slaying race
3084 decrease split destroy change_exp)], 3307 decrease split destroy change_exp value msg lore send_msg)],
3085 ["cf::object::player" => qw(player)], 3308 ["cf::object::player" => qw(player)],
3086 ["cf::player" => qw(peaceful)], 3309 ["cf::player" => qw(peaceful send_msg)],
3087 ["cf::map" => qw(trigger)], 3310 ["cf::map" => qw(trigger)],
3088) { 3311) {
3089 no strict 'refs';
3090 my ($pkg, @funs) = @$_; 3312 my ($pkg, @funs) = @$_;
3091 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3313 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3092 for @funs; 3314 for @funs;
3093} 3315}
3094 3316
3109 3331
3110 my $qcode = $code; 3332 my $qcode = $code;
3111 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3333 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3112 $qcode =~ s/\n/\\n/g; 3334 $qcode =~ s/\n/\\n/g;
3113 3335
3336 %vars = (_dummy => 0) unless %vars;
3337
3338 my @res;
3114 local $_; 3339 local $_;
3115 local @safe::cf::_safe_eval_args = values %vars;
3116 3340
3117 my $eval = 3341 my $eval =
3118 "do {\n" 3342 "do {\n"
3119 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3343 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3120 . "#line 0 \"{$qcode}\"\n" 3344 . "#line 0 \"{$qcode}\"\n"
3121 . $code 3345 . $code
3122 . "\n}" 3346 . "\n}"
3123 ; 3347 ;
3124 3348
3349 if ($CFG{safe_eval}) {
3125 sub_generation_inc; 3350 sub_generation_inc;
3351 local @safe::cf::_safe_eval_args = values %vars;
3126 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3352 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3127 sub_generation_inc; 3353 sub_generation_inc;
3354 } else {
3355 local @cf::_safe_eval_args = values %vars;
3356 @res = wantarray ? eval eval : scalar eval $eval;
3357 }
3128 3358
3129 if ($@) { 3359 if ($@) {
3130 warn "$@"; 3360 warn "$@",
3131 warn "while executing safe code '$code'\n"; 3361 "while executing safe code '$code'\n",
3132 warn "with arguments " . (join " ", %vars) . "\n"; 3362 "with arguments " . (join " ", %vars) . "\n";
3133 } 3363 }
3134 3364
3135 wantarray ? @res : $res[0] 3365 wantarray ? @res : $res[0]
3136} 3366}
3137 3367
3151=cut 3381=cut
3152 3382
3153sub register_script_function { 3383sub register_script_function {
3154 my ($fun, $cb) = @_; 3384 my ($fun, $cb) = @_;
3155 3385
3156 no strict 'refs'; 3386 $fun = "safe::$fun" if $CFG{safe_eval};
3157 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3387 *$fun = $safe_hole->wrap ($cb);
3158} 3388}
3159 3389
3160=back 3390=back
3161 3391
3162=cut 3392=cut
3171 # for this (global event?) 3401 # for this (global event?)
3172 %ext::player_env::MUSIC_FACE_CACHE = (); 3402 %ext::player_env::MUSIC_FACE_CACHE = ();
3173 3403
3174 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3404 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3175 3405
3176 warn "loading facedata from $path\n"; 3406 trace "loading facedata from $path\n";
3177 3407
3178 my $facedata;
3179 0 < aio_load $path, $facedata 3408 0 < aio_load $path, my $facedata
3180 or die "$path: $!"; 3409 or die "$path: $!";
3181 3410
3182 $facedata = Coro::Storable::thaw $facedata; 3411 $facedata = Coro::Storable::thaw $facedata;
3183 3412
3184 $facedata->{version} == 2 3413 $facedata->{version} == 2
3185 or cf::cleanup "$path: version mismatch, cannot proceed."; 3414 or cf::cleanup "$path: version mismatch, cannot proceed.";
3186 3415
3187 # patch in the exptable 3416 # patch in the exptable
3417 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3188 $facedata->{resource}{"res/exp_table"} = { 3418 $facedata->{resource}{"res/exp_table"} = {
3189 type => FT_RSRC, 3419 type => FT_RSRC,
3190 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3420 data => $exp_table,
3421 hash => (Digest::MD5::md5 $exp_table),
3191 }; 3422 };
3192 cf::cede_to_tick; 3423 cf::cede_to_tick;
3193 3424
3194 { 3425 {
3195 my $faces = $facedata->{faceinfo}; 3426 my $faces = $facedata->{faceinfo};
3197 while (my ($face, $info) = each %$faces) { 3428 while (my ($face, $info) = each %$faces) {
3198 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3429 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3199 3430
3200 cf::face::set_visibility $idx, $info->{visibility}; 3431 cf::face::set_visibility $idx, $info->{visibility};
3201 cf::face::set_magicmap $idx, $info->{magicmap}; 3432 cf::face::set_magicmap $idx, $info->{magicmap};
3202 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3433 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3203 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3434 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3204 3435
3205 cf::cede_to_tick; 3436 cf::cede_to_tick;
3206 } 3437 }
3207 3438
3208 while (my ($face, $info) = each %$faces) { 3439 while (my ($face, $info) = each %$faces) {
3213 3444
3214 if (my $smooth = cf::face::find $info->{smooth}) { 3445 if (my $smooth = cf::face::find $info->{smooth}) {
3215 cf::face::set_smooth $idx, $smooth; 3446 cf::face::set_smooth $idx, $smooth;
3216 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3447 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3217 } else { 3448 } else {
3218 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3449 error "smooth face '$info->{smooth}' not found for face '$face'";
3219 } 3450 }
3220 3451
3221 cf::cede_to_tick; 3452 cf::cede_to_tick;
3222 } 3453 }
3223 } 3454 }
3232 3463
3233 cf::anim::invalidate_all; # d'oh 3464 cf::anim::invalidate_all; # d'oh
3234 } 3465 }
3235 3466
3236 { 3467 {
3237 # TODO: for gcfclient pleasure, we should give resources
3238 # that gcfclient doesn't grok a >10000 face index.
3239 my $res = $facedata->{resource}; 3468 my $res = $facedata->{resource};
3240 3469
3241 while (my ($name, $info) = each %$res) { 3470 while (my ($name, $info) = each %$res) {
3242 if (defined $info->{type}) { 3471 if (defined $info->{type}) {
3243 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3472 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3244 my $data;
3245 3473
3246 if ($info->{type} & 1) { 3474 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3247 # prepend meta info
3248
3249 my $meta = $enc->encode ({
3250 name => $name,
3251 %{ $info->{meta} || {} },
3252 });
3253
3254 $data = pack "(w/a*)*", $meta, $info->{data};
3255 } else {
3256 $data = $info->{data};
3257 }
3258
3259 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3260 cf::face::set_type $idx, $info->{type}; 3475 cf::face::set_type $idx, $info->{type};
3261 } else { 3476 } else {
3262 $RESOURCE{$name} = $info; 3477 $RESOURCE{$name} = $info; # unused
3263 } 3478 }
3264 3479
3265 cf::cede_to_tick; 3480 cf::cede_to_tick;
3266 } 3481 }
3267 } 3482 }
3268 3483
3269 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3484 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3270 3485
3271 1 3486 1
3272} 3487}
3273
3274cf::global->attach (on_resource_update => sub {
3275 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3276 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3277
3278 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3279 my $sound = $soundconf->{compat}[$_]
3280 or next;
3281
3282 my $face = cf::face::find "sound/$sound->[1]";
3283 cf::sound::set $sound->[0] => $face;
3284 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3285 }
3286
3287 while (my ($k, $v) = each %{$soundconf->{event}}) {
3288 my $face = cf::face::find "sound/$v";
3289 cf::sound::set $k => $face;
3290 }
3291 }
3292});
3293 3488
3294register_exticmd fx_want => sub { 3489register_exticmd fx_want => sub {
3295 my ($ns, $want) = @_; 3490 my ($ns, $want) = @_;
3296 3491
3297 while (my ($k, $v) = each %$want) { 3492 while (my ($k, $v) = each %$want) {
3336sub reload_treasures { 3531sub reload_treasures {
3337 load_resource_file "$DATADIR/treasures" 3532 load_resource_file "$DATADIR/treasures"
3338 or die "unable to load treasurelists\n"; 3533 or die "unable to load treasurelists\n";
3339} 3534}
3340 3535
3536sub reload_sound {
3537 trace "loading sound config from $DATADIR/sound\n";
3538
3539 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3540 or die "$DATADIR/sound $!";
3541
3542 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3543
3544 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3545 my $sound = $soundconf->{compat}[$_]
3546 or next;
3547
3548 my $face = cf::face::find "sound/$sound->[1]";
3549 cf::sound::set $sound->[0] => $face;
3550 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3551 }
3552
3553 while (my ($k, $v) = each %{$soundconf->{event}}) {
3554 my $face = cf::face::find "sound/$v";
3555 cf::sound::set $k => $face;
3556 }
3557}
3558
3341sub reload_resources { 3559sub reload_resources {
3342 warn "reloading resource files...\n"; 3560 trace "reloading resource files...\n";
3343 3561
3562 reload_exp_table;
3563 reload_materials;
3344 reload_facedata; 3564 reload_facedata;
3565 reload_sound;
3345 reload_archetypes; 3566 reload_archetypes;
3346 reload_regions; 3567 reload_regions;
3347 reload_treasures; 3568 reload_treasures;
3348 3569
3349 warn "finished reloading resource files\n"; 3570 trace "finished reloading resource files\n";
3350}
3351
3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
3357 reload_resources;
3358} 3571}
3359 3572
3360sub reload_config { 3573sub reload_config {
3361 open my $fh, "<:utf8", "$CONFDIR/config" 3574 trace "reloading config file...\n";
3362 or return;
3363 3575
3364 local $/; 3576 0 < aio_load "$CONFDIR/config", my $config
3365 *CFG = YAML::Load <$fh>; 3577 or die "$CONFDIR/config: $!";
3366 3578
3579 utf8::decode $config;
3580 *CFG = yaml_load $config;
3581
3367 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3582 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3368 3583
3369 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3584 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3370 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3585 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3371 3586
3372 if (exists $CFG{mlockall}) { 3587 if (exists $CFG{mlockall}) {
3395 3610
3396 seek $fh, 0, 0; 3611 seek $fh, 0, 0;
3397 print $fh $$; 3612 print $fh $$;
3398} 3613}
3399 3614
3615sub main_loop {
3616 trace "EV::loop starting\n";
3617 if (1) {
3618 EV::loop;
3619 }
3620 trace "EV::loop returned\n";
3621 goto &main_loop unless $REALLY_UNLOOP;
3622}
3623
3400sub main { 3624sub main {
3401 atomic; 3625 cf::init_globals; # initialise logging
3626
3627 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3628 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3629 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3630 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3631
3632 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3402 3633
3403 # we must not ever block the main coroutine 3634 # we must not ever block the main coroutine
3404 local $Coro::idle = sub { 3635 local $Coro::idle = sub {
3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3636 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3406 (async { 3637 (async {
3407 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3638 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT; 3639 EV::loop EV::LOOP_ONESHOT;
3409 })->prio (Coro::PRIO_MAX); 3640 })->prio (Coro::PRIO_MAX);
3410 }; 3641 };
3411 3642
3412 { 3643 evthread_start IO::AIO::poll_fileno;
3413 my $guard = freeze_mainloop; 3644
3645 cf::sync_job {
3646 cf::incloader::init ();
3647
3648 cf::init_anim;
3649 cf::init_attackmess;
3650 cf::init_dynamic;
3651
3652 cf::load_settings;
3653
3654 reload_resources;
3414 reload_config; 3655 reload_config;
3415 db_init; 3656 db_init;
3657
3658 cf::init_uuid;
3659 cf::init_signals;
3660 cf::init_skills;
3661
3662 cf::init_beforeplay;
3663
3664 atomic;
3665
3416 load_extensions; 3666 load_extensions;
3417 3667
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 }
3420
3421 utime time, time, $RUNTIMEFILE; 3668 utime time, time, $RUNTIMEFILE;
3422 3669
3423 # no (long-running) fork's whatsoever before this point(!) 3670 # no (long-running) fork's whatsoever before this point(!)
3671 use POSIX ();
3424 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3672 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3425 3673
3426 EV::loop; 3674 cf::_post_init 0;
3675 };
3676
3677 cf::object::thawer::errors_are_fatal 0;
3678 info "parse errors in files are no longer fatal from this point on.\n";
3679
3680 my $free_main; $free_main = EV::idle sub {
3681 undef $free_main;
3682 undef &main; # free gobs of memory :)
3683 };
3684
3685 goto &main_loop;
3427} 3686}
3428 3687
3429############################################################################# 3688#############################################################################
3430# initialisation and cleanup 3689# initialisation and cleanup
3431 3690
3432# install some emergency cleanup handlers 3691# install some emergency cleanup handlers
3433BEGIN { 3692BEGIN {
3434 our %SIGWATCHER = (); 3693 our %SIGWATCHER = ();
3435 for my $signal (qw(INT HUP TERM)) { 3694 for my $signal (qw(INT HUP TERM)) {
3436 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3695 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3437 cf::cleanup "SIG$signal"; 3696 cf::cleanup "SIG$signal";
3438 }; 3697 };
3439 } 3698 }
3440} 3699}
3441 3700
3442sub write_runtime_sync { 3701sub write_runtime_sync {
3702 my $t0 = AE::time;
3703
3443 # first touch the runtime file to show we are still running: 3704 # first touch the runtime file to show we are still running:
3444 # the fsync below can take a very very long time. 3705 # the fsync below can take a very very long time.
3445 3706
3446 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3707 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3447 3708
3448 my $guard = cf::lock_acquire "write_runtime"; 3709 my $guard = cf::lock_acquire "write_runtime";
3449 3710
3450 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3711 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3451 or return; 3712 or return;
3452 3713
3453 my $value = $cf::RUNTIME + 90 + 10; 3714 my $value = $cf::RUNTIME + 90 + 10;
3454 # 10 is the runtime save interval, for a monotonic clock 3715 # 10 is the runtime save interval, for a monotonic clock
3455 # 60 allows for the watchdog to kill the server. 3716 # 60 allows for the watchdog to kill the server.
3468 or return; 3729 or return;
3469 3730
3470 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3731 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3471 and return; 3732 and return;
3472 3733
3473 warn "runtime file written.\n"; 3734 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3474 3735
3475 1 3736 1
3476} 3737}
3477 3738
3478our $uuid_lock; 3739our $uuid_lock;
3487 my $uuid = "$LOCALDIR/uuid"; 3748 my $uuid = "$LOCALDIR/uuid";
3488 3749
3489 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3750 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3490 or return; 3751 or return;
3491 3752
3492 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3753 my $value = uuid_seq uuid_cur;
3754
3755 unless ($value) {
3756 info "cowardly refusing to write zero uuid value!\n";
3757 return;
3758 }
3759
3760 my $value = uuid_str $value + $uuid_skip;
3493 $uuid_skip = 0; 3761 $uuid_skip = 0;
3494 3762
3495 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3763 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3496 and return; 3764 and return;
3497 3765
3503 or return; 3771 or return;
3504 3772
3505 aio_rename "$uuid~", $uuid 3773 aio_rename "$uuid~", $uuid
3506 and return; 3774 and return;
3507 3775
3508 warn "uuid file written ($value).\n"; 3776 trace "uuid file written ($value).\n";
3509 3777
3510 1 3778 1
3511 3779
3512} 3780}
3513 3781
3519} 3787}
3520 3788
3521sub emergency_save() { 3789sub emergency_save() {
3522 my $freeze_guard = cf::freeze_mainloop; 3790 my $freeze_guard = cf::freeze_mainloop;
3523 3791
3524 warn "enter emergency perl save\n"; 3792 info "emergency_perl_save: enter\n";
3793
3794 # this is a trade-off: we want to be very quick here, so
3795 # save all maps without fsync, and later call a global sync
3796 # (which in turn might be very very slow)
3797 local $USE_FSYNC = 0;
3525 3798
3526 cf::sync_job { 3799 cf::sync_job {
3800 cf::write_runtime_sync; # external watchdog should not bark
3801
3527 # use a peculiar iteration method to avoid tripping on perl 3802 # use a peculiar iteration method to avoid tripping on perl
3528 # refcount bugs in for. also avoids problems with players 3803 # refcount bugs in for. also avoids problems with players
3529 # and maps saved/destroyed asynchronously. 3804 # and maps saved/destroyed asynchronously.
3530 warn "begin emergency player save\n"; 3805 info "emergency_perl_save: begin player save\n";
3531 for my $login (keys %cf::PLAYER) { 3806 for my $login (keys %cf::PLAYER) {
3532 my $pl = $cf::PLAYER{$login} or next; 3807 my $pl = $cf::PLAYER{$login} or next;
3533 $pl->valid or next; 3808 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3809 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3535 $pl->save; 3810 $pl->save;
3536 } 3811 }
3537 warn "end emergency player save\n"; 3812 info "emergency_perl_save: end player save\n";
3538 3813
3539 warn "begin emergency map save\n"; 3814 cf::write_runtime_sync; # external watchdog should not bark
3815
3816 info "emergency_perl_save: begin map save\n";
3540 for my $path (keys %cf::MAP) { 3817 for my $path (keys %cf::MAP) {
3541 my $map = $cf::MAP{$path} or next; 3818 my $map = $cf::MAP{$path} or next;
3542 $map->valid or next; 3819 $map->valid or next;
3543 $map->save; 3820 $map->save;
3544 } 3821 }
3545 warn "end emergency map save\n"; 3822 info "emergency_perl_save: end map save\n";
3546 3823
3547 warn "begin emergency database checkpoint\n"; 3824 cf::write_runtime_sync; # external watchdog should not bark
3825
3826 info "emergency_perl_save: begin database checkpoint\n";
3548 BDB::db_env_txn_checkpoint $DB_ENV; 3827 BDB::db_env_txn_checkpoint $DB_ENV;
3549 warn "end emergency database checkpoint\n"; 3828 info "emergency_perl_save: end database checkpoint\n";
3550 3829
3551 warn "begin write uuid\n"; 3830 info "emergency_perl_save: begin write uuid\n";
3552 write_uuid_sync 1; 3831 write_uuid_sync 1;
3553 warn "end write uuid\n"; 3832 info "emergency_perl_save: end write uuid\n";
3833
3834 cf::write_runtime_sync; # external watchdog should not bark
3835
3836 trace "emergency_perl_save: syncing database to disk";
3837 BDB::db_env_txn_checkpoint $DB_ENV;
3838
3839 info "emergency_perl_save: starting sync\n";
3840 IO::AIO::aio_sync sub {
3841 info "emergency_perl_save: finished sync\n";
3842 };
3843
3844 cf::write_runtime_sync; # external watchdog should not bark
3845
3846 trace "emergency_perl_save: flushing outstanding aio requests";
3847 while (IO::AIO::nreqs || BDB::nreqs) {
3848 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3849 }
3850
3851 cf::write_runtime_sync; # external watchdog should not bark
3554 }; 3852 };
3555 3853
3556 warn "leave emergency perl save\n"; 3854 info "emergency_perl_save: leave\n";
3557} 3855}
3558 3856
3559sub post_cleanup { 3857sub post_cleanup {
3560 my ($make_core) = @_; 3858 my ($make_core) = @_;
3561 3859
3860 IO::AIO::flush;
3861
3562 warn Carp::longmess "post_cleanup backtrace" 3862 error Carp::longmess "post_cleanup backtrace"
3563 if $make_core; 3863 if $make_core;
3564 3864
3565 my $fh = pidfile; 3865 my $fh = pidfile;
3566 unlink $PIDFILE if <$fh> == $$; 3866 unlink $PIDFILE if <$fh> == $$;
3567} 3867}
3587 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3887 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3588 for my $name (keys %$leaf_symtab) { 3888 for my $name (keys %$leaf_symtab) {
3589 _gv_clear *{"$pkg$name"}; 3889 _gv_clear *{"$pkg$name"};
3590# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3890# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3591 } 3891 }
3592 warn "cleared package #$pkg\n";#d#
3593} 3892}
3594
3595our $RELOAD; # how many times to reload
3596 3893
3597sub do_reload_perl() { 3894sub do_reload_perl() {
3598 # can/must only be called in main 3895 # can/must only be called in main
3599 if ($Coro::current != $Coro::main) { 3896 unless (in_main) {
3600 warn "can only reload from main coroutine"; 3897 error "can only reload from main coroutine";
3601 return; 3898 return;
3602 } 3899 }
3603 3900
3604 return if $RELOAD++; 3901 return if $RELOAD++;
3605 3902
3903 my $t1 = AE::time;
3904
3606 while ($RELOAD) { 3905 while ($RELOAD) {
3607 warn "reloading..."; 3906 cf::get_slot 0.1, -1, "reload_perl";
3907 info "perl_reload: reloading...";
3608 3908
3609 warn "entering sync_job"; 3909 trace "perl_reload: entering sync_job";
3610 3910
3611 cf::sync_job { 3911 cf::sync_job {
3612 cf::write_runtime_sync; # external watchdog should not bark
3613 cf::emergency_save; 3912 #cf::emergency_save;
3614 cf::write_runtime_sync; # external watchdog should not bark
3615 3913
3616 warn "syncing database to disk";
3617 BDB::db_env_txn_checkpoint $DB_ENV;
3618
3619 # if anything goes wrong in here, we should simply crash as we already saved
3620
3621 warn "flushing outstanding aio requests";
3622 while (IO::AIO::nreqs || BDB::nreqs) {
3623 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3624 }
3625
3626 warn "cancelling all extension coros"; 3914 trace "perl_reload: cancelling all extension coros";
3627 $_->cancel for values %EXT_CORO; 3915 $_->cancel for values %EXT_CORO;
3628 %EXT_CORO = (); 3916 %EXT_CORO = ();
3629 3917
3630 warn "removing commands"; 3918 trace "perl_reload: removing commands";
3631 %COMMAND = (); 3919 %COMMAND = ();
3632 3920
3633 warn "removing ext/exti commands"; 3921 trace "perl_reload: removing ext/exti commands";
3634 %EXTCMD = (); 3922 %EXTCMD = ();
3635 %EXTICMD = (); 3923 %EXTICMD = ();
3636 3924
3637 warn "unloading/nuking all extensions"; 3925 trace "perl_reload: unloading/nuking all extensions";
3638 for my $pkg (@EXTS) { 3926 for my $pkg (@EXTS) {
3639 warn "... unloading $pkg"; 3927 trace "... unloading $pkg";
3640 3928
3641 if (my $cb = $pkg->can ("unload")) { 3929 if (my $cb = $pkg->can ("unload")) {
3642 eval { 3930 eval {
3643 $cb->($pkg); 3931 $cb->($pkg);
3644 1 3932 1
3645 } or warn "$pkg unloaded, but with errors: $@"; 3933 } or error "$pkg unloaded, but with errors: $@";
3646 } 3934 }
3647 3935
3648 warn "... clearing $pkg"; 3936 trace "... clearing $pkg";
3649 clear_package $pkg; 3937 clear_package $pkg;
3650 } 3938 }
3651 3939
3652 warn "unloading all perl modules loaded from $LIBDIR"; 3940 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3653 while (my ($k, $v) = each %INC) { 3941 while (my ($k, $v) = each %INC) {
3654 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3942 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3655 3943
3656 warn "... unloading $k"; 3944 trace "... unloading $k";
3657 delete $INC{$k}; 3945 delete $INC{$k};
3658 3946
3659 $k =~ s/\.pm$//; 3947 $k =~ s/\.pm$//;
3660 $k =~ s/\//::/g; 3948 $k =~ s/\//::/g;
3661 3949
3664 } 3952 }
3665 3953
3666 clear_package $k; 3954 clear_package $k;
3667 } 3955 }
3668 3956
3669 warn "getting rid of safe::, as good as possible"; 3957 trace "perl_reload: getting rid of safe::, as good as possible";
3670 clear_package "safe::$_" 3958 clear_package "safe::$_"
3671 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3959 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3672 3960
3673 warn "unloading cf.pm \"a bit\""; 3961 trace "perl_reload: unloading cf.pm \"a bit\"";
3674 delete $INC{"cf.pm"}; 3962 delete $INC{"cf.pm"};
3675 delete $INC{"cf/pod.pm"}; 3963 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3676 3964
3677 # don't, removes xs symbols, too, 3965 # don't, removes xs symbols, too,
3678 # and global variables created in xs 3966 # and global variables created in xs
3679 #clear_package __PACKAGE__; 3967 #clear_package __PACKAGE__;
3680 3968
3681 warn "unload completed, starting to reload now"; 3969 info "perl_reload: unload completed, starting to reload now";
3682 3970
3683 warn "reloading cf.pm"; 3971 trace "perl_reload: reloading cf.pm";
3684 require cf; 3972 require cf;
3685 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3973 cf::_connect_to_perl_1;
3686 3974
3687 warn "loading config and database again"; 3975 trace "perl_reload: loading config and database again";
3688 cf::reload_config; 3976 cf::reload_config;
3689 3977
3690 warn "loading extensions"; 3978 trace "perl_reload: loading extensions";
3691 cf::load_extensions; 3979 cf::load_extensions;
3692 3980
3981 if ($REATTACH_ON_RELOAD) {
3693 warn "reattaching attachments to objects/players"; 3982 trace "perl_reload: reattaching attachments to objects/players";
3694 _global_reattach; # objects, sockets 3983 _global_reattach; # objects, sockets
3695 warn "reattaching attachments to maps"; 3984 trace "perl_reload: reattaching attachments to maps";
3696 reattach $_ for values %MAP; 3985 reattach $_ for values %MAP;
3697 warn "reattaching attachments to players"; 3986 trace "perl_reload: reattaching attachments to players";
3698 reattach $_ for values %PLAYER; 3987 reattach $_ for values %PLAYER;
3988 }
3699 3989
3700 warn "leaving sync_job"; 3990 cf::_post_init 1;
3991
3992 trace "perl_reload: leaving sync_job";
3701 3993
3702 1 3994 1
3703 } or do { 3995 } or do {
3704 warn $@; 3996 error $@;
3705 cf::cleanup "error while reloading, exiting."; 3997 cf::cleanup "perl_reload: error, exiting.";
3706 }; 3998 };
3707 3999
3708 warn "reloaded";
3709 --$RELOAD; 4000 --$RELOAD;
3710 } 4001 }
4002
4003 $t1 = AE::time - $t1;
4004 info "perl_reload: completed in ${t1}s\n";
3711}; 4005};
3712 4006
3713our $RELOAD_WATCHER; # used only during reload 4007our $RELOAD_WATCHER; # used only during reload
3714 4008
3715sub reload_perl() { 4009sub reload_perl() {
3716 # doing reload synchronously and two reloads happen back-to-back, 4010 # doing reload synchronously and two reloads happen back-to-back,
3717 # coro crashes during coro_state_free->destroy here. 4011 # coro crashes during coro_state_free->destroy here.
3718 4012
4013 $RELOAD_WATCHER ||= cf::async {
4014 Coro::AIO::aio_wait cache_extensions;
4015
3719 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4016 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3720 do_reload_perl; 4017 do_reload_perl;
3721 undef $RELOAD_WATCHER; 4018 undef $RELOAD_WATCHER;
4019 };
3722 }; 4020 };
3723} 4021}
3724 4022
3725register_command "reload" => sub { 4023register_command "reload" => sub {
3726 my ($who, $arg) = @_; 4024 my ($who, $arg) = @_;
3732 reload_perl; 4030 reload_perl;
3733 }; 4031 };
3734 } 4032 }
3735}; 4033};
3736 4034
3737unshift @INC, $LIBDIR; 4035#############################################################################
3738 4036
3739my $bug_warning = 0; 4037my $bug_warning = 0;
3740 4038
3741our @WAIT_FOR_TICK; 4039our @WAIT_FOR_TICK;
3742our @WAIT_FOR_TICK_BEGIN; 4040our @WAIT_FOR_TICK_BEGIN;
3743 4041
3744sub wait_for_tick { 4042sub wait_for_tick() {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 4043 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3746 4044
3747 my $signal = new Coro::Signal; 4045 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK, $signal; 4046 push @WAIT_FOR_TICK, $signal;
3749 $signal->wait; 4047 $signal->wait;
3750} 4048}
3751 4049
3752sub wait_for_tick_begin { 4050sub wait_for_tick_begin() {
3753 return if tick_inhibit || $Coro::current == $Coro::main; 4051 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3754 4052
3755 my $signal = new Coro::Signal; 4053 my $signal = new Coro::Signal;
3756 push @WAIT_FOR_TICK_BEGIN, $signal; 4054 push @WAIT_FOR_TICK_BEGIN, $signal;
3757 $signal->wait; 4055 $signal->wait;
3758} 4056}
3764 return; 4062 return;
3765 } 4063 }
3766 4064
3767 cf::server_tick; # one server iteration 4065 cf::server_tick; # one server iteration
3768 4066
4067 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4068
3769 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4069 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3770 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4070 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3771 Coro::async_pool { 4071 Coro::async_pool {
3772 $Coro::current->{desc} = "runtime saver"; 4072 $Coro::current->{desc} = "runtime saver";
3773 write_runtime_sync 4073 write_runtime_sync
3774 or warn "ERROR: unable to write runtime file: $!"; 4074 or error "ERROR: unable to write runtime file: $!";
3775 }; 4075 };
3776 } 4076 }
3777 4077
3778 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4078 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3779 $sig->send; 4079 $sig->send;
3787 4087
3788 if (0) { 4088 if (0) {
3789 if ($NEXT_TICK) { 4089 if ($NEXT_TICK) {
3790 my $jitter = $TICK_START - $NEXT_TICK; 4090 my $jitter = $TICK_START - $NEXT_TICK;
3791 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4091 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3792 warn "jitter $JITTER\n";#d# 4092 debug "jitter $JITTER\n";#d#
3793 } 4093 }
3794 } 4094 }
3795} 4095}
3796 4096
3797{ 4097{
3798 # configure BDB 4098 # configure BDB
3799 4099
3800 BDB::min_parallel 8; 4100 BDB::min_parallel 16;
3801 BDB::max_poll_reqs $TICK * 0.1; 4101 BDB::max_poll_reqs $TICK * 0.1;
3802 $AnyEvent::BDB::WATCHER->priority (1); 4102 $AnyEvent::BDB::WATCHER->priority (1);
3803 4103
3804 unless ($DB_ENV) { 4104 unless ($DB_ENV) {
3805 $DB_ENV = BDB::db_env_create; 4105 $DB_ENV = BDB::db_env_create;
3842 IO::AIO::min_parallel 8; 4142 IO::AIO::min_parallel 8;
3843 IO::AIO::max_poll_time $TICK * 0.1; 4143 IO::AIO::max_poll_time $TICK * 0.1;
3844 undef $AnyEvent::AIO::WATCHER; 4144 undef $AnyEvent::AIO::WATCHER;
3845} 4145}
3846 4146
3847my $_log_backtrace; 4147our $_log_backtrace;
4148our $_log_backtrace_last;
3848 4149
3849sub _log_backtrace { 4150sub _log_backtrace {
3850 my ($msg, @addr) = @_; 4151 my ($msg, @addr) = @_;
3851 4152
3852 $msg =~ s/\n//; 4153 $msg =~ s/\n$//;
3853 4154
4155 if ($_log_backtrace_last eq $msg) {
4156 LOG llevInfo, "[ABT] $msg\n";
4157 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3854 # limit the # of concurrent backtraces 4158 # limit the # of concurrent backtraces
3855 if ($_log_backtrace < 2) { 4159 } elsif ($_log_backtrace < 2) {
4160 $_log_backtrace_last = $msg;
3856 ++$_log_backtrace; 4161 ++$_log_backtrace;
3857 my $perl_bt = Carp::longmess $msg; 4162 my $perl_bt = Carp::longmess $msg;
3858 async { 4163 async {
3859 $Coro::current->{desc} = "abt $msg"; 4164 $Coro::current->{desc} = "abt $msg";
3860 4165
3880 LOG llevInfo, "[ABT] $_\n" for @bt; 4185 LOG llevInfo, "[ABT] $_\n" for @bt;
3881 --$_log_backtrace; 4186 --$_log_backtrace;
3882 }; 4187 };
3883 } else { 4188 } else {
3884 LOG llevInfo, "[ABT] $msg\n"; 4189 LOG llevInfo, "[ABT] $msg\n";
3885 LOG llevInfo, "[ABT] [suppressed]\n"; 4190 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3886 } 4191 }
3887} 4192}
3888 4193
3889# load additional modules 4194# load additional modules
3890use cf::pod; 4195require "cf/$_.pm" for @EXTRA_MODULES;
4196cf::_connect_to_perl_2;
3891 4197
3892END { cf::emergency_save } 4198END { cf::emergency_save }
3893 4199
38941 42001
3895 4201

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines