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.403 by root, Mon Dec 17 07:09:18 2007 UTC vs.
Revision 1.522 by root, Sat Apr 17 02:22:14 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines