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.409 by root, Mon Jan 14 11:41:48 2008 UTC vs.
Revision 1.523 by root, Sat Apr 17 02:39:46 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines