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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines