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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines