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.418 by root, Fri Apr 11 21:09:53 2008 UTC vs.
Revision 1.552 by root, Mon May 17 21:12:59 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 utf8; 25use common::sense;
25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV 3.2; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp ();
35 36
37use Guard ();
36use Coro 4.50 (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
39use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
43use Coro::AIO; 48use Coro::AIO;
44use Coro::BDB; 49use Coro::BDB 1.6;
45use Coro::Storable; 50use Coro::Storable;
46use Coro::Util (); 51use Coro::Util ();
47 52
48use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
49use BDB (); 54use BDB ();
50use Data::Dumper; 55use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 56use Fcntl;
53use YAML (); 57use YAML::XS ();
54use IO::AIO 2.51 (); 58use IO::AIO ();
55use Time::HiRes; 59use Time::HiRes;
56use Compress::LZF; 60use Compress::LZF;
57use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
58 64
59# configure various modules to our taste 65# configure various modules to our taste
60# 66#
61$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
62Coro::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
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::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
64 75
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66 78
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
71 85
72our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
82our $DATADIR = datadir; 98our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
92our %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;
93 118
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 121our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
99 123
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 127our $DB_ENV;
105 128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
106our %CFG; 131our %CFG;
107 132
108our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 134our $RUNTIME;
110our $NOW; 135our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 146our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
123 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 :)
153
124binmode STDOUT; 154binmode STDOUT;
125binmode STDERR; 155binmode STDERR;
126 156
127# read virtual server time, if available 157# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
132} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
133 165
134mkdir $_ 166mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 168
137our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
138 170
139sub 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::"} };
140 187
141############################################################################# 188#############################################################################
142 189
143=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
144 191
186from wherever your confdir points to. 233from wherever your confdir points to.
187 234
188=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
189 236
190These 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
191returns 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
192per 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.
193 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
194=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
195 247
196This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
197C<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
198that call. 250that call.
199 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
200=back 258=back
201 259
202=cut 260=cut
203 261
204BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
205 *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 {
206 my $msg = join "", @_; 269 my $msg = join "", @_;
207 270
208 $msg .= "\n" 271 $msg .= "\n"
209 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
210 273
211 $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;
212 275
213 LOG llevError, $msg; 276 LOG llevWarn, $msg;
214 }; 277};
215}
216 278
217$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
219 281
220 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 286 return;#d#
223 }#d# 287 }#d#
224 288
225 # kill coroutine otherwise 289 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 290 Coro::terminate
228}; 291};
229
230$SIG{__DIE__} = sub { }; #d#?
231 292
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 303for my $pkg (qw(
243 cf::global cf::attachable 304 cf::global cf::attachable
244 cf::object cf::object::player 305 cf::object cf::object::player
245 cf::client cf::player 306 cf::client cf::player
246 cf::arch cf::living 307 cf::arch cf::living
308 cf::map cf::mapspace
247 cf::map cf::party cf::region 309 cf::party cf::region
248)) { 310)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 312}
252 313
253$EV::DIED = sub { 314$EV::DIED = sub {
254 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
255}; 316};
256 317
257############################################################################# 318#############################################################################
258 319
259=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
296our $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
297 358
298sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
300 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
301=item cf::lock_wait $string 405=item cf::lock_wait $string
302 406
303Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
304 408
305=item my $lock = cf::lock_acquire $string 409=item my $lock = cf::lock_acquire $string
306 410
307Wait 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
308a 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,
309for example when the coroutine gets canceled), the lock is automatically 413for example when the coroutine gets canceled), the lock is automatically
310returned. 414returned.
311 415
312Locks 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
313deadlocked coro. 417deadlocked coro.
319 423
320Return 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.
321 425
322=cut 426=cut
323 427
324our %LOCK; 428our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 429
327sub lock_wait($) { 430sub lock_wait($) {
328 my ($key) = @_; 431 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 432}
341 433
342sub lock_acquire($) { 434sub lock_acquire($) {
343 my ($key) = @_; 435 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 436}
357 437
358sub lock_active($) { 438sub lock_active($) {
359 my ($key) = @_; 439 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 440}
363 441
364sub freeze_mainloop { 442sub freeze_mainloop {
365 tick_inhibit_inc; 443 tick_inhibit_inc;
366 444
367 Coro::guard \&tick_inhibit_dec; 445 &Guard::guard (\&tick_inhibit_dec);
368} 446}
369 447
370=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
371 449
372Like 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
373get spread over timer. 451get spread over time.
374 452
375=cut 453=cut
376 454
377sub periodic($$) { 455sub periodic($$) {
378 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
395 473
396=cut 474=cut
397 475
398our @SLOT_QUEUE; 476our @SLOT_QUEUE;
399our $SLOT_QUEUE; 477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
400 479
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 481$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 482 $Coro::current->desc ("timeslot manager");
404 483
405 my $signal = new Coro::Signal; 484 my $signal = new Coro::Signal;
485 my $busy;
406 486
407 while () { 487 while () {
408 next_job: 488 next_job:
489
409 my $avail = cf::till_tick; 490 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 491
411 for (0 .. $#SLOT_QUEUE) { 492 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 495 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 496 $job->[2]->send;
415 Coro::cede; 497 Coro::cede;
416 goto next_job; 498 goto next_job;
417 } 499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 501 }
419 } 502 }
420 503
421 if (@SLOT_QUEUE) { 504 if (@SLOT_QUEUE) {
422 # 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
423 push @cf::WAIT_FOR_TICK, $signal; 506 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 507 $signal->wait;
425 } else { 508 } else {
509 $busy = 0;
426 Coro::schedule; 510 Coro::schedule;
427 } 511 }
428 } 512 }
429}; 513};
430 514
431sub get_slot($;$$) { 515sub get_slot($;$$) {
516 return if tick_inhibit || $Coro::current == $Coro::main;
517
432 my ($time, $pri, $name) = @_; 518 my ($time, $pri, $name) = @_;
433 519
434 $time = $TICK * .6 if $time > $TICK * .6; 520 $time = clamp $time, 0.01, $TICK * .6;
521
435 my $sig = new Coro::Signal; 522 my $sig = new Coro::Signal;
436 523
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready; 526 $SLOT_QUEUE->ready;
465=cut 552=cut
466 553
467sub sync_job(&) { 554sub sync_job(&) {
468 my ($job) = @_; 555 my ($job) = @_;
469 556
470 if ($Coro::current == $Coro::main) { 557 if (in_main) {
471 my $time = EV::time; 558 my $time = AE::time;
472 559
473 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
474 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
475 562
476 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
477 564
478 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
479 566
480 my $busy = 1; 567 my $busy = 1;
481 my @res; 568 my @res;
482 569
483 (async { 570 (async {
484 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
485 @res = eval { $job->() }; 572 @res = eval { $job->() };
486 warn $@ if $@; 573 error $@ if $@;
487 undef $busy; 574 undef $busy;
488 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
489 576
490 while ($busy) { 577 while ($busy) {
491 if (Coro::nready) { 578 if (Coro::nready) {
493 } else { 580 } else {
494 EV::loop EV::LOOP_ONESHOT; 581 EV::loop EV::LOOP_ONESHOT;
495 } 582 }
496 } 583 }
497 584
498 my $time = EV::time - $time; 585 my $time = AE::time - $time;
499 586
500 $TICK_START += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
501 588
502 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
503 } else { 590 } else {
525 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
526 613
527 $coro 614 $coro
528} 615}
529 616
530=item fork_call { }, $args 617=item fork_call { }, @args
531 618
532Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
533process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
534Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
535never block itself or use any form of event handling. 622never block itself or use any form of event handling.
536 623
537=cut 624=cut
538 625
626sub post_fork {
627 reset_signals;
628}
629
539sub fork_call(&@) { 630sub fork_call(&@) {
540 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
541 632
542 # 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,
543 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
544 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
545 636
546 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
547 reset_signals; 638 cf::post_fork;
548 &$cb 639 &$cb
549 }, @args; 640 } @args;
550 641
551 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 )
552} 654}
553 655
554=item $coin = coin_from_name $name 656=item $coin = coin_from_name $name
555 657
556=cut 658=cut
593within each server. 695within each server.
594 696
595=cut 697=cut
596 698
597sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
598 my ($name) = @_; 703 my ($name) = @_;
599 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
600 705
601 eval { 706 eval {
602 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
612} 717}
613 718
614our $DB; 719our $DB;
615 720
616sub db_init { 721sub db_init {
617 cf::sync_job {
618 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
619 };
620} 723}
621 724
622sub db_get($$) { 725sub db_get($$) {
623 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
624 727
625 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
626 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
627 732
628 $! ? () 733 $! ? ()
629 : $data 734 : $data
630 }
631} 735}
632 736
633sub db_put($$$) { 737sub db_put($$$) {
634 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
635 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
691 795
692 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
693 my $data = $process->(\@data); 797 my $data = $process->(\@data);
694 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
695 799
696 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
697 801
698 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
699 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
700 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
701 805
711 815
712=cut 816=cut
713 817
714sub datalog($@) { 818sub datalog($@) {
715 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
716 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
717} 821}
718 822
719=back 823=back
720 824
721=cut 825=cut
722 826
723############################################################################# 827#############################################################################
724 828
725=head2 ATTACHABLE OBJECTS 829=head2 ATTACHABLE OBJECTS
726 830
727Many objects in crossfire are so-called attachable objects. That means you can 831Many objects in deliantra are so-called attachable objects. That means you can
728attach callbacks/event handlers (a collection of which is called an "attachment") 832attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 833to it. All such attachable objects support the following methods.
730 834
731In the following description, CLASS can be any of C<global>, C<object> 835In the following description, CLASS can be any of C<global>, C<object>
732C<player>, C<client> or C<map> (i.e. the attachable objects in 836C<player>, C<client> or C<map> (i.e. the attachable objects in
782=item cf::CLASS::attachment $name, ... 886=item cf::CLASS::attachment $name, ...
783 887
784Register an attachment by C<$name> through which attachable objects of the 888Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 889given CLASS can refer to this attachment.
786 890
787Some classes such as crossfire maps and objects can specify attachments 891Some classes such as deliantra maps and objects can specify attachments
788that are attached at load/instantiate time, thus the need for a name. 892that are attached at load/instantiate time, thus the need for a name.
789 893
790These calls expect any number of the following handler/hook descriptions: 894These calls expect any number of the following handler/hook descriptions:
791 895
792=over 4 896=over 4
916 1020
917 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
918 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
919 1023
920 } elsif (ref $type) { 1024 } elsif (ref $type) {
921 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
922 1026
923 } else { 1027 } else {
924 shift @arg; 1028 shift @arg;
925 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
926 } 1030 }
927 } 1031 }
928} 1032}
929 1033
930sub _object_attach { 1034sub _object_attach {
940 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
941 } 1045 }
942 1046
943 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
944 } else { 1048 } else {
945 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
946 } 1050 }
947 1051
948 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
949} 1053}
950 1054
1009 1113
1010 for (@$callbacks) { 1114 for (@$callbacks) {
1011 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1012 1116
1013 if ($@) { 1117 if ($@) {
1014 warn "$@";
1015 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1016 override; 1119 override;
1017 } 1120 }
1018 1121
1019 return 1 if $override; 1122 return 1 if $override;
1020 } 1123 }
1083 1186
1084sub reattach { 1187sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1188 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1189 my ($obj) = @_;
1087 1190
1191 # no longer needed after getting rid of delete_package?
1088 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1192 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1089 1193
1090 my $registry = $obj->registry; 1194 my $registry = $obj->registry;
1091 1195
1092 @$registry = (); 1196 @$registry = ();
1093 1197
1098 for (@$attach) { 1202 for (@$attach) {
1099 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1100 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1101 } 1205 }
1102 } else { 1206 } else {
1103 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1104 } 1208 }
1105 } 1209 }
1106} 1210}
1107 1211
1108cf::attachable->attach ( 1212cf::attachable->attach (
1135 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1136 1240
1137 sync_job { 1241 sync_job {
1138 if (length $$rdata) { 1242 if (length $$rdata) {
1139 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1142 1247
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1249 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 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 }
1147 close $fh; 1255 aio_close $fh;
1148 1256
1149 if (@$objs) { 1257 if (@$objs) {
1150 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) {
1151 chmod SAVE_MODE, $fh; 1259 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1260 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1261 aio_write $fh, 0, (length $data), $data, 0;
1154 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 }
1155 close $fh; 1266 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1267 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1268 }
1158 } else { 1269 } else {
1159 aio_unlink "$filename.pst"; 1270 aio_unlink "$filename.pst";
1160 } 1271 }
1161 1272
1162 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1274
1275 $filename =~ s%/[^/]+$%%;
1276 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1277 } else {
1164 warn "FATAL: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1165 } 1279 }
1166 } else { 1280 } else {
1167 aio_unlink $filename; 1281 aio_unlink $filename;
1168 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1169 } 1283 }
1193 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1194 $av = $st->{objs}; 1308 $av = $st->{objs};
1195 } 1309 }
1196 1310
1197 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1198 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1199 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1200 1315
1201 ($data, $av) 1316 ($data, $av)
1202} 1317}
1203 1318
1204=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
1260 my ($name, $cb) = @_; 1375 my ($name, $cb) = @_;
1261 1376
1262 $EXTICMD{$name} = $cb; 1377 $EXTICMD{$name} = $cb;
1263} 1378}
1264 1379
1380use File::Glob ();
1381
1265cf::player->attach ( 1382cf::player->attach (
1266 on_command => sub { 1383 on_unknown_command => sub {
1267 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1268 1385
1269 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1270 or return; 1387 or return;
1271 1388
1294 1411
1295 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1296 if $reply; 1413 if $reply;
1297 1414
1298 } else { 1415 } else {
1299 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1300 } 1417 }
1301 1418
1302 cf::override; 1419 cf::override;
1303 }, 1420 },
1304); 1421);
1305 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
1306sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1307 cf::sync_job { 1439 cf::sync_job {
1308 my %todo; 1440 my %todo;
1309 1441
1310 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1311 next unless -r $path; 1443 next unless -r $path;
1329 1461
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1464
1333 $ext{source} = 1465 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1335 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1336 . $source 1468 . $source
1337 . "\n};\n1"; 1469 . "\n};\n1";
1338 1470
1339 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1340 } 1472 }
1341 1473
1474 my $pass = 0;
1342 my %done; 1475 my %done;
1343 while (%todo) { 1476 while (%todo) {
1344 my $progress; 1477 my $progress;
1345 1478
1479 ++$pass;
1480
1481 ext:
1346 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1347 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1348 goto skip 1484 next ext
1349 unless exists $done{$_}; 1485 unless exists $done{$_};
1350 } 1486 }
1351 1487
1352 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1353 1489
1354 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1355 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1356 : "$v->{base}: extension inactive.\n";
1357 1494
1358 if (exists $v->{meta}{mandatory}) {
1359 warn $msg;
1360 cf::cleanup "mandatory extension failed to load, exiting."; 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1361 } 1496 if exists $v->{meta}{mandatory};
1362 1497
1363 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;
1364 } 1507 }
1365
1366 $done{$k} = delete $todo{$k};
1367 push @EXTS, $v->{pkg};
1368 $progress = 1;
1369 } 1508 }
1370 1509
1371 skip: 1510 unless ($progress) {
1372 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1373 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 }
1374 } 1518 }
1375 }; 1519 };
1376} 1520}
1377 1521
1378############################################################################# 1522#############################################################################
1379 1523
1380=back 1524=back
1381 1525
1382=head2 CORE EXTENSIONS 1526=head2 CORE EXTENSIONS
1383 1527
1384Functions and methods that extend core crossfire objects. 1528Functions and methods that extend core deliantra objects.
1385 1529
1386=cut 1530=cut
1387 1531
1388package cf::player; 1532package cf::player;
1389 1533
1432 1576
1433sub exists($) { 1577sub exists($) {
1434 my ($login) = @_; 1578 my ($login) = @_;
1435 1579
1436 $cf::PLAYER{$login} 1580 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1581 or !aio_stat path $login
1438} 1582}
1439 1583
1440sub find($) { 1584sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1585 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1586 my $login = $_[0];
1454 my $f = new_from_file cf::object::thawer path $login 1598 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1599 or return;
1456 1600
1457 my $pl = cf::player::load_pl $f 1601 my $pl = cf::player::load_pl $f
1458 or return; 1602 or return;
1603
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1604 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1605 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1462 } 1607 }
1463 } 1608 }
1464} 1609}
1465 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
1466sub save($) { 1624sub save($) {
1467 my ($pl) = @_; 1625 my ($pl) = @_;
1468 1626
1469 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1470 1628
1473 1631
1474 return if $pl->{deny_save}; 1632 return if $pl->{deny_save};
1475 1633
1476 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1636
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];
1478 1641
1479 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1643 cf::cede_to_tick;
1481} 1644}
1482 1645
1514 my ($pl) = @_; 1677 my ($pl) = @_;
1515 1678
1516 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1517 1680
1518 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1519 $pl->password ("*"); # this should lock out the player until we nuked the dir 1682 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1520 1683
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1522 $pl->deactivate; 1685 $pl->deactivate;
1686
1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1524 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1525 1692
1526 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1528 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
1566 1733
1567 for my $login (@$dirs) { 1734 for my $login (@$dirs) {
1568 my $path = path $login; 1735 my $path = path $login;
1569 1736
1570 # a .pst is a dead give-away for a valid player 1737 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1738 # if no pst file found, open and chekc for blocked users
1739 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1740 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1741 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1742 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1743 }
1576 1744
1580 1748
1581 \@logins 1749 \@logins
1582} 1750}
1583 1751
1584=item $player->maps 1752=item $player->maps
1753
1754=item cf::player::maps $login
1585 1755
1586Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1587player. May block. 1757player. May block.
1588 1758
1589=cut 1759=cut
1607 } 1777 }
1608 1778
1609 \@paths 1779 \@paths
1610} 1780}
1611 1781
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1782=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1783
1614Expand crossfire pod fragments into protocol xml. 1784Expand deliantra pod fragments into protocol xml.
1615
1616=cut
1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1629sub expand_cfpod {
1630 my ($self, $pod) = @_;
1631
1632 my $xml;
1633
1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group;
1642 } elsif ($pod =~ m%\G
1643 ([BCGHITU])
1644 <
1645 (?:
1646 ([^<>]*) (?{ $group = $^N })
1647 | < $interior >
1648 )
1649 >
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "")
1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1694
1695 $xml
1696}
1697
1698no re 'eval';
1699
1700sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode}
1703}
1704 1785
1705=item $player->ext_reply ($msgid, @msg) 1786=item $player->ext_reply ($msgid, @msg)
1706 1787
1707Sends an ext reply to the player. 1788Sends an ext reply to the player.
1708 1789
1740 1821
1741=cut 1822=cut
1742 1823
1743sub find_by_path($) { 1824sub find_by_path($) {
1744 my ($path) = @_; 1825 my ($path) = @_;
1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1745 1828
1746 my ($match, $specificity); 1829 my ($match, $specificity);
1747 1830
1748 for my $region (list) { 1831 for my $region (list) {
1749 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1781 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
1782 1865
1783 # mit "rum" bekleckern, nicht 1866 # mit "rum" bekleckern, nicht
1784 $self->_create_random_map ( 1867 $self->_create_random_map (
1785 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1786 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1869 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1787 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1870 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1788 $rmp->{exit_on_final_map}, 1871 $rmp->{exit_on_final_map},
1789 $rmp->{xsize}, $rmp->{ysize}, 1872 $rmp->{xsize}, $rmp->{ysize},
1790 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1873 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1791 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1874 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1806 1889
1807sub register { 1890sub register {
1808 my (undef, $regex, $prio) = @_; 1891 my (undef, $regex, $prio) = @_;
1809 my $pkg = caller; 1892 my $pkg = caller;
1810 1893
1811 no strict;
1812 push @{"$pkg\::ISA"}, __PACKAGE__; 1894 push @{"$pkg\::ISA"}, __PACKAGE__;
1813 1895
1814 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1896 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1815} 1897}
1816 1898
1817# also paths starting with '/' 1899# also paths starting with '/'
1818$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1900$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1819 1901
1820sub thawer_merge { 1902sub thawer_merge {
1821 my ($self, $merge) = @_; 1903 my ($self, $merge) = @_;
1822 1904
1823 # we have to keep some variables in memory intact 1905 # we have to keep some variables in memory intact
1828} 1910}
1829 1911
1830sub normalise { 1912sub normalise {
1831 my ($path, $base) = @_; 1913 my ($path, $base) = @_;
1832 1914
1833 $path = "$path"; # make sure its a string 1915 $path = "$path"; # make sure it's a string
1834 1916
1835 $path =~ s/\.map$//; 1917 $path =~ s/\.map$//;
1836 1918
1837 # map plan: 1919 # map plan:
1838 # 1920 #
1853 $base =~ s{[^/]+/?$}{}; 1935 $base =~ s{[^/]+/?$}{};
1854 $path = "$base/$path"; 1936 $path = "$base/$path";
1855 } 1937 }
1856 1938
1857 for ($path) { 1939 for ($path) {
1858 redo if s{//}{/};
1859 redo if s{/\.?/}{/}; 1940 redo if s{/\.?/}{/};
1860 redo if s{/[^/]+/\.\./}{/}; 1941 redo if s{/[^/]+/\.\./}{/};
1861 } 1942 }
1862 1943
1863 $path 1944 $path
1877 $self->init; # pass $1 etc. 1958 $self->init; # pass $1 etc.
1878 return $self; 1959 return $self;
1879 } 1960 }
1880 } 1961 }
1881 1962
1882 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1963 Carp::cluck "unable to resolve path '$path' (base '$base')";
1883 () 1964 ()
1884} 1965}
1885 1966
1886sub init { 1967sub init {
1887 my ($self) = @_; 1968 my ($self) = @_;
1909 1990
1910# the temporary/swap location 1991# the temporary/swap location
1911sub save_path { 1992sub save_path {
1912 my ($self) = @_; 1993 my ($self) = @_;
1913 1994
1914 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1995 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1915 "$TMPDIR/$path.map" 1996 "$TMPDIR/$path.map"
1916} 1997}
1917 1998
1918# the unique path, undef == no special unique path 1999# the unique path, undef == no special unique path
1919sub uniq_path { 2000sub uniq_path {
1920 my ($self) = @_; 2001 my ($self) = @_;
1921 2002
1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2003 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1923 "$UNIQUEDIR/$path" 2004 "$UNIQUEDIR/$path"
1924}
1925
1926# and all this just because we cannot iterate over
1927# all maps in C++...
1928sub change_all_map_light {
1929 my ($change) = @_;
1930
1931 $_->change_map_light ($change)
1932 for grep $_->outdoor, values %cf::MAP;
1933} 2005}
1934 2006
1935sub decay_objects { 2007sub decay_objects {
1936 my ($self) = @_; 2008 my ($self) = @_;
1937 2009
2019 2091
2020sub find; 2092sub find;
2021sub find { 2093sub find {
2022 my ($path, $origin) = @_; 2094 my ($path, $origin) = @_;
2023 2095
2096 cf::cede_to_tick;
2097
2024 $path = normalise $path, $origin && $origin->path; 2098 $path = normalise $path, $origin && $origin->path;
2025 2099
2026 cf::lock_wait "map_data:$path";#d#remove 2100 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2027 cf::lock_wait "map_find:$path"; 2101 my $guard2 = cf::lock_acquire "map_find:$path";
2028 2102
2029 $cf::MAP{$path} || do { 2103 $cf::MAP{$path} || do {
2030 my $guard1 = cf::lock_acquire "map_find:$path";
2031 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2032
2033 my $map = new_from_path cf::map $path 2104 my $map = new_from_path cf::map $path
2034 or return; 2105 or return;
2035 2106
2036 $map->{last_save} = $cf::RUNTIME; 2107 $map->{last_save} = $cf::RUNTIME;
2037 2108
2039 or return; 2110 or return;
2040 2111
2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2112 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2042 # doing this can freeze the server in a sync job, obviously 2113 # doing this can freeze the server in a sync job, obviously
2043 #$cf::WAIT_FOR_TICK->wait; 2114 #$cf::WAIT_FOR_TICK->wait;
2115 undef $guard2;
2044 undef $guard1; 2116 undef $guard1;
2045 undef $guard2;
2046 $map->reset; 2117 $map->reset;
2047 return find $path; 2118 return find $path;
2048 } 2119 }
2049 2120
2050 $cf::MAP{$path} = $map 2121 $cf::MAP{$path} = $map
2051 } 2122 }
2052} 2123}
2053 2124
2054sub pre_load { } 2125sub pre_load { }
2055sub post_load { } 2126#sub post_load { } # XS
2056 2127
2057sub load { 2128sub load {
2058 my ($self) = @_; 2129 my ($self) = @_;
2059 2130
2060 local $self->{deny_reset} = 1; # loading can take a long time 2131 local $self->{deny_reset} = 1; # loading can take a long time
2077 my $f = new_from_file cf::object::thawer $self->{load_path}; 2148 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block; 2149 $f->skip_block;
2079 $self->_load_objects ($f) 2150 $self->_load_objects ($f)
2080 or return; 2151 or return;
2081 2152
2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2153 $self->post_load_original
2083 if delete $self->{load_original}; 2154 if delete $self->{load_original};
2084 2155
2085 if (my $uniq = $self->uniq_path) { 2156 if (my $uniq = $self->uniq_path) {
2086 utf8::encode $uniq; 2157 utf8::encode $uniq;
2087 unless (aio_stat $uniq) { 2158 unless (aio_stat $uniq) {
2105 unless ($self->{deny_activate}) { 2176 unless ($self->{deny_activate}) {
2106 $self->decay_objects; 2177 $self->decay_objects;
2107 $self->fix_auto_apply; 2178 $self->fix_auto_apply;
2108 $self->update_buttons; 2179 $self->update_buttons;
2109 cf::cede_to_tick; 2180 cf::cede_to_tick;
2110 $self->set_darkness_map;
2111 cf::cede_to_tick;
2112 $self->activate; 2181 $self->activate;
2113 } 2182 }
2114 2183
2115 $self->{last_save} = $cf::RUNTIME; 2184 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME); 2185 $self->last_access ($cf::RUNTIME);
2117 2186
2118 $self->in_memory (cf::MAP_IN_MEMORY); 2187 $self->in_memory (cf::MAP_ACTIVE);
2119 } 2188 }
2120 2189
2121 $self->post_load; 2190 $self->post_load;
2122} 2191}
2123 2192
2193# customize the map for a given player, i.e.
2194# return the _real_ map. used by e.g. per-player
2195# maps to change the path to ~playername/mappath
2124sub customise_for { 2196sub customise_for {
2125 my ($self, $ob) = @_; 2197 my ($self, $ob) = @_;
2126 2198
2127 return find "~" . $ob->name . "/" . $self->{path} 2199 return find "~" . $ob->name . "/" . $self->{path}
2128 if $self->per_player; 2200 if $self->per_player;
2144 or next; 2216 or next;
2145 $neigh = find $neigh, $map 2217 $neigh = find $neigh, $map
2146 or next; 2218 or next;
2147 $neigh->load; 2219 $neigh->load;
2148 2220
2221 # now find the diagonal neighbours
2149 push @neigh, 2222 push @neigh,
2150 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2223 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2151 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2224 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2152 } 2225 }
2153 2226
2160} 2233}
2161 2234
2162sub find_sync { 2235sub find_sync {
2163 my ($path, $origin) = @_; 2236 my ($path, $origin) = @_;
2164 2237
2165 cf::sync_job { find $path, $origin } 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2239 if $Coro::current == $Coro::main;
2240
2241 find $path, $origin
2166} 2242}
2167 2243
2168sub do_load_sync { 2244sub do_load_sync {
2169 my ($map) = @_; 2245 my ($map) = @_;
2170 2246
2171 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2247 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2172 if $Coro::current == $Coro::main; 2248 if $Coro::current == $Coro::main;
2173 2249
2174 cf::sync_job { $map->load }; 2250 $map->load;
2175} 2251}
2176 2252
2177our %MAP_PREFETCH; 2253our %MAP_PREFETCH;
2178our $MAP_PREFETCHER = undef; 2254our $MAP_PREFETCHER = undef;
2179 2255
2181 my ($path, $origin, $load) = @_; 2257 my ($path, $origin, $load) = @_;
2182 2258
2183 $path = normalise $path, $origin && $origin->{path}; 2259 $path = normalise $path, $origin && $origin->{path};
2184 2260
2185 if (my $map = $cf::MAP{$path}) { 2261 if (my $map = $cf::MAP{$path}) {
2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2262 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2187 } 2263 }
2188 2264
2189 $MAP_PREFETCH{$path} |= $load; 2265 $MAP_PREFETCH{$path} |= $load;
2190 2266
2191 $MAP_PREFETCHER ||= cf::async { 2267 $MAP_PREFETCHER ||= cf::async {
2205 $MAP_PREFETCHER->prio (6); 2281 $MAP_PREFETCHER->prio (6);
2206 2282
2207 () 2283 ()
2208} 2284}
2209 2285
2286# common code, used by both ->save and ->swapout
2210sub save { 2287sub _save {
2211 my ($self) = @_; 2288 my ($self) = @_;
2212
2213 my $lock = cf::lock_acquire "map_data:$self->{path}";
2214 2289
2215 $self->{last_save} = $cf::RUNTIME; 2290 $self->{last_save} = $cf::RUNTIME;
2216 2291
2217 return unless $self->dirty; 2292 return unless $self->dirty;
2218 2293
2227 2302
2228 cf::async { 2303 cf::async {
2229 $Coro::current->{desc} = "map player save"; 2304 $Coro::current->{desc} = "map player save";
2230 $_->contr->save for $self->players; 2305 $_->contr->save for $self->players;
2231 }; 2306 };
2307
2308 cf::get_slot 0.02;
2232 2309
2233 if ($uniq) { 2310 if ($uniq) {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2311 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2235 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2312 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2236 } else { 2313 } else {
2237 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2314 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2238 } 2315 }
2239} 2316}
2240 2317
2318sub save {
2319 my ($self) = @_;
2320
2321 my $lock = cf::lock_acquire "map_data:$self->{path}";
2322
2323 $self->_save;
2324}
2325
2241sub swap_out { 2326sub swap_out {
2242 my ($self) = @_; 2327 my ($self) = @_;
2243 2328
2244 # save first because save cedes
2245 $self->save;
2246
2247 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2329 my $lock = cf::lock_acquire "map_data:$self->{path}";
2248 2330
2331 return if $self->in_memory != cf::MAP_ACTIVE;
2332 return if $self->{deny_save};
2249 return if $self->players; 2333 return if $self->players;
2250 return if $self->in_memory != cf::MAP_IN_MEMORY;
2251 return if $self->{deny_save};
2252 2334
2335 # first deactivate the map and "unlink" it from the core
2336 $self->deactivate;
2337 $_->clear_links_to ($self) for values %cf::MAP;
2253 $self->in_memory (cf::MAP_SWAPPED); 2338 $self->in_memory (cf::MAP_SWAPPED);
2339
2340 # then atomically save
2341 $self->_save;
2342
2343 # then free the map
2344 $self->clear;
2345}
2346
2347sub reset_at {
2348 my ($self) = @_;
2349
2350 # TODO: safety, remove and allow resettable per-player maps
2351 return 1e99 if $self->{deny_reset};
2352
2353 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2354 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2355
2356 $time + $to
2357}
2358
2359sub should_reset {
2360 my ($self) = @_;
2361
2362 $self->reset_at <= $cf::RUNTIME
2363}
2364
2365sub reset {
2366 my ($self) = @_;
2367
2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2369
2370 return if $self->players;
2371
2372 cf::trace "resetting map ", $self->path, "\n";
2373
2374 $self->in_memory (cf::MAP_SWAPPED);
2375
2376 # need to save uniques path
2377 unless ($self->{deny_save}) {
2378 my $uniq = $self->uniq_path; utf8::encode $uniq;
2379
2380 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2381 if $uniq;
2382 }
2383
2384 delete $cf::MAP{$self->path};
2254 2385
2255 $self->deactivate; 2386 $self->deactivate;
2256 $_->clear_links_to ($self) for values %cf::MAP; 2387 $_->clear_links_to ($self) for values %cf::MAP;
2257 $self->clear; 2388 $self->clear;
2258}
2259
2260sub reset_at {
2261 my ($self) = @_;
2262
2263 # TODO: safety, remove and allow resettable per-player maps
2264 return 1e99 if $self->{deny_reset};
2265
2266 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2267 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2268
2269 $time + $to
2270}
2271
2272sub should_reset {
2273 my ($self) = @_;
2274
2275 $self->reset_at <= $cf::RUNTIME
2276}
2277
2278sub reset {
2279 my ($self) = @_;
2280
2281 my $lock = cf::lock_acquire "map_data:$self->{path}";
2282
2283 return if $self->players;
2284
2285 warn "resetting map ", $self->path;
2286
2287 $self->in_memory (cf::MAP_SWAPPED);
2288
2289 # need to save uniques path
2290 unless ($self->{deny_save}) {
2291 my $uniq = $self->uniq_path; utf8::encode $uniq;
2292
2293 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2294 if $uniq;
2295 }
2296
2297 delete $cf::MAP{$self->path};
2298
2299 $self->deactivate;
2300 $_->clear_links_to ($self) for values %cf::MAP;
2301 $self->clear;
2302 2389
2303 $self->unlink_save; 2390 $self->unlink_save;
2304 $self->destroy; 2391 $self->destroy;
2305} 2392}
2306 2393
2314 2401
2315 delete $cf::MAP{$self->path}; 2402 delete $cf::MAP{$self->path};
2316 2403
2317 $self->unlink_save; 2404 $self->unlink_save;
2318 2405
2319 bless $self, "cf::map"; 2406 bless $self, "cf::map::wrap";
2320 delete $self->{deny_reset}; 2407 delete $self->{deny_reset};
2321 $self->{deny_save} = 1; 2408 $self->{deny_save} = 1;
2322 $self->reset_timeout (1); 2409 $self->reset_timeout (1);
2323 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2410 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2324 2411
2373 2460
2374sub unique_maps() { 2461sub unique_maps() {
2375 [ 2462 [
2376 map { 2463 map {
2377 utf8::decode $_; 2464 utf8::decode $_;
2378 /\.map$/ 2465 s/\.map$//; # TODO future compatibility hack
2466 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2467 ? ()
2379 ? normalise $_ 2468 : normalise $_
2380 : ()
2381 } @{ aio_readdir $UNIQUEDIR or [] } 2469 } @{ aio_readdir $UNIQUEDIR or [] }
2382 ] 2470 ]
2383} 2471}
2384 2472
2473=item cf::map::static_maps
2474
2475Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2476file in the shared directory excluding F</styles> and F</editor>). May
2477block.
2478
2479=cut
2480
2481sub static_maps() {
2482 my @dirs = "";
2483 my @maps;
2484
2485 while (@dirs) {
2486 my $dir = shift @dirs;
2487
2488 next if $dir eq "/styles" || $dir eq "/editor";
2489
2490 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2491 or return;
2492
2493 for (@$files) {
2494 s/\.map$// or next;
2495 utf8::decode $_;
2496 push @maps, "$dir/$_";
2497 }
2498
2499 push @dirs, map "$dir/$_", @$dirs;
2500 }
2501
2502 \@maps
2503}
2504
2385=back 2505=back
2386 2506
2387=head3 cf::object 2507=head3 cf::object
2388 2508
2389=cut 2509=cut
2392 2512
2393=over 4 2513=over 4
2394 2514
2395=item $ob->inv_recursive 2515=item $ob->inv_recursive
2396 2516
2397Returns the inventory of the object _and_ their inventories, recursively. 2517Returns the inventory of the object I<and> their inventories, recursively,
2518but I<not> the object itself.
2398 2519
2399=cut 2520=cut
2400 2521
2401sub inv_recursive_; 2522sub inv_recursive_;
2402sub inv_recursive_ { 2523sub inv_recursive_ {
2407 inv_recursive_ inv $_[0] 2528 inv_recursive_ inv $_[0]
2408} 2529}
2409 2530
2410=item $ref = $ob->ref 2531=item $ref = $ob->ref
2411 2532
2412creates and returns a persistent reference to an objetc that can be stored as a string. 2533Creates and returns a persistent reference to an object that can be stored as a string.
2413 2534
2414=item $ob = cf::object::deref ($refstring) 2535=item $ob = cf::object::deref ($refstring)
2415 2536
2416returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2537returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2417even if the object actually exists. May block. 2538even if the object actually exists. May block.
2449can be C<undef>. Does the right thing when the player is currently in a 2570can be C<undef>. Does the right thing when the player is currently in a
2450dialogue with the given NPC character. 2571dialogue with the given NPC character.
2451 2572
2452=cut 2573=cut
2453 2574
2575our $SAY_CHANNEL = {
2576 id => "say",
2577 title => "Map",
2578 reply => "say ",
2579 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2580};
2581
2582our $CHAT_CHANNEL = {
2583 id => "chat",
2584 title => "Chat",
2585 reply => "chat ",
2586 tooltip => "Player chat and shouts, global to the server.",
2587};
2588
2454# rough implementation of a future "reply" method that works 2589# rough implementation of a future "reply" method that works
2455# with dialog boxes. 2590# with dialog boxes.
2456#TODO: the first argument must go, split into a $npc->reply_to ( method 2591#TODO: the first argument must go, split into a $npc->reply_to ( method
2457sub cf::object::player::reply($$$;$) { 2592sub cf::object::player::reply($$$;$) {
2458 my ($self, $npc, $msg, $flags) = @_; 2593 my ($self, $npc, $msg, $flags) = @_;
2469 my $dialog = $pl->{npc_dialog}; 2604 my $dialog = $pl->{npc_dialog};
2470 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2605 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2471 2606
2472 } else { 2607 } else {
2473 $msg = $npc->name . " says: $msg" if $npc; 2608 $msg = $npc->name . " says: $msg" if $npc;
2474 $self->message ($msg, $flags); 2609 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2475 } 2610 }
2476 } 2611 }
2477} 2612}
2478 2613
2479=item $object->send_msg ($channel, $msg, $color, [extra...]) 2614=item $object->send_msg ($channel, $msg, $color, [extra...])
2504 2639
2505=item $player_object->enter_link 2640=item $player_object->enter_link
2506 2641
2507Freezes the player and moves him/her to a special map (C<{link}>). 2642Freezes the player and moves him/her to a special map (C<{link}>).
2508 2643
2509The player should be reasonably safe there for short amounts of time. You 2644The player should be reasonably safe there for short amounts of time (e.g.
2510I<MUST> call C<leave_link> as soon as possible, though. 2645for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2646though, as the player cannot control the character while it is on the link
2647map.
2511 2648
2512Will never block. 2649Will never block.
2513 2650
2514=item $player_object->leave_link ($map, $x, $y) 2651=item $player_object->leave_link ($map, $x, $y)
2515 2652
2535sub cf::object::player::enter_link { 2672sub cf::object::player::enter_link {
2536 my ($self) = @_; 2673 my ($self) = @_;
2537 2674
2538 $self->deactivate_recursive; 2675 $self->deactivate_recursive;
2539 2676
2677 ++$self->{_link_recursion};
2678
2540 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2679 return if UNIVERSAL::isa $self->map, "ext::map_link";
2541 2680
2542 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2681 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2543 if $self->map && $self->map->{path} ne "{link}"; 2682 if $self->map && $self->map->{path} ne "{link}";
2544 2683
2545 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2684 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2546} 2685}
2547 2686
2548sub cf::object::player::leave_link { 2687sub cf::object::player::leave_link {
2549 my ($self, $map, $x, $y) = @_; 2688 my ($self, $map, $x, $y) = @_;
2550 2689
2567 ($x, $y) = (-1, -1) 2706 ($x, $y) = (-1, -1)
2568 unless (defined $x) && (defined $y); 2707 unless (defined $x) && (defined $y);
2569 2708
2570 # use -1 or undef as default coordinates, not 0, 0 2709 # use -1 or undef as default coordinates, not 0, 0
2571 ($x, $y) = ($map->enter_x, $map->enter_y) 2710 ($x, $y) = ($map->enter_x, $map->enter_y)
2572 if $x <=0 && $y <= 0; 2711 if $x <= 0 && $y <= 0;
2573 2712
2574 $map->load; 2713 $map->load;
2575 $map->load_neighbours; 2714 $map->load_neighbours;
2576 2715
2577 return unless $self->contr->active; 2716 return unless $self->contr->active;
2578 $self->activate_recursive;
2579 2717
2580 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2718 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2581 $self->enter_map ($map, $x, $y); 2719 if ($self->enter_map ($map, $x, $y)) {
2582} 2720 # entering was successful
2721 delete $self->{_link_recursion};
2722 # only activate afterwards, to support waiting in hooks
2723 $self->activate_recursive;
2724 }
2583 2725
2726}
2727
2584=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2728=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2585 2729
2586Moves the player to the given map-path and coordinates by first freezing 2730Moves the player to the given map-path and coordinates by first freezing
2587her, loading and preparing them map, calling the provided $check callback 2731her, loading and preparing them map, calling the provided $check callback
2588that has to return the map if sucecssful, and then unfreezes the player on 2732that has to return the map if sucecssful, and then unfreezes the player on
2589the new (success) or old (failed) map position. In either case, $done will 2733the new (success) or old (failed) map position. In either case, $done will
2590be called at the end of this process. 2734be called at the end of this process.
2591 2735
2736Note that $check will be called with a potentially non-loaded map, so if
2737it needs a loaded map it has to call C<< ->load >>.
2738
2592=cut 2739=cut
2593 2740
2594our $GOTOGEN; 2741our $GOTOGEN;
2595 2742
2596sub cf::object::player::goto { 2743sub cf::object::player::goto {
2597 my ($self, $path, $x, $y, $check, $done) = @_; 2744 my ($self, $path, $x, $y, $check, $done) = @_;
2745
2746 if ($self->{_link_recursion} >= $MAX_LINKS) {
2747 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2748 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2749 ($path, $x, $y) = @$EMERGENCY_POSITION;
2750 }
2598 2751
2599 # do generation counting so two concurrent goto's will be executed in-order 2752 # do generation counting so two concurrent goto's will be executed in-order
2600 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2753 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2601 2754
2602 $self->enter_link; 2755 $self->enter_link;
2626 my $map = eval { 2779 my $map = eval {
2627 my $map = defined $path ? cf::map::find $path : undef; 2780 my $map = defined $path ? cf::map::find $path : undef;
2628 2781
2629 if ($map) { 2782 if ($map) {
2630 $map = $map->customise_for ($self); 2783 $map = $map->customise_for ($self);
2631 $map = $check->($map) if $check && $map; 2784 $map = $check->($map, $x, $y, $self) if $check && $map;
2632 } else { 2785 } else {
2633 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2786 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2634 } 2787 }
2635 2788
2636 $map 2789 $map
2644 if ($gen == $self->{_goto_generation}) { 2797 if ($gen == $self->{_goto_generation}) {
2645 delete $self->{_goto_generation}; 2798 delete $self->{_goto_generation};
2646 $self->leave_link ($map, $x, $y); 2799 $self->leave_link ($map, $x, $y);
2647 } 2800 }
2648 2801
2649 $done->() if $done; 2802 $done->($self) if $done;
2650 })->prio (1); 2803 })->prio (1);
2651} 2804}
2652 2805
2653=item $player_object->enter_exit ($exit_object) 2806=item $player_object->enter_exit ($exit_object)
2654 2807
2674} 2827}
2675 2828
2676sub prepare_random_map { 2829sub prepare_random_map {
2677 my ($exit) = @_; 2830 my ($exit) = @_;
2678 2831
2679 my $guard = cf::lock_acquire "exit_prepare:$exit";
2680
2681 # all this does is basically replace the /! path by 2832 # all this does is basically replace the /! path by
2682 # a new random map path (?random/...) with a seed 2833 # a new random map path (?random/...) with a seed
2683 # that depends on the exit object 2834 # that depends on the exit object
2684 2835
2685 my $rmp = parse_random_map_params $exit->msg; 2836 my $rmp = parse_random_map_params $exit->msg;
2687 if ($exit->map) { 2838 if ($exit->map) {
2688 $rmp->{region} = $exit->region->name; 2839 $rmp->{region} = $exit->region->name;
2689 $rmp->{origin_map} = $exit->map->path; 2840 $rmp->{origin_map} = $exit->map->path;
2690 $rmp->{origin_x} = $exit->x; 2841 $rmp->{origin_x} = $exit->x;
2691 $rmp->{origin_y} = $exit->y; 2842 $rmp->{origin_y} = $exit->y;
2843
2844 $exit->map->touch;
2692 } 2845 }
2693 2846
2694 $rmp->{random_seed} ||= $exit->random_seed; 2847 $rmp->{random_seed} ||= $exit->random_seed;
2695 2848
2696 my $data = cf::encode_json $rmp; 2849 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2697 my $md5 = Digest::MD5::md5_hex $data; 2850 my $md5 = Digest::MD5::md5_hex $data;
2698 my $meta = "$RANDOMDIR/$md5.meta"; 2851 my $meta = "$RANDOMDIR/$md5.meta";
2699 2852
2700 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2853 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2701 aio_write $fh, 0, (length $data), $data, 0; 2854 aio_write $fh, 0, (length $data), $data, 0;
2702 undef $fh; 2855 undef $fh;
2703 aio_rename "$meta~", $meta; 2856 aio_rename "$meta~", $meta;
2704 2857
2858 my $slaying = "?random/$md5";
2859
2860 if ($exit->valid) {
2705 $exit->slaying ("?random/$md5"); 2861 $exit->slaying ("?random/$md5");
2706 $exit->msg (undef); 2862 $exit->msg (undef);
2863 }
2707 } 2864 }
2708} 2865}
2709 2866
2710sub cf::object::player::enter_exit { 2867sub cf::object::player::enter_exit {
2711 my ($self, $exit) = @_; 2868 my ($self, $exit) = @_;
2712 2869
2713 return unless $self->type == cf::PLAYER; 2870 return unless $self->type == cf::PLAYER;
2714 2871
2715 if ($exit->slaying eq "/!") {
2716 #TODO: this should de-fi-ni-te-ly not be a sync-job
2717 # the problem is that $exit might not survive long enough
2718 # so it needs to be done right now, right here
2719 cf::sync_job { prepare_random_map $exit };
2720 }
2721
2722 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2723 my $hp = $exit->stats->hp;
2724 my $sp = $exit->stats->sp;
2725
2726 $self->enter_link; 2872 $self->enter_link;
2727 2873
2728 # if exit is damned, update players death & WoR home-position
2729 $self->contr->savebed ($slaying, $hp, $sp)
2730 if $exit->flag (FLAG_DAMNED);
2731
2732 (async { 2874 (async {
2733 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2875 $Coro::current->{desc} = "enter_exit";
2734 2876
2735 $self->deactivate_recursive; # just to be sure
2736 unless (eval { 2877 unless (eval {
2878 $self->deactivate_recursive; # just to be sure
2879
2880 # random map handling
2881 {
2882 my $guard = cf::lock_acquire "exit_prepare:$exit";
2883
2884 prepare_random_map $exit
2885 if $exit->slaying eq "/!";
2886 }
2887
2888 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2889 my $x = $exit->stats->hp;
2890 my $y = $exit->stats->sp;
2891
2737 $self->goto ($slaying, $hp, $sp); 2892 $self->goto ($map, $x, $y);
2738 2893
2894 # if exit is damned, update players death & WoR home-position
2895 $self->contr->savebed ($map, $x, $y)
2896 if $exit->flag (cf::FLAG_DAMNED);
2897
2739 1; 2898 1
2740 }) { 2899 }) {
2741 $self->message ("Something went wrong deep within the crossfire server. " 2900 $self->message ("Something went wrong deep within the deliantra server. "
2742 . "I'll try to bring you back to the map you were before. " 2901 . "I'll try to bring you back to the map you were before. "
2743 . "Please report this to the dungeon master!", 2902 . "Please report this to the dungeon master!",
2744 cf::NDI_UNIQUE | cf::NDI_RED); 2903 cf::NDI_UNIQUE | cf::NDI_RED);
2745 2904
2746 warn "ERROR in enter_exit: $@"; 2905 error "ERROR in enter_exit: $@";
2747 $self->leave_link; 2906 $self->leave_link;
2748 } 2907 }
2749 })->prio (1); 2908 })->prio (1);
2750} 2909}
2751 2910
2763sub cf::client::send_drawinfo { 2922sub cf::client::send_drawinfo {
2764 my ($self, $text, $flags) = @_; 2923 my ($self, $text, $flags) = @_;
2765 2924
2766 utf8::encode $text; 2925 utf8::encode $text;
2767 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2926 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2927}
2928
2929=item $client->send_big_packet ($pkt)
2930
2931Like C<send_packet>, but tries to compress large packets, and fragments
2932them as required.
2933
2934=cut
2935
2936our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2937
2938sub cf::client::send_big_packet {
2939 my ($self, $pkt) = @_;
2940
2941 # try lzf for large packets
2942 $pkt = "lzf " . Compress::LZF::compress $pkt
2943 if 1024 <= length $pkt and $self->{can_lzf};
2944
2945 # split very large packets
2946 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2947 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2948 $pkt = "frag";
2949 }
2950
2951 $self->send_packet ($pkt);
2768} 2952}
2769 2953
2770=item $client->send_msg ($channel, $msg, $color, [extra...]) 2954=item $client->send_msg ($channel, $msg, $color, [extra...])
2771 2955
2772Send a drawinfo or msg packet to the client, formatting the msg for the 2956Send a drawinfo or msg packet to the client, formatting the msg for the
2776 2960
2777=cut 2961=cut
2778 2962
2779# non-persistent channels (usually the info channel) 2963# non-persistent channels (usually the info channel)
2780our %CHANNEL = ( 2964our %CHANNEL = (
2965 "c/motd" => {
2966 id => "infobox",
2967 title => "MOTD",
2968 reply => undef,
2969 tooltip => "The message of the day",
2970 },
2781 "c/identify" => { 2971 "c/identify" => {
2782 id => "infobox", 2972 id => "infobox",
2783 title => "Identify", 2973 title => "Identify",
2784 reply => undef, 2974 reply => undef,
2785 tooltip => "Items recently identified", 2975 tooltip => "Items recently identified",
2787 "c/examine" => { 2977 "c/examine" => {
2788 id => "infobox", 2978 id => "infobox",
2789 title => "Examine", 2979 title => "Examine",
2790 reply => undef, 2980 reply => undef,
2791 tooltip => "Signs and other items you examined", 2981 tooltip => "Signs and other items you examined",
2982 },
2983 "c/shopinfo" => {
2984 id => "infobox",
2985 title => "Shop Info",
2986 reply => undef,
2987 tooltip => "What your bargaining skill tells you about the shop",
2792 }, 2988 },
2793 "c/book" => { 2989 "c/book" => {
2794 id => "infobox", 2990 id => "infobox",
2795 title => "Book", 2991 title => "Book",
2796 reply => undef, 2992 reply => undef,
2812 id => "infobox", 3008 id => "infobox",
2813 title => "Body Parts", 3009 title => "Body Parts",
2814 reply => undef, 3010 reply => undef,
2815 tooltip => "Shows which body parts you posess and are available", 3011 tooltip => "Shows which body parts you posess and are available",
2816 }, 3012 },
3013 "c/statistics" => {
3014 id => "infobox",
3015 title => "Statistics",
3016 reply => undef,
3017 tooltip => "Shows your primary statistics",
3018 },
3019 "c/skills" => {
3020 id => "infobox",
3021 title => "Skills",
3022 reply => undef,
3023 tooltip => "Shows your experience per skill and item power",
3024 },
3025 "c/shopitems" => {
3026 id => "infobox",
3027 title => "Shop Items",
3028 reply => undef,
3029 tooltip => "Shows the items currently for sale in this shop",
3030 },
3031 "c/resistances" => {
3032 id => "infobox",
3033 title => "Resistances",
3034 reply => undef,
3035 tooltip => "Shows your resistances",
3036 },
3037 "c/pets" => {
3038 id => "infobox",
3039 title => "Pets",
3040 reply => undef,
3041 tooltip => "Shows information abotu your pets/a specific pet",
3042 },
3043 "c/perceiveself" => {
3044 id => "infobox",
3045 title => "Perceive Self",
3046 reply => undef,
3047 tooltip => "You gained detailed knowledge about yourself",
3048 },
2817 "c/uptime" => { 3049 "c/uptime" => {
2818 id => "infobox", 3050 id => "infobox",
2819 title => "Uptime", 3051 title => "Uptime",
2820 reply => undef, 3052 reply => undef,
2821 tooltip => "How long the server has been running since last restart", 3053 tooltip => "How long the server has been running since last restart",
2824 id => "infobox", 3056 id => "infobox",
2825 title => "Map Info", 3057 title => "Map Info",
2826 reply => undef, 3058 reply => undef,
2827 tooltip => "Information related to the maps", 3059 tooltip => "Information related to the maps",
2828 }, 3060 },
3061 "c/party" => {
3062 id => "party",
3063 title => "Party",
3064 reply => "gsay ",
3065 tooltip => "Messages and chat related to your party",
3066 },
3067 "c/death" => {
3068 id => "death",
3069 title => "Death",
3070 reply => undef,
3071 tooltip => "Reason for and more info about your most recent death",
3072 },
3073 "c/say" => $SAY_CHANNEL,
3074 "c/chat" => $CHAT_CHANNEL,
2829); 3075);
2830 3076
2831sub cf::client::send_msg { 3077sub cf::client::send_msg {
2832 my ($self, $channel, $msg, $color, @extra) = @_; 3078 my ($self, $channel, $msg, $color, @extra) = @_;
2833 3079
2834 $msg = $self->pl->expand_cfpod ($msg); 3080 $msg = $self->pl->expand_cfpod ($msg)
3081 unless $color & cf::NDI_VERBATIM;
2835 3082
2836 $color &= cf::NDI_CLIENT_MASK; # just in case... 3083 $color &= cf::NDI_CLIENT_MASK; # just in case...
2837 3084
2838 # check predefined channels, for the benefit of C 3085 # check predefined channels, for the benefit of C
2839 if ($CHANNEL{$channel}) { 3086 if ($CHANNEL{$channel}) {
2840 $channel = $CHANNEL{$channel}; 3087 $channel = $CHANNEL{$channel};
2841 3088
2842 $self->ext_msg (channel_info => $channel) 3089 $self->ext_msg (channel_info => $channel);
2843 if $self->can_msg;
2844
2845 $channel = $channel->{id}; 3090 $channel = $channel->{id};
2846 3091
2847 } elsif (ref $channel) { 3092 } elsif (ref $channel) {
2848 # send meta info to client, if not yet sent 3093 # send meta info to client, if not yet sent
2849 unless (exists $self->{channel}{$channel->{id}}) { 3094 unless (exists $self->{channel}{$channel->{id}}) {
2850 $self->{channel}{$channel->{id}} = $channel; 3095 $self->{channel}{$channel->{id}} = $channel;
2851 $self->ext_msg (channel_info => $channel) 3096 $self->ext_msg (channel_info => $channel);
2852 if $self->can_msg;
2853 } 3097 }
2854 3098
2855 $channel = $channel->{id}; 3099 $channel = $channel->{id};
2856 } 3100 }
2857 3101
2858 return unless @extra || length $msg; 3102 return unless @extra || length $msg;
2859 3103
2860 if ($self->can_msg) {
2861 # default colour, mask it out 3104 # default colour, mask it out
2862 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3105 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2863 if $color & cf::NDI_DEF; 3106 if $color & cf::NDI_DEF;
2864 3107
2865 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3108 my $pkt = "msg "
3109 . $self->{json_coder}->encode (
2866 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3110 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2867 } else { 3111 );
2868 if ($color >= 0) {
2869 # replace some tags by gcfclient-compatible ones
2870 for ($msg) {
2871 1 while
2872 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2873 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2874 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2875 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2876 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2877 }
2878 3112
2879 $color &= cf::NDI_COLOR_MASK; 3113 $self->send_big_packet ($pkt);
2880
2881 utf8::encode $msg;
2882
2883 if (0 && $msg =~ /\[/) {
2884 # COMMAND/INFO
2885 $self->send_packet ("drawextinfo $color 10 8 $msg")
2886 } else {
2887 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2888 $self->send_packet ("drawinfo $color $msg")
2889 }
2890 }
2891 }
2892} 3114}
2893 3115
2894=item $client->ext_msg ($type, @msg) 3116=item $client->ext_msg ($type, @msg)
2895 3117
2896Sends an ext event to the client. 3118Sends an ext event to the client.
2899 3121
2900sub cf::client::ext_msg($$@) { 3122sub cf::client::ext_msg($$@) {
2901 my ($self, $type, @msg) = @_; 3123 my ($self, $type, @msg) = @_;
2902 3124
2903 if ($self->extcmd == 2) { 3125 if ($self->extcmd == 2) {
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3126 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2905 } elsif ($self->extcmd == 1) { # TODO: remove 3127 } elsif ($self->extcmd == 1) { # TODO: remove
2906 push @msg, msgtype => "event_$type"; 3128 push @msg, msgtype => "event_$type";
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3129 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2908 } 3130 }
2909} 3131}
2910 3132
2911=item $client->ext_reply ($msgid, @msg) 3133=item $client->ext_reply ($msgid, @msg)
2912 3134
2916 3138
2917sub cf::client::ext_reply($$@) { 3139sub cf::client::ext_reply($$@) {
2918 my ($self, $id, @msg) = @_; 3140 my ($self, $id, @msg) = @_;
2919 3141
2920 if ($self->extcmd == 2) { 3142 if ($self->extcmd == 2) {
2921 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3143 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2922 } elsif ($self->extcmd == 1) { 3144 } elsif ($self->extcmd == 1) {
2923 #TODO: version 1, remove 3145 #TODO: version 1, remove
2924 unshift @msg, msgtype => "reply", msgid => $id; 3146 unshift @msg, msgtype => "reply", msgid => $id;
2925 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3147 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2926 } 3148 }
2927} 3149}
2928 3150
2929=item $success = $client->query ($flags, "text", \&cb) 3151=item $success = $client->query ($flags, "text", \&cb)
2930 3152
3001 3223
3002 $ns->ext_reply ($reply, @reply) 3224 $ns->ext_reply ($reply, @reply)
3003 if $reply; 3225 if $reply;
3004 3226
3005 } else { 3227 } else {
3006 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3228 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3007 } 3229 }
3008 3230
3009 cf::override; 3231 cf::override;
3010 }, 3232 },
3011); 3233);
3031 3253
3032 $coro 3254 $coro
3033} 3255}
3034 3256
3035cf::client->attach ( 3257cf::client->attach (
3036 on_destroy => sub { 3258 on_client_destroy => sub {
3037 my ($ns) = @_; 3259 my ($ns) = @_;
3038 3260
3039 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3261 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3040 }, 3262 },
3041); 3263);
3057our $safe_hole = new Safe::Hole; 3279our $safe_hole = new Safe::Hole;
3058 3280
3059$SIG{FPE} = 'IGNORE'; 3281$SIG{FPE} = 'IGNORE';
3060 3282
3061$safe->permit_only (Opcode::opset qw( 3283$safe->permit_only (Opcode::opset qw(
3062 :base_core :base_mem :base_orig :base_math 3284 :base_core :base_mem :base_orig :base_math :base_loop
3063 grepstart grepwhile mapstart mapwhile 3285 grepstart grepwhile mapstart mapwhile
3064 sort time 3286 sort time
3065)); 3287));
3066 3288
3067# here we export the classes and methods available to script code 3289# here we export the classes and methods available to script code
3070 3292
3071The following functions and methods are available within a safe environment: 3293The following functions and methods are available within a safe environment:
3072 3294
3073 cf::object 3295 cf::object
3074 contr pay_amount pay_player map x y force_find force_add destroy 3296 contr pay_amount pay_player map x y force_find force_add destroy
3075 insert remove name archname title slaying race decrease_ob_nr 3297 insert remove name archname title slaying race decrease split
3298 value
3076 3299
3077 cf::object::player 3300 cf::object::player
3078 player 3301 player
3079 3302
3080 cf::player 3303 cf::player
3085 3308
3086=cut 3309=cut
3087 3310
3088for ( 3311for (
3089 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3312 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3090 insert remove inv name archname title slaying race 3313 insert remove inv nrof name archname title slaying race
3091 decrease_ob_nr destroy)], 3314 decrease split destroy change_exp value msg lore send_msg)],
3092 ["cf::object::player" => qw(player)], 3315 ["cf::object::player" => qw(player)],
3093 ["cf::player" => qw(peaceful)], 3316 ["cf::player" => qw(peaceful send_msg)],
3094 ["cf::map" => qw(trigger)], 3317 ["cf::map" => qw(trigger)],
3095) { 3318) {
3096 no strict 'refs';
3097 my ($pkg, @funs) = @$_; 3319 my ($pkg, @funs) = @$_;
3098 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3320 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3099 for @funs; 3321 for @funs;
3100} 3322}
3101 3323
3116 3338
3117 my $qcode = $code; 3339 my $qcode = $code;
3118 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3340 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3119 $qcode =~ s/\n/\\n/g; 3341 $qcode =~ s/\n/\\n/g;
3120 3342
3343 %vars = (_dummy => 0) unless %vars;
3344
3345 my @res;
3121 local $_; 3346 local $_;
3122 local @safe::cf::_safe_eval_args = values %vars;
3123 3347
3124 my $eval = 3348 my $eval =
3125 "do {\n" 3349 "do {\n"
3126 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3350 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3127 . "#line 0 \"{$qcode}\"\n" 3351 . "#line 0 \"{$qcode}\"\n"
3128 . $code 3352 . $code
3129 . "\n}" 3353 . "\n}"
3130 ; 3354 ;
3131 3355
3356 if ($CFG{safe_eval}) {
3132 sub_generation_inc; 3357 sub_generation_inc;
3358 local @safe::cf::_safe_eval_args = values %vars;
3133 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3359 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3134 sub_generation_inc; 3360 sub_generation_inc;
3361 } else {
3362 local @cf::_safe_eval_args = values %vars;
3363 @res = wantarray ? eval eval : scalar eval $eval;
3364 }
3135 3365
3136 if ($@) { 3366 if ($@) {
3137 warn "$@"; 3367 warn "$@",
3138 warn "while executing safe code '$code'\n"; 3368 "while executing safe code '$code'\n",
3139 warn "with arguments " . (join " ", %vars) . "\n"; 3369 "with arguments " . (join " ", %vars) . "\n";
3140 } 3370 }
3141 3371
3142 wantarray ? @res : $res[0] 3372 wantarray ? @res : $res[0]
3143} 3373}
3144 3374
3158=cut 3388=cut
3159 3389
3160sub register_script_function { 3390sub register_script_function {
3161 my ($fun, $cb) = @_; 3391 my ($fun, $cb) = @_;
3162 3392
3163 no strict 'refs'; 3393 $fun = "safe::$fun" if $CFG{safe_eval};
3164 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3394 *$fun = $safe_hole->wrap ($cb);
3165} 3395}
3166 3396
3167=back 3397=back
3168 3398
3169=cut 3399=cut
3178 # for this (global event?) 3408 # for this (global event?)
3179 %ext::player_env::MUSIC_FACE_CACHE = (); 3409 %ext::player_env::MUSIC_FACE_CACHE = ();
3180 3410
3181 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3411 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3182 3412
3183 warn "loading facedata from $path\n"; 3413 trace "loading facedata from $path\n";
3184 3414
3185 my $facedata;
3186 0 < aio_load $path, $facedata 3415 0 < aio_load $path, my $facedata
3187 or die "$path: $!"; 3416 or die "$path: $!";
3188 3417
3189 $facedata = Coro::Storable::thaw $facedata; 3418 $facedata = Coro::Storable::thaw $facedata;
3190 3419
3191 $facedata->{version} == 2 3420 $facedata->{version} == 2
3192 or cf::cleanup "$path: version mismatch, cannot proceed."; 3421 or cf::cleanup "$path: version mismatch, cannot proceed.";
3193 3422
3194 # patch in the exptable 3423 # patch in the exptable
3424 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3195 $facedata->{resource}{"res/exp_table"} = { 3425 $facedata->{resource}{"res/exp_table"} = {
3196 type => FT_RSRC, 3426 type => FT_RSRC,
3197 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3427 data => $exp_table,
3428 hash => (Digest::MD5::md5 $exp_table),
3198 }; 3429 };
3199 cf::cede_to_tick; 3430 cf::cede_to_tick;
3200 3431
3201 { 3432 {
3202 my $faces = $facedata->{faceinfo}; 3433 my $faces = $facedata->{faceinfo};
3204 while (my ($face, $info) = each %$faces) { 3435 while (my ($face, $info) = each %$faces) {
3205 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3436 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3206 3437
3207 cf::face::set_visibility $idx, $info->{visibility}; 3438 cf::face::set_visibility $idx, $info->{visibility};
3208 cf::face::set_magicmap $idx, $info->{magicmap}; 3439 cf::face::set_magicmap $idx, $info->{magicmap};
3209 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3440 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3210 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3441 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3211 3442
3212 cf::cede_to_tick; 3443 cf::cede_to_tick;
3213 } 3444 }
3214 3445
3215 while (my ($face, $info) = each %$faces) { 3446 while (my ($face, $info) = each %$faces) {
3220 3451
3221 if (my $smooth = cf::face::find $info->{smooth}) { 3452 if (my $smooth = cf::face::find $info->{smooth}) {
3222 cf::face::set_smooth $idx, $smooth; 3453 cf::face::set_smooth $idx, $smooth;
3223 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3454 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3224 } else { 3455 } else {
3225 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3456 error "smooth face '$info->{smooth}' not found for face '$face'";
3226 } 3457 }
3227 3458
3228 cf::cede_to_tick; 3459 cf::cede_to_tick;
3229 } 3460 }
3230 } 3461 }
3239 3470
3240 cf::anim::invalidate_all; # d'oh 3471 cf::anim::invalidate_all; # d'oh
3241 } 3472 }
3242 3473
3243 { 3474 {
3244 # TODO: for gcfclient pleasure, we should give resources
3245 # that gcfclient doesn't grok a >10000 face index.
3246 my $res = $facedata->{resource}; 3475 my $res = $facedata->{resource};
3247 3476
3248 while (my ($name, $info) = each %$res) { 3477 while (my ($name, $info) = each %$res) {
3249 if (defined $info->{type}) { 3478 if (defined $info->{type}) {
3250 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3479 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3251 my $data;
3252 3480
3253 if ($info->{type} & 1) { 3481 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3254 # prepend meta info
3255
3256 my $meta = $enc->encode ({
3257 name => $name,
3258 %{ $info->{meta} || {} },
3259 });
3260
3261 $data = pack "(w/a*)*", $meta, $info->{data};
3262 } else {
3263 $data = $info->{data};
3264 }
3265
3266 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3267 cf::face::set_type $idx, $info->{type}; 3482 cf::face::set_type $idx, $info->{type};
3268 } else { 3483 } else {
3269 $RESOURCE{$name} = $info; 3484 $RESOURCE{$name} = $info; # unused
3270 } 3485 }
3271 3486
3272 cf::cede_to_tick; 3487 cf::cede_to_tick;
3273 } 3488 }
3274 } 3489 }
3275 3490
3276 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3491 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3277 3492
3278 1 3493 1
3279} 3494}
3280
3281cf::global->attach (on_resource_update => sub {
3282 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3283 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3284
3285 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3286 my $sound = $soundconf->{compat}[$_]
3287 or next;
3288
3289 my $face = cf::face::find "sound/$sound->[1]";
3290 cf::sound::set $sound->[0] => $face;
3291 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3292 }
3293
3294 while (my ($k, $v) = each %{$soundconf->{event}}) {
3295 my $face = cf::face::find "sound/$v";
3296 cf::sound::set $k => $face;
3297 }
3298 }
3299});
3300 3495
3301register_exticmd fx_want => sub { 3496register_exticmd fx_want => sub {
3302 my ($ns, $want) = @_; 3497 my ($ns, $want) = @_;
3303 3498
3304 while (my ($k, $v) = each %$want) { 3499 while (my ($k, $v) = each %$want) {
3305 $ns->fx_want ($k, $v); 3500 $ns->fx_want ($k, $v);
3306 } 3501 }
3307}; 3502};
3503
3504sub load_resource_file($) {
3505 my $guard = lock_acquire "load_resource_file";
3506
3507 my $status = load_resource_file_ $_[0];
3508 get_slot 0.1, 100;
3509 cf::arch::commit_load;
3510
3511 $status
3512}
3308 3513
3309sub reload_regions { 3514sub reload_regions {
3310 # HACK to clear player env face cache, we need some signal framework 3515 # HACK to clear player env face cache, we need some signal framework
3311 # for this (global event?) 3516 # for this (global event?)
3312 %ext::player_env::MUSIC_FACE_CACHE = (); 3517 %ext::player_env::MUSIC_FACE_CACHE = ();
3326} 3531}
3327 3532
3328sub reload_archetypes { 3533sub reload_archetypes {
3329 load_resource_file "$DATADIR/archetypes" 3534 load_resource_file "$DATADIR/archetypes"
3330 or die "unable to load archetypes\n"; 3535 or die "unable to load archetypes\n";
3331 #d# NEED to laod twice to resolve forward references
3332 # this really needs to be done in an extra post-pass
3333 # (which needs to be synchronous, so solve it differently)
3334 load_resource_file "$DATADIR/archetypes"
3335 or die "unable to load archetypes\n";
3336} 3536}
3337 3537
3338sub reload_treasures { 3538sub reload_treasures {
3339 load_resource_file "$DATADIR/treasures" 3539 load_resource_file "$DATADIR/treasures"
3340 or die "unable to load treasurelists\n"; 3540 or die "unable to load treasurelists\n";
3341} 3541}
3342 3542
3543sub reload_sound {
3544 trace "loading sound config from $DATADIR/sound\n";
3545
3546 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3547 or die "$DATADIR/sound $!";
3548
3549 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3550
3551 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3552 my $sound = $soundconf->{compat}[$_]
3553 or next;
3554
3555 my $face = cf::face::find "sound/$sound->[1]";
3556 cf::sound::set $sound->[0] => $face;
3557 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3558 }
3559
3560 while (my ($k, $v) = each %{$soundconf->{event}}) {
3561 my $face = cf::face::find "sound/$v";
3562 cf::sound::set $k => $face;
3563 }
3564}
3565
3343sub reload_resources { 3566sub reload_resources {
3344 warn "reloading resource files...\n"; 3567 trace "reloading resource files...\n";
3345 3568
3569 reload_exp_table;
3570 reload_materials;
3571 reload_facedata;
3572 reload_sound;
3573 reload_archetypes;
3346 reload_regions; 3574 reload_regions;
3347 reload_facedata;
3348 #reload_archetypes;#d#
3349 reload_archetypes;
3350 reload_treasures; 3575 reload_treasures;
3351 3576
3352 warn "finished reloading resource files\n"; 3577 trace "finished reloading resource files\n";
3353}
3354
3355sub init {
3356 reload_resources;
3357} 3578}
3358 3579
3359sub reload_config { 3580sub reload_config {
3360 open my $fh, "<:utf8", "$CONFDIR/config" 3581 trace "reloading config file...\n";
3361 or return;
3362 3582
3363 local $/; 3583 0 < aio_load "$CONFDIR/config", my $config
3364 *CFG = YAML::Load <$fh>; 3584 or die "$CONFDIR/config: $!";
3365 3585
3586 utf8::decode $config;
3587 *CFG = yaml_load $config;
3588
3366 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3589 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3367 3590
3368 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3591 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3369 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3592 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3370 3593
3371 if (exists $CFG{mlockall}) { 3594 if (exists $CFG{mlockall}) {
3375 }; 3598 };
3376 warn $@ if $@; 3599 warn $@ if $@;
3377 } 3600 }
3378} 3601}
3379 3602
3603sub pidfile() {
3604 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3605 or die "$PIDFILE: $!";
3606 flock $fh, &Fcntl::LOCK_EX
3607 or die "$PIDFILE: flock: $!";
3608 $fh
3609}
3610
3611# make sure only one server instance is running at any one time
3612sub atomic {
3613 my $fh = pidfile;
3614
3615 my $pid = <$fh>;
3616 kill 9, $pid if $pid > 0;
3617
3618 seek $fh, 0, 0;
3619 print $fh $$;
3620}
3621
3622sub main_loop {
3623 trace "EV::loop starting\n";
3624 if (1) {
3625 EV::loop;
3626 }
3627 trace "EV::loop returned\n";
3628 goto &main_loop unless $REALLY_UNLOOP;
3629}
3630
3380sub main { 3631sub main {
3632 cf::init_globals; # initialise logging
3633
3634 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3635 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3636 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3637 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3638
3639 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3640
3381 # we must not ever block the main coroutine 3641 # we must not ever block the main coroutine
3382 local $Coro::idle = sub { 3642 local $Coro::idle = sub {
3383 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3643 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3384 (async { 3644 (async {
3385 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3645 $Coro::current->{desc} = "IDLE BUG HANDLER";
3386 EV::loop EV::LOOP_ONESHOT; 3646 EV::loop EV::LOOP_ONESHOT;
3387 })->prio (Coro::PRIO_MAX); 3647 })->prio (Coro::PRIO_MAX);
3388 }; 3648 };
3389 3649
3390 reload_config;
3391 db_init;
3392 load_extensions;
3393
3394 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 evthread_start IO::AIO::poll_fileno; 3650 evthread_start IO::AIO::poll_fileno;
3396 EV::loop; 3651
3652 cf::sync_job {
3653 cf::incloader::init ();
3654
3655 cf::init_anim;
3656 cf::init_attackmess;
3657 cf::init_dynamic;
3658
3659 cf::load_settings;
3660
3661 reload_resources;
3662 reload_config;
3663 db_init;
3664
3665 cf::init_uuid;
3666 cf::init_signals;
3667 cf::init_skills;
3668
3669 cf::init_beforeplay;
3670
3671 atomic;
3672
3673 load_extensions;
3674
3675 utime time, time, $RUNTIMEFILE;
3676
3677 # no (long-running) fork's whatsoever before this point(!)
3678 use POSIX ();
3679 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3680
3681 cf::_post_init 0;
3682 };
3683
3684 cf::object::thawer::errors_are_fatal 0;
3685 info "parse errors in files are no longer fatal from this point on.\n";
3686
3687 my $free_main; $free_main = EV::idle sub {
3688 undef $free_main;
3689 undef &main; # free gobs of memory :)
3690 };
3691
3692 goto &main_loop;
3397} 3693}
3398 3694
3399############################################################################# 3695#############################################################################
3400# initialisation and cleanup 3696# initialisation and cleanup
3401 3697
3402# install some emergency cleanup handlers 3698# install some emergency cleanup handlers
3403BEGIN { 3699BEGIN {
3404 our %SIGWATCHER = (); 3700 our %SIGWATCHER = ();
3405 for my $signal (qw(INT HUP TERM)) { 3701 for my $signal (qw(INT HUP TERM)) {
3406 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3702 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3407 cf::cleanup "SIG$signal"; 3703 cf::cleanup "SIG$signal";
3408 }; 3704 };
3409 } 3705 }
3410} 3706}
3411 3707
3412sub write_runtime_sync { 3708sub write_runtime_sync {
3413 my $runtime = "$LOCALDIR/runtime"; 3709 my $t0 = AE::time;
3414 3710
3415 # first touch the runtime file to show we are still running: 3711 # first touch the runtime file to show we are still running:
3416 # the fsync below can take a very very long time. 3712 # the fsync below can take a very very long time.
3417 3713
3418 IO::AIO::aio_utime $runtime, undef, undef; 3714 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3419 3715
3420 my $guard = cf::lock_acquire "write_runtime"; 3716 my $guard = cf::lock_acquire "write_runtime";
3421 3717
3422 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3718 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3423 or return; 3719 or return;
3424 3720
3425 my $value = $cf::RUNTIME + 90 + 10; 3721 my $value = $cf::RUNTIME + 90 + 10;
3426 # 10 is the runtime save interval, for a monotonic clock 3722 # 10 is the runtime save interval, for a monotonic clock
3427 # 60 allows for the watchdog to kill the server. 3723 # 60 allows for the watchdog to kill the server.
3437 aio_utime $fh, undef, undef; 3733 aio_utime $fh, undef, undef;
3438 3734
3439 close $fh 3735 close $fh
3440 or return; 3736 or return;
3441 3737
3442 aio_rename "$runtime~", $runtime 3738 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3443 and return; 3739 and return;
3444 3740
3445 warn "runtime file written.\n"; 3741 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3446 3742
3447 1 3743 1
3448} 3744}
3449 3745
3450our $uuid_lock; 3746our $uuid_lock;
3459 my $uuid = "$LOCALDIR/uuid"; 3755 my $uuid = "$LOCALDIR/uuid";
3460 3756
3461 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3757 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3462 or return; 3758 or return;
3463 3759
3464 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3760 my $value = uuid_seq uuid_cur;
3761
3762 unless ($value) {
3763 info "cowardly refusing to write zero uuid value!\n";
3764 return;
3765 }
3766
3767 my $value = uuid_str $value + $uuid_skip;
3465 $uuid_skip = 0; 3768 $uuid_skip = 0;
3466 3769
3467 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3770 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3468 and return; 3771 and return;
3469 3772
3475 or return; 3778 or return;
3476 3779
3477 aio_rename "$uuid~", $uuid 3780 aio_rename "$uuid~", $uuid
3478 and return; 3781 and return;
3479 3782
3480 warn "uuid file written ($value).\n"; 3783 trace "uuid file written ($value).\n";
3481 3784
3482 1 3785 1
3483 3786
3484} 3787}
3485 3788
3491} 3794}
3492 3795
3493sub emergency_save() { 3796sub emergency_save() {
3494 my $freeze_guard = cf::freeze_mainloop; 3797 my $freeze_guard = cf::freeze_mainloop;
3495 3798
3496 warn "enter emergency perl save\n"; 3799 info "emergency_perl_save: enter\n";
3800
3801 # this is a trade-off: we want to be very quick here, so
3802 # save all maps without fsync, and later call a global sync
3803 # (which in turn might be very very slow)
3804 local $USE_FSYNC = 0;
3497 3805
3498 cf::sync_job { 3806 cf::sync_job {
3807 cf::write_runtime_sync; # external watchdog should not bark
3808
3499 # use a peculiar iteration method to avoid tripping on perl 3809 # use a peculiar iteration method to avoid tripping on perl
3500 # refcount bugs in for. also avoids problems with players 3810 # refcount bugs in for. also avoids problems with players
3501 # and maps saved/destroyed asynchronously. 3811 # and maps saved/destroyed asynchronously.
3502 warn "begin emergency player save\n"; 3812 info "emergency_perl_save: begin player save\n";
3503 for my $login (keys %cf::PLAYER) { 3813 for my $login (keys %cf::PLAYER) {
3504 my $pl = $cf::PLAYER{$login} or next; 3814 my $pl = $cf::PLAYER{$login} or next;
3505 $pl->valid or next; 3815 $pl->valid or next;
3506 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3816 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3507 $pl->save; 3817 $pl->save;
3508 } 3818 }
3509 warn "end emergency player save\n"; 3819 info "emergency_perl_save: end player save\n";
3510 3820
3511 warn "begin emergency map save\n"; 3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3823 info "emergency_perl_save: begin map save\n";
3512 for my $path (keys %cf::MAP) { 3824 for my $path (keys %cf::MAP) {
3513 my $map = $cf::MAP{$path} or next; 3825 my $map = $cf::MAP{$path} or next;
3514 $map->valid or next; 3826 $map->valid or next;
3515 $map->save; 3827 $map->save;
3516 } 3828 }
3517 warn "end emergency map save\n"; 3829 info "emergency_perl_save: end map save\n";
3518 3830
3519 warn "begin emergency database checkpoint\n"; 3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3833 info "emergency_perl_save: begin database checkpoint\n";
3520 BDB::db_env_txn_checkpoint $DB_ENV; 3834 BDB::db_env_txn_checkpoint $DB_ENV;
3521 warn "end emergency database checkpoint\n"; 3835 info "emergency_perl_save: end database checkpoint\n";
3522 3836
3523 warn "begin write uuid\n"; 3837 info "emergency_perl_save: begin write uuid\n";
3524 write_uuid_sync 1; 3838 write_uuid_sync 1;
3525 warn "end write uuid\n"; 3839 info "emergency_perl_save: end write uuid\n";
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: syncing database to disk";
3844 BDB::db_env_txn_checkpoint $DB_ENV;
3845
3846 info "emergency_perl_save: starting sync\n";
3847 IO::AIO::aio_sync sub {
3848 info "emergency_perl_save: finished sync\n";
3849 };
3850
3851 cf::write_runtime_sync; # external watchdog should not bark
3852
3853 trace "emergency_perl_save: flushing outstanding aio requests";
3854 while (IO::AIO::nreqs || BDB::nreqs) {
3855 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3856 }
3857
3858 cf::write_runtime_sync; # external watchdog should not bark
3526 }; 3859 };
3527 3860
3528 warn "leave emergency perl save\n"; 3861 info "emergency_perl_save: leave\n";
3529} 3862}
3530 3863
3531sub post_cleanup { 3864sub post_cleanup {
3532 my ($make_core) = @_; 3865 my ($make_core) = @_;
3533 3866
3867 IO::AIO::flush;
3868
3534 warn Carp::longmess "post_cleanup backtrace" 3869 error Carp::longmess "post_cleanup backtrace"
3535 if $make_core; 3870 if $make_core;
3871
3872 my $fh = pidfile;
3873 unlink $PIDFILE if <$fh> == $$;
3874}
3875
3876# a safer delete_package, copied from Symbol
3877sub clear_package($) {
3878 my $pkg = shift;
3879
3880 # expand to full symbol table name if needed
3881 unless ($pkg =~ /^main::.*::$/) {
3882 $pkg = "main$pkg" if $pkg =~ /^::/;
3883 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3884 $pkg .= '::' unless $pkg =~ /::$/;
3885 }
3886
3887 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3888 my $stem_symtab = *{$stem}{HASH};
3889
3890 defined $stem_symtab and exists $stem_symtab->{$leaf}
3891 or return;
3892
3893 # clear all symbols
3894 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3895 for my $name (keys %$leaf_symtab) {
3896 _gv_clear *{"$pkg$name"};
3897# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3898 }
3536} 3899}
3537 3900
3538sub do_reload_perl() { 3901sub do_reload_perl() {
3539 # can/must only be called in main 3902 # can/must only be called in main
3540 if ($Coro::current != $Coro::main) { 3903 unless (in_main) {
3541 warn "can only reload from main coroutine"; 3904 error "can only reload from main coroutine";
3542 return; 3905 return;
3543 } 3906 }
3544 3907
3545 warn "reloading..."; 3908 return if $RELOAD++;
3546 3909
3547 warn "entering sync_job"; 3910 my $t1 = AE::time;
3548 3911
3912 while ($RELOAD) {
3913 cf::get_slot 0.1, -1, "reload_perl";
3914 info "perl_reload: reloading...";
3915
3916 trace "perl_reload: entering sync_job";
3917
3549 cf::sync_job { 3918 cf::sync_job {
3550 cf::write_runtime_sync; # external watchdog should not bark
3551 cf::emergency_save; 3919 #cf::emergency_save;
3552 cf::write_runtime_sync; # external watchdog should not bark
3553 3920
3554 warn "syncing database to disk";
3555 BDB::db_env_txn_checkpoint $DB_ENV;
3556
3557 # if anything goes wrong in here, we should simply crash as we already saved
3558
3559 warn "flushing outstanding aio requests";
3560 for (;;) {
3561 BDB::flush;
3562 IO::AIO::flush;
3563 Coro::cede_notself;
3564 last unless IO::AIO::nreqs || BDB::nreqs;
3565 warn "iterate...";
3566 }
3567
3568 ++$RELOAD;
3569
3570 warn "cancelling all extension coros"; 3921 trace "perl_reload: cancelling all extension coros";
3571 $_->cancel for values %EXT_CORO; 3922 $_->cancel for values %EXT_CORO;
3572 %EXT_CORO = (); 3923 %EXT_CORO = ();
3573 3924
3574 warn "removing commands"; 3925 trace "perl_reload: removing commands";
3575 %COMMAND = (); 3926 %COMMAND = ();
3576 3927
3577 warn "removing ext/exti commands"; 3928 trace "perl_reload: removing ext/exti commands";
3578 %EXTCMD = (); 3929 %EXTCMD = ();
3579 %EXTICMD = (); 3930 %EXTICMD = ();
3580 3931
3581 warn "unloading/nuking all extensions"; 3932 trace "perl_reload: unloading/nuking all extensions";
3582 for my $pkg (@EXTS) { 3933 for my $pkg (@EXTS) {
3583 warn "... unloading $pkg"; 3934 trace "... unloading $pkg";
3584 3935
3585 if (my $cb = $pkg->can ("unload")) { 3936 if (my $cb = $pkg->can ("unload")) {
3586 eval { 3937 eval {
3587 $cb->($pkg); 3938 $cb->($pkg);
3588 1 3939 1
3589 } or warn "$pkg unloaded, but with errors: $@"; 3940 } or error "$pkg unloaded, but with errors: $@";
3941 }
3942
3943 trace "... clearing $pkg";
3944 clear_package $pkg;
3590 } 3945 }
3591 3946
3592 warn "... nuking $pkg";
3593 Symbol::delete_package $pkg;
3594 }
3595
3596 warn "unloading all perl modules loaded from $LIBDIR"; 3947 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3597 while (my ($k, $v) = each %INC) { 3948 while (my ($k, $v) = each %INC) {
3598 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3949 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3599 3950
3600 warn "... unloading $k"; 3951 trace "... unloading $k";
3601 delete $INC{$k}; 3952 delete $INC{$k};
3602 3953
3603 $k =~ s/\.pm$//; 3954 $k =~ s/\.pm$//;
3604 $k =~ s/\//::/g; 3955 $k =~ s/\//::/g;
3605 3956
3606 if (my $cb = $k->can ("unload_module")) { 3957 if (my $cb = $k->can ("unload_module")) {
3607 $cb->(); 3958 $cb->();
3959 }
3960
3961 clear_package $k;
3608 } 3962 }
3609 3963
3610 Symbol::delete_package $k;
3611 }
3612
3613 warn "getting rid of safe::, as good as possible"; 3964 trace "perl_reload: getting rid of safe::, as good as possible";
3614 Symbol::delete_package "safe::$_" 3965 clear_package "safe::$_"
3615 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3966 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3616 3967
3617 warn "unloading cf.pm \"a bit\""; 3968 trace "perl_reload: unloading cf.pm \"a bit\"";
3618 delete $INC{"cf.pm"}; 3969 delete $INC{"cf.pm"};
3619 delete $INC{"cf/pod.pm"}; 3970 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3620 3971
3621 # don't, removes xs symbols, too, 3972 # don't, removes xs symbols, too,
3622 # and global variables created in xs 3973 # and global variables created in xs
3623 #Symbol::delete_package __PACKAGE__; 3974 #clear_package __PACKAGE__;
3624 3975
3625 warn "unload completed, starting to reload now"; 3976 info "perl_reload: unload completed, starting to reload now";
3626 3977
3627 warn "reloading cf.pm"; 3978 trace "perl_reload: reloading cf.pm";
3628 require cf; 3979 require cf;
3629 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3980 cf::_connect_to_perl_1;
3630 3981
3631 warn "loading config and database again"; 3982 trace "perl_reload: loading config and database again";
3632 cf::reload_config; 3983 cf::reload_config;
3633 3984
3634 warn "loading extensions"; 3985 trace "perl_reload: loading extensions";
3635 cf::load_extensions; 3986 cf::load_extensions;
3636 3987
3988 if ($REATTACH_ON_RELOAD) {
3637 warn "reattaching attachments to objects/players"; 3989 trace "perl_reload: reattaching attachments to objects/players";
3638 _global_reattach; # objects, sockets 3990 _global_reattach; # objects, sockets
3639 warn "reattaching attachments to maps"; 3991 trace "perl_reload: reattaching attachments to maps";
3640 reattach $_ for values %MAP; 3992 reattach $_ for values %MAP;
3641 warn "reattaching attachments to players"; 3993 trace "perl_reload: reattaching attachments to players";
3642 reattach $_ for values %PLAYER; 3994 reattach $_ for values %PLAYER;
3995 }
3643 3996
3644 warn "leaving sync_job"; 3997 cf::_post_init 1;
3645 3998
3999 trace "perl_reload: leaving sync_job";
4000
3646 1 4001 1
3647 } or do { 4002 } or do {
3648 warn $@; 4003 error $@;
3649 cf::cleanup "error while reloading, exiting."; 4004 cf::cleanup "perl_reload: error, exiting.";
4005 };
4006
4007 --$RELOAD;
3650 }; 4008 }
3651 4009
3652 warn "reloaded"; 4010 $t1 = AE::time - $t1;
4011 info "perl_reload: completed in ${t1}s\n";
3653}; 4012};
3654 4013
3655our $RELOAD_WATCHER; # used only during reload 4014our $RELOAD_WATCHER; # used only during reload
3656 4015
3657sub reload_perl() { 4016sub reload_perl() {
3658 # doing reload synchronously and two reloads happen back-to-back, 4017 # doing reload synchronously and two reloads happen back-to-back,
3659 # coro crashes during coro_state_free->destroy here. 4018 # coro crashes during coro_state_free->destroy here.
3660 4019
4020 $RELOAD_WATCHER ||= cf::async {
4021 Coro::AIO::aio_wait cache_extensions;
4022
3661 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4023 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3662 do_reload_perl; 4024 do_reload_perl;
3663 undef $RELOAD_WATCHER; 4025 undef $RELOAD_WATCHER;
4026 };
3664 }; 4027 };
3665} 4028}
3666 4029
3667register_command "reload" => sub { 4030register_command "reload" => sub {
3668 my ($who, $arg) = @_; 4031 my ($who, $arg) = @_;
3674 reload_perl; 4037 reload_perl;
3675 }; 4038 };
3676 } 4039 }
3677}; 4040};
3678 4041
3679unshift @INC, $LIBDIR; 4042#############################################################################
3680 4043
3681my $bug_warning = 0; 4044my $bug_warning = 0;
3682 4045
3683our @WAIT_FOR_TICK; 4046our @WAIT_FOR_TICK;
3684our @WAIT_FOR_TICK_BEGIN; 4047our @WAIT_FOR_TICK_BEGIN;
3685 4048
3686sub wait_for_tick { 4049sub wait_for_tick() {
3687 return if tick_inhibit;
3688 return if $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3689 4051
3690 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3691 push @WAIT_FOR_TICK, $signal; 4053 push @WAIT_FOR_TICK, $signal;
3692 $signal->wait; 4054 $signal->wait;
3693} 4055}
3694 4056
3695sub wait_for_tick_begin { 4057sub wait_for_tick_begin() {
3696 return if tick_inhibit;
3697 return if $Coro::current == $Coro::main; 4058 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3698 4059
3699 my $signal = new Coro::Signal; 4060 my $signal = new Coro::Signal;
3700 push @WAIT_FOR_TICK_BEGIN, $signal; 4061 push @WAIT_FOR_TICK_BEGIN, $signal;
3701 $signal->wait; 4062 $signal->wait;
3702} 4063}
3708 return; 4069 return;
3709 } 4070 }
3710 4071
3711 cf::server_tick; # one server iteration 4072 cf::server_tick; # one server iteration
3712 4073
4074 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4075
3713 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4076 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3714 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4077 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3715 Coro::async_pool { 4078 Coro::async_pool {
3716 $Coro::current->{desc} = "runtime saver"; 4079 $Coro::current->{desc} = "runtime saver";
3717 write_runtime_sync 4080 write_runtime_sync
3718 or warn "ERROR: unable to write runtime file: $!"; 4081 or error "ERROR: unable to write runtime file: $!";
3719 }; 4082 };
3720 } 4083 }
3721 4084
3722 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4085 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3723 $sig->send; 4086 $sig->send;
3731 4094
3732 if (0) { 4095 if (0) {
3733 if ($NEXT_TICK) { 4096 if ($NEXT_TICK) {
3734 my $jitter = $TICK_START - $NEXT_TICK; 4097 my $jitter = $TICK_START - $NEXT_TICK;
3735 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4098 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3736 warn "jitter $JITTER\n";#d# 4099 debug "jitter $JITTER\n";#d#
3737 } 4100 }
3738 } 4101 }
3739} 4102}
3740 4103
3741{ 4104{
3742 # configure BDB 4105 # configure BDB
3743 4106
3744 BDB::min_parallel 8; 4107 BDB::min_parallel 16;
3745 BDB::max_poll_reqs $TICK * 0.1; 4108 BDB::max_poll_reqs $TICK * 0.1;
3746 $Coro::BDB::WATCHER->priority (1); 4109 $AnyEvent::BDB::WATCHER->priority (1);
3747 4110
3748 unless ($DB_ENV) { 4111 unless ($DB_ENV) {
3749 $DB_ENV = BDB::db_env_create; 4112 $DB_ENV = BDB::db_env_create;
3750 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4113 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3751 | BDB::LOG_AUTOREMOVE, 1); 4114 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4115 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3752 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4116 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3753 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4117 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3754 4118
3755 cf::sync_job { 4119 cf::sync_job {
3756 eval { 4120 eval {
3782{ 4146{
3783 # configure IO::AIO 4147 # configure IO::AIO
3784 4148
3785 IO::AIO::min_parallel 8; 4149 IO::AIO::min_parallel 8;
3786 IO::AIO::max_poll_time $TICK * 0.1; 4150 IO::AIO::max_poll_time $TICK * 0.1;
3787 $Coro::AIO::WATCHER->priority (1); 4151 undef $AnyEvent::AIO::WATCHER;
3788} 4152}
3789 4153
3790my $_log_backtrace; 4154our $_log_backtrace;
4155our $_log_backtrace_last;
3791 4156
3792sub _log_backtrace { 4157sub _log_backtrace {
3793 my ($msg, @addr) = @_; 4158 my ($msg, @addr) = @_;
3794 4159
3795 $msg =~ s/\n//; 4160 $msg =~ s/\n$//;
3796 4161
4162 if ($_log_backtrace_last eq $msg) {
4163 LOG llevInfo, "[ABT] $msg\n";
4164 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3797 # limit the # of concurrent backtraces 4165 # limit the # of concurrent backtraces
3798 if ($_log_backtrace < 2) { 4166 } elsif ($_log_backtrace < 2) {
4167 $_log_backtrace_last = $msg;
3799 ++$_log_backtrace; 4168 ++$_log_backtrace;
4169 my $perl_bt = Carp::longmess $msg;
3800 async { 4170 async {
3801 $Coro::current->{desc} = "abt $msg"; 4171 $Coro::current->{desc} = "abt $msg";
3802 4172
3803 my @bt = fork_call { 4173 my @bt = fork_call {
3804 @addr = map { sprintf "%x", $_ } @addr; 4174 @addr = map { sprintf "%x", $_ } @addr;
3815 } 4185 }
3816 4186
3817 @funcs 4187 @funcs
3818 }; 4188 };
3819 4189
3820 LOG llevInfo, "[ABT] $msg\n"; 4190 LOG llevInfo, "[ABT] $perl_bt\n";
4191 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3821 LOG llevInfo, "[ABT] $_\n" for @bt; 4192 LOG llevInfo, "[ABT] $_\n" for @bt;
3822 --$_log_backtrace; 4193 --$_log_backtrace;
3823 }; 4194 };
3824 } else { 4195 } else {
3825 LOG llevInfo, "[ABT] $msg\n"; 4196 LOG llevInfo, "[ABT] $msg\n";
3826 LOG llevInfo, "[ABT] [suppressed]\n"; 4197 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3827 } 4198 }
3828} 4199}
3829 4200
3830# load additional modules 4201# load additional modules
3831use cf::pod; 4202require "cf/$_.pm" for @EXTRA_MODULES;
4203cf::_connect_to_perl_2;
3832 4204
3833END { cf::emergency_save } 4205END { cf::emergency_save }
3834 4206
38351 42071
3836 4208

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines