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.404 by root, Mon Dec 17 07:27:58 2007 UTC vs.
Revision 1.515 by root, Thu Apr 15 04:56:47 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
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use EV 1.86; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 4.32 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
18use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
23use Coro::BDB; 51use Coro::BDB 1.6;
24use Coro::Storable; 52use Coro::Storable;
25use Coro::Util (); 53use Coro::Util ();
26 54
27use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
28use BDB (); 56use BDB ();
29use Data::Dumper; 57use Data::Dumper;
30use Digest::MD5;
31use Fcntl; 58use Fcntl;
32use YAML::Syck (); 59use YAML::XS ();
33use IO::AIO 2.51 (); 60use IO::AIO ();
34use Time::HiRes; 61use Time::HiRes;
35use Compress::LZF; 62use Compress::LZF;
36use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
37 66
38# configure various modules to our taste 67# configure various modules to our taste
39# 68#
40$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43 77
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 78# strictly for debugging
45$YAML::Syck::ImplicitUnicode = 1; 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 80
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 82
51our %COMMAND = (); 83our %COMMAND = ();
52our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
55our %EXTCMD = (); 87our %EXTCMD = ();
56our %EXTICMD = (); 88our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
59 91
60our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
62 96
63our $CONFDIR = confdir; 97our $CONFDIR = confdir;
64our $DATADIR = datadir; 98our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
74 115
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 118our $NEXT_TICK;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
81 120
82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
86our $DB_ENV; 124our $DB_ENV;
87 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
88our %CFG; 128our %CFG;
89 129
90our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
91our $RUNTIME; 131our $RUNTIME;
92our $NOW; 132our $NOW;
98# used to convert map paths into valid unix filenames by replacing / by ∕ 138# used to convert map paths into valid unix filenames by replacing / by ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 140
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
103our $tick_start; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
104 150
105binmode STDOUT; 151binmode STDOUT;
106binmode STDERR; 152binmode STDERR;
107 153
108# read virtual server time, if available 154# read virtual server time, if available
109unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
110 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
111 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
112 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
113} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
114 162
115mkdir $_ 163mkdir $_
116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
117 165
118our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
119 167
120sub cf::map::normalise; 168sub cf::map::normalise;
169
170#############################################################################
171
172%REFLECT = ();
173for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_;
175 $REFLECT{$reflect->{class}} = $reflect;
176}
177
178# this is decidedly evil
179$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
121 180
122############################################################################# 181#############################################################################
123 182
124=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
125 184
172returns directly I<after> the tick processing (and consequently, can only wake one process 231returns directly I<after> the tick processing (and consequently, can only wake one process
173per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 232per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
174 233
175=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
176 235
177This array contains the results of the last C<invoke ()> call. When 236This array contains the results of the last C<invoke ()> call. When
178C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
179that call. 238that call.
180 239
240=item %cf::REFLECT
241
242Contains, for each (C++) class name, a hash reference with information
243about object members (methods, scalars, arrays and flags) and other
244metadata, which is useful for introspection.
245
181=back 246=back
182 247
183=cut 248=cut
184 249
185BEGIN { 250$Coro::State::WARNHOOK = sub {
186 *CORE::GLOBAL::warn = sub {
187 my $msg = join "", @_; 251 my $msg = join "", @_;
188 252
189 $msg .= "\n" 253 $msg .= "\n"
190 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
191 255
192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
193 257
194 LOG llevError, $msg; 258 LOG llevError, $msg;
195 }; 259};
196} 260
261$Coro::State::DIEHOOK = sub {
262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
265
266 if ($Coro::current == $Coro::main) {#d#
267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
268 return;#d#
269 }#d#
270
271 # kill coroutine otherwise
272 Coro::terminate
273};
197 274
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
208for my $pkg (qw( 285for my $pkg (qw(
209 cf::global cf::attachable 286 cf::global cf::attachable
210 cf::object cf::object::player 287 cf::object cf::object::player
211 cf::client cf::player 288 cf::client cf::player
212 cf::arch cf::living 289 cf::arch cf::living
290 cf::map cf::mapspace
213 cf::map cf::party cf::region 291 cf::party cf::region
214)) { 292)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 294}
218 295
219$EV::DIED = sub { 296$EV::DIED = sub {
220 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
221}; 298};
222 299
223############################################################################# 300#############################################################################
224 301
225=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 339our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263 340
264sub encode_json($) { $json_coder->encode ($_[0]) } 341sub encode_json($) { $json_coder->encode ($_[0]) }
265sub decode_json($) { $json_coder->decode ($_[0]) } 342sub decode_json($) { $json_coder->decode ($_[0]) }
266 343
344=item cf::post_init { BLOCK }
345
346Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again.
348
349The cdoeblock will have a single boolean argument to indicate whether this
350is a reload or not.
351
352=cut
353
354sub post_init(&) {
355 push @POST_INIT, shift;
356}
357
267=item cf::lock_wait $string 358=item cf::lock_wait $string
268 359
269Wait until the given lock is available. See cf::lock_acquire. 360Wait until the given lock is available. See cf::lock_acquire.
270 361
271=item my $lock = cf::lock_acquire $string 362=item my $lock = cf::lock_acquire $string
272 363
273Wait until the given lock is available and then acquires it and returns 364Wait until the given lock is available and then acquires it and returns
274a Coro::guard object. If the guard object gets destroyed (goes out of scope, 365a L<Guard> object. If the guard object gets destroyed (goes out of scope,
275for example when the coroutine gets canceled), the lock is automatically 366for example when the coroutine gets canceled), the lock is automatically
276returned. 367returned.
277 368
278Locks are *not* recursive, locking from the same coro twice results in a 369Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro. 370deadlocked coro.
285 376
286Return true if the lock is currently active, i.e. somebody has locked it. 377Return true if the lock is currently active, i.e. somebody has locked it.
287 378
288=cut 379=cut
289 380
290our %LOCK; 381our $LOCKS = new Coro::SemaphoreSet;
291our %LOCKER;#d#
292 382
293sub lock_wait($) { 383sub lock_wait($) {
294 my ($key) = @_; 384 $LOCKS->wait ($_[0]);
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
300
301 # wait for lock, if any
302 while ($LOCK{$key}) {
303 push @{ $LOCK{$key} }, $Coro::current;
304 Coro::schedule;
305 }
306} 385}
307 386
308sub lock_acquire($) { 387sub lock_acquire($) {
309 my ($key) = @_; 388 $LOCKS->guard ($_[0])
310
311 # wait, to be sure we are not locked
312 lock_wait $key;
313
314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
316
317 Coro::guard {
318 delete $LOCKER{$key};#d#
319 # wake up all waiters, to be on the safe side
320 $_->ready for @{ delete $LOCK{$key} };
321 }
322} 389}
323 390
324sub lock_active($) { 391sub lock_active($) {
325 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
326
327 ! ! $LOCK{$key}
328} 393}
329 394
330sub freeze_mainloop { 395sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 396 tick_inhibit_inc;
332 397
333 my $guard = Coro::guard { 398 &Guard::guard (\&tick_inhibit_dec);
334 $TICK_WATCHER->start;
335 };
336 $TICK_WATCHER->stop;
337 $guard
338} 399}
339 400
340=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
341 402
342Like EV::periodic, but randomly selects a starting point so that the actions 403Like EV::periodic, but randomly selects a starting point so that the actions
343get spread over timer. 404get spread over time.
344 405
345=cut 406=cut
346 407
347sub periodic($$) { 408sub periodic($$) {
348 my ($interval, $cb) = @_; 409 my ($interval, $cb) = @_;
365 426
366=cut 427=cut
367 428
368our @SLOT_QUEUE; 429our @SLOT_QUEUE;
369our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
370 432
371$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
372$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
373 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
374 436
375 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
376 439
377 while () { 440 while () {
378 next_job: 441 next_job:
442
379 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
380 if ($avail > 0.01) { 444
381 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
382 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
383 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
384 $job->[2]->send; 449 $job->[2]->send;
385 Coro::cede; 450 Coro::cede;
386 goto next_job; 451 goto next_job;
387 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
388 } 454 }
389 } 455 }
390 456
391 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
392 # we do not use wait_for_tick() as it returns immediately when tick is inactive 458 # we do not use wait_for_tick() as it returns immediately when tick is inactive
393 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
394 $signal->wait; 460 $signal->wait;
395 } else { 461 } else {
462 $busy = 0;
396 Coro::schedule; 463 Coro::schedule;
397 } 464 }
398 } 465 }
399}; 466};
400 467
401sub get_slot($;$$) { 468sub get_slot($;$$) {
469 return if tick_inhibit || $Coro::current == $Coro::main;
470
402 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
403 472
404 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
405 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
406 476
407 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
408 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
409 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
436 506
437sub sync_job(&) { 507sub sync_job(&) {
438 my ($job) = @_; 508 my ($job) = @_;
439 509
440 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
441 my $time = EV::time; 511 my $time = AE::time;
442 512
443 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
444 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
445 515
446 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
447 517
448 # TODO: use suspend/resume instead
449 # (but this is cancel-safe)
450 my $freeze_guard = freeze_mainloop; 518 my $freeze_guard = freeze_mainloop;
451 519
452 my $busy = 1; 520 my $busy = 1;
453 my @res; 521 my @res;
454 522
465 } else { 533 } else {
466 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
467 } 535 }
468 } 536 }
469 537
470 $time = EV::time - $time; 538 my $time = AE::time - $time;
471 539
472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
474
475 $tick_start += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
476 541
477 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
478 } else { 543 } else {
479 # we are in another coroutine, how wonderful, everything just works 544 # we are in another coroutine, how wonderful, everything just works
480 545
522 reset_signals; 587 reset_signals;
523 &$cb 588 &$cb
524 }, @args; 589 }, @args;
525 590
526 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
592}
593
594sub objinfo {
595 (
596 "counter value" => cf::object::object_count,
597 "objects created" => cf::object::create_count,
598 "objects destroyed" => cf::object::destroy_count,
599 "freelist size" => cf::object::free_count,
600 "allocated objects" => cf::object::objects_size,
601 "active objects" => cf::object::actives_size,
602 )
603}
604
605=item $coin = coin_from_name $name
606
607=cut
608
609our %coin_alias = (
610 "silver" => "silvercoin",
611 "silvercoin" => "silvercoin",
612 "silvercoins" => "silvercoin",
613 "gold" => "goldcoin",
614 "goldcoin" => "goldcoin",
615 "goldcoins" => "goldcoin",
616 "platinum" => "platinacoin",
617 "platinumcoin" => "platinacoin",
618 "platinumcoins" => "platinacoin",
619 "platina" => "platinacoin",
620 "platinacoin" => "platinacoin",
621 "platinacoins" => "platinacoin",
622 "royalty" => "royalty",
623 "royalties" => "royalty",
624);
625
626sub coin_from_name($) {
627 $coin_alias{$_[0]}
628 ? cf::arch::find $coin_alias{$_[0]}
629 : undef
527} 630}
528 631
529=item $value = cf::db_get $family => $key 632=item $value = cf::db_get $family => $key
530 633
531Returns a single value from the environment database. 634Returns a single value from the environment database.
670 773
671############################################################################# 774#############################################################################
672 775
673=head2 ATTACHABLE OBJECTS 776=head2 ATTACHABLE OBJECTS
674 777
675Many objects in crossfire are so-called attachable objects. That means you can 778Many objects in deliantra are so-called attachable objects. That means you can
676attach callbacks/event handlers (a collection of which is called an "attachment") 779attach callbacks/event handlers (a collection of which is called an "attachment")
677to it. All such attachable objects support the following methods. 780to it. All such attachable objects support the following methods.
678 781
679In the following description, CLASS can be any of C<global>, C<object> 782In the following description, CLASS can be any of C<global>, C<object>
680C<player>, C<client> or C<map> (i.e. the attachable objects in 783C<player>, C<client> or C<map> (i.e. the attachable objects in
730=item cf::CLASS::attachment $name, ... 833=item cf::CLASS::attachment $name, ...
731 834
732Register an attachment by C<$name> through which attachable objects of the 835Register an attachment by C<$name> through which attachable objects of the
733given CLASS can refer to this attachment. 836given CLASS can refer to this attachment.
734 837
735Some classes such as crossfire maps and objects can specify attachments 838Some classes such as deliantra maps and objects can specify attachments
736that are attached at load/instantiate time, thus the need for a name. 839that are attached at load/instantiate time, thus the need for a name.
737 840
738These calls expect any number of the following handler/hook descriptions: 841These calls expect any number of the following handler/hook descriptions:
739 842
740=over 4 843=over 4
968 } 1071 }
969 1072
970 0 1073 0
971} 1074}
972 1075
973=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1076=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
974 1077
975=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1078=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
976 1079
977Generate an object-specific event with the given arguments. 1080Generate an object-specific event with the given arguments.
978 1081
1031 1134
1032sub reattach { 1135sub reattach {
1033 # basically do the same as instantiate, without calling instantiate 1136 # basically do the same as instantiate, without calling instantiate
1034 my ($obj) = @_; 1137 my ($obj) = @_;
1035 1138
1139 # no longer needed after getting rid of delete_package?
1036 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1140 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1037 1141
1038 my $registry = $obj->registry; 1142 my $registry = $obj->registry;
1039 1143
1040 @$registry = (); 1144 @$registry = ();
1041 1145
1087 utf8::decode (my $decname = $filename); 1191 utf8::decode (my $decname = $filename);
1088 warn sprintf "saving %s (%d,%d)\n", 1192 warn sprintf "saving %s (%d,%d)\n",
1089 $decname, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1090 1194
1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1092 chmod SAVE_MODE, $fh; 1196 aio_chmod $fh, SAVE_MODE;
1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1094 aio_fsync $fh if $cf::USE_FSYNC; 1198 if ($cf::USE_FSYNC) {
1199 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;
1200 aio_fsync $fh;
1201 }
1095 close $fh; 1202 aio_close $fh;
1096 1203
1097 if (@$objs) { 1204 if (@$objs) {
1098 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1205 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1099 chmod SAVE_MODE, $fh; 1206 aio_chmod $fh, SAVE_MODE;
1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1101 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1102 aio_fsync $fh if $cf::USE_FSYNC; 1209 if ($cf::USE_FSYNC) {
1210 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;
1211 aio_fsync $fh;
1212 }
1103 close $fh; 1213 aio_close $fh;
1104 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1105 } 1215 }
1106 } else { 1216 } else {
1107 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
1108 } 1218 }
1109 1219
1110 aio_rename "$filename~", $filename; 1220 aio_rename "$filename~", $filename;
1221
1222 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC;
1111 } else { 1224 } else {
1112 warn "FATAL: $filename~: $!\n"; 1225 warn "unable to save objects: $filename~: $!\n";
1113 } 1226 }
1114 } else { 1227 } else {
1115 aio_unlink $filename; 1228 aio_unlink $filename;
1116 aio_unlink "$filename.pst"; 1229 aio_unlink "$filename.pst";
1117 } 1230 }
1208 my ($name, $cb) = @_; 1321 my ($name, $cb) = @_;
1209 1322
1210 $EXTICMD{$name} = $cb; 1323 $EXTICMD{$name} = $cb;
1211} 1324}
1212 1325
1326use File::Glob ();
1327
1213cf::player->attach ( 1328cf::player->attach (
1214 on_command => sub { 1329 on_unknown_command => sub {
1215 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1216 1331
1217 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1218 or return; 1333 or return;
1219 1334
1249 1364
1250 cf::override; 1365 cf::override;
1251 }, 1366 },
1252); 1367);
1253 1368
1369# "readahead" all extensions
1370sub cache_extensions {
1371 my $grp = IO::AIO::aio_group;
1372
1373 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1374 for (grep /\.ext$/, @{$_[0]}) {
1375 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1376 }
1377 };
1378
1379 $grp
1380}
1381
1254sub load_extensions { 1382sub load_extensions {
1255 cf::sync_job { 1383 cf::sync_job {
1256 my %todo; 1384 my %todo;
1257 1385
1258 for my $path (<$LIBDIR/*.ext>) { 1386 for my $path (<$LIBDIR/*.ext>) {
1277 1405
1278 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1279 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1280 1408
1281 $ext{source} = 1409 $ext{source} =
1282 "package $pkg; use strict; use utf8;\n" 1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1283 . "#line 1 \"$path\"\n{\n" 1411 . "#line 1 \"$path\"\n{\n"
1284 . $source 1412 . $source
1285 . "\n};\n1"; 1413 . "\n};\n1";
1286 1414
1287 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1288 } 1416 }
1289 1417
1418 my $pass = 0;
1290 my %done; 1419 my %done;
1291 while (%todo) { 1420 while (%todo) {
1292 my $progress; 1421 my $progress;
1293 1422
1423 ++$pass;
1424
1425 ext:
1294 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1295 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1296 goto skip 1428 next ext
1297 unless exists $done{$_}; 1429 unless exists $done{$_};
1298 } 1430 }
1299 1431
1300 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1301 1433
1302 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1303 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1304 : "$v->{base}: extension inactive.\n";
1305 1438
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1306 if (exists $v->{meta}{mandatory}) { 1440 if exists $v->{meta}{mandatory};
1307 warn $msg; 1441 } else {
1308 warn "mandatory extension failed to load, exiting.\n"; 1442 $done{$k} = delete $todo{$k};
1309 exit 1; 1443 push @EXTS, $v->{pkg};
1310 } 1444 $progress = 1;
1311 1445
1312 warn $msg; 1446 warn "$v->{base}: extension inactive.\n"
1447 unless $active;
1313 } 1448 }
1314
1315 $done{$k} = delete $todo{$k};
1316 push @EXTS, $v->{pkg};
1317 $progress = 1;
1318 } 1449 }
1319 1450
1320 skip: 1451 unless ($progress) {
1321 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1322 unless $progress; 1453
1454 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory};
1457 }
1458 }
1323 } 1459 }
1324 }; 1460 };
1325} 1461}
1326 1462
1327############################################################################# 1463#############################################################################
1328 1464
1329=back 1465=back
1330 1466
1331=head2 CORE EXTENSIONS 1467=head2 CORE EXTENSIONS
1332 1468
1333Functions and methods that extend core crossfire objects. 1469Functions and methods that extend core deliantra objects.
1334 1470
1335=cut 1471=cut
1336 1472
1337package cf::player; 1473package cf::player;
1338 1474
1381 1517
1382sub exists($) { 1518sub exists($) {
1383 my ($login) = @_; 1519 my ($login) = @_;
1384 1520
1385 $cf::PLAYER{$login} 1521 $cf::PLAYER{$login}
1386 or cf::sync_job { !aio_stat path $login } 1522 or !aio_stat path $login
1387} 1523}
1388 1524
1389sub find($) { 1525sub find($) {
1390 return $cf::PLAYER{$_[0]} || do { 1526 return $cf::PLAYER{$_[0]} || do {
1391 my $login = $_[0]; 1527 my $login = $_[0];
1403 my $f = new_from_file cf::object::thawer path $login 1539 my $f = new_from_file cf::object::thawer path $login
1404 or return; 1540 or return;
1405 1541
1406 my $pl = cf::player::load_pl $f 1542 my $pl = cf::player::load_pl $f
1407 or return; 1543 or return;
1544
1408 local $cf::PLAYER_LOADING{$login} = $pl; 1545 local $cf::PLAYER_LOADING{$login} = $pl;
1409 $f->resolve_delayed_derefs; 1546 $f->resolve_delayed_derefs;
1410 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1411 } 1548 }
1412 } 1549 }
1413} 1550}
1414 1551
1552cf::player->attach (
1553 on_load => sub {
1554 my ($pl, $path) = @_;
1555
1556 # restore slots saved in save, below
1557 my $slots = delete $pl->{_slots};
1558
1559 $pl->ob->current_weapon ($slots->[0]);
1560 $pl->combat_ob ($slots->[1]);
1561 $pl->ranged_ob ($slots->[2]);
1562 },
1563);
1564
1415sub save($) { 1565sub save($) {
1416 my ($pl) = @_; 1566 my ($pl) = @_;
1417 1567
1418 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1419 1569
1422 1572
1423 return if $pl->{deny_save}; 1573 return if $pl->{deny_save};
1424 1574
1425 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1426 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1577
1578 cf::get_slot 0.01;
1579
1580 # save slots, to be restored later
1581 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1427 1582
1428 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1429 cf::cede_to_tick; 1584 cf::cede_to_tick;
1430} 1585}
1431 1586
1463 my ($pl) = @_; 1618 my ($pl) = @_;
1464 1619
1465 my $name = $pl->ob->name; 1620 my $name = $pl->ob->name;
1466 1621
1467 $pl->{deny_save} = 1; 1622 $pl->{deny_save} = 1;
1468 $pl->password ("*"); # this should lock out the player until we nuked the dir 1623 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1469 1624
1470 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1471 $pl->deactivate; 1626 $pl->deactivate;
1627 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1628 $pl->ob->check_score;
1472 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1629 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1473 $pl->ns->destroy if $pl->ns; 1630 $pl->ns->destroy if $pl->ns;
1474 1631
1475 my $path = playerdir $pl; 1632 my $path = playerdir $pl;
1476 my $temp = "$path~$cf::RUNTIME~deleting~"; 1633 my $temp = "$path~$cf::RUNTIME~deleting~";
1515 1672
1516 for my $login (@$dirs) { 1673 for my $login (@$dirs) {
1517 my $path = path $login; 1674 my $path = path $login;
1518 1675
1519 # a .pst is a dead give-away for a valid player 1676 # a .pst is a dead give-away for a valid player
1520 unless (-e "$path.pst") { 1677 # if no pst file found, open and chekc for blocked users
1678 if (aio_stat "$path.pst") {
1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1679 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1522 aio_read $fh, 0, 512, my $buf, 0 or next; 1680 aio_read $fh, 0, 512, my $buf, 0 or next;
1523 $buf !~ /^password -------------$/m or next; # official not-valid tag 1681 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 } 1682 }
1525 1683
1556 } 1714 }
1557 1715
1558 \@paths 1716 \@paths
1559} 1717}
1560 1718
1561=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1719=item $protocol_xml = $player->expand_cfpod ($cfpod)
1562 1720
1563Expand crossfire pod fragments into protocol xml. 1721Expand deliantra pod fragments into protocol xml.
1564
1565=cut
1566
1567use re 'eval';
1568
1569my $group;
1570my $interior; $interior = qr{
1571 # match a pod interior sequence sans C<< >>
1572 (?:
1573 \ (.*?)\ (?{ $group = $^N })
1574 | < (??{$interior}) >
1575 )
1576}x;
1577
1578sub expand_cfpod {
1579 my ($self, $pod) = @_;
1580
1581 my $xml;
1582
1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1586
1587 $group =~ s/&/&amp;/g;
1588 $group =~ s/</&lt;/g;
1589
1590 $xml .= $group;
1591 } elsif ($pod =~ m%\G
1592 ([BCGHITU])
1593 <
1594 (?:
1595 ([^<>]*) (?{ $group = $^N })
1596 | < $interior >
1597 )
1598 >
1599 %gcsx
1600 ) {
1601 my ($code, $data) = ($1, $group);
1602
1603 if ($code eq "B") {
1604 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1605 } elsif ($code eq "I") {
1606 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1607 } elsif ($code eq "U") {
1608 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1609 } elsif ($code eq "C") {
1610 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1611 } elsif ($code eq "T") {
1612 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1613 } elsif ($code eq "G") {
1614 my ($male, $female) = split /\|/, $data;
1615 $data = $self->gender ? $female : $male;
1616 $xml .= expand_cfpod ($self, $data);
1617 } elsif ($code eq "H") {
1618 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1620 "")
1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1632
1633 for ($xml) {
1634 # create single paragraphs (very hackish)
1635 s/(?<=\S)\n(?=\w)/ /g;
1636
1637 # compress some whitespace
1638 s/\s+\n/\n/g; # ws line-ends
1639 s/\n\n+/\n/g; # double lines
1640 s/^\n+//; # beginning lines
1641 s/\n+$//; # ending lines
1642 }
1643
1644 $xml
1645}
1646
1647no re 'eval';
1648
1649sub hintmode {
1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1651 $_[0]{hintmode}
1652}
1653 1722
1654=item $player->ext_reply ($msgid, @msg) 1723=item $player->ext_reply ($msgid, @msg)
1655 1724
1656Sends an ext reply to the player. 1725Sends an ext reply to the player.
1657 1726
1724our $MAX_RESET = 3600; 1793our $MAX_RESET = 3600;
1725our $DEFAULT_RESET = 3000; 1794our $DEFAULT_RESET = 3000;
1726 1795
1727sub generate_random_map { 1796sub generate_random_map {
1728 my ($self, $rmp) = @_; 1797 my ($self, $rmp) = @_;
1798
1799 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1800
1729 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1802 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1735 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1736 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1855 1927
1856# the temporary/swap location 1928# the temporary/swap location
1857sub save_path { 1929sub save_path {
1858 my ($self) = @_; 1930 my ($self) = @_;
1859 1931
1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1861 "$TMPDIR/$path.map" 1933 "$TMPDIR/$path.map"
1862} 1934}
1863 1935
1864# the unique path, undef == no special unique path 1936# the unique path, undef == no special unique path
1865sub uniq_path { 1937sub uniq_path {
1866 my ($self) = @_; 1938 my ($self) = @_;
1867 1939
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1940 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1941 "$UNIQUEDIR/$path"
1870}
1871
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879} 1942}
1880 1943
1881sub decay_objects { 1944sub decay_objects {
1882 my ($self) = @_; 1945 my ($self) = @_;
1883 1946
1967sub find { 2030sub find {
1968 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1969 2032
1970 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1971 2034
1972 cf::lock_wait "map_data:$path";#d#remove 2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2036 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2037
1975 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_find:$path";
1977 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1978
1979 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1980 or return; 2040 or return;
1981 2041
1982 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1983 2043
1985 or return; 2045 or return;
1986 2046
1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1988 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1989 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
1990 undef $guard1; 2051 undef $guard1;
1991 undef $guard2;
1992 $map->reset; 2052 $map->reset;
1993 return find $path; 2053 return find $path;
1994 } 2054 }
1995 2055
1996 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1997 } 2057 }
1998} 2058}
1999 2059
2000sub pre_load { } 2060sub pre_load { }
2001sub post_load { } 2061#sub post_load { } # XS
2002 2062
2003sub load { 2063sub load {
2004 my ($self) = @_; 2064 my ($self) = @_;
2005 2065
2006 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
2023 my $f = new_from_file cf::object::thawer $self->{load_path}; 2083 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block; 2084 $f->skip_block;
2025 $self->_load_objects ($f) 2085 $self->_load_objects ($f)
2026 or return; 2086 or return;
2027 2087
2028 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2088 $self->post_load_original
2029 if delete $self->{load_original}; 2089 if delete $self->{load_original};
2030 2090
2031 if (my $uniq = $self->uniq_path) { 2091 if (my $uniq = $self->uniq_path) {
2032 utf8::encode $uniq; 2092 utf8::encode $uniq;
2033 unless (aio_stat $uniq) { 2093 unless (aio_stat $uniq) {
2051 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2112 $self->decay_objects;
2053 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
2054 $self->update_buttons; 2114 $self->update_buttons;
2055 cf::cede_to_tick; 2115 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2116 $self->activate;
2059 } 2117 }
2060 2118
2061 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2063 2121
2064 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
2065 } 2123 }
2066 2124
2067 $self->post_load; 2125 $self->post_load;
2068} 2126}
2069 2127
2128# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath
2070sub customise_for { 2131sub customise_for {
2071 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
2072 2133
2073 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2135 if $self->per_player;
2127 my ($path, $origin, $load) = @_; 2188 my ($path, $origin, $load) = @_;
2128 2189
2129 $path = normalise $path, $origin && $origin->{path}; 2190 $path = normalise $path, $origin && $origin->{path};
2130 2191
2131 if (my $map = $cf::MAP{$path}) { 2192 if (my $map = $cf::MAP{$path}) {
2132 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2193 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2133 } 2194 }
2134 2195
2135 $MAP_PREFETCH{$path} |= $load; 2196 $MAP_PREFETCH{$path} |= $load;
2136 2197
2137 $MAP_PREFETCHER ||= cf::async { 2198 $MAP_PREFETCHER ||= cf::async {
2174 cf::async { 2235 cf::async {
2175 $Coro::current->{desc} = "map player save"; 2236 $Coro::current->{desc} = "map player save";
2176 $_->contr->save for $self->players; 2237 $_->contr->save for $self->players;
2177 }; 2238 };
2178 2239
2240 cf::get_slot 0.02;
2241
2179 if ($uniq) { 2242 if ($uniq) {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2243 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2181 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2244 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2182 } else { 2245 } else {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2246 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2191 $self->save; 2254 $self->save;
2192 2255
2193 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2256 my $lock = cf::lock_acquire "map_data:$self->{path}";
2194 2257
2195 return if $self->players; 2258 return if $self->players;
2196 return if $self->in_memory != cf::MAP_IN_MEMORY; 2259 return if $self->in_memory != cf::MAP_ACTIVE;
2197 return if $self->{deny_save}; 2260 return if $self->{deny_save};
2198 2261
2199 $self->in_memory (cf::MAP_SWAPPED); 2262 $self->in_memory (cf::MAP_SWAPPED);
2200 2263
2201 $self->deactivate; 2264 $self->deactivate;
2226 2289
2227 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2290 my $lock = cf::lock_acquire "map_data:$self->{path}";
2228 2291
2229 return if $self->players; 2292 return if $self->players;
2230 2293
2231 warn "resetting map ", $self->path; 2294 warn "resetting map ", $self->path, "\n";
2232 2295
2233 $self->in_memory (cf::MAP_SWAPPED); 2296 $self->in_memory (cf::MAP_SWAPPED);
2234 2297
2235 # need to save uniques path 2298 # need to save uniques path
2236 unless ($self->{deny_save}) { 2299 unless ($self->{deny_save}) {
2319 2382
2320sub unique_maps() { 2383sub unique_maps() {
2321 [ 2384 [
2322 map { 2385 map {
2323 utf8::decode $_; 2386 utf8::decode $_;
2324 /\.map$/ 2387 s/\.map$//; # TODO future compatibility hack
2388 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2389 ? ()
2325 ? normalise $_ 2390 : normalise $_
2326 : ()
2327 } @{ aio_readdir $UNIQUEDIR or [] } 2391 } @{ aio_readdir $UNIQUEDIR or [] }
2328 ] 2392 ]
2329} 2393}
2330 2394
2331package cf; 2395=item cf::map::static_maps
2396
2397Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2398file in the shared directory excluding F</styles> and F</editor>). May
2399block.
2400
2401=cut
2402
2403sub static_maps() {
2404 my @dirs = "";
2405 my @maps;
2406
2407 while (@dirs) {
2408 my $dir = shift @dirs;
2409
2410 next if $dir eq "/styles" || $dir eq "/editor";
2411
2412 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2413 or return;
2414
2415 for (@$files) {
2416 s/\.map$// or next;
2417 utf8::decode $_;
2418 push @maps, "$dir/$_";
2419 }
2420
2421 push @dirs, map "$dir/$_", @$dirs;
2422 }
2423
2424 \@maps
2425}
2332 2426
2333=back 2427=back
2334 2428
2335=head3 cf::object 2429=head3 cf::object
2336 2430
2340 2434
2341=over 4 2435=over 4
2342 2436
2343=item $ob->inv_recursive 2437=item $ob->inv_recursive
2344 2438
2345Returns the inventory of the object _and_ their inventories, recursively. 2439Returns the inventory of the object I<and> their inventories, recursively,
2440but I<not> the object itself.
2346 2441
2347=cut 2442=cut
2348 2443
2349sub inv_recursive_; 2444sub inv_recursive_;
2350sub inv_recursive_ { 2445sub inv_recursive_ {
2355 inv_recursive_ inv $_[0] 2450 inv_recursive_ inv $_[0]
2356} 2451}
2357 2452
2358=item $ref = $ob->ref 2453=item $ref = $ob->ref
2359 2454
2360creates and returns a persistent reference to an objetc that can be stored as a string. 2455Creates and returns a persistent reference to an object that can be stored as a string.
2361 2456
2362=item $ob = cf::object::deref ($refstring) 2457=item $ob = cf::object::deref ($refstring)
2363 2458
2364returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2459returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2365even if the object actually exists. May block. 2460even if the object actually exists. May block.
2397can be C<undef>. Does the right thing when the player is currently in a 2492can be C<undef>. Does the right thing when the player is currently in a
2398dialogue with the given NPC character. 2493dialogue with the given NPC character.
2399 2494
2400=cut 2495=cut
2401 2496
2497our $SAY_CHANNEL = {
2498 id => "say",
2499 title => "Map",
2500 reply => "say ",
2501 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2502};
2503
2504our $CHAT_CHANNEL = {
2505 id => "chat",
2506 title => "Chat",
2507 reply => "chat ",
2508 tooltip => "Player chat and shouts, global to the server.",
2509};
2510
2402# rough implementation of a future "reply" method that works 2511# rough implementation of a future "reply" method that works
2403# with dialog boxes. 2512# with dialog boxes.
2404#TODO: the first argument must go, split into a $npc->reply_to ( method 2513#TODO: the first argument must go, split into a $npc->reply_to ( method
2405sub cf::object::player::reply($$$;$) { 2514sub cf::object::player::reply($$$;$) {
2406 my ($self, $npc, $msg, $flags) = @_; 2515 my ($self, $npc, $msg, $flags) = @_;
2417 my $dialog = $pl->{npc_dialog}; 2526 my $dialog = $pl->{npc_dialog};
2418 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2527 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2419 2528
2420 } else { 2529 } else {
2421 $msg = $npc->name . " says: $msg" if $npc; 2530 $msg = $npc->name . " says: $msg" if $npc;
2422 $self->message ($msg, $flags); 2531 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2423 } 2532 }
2424 } 2533 }
2425} 2534}
2426 2535
2427=item $object->send_msg ($channel, $msg, $color, [extra...]) 2536=item $object->send_msg ($channel, $msg, $color, [extra...])
2452 2561
2453=item $player_object->enter_link 2562=item $player_object->enter_link
2454 2563
2455Freezes the player and moves him/her to a special map (C<{link}>). 2564Freezes the player and moves him/her to a special map (C<{link}>).
2456 2565
2457The player should be reasonably safe there for short amounts of time. You 2566The player should be reasonably safe there for short amounts of time (e.g.
2458I<MUST> call C<leave_link> as soon as possible, though. 2567for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2568though, as the palyer cannot control the character while it is on the link
2569map.
2459 2570
2460Will never block. 2571Will never block.
2461 2572
2462=item $player_object->leave_link ($map, $x, $y) 2573=item $player_object->leave_link ($map, $x, $y)
2463 2574
2515 ($x, $y) = (-1, -1) 2626 ($x, $y) = (-1, -1)
2516 unless (defined $x) && (defined $y); 2627 unless (defined $x) && (defined $y);
2517 2628
2518 # use -1 or undef as default coordinates, not 0, 0 2629 # use -1 or undef as default coordinates, not 0, 0
2519 ($x, $y) = ($map->enter_x, $map->enter_y) 2630 ($x, $y) = ($map->enter_x, $map->enter_y)
2520 if $x <=0 && $y <= 0; 2631 if $x <= 0 && $y <= 0;
2521 2632
2522 $map->load; 2633 $map->load;
2523 $map->load_neighbours; 2634 $map->load_neighbours;
2524 2635
2525 return unless $self->contr->active; 2636 return unless $self->contr->active;
2526 $self->activate_recursive;
2527 2637
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2639 $self->enter_map ($map, $x, $y);
2640
2641 # only activate afterwards, to support waiting in hooks
2642 $self->activate_recursive;
2530} 2643}
2531 2644
2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2645=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2533 2646
2534Moves the player to the given map-path and coordinates by first freezing 2647Moves the player to the given map-path and coordinates by first freezing
2535her, loading and preparing them map, calling the provided $check callback 2648her, loading and preparing them map, calling the provided $check callback
2536that has to return the map if sucecssful, and then unfreezes the player on 2649that has to return the map if sucecssful, and then unfreezes the player on
2537the new (success) or old (failed) map position. In either case, $done will 2650the new (success) or old (failed) map position. In either case, $done will
2538be called at the end of this process. 2651be called at the end of this process.
2652
2653Note that $check will be called with a potentially non-loaded map, so if
2654it needs a loaded map it has to call C<< ->load >>.
2539 2655
2540=cut 2656=cut
2541 2657
2542our $GOTOGEN; 2658our $GOTOGEN;
2543 2659
2622} 2738}
2623 2739
2624sub prepare_random_map { 2740sub prepare_random_map {
2625 my ($exit) = @_; 2741 my ($exit) = @_;
2626 2742
2627 my $guard = cf::lock_acquire "exit_prepare:$exit";
2628
2629 # all this does is basically replace the /! path by 2743 # all this does is basically replace the /! path by
2630 # a new random map path (?random/...) with a seed 2744 # a new random map path (?random/...) with a seed
2631 # that depends on the exit object 2745 # that depends on the exit object
2632 2746
2633 my $rmp = parse_random_map_params $exit->msg; 2747 my $rmp = parse_random_map_params $exit->msg;
2635 if ($exit->map) { 2749 if ($exit->map) {
2636 $rmp->{region} = $exit->region->name; 2750 $rmp->{region} = $exit->region->name;
2637 $rmp->{origin_map} = $exit->map->path; 2751 $rmp->{origin_map} = $exit->map->path;
2638 $rmp->{origin_x} = $exit->x; 2752 $rmp->{origin_x} = $exit->x;
2639 $rmp->{origin_y} = $exit->y; 2753 $rmp->{origin_y} = $exit->y;
2754
2755 $exit->map->touch;
2640 } 2756 }
2641 2757
2642 $rmp->{random_seed} ||= $exit->random_seed; 2758 $rmp->{random_seed} ||= $exit->random_seed;
2643 2759
2644 my $data = cf::encode_json $rmp; 2760 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2645 my $md5 = Digest::MD5::md5_hex $data; 2761 my $md5 = Digest::MD5::md5_hex $data;
2646 my $meta = "$RANDOMDIR/$md5.meta"; 2762 my $meta = "$RANDOMDIR/$md5.meta";
2647 2763
2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2764 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2649 aio_write $fh, 0, (length $data), $data, 0; 2765 aio_write $fh, 0, (length $data), $data, 0;
2650 undef $fh; 2766 undef $fh;
2651 aio_rename "$meta~", $meta; 2767 aio_rename "$meta~", $meta;
2652 2768
2769 my $slaying = "?random/$md5";
2770
2771 if ($exit->valid) {
2653 $exit->slaying ("?random/$md5"); 2772 $exit->slaying ("?random/$md5");
2654 $exit->msg (undef); 2773 $exit->msg (undef);
2774 }
2655 } 2775 }
2656} 2776}
2657 2777
2658sub cf::object::player::enter_exit { 2778sub cf::object::player::enter_exit {
2659 my ($self, $exit) = @_; 2779 my ($self, $exit) = @_;
2660 2780
2661 return unless $self->type == cf::PLAYER; 2781 return unless $self->type == cf::PLAYER;
2662 2782
2663 if ($exit->slaying eq "/!") {
2664 #TODO: this should de-fi-ni-te-ly not be a sync-job
2665 # the problem is that $exit might not survive long enough
2666 # so it needs to be done right now, right here
2667 cf::sync_job { prepare_random_map $exit };
2668 }
2669
2670 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2671 my $hp = $exit->stats->hp;
2672 my $sp = $exit->stats->sp;
2673
2674 $self->enter_link; 2783 $self->enter_link;
2675 2784
2676 # if exit is damned, update players death & WoR home-position
2677 $self->contr->savebed ($slaying, $hp, $sp)
2678 if $exit->flag (FLAG_DAMNED);
2679
2680 (async { 2785 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2786 $Coro::current->{desc} = "enter_exit";
2682 2787
2683 $self->deactivate_recursive; # just to be sure
2684 unless (eval { 2788 unless (eval {
2789 $self->deactivate_recursive; # just to be sure
2790
2791 # random map handling
2792 {
2793 my $guard = cf::lock_acquire "exit_prepare:$exit";
2794
2795 prepare_random_map $exit
2796 if $exit->slaying eq "/!";
2797 }
2798
2799 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2800 my $x = $exit->stats->hp;
2801 my $y = $exit->stats->sp;
2802
2685 $self->goto ($slaying, $hp, $sp); 2803 $self->goto ($map, $x, $y);
2686 2804
2805 # if exit is damned, update players death & WoR home-position
2806 $self->contr->savebed ($map, $x, $y)
2807 if $exit->flag (cf::FLAG_DAMNED);
2808
2687 1; 2809 1
2688 }) { 2810 }) {
2689 $self->message ("Something went wrong deep within the crossfire server. " 2811 $self->message ("Something went wrong deep within the deliantra server. "
2690 . "I'll try to bring you back to the map you were before. " 2812 . "I'll try to bring you back to the map you were before. "
2691 . "Please report this to the dungeon master!", 2813 . "Please report this to the dungeon master!",
2692 cf::NDI_UNIQUE | cf::NDI_RED); 2814 cf::NDI_UNIQUE | cf::NDI_RED);
2693 2815
2694 warn "ERROR in enter_exit: $@"; 2816 warn "ERROR in enter_exit: $@";
2711sub cf::client::send_drawinfo { 2833sub cf::client::send_drawinfo {
2712 my ($self, $text, $flags) = @_; 2834 my ($self, $text, $flags) = @_;
2713 2835
2714 utf8::encode $text; 2836 utf8::encode $text;
2715 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2837 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2838}
2839
2840=item $client->send_big_packet ($pkt)
2841
2842Like C<send_packet>, but tries to compress large packets, and fragments
2843them as required.
2844
2845=cut
2846
2847our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2848
2849sub cf::client::send_big_packet {
2850 my ($self, $pkt) = @_;
2851
2852 # try lzf for large packets
2853 $pkt = "lzf " . Compress::LZF::compress $pkt
2854 if 1024 <= length $pkt and $self->{can_lzf};
2855
2856 # split very large packets
2857 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2858 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2859 $pkt = "frag";
2860 }
2861
2862 $self->send_packet ($pkt);
2716} 2863}
2717 2864
2718=item $client->send_msg ($channel, $msg, $color, [extra...]) 2865=item $client->send_msg ($channel, $msg, $color, [extra...])
2719 2866
2720Send a drawinfo or msg packet to the client, formatting the msg for the 2867Send a drawinfo or msg packet to the client, formatting the msg for the
2724 2871
2725=cut 2872=cut
2726 2873
2727# non-persistent channels (usually the info channel) 2874# non-persistent channels (usually the info channel)
2728our %CHANNEL = ( 2875our %CHANNEL = (
2876 "c/motd" => {
2877 id => "infobox",
2878 title => "MOTD",
2879 reply => undef,
2880 tooltip => "The message of the day",
2881 },
2729 "c/identify" => { 2882 "c/identify" => {
2730 id => "infobox", 2883 id => "infobox",
2731 title => "Identify", 2884 title => "Identify",
2732 reply => undef, 2885 reply => undef,
2733 tooltip => "Items recently identified", 2886 tooltip => "Items recently identified",
2735 "c/examine" => { 2888 "c/examine" => {
2736 id => "infobox", 2889 id => "infobox",
2737 title => "Examine", 2890 title => "Examine",
2738 reply => undef, 2891 reply => undef,
2739 tooltip => "Signs and other items you examined", 2892 tooltip => "Signs and other items you examined",
2893 },
2894 "c/shopinfo" => {
2895 id => "infobox",
2896 title => "Shop Info",
2897 reply => undef,
2898 tooltip => "What your bargaining skill tells you about the shop",
2740 }, 2899 },
2741 "c/book" => { 2900 "c/book" => {
2742 id => "infobox", 2901 id => "infobox",
2743 title => "Book", 2902 title => "Book",
2744 reply => undef, 2903 reply => undef,
2760 id => "infobox", 2919 id => "infobox",
2761 title => "Body Parts", 2920 title => "Body Parts",
2762 reply => undef, 2921 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available", 2922 tooltip => "Shows which body parts you posess and are available",
2764 }, 2923 },
2924 "c/statistics" => {
2925 id => "infobox",
2926 title => "Statistics",
2927 reply => undef,
2928 tooltip => "Shows your primary statistics",
2929 },
2930 "c/skills" => {
2931 id => "infobox",
2932 title => "Skills",
2933 reply => undef,
2934 tooltip => "Shows your experience per skill and item power",
2935 },
2936 "c/shopitems" => {
2937 id => "infobox",
2938 title => "Shop Items",
2939 reply => undef,
2940 tooltip => "Shows the items currently for sale in this shop",
2941 },
2942 "c/resistances" => {
2943 id => "infobox",
2944 title => "Resistances",
2945 reply => undef,
2946 tooltip => "Shows your resistances",
2947 },
2948 "c/pets" => {
2949 id => "infobox",
2950 title => "Pets",
2951 reply => undef,
2952 tooltip => "Shows information abotu your pets/a specific pet",
2953 },
2954 "c/perceiveself" => {
2955 id => "infobox",
2956 title => "Perceive Self",
2957 reply => undef,
2958 tooltip => "You gained detailed knowledge about yourself",
2959 },
2765 "c/uptime" => { 2960 "c/uptime" => {
2766 id => "infobox", 2961 id => "infobox",
2767 title => "Uptime", 2962 title => "Uptime",
2768 reply => undef, 2963 reply => undef,
2769 tooltip => "How long the server has been running since last restart", 2964 tooltip => "How long the server has been running since last restart",
2772 id => "infobox", 2967 id => "infobox",
2773 title => "Map Info", 2968 title => "Map Info",
2774 reply => undef, 2969 reply => undef,
2775 tooltip => "Information related to the maps", 2970 tooltip => "Information related to the maps",
2776 }, 2971 },
2972 "c/party" => {
2973 id => "party",
2974 title => "Party",
2975 reply => "gsay ",
2976 tooltip => "Messages and chat related to your party",
2977 },
2978 "c/death" => {
2979 id => "death",
2980 title => "Death",
2981 reply => undef,
2982 tooltip => "Reason for and more info about your most recent death",
2983 },
2984 "c/say" => $SAY_CHANNEL,
2985 "c/chat" => $CHAT_CHANNEL,
2777); 2986);
2778 2987
2779sub cf::client::send_msg { 2988sub cf::client::send_msg {
2780 my ($self, $channel, $msg, $color, @extra) = @_; 2989 my ($self, $channel, $msg, $color, @extra) = @_;
2781 2990
2782 $msg = $self->pl->expand_cfpod ($msg); 2991 $msg = $self->pl->expand_cfpod ($msg)
2992 unless $color & cf::NDI_VERBATIM;
2783 2993
2784 $color &= cf::NDI_CLIENT_MASK; # just in case... 2994 $color &= cf::NDI_CLIENT_MASK; # just in case...
2785 2995
2786 # check predefined channels, for the benefit of C 2996 # check predefined channels, for the benefit of C
2787 if ($CHANNEL{$channel}) { 2997 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel}; 2998 $channel = $CHANNEL{$channel};
2789 2999
2790 $self->ext_msg (channel_info => $channel) 3000 $self->ext_msg (channel_info => $channel);
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id}; 3001 $channel = $channel->{id};
2794 3002
2795 } elsif (ref $channel) { 3003 } elsif (ref $channel) {
2796 # send meta info to client, if not yet sent 3004 # send meta info to client, if not yet sent
2797 unless (exists $self->{channel}{$channel->{id}}) { 3005 unless (exists $self->{channel}{$channel->{id}}) {
2798 $self->{channel}{$channel->{id}} = $channel; 3006 $self->{channel}{$channel->{id}} = $channel;
2799 $self->ext_msg (channel_info => $channel) 3007 $self->ext_msg (channel_info => $channel);
2800 if $self->can_msg;
2801 } 3008 }
2802 3009
2803 $channel = $channel->{id}; 3010 $channel = $channel->{id};
2804 } 3011 }
2805 3012
2806 return unless @extra || length $msg; 3013 return unless @extra || length $msg;
2807 3014
2808 if ($self->can_msg) {
2809 # default colour, mask it out 3015 # default colour, mask it out
2810 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3016 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2811 if $color & cf::NDI_DEF; 3017 if $color & cf::NDI_DEF;
2812 3018
2813 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3019 my $pkt = "msg "
3020 . $self->{json_coder}->encode (
2814 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3021 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2815 } else { 3022 );
2816 if ($color >= 0) {
2817 # replace some tags by gcfclient-compatible ones
2818 for ($msg) {
2819 1 while
2820 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2821 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2822 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2823 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2824 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2825 }
2826 3023
2827 $color &= cf::NDI_COLOR_MASK; 3024 $self->send_big_packet ($pkt);
2828
2829 utf8::encode $msg;
2830
2831 if (0 && $msg =~ /\[/) {
2832 # COMMAND/INFO
2833 $self->send_packet ("drawextinfo $color 10 8 $msg")
2834 } else {
2835 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2836 $self->send_packet ("drawinfo $color $msg")
2837 }
2838 }
2839 }
2840} 3025}
2841 3026
2842=item $client->ext_msg ($type, @msg) 3027=item $client->ext_msg ($type, @msg)
2843 3028
2844Sends an ext event to the client. 3029Sends an ext event to the client.
2847 3032
2848sub cf::client::ext_msg($$@) { 3033sub cf::client::ext_msg($$@) {
2849 my ($self, $type, @msg) = @_; 3034 my ($self, $type, @msg) = @_;
2850 3035
2851 if ($self->extcmd == 2) { 3036 if ($self->extcmd == 2) {
2852 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3037 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2853 } elsif ($self->extcmd == 1) { # TODO: remove 3038 } elsif ($self->extcmd == 1) { # TODO: remove
2854 push @msg, msgtype => "event_$type"; 3039 push @msg, msgtype => "event_$type";
2855 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2856 } 3041 }
2857} 3042}
2858 3043
2859=item $client->ext_reply ($msgid, @msg) 3044=item $client->ext_reply ($msgid, @msg)
2860 3045
2864 3049
2865sub cf::client::ext_reply($$@) { 3050sub cf::client::ext_reply($$@) {
2866 my ($self, $id, @msg) = @_; 3051 my ($self, $id, @msg) = @_;
2867 3052
2868 if ($self->extcmd == 2) { 3053 if ($self->extcmd == 2) {
2869 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3054 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2870 } elsif ($self->extcmd == 1) { 3055 } elsif ($self->extcmd == 1) {
2871 #TODO: version 1, remove 3056 #TODO: version 1, remove
2872 unshift @msg, msgtype => "reply", msgid => $id; 3057 unshift @msg, msgtype => "reply", msgid => $id;
2873 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2874 } 3059 }
2875} 3060}
2876 3061
2877=item $success = $client->query ($flags, "text", \&cb) 3062=item $success = $client->query ($flags, "text", \&cb)
2878 3063
2979 3164
2980 $coro 3165 $coro
2981} 3166}
2982 3167
2983cf::client->attach ( 3168cf::client->attach (
2984 on_destroy => sub { 3169 on_client_destroy => sub {
2985 my ($ns) = @_; 3170 my ($ns) = @_;
2986 3171
2987 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3172 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2988 }, 3173 },
2989); 3174);
3005our $safe_hole = new Safe::Hole; 3190our $safe_hole = new Safe::Hole;
3006 3191
3007$SIG{FPE} = 'IGNORE'; 3192$SIG{FPE} = 'IGNORE';
3008 3193
3009$safe->permit_only (Opcode::opset qw( 3194$safe->permit_only (Opcode::opset qw(
3010 :base_core :base_mem :base_orig :base_math 3195 :base_core :base_mem :base_orig :base_math :base_loop
3011 grepstart grepwhile mapstart mapwhile 3196 grepstart grepwhile mapstart mapwhile
3012 sort time 3197 sort time
3013)); 3198));
3014 3199
3015# here we export the classes and methods available to script code 3200# here we export the classes and methods available to script code
3018 3203
3019The following functions and methods are available within a safe environment: 3204The following functions and methods are available within a safe environment:
3020 3205
3021 cf::object 3206 cf::object
3022 contr pay_amount pay_player map x y force_find force_add destroy 3207 contr pay_amount pay_player map x y force_find force_add destroy
3023 insert remove name archname title slaying race decrease_ob_nr 3208 insert remove name archname title slaying race decrease split
3209 value
3024 3210
3025 cf::object::player 3211 cf::object::player
3026 player 3212 player
3027 3213
3028 cf::player 3214 cf::player
3033 3219
3034=cut 3220=cut
3035 3221
3036for ( 3222for (
3037 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3223 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3038 insert remove inv name archname title slaying race 3224 insert remove inv nrof name archname title slaying race
3039 decrease_ob_nr destroy)], 3225 decrease split destroy change_exp value msg lore send_msg)],
3040 ["cf::object::player" => qw(player)], 3226 ["cf::object::player" => qw(player)],
3041 ["cf::player" => qw(peaceful)], 3227 ["cf::player" => qw(peaceful send_msg)],
3042 ["cf::map" => qw(trigger)], 3228 ["cf::map" => qw(trigger)],
3043) { 3229) {
3044 no strict 'refs'; 3230 no strict 'refs';
3045 my ($pkg, @funs) = @$_; 3231 my ($pkg, @funs) = @$_;
3046 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3232 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3064 3250
3065 my $qcode = $code; 3251 my $qcode = $code;
3066 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3252 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3067 $qcode =~ s/\n/\\n/g; 3253 $qcode =~ s/\n/\\n/g;
3068 3254
3255 %vars = (_dummy => 0) unless %vars;
3256
3257 my @res;
3069 local $_; 3258 local $_;
3070 local @safe::cf::_safe_eval_args = values %vars;
3071 3259
3072 my $eval = 3260 my $eval =
3073 "do {\n" 3261 "do {\n"
3074 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3262 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3075 . "#line 0 \"{$qcode}\"\n" 3263 . "#line 0 \"{$qcode}\"\n"
3076 . $code 3264 . $code
3077 . "\n}" 3265 . "\n}"
3078 ; 3266 ;
3079 3267
3268 if ($CFG{safe_eval}) {
3080 sub_generation_inc; 3269 sub_generation_inc;
3270 local @safe::cf::_safe_eval_args = values %vars;
3081 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3271 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3082 sub_generation_inc; 3272 sub_generation_inc;
3273 } else {
3274 local @cf::_safe_eval_args = values %vars;
3275 @res = wantarray ? eval eval : scalar eval $eval;
3276 }
3083 3277
3084 if ($@) { 3278 if ($@) {
3085 warn "$@"; 3279 warn "$@";
3086 warn "while executing safe code '$code'\n"; 3280 warn "while executing safe code '$code'\n";
3087 warn "with arguments " . (join " ", %vars) . "\n"; 3281 warn "with arguments " . (join " ", %vars) . "\n";
3106=cut 3300=cut
3107 3301
3108sub register_script_function { 3302sub register_script_function {
3109 my ($fun, $cb) = @_; 3303 my ($fun, $cb) = @_;
3110 3304
3111 no strict 'refs'; 3305 $fun = "safe::$fun" if $CFG{safe_eval};
3112 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3306 *$fun = $safe_hole->wrap ($cb);
3113} 3307}
3114 3308
3115=back 3309=back
3116 3310
3117=cut 3311=cut
3138 3332
3139 $facedata->{version} == 2 3333 $facedata->{version} == 2
3140 or cf::cleanup "$path: version mismatch, cannot proceed."; 3334 or cf::cleanup "$path: version mismatch, cannot proceed.";
3141 3335
3142 # patch in the exptable 3336 # patch in the exptable
3337 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3143 $facedata->{resource}{"res/exp_table"} = { 3338 $facedata->{resource}{"res/exp_table"} = {
3144 type => FT_RSRC, 3339 type => FT_RSRC,
3145 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3340 data => $exp_table,
3341 hash => (Digest::MD5::md5 $exp_table),
3146 }; 3342 };
3147 cf::cede_to_tick; 3343 cf::cede_to_tick;
3148 3344
3149 { 3345 {
3150 my $faces = $facedata->{faceinfo}; 3346 my $faces = $facedata->{faceinfo};
3151 3347
3152 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
3153 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3349 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3350
3154 cf::face::set_visibility $idx, $info->{visibility}; 3351 cf::face::set_visibility $idx, $info->{visibility};
3155 cf::face::set_magicmap $idx, $info->{magicmap}; 3352 cf::face::set_magicmap $idx, $info->{magicmap};
3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3353 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3157 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3354 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3158 3355
3159 cf::cede_to_tick; 3356 cf::cede_to_tick;
3160 } 3357 }
3161 3358
3162 while (my ($face, $info) = each %$faces) { 3359 while (my ($face, $info) = each %$faces) {
3163 next unless $info->{smooth}; 3360 next unless $info->{smooth};
3361
3164 my $idx = cf::face::find $face 3362 my $idx = cf::face::find $face
3165 or next; 3363 or next;
3364
3166 if (my $smooth = cf::face::find $info->{smooth}) { 3365 if (my $smooth = cf::face::find $info->{smooth}) {
3167 cf::face::set_smooth $idx, $smooth; 3366 cf::face::set_smooth $idx, $smooth;
3168 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3367 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3169 } else { 3368 } else {
3170 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3369 warn "smooth face '$info->{smooth}' not found for face '$face'";
3184 3383
3185 cf::anim::invalidate_all; # d'oh 3384 cf::anim::invalidate_all; # d'oh
3186 } 3385 }
3187 3386
3188 { 3387 {
3189 # TODO: for gcfclient pleasure, we should give resources
3190 # that gcfclient doesn't grok a >10000 face index.
3191 my $res = $facedata->{resource}; 3388 my $res = $facedata->{resource};
3192 3389
3193 my $soundconf = delete $res->{"res/sound.conf"};
3194
3195 while (my ($name, $info) = each %$res) { 3390 while (my ($name, $info) = each %$res) {
3391 if (defined $info->{type}) {
3196 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3392 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197 my $data;
3198 3393
3199 if ($info->{type} & 1) { 3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3200 # prepend meta info 3395 cf::face::set_type $idx, $info->{type};
3201
3202 my $meta = $enc->encode ({
3203 name => $name,
3204 %{ $info->{meta} || {} },
3205 });
3206
3207 $data = pack "(w/a*)*", $meta, $info->{data};
3208 } else { 3396 } else {
3209 $data = $info->{data}; 3397 $RESOURCE{$name} = $info;
3210 } 3398 }
3211 3399
3212 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3213 cf::face::set_type $idx, $info->{type};
3214
3215 cf::cede_to_tick; 3400 cf::cede_to_tick;
3216 } 3401 }
3217
3218 if ($soundconf) {
3219 $soundconf = $enc->decode (delete $soundconf->{data});
3220
3221 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3222 my $sound = $soundconf->{compat}[$_]
3223 or next;
3224
3225 my $face = cf::face::find "sound/$sound->[1]";
3226 cf::sound::set $sound->[0] => $face;
3227 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3228 }
3229
3230 while (my ($k, $v) = each %{$soundconf->{event}}) {
3231 my $face = cf::face::find "sound/$v";
3232 cf::sound::set $k => $face;
3233 }
3234 }
3235 } 3402 }
3403
3404 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3236 3405
3237 1 3406 1
3238} 3407}
3408
3409cf::global->attach (on_resource_update => sub {
3410 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3411 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3412
3413 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3414 my $sound = $soundconf->{compat}[$_]
3415 or next;
3416
3417 my $face = cf::face::find "sound/$sound->[1]";
3418 cf::sound::set $sound->[0] => $face;
3419 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3420 }
3421
3422 while (my ($k, $v) = each %{$soundconf->{event}}) {
3423 my $face = cf::face::find "sound/$v";
3424 cf::sound::set $k => $face;
3425 }
3426 }
3427});
3239 3428
3240register_exticmd fx_want => sub { 3429register_exticmd fx_want => sub {
3241 my ($ns, $want) = @_; 3430 my ($ns, $want) = @_;
3242 3431
3243 while (my ($k, $v) = each %$want) { 3432 while (my ($k, $v) = each %$want) {
3244 $ns->fx_want ($k, $v); 3433 $ns->fx_want ($k, $v);
3245 } 3434 }
3246}; 3435};
3436
3437sub load_resource_file($) {
3438 my $guard = lock_acquire "load_resource_file";
3439
3440 my $status = load_resource_file_ $_[0];
3441 get_slot 0.1, 100;
3442 cf::arch::commit_load;
3443
3444 $status
3445}
3247 3446
3248sub reload_regions { 3447sub reload_regions {
3249 # HACK to clear player env face cache, we need some signal framework 3448 # HACK to clear player env face cache, we need some signal framework
3250 # for this (global event?) 3449 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = (); 3450 %ext::player_env::MUSIC_FACE_CACHE = ();
3265} 3464}
3266 3465
3267sub reload_archetypes { 3466sub reload_archetypes {
3268 load_resource_file "$DATADIR/archetypes" 3467 load_resource_file "$DATADIR/archetypes"
3269 or die "unable to load archetypes\n"; 3468 or die "unable to load archetypes\n";
3270 #d# NEED to laod twice to resolve forward references
3271 # this really needs to be done in an extra post-pass
3272 # (which needs to be synchronous, so solve it differently)
3273 load_resource_file "$DATADIR/archetypes"
3274 or die "unable to load archetypes\n";
3275} 3469}
3276 3470
3277sub reload_treasures { 3471sub reload_treasures {
3278 load_resource_file "$DATADIR/treasures" 3472 load_resource_file "$DATADIR/treasures"
3279 or die "unable to load treasurelists\n"; 3473 or die "unable to load treasurelists\n";
3280} 3474}
3281 3475
3282sub reload_resources { 3476sub reload_resources {
3283 warn "reloading resource files...\n"; 3477 warn "reloading resource files...\n";
3284 3478
3479 reload_facedata;
3480 reload_archetypes;
3285 reload_regions; 3481 reload_regions;
3286 reload_facedata;
3287 #reload_archetypes;#d#
3288 reload_archetypes;
3289 reload_treasures; 3482 reload_treasures;
3290 3483
3291 warn "finished reloading resource files\n"; 3484 warn "finished reloading resource files\n";
3292} 3485}
3293 3486
3294sub init {
3295 reload_resources;
3296}
3297
3298sub reload_config { 3487sub reload_config {
3488 warn "reloading config file...\n";
3489
3299 open my $fh, "<:utf8", "$CONFDIR/config" 3490 open my $fh, "<:utf8", "$CONFDIR/config"
3300 or return; 3491 or return;
3301 3492
3302 local $/; 3493 local $/;
3303 *CFG = YAML::Syck::Load <$fh>; 3494 *CFG = YAML::XS::Load scalar <$fh>;
3304 3495
3305 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3306 3497
3307 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3498 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3308 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3499 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3312 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3313 and die "WARNING: m(un)lockall failed: $!\n"; 3504 and die "WARNING: m(un)lockall failed: $!\n";
3314 }; 3505 };
3315 warn $@ if $@; 3506 warn $@ if $@;
3316 } 3507 }
3508
3509 warn "finished reloading resource files\n";
3510}
3511
3512sub pidfile() {
3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3514 or die "$PIDFILE: $!";
3515 flock $fh, &Fcntl::LOCK_EX
3516 or die "$PIDFILE: flock: $!";
3517 $fh
3518}
3519
3520# make sure only one server instance is running at any one time
3521sub atomic {
3522 my $fh = pidfile;
3523
3524 my $pid = <$fh>;
3525 kill 9, $pid if $pid > 0;
3526
3527 seek $fh, 0, 0;
3528 print $fh $$;
3529}
3530
3531sub main_loop {
3532 warn "EV::loop starting\n";
3533 if (1) {
3534 EV::loop;
3535 }
3536 warn "EV::loop returned\n";
3537 goto &main_loop unless $REALLY_UNLOOP;
3317} 3538}
3318 3539
3319sub main { 3540sub main {
3541 cf::init_globals; # initialise logging
3542
3543 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3544 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3545 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3546 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3547
3548 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3549
3320 # we must not ever block the main coroutine 3550 # we must not ever block the main coroutine
3321 local $Coro::idle = sub { 3551 local $Coro::idle = sub {
3322 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3552 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3323 (async { 3553 (async {
3324 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3554 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT; 3555 EV::loop EV::LOOP_ONESHOT;
3326 })->prio (Coro::PRIO_MAX); 3556 })->prio (Coro::PRIO_MAX);
3327 }; 3557 };
3328 3558
3559 evthread_start IO::AIO::poll_fileno;
3560
3561 cf::sync_job {
3562 cf::init_experience;
3563 cf::init_anim;
3564 cf::init_attackmess;
3565 cf::init_dynamic;
3566
3567 cf::load_settings;
3568 cf::load_materials;
3569
3570 reload_resources;
3329 reload_config; 3571 reload_config;
3330 db_init; 3572 db_init;
3573
3574 cf::init_uuid;
3575 cf::init_signals;
3576 cf::init_skills;
3577
3578 cf::init_beforeplay;
3579
3580 atomic;
3581
3331 load_extensions; 3582 load_extensions;
3332 3583
3333 $TICK_WATCHER->start; 3584 utime time, time, $RUNTIMEFILE;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3585
3335 EV::loop; 3586 # no (long-running) fork's whatsoever before this point(!)
3587 use POSIX ();
3588 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3589
3590 (pop @POST_INIT)->(0) while @POST_INIT;
3591 };
3592
3593 main_loop;
3336} 3594}
3337 3595
3338############################################################################# 3596#############################################################################
3339# initialisation and cleanup 3597# initialisation and cleanup
3340 3598
3341# install some emergency cleanup handlers 3599# install some emergency cleanup handlers
3342BEGIN { 3600BEGIN {
3343 our %SIGWATCHER = (); 3601 our %SIGWATCHER = ();
3344 for my $signal (qw(INT HUP TERM)) { 3602 for my $signal (qw(INT HUP TERM)) {
3345 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3603 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3346 cf::cleanup "SIG$signal"; 3604 cf::cleanup "SIG$signal";
3347 }; 3605 };
3348 } 3606 }
3349} 3607}
3350 3608
3351sub write_runtime { 3609sub write_runtime_sync {
3352 my $runtime = "$LOCALDIR/runtime"; 3610 my $t0 = AE::time;
3353 3611
3354 # first touch the runtime file to show we are still running: 3612 # first touch the runtime file to show we are still running:
3355 # the fsync below can take a very very long time. 3613 # the fsync below can take a very very long time.
3356 3614
3357 IO::AIO::aio_utime $runtime, undef, undef; 3615 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3358 3616
3359 my $guard = cf::lock_acquire "write_runtime"; 3617 my $guard = cf::lock_acquire "write_runtime";
3360 3618
3361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3619 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3362 or return; 3620 or return;
3363 3621
3364 my $value = $cf::RUNTIME + 90 + 10; 3622 my $value = $cf::RUNTIME + 90 + 10;
3365 # 10 is the runtime save interval, for a monotonic clock 3623 # 10 is the runtime save interval, for a monotonic clock
3366 # 60 allows for the watchdog to kill the server. 3624 # 60 allows for the watchdog to kill the server.
3376 aio_utime $fh, undef, undef; 3634 aio_utime $fh, undef, undef;
3377 3635
3378 close $fh 3636 close $fh
3379 or return; 3637 or return;
3380 3638
3381 aio_rename "$runtime~", $runtime 3639 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3382 and return; 3640 and return;
3383 3641
3384 warn "runtime file written.\n"; 3642 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3385 3643
3386 1 3644 1
3645}
3646
3647our $uuid_lock;
3648our $uuid_skip;
3649
3650sub write_uuid_sync($) {
3651 $uuid_skip ||= $_[0];
3652
3653 return if $uuid_lock;
3654 local $uuid_lock = 1;
3655
3656 my $uuid = "$LOCALDIR/uuid";
3657
3658 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3659 or return;
3660
3661 my $value = uuid_seq uuid_cur;
3662
3663 unless ($value) {
3664 warn "cowardly refusing to write zero uuid value!\n";
3665 return;
3666 }
3667
3668 my $value = uuid_str $value + $uuid_skip;
3669 $uuid_skip = 0;
3670
3671 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3672 and return;
3673
3674 # always fsync - this file is important
3675 aio_fsync $fh
3676 and return;
3677
3678 close $fh
3679 or return;
3680
3681 aio_rename "$uuid~", $uuid
3682 and return;
3683
3684 warn "uuid file written ($value).\n";
3685
3686 1
3687
3688}
3689
3690sub write_uuid($$) {
3691 my ($skip, $sync) = @_;
3692
3693 $sync ? write_uuid_sync $skip
3694 : async { write_uuid_sync $skip };
3387} 3695}
3388 3696
3389sub emergency_save() { 3697sub emergency_save() {
3390 my $freeze_guard = cf::freeze_mainloop; 3698 my $freeze_guard = cf::freeze_mainloop;
3391 3699
3392 warn "enter emergency perl save\n"; 3700 warn "emergency_perl_save: enter\n";
3393 3701
3394 cf::sync_job { 3702 cf::sync_job {
3703 # this is a trade-off: we want to be very quick here, so
3704 # save all maps without fsync, and later call a global sync
3705 # (which in turn might be very very slow)
3706 local $USE_FSYNC = 0;
3707
3395 # use a peculiar iteration method to avoid tripping on perl 3708 # use a peculiar iteration method to avoid tripping on perl
3396 # refcount bugs in for. also avoids problems with players 3709 # refcount bugs in for. also avoids problems with players
3397 # and maps saved/destroyed asynchronously. 3710 # and maps saved/destroyed asynchronously.
3398 warn "begin emergency player save\n"; 3711 warn "emergency_perl_save: begin player save\n";
3399 for my $login (keys %cf::PLAYER) { 3712 for my $login (keys %cf::PLAYER) {
3400 my $pl = $cf::PLAYER{$login} or next; 3713 my $pl = $cf::PLAYER{$login} or next;
3401 $pl->valid or next; 3714 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3715 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3403 $pl->save; 3716 $pl->save;
3404 } 3717 }
3405 warn "end emergency player save\n"; 3718 warn "emergency_perl_save: end player save\n";
3406 3719
3407 warn "begin emergency map save\n"; 3720 warn "emergency_perl_save: begin map save\n";
3408 for my $path (keys %cf::MAP) { 3721 for my $path (keys %cf::MAP) {
3409 my $map = $cf::MAP{$path} or next; 3722 my $map = $cf::MAP{$path} or next;
3410 $map->valid or next; 3723 $map->valid or next;
3411 $map->save; 3724 $map->save;
3412 } 3725 }
3413 warn "end emergency map save\n"; 3726 warn "emergency_perl_save: end map save\n";
3414 3727
3415 warn "begin emergency database checkpoint\n"; 3728 warn "emergency_perl_save: begin database checkpoint\n";
3416 BDB::db_env_txn_checkpoint $DB_ENV; 3729 BDB::db_env_txn_checkpoint $DB_ENV;
3417 warn "end emergency database checkpoint\n"; 3730 warn "emergency_perl_save: end database checkpoint\n";
3731
3732 warn "emergency_perl_save: begin write uuid\n";
3733 write_uuid_sync 1;
3734 warn "emergency_perl_save: end write uuid\n";
3418 }; 3735 };
3419 3736
3737 warn "emergency_perl_save: starting sync()\n";
3738 IO::AIO::aio_sync sub {
3739 warn "emergency_perl_save: finished sync()\n";
3740 };
3741
3420 warn "leave emergency perl save\n"; 3742 warn "emergency_perl_save: leave\n";
3421} 3743}
3422 3744
3423sub post_cleanup { 3745sub post_cleanup {
3424 my ($make_core) = @_; 3746 my ($make_core) = @_;
3425 3747
3426 warn Carp::longmess "post_cleanup backtrace" 3748 warn Carp::longmess "post_cleanup backtrace"
3427 if $make_core; 3749 if $make_core;
3750
3751 my $fh = pidfile;
3752 unlink $PIDFILE if <$fh> == $$;
3753}
3754
3755# a safer delete_package, copied from Symbol
3756sub clear_package($) {
3757 my $pkg = shift;
3758
3759 # expand to full symbol table name if needed
3760 unless ($pkg =~ /^main::.*::$/) {
3761 $pkg = "main$pkg" if $pkg =~ /^::/;
3762 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3763 $pkg .= '::' unless $pkg =~ /::$/;
3764 }
3765
3766 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3767 my $stem_symtab = *{$stem}{HASH};
3768
3769 defined $stem_symtab and exists $stem_symtab->{$leaf}
3770 or return;
3771
3772 # clear all symbols
3773 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3774 for my $name (keys %$leaf_symtab) {
3775 _gv_clear *{"$pkg$name"};
3776# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3777 }
3778 warn "cleared package $pkg\n";#d#
3428} 3779}
3429 3780
3430sub do_reload_perl() { 3781sub do_reload_perl() {
3431 # can/must only be called in main 3782 # can/must only be called in main
3432 if ($Coro::current != $Coro::main) { 3783 if ($Coro::current != $Coro::main) {
3433 warn "can only reload from main coroutine"; 3784 warn "can only reload from main coroutine";
3434 return; 3785 return;
3435 } 3786 }
3436 3787
3788 return if $RELOAD++;
3789
3790 my $t1 = AE::time;
3791
3792 while ($RELOAD) {
3437 warn "reloading..."; 3793 warn "reloading...";
3438 3794
3439 warn "entering sync_job"; 3795 warn "entering sync_job";
3440 3796
3441 cf::sync_job { 3797 cf::sync_job {
3442 cf::write_runtime; # external watchdog should not bark 3798 cf::write_runtime_sync; # external watchdog should not bark
3443 cf::emergency_save; 3799 cf::emergency_save;
3444 cf::write_runtime; # external watchdog should not bark 3800 cf::write_runtime_sync; # external watchdog should not bark
3445 3801
3446 warn "syncing database to disk"; 3802 warn "syncing database to disk";
3447 BDB::db_env_txn_checkpoint $DB_ENV; 3803 BDB::db_env_txn_checkpoint $DB_ENV;
3448 3804
3449 # if anything goes wrong in here, we should simply crash as we already saved 3805 # if anything goes wrong in here, we should simply crash as we already saved
3450 3806
3451 warn "flushing outstanding aio requests"; 3807 warn "flushing outstanding aio requests";
3452 for (;;) {
3453 BDB::flush;
3454 IO::AIO::flush;
3455 Coro::cede_notself;
3456 last unless IO::AIO::nreqs || BDB::nreqs; 3808 while (IO::AIO::nreqs || BDB::nreqs) {
3457 warn "iterate..."; 3809 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3458 }
3459
3460 ++$RELOAD;
3461
3462 warn "cancelling all extension coros";
3463 $_->cancel for values %EXT_CORO;
3464 %EXT_CORO = ();
3465
3466 warn "removing commands";
3467 %COMMAND = ();
3468
3469 warn "removing ext/exti commands";
3470 %EXTCMD = ();
3471 %EXTICMD = ();
3472
3473 warn "unloading/nuking all extensions";
3474 for my $pkg (@EXTS) {
3475 warn "... unloading $pkg";
3476
3477 if (my $cb = $pkg->can ("unload")) {
3478 eval {
3479 $cb->($pkg);
3480 1
3481 } or warn "$pkg unloaded, but with errors: $@";
3482 } 3810 }
3483 3811
3484 warn "... nuking $pkg"; 3812 warn "cancelling all extension coros";
3485 Symbol::delete_package $pkg; 3813 $_->cancel for values %EXT_CORO;
3486 } 3814 %EXT_CORO = ();
3487 3815
3488 warn "unloading all perl modules loaded from $LIBDIR"; 3816 warn "removing commands";
3489 while (my ($k, $v) = each %INC) { 3817 %COMMAND = ();
3490 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3491 3818
3819 warn "removing ext/exti commands";
3820 %EXTCMD = ();
3821 %EXTICMD = ();
3822
3823 warn "unloading/nuking all extensions";
3824 for my $pkg (@EXTS) {
3492 warn "... unloading $k"; 3825 warn "... unloading $pkg";
3493 delete $INC{$k};
3494 3826
3495 $k =~ s/\.pm$//;
3496 $k =~ s/\//::/g;
3497
3498 if (my $cb = $k->can ("unload_module")) { 3827 if (my $cb = $pkg->can ("unload")) {
3828 eval {
3499 $cb->(); 3829 $cb->($pkg);
3830 1
3831 } or warn "$pkg unloaded, but with errors: $@";
3832 }
3833
3834 warn "... clearing $pkg";
3835 clear_package $pkg;
3500 } 3836 }
3501 3837
3502 Symbol::delete_package $k; 3838 warn "unloading all perl modules loaded from $LIBDIR";
3839 while (my ($k, $v) = each %INC) {
3840 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3841
3842 warn "... unloading $k";
3843 delete $INC{$k};
3844
3845 $k =~ s/\.pm$//;
3846 $k =~ s/\//::/g;
3847
3848 if (my $cb = $k->can ("unload_module")) {
3849 $cb->();
3850 }
3851
3852 clear_package $k;
3503 } 3853 }
3504 3854
3505 warn "getting rid of safe::, as good as possible"; 3855 warn "getting rid of safe::, as good as possible";
3506 Symbol::delete_package "safe::$_" 3856 clear_package "safe::$_"
3507 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3857 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3508 3858
3509 warn "unloading cf.pm \"a bit\""; 3859 warn "unloading cf.pm \"a bit\"";
3510 delete $INC{"cf.pm"}; 3860 delete $INC{"cf.pm"};
3511 delete $INC{"cf/pod.pm"}; 3861 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3512 3862
3513 # don't, removes xs symbols, too, 3863 # don't, removes xs symbols, too,
3514 # and global variables created in xs 3864 # and global variables created in xs
3515 #Symbol::delete_package __PACKAGE__; 3865 #clear_package __PACKAGE__;
3516 3866
3517 warn "unload completed, starting to reload now"; 3867 warn "unload completed, starting to reload now";
3518 3868
3519 warn "reloading cf.pm"; 3869 warn "reloading cf.pm";
3520 require cf; 3870 require cf;
3521 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3871 cf::_connect_to_perl_1;
3522 3872
3523 warn "loading config and database again"; 3873 warn "loading config and database again";
3524 cf::reload_config; 3874 cf::reload_config;
3525 3875
3526 warn "loading extensions"; 3876 warn "loading extensions";
3527 cf::load_extensions; 3877 cf::load_extensions;
3528 3878
3879 if ($REATTACH_ON_RELOAD) {
3529 warn "reattaching attachments to objects/players"; 3880 warn "reattaching attachments to objects/players";
3530 _global_reattach; # objects, sockets 3881 _global_reattach; # objects, sockets
3531 warn "reattaching attachments to maps"; 3882 warn "reattaching attachments to maps";
3532 reattach $_ for values %MAP; 3883 reattach $_ for values %MAP;
3533 warn "reattaching attachments to players"; 3884 warn "reattaching attachments to players";
3534 reattach $_ for values %PLAYER; 3885 reattach $_ for values %PLAYER;
3886 }
3535 3887
3888 warn "running post_init jobs";
3889 (pop @POST_INIT)->(1) while @POST_INIT;
3890
3536 warn "leaving sync_job"; 3891 warn "leaving sync_job";
3537 3892
3538 1 3893 1
3539 } or do { 3894 } or do {
3540 warn $@; 3895 warn $@;
3541 warn "error while reloading, exiting."; 3896 cf::cleanup "error while reloading, exiting.";
3542 exit 1;
3543 }; 3897 };
3544 3898
3545 warn "reloaded"; 3899 warn "reloaded";
3900 --$RELOAD;
3901 }
3902
3903 $t1 = AE::time - $t1;
3904 warn "reload completed in ${t1}s\n";
3546}; 3905};
3547 3906
3548our $RELOAD_WATCHER; # used only during reload 3907our $RELOAD_WATCHER; # used only during reload
3549 3908
3550sub reload_perl() { 3909sub reload_perl() {
3551 # doing reload synchronously and two reloads happen back-to-back, 3910 # doing reload synchronously and two reloads happen back-to-back,
3552 # coro crashes during coro_state_free->destroy here. 3911 # coro crashes during coro_state_free->destroy here.
3553 3912
3913 $RELOAD_WATCHER ||= cf::async {
3914 Coro::AIO::aio_wait cache_extensions;
3915
3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3916 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3917 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3918 undef $RELOAD_WATCHER;
3556 do_reload_perl; 3919 };
3557 }; 3920 };
3558} 3921}
3559 3922
3560register_command "reload" => sub { 3923register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3924 my ($who, $arg) = @_;
3575 3938
3576our @WAIT_FOR_TICK; 3939our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 3940our @WAIT_FOR_TICK_BEGIN;
3578 3941
3579sub wait_for_tick { 3942sub wait_for_tick {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 3943 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3582 3944
3583 my $signal = new Coro::Signal; 3945 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 3946 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 3947 $signal->wait;
3586} 3948}
3587 3949
3588sub wait_for_tick_begin { 3950sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 3951 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3591 3952
3592 my $signal = new Coro::Signal; 3953 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 3954 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 3955 $signal->wait;
3595} 3956}
3596 3957
3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3958sub tick {
3598 if ($Coro::current != $Coro::main) { 3959 if ($Coro::current != $Coro::main) {
3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3960 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3600 unless ++$bug_warning > 10; 3961 unless ++$bug_warning > 10;
3601 return; 3962 return;
3602 } 3963 }
3603 3964
3604 $NOW = $tick_start = EV::now;
3605
3606 cf::server_tick; # one server iteration 3965 cf::server_tick; # one server iteration
3607 3966
3608 $RUNTIME += $TICK; 3967 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3609 $NEXT_TICK = $_[0]->at;
3610 3968
3611 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3969 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3612 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3970 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3613 Coro::async_pool { 3971 Coro::async_pool {
3614 $Coro::current->{desc} = "runtime saver"; 3972 $Coro::current->{desc} = "runtime saver";
3615 write_runtime 3973 write_runtime_sync
3616 or warn "ERROR: unable to write runtime file: $!"; 3974 or warn "ERROR: unable to write runtime file: $!";
3617 }; 3975 };
3618 } 3976 }
3619 3977
3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3978 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3622 } 3980 }
3623 while (my $sig = shift @WAIT_FOR_TICK) { 3981 while (my $sig = shift @WAIT_FOR_TICK) {
3624 $sig->send; 3982 $sig->send;
3625 } 3983 }
3626 3984
3627 $LOAD = ($NOW - $tick_start) / $TICK; 3985 $LOAD = ($NOW - $TICK_START) / $TICK;
3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3986 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3629 3987
3630 _post_tick; 3988 if (0) {
3631}; 3989 if ($NEXT_TICK) {
3632$TICK_WATCHER->priority (EV::MAXPRI); 3990 my $jitter = $TICK_START - $NEXT_TICK;
3991 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3992 warn "jitter $JITTER\n";#d#
3993 }
3994 }
3995}
3633 3996
3634{ 3997{
3635 # configure BDB 3998 # configure BDB
3636 3999
3637 BDB::min_parallel 8; 4000 BDB::min_parallel 16;
3638 BDB::max_poll_reqs $TICK * 0.1; 4001 BDB::max_poll_reqs $TICK * 0.1;
3639 $Coro::BDB::WATCHER->priority (1); 4002 $AnyEvent::BDB::WATCHER->priority (1);
3640 4003
3641 unless ($DB_ENV) { 4004 unless ($DB_ENV) {
3642 $DB_ENV = BDB::db_env_create; 4005 $DB_ENV = BDB::db_env_create;
3643 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4006 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3644 | BDB::LOG_AUTOREMOVE, 1); 4007 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4008 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3645 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4009 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3646 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4010 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3647 4011
3648 cf::sync_job { 4012 cf::sync_job {
3649 eval { 4013 eval {
3675{ 4039{
3676 # configure IO::AIO 4040 # configure IO::AIO
3677 4041
3678 IO::AIO::min_parallel 8; 4042 IO::AIO::min_parallel 8;
3679 IO::AIO::max_poll_time $TICK * 0.1; 4043 IO::AIO::max_poll_time $TICK * 0.1;
3680 $Coro::AIO::WATCHER->priority (1); 4044 undef $AnyEvent::AIO::WATCHER;
3681} 4045}
3682 4046
3683my $_log_backtrace; 4047my $_log_backtrace;
3684 4048
3685sub _log_backtrace { 4049sub _log_backtrace {
3688 $msg =~ s/\n//; 4052 $msg =~ s/\n//;
3689 4053
3690 # limit the # of concurrent backtraces 4054 # limit the # of concurrent backtraces
3691 if ($_log_backtrace < 2) { 4055 if ($_log_backtrace < 2) {
3692 ++$_log_backtrace; 4056 ++$_log_backtrace;
4057 my $perl_bt = Carp::longmess $msg;
3693 async { 4058 async {
3694 $Coro::current->{desc} = "abt $msg"; 4059 $Coro::current->{desc} = "abt $msg";
3695 4060
3696 my @bt = fork_call { 4061 my @bt = fork_call {
3697 @addr = map { sprintf "%x", $_ } @addr; 4062 @addr = map { sprintf "%x", $_ } @addr;
3708 } 4073 }
3709 4074
3710 @funcs 4075 @funcs
3711 }; 4076 };
3712 4077
3713 LOG llevInfo, "[ABT] $msg\n"; 4078 LOG llevInfo, "[ABT] $perl_bt\n";
4079 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3714 LOG llevInfo, "[ABT] $_\n" for @bt; 4080 LOG llevInfo, "[ABT] $_\n" for @bt;
3715 --$_log_backtrace; 4081 --$_log_backtrace;
3716 }; 4082 };
3717 } else { 4083 } else {
3718 LOG llevInfo, "[ABT] $msg\n"; 4084 LOG llevInfo, "[ABT] $msg\n";
3719 LOG llevInfo, "[ABT] [suppressed]\n"; 4085 LOG llevInfo, "[ABT] [suppressed]\n";
3720 } 4086 }
3721} 4087}
3722 4088
3723# load additional modules 4089# load additional modules
3724use cf::pod; 4090require "cf/$_.pm" for @EXTRA_MODULES;
4091cf::_connect_to_perl_2;
3725 4092
3726END { cf::emergency_save } 4093END { cf::emergency_save }
3727 4094
37281 40951
3729 4096

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines