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.410 by root, Tue Jan 15 12:02:24 2008 UTC vs.
Revision 1.540 by root, Tue May 4 23:32:29 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use EV 1.86; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 4.32 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
18use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
23use Coro::BDB; 49use Coro::BDB 1.6;
24use Coro::Storable; 50use Coro::Storable;
25use Coro::Util (); 51use Coro::Util ();
26 52
27use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
28use BDB (); 54use BDB ();
29use Data::Dumper; 55use Data::Dumper;
30use Digest::MD5;
31use Fcntl; 56use Fcntl;
32use YAML (); 57use YAML::XS ();
33use IO::AIO 2.51 (); 58use IO::AIO ();
34use Time::HiRes; 59use Time::HiRes;
35use Compress::LZF; 60use Compress::LZF;
36use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
37 64
38# configure various modules to our taste 65# configure various modules to our taste
39# 66#
40$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
41Coro::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";
42Compress::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
43 75
44$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" };
45 78
46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
47 82
48our %COMMAND = (); 83our %COMMAND = ();
49our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
50 85
51our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
52our %EXTCMD = (); 87our %EXTCMD = ();
53our %EXTICMD = (); 88our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
56 91
57our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
59 96
60our $CONFDIR = confdir; 97our $CONFDIR = confdir;
61our $DATADIR = datadir; 98our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
71our %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;
72 118
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 121our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
79 123
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 127our $DB_ENV;
85 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
86our %CFG; 131our %CFG;
87 132
88our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 134our $RUNTIME;
90our $NOW; 135our $NOW;
96# used to convert map paths into valid unix filenames by replacing / by ∕ 141# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 143
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
102 153
103binmode STDOUT; 154binmode STDOUT;
104binmode STDERR; 155binmode STDERR;
105 156
106# read virtual server time, if available 157# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
111} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
112 165
113mkdir $_ 166mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 168
116our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
117 170
118sub 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::"} };
119 187
120############################################################################# 188#############################################################################
121 189
122=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
123 191
170returns 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 process
171per 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.
172 240
173=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
174 242
175This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call. 245that call.
178 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
179=back 253=back
180 254
181=cut 255=cut
182 256
183BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
184 *CORE::GLOBAL::warn = sub { 258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
263$Coro::State::WARNHOOK = sub {
185 my $msg = join "", @_; 264 my $msg = join "", @_;
186 265
187 $msg .= "\n" 266 $msg .= "\n"
188 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
189 268
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 270
192 LOG llevError, $msg; 271 LOG llevWarn, $msg;
193 }; 272};
194}
195 273
196$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
197 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
198 276
199 if ($Coro::current == $Coro::main) {#d# 277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d# 281 return;#d#
202 }#d# 282 }#d#
203 283
204 # kill coroutine otherwise 284 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate 285 Coro::terminate
207}; 286};
208
209$SIG{__DIE__} = sub { }; #d#?
210 287
211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
221for my $pkg (qw( 298for my $pkg (qw(
222 cf::global cf::attachable 299 cf::global cf::attachable
223 cf::object cf::object::player 300 cf::object cf::object::player
224 cf::client cf::player 301 cf::client cf::player
225 cf::arch cf::living 302 cf::arch cf::living
303 cf::map cf::mapspace
226 cf::map cf::party cf::region 304 cf::party cf::region
227)) { 305)) {
228 no strict 'refs';
229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
230} 307}
231 308
232$EV::DIED = sub { 309$EV::DIED = sub {
233 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
234}; 311};
235 312
236############################################################################# 313#############################################################################
237 314
238=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
276 353
277sub encode_json($) { $json_coder->encode ($_[0]) } 354sub encode_json($) { $json_coder->encode ($_[0]) }
278sub decode_json($) { $json_coder->decode ($_[0]) } 355sub decode_json($) { $json_coder->decode ($_[0]) }
279 356
357=item cf::post_init { BLOCK }
358
359Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again.
361
362The cdoeblock will have a single boolean argument to indicate whether this
363is a reload or not.
364
365=cut
366
367sub post_init(&) {
368 push @POST_INIT, shift;
369}
370
280=item cf::lock_wait $string 371=item cf::lock_wait $string
281 372
282Wait until the given lock is available. See cf::lock_acquire. 373Wait until the given lock is available. See cf::lock_acquire.
283 374
284=item my $lock = cf::lock_acquire $string 375=item my $lock = cf::lock_acquire $string
285 376
286Wait until the given lock is available and then acquires it and returns 377Wait until the given lock is available and then acquires it and returns
287a Coro::guard object. If the guard object gets destroyed (goes out of scope, 378a L<Guard> object. If the guard object gets destroyed (goes out of scope,
288for example when the coroutine gets canceled), the lock is automatically 379for example when the coroutine gets canceled), the lock is automatically
289returned. 380returned.
290 381
291Locks are *not* recursive, locking from the same coro twice results in a 382Locks are *not* recursive, locking from the same coro twice results in a
292deadlocked coro. 383deadlocked coro.
298 389
299Return true if the lock is currently active, i.e. somebody has locked it. 390Return true if the lock is currently active, i.e. somebody has locked it.
300 391
301=cut 392=cut
302 393
303our %LOCK; 394our $LOCKS = new Coro::SemaphoreSet;
304our %LOCKER;#d#
305 395
306sub lock_wait($) { 396sub lock_wait($) {
307 my ($key) = @_; 397 $LOCKS->wait ($_[0]);
308
309 if ($LOCKER{$key} == $Coro::current) {#d#
310 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
311 return;#d#
312 }#d#
313
314 # wait for lock, if any
315 while ($LOCK{$key}) {
316 push @{ $LOCK{$key} }, $Coro::current;
317 Coro::schedule;
318 }
319} 398}
320 399
321sub lock_acquire($) { 400sub lock_acquire($) {
322 my ($key) = @_; 401 $LOCKS->guard ($_[0])
323
324 # wait, to be sure we are not locked
325 lock_wait $key;
326
327 $LOCK{$key} = [];
328 $LOCKER{$key} = $Coro::current;#d#
329
330 Coro::guard {
331 delete $LOCKER{$key};#d#
332 # wake up all waiters, to be on the safe side
333 $_->ready for @{ delete $LOCK{$key} };
334 }
335} 402}
336 403
337sub lock_active($) { 404sub lock_active($) {
338 my ($key) = @_; 405 $LOCKS->count ($_[0]) < 1
339
340 ! ! $LOCK{$key}
341} 406}
342 407
343sub freeze_mainloop { 408sub freeze_mainloop {
344 return unless $TICK_WATCHER->is_active; 409 tick_inhibit_inc;
345 410
346 my $guard = Coro::guard { 411 &Guard::guard (\&tick_inhibit_dec);
347 $TICK_WATCHER->start;
348 };
349 $TICK_WATCHER->stop;
350 $guard
351} 412}
352 413
353=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
354 415
355Like EV::periodic, but randomly selects a starting point so that the actions 416Like EV::periodic, but randomly selects a starting point so that the actions
356get spread over timer. 417get spread over time.
357 418
358=cut 419=cut
359 420
360sub periodic($$) { 421sub periodic($$) {
361 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
378 439
379=cut 440=cut
380 441
381our @SLOT_QUEUE; 442our @SLOT_QUEUE;
382our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
383 445
384$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
385$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
387 449
388 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
389 452
390 while () { 453 while () {
391 next_job: 454 next_job:
455
392 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
393 if ($avail > 0.01) { 457
394 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
395 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
396 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
397 $job->[2]->send; 462 $job->[2]->send;
398 Coro::cede; 463 Coro::cede;
399 goto next_job; 464 goto next_job;
400 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
401 } 467 }
402 } 468 }
403 469
404 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
405 # we do not use wait_for_tick() as it returns immediately when tick is inactive 471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
406 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
407 $signal->wait; 473 $signal->wait;
408 } else { 474 } else {
475 $busy = 0;
409 Coro::schedule; 476 Coro::schedule;
410 } 477 }
411 } 478 }
412}; 479};
413 480
414sub get_slot($;$$) { 481sub get_slot($;$$) {
482 return if tick_inhibit || $Coro::current == $Coro::main;
483
415 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
416 485
417 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
418 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
419 489
420 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
421 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
422 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
448=cut 518=cut
449 519
450sub sync_job(&) { 520sub sync_job(&) {
451 my ($job) = @_; 521 my ($job) = @_;
452 522
453 if ($Coro::current == $Coro::main) { 523 if (in_main) {
454 my $time = EV::time; 524 my $time = AE::time;
455 525
456 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
457 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
458 528
459 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
460 530
461 # TODO: use suspend/resume instead
462 # (but this is cancel-safe)
463 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
464 532
465 my $busy = 1; 533 my $busy = 1;
466 my @res; 534 my @res;
467 535
468 (async { 536 (async {
469 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
470 @res = eval { $job->() }; 538 @res = eval { $job->() };
471 warn $@ if $@; 539 error $@ if $@;
472 undef $busy; 540 undef $busy;
473 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
474 542
475 while ($busy) { 543 while ($busy) {
476 if (Coro::nready) { 544 if (Coro::nready) {
478 } else { 546 } else {
479 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
480 } 548 }
481 } 549 }
482 550
483 $time = EV::time - $time; 551 my $time = AE::time - $time;
484 552
485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
487
488 $tick_start += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
489 554
490 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
491 } else { 556 } else {
492 # we are in another coroutine, how wonderful, everything just works 557 # we are in another coroutine, how wonderful, everything just works
493 558
537 }, @args; 602 }, @args;
538 603
539 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
540} 605}
541 606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
616}
617
618=item $coin = coin_from_name $name
619
620=cut
621
622our %coin_alias = (
623 "silver" => "silvercoin",
624 "silvercoin" => "silvercoin",
625 "silvercoins" => "silvercoin",
626 "gold" => "goldcoin",
627 "goldcoin" => "goldcoin",
628 "goldcoins" => "goldcoin",
629 "platinum" => "platinacoin",
630 "platinumcoin" => "platinacoin",
631 "platinumcoins" => "platinacoin",
632 "platina" => "platinacoin",
633 "platinacoin" => "platinacoin",
634 "platinacoins" => "platinacoin",
635 "royalty" => "royalty",
636 "royalties" => "royalty",
637);
638
639sub coin_from_name($) {
640 $coin_alias{$_[0]}
641 ? cf::arch::find $coin_alias{$_[0]}
642 : undef
643}
644
542=item $value = cf::db_get $family => $key 645=item $value = cf::db_get $family => $key
543 646
544Returns a single value from the environment database. 647Returns a single value from the environment database.
545 648
546=item cf::db_put $family => $key => $value 649=item cf::db_put $family => $key => $value
554within each server. 657within each server.
555 658
556=cut 659=cut
557 660
558sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
559 my ($name) = @_; 665 my ($name) = @_;
560 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
561 667
562 eval { 668 eval {
563 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
573} 679}
574 680
575our $DB; 681our $DB;
576 682
577sub db_init { 683sub db_init {
578 cf::sync_job {
579 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
580 };
581} 685}
582 686
583sub db_get($$) { 687sub db_get($$) {
584 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
585 689
586 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
587 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
588 694
589 $! ? () 695 $! ? ()
590 : $data 696 : $data
591 }
592} 697}
593 698
594sub db_put($$$) { 699sub db_put($$$) {
595 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
596 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
652 757
653 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
654 my $data = $process->(\@data); 759 my $data = $process->(\@data);
655 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
656 761
657 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
658 763
659 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
660 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
661 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
662 767
672 777
673=cut 778=cut
674 779
675sub datalog($@) { 780sub datalog($@) {
676 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
677 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
678} 783}
679 784
680=back 785=back
681 786
682=cut 787=cut
683 788
684############################################################################# 789#############################################################################
685 790
686=head2 ATTACHABLE OBJECTS 791=head2 ATTACHABLE OBJECTS
687 792
688Many objects in crossfire are so-called attachable objects. That means you can 793Many objects in deliantra are so-called attachable objects. That means you can
689attach callbacks/event handlers (a collection of which is called an "attachment") 794attach callbacks/event handlers (a collection of which is called an "attachment")
690to it. All such attachable objects support the following methods. 795to it. All such attachable objects support the following methods.
691 796
692In the following description, CLASS can be any of C<global>, C<object> 797In the following description, CLASS can be any of C<global>, C<object>
693C<player>, C<client> or C<map> (i.e. the attachable objects in 798C<player>, C<client> or C<map> (i.e. the attachable objects in
743=item cf::CLASS::attachment $name, ... 848=item cf::CLASS::attachment $name, ...
744 849
745Register an attachment by C<$name> through which attachable objects of the 850Register an attachment by C<$name> through which attachable objects of the
746given CLASS can refer to this attachment. 851given CLASS can refer to this attachment.
747 852
748Some classes such as crossfire maps and objects can specify attachments 853Some classes such as deliantra maps and objects can specify attachments
749that are attached at load/instantiate time, thus the need for a name. 854that are attached at load/instantiate time, thus the need for a name.
750 855
751These calls expect any number of the following handler/hook descriptions: 856These calls expect any number of the following handler/hook descriptions:
752 857
753=over 4 858=over 4
877 982
878 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
879 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
880 985
881 } elsif (ref $type) { 986 } elsif (ref $type) {
882 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
883 988
884 } else { 989 } else {
885 shift @arg; 990 shift @arg;
886 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
887 } 992 }
888 } 993 }
889} 994}
890 995
891sub _object_attach { 996sub _object_attach {
901 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
902 } 1007 }
903 1008
904 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
905 } else { 1010 } else {
906 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
907 } 1012 }
908 1013
909 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
910} 1015}
911 1016
970 1075
971 for (@$callbacks) { 1076 for (@$callbacks) {
972 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
973 1078
974 if ($@) { 1079 if ($@) {
975 warn "$@";
976 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
977 override; 1081 override;
978 } 1082 }
979 1083
980 return 1 if $override; 1084 return 1 if $override;
981 } 1085 }
1044 1148
1045sub reattach { 1149sub reattach {
1046 # basically do the same as instantiate, without calling instantiate 1150 # basically do the same as instantiate, without calling instantiate
1047 my ($obj) = @_; 1151 my ($obj) = @_;
1048 1152
1153 # no longer needed after getting rid of delete_package?
1049 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1154 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1050 1155
1051 my $registry = $obj->registry; 1156 my $registry = $obj->registry;
1052 1157
1053 @$registry = (); 1158 @$registry = ();
1054 1159
1059 for (@$attach) { 1164 for (@$attach) {
1060 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1061 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1062 } 1167 }
1063 } else { 1168 } else {
1064 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1065 } 1170 }
1066 } 1171 }
1067} 1172}
1068 1173
1069cf::attachable->attach ( 1174cf::attachable->attach (
1096 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1097 1202
1098 sync_job { 1203 sync_job {
1099 if (length $$rdata) { 1204 if (length $$rdata) {
1100 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1101 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1102 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1103 1209
1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1211 aio_chmod $fh, SAVE_MODE;
1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1107 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 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;
1215 aio_fsync $fh;
1216 }
1108 close $fh; 1217 aio_close $fh;
1109 1218
1110 if (@$objs) { 1219 if (@$objs) {
1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1220 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1112 chmod SAVE_MODE, $fh; 1221 aio_chmod $fh, SAVE_MODE;
1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1222 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1114 aio_write $fh, 0, (length $data), $data, 0; 1223 aio_write $fh, 0, (length $data), $data, 0;
1115 aio_fsync $fh if $cf::USE_FSYNC; 1224 if ($cf::USE_FSYNC) {
1225 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;
1226 aio_fsync $fh;
1227 }
1116 close $fh; 1228 aio_close $fh;
1117 aio_rename "$filename.pst~", "$filename.pst"; 1229 aio_rename "$filename.pst~", "$filename.pst";
1118 } 1230 }
1119 } else { 1231 } else {
1120 aio_unlink "$filename.pst"; 1232 aio_unlink "$filename.pst";
1121 } 1233 }
1122 1234
1123 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1236
1237 $filename =~ s%/[^/]+$%%;
1238 aio_pathsync $filename if $cf::USE_FSYNC;
1124 } else { 1239 } else {
1125 warn "FATAL: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1126 } 1241 }
1127 } else { 1242 } else {
1128 aio_unlink $filename; 1243 aio_unlink $filename;
1129 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1130 } 1245 }
1154 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs}; 1270 $av = $st->{objs};
1156 } 1271 }
1157 1272
1158 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1159 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1160 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1161 1277
1162 ($data, $av) 1278 ($data, $av)
1163} 1279}
1164 1280
1165=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1221 my ($name, $cb) = @_; 1337 my ($name, $cb) = @_;
1222 1338
1223 $EXTICMD{$name} = $cb; 1339 $EXTICMD{$name} = $cb;
1224} 1340}
1225 1341
1342use File::Glob ();
1343
1226cf::player->attach ( 1344cf::player->attach (
1227 on_command => sub { 1345 on_unknown_command => sub {
1228 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1229 1347
1230 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1231 or return; 1349 or return;
1232 1350
1255 1373
1256 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1257 if $reply; 1375 if $reply;
1258 1376
1259 } else { 1377 } else {
1260 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1261 } 1379 }
1262 1380
1263 cf::override; 1381 cf::override;
1264 }, 1382 },
1265); 1383);
1266 1384
1385# "readahead" all extensions
1386sub cache_extensions {
1387 my $grp = IO::AIO::aio_group;
1388
1389 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1390 for (grep /\.ext$/, @{$_[0]}) {
1391 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1392 }
1393 };
1394
1395 $grp
1396}
1397
1267sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1268 cf::sync_job { 1401 cf::sync_job {
1269 my %todo; 1402 my %todo;
1270 1403
1271 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1272 next unless -r $path; 1405 next unless -r $path;
1290 1423
1291 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1292 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1293 1426
1294 $ext{source} = 1427 $ext{source} =
1295 "package $pkg; use strict; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1296 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1297 . $source 1430 . $source
1298 . "\n};\n1"; 1431 . "\n};\n1";
1299 1432
1300 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1301 } 1434 }
1302 1435
1436 my $pass = 0;
1303 my %done; 1437 my %done;
1304 while (%todo) { 1438 while (%todo) {
1305 my $progress; 1439 my $progress;
1306 1440
1441 ++$pass;
1442
1443 ext:
1307 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1308 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1309 goto skip 1446 next ext
1310 unless exists $done{$_}; 1447 unless exists $done{$_};
1311 } 1448 }
1312 1449
1313 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1314 1451
1315 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1316 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1317 : "$v->{base}: extension inactive.\n"; 1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1318 1457
1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1319 if (exists $v->{meta}{mandatory}) { 1459 if exists $v->{meta}{mandatory};
1320 warn $msg; 1460
1321 warn "mandatory extension failed to load, exiting.\n"; 1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1322 exit 1; 1462 delete $todo{$k};
1323 } 1463 } else {
1324 1464 $done{$k} = delete $todo{$k};
1325 warn $msg; 1465 push @EXTS, $v->{pkg};
1466 $progress = 1;
1467
1468 info "$v->{base}: extension inactive.\n"
1469 unless $active;
1326 } 1470 }
1327
1328 $done{$k} = delete $todo{$k};
1329 push @EXTS, $v->{pkg};
1330 $progress = 1;
1331 } 1471 }
1332 1472
1333 skip: 1473 unless ($progress) {
1334 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1474 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1335 unless $progress; 1475
1476 while (my ($k, $v) = each %todo) {
1477 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1478 if exists $v->{meta}{mandatory};
1479 }
1480 }
1336 } 1481 }
1337 }; 1482 };
1338} 1483}
1339 1484
1340############################################################################# 1485#############################################################################
1341 1486
1342=back 1487=back
1343 1488
1344=head2 CORE EXTENSIONS 1489=head2 CORE EXTENSIONS
1345 1490
1346Functions and methods that extend core crossfire objects. 1491Functions and methods that extend core deliantra objects.
1347 1492
1348=cut 1493=cut
1349 1494
1350package cf::player; 1495package cf::player;
1351 1496
1394 1539
1395sub exists($) { 1540sub exists($) {
1396 my ($login) = @_; 1541 my ($login) = @_;
1397 1542
1398 $cf::PLAYER{$login} 1543 $cf::PLAYER{$login}
1399 or cf::sync_job { !aio_stat path $login } 1544 or !aio_stat path $login
1400} 1545}
1401 1546
1402sub find($) { 1547sub find($) {
1403 return $cf::PLAYER{$_[0]} || do { 1548 return $cf::PLAYER{$_[0]} || do {
1404 my $login = $_[0]; 1549 my $login = $_[0];
1416 my $f = new_from_file cf::object::thawer path $login 1561 my $f = new_from_file cf::object::thawer path $login
1417 or return; 1562 or return;
1418 1563
1419 my $pl = cf::player::load_pl $f 1564 my $pl = cf::player::load_pl $f
1420 or return; 1565 or return;
1566
1421 local $cf::PLAYER_LOADING{$login} = $pl; 1567 local $cf::PLAYER_LOADING{$login} = $pl;
1422 $f->resolve_delayed_derefs; 1568 $f->resolve_delayed_derefs;
1423 $cf::PLAYER{$login} = $pl 1569 $cf::PLAYER{$login} = $pl
1424 } 1570 }
1425 } 1571 }
1426} 1572}
1427 1573
1574cf::player->attach (
1575 on_load => sub {
1576 my ($pl, $path) = @_;
1577
1578 # restore slots saved in save, below
1579 my $slots = delete $pl->{_slots};
1580
1581 $pl->ob->current_weapon ($slots->[0]);
1582 $pl->combat_ob ($slots->[1]);
1583 $pl->ranged_ob ($slots->[2]);
1584 },
1585);
1586
1428sub save($) { 1587sub save($) {
1429 my ($pl) = @_; 1588 my ($pl) = @_;
1430 1589
1431 return if $pl->{deny_save}; 1590 return if $pl->{deny_save};
1432 1591
1435 1594
1436 return if $pl->{deny_save}; 1595 return if $pl->{deny_save};
1437 1596
1438 aio_mkdir playerdir $pl, 0770; 1597 aio_mkdir playerdir $pl, 0770;
1439 $pl->{last_save} = $cf::RUNTIME; 1598 $pl->{last_save} = $cf::RUNTIME;
1599
1600 cf::get_slot 0.01;
1601
1602 # save slots, to be restored later
1603 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1440 1604
1441 $pl->save_pl ($path); 1605 $pl->save_pl ($path);
1442 cf::cede_to_tick; 1606 cf::cede_to_tick;
1443} 1607}
1444 1608
1476 my ($pl) = @_; 1640 my ($pl) = @_;
1477 1641
1478 my $name = $pl->ob->name; 1642 my $name = $pl->ob->name;
1479 1643
1480 $pl->{deny_save} = 1; 1644 $pl->{deny_save} = 1;
1481 $pl->password ("*"); # this should lock out the player until we nuked the dir 1645 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1482 1646
1483 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1484 $pl->deactivate; 1648 $pl->deactivate;
1649 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1485 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1486 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1487 1652
1488 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1489 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
1528 1693
1529 for my $login (@$dirs) { 1694 for my $login (@$dirs) {
1530 my $path = path $login; 1695 my $path = path $login;
1531 1696
1532 # a .pst is a dead give-away for a valid player 1697 # a .pst is a dead give-away for a valid player
1533 unless (-e "$path.pst") { 1698 # if no pst file found, open and chekc for blocked users
1699 if (aio_stat "$path.pst") {
1534 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1700 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1535 aio_read $fh, 0, 512, my $buf, 0 or next; 1701 aio_read $fh, 0, 512, my $buf, 0 or next;
1536 $buf !~ /^password -------------$/m or next; # official not-valid tag 1702 $buf !~ /^password -------------$/m or next; # official not-valid tag
1537 } 1703 }
1538 1704
1542 1708
1543 \@logins 1709 \@logins
1544} 1710}
1545 1711
1546=item $player->maps 1712=item $player->maps
1713
1714=item cf::player::maps $login
1547 1715
1548Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1549player. May block. 1717player. May block.
1550 1718
1551=cut 1719=cut
1569 } 1737 }
1570 1738
1571 \@paths 1739 \@paths
1572} 1740}
1573 1741
1574=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1742=item $protocol_xml = $player->expand_cfpod ($cfpod)
1575 1743
1576Expand crossfire pod fragments into protocol xml. 1744Expand deliantra pod fragments into protocol xml.
1577
1578=cut
1579
1580use re 'eval';
1581
1582my $group;
1583my $interior; $interior = qr{
1584 # match a pod interior sequence sans C<< >>
1585 (?:
1586 \ (.*?)\ (?{ $group = $^N })
1587 | < (??{$interior}) >
1588 )
1589}x;
1590
1591sub expand_cfpod {
1592 my ($self, $pod) = @_;
1593
1594 my $xml;
1595
1596 while () {
1597 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1598 $group = $1;
1599
1600 $group =~ s/&/&amp;/g;
1601 $group =~ s/</&lt;/g;
1602
1603 $xml .= $group;
1604 } elsif ($pod =~ m%\G
1605 ([BCGHITU])
1606 <
1607 (?:
1608 ([^<>]*) (?{ $group = $^N })
1609 | < $interior >
1610 )
1611 >
1612 %gcsx
1613 ) {
1614 my ($code, $data) = ($1, $group);
1615
1616 if ($code eq "B") {
1617 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1618 } elsif ($code eq "I") {
1619 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1620 } elsif ($code eq "U") {
1621 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1622 } elsif ($code eq "C") {
1623 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1624 } elsif ($code eq "T") {
1625 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1626 } elsif ($code eq "G") {
1627 my ($male, $female) = split /\|/, $data;
1628 $data = $self->gender ? $female : $male;
1629 $xml .= expand_cfpod ($self, $data);
1630 } elsif ($code eq "H") {
1631 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1632 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1633 "")
1634 [$self->{hintmode}];
1635 } else {
1636 $xml .= "error processing '$code($data)' directive";
1637 }
1638 } else {
1639 if ($pod =~ /\G(.+)/) {
1640 warn "parse error while expanding $pod (at $1)";
1641 }
1642 last;
1643 }
1644 }
1645
1646 for ($xml) {
1647 # create single paragraphs (very hackish)
1648 s/(?<=\S)\n(?=\w)/ /g;
1649
1650 # compress some whitespace
1651 s/\s+\n/\n/g; # ws line-ends
1652 s/\n\n+/\n/g; # double lines
1653 s/^\n+//; # beginning lines
1654 s/\n+$//; # ending lines
1655 }
1656
1657 $xml
1658}
1659
1660no re 'eval';
1661
1662sub hintmode {
1663 $_[0]{hintmode} = $_[1] if @_ > 1;
1664 $_[0]{hintmode}
1665}
1666 1745
1667=item $player->ext_reply ($msgid, @msg) 1746=item $player->ext_reply ($msgid, @msg)
1668 1747
1669Sends an ext reply to the player. 1748Sends an ext reply to the player.
1670 1749
1702 1781
1703=cut 1782=cut
1704 1783
1705sub find_by_path($) { 1784sub find_by_path($) {
1706 my ($path) = @_; 1785 my ($path) = @_;
1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1707 1788
1708 my ($match, $specificity); 1789 my ($match, $specificity);
1709 1790
1710 for my $region (list) { 1791 for my $region (list) {
1711 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
1737our $MAX_RESET = 3600; 1818our $MAX_RESET = 3600;
1738our $DEFAULT_RESET = 3000; 1819our $DEFAULT_RESET = 3000;
1739 1820
1740sub generate_random_map { 1821sub generate_random_map {
1741 my ($self, $rmp) = @_; 1822 my ($self, $rmp) = @_;
1823
1824 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1825
1742 # mit "rum" bekleckern, nicht 1826 # mit "rum" bekleckern, nicht
1743 $self->_create_random_map ( 1827 $self->_create_random_map (
1744 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1828 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1745 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1829 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1746 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1830 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1747 $rmp->{exit_on_final_map}, 1831 $rmp->{exit_on_final_map},
1748 $rmp->{xsize}, $rmp->{ysize}, 1832 $rmp->{xsize}, $rmp->{ysize},
1749 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1833 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1750 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1834 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1765 1849
1766sub register { 1850sub register {
1767 my (undef, $regex, $prio) = @_; 1851 my (undef, $regex, $prio) = @_;
1768 my $pkg = caller; 1852 my $pkg = caller;
1769 1853
1770 no strict;
1771 push @{"$pkg\::ISA"}, __PACKAGE__; 1854 push @{"$pkg\::ISA"}, __PACKAGE__;
1772 1855
1773 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1774} 1857}
1775 1858
1776# also paths starting with '/' 1859# also paths starting with '/'
1777$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1778 1861
1779sub thawer_merge { 1862sub thawer_merge {
1780 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1781 1864
1782 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
1868 1951
1869# the temporary/swap location 1952# the temporary/swap location
1870sub save_path { 1953sub save_path {
1871 my ($self) = @_; 1954 my ($self) = @_;
1872 1955
1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1956 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1874 "$TMPDIR/$path.map" 1957 "$TMPDIR/$path.map"
1875} 1958}
1876 1959
1877# the unique path, undef == no special unique path 1960# the unique path, undef == no special unique path
1878sub uniq_path { 1961sub uniq_path {
1879 my ($self) = @_; 1962 my ($self) = @_;
1880 1963
1881 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1964 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1882 "$UNIQUEDIR/$path" 1965 "$UNIQUEDIR/$path"
1883}
1884
1885# and all this just because we cannot iterate over
1886# all maps in C++...
1887sub change_all_map_light {
1888 my ($change) = @_;
1889
1890 $_->change_map_light ($change)
1891 for grep $_->outdoor, values %cf::MAP;
1892} 1966}
1893 1967
1894sub decay_objects { 1968sub decay_objects {
1895 my ($self) = @_; 1969 my ($self) = @_;
1896 1970
1980sub find { 2054sub find {
1981 my ($path, $origin) = @_; 2055 my ($path, $origin) = @_;
1982 2056
1983 $path = normalise $path, $origin && $origin->path; 2057 $path = normalise $path, $origin && $origin->path;
1984 2058
1985 cf::lock_wait "map_data:$path";#d#remove 2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1986 cf::lock_wait "map_find:$path"; 2060 my $guard2 = cf::lock_acquire "map_find:$path";
1987 2061
1988 $cf::MAP{$path} || do { 2062 $cf::MAP{$path} || do {
1989 my $guard1 = cf::lock_acquire "map_find:$path";
1990 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1991
1992 my $map = new_from_path cf::map $path 2063 my $map = new_from_path cf::map $path
1993 or return; 2064 or return;
1994 2065
1995 $map->{last_save} = $cf::RUNTIME; 2066 $map->{last_save} = $cf::RUNTIME;
1996 2067
1998 or return; 2069 or return;
1999 2070
2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2071 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2001 # doing this can freeze the server in a sync job, obviously 2072 # doing this can freeze the server in a sync job, obviously
2002 #$cf::WAIT_FOR_TICK->wait; 2073 #$cf::WAIT_FOR_TICK->wait;
2074 undef $guard2;
2003 undef $guard1; 2075 undef $guard1;
2004 undef $guard2;
2005 $map->reset; 2076 $map->reset;
2006 return find $path; 2077 return find $path;
2007 } 2078 }
2008 2079
2009 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
2010 } 2081 }
2011} 2082}
2012 2083
2013sub pre_load { } 2084sub pre_load { }
2014sub post_load { } 2085#sub post_load { } # XS
2015 2086
2016sub load { 2087sub load {
2017 my ($self) = @_; 2088 my ($self) = @_;
2018 2089
2019 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
2036 my $f = new_from_file cf::object::thawer $self->{load_path}; 2107 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block; 2108 $f->skip_block;
2038 $self->_load_objects ($f) 2109 $self->_load_objects ($f)
2039 or return; 2110 or return;
2040 2111
2041 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2112 $self->post_load_original
2042 if delete $self->{load_original}; 2113 if delete $self->{load_original};
2043 2114
2044 if (my $uniq = $self->uniq_path) { 2115 if (my $uniq = $self->uniq_path) {
2045 utf8::encode $uniq; 2116 utf8::encode $uniq;
2046 unless (aio_stat $uniq) { 2117 unless (aio_stat $uniq) {
2064 unless ($self->{deny_activate}) { 2135 unless ($self->{deny_activate}) {
2065 $self->decay_objects; 2136 $self->decay_objects;
2066 $self->fix_auto_apply; 2137 $self->fix_auto_apply;
2067 $self->update_buttons; 2138 $self->update_buttons;
2068 cf::cede_to_tick; 2139 cf::cede_to_tick;
2069 $self->set_darkness_map;
2070 cf::cede_to_tick;
2071 $self->activate; 2140 $self->activate;
2072 } 2141 }
2073 2142
2074 $self->{last_save} = $cf::RUNTIME; 2143 $self->{last_save} = $cf::RUNTIME;
2075 $self->last_access ($cf::RUNTIME); 2144 $self->last_access ($cf::RUNTIME);
2076 2145
2077 $self->in_memory (cf::MAP_IN_MEMORY); 2146 $self->in_memory (cf::MAP_ACTIVE);
2078 } 2147 }
2079 2148
2080 $self->post_load; 2149 $self->post_load;
2081} 2150}
2082 2151
2152# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath
2083sub customise_for { 2155sub customise_for {
2084 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
2085 2157
2086 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
2087 if $self->per_player; 2159 if $self->per_player;
2103 or next; 2175 or next;
2104 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2105 or next; 2177 or next;
2106 $neigh->load; 2178 $neigh->load;
2107 2179
2180 # now find the diagonal neighbours
2108 push @neigh, 2181 push @neigh,
2109 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2110 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2111 } 2184 }
2112 2185
2119} 2192}
2120 2193
2121sub find_sync { 2194sub find_sync {
2122 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2123 2196
2124 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
2125} 2201}
2126 2202
2127sub do_load_sync { 2203sub do_load_sync {
2128 my ($map) = @_; 2204 my ($map) = @_;
2129 2205
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2132 2208
2133 cf::sync_job { $map->load }; 2209 $map->load;
2134} 2210}
2135 2211
2136our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2137our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2138 2214
2140 my ($path, $origin, $load) = @_; 2216 my ($path, $origin, $load) = @_;
2141 2217
2142 $path = normalise $path, $origin && $origin->{path}; 2218 $path = normalise $path, $origin && $origin->{path};
2143 2219
2144 if (my $map = $cf::MAP{$path}) { 2220 if (my $map = $cf::MAP{$path}) {
2145 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2221 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2146 } 2222 }
2147 2223
2148 $MAP_PREFETCH{$path} |= $load; 2224 $MAP_PREFETCH{$path} |= $load;
2149 2225
2150 $MAP_PREFETCHER ||= cf::async { 2226 $MAP_PREFETCHER ||= cf::async {
2164 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2165 2241
2166 () 2242 ()
2167} 2243}
2168 2244
2245# common code, used by both ->save and ->swapout
2169sub save { 2246sub _save {
2170 my ($self) = @_; 2247 my ($self) = @_;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2248
2174 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2175 2250
2176 return unless $self->dirty; 2251 return unless $self->dirty;
2177 2252
2186 2261
2187 cf::async { 2262 cf::async {
2188 $Coro::current->{desc} = "map player save"; 2263 $Coro::current->{desc} = "map player save";
2189 $_->contr->save for $self->players; 2264 $_->contr->save for $self->players;
2190 }; 2265 };
2266
2267 cf::get_slot 0.02;
2191 2268
2192 if ($uniq) { 2269 if ($uniq) {
2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2270 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2194 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2271 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2195 } else { 2272 } else {
2196 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2273 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2197 } 2274 }
2198} 2275}
2199 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2200sub swap_out { 2285sub swap_out {
2201 my ($self) = @_; 2286 my ($self) = @_;
2202 2287
2203 # save first because save cedes
2204 $self->save;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2289
2290 return if $self->in_memory != cf::MAP_ACTIVE;
2291 return if $self->{deny_save};
2208 return if $self->players; 2292 return if $self->players;
2209 return if $self->in_memory != cf::MAP_IN_MEMORY;
2210 return if $self->{deny_save};
2211 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2212 $self->in_memory (cf::MAP_SWAPPED); 2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # then atomically save
2300 $self->_save;
2301
2302 # then free the map
2303 $self->clear;
2304}
2305
2306sub reset_at {
2307 my ($self) = @_;
2308
2309 # TODO: safety, remove and allow resettable per-player maps
2310 return 1e99 if $self->{deny_reset};
2311
2312 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2313 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2314
2315 $time + $to
2316}
2317
2318sub should_reset {
2319 my ($self) = @_;
2320
2321 $self->reset_at <= $cf::RUNTIME
2322}
2323
2324sub reset {
2325 my ($self) = @_;
2326
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
2329 return if $self->players;
2330
2331 cf::trace "resetting map ", $self->path, "\n";
2332
2333 $self->in_memory (cf::MAP_SWAPPED);
2334
2335 # need to save uniques path
2336 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338
2339 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2340 if $uniq;
2341 }
2342
2343 delete $cf::MAP{$self->path};
2213 2344
2214 $self->deactivate; 2345 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2216 $self->clear; 2347 $self->clear;
2217}
2218
2219sub reset_at {
2220 my ($self) = @_;
2221
2222 # TODO: safety, remove and allow resettable per-player maps
2223 return 1e99 if $self->{deny_reset};
2224
2225 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2226 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2227
2228 $time + $to
2229}
2230
2231sub should_reset {
2232 my ($self) = @_;
2233
2234 $self->reset_at <= $cf::RUNTIME
2235}
2236
2237sub reset {
2238 my ($self) = @_;
2239
2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2241
2242 return if $self->players;
2243
2244 warn "resetting map ", $self->path;
2245
2246 $self->in_memory (cf::MAP_SWAPPED);
2247
2248 # need to save uniques path
2249 unless ($self->{deny_save}) {
2250 my $uniq = $self->uniq_path; utf8::encode $uniq;
2251
2252 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2253 if $uniq;
2254 }
2255
2256 delete $cf::MAP{$self->path};
2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2260 $self->clear;
2261 2348
2262 $self->unlink_save; 2349 $self->unlink_save;
2263 $self->destroy; 2350 $self->destroy;
2264} 2351}
2265 2352
2273 2360
2274 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2275 2362
2276 $self->unlink_save; 2363 $self->unlink_save;
2277 2364
2278 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2279 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2280 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2281 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2283 2370
2332 2419
2333sub unique_maps() { 2420sub unique_maps() {
2334 [ 2421 [
2335 map { 2422 map {
2336 utf8::decode $_; 2423 utf8::decode $_;
2337 /\.map$/ 2424 s/\.map$//; # TODO future compatibility hack
2425 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2426 ? ()
2338 ? normalise $_ 2427 : normalise $_
2339 : ()
2340 } @{ aio_readdir $UNIQUEDIR or [] } 2428 } @{ aio_readdir $UNIQUEDIR or [] }
2341 ] 2429 ]
2342} 2430}
2343 2431
2344package cf; 2432=item cf::map::static_maps
2433
2434Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2435file in the shared directory excluding F</styles> and F</editor>). May
2436block.
2437
2438=cut
2439
2440sub static_maps() {
2441 my @dirs = "";
2442 my @maps;
2443
2444 while (@dirs) {
2445 my $dir = shift @dirs;
2446
2447 next if $dir eq "/styles" || $dir eq "/editor";
2448
2449 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2450 or return;
2451
2452 for (@$files) {
2453 s/\.map$// or next;
2454 utf8::decode $_;
2455 push @maps, "$dir/$_";
2456 }
2457
2458 push @dirs, map "$dir/$_", @$dirs;
2459 }
2460
2461 \@maps
2462}
2345 2463
2346=back 2464=back
2347 2465
2348=head3 cf::object 2466=head3 cf::object
2349 2467
2353 2471
2354=over 4 2472=over 4
2355 2473
2356=item $ob->inv_recursive 2474=item $ob->inv_recursive
2357 2475
2358Returns the inventory of the object _and_ their inventories, recursively. 2476Returns the inventory of the object I<and> their inventories, recursively,
2477but I<not> the object itself.
2359 2478
2360=cut 2479=cut
2361 2480
2362sub inv_recursive_; 2481sub inv_recursive_;
2363sub inv_recursive_ { 2482sub inv_recursive_ {
2368 inv_recursive_ inv $_[0] 2487 inv_recursive_ inv $_[0]
2369} 2488}
2370 2489
2371=item $ref = $ob->ref 2490=item $ref = $ob->ref
2372 2491
2373creates and returns a persistent reference to an objetc that can be stored as a string. 2492Creates and returns a persistent reference to an object that can be stored as a string.
2374 2493
2375=item $ob = cf::object::deref ($refstring) 2494=item $ob = cf::object::deref ($refstring)
2376 2495
2377returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2496returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2378even if the object actually exists. May block. 2497even if the object actually exists. May block.
2410can be C<undef>. Does the right thing when the player is currently in a 2529can be C<undef>. Does the right thing when the player is currently in a
2411dialogue with the given NPC character. 2530dialogue with the given NPC character.
2412 2531
2413=cut 2532=cut
2414 2533
2534our $SAY_CHANNEL = {
2535 id => "say",
2536 title => "Map",
2537 reply => "say ",
2538 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2539};
2540
2541our $CHAT_CHANNEL = {
2542 id => "chat",
2543 title => "Chat",
2544 reply => "chat ",
2545 tooltip => "Player chat and shouts, global to the server.",
2546};
2547
2415# rough implementation of a future "reply" method that works 2548# rough implementation of a future "reply" method that works
2416# with dialog boxes. 2549# with dialog boxes.
2417#TODO: the first argument must go, split into a $npc->reply_to ( method 2550#TODO: the first argument must go, split into a $npc->reply_to ( method
2418sub cf::object::player::reply($$$;$) { 2551sub cf::object::player::reply($$$;$) {
2419 my ($self, $npc, $msg, $flags) = @_; 2552 my ($self, $npc, $msg, $flags) = @_;
2430 my $dialog = $pl->{npc_dialog}; 2563 my $dialog = $pl->{npc_dialog};
2431 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2564 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2432 2565
2433 } else { 2566 } else {
2434 $msg = $npc->name . " says: $msg" if $npc; 2567 $msg = $npc->name . " says: $msg" if $npc;
2435 $self->message ($msg, $flags); 2568 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2436 } 2569 }
2437 } 2570 }
2438} 2571}
2439 2572
2440=item $object->send_msg ($channel, $msg, $color, [extra...]) 2573=item $object->send_msg ($channel, $msg, $color, [extra...])
2465 2598
2466=item $player_object->enter_link 2599=item $player_object->enter_link
2467 2600
2468Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2469 2602
2470The player should be reasonably safe there for short amounts of time. You 2603The player should be reasonably safe there for short amounts of time (e.g.
2471I<MUST> call C<leave_link> as soon as possible, though. 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2605though, as the player cannot control the character while it is on the link
2606map.
2472 2607
2473Will never block. 2608Will never block.
2474 2609
2475=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
2476 2611
2496sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2497 my ($self) = @_; 2632 my ($self) = @_;
2498 2633
2499 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2500 2635
2636 ++$self->{_link_recursion};
2637
2501 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2502 2639
2503 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2504 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2505 2642
2506 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2507} 2644}
2508 2645
2509sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2510 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2511 2648
2528 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
2529 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
2530 2667
2531 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
2532 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
2533 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
2534 2671
2535 $map->load; 2672 $map->load;
2536 $map->load_neighbours; 2673 $map->load_neighbours;
2537 2674
2538 return unless $self->contr->active; 2675 return unless $self->contr->active;
2539 $self->activate_recursive;
2540 2676
2541 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2542 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2543} 2679 # entering was successful
2680 delete $self->{_link_recursion};
2681 # only activate afterwards, to support waiting in hooks
2682 $self->activate_recursive;
2683 }
2544 2684
2685}
2686
2545=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2546 2688
2547Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2548her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2549that has to return the map if sucecssful, and then unfreezes the player on 2691that has to return the map if sucecssful, and then unfreezes the player on
2550the new (success) or old (failed) map position. In either case, $done will 2692the new (success) or old (failed) map position. In either case, $done will
2551be called at the end of this process. 2693be called at the end of this process.
2552 2694
2695Note that $check will be called with a potentially non-loaded map, so if
2696it needs a loaded map it has to call C<< ->load >>.
2697
2553=cut 2698=cut
2554 2699
2555our $GOTOGEN; 2700our $GOTOGEN;
2556 2701
2557sub cf::object::player::goto { 2702sub cf::object::player::goto {
2558 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2559 2710
2560 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2562 2713
2563 $self->enter_link; 2714 $self->enter_link;
2587 my $map = eval { 2738 my $map = eval {
2588 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2589 2740
2590 if ($map) { 2741 if ($map) {
2591 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2592 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2593 } else { 2744 } else {
2594 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2595 } 2746 }
2596 2747
2597 $map 2748 $map
2605 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2606 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2607 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2608 } 2759 }
2609 2760
2610 $done->() if $done; 2761 $done->($self) if $done;
2611 })->prio (1); 2762 })->prio (1);
2612} 2763}
2613 2764
2614=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2615 2766
2635} 2786}
2636 2787
2637sub prepare_random_map { 2788sub prepare_random_map {
2638 my ($exit) = @_; 2789 my ($exit) = @_;
2639 2790
2640 my $guard = cf::lock_acquire "exit_prepare:$exit";
2641
2642 # all this does is basically replace the /! path by 2791 # all this does is basically replace the /! path by
2643 # a new random map path (?random/...) with a seed 2792 # a new random map path (?random/...) with a seed
2644 # that depends on the exit object 2793 # that depends on the exit object
2645 2794
2646 my $rmp = parse_random_map_params $exit->msg; 2795 my $rmp = parse_random_map_params $exit->msg;
2648 if ($exit->map) { 2797 if ($exit->map) {
2649 $rmp->{region} = $exit->region->name; 2798 $rmp->{region} = $exit->region->name;
2650 $rmp->{origin_map} = $exit->map->path; 2799 $rmp->{origin_map} = $exit->map->path;
2651 $rmp->{origin_x} = $exit->x; 2800 $rmp->{origin_x} = $exit->x;
2652 $rmp->{origin_y} = $exit->y; 2801 $rmp->{origin_y} = $exit->y;
2802
2803 $exit->map->touch;
2653 } 2804 }
2654 2805
2655 $rmp->{random_seed} ||= $exit->random_seed; 2806 $rmp->{random_seed} ||= $exit->random_seed;
2656 2807
2657 my $data = cf::encode_json $rmp; 2808 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2658 my $md5 = Digest::MD5::md5_hex $data; 2809 my $md5 = Digest::MD5::md5_hex $data;
2659 my $meta = "$RANDOMDIR/$md5.meta"; 2810 my $meta = "$RANDOMDIR/$md5.meta";
2660 2811
2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2812 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2662 aio_write $fh, 0, (length $data), $data, 0; 2813 aio_write $fh, 0, (length $data), $data, 0;
2663 undef $fh; 2814 undef $fh;
2664 aio_rename "$meta~", $meta; 2815 aio_rename "$meta~", $meta;
2665 2816
2817 my $slaying = "?random/$md5";
2818
2819 if ($exit->valid) {
2666 $exit->slaying ("?random/$md5"); 2820 $exit->slaying ("?random/$md5");
2667 $exit->msg (undef); 2821 $exit->msg (undef);
2822 }
2668 } 2823 }
2669} 2824}
2670 2825
2671sub cf::object::player::enter_exit { 2826sub cf::object::player::enter_exit {
2672 my ($self, $exit) = @_; 2827 my ($self, $exit) = @_;
2673 2828
2674 return unless $self->type == cf::PLAYER; 2829 return unless $self->type == cf::PLAYER;
2675 2830
2676 if ($exit->slaying eq "/!") {
2677 #TODO: this should de-fi-ni-te-ly not be a sync-job
2678 # the problem is that $exit might not survive long enough
2679 # so it needs to be done right now, right here
2680 cf::sync_job { prepare_random_map $exit };
2681 }
2682
2683 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2684 my $hp = $exit->stats->hp;
2685 my $sp = $exit->stats->sp;
2686
2687 $self->enter_link; 2831 $self->enter_link;
2688 2832
2689 # if exit is damned, update players death & WoR home-position
2690 $self->contr->savebed ($slaying, $hp, $sp)
2691 if $exit->flag (FLAG_DAMNED);
2692
2693 (async { 2833 (async {
2694 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2834 $Coro::current->{desc} = "enter_exit";
2695 2835
2696 $self->deactivate_recursive; # just to be sure
2697 unless (eval { 2836 unless (eval {
2837 $self->deactivate_recursive; # just to be sure
2838
2839 # random map handling
2840 {
2841 my $guard = cf::lock_acquire "exit_prepare:$exit";
2842
2843 prepare_random_map $exit
2844 if $exit->slaying eq "/!";
2845 }
2846
2847 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2848 my $x = $exit->stats->hp;
2849 my $y = $exit->stats->sp;
2850
2698 $self->goto ($slaying, $hp, $sp); 2851 $self->goto ($map, $x, $y);
2699 2852
2853 # if exit is damned, update players death & WoR home-position
2854 $self->contr->savebed ($map, $x, $y)
2855 if $exit->flag (cf::FLAG_DAMNED);
2856
2700 1; 2857 1
2701 }) { 2858 }) {
2702 $self->message ("Something went wrong deep within the crossfire server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2703 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2704 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2706 2863
2707 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2708 $self->leave_link; 2865 $self->leave_link;
2709 } 2866 }
2710 })->prio (1); 2867 })->prio (1);
2711} 2868}
2712 2869
2724sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2725 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2726 2883
2727 utf8::encode $text; 2884 utf8::encode $text;
2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2885 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2886}
2887
2888=item $client->send_big_packet ($pkt)
2889
2890Like C<send_packet>, but tries to compress large packets, and fragments
2891them as required.
2892
2893=cut
2894
2895our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2896
2897sub cf::client::send_big_packet {
2898 my ($self, $pkt) = @_;
2899
2900 # try lzf for large packets
2901 $pkt = "lzf " . Compress::LZF::compress $pkt
2902 if 1024 <= length $pkt and $self->{can_lzf};
2903
2904 # split very large packets
2905 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2906 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2907 $pkt = "frag";
2908 }
2909
2910 $self->send_packet ($pkt);
2729} 2911}
2730 2912
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 2914
2733Send a drawinfo or msg packet to the client, formatting the msg for the 2915Send a drawinfo or msg packet to the client, formatting the msg for the
2737 2919
2738=cut 2920=cut
2739 2921
2740# non-persistent channels (usually the info channel) 2922# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2742 "c/identify" => { 2930 "c/identify" => {
2743 id => "infobox", 2931 id => "infobox",
2744 title => "Identify", 2932 title => "Identify",
2745 reply => undef, 2933 reply => undef,
2746 tooltip => "Items recently identified", 2934 tooltip => "Items recently identified",
2748 "c/examine" => { 2936 "c/examine" => {
2749 id => "infobox", 2937 id => "infobox",
2750 title => "Examine", 2938 title => "Examine",
2751 reply => undef, 2939 reply => undef,
2752 tooltip => "Signs and other items you examined", 2940 tooltip => "Signs and other items you examined",
2941 },
2942 "c/shopinfo" => {
2943 id => "infobox",
2944 title => "Shop Info",
2945 reply => undef,
2946 tooltip => "What your bargaining skill tells you about the shop",
2753 }, 2947 },
2754 "c/book" => { 2948 "c/book" => {
2755 id => "infobox", 2949 id => "infobox",
2756 title => "Book", 2950 title => "Book",
2757 reply => undef, 2951 reply => undef,
2773 id => "infobox", 2967 id => "infobox",
2774 title => "Body Parts", 2968 title => "Body Parts",
2775 reply => undef, 2969 reply => undef,
2776 tooltip => "Shows which body parts you posess and are available", 2970 tooltip => "Shows which body parts you posess and are available",
2777 }, 2971 },
2972 "c/statistics" => {
2973 id => "infobox",
2974 title => "Statistics",
2975 reply => undef,
2976 tooltip => "Shows your primary statistics",
2977 },
2978 "c/skills" => {
2979 id => "infobox",
2980 title => "Skills",
2981 reply => undef,
2982 tooltip => "Shows your experience per skill and item power",
2983 },
2984 "c/shopitems" => {
2985 id => "infobox",
2986 title => "Shop Items",
2987 reply => undef,
2988 tooltip => "Shows the items currently for sale in this shop",
2989 },
2990 "c/resistances" => {
2991 id => "infobox",
2992 title => "Resistances",
2993 reply => undef,
2994 tooltip => "Shows your resistances",
2995 },
2996 "c/pets" => {
2997 id => "infobox",
2998 title => "Pets",
2999 reply => undef,
3000 tooltip => "Shows information abotu your pets/a specific pet",
3001 },
3002 "c/perceiveself" => {
3003 id => "infobox",
3004 title => "Perceive Self",
3005 reply => undef,
3006 tooltip => "You gained detailed knowledge about yourself",
3007 },
2778 "c/uptime" => { 3008 "c/uptime" => {
2779 id => "infobox", 3009 id => "infobox",
2780 title => "Uptime", 3010 title => "Uptime",
2781 reply => undef, 3011 reply => undef,
2782 tooltip => "How long the server has been running since last restart", 3012 tooltip => "How long the server has been running since last restart",
2785 id => "infobox", 3015 id => "infobox",
2786 title => "Map Info", 3016 title => "Map Info",
2787 reply => undef, 3017 reply => undef,
2788 tooltip => "Information related to the maps", 3018 tooltip => "Information related to the maps",
2789 }, 3019 },
3020 "c/party" => {
3021 id => "party",
3022 title => "Party",
3023 reply => "gsay ",
3024 tooltip => "Messages and chat related to your party",
3025 },
3026 "c/death" => {
3027 id => "death",
3028 title => "Death",
3029 reply => undef,
3030 tooltip => "Reason for and more info about your most recent death",
3031 },
3032 "c/say" => $SAY_CHANNEL,
3033 "c/chat" => $CHAT_CHANNEL,
2790); 3034);
2791 3035
2792sub cf::client::send_msg { 3036sub cf::client::send_msg {
2793 my ($self, $channel, $msg, $color, @extra) = @_; 3037 my ($self, $channel, $msg, $color, @extra) = @_;
2794 3038
2795 $msg = $self->pl->expand_cfpod ($msg); 3039 $msg = $self->pl->expand_cfpod ($msg)
3040 unless $color & cf::NDI_VERBATIM;
2796 3041
2797 $color &= cf::NDI_CLIENT_MASK; # just in case... 3042 $color &= cf::NDI_CLIENT_MASK; # just in case...
2798 3043
2799 # check predefined channels, for the benefit of C 3044 # check predefined channels, for the benefit of C
2800 if ($CHANNEL{$channel}) { 3045 if ($CHANNEL{$channel}) {
2801 $channel = $CHANNEL{$channel}; 3046 $channel = $CHANNEL{$channel};
2802 3047
2803 $self->ext_msg (channel_info => $channel) 3048 $self->ext_msg (channel_info => $channel);
2804 if $self->can_msg;
2805
2806 $channel = $channel->{id}; 3049 $channel = $channel->{id};
2807 3050
2808 } elsif (ref $channel) { 3051 } elsif (ref $channel) {
2809 # send meta info to client, if not yet sent 3052 # send meta info to client, if not yet sent
2810 unless (exists $self->{channel}{$channel->{id}}) { 3053 unless (exists $self->{channel}{$channel->{id}}) {
2811 $self->{channel}{$channel->{id}} = $channel; 3054 $self->{channel}{$channel->{id}} = $channel;
2812 $self->ext_msg (channel_info => $channel) 3055 $self->ext_msg (channel_info => $channel);
2813 if $self->can_msg;
2814 } 3056 }
2815 3057
2816 $channel = $channel->{id}; 3058 $channel = $channel->{id};
2817 } 3059 }
2818 3060
2819 return unless @extra || length $msg; 3061 return unless @extra || length $msg;
2820 3062
2821 if ($self->can_msg) {
2822 # default colour, mask it out 3063 # default colour, mask it out
2823 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3064 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2824 if $color & cf::NDI_DEF; 3065 if $color & cf::NDI_DEF;
2825 3066
2826 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3067 my $pkt = "msg "
3068 . $self->{json_coder}->encode (
2827 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2828 } else { 3070 );
2829 if ($color >= 0) {
2830 # replace some tags by gcfclient-compatible ones
2831 for ($msg) {
2832 1 while
2833 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2834 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2835 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2836 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2837 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2838 }
2839 3071
2840 $color &= cf::NDI_COLOR_MASK; 3072 $self->send_big_packet ($pkt);
2841
2842 utf8::encode $msg;
2843
2844 if (0 && $msg =~ /\[/) {
2845 # COMMAND/INFO
2846 $self->send_packet ("drawextinfo $color 10 8 $msg")
2847 } else {
2848 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2849 $self->send_packet ("drawinfo $color $msg")
2850 }
2851 }
2852 }
2853} 3073}
2854 3074
2855=item $client->ext_msg ($type, @msg) 3075=item $client->ext_msg ($type, @msg)
2856 3076
2857Sends an ext event to the client. 3077Sends an ext event to the client.
2860 3080
2861sub cf::client::ext_msg($$@) { 3081sub cf::client::ext_msg($$@) {
2862 my ($self, $type, @msg) = @_; 3082 my ($self, $type, @msg) = @_;
2863 3083
2864 if ($self->extcmd == 2) { 3084 if ($self->extcmd == 2) {
2865 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2866 } elsif ($self->extcmd == 1) { # TODO: remove 3086 } elsif ($self->extcmd == 1) { # TODO: remove
2867 push @msg, msgtype => "event_$type"; 3087 push @msg, msgtype => "event_$type";
2868 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2869 } 3089 }
2870} 3090}
2871 3091
2872=item $client->ext_reply ($msgid, @msg) 3092=item $client->ext_reply ($msgid, @msg)
2873 3093
2877 3097
2878sub cf::client::ext_reply($$@) { 3098sub cf::client::ext_reply($$@) {
2879 my ($self, $id, @msg) = @_; 3099 my ($self, $id, @msg) = @_;
2880 3100
2881 if ($self->extcmd == 2) { 3101 if ($self->extcmd == 2) {
2882 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2883 } elsif ($self->extcmd == 1) { 3103 } elsif ($self->extcmd == 1) {
2884 #TODO: version 1, remove 3104 #TODO: version 1, remove
2885 unshift @msg, msgtype => "reply", msgid => $id; 3105 unshift @msg, msgtype => "reply", msgid => $id;
2886 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2887 } 3107 }
2888} 3108}
2889 3109
2890=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2891 3111
2962 3182
2963 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
2964 if $reply; 3184 if $reply;
2965 3185
2966 } else { 3186 } else {
2967 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2968 } 3188 }
2969 3189
2970 cf::override; 3190 cf::override;
2971 }, 3191 },
2972); 3192);
2992 3212
2993 $coro 3213 $coro
2994} 3214}
2995 3215
2996cf::client->attach ( 3216cf::client->attach (
2997 on_destroy => sub { 3217 on_client_destroy => sub {
2998 my ($ns) = @_; 3218 my ($ns) = @_;
2999 3219
3000 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3001 }, 3221 },
3002); 3222);
3018our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
3019 3239
3020$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
3021 3241
3022$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
3023 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
3024 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
3025 sort time 3245 sort time
3026)); 3246));
3027 3247
3028# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
3031 3251
3032The following functions and methods are available within a safe environment: 3252The following functions and methods are available within a safe environment:
3033 3253
3034 cf::object 3254 cf::object
3035 contr pay_amount pay_player map x y force_find force_add destroy 3255 contr pay_amount pay_player map x y force_find force_add destroy
3036 insert remove name archname title slaying race decrease_ob_nr 3256 insert remove name archname title slaying race decrease split
3257 value
3037 3258
3038 cf::object::player 3259 cf::object::player
3039 player 3260 player
3040 3261
3041 cf::player 3262 cf::player
3046 3267
3047=cut 3268=cut
3048 3269
3049for ( 3270for (
3050 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3271 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3051 insert remove inv name archname title slaying race 3272 insert remove inv nrof name archname title slaying race
3052 decrease_ob_nr destroy)], 3273 decrease split destroy change_exp value msg lore send_msg)],
3053 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
3054 ["cf::player" => qw(peaceful)], 3275 ["cf::player" => qw(peaceful send_msg)],
3055 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
3056) { 3277) {
3057 no strict 'refs';
3058 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
3059 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3060 for @funs; 3280 for @funs;
3061} 3281}
3062 3282
3077 3297
3078 my $qcode = $code; 3298 my $qcode = $code;
3079 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3299 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3080 $qcode =~ s/\n/\\n/g; 3300 $qcode =~ s/\n/\\n/g;
3081 3301
3302 %vars = (_dummy => 0) unless %vars;
3303
3304 my @res;
3082 local $_; 3305 local $_;
3083 local @safe::cf::_safe_eval_args = values %vars;
3084 3306
3085 my $eval = 3307 my $eval =
3086 "do {\n" 3308 "do {\n"
3087 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3309 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3088 . "#line 0 \"{$qcode}\"\n" 3310 . "#line 0 \"{$qcode}\"\n"
3089 . $code 3311 . $code
3090 . "\n}" 3312 . "\n}"
3091 ; 3313 ;
3092 3314
3315 if ($CFG{safe_eval}) {
3093 sub_generation_inc; 3316 sub_generation_inc;
3317 local @safe::cf::_safe_eval_args = values %vars;
3094 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3318 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3095 sub_generation_inc; 3319 sub_generation_inc;
3320 } else {
3321 local @cf::_safe_eval_args = values %vars;
3322 @res = wantarray ? eval eval : scalar eval $eval;
3323 }
3096 3324
3097 if ($@) { 3325 if ($@) {
3098 warn "$@"; 3326 warn "$@",
3099 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
3100 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
3101 } 3329 }
3102 3330
3103 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
3104} 3332}
3105 3333
3119=cut 3347=cut
3120 3348
3121sub register_script_function { 3349sub register_script_function {
3122 my ($fun, $cb) = @_; 3350 my ($fun, $cb) = @_;
3123 3351
3124 no strict 'refs'; 3352 $fun = "safe::$fun" if $CFG{safe_eval};
3125 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3353 *$fun = $safe_hole->wrap ($cb);
3126} 3354}
3127 3355
3128=back 3356=back
3129 3357
3130=cut 3358=cut
3131 3359
3132############################################################################# 3360#############################################################################
3133# the server's init and main functions 3361# the server's init and main functions
3362
3363# async inc loader. yay.
3364sub inc_loader {
3365 my $mod = $_[1];
3366
3367 if (in_main && !tick_inhibit) {
3368 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3369 } else {
3370 debug "loading perl module $mod\n";
3371 }
3372
3373 # 1. find real file
3374 for my $dir (@ORIG_INC) {
3375 warn "$dir/$mod\n";#d#
3376 ref $dir and next;
3377 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3378 or next;
3379
3380 $data = "#line 1 $dir/$mod\n$data";
3381
3382 open my $fh, "<", \$data or die;
3383
3384 return $fh;
3385 }
3386
3387 ()
3388}
3389
3390sub init_inc {
3391 # save original @INC
3392 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3393
3394 # make sure we can do scalar-opens
3395 open my $dummy, "<", \my $dummy2;
3396
3397 # execute some stuff so perl load's some of the core modules
3398 /Ü/ =~ /ü/i;
3399 eval { &Storable::nstore_fd };
3400
3401 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3402
3403 debug "module loading will be asynchronous from this point on.";
3404}
3134 3405
3135sub load_facedata($) { 3406sub load_facedata($) {
3136 my ($path) = @_; 3407 my ($path) = @_;
3137 3408
3138 # HACK to clear player env face cache, we need some signal framework 3409 # HACK to clear player env face cache, we need some signal framework
3139 # for this (global event?) 3410 # for this (global event?)
3140 %ext::player_env::MUSIC_FACE_CACHE = (); 3411 %ext::player_env::MUSIC_FACE_CACHE = ();
3141 3412
3142 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3413 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3143 3414
3144 warn "loading facedata from $path\n"; 3415 trace "loading facedata from $path\n";
3145 3416
3146 my $facedata; 3417 my $facedata;
3147 0 < aio_load $path, $facedata 3418 0 < aio_load $path, $facedata
3148 or die "$path: $!"; 3419 or die "$path: $!";
3149 3420
3151 3422
3152 $facedata->{version} == 2 3423 $facedata->{version} == 2
3153 or cf::cleanup "$path: version mismatch, cannot proceed."; 3424 or cf::cleanup "$path: version mismatch, cannot proceed.";
3154 3425
3155 # patch in the exptable 3426 # patch in the exptable
3427 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3156 $facedata->{resource}{"res/exp_table"} = { 3428 $facedata->{resource}{"res/exp_table"} = {
3157 type => FT_RSRC, 3429 type => FT_RSRC,
3158 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3430 data => $exp_table,
3431 hash => (Digest::MD5::md5 $exp_table),
3159 }; 3432 };
3160 cf::cede_to_tick; 3433 cf::cede_to_tick;
3161 3434
3162 { 3435 {
3163 my $faces = $facedata->{faceinfo}; 3436 my $faces = $facedata->{faceinfo};
3165 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
3166 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3439 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3167 3440
3168 cf::face::set_visibility $idx, $info->{visibility}; 3441 cf::face::set_visibility $idx, $info->{visibility};
3169 cf::face::set_magicmap $idx, $info->{magicmap}; 3442 cf::face::set_magicmap $idx, $info->{magicmap};
3170 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3443 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3171 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3444 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3172 3445
3173 cf::cede_to_tick; 3446 cf::cede_to_tick;
3174 } 3447 }
3175 3448
3176 while (my ($face, $info) = each %$faces) { 3449 while (my ($face, $info) = each %$faces) {
3181 3454
3182 if (my $smooth = cf::face::find $info->{smooth}) { 3455 if (my $smooth = cf::face::find $info->{smooth}) {
3183 cf::face::set_smooth $idx, $smooth; 3456 cf::face::set_smooth $idx, $smooth;
3184 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3457 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3185 } else { 3458 } else {
3186 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3459 error "smooth face '$info->{smooth}' not found for face '$face'";
3187 } 3460 }
3188 3461
3189 cf::cede_to_tick; 3462 cf::cede_to_tick;
3190 } 3463 }
3191 } 3464 }
3200 3473
3201 cf::anim::invalidate_all; # d'oh 3474 cf::anim::invalidate_all; # d'oh
3202 } 3475 }
3203 3476
3204 { 3477 {
3205 # TODO: for gcfclient pleasure, we should give resources
3206 # that gcfclient doesn't grok a >10000 face index.
3207 my $res = $facedata->{resource}; 3478 my $res = $facedata->{resource};
3208 3479
3209 while (my ($name, $info) = each %$res) { 3480 while (my ($name, $info) = each %$res) {
3210 if (defined $info->{type}) { 3481 if (defined $info->{type}) {
3211 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3482 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3212 my $data;
3213 3483
3214 if ($info->{type} & 1) { 3484 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3215 # prepend meta info
3216
3217 my $meta = $enc->encode ({
3218 name => $name,
3219 %{ $info->{meta} || {} },
3220 });
3221
3222 $data = pack "(w/a*)*", $meta, $info->{data};
3223 } else {
3224 $data = $info->{data};
3225 }
3226
3227 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3228 cf::face::set_type $idx, $info->{type}; 3485 cf::face::set_type $idx, $info->{type};
3229 } else { 3486 } else {
3230 $RESOURCE{$name} = $info; 3487 $RESOURCE{$name} = $info; # unused
3231 } 3488 }
3232 3489
3233 cf::cede_to_tick; 3490 cf::cede_to_tick;
3234 } 3491 }
3235 } 3492 }
3236 3493
3237 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3494 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3238 3495
3239 1 3496 1
3240} 3497}
3241
3242cf::global->attach (on_resource_update => sub {
3243 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3244 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3245
3246 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3247 my $sound = $soundconf->{compat}[$_]
3248 or next;
3249
3250 my $face = cf::face::find "sound/$sound->[1]";
3251 cf::sound::set $sound->[0] => $face;
3252 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3253 }
3254
3255 while (my ($k, $v) = each %{$soundconf->{event}}) {
3256 my $face = cf::face::find "sound/$v";
3257 cf::sound::set $k => $face;
3258 }
3259 }
3260});
3261 3498
3262register_exticmd fx_want => sub { 3499register_exticmd fx_want => sub {
3263 my ($ns, $want) = @_; 3500 my ($ns, $want) = @_;
3264 3501
3265 while (my ($k, $v) = each %$want) { 3502 while (my ($k, $v) = each %$want) {
3266 $ns->fx_want ($k, $v); 3503 $ns->fx_want ($k, $v);
3267 } 3504 }
3268}; 3505};
3506
3507sub load_resource_file($) {
3508 my $guard = lock_acquire "load_resource_file";
3509
3510 my $status = load_resource_file_ $_[0];
3511 get_slot 0.1, 100;
3512 cf::arch::commit_load;
3513
3514 $status
3515}
3269 3516
3270sub reload_regions { 3517sub reload_regions {
3271 # HACK to clear player env face cache, we need some signal framework 3518 # HACK to clear player env face cache, we need some signal framework
3272 # for this (global event?) 3519 # for this (global event?)
3273 %ext::player_env::MUSIC_FACE_CACHE = (); 3520 %ext::player_env::MUSIC_FACE_CACHE = ();
3287} 3534}
3288 3535
3289sub reload_archetypes { 3536sub reload_archetypes {
3290 load_resource_file "$DATADIR/archetypes" 3537 load_resource_file "$DATADIR/archetypes"
3291 or die "unable to load archetypes\n"; 3538 or die "unable to load archetypes\n";
3292 #d# NEED to laod twice to resolve forward references
3293 # this really needs to be done in an extra post-pass
3294 # (which needs to be synchronous, so solve it differently)
3295 load_resource_file "$DATADIR/archetypes"
3296 or die "unable to load archetypes\n";
3297} 3539}
3298 3540
3299sub reload_treasures { 3541sub reload_treasures {
3300 load_resource_file "$DATADIR/treasures" 3542 load_resource_file "$DATADIR/treasures"
3301 or die "unable to load treasurelists\n"; 3543 or die "unable to load treasurelists\n";
3302} 3544}
3303 3545
3546sub reload_sound {
3547 trace "loading sound config from $DATADIR/sound\n";
3548
3549 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3550 or die "$DATADIR/sound $!";
3551
3552 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3553
3554 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3555 my $sound = $soundconf->{compat}[$_]
3556 or next;
3557
3558 my $face = cf::face::find "sound/$sound->[1]";
3559 cf::sound::set $sound->[0] => $face;
3560 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3561 }
3562
3563 while (my ($k, $v) = each %{$soundconf->{event}}) {
3564 my $face = cf::face::find "sound/$v";
3565 cf::sound::set $k => $face;
3566 }
3567}
3568
3304sub reload_resources { 3569sub reload_resources {
3305 warn "reloading resource files...\n"; 3570 trace "reloading resource files...\n";
3306 3571
3572 reload_facedata;
3573 reload_sound;
3574 reload_archetypes;
3307 reload_regions; 3575 reload_regions;
3308 reload_facedata;
3309 #reload_archetypes;#d#
3310 reload_archetypes;
3311 reload_treasures; 3576 reload_treasures;
3312 3577
3313 warn "finished reloading resource files\n"; 3578 trace "finished reloading resource files\n";
3314}
3315
3316sub init {
3317 reload_resources;
3318} 3579}
3319 3580
3320sub reload_config { 3581sub reload_config {
3582 trace "reloading config file...\n";
3583
3321 open my $fh, "<:utf8", "$CONFDIR/config" 3584 open my $fh, "<:utf8", "$CONFDIR/config"
3322 or return; 3585 or return;
3323 3586
3324 local $/; 3587 local $/;
3325 *CFG = YAML::Load <$fh>; 3588 *CFG = YAML::XS::Load scalar <$fh>;
3326 3589
3327 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3328 3591
3329 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3592 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3330 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3593 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3331 3594
3332 if (exists $CFG{mlockall}) { 3595 if (exists $CFG{mlockall}) {
3334 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3597 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3335 and die "WARNING: m(un)lockall failed: $!\n"; 3598 and die "WARNING: m(un)lockall failed: $!\n";
3336 }; 3599 };
3337 warn $@ if $@; 3600 warn $@ if $@;
3338 } 3601 }
3602
3603 trace "finished reloading resource files\n";
3604}
3605
3606sub pidfile() {
3607 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3608 or die "$PIDFILE: $!";
3609 flock $fh, &Fcntl::LOCK_EX
3610 or die "$PIDFILE: flock: $!";
3611 $fh
3612}
3613
3614# make sure only one server instance is running at any one time
3615sub atomic {
3616 my $fh = pidfile;
3617
3618 my $pid = <$fh>;
3619 kill 9, $pid if $pid > 0;
3620
3621 seek $fh, 0, 0;
3622 print $fh $$;
3623}
3624
3625sub main_loop {
3626 trace "EV::loop starting\n";
3627 if (1) {
3628 EV::loop;
3629 }
3630 trace "EV::loop returned\n";
3631 goto &main_loop unless $REALLY_UNLOOP;
3339} 3632}
3340 3633
3341sub main { 3634sub main {
3635 cf::init_globals; # initialise logging
3636
3637 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3638 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3639 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3640 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3641
3642 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3643
3342 # we must not ever block the main coroutine 3644 # we must not ever block the main coroutine
3343 local $Coro::idle = sub { 3645 local $Coro::idle = sub {
3344 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3646 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3345 (async { 3647 (async {
3346 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3648 $Coro::current->{desc} = "IDLE BUG HANDLER";
3347 EV::loop EV::LOOP_ONESHOT; 3649 EV::loop EV::LOOP_ONESHOT;
3348 })->prio (Coro::PRIO_MAX); 3650 })->prio (Coro::PRIO_MAX);
3349 }; 3651 };
3350 3652
3653 evthread_start IO::AIO::poll_fileno;
3654
3655 cf::sync_job {
3656 init_inc;
3657
3658 cf::init_experience;
3659 cf::init_anim;
3660 cf::init_attackmess;
3661 cf::init_dynamic;
3662
3663 cf::load_settings;
3664 cf::load_materials;
3665
3666 reload_resources;
3351 reload_config; 3667 reload_config;
3352 db_init; 3668 db_init;
3669
3670 cf::init_uuid;
3671 cf::init_signals;
3672 cf::init_skills;
3673
3674 cf::init_beforeplay;
3675
3676 atomic;
3677
3353 load_extensions; 3678 load_extensions;
3354 3679
3355 $TICK_WATCHER->start; 3680 utime time, time, $RUNTIMEFILE;
3356 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3681
3357 EV::loop; 3682 # no (long-running) fork's whatsoever before this point(!)
3683 use POSIX ();
3684 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3685
3686 (pop @POST_INIT)->(0) while @POST_INIT;
3687 };
3688
3689 cf::object::thawer::errors_are_fatal 0;
3690 info "parse errors in files are no longer fatal from this point on.\n";
3691
3692 my $free_main; $free_main = EV::idle sub {
3693 undef $free_main;
3694 undef &main; # free gobs of memory :)
3695 };
3696
3697 goto &main_loop;
3358} 3698}
3359 3699
3360############################################################################# 3700#############################################################################
3361# initialisation and cleanup 3701# initialisation and cleanup
3362 3702
3363# install some emergency cleanup handlers 3703# install some emergency cleanup handlers
3364BEGIN { 3704BEGIN {
3365 our %SIGWATCHER = (); 3705 our %SIGWATCHER = ();
3366 for my $signal (qw(INT HUP TERM)) { 3706 for my $signal (qw(INT HUP TERM)) {
3367 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3707 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3368 cf::cleanup "SIG$signal"; 3708 cf::cleanup "SIG$signal";
3369 }; 3709 };
3370 } 3710 }
3371} 3711}
3372 3712
3373sub write_runtime { 3713sub write_runtime_sync {
3374 my $runtime = "$LOCALDIR/runtime"; 3714 my $t0 = AE::time;
3375 3715
3376 # first touch the runtime file to show we are still running: 3716 # first touch the runtime file to show we are still running:
3377 # the fsync below can take a very very long time. 3717 # the fsync below can take a very very long time.
3378 3718
3379 IO::AIO::aio_utime $runtime, undef, undef; 3719 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3380 3720
3381 my $guard = cf::lock_acquire "write_runtime"; 3721 my $guard = cf::lock_acquire "write_runtime";
3382 3722
3383 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3723 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3384 or return; 3724 or return;
3385 3725
3386 my $value = $cf::RUNTIME + 90 + 10; 3726 my $value = $cf::RUNTIME + 90 + 10;
3387 # 10 is the runtime save interval, for a monotonic clock 3727 # 10 is the runtime save interval, for a monotonic clock
3388 # 60 allows for the watchdog to kill the server. 3728 # 60 allows for the watchdog to kill the server.
3398 aio_utime $fh, undef, undef; 3738 aio_utime $fh, undef, undef;
3399 3739
3400 close $fh 3740 close $fh
3401 or return; 3741 or return;
3402 3742
3403 aio_rename "$runtime~", $runtime 3743 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3404 and return; 3744 and return;
3405 3745
3406 warn "runtime file written.\n"; 3746 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3407 3747
3408 1 3748 1
3749}
3750
3751our $uuid_lock;
3752our $uuid_skip;
3753
3754sub write_uuid_sync($) {
3755 $uuid_skip ||= $_[0];
3756
3757 return if $uuid_lock;
3758 local $uuid_lock = 1;
3759
3760 my $uuid = "$LOCALDIR/uuid";
3761
3762 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3763 or return;
3764
3765 my $value = uuid_seq uuid_cur;
3766
3767 unless ($value) {
3768 info "cowardly refusing to write zero uuid value!\n";
3769 return;
3770 }
3771
3772 my $value = uuid_str $value + $uuid_skip;
3773 $uuid_skip = 0;
3774
3775 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3776 and return;
3777
3778 # always fsync - this file is important
3779 aio_fsync $fh
3780 and return;
3781
3782 close $fh
3783 or return;
3784
3785 aio_rename "$uuid~", $uuid
3786 and return;
3787
3788 trace "uuid file written ($value).\n";
3789
3790 1
3791
3792}
3793
3794sub write_uuid($$) {
3795 my ($skip, $sync) = @_;
3796
3797 $sync ? write_uuid_sync $skip
3798 : async { write_uuid_sync $skip };
3409} 3799}
3410 3800
3411sub emergency_save() { 3801sub emergency_save() {
3412 my $freeze_guard = cf::freeze_mainloop; 3802 my $freeze_guard = cf::freeze_mainloop;
3413 3803
3414 warn "enter emergency perl save\n"; 3804 info "emergency_perl_save: enter\n";
3805
3806 # this is a trade-off: we want to be very quick here, so
3807 # save all maps without fsync, and later call a global sync
3808 # (which in turn might be very very slow)
3809 local $USE_FSYNC = 0;
3415 3810
3416 cf::sync_job { 3811 cf::sync_job {
3812 cf::write_runtime_sync; # external watchdog should not bark
3813
3417 # use a peculiar iteration method to avoid tripping on perl 3814 # use a peculiar iteration method to avoid tripping on perl
3418 # refcount bugs in for. also avoids problems with players 3815 # refcount bugs in for. also avoids problems with players
3419 # and maps saved/destroyed asynchronously. 3816 # and maps saved/destroyed asynchronously.
3420 warn "begin emergency player save\n"; 3817 info "emergency_perl_save: begin player save\n";
3421 for my $login (keys %cf::PLAYER) { 3818 for my $login (keys %cf::PLAYER) {
3422 my $pl = $cf::PLAYER{$login} or next; 3819 my $pl = $cf::PLAYER{$login} or next;
3423 $pl->valid or next; 3820 $pl->valid or next;
3424 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3821 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3425 $pl->save; 3822 $pl->save;
3426 } 3823 }
3427 warn "end emergency player save\n"; 3824 info "emergency_perl_save: end player save\n";
3428 3825
3429 warn "begin emergency map save\n"; 3826 cf::write_runtime_sync; # external watchdog should not bark
3827
3828 info "emergency_perl_save: begin map save\n";
3430 for my $path (keys %cf::MAP) { 3829 for my $path (keys %cf::MAP) {
3431 my $map = $cf::MAP{$path} or next; 3830 my $map = $cf::MAP{$path} or next;
3432 $map->valid or next; 3831 $map->valid or next;
3433 $map->save; 3832 $map->save;
3434 } 3833 }
3435 warn "end emergency map save\n"; 3834 info "emergency_perl_save: end map save\n";
3436 3835
3437 warn "begin emergency database checkpoint\n"; 3836 cf::write_runtime_sync; # external watchdog should not bark
3837
3838 info "emergency_perl_save: begin database checkpoint\n";
3438 BDB::db_env_txn_checkpoint $DB_ENV; 3839 BDB::db_env_txn_checkpoint $DB_ENV;
3439 warn "end emergency database checkpoint\n"; 3840 info "emergency_perl_save: end database checkpoint\n";
3841
3842 info "emergency_perl_save: begin write uuid\n";
3843 write_uuid_sync 1;
3844 info "emergency_perl_save: end write uuid\n";
3845
3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3848 trace "emergency_perl_save: syncing database to disk";
3849 BDB::db_env_txn_checkpoint $DB_ENV;
3850
3851 info "emergency_perl_save: starting sync\n";
3852 IO::AIO::aio_sync sub {
3853 info "emergency_perl_save: finished sync\n";
3854 };
3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 trace "emergency_perl_save: flushing outstanding aio requests";
3859 while (IO::AIO::nreqs || BDB::nreqs) {
3860 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3861 }
3862
3863 cf::write_runtime_sync; # external watchdog should not bark
3440 }; 3864 };
3441 3865
3442 warn "leave emergency perl save\n"; 3866 info "emergency_perl_save: leave\n";
3443} 3867}
3444 3868
3445sub post_cleanup { 3869sub post_cleanup {
3446 my ($make_core) = @_; 3870 my ($make_core) = @_;
3447 3871
3872 IO::AIO::flush;
3873
3448 warn Carp::longmess "post_cleanup backtrace" 3874 error Carp::longmess "post_cleanup backtrace"
3449 if $make_core; 3875 if $make_core;
3876
3877 my $fh = pidfile;
3878 unlink $PIDFILE if <$fh> == $$;
3879}
3880
3881# a safer delete_package, copied from Symbol
3882sub clear_package($) {
3883 my $pkg = shift;
3884
3885 # expand to full symbol table name if needed
3886 unless ($pkg =~ /^main::.*::$/) {
3887 $pkg = "main$pkg" if $pkg =~ /^::/;
3888 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3889 $pkg .= '::' unless $pkg =~ /::$/;
3890 }
3891
3892 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3893 my $stem_symtab = *{$stem}{HASH};
3894
3895 defined $stem_symtab and exists $stem_symtab->{$leaf}
3896 or return;
3897
3898 # clear all symbols
3899 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3900 for my $name (keys %$leaf_symtab) {
3901 _gv_clear *{"$pkg$name"};
3902# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3903 }
3450} 3904}
3451 3905
3452sub do_reload_perl() { 3906sub do_reload_perl() {
3453 # can/must only be called in main 3907 # can/must only be called in main
3454 if ($Coro::current != $Coro::main) { 3908 if (in_main) {
3455 warn "can only reload from main coroutine"; 3909 error "can only reload from main coroutine";
3456 return; 3910 return;
3457 } 3911 }
3458 3912
3913 return if $RELOAD++;
3914
3915 my $t1 = AE::time;
3916
3917 while ($RELOAD) {
3459 warn "reloading..."; 3918 info "reloading...";
3460 3919
3461 warn "entering sync_job"; 3920 trace "entering sync_job";
3462 3921
3463 cf::sync_job { 3922 cf::sync_job {
3464 cf::write_runtime; # external watchdog should not bark
3465 cf::emergency_save; 3923 cf::emergency_save;
3466 cf::write_runtime; # external watchdog should not bark
3467 3924
3468 warn "syncing database to disk";
3469 BDB::db_env_txn_checkpoint $DB_ENV;
3470
3471 # if anything goes wrong in here, we should simply crash as we already saved
3472
3473 warn "flushing outstanding aio requests";
3474 for (;;) {
3475 BDB::flush;
3476 IO::AIO::flush;
3477 Coro::cede_notself;
3478 last unless IO::AIO::nreqs || BDB::nreqs;
3479 warn "iterate...";
3480 }
3481
3482 ++$RELOAD;
3483
3484 warn "cancelling all extension coros"; 3925 trace "cancelling all extension coros";
3485 $_->cancel for values %EXT_CORO; 3926 $_->cancel for values %EXT_CORO;
3486 %EXT_CORO = (); 3927 %EXT_CORO = ();
3487 3928
3488 warn "removing commands"; 3929 trace "removing commands";
3489 %COMMAND = (); 3930 %COMMAND = ();
3490 3931
3491 warn "removing ext/exti commands"; 3932 trace "removing ext/exti commands";
3492 %EXTCMD = (); 3933 %EXTCMD = ();
3493 %EXTICMD = (); 3934 %EXTICMD = ();
3494 3935
3495 warn "unloading/nuking all extensions"; 3936 trace "unloading/nuking all extensions";
3496 for my $pkg (@EXTS) { 3937 for my $pkg (@EXTS) {
3497 warn "... unloading $pkg"; 3938 trace "... unloading $pkg";
3498 3939
3499 if (my $cb = $pkg->can ("unload")) { 3940 if (my $cb = $pkg->can ("unload")) {
3500 eval { 3941 eval {
3501 $cb->($pkg); 3942 $cb->($pkg);
3502 1 3943 1
3503 } or warn "$pkg unloaded, but with errors: $@"; 3944 } or error "$pkg unloaded, but with errors: $@";
3945 }
3946
3947 trace "... clearing $pkg";
3948 clear_package $pkg;
3504 } 3949 }
3505 3950
3506 warn "... nuking $pkg";
3507 Symbol::delete_package $pkg;
3508 }
3509
3510 warn "unloading all perl modules loaded from $LIBDIR"; 3951 trace "unloading all perl modules loaded from $LIBDIR";
3511 while (my ($k, $v) = each %INC) { 3952 while (my ($k, $v) = each %INC) {
3512 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3953 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3513 3954
3514 warn "... unloading $k"; 3955 trace "... unloading $k";
3515 delete $INC{$k}; 3956 delete $INC{$k};
3516 3957
3517 $k =~ s/\.pm$//; 3958 $k =~ s/\.pm$//;
3518 $k =~ s/\//::/g; 3959 $k =~ s/\//::/g;
3519 3960
3520 if (my $cb = $k->can ("unload_module")) { 3961 if (my $cb = $k->can ("unload_module")) {
3521 $cb->(); 3962 $cb->();
3963 }
3964
3965 clear_package $k;
3522 } 3966 }
3523 3967
3524 Symbol::delete_package $k;
3525 }
3526
3527 warn "getting rid of safe::, as good as possible"; 3968 trace "getting rid of safe::, as good as possible";
3528 Symbol::delete_package "safe::$_" 3969 clear_package "safe::$_"
3529 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3970 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3530 3971
3531 warn "unloading cf.pm \"a bit\""; 3972 trace "unloading cf.pm \"a bit\"";
3532 delete $INC{"cf.pm"}; 3973 delete $INC{"cf.pm"};
3533 delete $INC{"cf/pod.pm"}; 3974 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3534 3975
3535 # don't, removes xs symbols, too, 3976 # don't, removes xs symbols, too,
3536 # and global variables created in xs 3977 # and global variables created in xs
3537 #Symbol::delete_package __PACKAGE__; 3978 #clear_package __PACKAGE__;
3538 3979
3539 warn "unload completed, starting to reload now"; 3980 info "unload completed, starting to reload now";
3540 3981
3541 warn "reloading cf.pm"; 3982 trace "reloading cf.pm";
3542 require cf; 3983 require cf;
3543 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3984 cf::_connect_to_perl_1;
3544 3985
3545 warn "loading config and database again"; 3986 trace "loading config and database again";
3546 cf::reload_config; 3987 cf::reload_config;
3547 3988
3548 warn "loading extensions"; 3989 trace "loading extensions";
3549 cf::load_extensions; 3990 cf::load_extensions;
3550 3991
3992 if ($REATTACH_ON_RELOAD) {
3551 warn "reattaching attachments to objects/players"; 3993 trace "reattaching attachments to objects/players";
3552 _global_reattach; # objects, sockets 3994 _global_reattach; # objects, sockets
3553 warn "reattaching attachments to maps"; 3995 trace "reattaching attachments to maps";
3554 reattach $_ for values %MAP; 3996 reattach $_ for values %MAP;
3555 warn "reattaching attachments to players"; 3997 trace "reattaching attachments to players";
3556 reattach $_ for values %PLAYER; 3998 reattach $_ for values %PLAYER;
3999 }
3557 4000
4001 trace "running post_init jobs";
4002 (pop @POST_INIT)->(1) while @POST_INIT;
4003
3558 warn "leaving sync_job"; 4004 trace "leaving sync_job";
3559 4005
3560 1 4006 1
3561 } or do { 4007 } or do {
3562 warn $@; 4008 error $@;
3563 warn "error while reloading, exiting."; 4009 cf::cleanup "error while reloading, exiting.";
3564 exit 1; 4010 };
4011
4012 info "reloaded";
4013 --$RELOAD;
3565 }; 4014 }
3566 4015
3567 warn "reloaded"; 4016 $t1 = AE::time - $t1;
4017 info "reload completed in ${t1}s\n";
3568}; 4018};
3569 4019
3570our $RELOAD_WATCHER; # used only during reload 4020our $RELOAD_WATCHER; # used only during reload
3571 4021
3572sub reload_perl() { 4022sub reload_perl() {
3573 # doing reload synchronously and two reloads happen back-to-back, 4023 # doing reload synchronously and two reloads happen back-to-back,
3574 # coro crashes during coro_state_free->destroy here. 4024 # coro crashes during coro_state_free->destroy here.
3575 4025
4026 $RELOAD_WATCHER ||= cf::async {
4027 Coro::AIO::aio_wait cache_extensions;
4028
3576 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4029 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3577 do_reload_perl; 4030 do_reload_perl;
3578 undef $RELOAD_WATCHER; 4031 undef $RELOAD_WATCHER;
4032 };
3579 }; 4033 };
3580} 4034}
3581 4035
3582register_command "reload" => sub { 4036register_command "reload" => sub {
3583 my ($who, $arg) = @_; 4037 my ($who, $arg) = @_;
3589 reload_perl; 4043 reload_perl;
3590 }; 4044 };
3591 } 4045 }
3592}; 4046};
3593 4047
3594unshift @INC, $LIBDIR; 4048#############################################################################
3595 4049
3596my $bug_warning = 0; 4050my $bug_warning = 0;
3597 4051
3598our @WAIT_FOR_TICK; 4052our @WAIT_FOR_TICK;
3599our @WAIT_FOR_TICK_BEGIN; 4053our @WAIT_FOR_TICK_BEGIN;
3600 4054
3601sub wait_for_tick { 4055sub wait_for_tick {
3602 return unless $TICK_WATCHER->is_active;
3603 return if $Coro::current == $Coro::main; 4056 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3604 4057
3605 my $signal = new Coro::Signal; 4058 my $signal = new Coro::Signal;
3606 push @WAIT_FOR_TICK, $signal; 4059 push @WAIT_FOR_TICK, $signal;
3607 $signal->wait; 4060 $signal->wait;
3608} 4061}
3609 4062
3610sub wait_for_tick_begin { 4063sub wait_for_tick_begin {
3611 return unless $TICK_WATCHER->is_active;
3612 return if $Coro::current == $Coro::main; 4064 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3613 4065
3614 my $signal = new Coro::Signal; 4066 my $signal = new Coro::Signal;
3615 push @WAIT_FOR_TICK_BEGIN, $signal; 4067 push @WAIT_FOR_TICK_BEGIN, $signal;
3616 $signal->wait; 4068 $signal->wait;
3617} 4069}
3618 4070
3619$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4071sub tick {
3620 if ($Coro::current != $Coro::main) { 4072 if ($Coro::current != $Coro::main) {
3621 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4073 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3622 unless ++$bug_warning > 10; 4074 unless ++$bug_warning > 10;
3623 return; 4075 return;
3624 } 4076 }
3625 4077
3626 $NOW = $tick_start = EV::now;
3627
3628 cf::server_tick; # one server iteration 4078 cf::server_tick; # one server iteration
3629 4079
3630 $RUNTIME += $TICK; 4080 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3631 $NEXT_TICK = $_[0]->at;
3632 4081
3633 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4082 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3634 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4083 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3635 Coro::async_pool { 4084 Coro::async_pool {
3636 $Coro::current->{desc} = "runtime saver"; 4085 $Coro::current->{desc} = "runtime saver";
3637 write_runtime 4086 write_runtime_sync
3638 or warn "ERROR: unable to write runtime file: $!"; 4087 or error "ERROR: unable to write runtime file: $!";
3639 }; 4088 };
3640 } 4089 }
3641 4090
3642 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4091 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3643 $sig->send; 4092 $sig->send;
3644 } 4093 }
3645 while (my $sig = shift @WAIT_FOR_TICK) { 4094 while (my $sig = shift @WAIT_FOR_TICK) {
3646 $sig->send; 4095 $sig->send;
3647 } 4096 }
3648 4097
3649 $LOAD = ($NOW - $tick_start) / $TICK; 4098 $LOAD = ($NOW - $TICK_START) / $TICK;
3650 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4099 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3651 4100
3652 _post_tick; 4101 if (0) {
3653}; 4102 if ($NEXT_TICK) {
3654$TICK_WATCHER->priority (EV::MAXPRI); 4103 my $jitter = $TICK_START - $NEXT_TICK;
4104 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4105 debug "jitter $JITTER\n";#d#
4106 }
4107 }
4108}
3655 4109
3656{ 4110{
3657 # configure BDB 4111 # configure BDB
3658 4112
3659 BDB::min_parallel 8; 4113 BDB::min_parallel 16;
3660 BDB::max_poll_reqs $TICK * 0.1; 4114 BDB::max_poll_reqs $TICK * 0.1;
3661 $Coro::BDB::WATCHER->priority (1); 4115 $AnyEvent::BDB::WATCHER->priority (1);
3662 4116
3663 unless ($DB_ENV) { 4117 unless ($DB_ENV) {
3664 $DB_ENV = BDB::db_env_create; 4118 $DB_ENV = BDB::db_env_create;
3665 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4119 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3666 | BDB::LOG_AUTOREMOVE, 1); 4120 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4121 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3667 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4122 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3668 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4123 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3669 4124
3670 cf::sync_job { 4125 cf::sync_job {
3671 eval { 4126 eval {
3697{ 4152{
3698 # configure IO::AIO 4153 # configure IO::AIO
3699 4154
3700 IO::AIO::min_parallel 8; 4155 IO::AIO::min_parallel 8;
3701 IO::AIO::max_poll_time $TICK * 0.1; 4156 IO::AIO::max_poll_time $TICK * 0.1;
3702 $Coro::AIO::WATCHER->priority (1); 4157 undef $AnyEvent::AIO::WATCHER;
3703} 4158}
3704 4159
3705my $_log_backtrace; 4160my $_log_backtrace;
3706 4161
3707sub _log_backtrace { 4162sub _log_backtrace {
3710 $msg =~ s/\n//; 4165 $msg =~ s/\n//;
3711 4166
3712 # limit the # of concurrent backtraces 4167 # limit the # of concurrent backtraces
3713 if ($_log_backtrace < 2) { 4168 if ($_log_backtrace < 2) {
3714 ++$_log_backtrace; 4169 ++$_log_backtrace;
4170 my $perl_bt = Carp::longmess $msg;
3715 async { 4171 async {
3716 $Coro::current->{desc} = "abt $msg"; 4172 $Coro::current->{desc} = "abt $msg";
3717 4173
3718 my @bt = fork_call { 4174 my @bt = fork_call {
3719 @addr = map { sprintf "%x", $_ } @addr; 4175 @addr = map { sprintf "%x", $_ } @addr;
3730 } 4186 }
3731 4187
3732 @funcs 4188 @funcs
3733 }; 4189 };
3734 4190
3735 LOG llevInfo, "[ABT] $msg\n"; 4191 LOG llevInfo, "[ABT] $perl_bt\n";
4192 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3736 LOG llevInfo, "[ABT] $_\n" for @bt; 4193 LOG llevInfo, "[ABT] $_\n" for @bt;
3737 --$_log_backtrace; 4194 --$_log_backtrace;
3738 }; 4195 };
3739 } else { 4196 } else {
3740 LOG llevInfo, "[ABT] $msg\n"; 4197 LOG llevInfo, "[ABT] $msg\n";
3741 LOG llevInfo, "[ABT] [suppressed]\n"; 4198 LOG llevInfo, "[ABT] [suppressed]\n";
3742 } 4199 }
3743} 4200}
3744 4201
3745# load additional modules 4202# load additional modules
3746use cf::pod; 4203require "cf/$_.pm" for @EXTRA_MODULES;
4204cf::_connect_to_perl_2;
3747 4205
3748END { cf::emergency_save } 4206END { cf::emergency_save }
3749 4207
37501 42081
3751 4209

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines