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.405 by root, Mon Dec 17 08:03:22 2007 UTC vs.
Revision 1.518 by root, Fri Apr 16 02:21:26 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines