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.404 by root, Mon Dec 17 07:27:58 2007 UTC vs.
Revision 1.518 by root, Fri Apr 16 02:21:26 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use EV 1.86; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 4.32 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
18use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
23use Coro::BDB; 51use Coro::BDB 1.6;
24use Coro::Storable; 52use Coro::Storable;
25use Coro::Util (); 53use Coro::Util ();
26 54
27use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
28use BDB (); 56use BDB ();
29use Data::Dumper; 57use Data::Dumper;
30use Digest::MD5;
31use Fcntl; 58use Fcntl;
32use YAML::Syck (); 59use YAML::XS ();
33use IO::AIO 2.51 (); 60use IO::AIO ();
34use Time::HiRes; 61use Time::HiRes;
35use Compress::LZF; 62use Compress::LZF;
36use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
37 66
38# configure various modules to our taste 67# configure various modules to our taste
39# 68#
40$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43 77
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 78# strictly for debugging
45$YAML::Syck::ImplicitUnicode = 1; 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 80
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 82
51our %COMMAND = (); 83our %COMMAND = ();
52our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
55our %EXTCMD = (); 87our %EXTCMD = ();
56our %EXTICMD = (); 88our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
59 91
60our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
62 96
63our $CONFDIR = confdir; 97our $CONFDIR = confdir;
64our $DATADIR = datadir; 98our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
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 } else {
1308 warn "mandatory extension failed to load, exiting.\n"; 1442 $done{$k} = delete $todo{$k};
1309 exit 1; 1443 push @EXTS, $v->{pkg};
1310 } 1444 $progress = 1;
1311 1445
1312 warn $msg; 1446 warn "$v->{base}: extension inactive.\n"
1447 unless $active;
1313 } 1448 }
1314
1315 $done{$k} = delete $todo{$k};
1316 push @EXTS, $v->{pkg};
1317 $progress = 1;
1318 } 1449 }
1319 1450
1320 skip: 1451 unless ($progress) {
1321 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1322 unless $progress; 1453
1454 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory};
1457 }
1458 }
1323 } 1459 }
1324 }; 1460 };
1325} 1461}
1326 1462
1327############################################################################# 1463#############################################################################
1328 1464
1329=back 1465=back
1330 1466
1331=head2 CORE EXTENSIONS 1467=head2 CORE EXTENSIONS
1332 1468
1333Functions and methods that extend core crossfire objects. 1469Functions and methods that extend core deliantra objects.
1334 1470
1335=cut 1471=cut
1336 1472
1337package cf::player; 1473package cf::player;
1338 1474
1381 1517
1382sub exists($) { 1518sub exists($) {
1383 my ($login) = @_; 1519 my ($login) = @_;
1384 1520
1385 $cf::PLAYER{$login} 1521 $cf::PLAYER{$login}
1386 or cf::sync_job { !aio_stat path $login } 1522 or !aio_stat path $login
1387} 1523}
1388 1524
1389sub find($) { 1525sub find($) {
1390 return $cf::PLAYER{$_[0]} || do { 1526 return $cf::PLAYER{$_[0]} || do {
1391 my $login = $_[0]; 1527 my $login = $_[0];
1403 my $f = new_from_file cf::object::thawer path $login 1539 my $f = new_from_file cf::object::thawer path $login
1404 or return; 1540 or return;
1405 1541
1406 my $pl = cf::player::load_pl $f 1542 my $pl = cf::player::load_pl $f
1407 or return; 1543 or return;
1544
1408 local $cf::PLAYER_LOADING{$login} = $pl; 1545 local $cf::PLAYER_LOADING{$login} = $pl;
1409 $f->resolve_delayed_derefs; 1546 $f->resolve_delayed_derefs;
1410 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1411 } 1548 }
1412 } 1549 }
1413} 1550}
1414 1551
1552cf::player->attach (
1553 on_load => sub {
1554 my ($pl, $path) = @_;
1555
1556 # restore slots saved in save, below
1557 my $slots = delete $pl->{_slots};
1558
1559 $pl->ob->current_weapon ($slots->[0]);
1560 $pl->combat_ob ($slots->[1]);
1561 $pl->ranged_ob ($slots->[2]);
1562 },
1563);
1564
1415sub save($) { 1565sub save($) {
1416 my ($pl) = @_; 1566 my ($pl) = @_;
1417 1567
1418 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1419 1569
1422 1572
1423 return if $pl->{deny_save}; 1573 return if $pl->{deny_save};
1424 1574
1425 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1426 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1577
1578 cf::get_slot 0.01;
1579
1580 # save slots, to be restored later
1581 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1427 1582
1428 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1429 cf::cede_to_tick; 1584 cf::cede_to_tick;
1430} 1585}
1431 1586
1463 my ($pl) = @_; 1618 my ($pl) = @_;
1464 1619
1465 my $name = $pl->ob->name; 1620 my $name = $pl->ob->name;
1466 1621
1467 $pl->{deny_save} = 1; 1622 $pl->{deny_save} = 1;
1468 $pl->password ("*"); # this should lock out the player until we nuked the dir 1623 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1469 1624
1470 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1471 $pl->deactivate; 1626 $pl->deactivate;
1627 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1628 $pl->ob->check_score;
1472 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1629 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1473 $pl->ns->destroy if $pl->ns; 1630 $pl->ns->destroy if $pl->ns;
1474 1631
1475 my $path = playerdir $pl; 1632 my $path = playerdir $pl;
1476 my $temp = "$path~$cf::RUNTIME~deleting~"; 1633 my $temp = "$path~$cf::RUNTIME~deleting~";
1515 1672
1516 for my $login (@$dirs) { 1673 for my $login (@$dirs) {
1517 my $path = path $login; 1674 my $path = path $login;
1518 1675
1519 # a .pst is a dead give-away for a valid player 1676 # a .pst is a dead give-away for a valid player
1520 unless (-e "$path.pst") { 1677 # if no pst file found, open and chekc for blocked users
1678 if (aio_stat "$path.pst") {
1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1679 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1522 aio_read $fh, 0, 512, my $buf, 0 or next; 1680 aio_read $fh, 0, 512, my $buf, 0 or next;
1523 $buf !~ /^password -------------$/m or next; # official not-valid tag 1681 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 } 1682 }
1525 1683
1556 } 1714 }
1557 1715
1558 \@paths 1716 \@paths
1559} 1717}
1560 1718
1561=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1719=item $protocol_xml = $player->expand_cfpod ($cfpod)
1562 1720
1563Expand crossfire pod fragments into protocol xml. 1721Expand 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 1722
1654=item $player->ext_reply ($msgid, @msg) 1723=item $player->ext_reply ($msgid, @msg)
1655 1724
1656Sends an ext reply to the player. 1725Sends an ext reply to the player.
1657 1726
1724our $MAX_RESET = 3600; 1793our $MAX_RESET = 3600;
1725our $DEFAULT_RESET = 3000; 1794our $DEFAULT_RESET = 3000;
1726 1795
1727sub generate_random_map { 1796sub generate_random_map {
1728 my ($self, $rmp) = @_; 1797 my ($self, $rmp) = @_;
1798
1799 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1800
1729 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1802 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1735 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1736 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1855 1927
1856# the temporary/swap location 1928# the temporary/swap location
1857sub save_path { 1929sub save_path {
1858 my ($self) = @_; 1930 my ($self) = @_;
1859 1931
1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1861 "$TMPDIR/$path.map" 1933 "$TMPDIR/$path.map"
1862} 1934}
1863 1935
1864# the unique path, undef == no special unique path 1936# the unique path, undef == no special unique path
1865sub uniq_path { 1937sub uniq_path {
1866 my ($self) = @_; 1938 my ($self) = @_;
1867 1939
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1940 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1941 "$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} 1942}
1880 1943
1881sub decay_objects { 1944sub decay_objects {
1882 my ($self) = @_; 1945 my ($self) = @_;
1883 1946
1967sub find { 2030sub find {
1968 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1969 2032
1970 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1971 2034
1972 cf::lock_wait "map_data:$path";#d#remove 2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2036 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2037
1975 $cf::MAP{$path} || do { 2038 $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 2039 my $map = new_from_path cf::map $path
1980 or return; 2040 or return;
1981 2041
1982 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1983 2043
1985 or return; 2045 or return;
1986 2046
1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1988 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1989 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
1990 undef $guard1; 2051 undef $guard1;
1991 undef $guard2;
1992 $map->reset; 2052 $map->reset;
1993 return find $path; 2053 return find $path;
1994 } 2054 }
1995 2055
1996 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1997 } 2057 }
1998} 2058}
1999 2059
2000sub pre_load { } 2060sub pre_load { }
2001sub post_load { } 2061#sub post_load { } # XS
2002 2062
2003sub load { 2063sub load {
2004 my ($self) = @_; 2064 my ($self) = @_;
2005 2065
2006 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
2023 my $f = new_from_file cf::object::thawer $self->{load_path}; 2083 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block; 2084 $f->skip_block;
2025 $self->_load_objects ($f) 2085 $self->_load_objects ($f)
2026 or return; 2086 or return;
2027 2087
2028 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2088 $self->post_load_original
2029 if delete $self->{load_original}; 2089 if delete $self->{load_original};
2030 2090
2031 if (my $uniq = $self->uniq_path) { 2091 if (my $uniq = $self->uniq_path) {
2032 utf8::encode $uniq; 2092 utf8::encode $uniq;
2033 unless (aio_stat $uniq) { 2093 unless (aio_stat $uniq) {
2051 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2112 $self->decay_objects;
2053 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
2054 $self->update_buttons; 2114 $self->update_buttons;
2055 cf::cede_to_tick; 2115 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2116 $self->activate;
2059 } 2117 }
2060 2118
2061 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2063 2121
2064 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
2065 } 2123 }
2066 2124
2067 $self->post_load; 2125 $self->post_load;
2068} 2126}
2069 2127
2128# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath
2070sub customise_for { 2131sub customise_for {
2071 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
2072 2133
2073 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2135 if $self->per_player;
2127 my ($path, $origin, $load) = @_; 2188 my ($path, $origin, $load) = @_;
2128 2189
2129 $path = normalise $path, $origin && $origin->{path}; 2190 $path = normalise $path, $origin && $origin->{path};
2130 2191
2131 if (my $map = $cf::MAP{$path}) { 2192 if (my $map = $cf::MAP{$path}) {
2132 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2193 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2133 } 2194 }
2134 2195
2135 $MAP_PREFETCH{$path} |= $load; 2196 $MAP_PREFETCH{$path} |= $load;
2136 2197
2137 $MAP_PREFETCHER ||= cf::async { 2198 $MAP_PREFETCHER ||= cf::async {
2151 $MAP_PREFETCHER->prio (6); 2212 $MAP_PREFETCHER->prio (6);
2152 2213
2153 () 2214 ()
2154} 2215}
2155 2216
2217# common code, used by both ->save and ->swapout
2156sub save { 2218sub _save {
2157 my ($self) = @_; 2219 my ($self) = @_;
2158
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160 2220
2161 $self->{last_save} = $cf::RUNTIME; 2221 $self->{last_save} = $cf::RUNTIME;
2162 2222
2163 return unless $self->dirty; 2223 return unless $self->dirty;
2164 2224
2173 2233
2174 cf::async { 2234 cf::async {
2175 $Coro::current->{desc} = "map player save"; 2235 $Coro::current->{desc} = "map player save";
2176 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
2177 }; 2237 };
2238
2239 cf::get_slot 0.02;
2178 2240
2179 if ($uniq) { 2241 if ($uniq) {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2181 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2182 } else { 2244 } else {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2184 } 2246 }
2185} 2247}
2186 2248
2249sub save {
2250 my ($self) = @_;
2251
2252 my $lock = cf::lock_acquire "map_data:$self->{path}";
2253
2254 $self->_save;
2255}
2256
2187sub swap_out { 2257sub swap_out {
2188 my ($self) = @_; 2258 my ($self) = @_;
2189 2259
2190 # save first because save cedes
2191 $self->save;
2192
2193 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2194 2261
2262 return if $self->in_memory != cf::MAP_ACTIVE;
2263 return if $self->{deny_save};
2195 return if $self->players; 2264 return if $self->players;
2196 return if $self->in_memory != cf::MAP_IN_MEMORY;
2197 return if $self->{deny_save};
2198 2265
2199 $self->in_memory (cf::MAP_SWAPPED); 2266 # first deactivate the map and "unlink" it from the core
2200
2201 $self->deactivate; 2267 $self->deactivate;
2202 $_->clear_links_to ($self) for values %cf::MAP; 2268 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->in_memory (cf::MAP_SWAPPED);
2270
2271 # then atomically save
2272 $self->_save;
2273
2274 # then free the map
2203 $self->clear; 2275 $self->clear;
2204} 2276}
2205 2277
2206sub reset_at { 2278sub reset_at {
2207 my ($self) = @_; 2279 my ($self) = @_;
2226 2298
2227 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2299 my $lock = cf::lock_acquire "map_data:$self->{path}";
2228 2300
2229 return if $self->players; 2301 return if $self->players;
2230 2302
2231 warn "resetting map ", $self->path; 2303 warn "resetting map ", $self->path, "\n";
2232 2304
2233 $self->in_memory (cf::MAP_SWAPPED); 2305 $self->in_memory (cf::MAP_SWAPPED);
2234 2306
2235 # need to save uniques path 2307 # need to save uniques path
2236 unless ($self->{deny_save}) { 2308 unless ($self->{deny_save}) {
2319 2391
2320sub unique_maps() { 2392sub unique_maps() {
2321 [ 2393 [
2322 map { 2394 map {
2323 utf8::decode $_; 2395 utf8::decode $_;
2324 /\.map$/ 2396 s/\.map$//; # TODO future compatibility hack
2397 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2398 ? ()
2325 ? normalise $_ 2399 : normalise $_
2326 : ()
2327 } @{ aio_readdir $UNIQUEDIR or [] } 2400 } @{ aio_readdir $UNIQUEDIR or [] }
2328 ] 2401 ]
2329} 2402}
2330 2403
2331package cf; 2404=item cf::map::static_maps
2405
2406Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2407file in the shared directory excluding F</styles> and F</editor>). May
2408block.
2409
2410=cut
2411
2412sub static_maps() {
2413 my @dirs = "";
2414 my @maps;
2415
2416 while (@dirs) {
2417 my $dir = shift @dirs;
2418
2419 next if $dir eq "/styles" || $dir eq "/editor";
2420
2421 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2422 or return;
2423
2424 for (@$files) {
2425 s/\.map$// or next;
2426 utf8::decode $_;
2427 push @maps, "$dir/$_";
2428 }
2429
2430 push @dirs, map "$dir/$_", @$dirs;
2431 }
2432
2433 \@maps
2434}
2332 2435
2333=back 2436=back
2334 2437
2335=head3 cf::object 2438=head3 cf::object
2336 2439
2340 2443
2341=over 4 2444=over 4
2342 2445
2343=item $ob->inv_recursive 2446=item $ob->inv_recursive
2344 2447
2345Returns the inventory of the object _and_ their inventories, recursively. 2448Returns the inventory of the object I<and> their inventories, recursively,
2449but I<not> the object itself.
2346 2450
2347=cut 2451=cut
2348 2452
2349sub inv_recursive_; 2453sub inv_recursive_;
2350sub inv_recursive_ { 2454sub inv_recursive_ {
2355 inv_recursive_ inv $_[0] 2459 inv_recursive_ inv $_[0]
2356} 2460}
2357 2461
2358=item $ref = $ob->ref 2462=item $ref = $ob->ref
2359 2463
2360creates and returns a persistent reference to an objetc that can be stored as a string. 2464Creates and returns a persistent reference to an object that can be stored as a string.
2361 2465
2362=item $ob = cf::object::deref ($refstring) 2466=item $ob = cf::object::deref ($refstring)
2363 2467
2364returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2468returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2365even if the object actually exists. May block. 2469even if the object actually exists. May block.
2397can be C<undef>. Does the right thing when the player is currently in a 2501can be C<undef>. Does the right thing when the player is currently in a
2398dialogue with the given NPC character. 2502dialogue with the given NPC character.
2399 2503
2400=cut 2504=cut
2401 2505
2506our $SAY_CHANNEL = {
2507 id => "say",
2508 title => "Map",
2509 reply => "say ",
2510 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2511};
2512
2513our $CHAT_CHANNEL = {
2514 id => "chat",
2515 title => "Chat",
2516 reply => "chat ",
2517 tooltip => "Player chat and shouts, global to the server.",
2518};
2519
2402# rough implementation of a future "reply" method that works 2520# rough implementation of a future "reply" method that works
2403# with dialog boxes. 2521# with dialog boxes.
2404#TODO: the first argument must go, split into a $npc->reply_to ( method 2522#TODO: the first argument must go, split into a $npc->reply_to ( method
2405sub cf::object::player::reply($$$;$) { 2523sub cf::object::player::reply($$$;$) {
2406 my ($self, $npc, $msg, $flags) = @_; 2524 my ($self, $npc, $msg, $flags) = @_;
2417 my $dialog = $pl->{npc_dialog}; 2535 my $dialog = $pl->{npc_dialog};
2418 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2536 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2419 2537
2420 } else { 2538 } else {
2421 $msg = $npc->name . " says: $msg" if $npc; 2539 $msg = $npc->name . " says: $msg" if $npc;
2422 $self->message ($msg, $flags); 2540 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2423 } 2541 }
2424 } 2542 }
2425} 2543}
2426 2544
2427=item $object->send_msg ($channel, $msg, $color, [extra...]) 2545=item $object->send_msg ($channel, $msg, $color, [extra...])
2452 2570
2453=item $player_object->enter_link 2571=item $player_object->enter_link
2454 2572
2455Freezes the player and moves him/her to a special map (C<{link}>). 2573Freezes the player and moves him/her to a special map (C<{link}>).
2456 2574
2457The player should be reasonably safe there for short amounts of time. You 2575The player should be reasonably safe there for short amounts of time (e.g.
2458I<MUST> call C<leave_link> as soon as possible, though. 2576for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2577though, as the palyer cannot control the character while it is on the link
2578map.
2459 2579
2460Will never block. 2580Will never block.
2461 2581
2462=item $player_object->leave_link ($map, $x, $y) 2582=item $player_object->leave_link ($map, $x, $y)
2463 2583
2515 ($x, $y) = (-1, -1) 2635 ($x, $y) = (-1, -1)
2516 unless (defined $x) && (defined $y); 2636 unless (defined $x) && (defined $y);
2517 2637
2518 # use -1 or undef as default coordinates, not 0, 0 2638 # use -1 or undef as default coordinates, not 0, 0
2519 ($x, $y) = ($map->enter_x, $map->enter_y) 2639 ($x, $y) = ($map->enter_x, $map->enter_y)
2520 if $x <=0 && $y <= 0; 2640 if $x <= 0 && $y <= 0;
2521 2641
2522 $map->load; 2642 $map->load;
2523 $map->load_neighbours; 2643 $map->load_neighbours;
2524 2644
2525 return unless $self->contr->active; 2645 return unless $self->contr->active;
2526 $self->activate_recursive;
2527 2646
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2647 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2648 $self->enter_map ($map, $x, $y);
2649
2650 # only activate afterwards, to support waiting in hooks
2651 $self->activate_recursive;
2530} 2652}
2531 2653
2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2654=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2533 2655
2534Moves the player to the given map-path and coordinates by first freezing 2656Moves the player to the given map-path and coordinates by first freezing
2535her, loading and preparing them map, calling the provided $check callback 2657her, loading and preparing them map, calling the provided $check callback
2536that has to return the map if sucecssful, and then unfreezes the player on 2658that has to return the map if sucecssful, and then unfreezes the player on
2537the new (success) or old (failed) map position. In either case, $done will 2659the new (success) or old (failed) map position. In either case, $done will
2538be called at the end of this process. 2660be called at the end of this process.
2661
2662Note that $check will be called with a potentially non-loaded map, so if
2663it needs a loaded map it has to call C<< ->load >>.
2539 2664
2540=cut 2665=cut
2541 2666
2542our $GOTOGEN; 2667our $GOTOGEN;
2543 2668
2622} 2747}
2623 2748
2624sub prepare_random_map { 2749sub prepare_random_map {
2625 my ($exit) = @_; 2750 my ($exit) = @_;
2626 2751
2627 my $guard = cf::lock_acquire "exit_prepare:$exit";
2628
2629 # all this does is basically replace the /! path by 2752 # all this does is basically replace the /! path by
2630 # a new random map path (?random/...) with a seed 2753 # a new random map path (?random/...) with a seed
2631 # that depends on the exit object 2754 # that depends on the exit object
2632 2755
2633 my $rmp = parse_random_map_params $exit->msg; 2756 my $rmp = parse_random_map_params $exit->msg;
2635 if ($exit->map) { 2758 if ($exit->map) {
2636 $rmp->{region} = $exit->region->name; 2759 $rmp->{region} = $exit->region->name;
2637 $rmp->{origin_map} = $exit->map->path; 2760 $rmp->{origin_map} = $exit->map->path;
2638 $rmp->{origin_x} = $exit->x; 2761 $rmp->{origin_x} = $exit->x;
2639 $rmp->{origin_y} = $exit->y; 2762 $rmp->{origin_y} = $exit->y;
2763
2764 $exit->map->touch;
2640 } 2765 }
2641 2766
2642 $rmp->{random_seed} ||= $exit->random_seed; 2767 $rmp->{random_seed} ||= $exit->random_seed;
2643 2768
2644 my $data = cf::encode_json $rmp; 2769 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2645 my $md5 = Digest::MD5::md5_hex $data; 2770 my $md5 = Digest::MD5::md5_hex $data;
2646 my $meta = "$RANDOMDIR/$md5.meta"; 2771 my $meta = "$RANDOMDIR/$md5.meta";
2647 2772
2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2773 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2649 aio_write $fh, 0, (length $data), $data, 0; 2774 aio_write $fh, 0, (length $data), $data, 0;
2650 undef $fh; 2775 undef $fh;
2651 aio_rename "$meta~", $meta; 2776 aio_rename "$meta~", $meta;
2652 2777
2778 my $slaying = "?random/$md5";
2779
2780 if ($exit->valid) {
2653 $exit->slaying ("?random/$md5"); 2781 $exit->slaying ("?random/$md5");
2654 $exit->msg (undef); 2782 $exit->msg (undef);
2783 }
2655 } 2784 }
2656} 2785}
2657 2786
2658sub cf::object::player::enter_exit { 2787sub cf::object::player::enter_exit {
2659 my ($self, $exit) = @_; 2788 my ($self, $exit) = @_;
2660 2789
2661 return unless $self->type == cf::PLAYER; 2790 return unless $self->type == cf::PLAYER;
2662 2791
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; 2792 $self->enter_link;
2675 2793
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 { 2794 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2795 $Coro::current->{desc} = "enter_exit";
2682 2796
2683 $self->deactivate_recursive; # just to be sure
2684 unless (eval { 2797 unless (eval {
2798 $self->deactivate_recursive; # just to be sure
2799
2800 # random map handling
2801 {
2802 my $guard = cf::lock_acquire "exit_prepare:$exit";
2803
2804 prepare_random_map $exit
2805 if $exit->slaying eq "/!";
2806 }
2807
2808 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2809 my $x = $exit->stats->hp;
2810 my $y = $exit->stats->sp;
2811
2685 $self->goto ($slaying, $hp, $sp); 2812 $self->goto ($map, $x, $y);
2686 2813
2814 # if exit is damned, update players death & WoR home-position
2815 $self->contr->savebed ($map, $x, $y)
2816 if $exit->flag (cf::FLAG_DAMNED);
2817
2687 1; 2818 1
2688 }) { 2819 }) {
2689 $self->message ("Something went wrong deep within the crossfire server. " 2820 $self->message ("Something went wrong deep within the deliantra server. "
2690 . "I'll try to bring you back to the map you were before. " 2821 . "I'll try to bring you back to the map you were before. "
2691 . "Please report this to the dungeon master!", 2822 . "Please report this to the dungeon master!",
2692 cf::NDI_UNIQUE | cf::NDI_RED); 2823 cf::NDI_UNIQUE | cf::NDI_RED);
2693 2824
2694 warn "ERROR in enter_exit: $@"; 2825 warn "ERROR in enter_exit: $@";
2711sub cf::client::send_drawinfo { 2842sub cf::client::send_drawinfo {
2712 my ($self, $text, $flags) = @_; 2843 my ($self, $text, $flags) = @_;
2713 2844
2714 utf8::encode $text; 2845 utf8::encode $text;
2715 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2846 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2847}
2848
2849=item $client->send_big_packet ($pkt)
2850
2851Like C<send_packet>, but tries to compress large packets, and fragments
2852them as required.
2853
2854=cut
2855
2856our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2857
2858sub cf::client::send_big_packet {
2859 my ($self, $pkt) = @_;
2860
2861 # try lzf for large packets
2862 $pkt = "lzf " . Compress::LZF::compress $pkt
2863 if 1024 <= length $pkt and $self->{can_lzf};
2864
2865 # split very large packets
2866 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2867 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2868 $pkt = "frag";
2869 }
2870
2871 $self->send_packet ($pkt);
2716} 2872}
2717 2873
2718=item $client->send_msg ($channel, $msg, $color, [extra...]) 2874=item $client->send_msg ($channel, $msg, $color, [extra...])
2719 2875
2720Send a drawinfo or msg packet to the client, formatting the msg for the 2876Send a drawinfo or msg packet to the client, formatting the msg for the
2724 2880
2725=cut 2881=cut
2726 2882
2727# non-persistent channels (usually the info channel) 2883# non-persistent channels (usually the info channel)
2728our %CHANNEL = ( 2884our %CHANNEL = (
2885 "c/motd" => {
2886 id => "infobox",
2887 title => "MOTD",
2888 reply => undef,
2889 tooltip => "The message of the day",
2890 },
2729 "c/identify" => { 2891 "c/identify" => {
2730 id => "infobox", 2892 id => "infobox",
2731 title => "Identify", 2893 title => "Identify",
2732 reply => undef, 2894 reply => undef,
2733 tooltip => "Items recently identified", 2895 tooltip => "Items recently identified",
2735 "c/examine" => { 2897 "c/examine" => {
2736 id => "infobox", 2898 id => "infobox",
2737 title => "Examine", 2899 title => "Examine",
2738 reply => undef, 2900 reply => undef,
2739 tooltip => "Signs and other items you examined", 2901 tooltip => "Signs and other items you examined",
2902 },
2903 "c/shopinfo" => {
2904 id => "infobox",
2905 title => "Shop Info",
2906 reply => undef,
2907 tooltip => "What your bargaining skill tells you about the shop",
2740 }, 2908 },
2741 "c/book" => { 2909 "c/book" => {
2742 id => "infobox", 2910 id => "infobox",
2743 title => "Book", 2911 title => "Book",
2744 reply => undef, 2912 reply => undef,
2760 id => "infobox", 2928 id => "infobox",
2761 title => "Body Parts", 2929 title => "Body Parts",
2762 reply => undef, 2930 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available", 2931 tooltip => "Shows which body parts you posess and are available",
2764 }, 2932 },
2933 "c/statistics" => {
2934 id => "infobox",
2935 title => "Statistics",
2936 reply => undef,
2937 tooltip => "Shows your primary statistics",
2938 },
2939 "c/skills" => {
2940 id => "infobox",
2941 title => "Skills",
2942 reply => undef,
2943 tooltip => "Shows your experience per skill and item power",
2944 },
2945 "c/shopitems" => {
2946 id => "infobox",
2947 title => "Shop Items",
2948 reply => undef,
2949 tooltip => "Shows the items currently for sale in this shop",
2950 },
2951 "c/resistances" => {
2952 id => "infobox",
2953 title => "Resistances",
2954 reply => undef,
2955 tooltip => "Shows your resistances",
2956 },
2957 "c/pets" => {
2958 id => "infobox",
2959 title => "Pets",
2960 reply => undef,
2961 tooltip => "Shows information abotu your pets/a specific pet",
2962 },
2963 "c/perceiveself" => {
2964 id => "infobox",
2965 title => "Perceive Self",
2966 reply => undef,
2967 tooltip => "You gained detailed knowledge about yourself",
2968 },
2765 "c/uptime" => { 2969 "c/uptime" => {
2766 id => "infobox", 2970 id => "infobox",
2767 title => "Uptime", 2971 title => "Uptime",
2768 reply => undef, 2972 reply => undef,
2769 tooltip => "How long the server has been running since last restart", 2973 tooltip => "How long the server has been running since last restart",
2772 id => "infobox", 2976 id => "infobox",
2773 title => "Map Info", 2977 title => "Map Info",
2774 reply => undef, 2978 reply => undef,
2775 tooltip => "Information related to the maps", 2979 tooltip => "Information related to the maps",
2776 }, 2980 },
2981 "c/party" => {
2982 id => "party",
2983 title => "Party",
2984 reply => "gsay ",
2985 tooltip => "Messages and chat related to your party",
2986 },
2987 "c/death" => {
2988 id => "death",
2989 title => "Death",
2990 reply => undef,
2991 tooltip => "Reason for and more info about your most recent death",
2992 },
2993 "c/say" => $SAY_CHANNEL,
2994 "c/chat" => $CHAT_CHANNEL,
2777); 2995);
2778 2996
2779sub cf::client::send_msg { 2997sub cf::client::send_msg {
2780 my ($self, $channel, $msg, $color, @extra) = @_; 2998 my ($self, $channel, $msg, $color, @extra) = @_;
2781 2999
2782 $msg = $self->pl->expand_cfpod ($msg); 3000 $msg = $self->pl->expand_cfpod ($msg)
3001 unless $color & cf::NDI_VERBATIM;
2783 3002
2784 $color &= cf::NDI_CLIENT_MASK; # just in case... 3003 $color &= cf::NDI_CLIENT_MASK; # just in case...
2785 3004
2786 # check predefined channels, for the benefit of C 3005 # check predefined channels, for the benefit of C
2787 if ($CHANNEL{$channel}) { 3006 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel}; 3007 $channel = $CHANNEL{$channel};
2789 3008
2790 $self->ext_msg (channel_info => $channel) 3009 $self->ext_msg (channel_info => $channel);
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id}; 3010 $channel = $channel->{id};
2794 3011
2795 } elsif (ref $channel) { 3012 } elsif (ref $channel) {
2796 # send meta info to client, if not yet sent 3013 # send meta info to client, if not yet sent
2797 unless (exists $self->{channel}{$channel->{id}}) { 3014 unless (exists $self->{channel}{$channel->{id}}) {
2798 $self->{channel}{$channel->{id}} = $channel; 3015 $self->{channel}{$channel->{id}} = $channel;
2799 $self->ext_msg (channel_info => $channel) 3016 $self->ext_msg (channel_info => $channel);
2800 if $self->can_msg;
2801 } 3017 }
2802 3018
2803 $channel = $channel->{id}; 3019 $channel = $channel->{id};
2804 } 3020 }
2805 3021
2806 return unless @extra || length $msg; 3022 return unless @extra || length $msg;
2807 3023
2808 if ($self->can_msg) {
2809 # default colour, mask it out 3024 # default colour, mask it out
2810 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3025 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2811 if $color & cf::NDI_DEF; 3026 if $color & cf::NDI_DEF;
2812 3027
2813 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3028 my $pkt = "msg "
3029 . $self->{json_coder}->encode (
2814 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3030 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2815 } else { 3031 );
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 3032
2827 $color &= cf::NDI_COLOR_MASK; 3033 $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} 3034}
2841 3035
2842=item $client->ext_msg ($type, @msg) 3036=item $client->ext_msg ($type, @msg)
2843 3037
2844Sends an ext event to the client. 3038Sends an ext event to the client.
2847 3041
2848sub cf::client::ext_msg($$@) { 3042sub cf::client::ext_msg($$@) {
2849 my ($self, $type, @msg) = @_; 3043 my ($self, $type, @msg) = @_;
2850 3044
2851 if ($self->extcmd == 2) { 3045 if ($self->extcmd == 2) {
2852 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3046 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2853 } elsif ($self->extcmd == 1) { # TODO: remove 3047 } elsif ($self->extcmd == 1) { # TODO: remove
2854 push @msg, msgtype => "event_$type"; 3048 push @msg, msgtype => "event_$type";
2855 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3049 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2856 } 3050 }
2857} 3051}
2858 3052
2859=item $client->ext_reply ($msgid, @msg) 3053=item $client->ext_reply ($msgid, @msg)
2860 3054
2864 3058
2865sub cf::client::ext_reply($$@) { 3059sub cf::client::ext_reply($$@) {
2866 my ($self, $id, @msg) = @_; 3060 my ($self, $id, @msg) = @_;
2867 3061
2868 if ($self->extcmd == 2) { 3062 if ($self->extcmd == 2) {
2869 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3063 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2870 } elsif ($self->extcmd == 1) { 3064 } elsif ($self->extcmd == 1) {
2871 #TODO: version 1, remove 3065 #TODO: version 1, remove
2872 unshift @msg, msgtype => "reply", msgid => $id; 3066 unshift @msg, msgtype => "reply", msgid => $id;
2873 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3067 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2874 } 3068 }
2875} 3069}
2876 3070
2877=item $success = $client->query ($flags, "text", \&cb) 3071=item $success = $client->query ($flags, "text", \&cb)
2878 3072
2979 3173
2980 $coro 3174 $coro
2981} 3175}
2982 3176
2983cf::client->attach ( 3177cf::client->attach (
2984 on_destroy => sub { 3178 on_client_destroy => sub {
2985 my ($ns) = @_; 3179 my ($ns) = @_;
2986 3180
2987 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3181 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2988 }, 3182 },
2989); 3183);
3005our $safe_hole = new Safe::Hole; 3199our $safe_hole = new Safe::Hole;
3006 3200
3007$SIG{FPE} = 'IGNORE'; 3201$SIG{FPE} = 'IGNORE';
3008 3202
3009$safe->permit_only (Opcode::opset qw( 3203$safe->permit_only (Opcode::opset qw(
3010 :base_core :base_mem :base_orig :base_math 3204 :base_core :base_mem :base_orig :base_math :base_loop
3011 grepstart grepwhile mapstart mapwhile 3205 grepstart grepwhile mapstart mapwhile
3012 sort time 3206 sort time
3013)); 3207));
3014 3208
3015# here we export the classes and methods available to script code 3209# here we export the classes and methods available to script code
3018 3212
3019The following functions and methods are available within a safe environment: 3213The following functions and methods are available within a safe environment:
3020 3214
3021 cf::object 3215 cf::object
3022 contr pay_amount pay_player map x y force_find force_add destroy 3216 contr pay_amount pay_player map x y force_find force_add destroy
3023 insert remove name archname title slaying race decrease_ob_nr 3217 insert remove name archname title slaying race decrease split
3218 value
3024 3219
3025 cf::object::player 3220 cf::object::player
3026 player 3221 player
3027 3222
3028 cf::player 3223 cf::player
3033 3228
3034=cut 3229=cut
3035 3230
3036for ( 3231for (
3037 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3232 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3038 insert remove inv name archname title slaying race 3233 insert remove inv nrof name archname title slaying race
3039 decrease_ob_nr destroy)], 3234 decrease split destroy change_exp value msg lore send_msg)],
3040 ["cf::object::player" => qw(player)], 3235 ["cf::object::player" => qw(player)],
3041 ["cf::player" => qw(peaceful)], 3236 ["cf::player" => qw(peaceful send_msg)],
3042 ["cf::map" => qw(trigger)], 3237 ["cf::map" => qw(trigger)],
3043) { 3238) {
3044 no strict 'refs'; 3239 no strict 'refs';
3045 my ($pkg, @funs) = @$_; 3240 my ($pkg, @funs) = @$_;
3046 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3241 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3064 3259
3065 my $qcode = $code; 3260 my $qcode = $code;
3066 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3261 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3067 $qcode =~ s/\n/\\n/g; 3262 $qcode =~ s/\n/\\n/g;
3068 3263
3264 %vars = (_dummy => 0) unless %vars;
3265
3266 my @res;
3069 local $_; 3267 local $_;
3070 local @safe::cf::_safe_eval_args = values %vars;
3071 3268
3072 my $eval = 3269 my $eval =
3073 "do {\n" 3270 "do {\n"
3074 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3271 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3075 . "#line 0 \"{$qcode}\"\n" 3272 . "#line 0 \"{$qcode}\"\n"
3076 . $code 3273 . $code
3077 . "\n}" 3274 . "\n}"
3078 ; 3275 ;
3079 3276
3277 if ($CFG{safe_eval}) {
3080 sub_generation_inc; 3278 sub_generation_inc;
3279 local @safe::cf::_safe_eval_args = values %vars;
3081 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3280 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3082 sub_generation_inc; 3281 sub_generation_inc;
3282 } else {
3283 local @cf::_safe_eval_args = values %vars;
3284 @res = wantarray ? eval eval : scalar eval $eval;
3285 }
3083 3286
3084 if ($@) { 3287 if ($@) {
3085 warn "$@"; 3288 warn "$@";
3086 warn "while executing safe code '$code'\n"; 3289 warn "while executing safe code '$code'\n";
3087 warn "with arguments " . (join " ", %vars) . "\n"; 3290 warn "with arguments " . (join " ", %vars) . "\n";
3106=cut 3309=cut
3107 3310
3108sub register_script_function { 3311sub register_script_function {
3109 my ($fun, $cb) = @_; 3312 my ($fun, $cb) = @_;
3110 3313
3111 no strict 'refs'; 3314 $fun = "safe::$fun" if $CFG{safe_eval};
3112 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3315 *$fun = $safe_hole->wrap ($cb);
3113} 3316}
3114 3317
3115=back 3318=back
3116 3319
3117=cut 3320=cut
3138 3341
3139 $facedata->{version} == 2 3342 $facedata->{version} == 2
3140 or cf::cleanup "$path: version mismatch, cannot proceed."; 3343 or cf::cleanup "$path: version mismatch, cannot proceed.";
3141 3344
3142 # patch in the exptable 3345 # patch in the exptable
3346 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3143 $facedata->{resource}{"res/exp_table"} = { 3347 $facedata->{resource}{"res/exp_table"} = {
3144 type => FT_RSRC, 3348 type => FT_RSRC,
3145 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3349 data => $exp_table,
3350 hash => (Digest::MD5::md5 $exp_table),
3146 }; 3351 };
3147 cf::cede_to_tick; 3352 cf::cede_to_tick;
3148 3353
3149 { 3354 {
3150 my $faces = $facedata->{faceinfo}; 3355 my $faces = $facedata->{faceinfo};
3151 3356
3152 while (my ($face, $info) = each %$faces) { 3357 while (my ($face, $info) = each %$faces) {
3153 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3358 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3359
3154 cf::face::set_visibility $idx, $info->{visibility}; 3360 cf::face::set_visibility $idx, $info->{visibility};
3155 cf::face::set_magicmap $idx, $info->{magicmap}; 3361 cf::face::set_magicmap $idx, $info->{magicmap};
3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3362 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3157 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3363 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3158 3364
3159 cf::cede_to_tick; 3365 cf::cede_to_tick;
3160 } 3366 }
3161 3367
3162 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3163 next unless $info->{smooth}; 3369 next unless $info->{smooth};
3370
3164 my $idx = cf::face::find $face 3371 my $idx = cf::face::find $face
3165 or next; 3372 or next;
3373
3166 if (my $smooth = cf::face::find $info->{smooth}) { 3374 if (my $smooth = cf::face::find $info->{smooth}) {
3167 cf::face::set_smooth $idx, $smooth; 3375 cf::face::set_smooth $idx, $smooth;
3168 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3376 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3169 } else { 3377 } else {
3170 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3378 warn "smooth face '$info->{smooth}' not found for face '$face'";
3184 3392
3185 cf::anim::invalidate_all; # d'oh 3393 cf::anim::invalidate_all; # d'oh
3186 } 3394 }
3187 3395
3188 { 3396 {
3189 # TODO: for gcfclient pleasure, we should give resources
3190 # that gcfclient doesn't grok a >10000 face index.
3191 my $res = $facedata->{resource}; 3397 my $res = $facedata->{resource};
3192 3398
3193 my $soundconf = delete $res->{"res/sound.conf"};
3194
3195 while (my ($name, $info) = each %$res) { 3399 while (my ($name, $info) = each %$res) {
3400 if (defined $info->{type}) {
3196 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3401 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197 my $data;
3198 3402
3199 if ($info->{type} & 1) { 3403 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3200 # prepend meta info 3404 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 { 3405 } else {
3209 $data = $info->{data}; 3406 $RESOURCE{$name} = $info;
3210 } 3407 }
3211 3408
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; 3409 cf::cede_to_tick;
3216 } 3410 }
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 } 3411 }
3412
3413 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3236 3414
3237 1 3415 1
3238} 3416}
3417
3418cf::global->attach (on_resource_update => sub {
3419 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3420 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3421
3422 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3423 my $sound = $soundconf->{compat}[$_]
3424 or next;
3425
3426 my $face = cf::face::find "sound/$sound->[1]";
3427 cf::sound::set $sound->[0] => $face;
3428 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3429 }
3430
3431 while (my ($k, $v) = each %{$soundconf->{event}}) {
3432 my $face = cf::face::find "sound/$v";
3433 cf::sound::set $k => $face;
3434 }
3435 }
3436});
3239 3437
3240register_exticmd fx_want => sub { 3438register_exticmd fx_want => sub {
3241 my ($ns, $want) = @_; 3439 my ($ns, $want) = @_;
3242 3440
3243 while (my ($k, $v) = each %$want) { 3441 while (my ($k, $v) = each %$want) {
3244 $ns->fx_want ($k, $v); 3442 $ns->fx_want ($k, $v);
3245 } 3443 }
3246}; 3444};
3445
3446sub load_resource_file($) {
3447 my $guard = lock_acquire "load_resource_file";
3448
3449 my $status = load_resource_file_ $_[0];
3450 get_slot 0.1, 100;
3451 cf::arch::commit_load;
3452
3453 $status
3454}
3247 3455
3248sub reload_regions { 3456sub reload_regions {
3249 # HACK to clear player env face cache, we need some signal framework 3457 # HACK to clear player env face cache, we need some signal framework
3250 # for this (global event?) 3458 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = (); 3459 %ext::player_env::MUSIC_FACE_CACHE = ();
3265} 3473}
3266 3474
3267sub reload_archetypes { 3475sub reload_archetypes {
3268 load_resource_file "$DATADIR/archetypes" 3476 load_resource_file "$DATADIR/archetypes"
3269 or die "unable to load archetypes\n"; 3477 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} 3478}
3276 3479
3277sub reload_treasures { 3480sub reload_treasures {
3278 load_resource_file "$DATADIR/treasures" 3481 load_resource_file "$DATADIR/treasures"
3279 or die "unable to load treasurelists\n"; 3482 or die "unable to load treasurelists\n";
3280} 3483}
3281 3484
3282sub reload_resources { 3485sub reload_resources {
3283 warn "reloading resource files...\n"; 3486 warn "reloading resource files...\n";
3284 3487
3488 reload_facedata;
3489 reload_archetypes;
3285 reload_regions; 3490 reload_regions;
3286 reload_facedata;
3287 #reload_archetypes;#d#
3288 reload_archetypes;
3289 reload_treasures; 3491 reload_treasures;
3290 3492
3291 warn "finished reloading resource files\n"; 3493 warn "finished reloading resource files\n";
3292} 3494}
3293 3495
3294sub init {
3295 reload_resources;
3296}
3297
3298sub reload_config { 3496sub reload_config {
3497 warn "reloading config file...\n";
3498
3299 open my $fh, "<:utf8", "$CONFDIR/config" 3499 open my $fh, "<:utf8", "$CONFDIR/config"
3300 or return; 3500 or return;
3301 3501
3302 local $/; 3502 local $/;
3303 *CFG = YAML::Syck::Load <$fh>; 3503 *CFG = YAML::XS::Load scalar <$fh>;
3304 3504
3305 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3505 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3306 3506
3307 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3507 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3308 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3508 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3312 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3512 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3313 and die "WARNING: m(un)lockall failed: $!\n"; 3513 and die "WARNING: m(un)lockall failed: $!\n";
3314 }; 3514 };
3315 warn $@ if $@; 3515 warn $@ if $@;
3316 } 3516 }
3517
3518 warn "finished reloading resource files\n";
3519}
3520
3521sub pidfile() {
3522 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3523 or die "$PIDFILE: $!";
3524 flock $fh, &Fcntl::LOCK_EX
3525 or die "$PIDFILE: flock: $!";
3526 $fh
3527}
3528
3529# make sure only one server instance is running at any one time
3530sub atomic {
3531 my $fh = pidfile;
3532
3533 my $pid = <$fh>;
3534 kill 9, $pid if $pid > 0;
3535
3536 seek $fh, 0, 0;
3537 print $fh $$;
3538}
3539
3540sub main_loop {
3541 warn "EV::loop starting\n";
3542 if (1) {
3543 EV::loop;
3544 }
3545 warn "EV::loop returned\n";
3546 goto &main_loop unless $REALLY_UNLOOP;
3317} 3547}
3318 3548
3319sub main { 3549sub main {
3550 cf::init_globals; # initialise logging
3551
3552 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3553 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3554 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3555 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3556
3557 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3558
3320 # we must not ever block the main coroutine 3559 # we must not ever block the main coroutine
3321 local $Coro::idle = sub { 3560 local $Coro::idle = sub {
3322 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3561 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3323 (async { 3562 (async {
3324 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3563 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT; 3564 EV::loop EV::LOOP_ONESHOT;
3326 })->prio (Coro::PRIO_MAX); 3565 })->prio (Coro::PRIO_MAX);
3327 }; 3566 };
3328 3567
3568 evthread_start IO::AIO::poll_fileno;
3569
3570 cf::sync_job {
3571 cf::init_experience;
3572 cf::init_anim;
3573 cf::init_attackmess;
3574 cf::init_dynamic;
3575
3576 cf::load_settings;
3577 cf::load_materials;
3578
3579 reload_resources;
3329 reload_config; 3580 reload_config;
3330 db_init; 3581 db_init;
3582
3583 cf::init_uuid;
3584 cf::init_signals;
3585 cf::init_skills;
3586
3587 cf::init_beforeplay;
3588
3589 atomic;
3590
3331 load_extensions; 3591 load_extensions;
3332 3592
3333 $TICK_WATCHER->start; 3593 utime time, time, $RUNTIMEFILE;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3594
3335 EV::loop; 3595 # no (long-running) fork's whatsoever before this point(!)
3596 use POSIX ();
3597 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3598
3599 (pop @POST_INIT)->(0) while @POST_INIT;
3600 };
3601
3602 cf::object::thawer::errors_are_fatal 0;
3603 warn "parse errors in files are no longer fatal from this point on.\n";
3604
3605 main_loop;
3336} 3606}
3337 3607
3338############################################################################# 3608#############################################################################
3339# initialisation and cleanup 3609# initialisation and cleanup
3340 3610
3341# install some emergency cleanup handlers 3611# install some emergency cleanup handlers
3342BEGIN { 3612BEGIN {
3343 our %SIGWATCHER = (); 3613 our %SIGWATCHER = ();
3344 for my $signal (qw(INT HUP TERM)) { 3614 for my $signal (qw(INT HUP TERM)) {
3345 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3615 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3346 cf::cleanup "SIG$signal"; 3616 cf::cleanup "SIG$signal";
3347 }; 3617 };
3348 } 3618 }
3349} 3619}
3350 3620
3351sub write_runtime { 3621sub write_runtime_sync {
3352 my $runtime = "$LOCALDIR/runtime"; 3622 my $t0 = AE::time;
3353 3623
3354 # first touch the runtime file to show we are still running: 3624 # first touch the runtime file to show we are still running:
3355 # the fsync below can take a very very long time. 3625 # the fsync below can take a very very long time.
3356 3626
3357 IO::AIO::aio_utime $runtime, undef, undef; 3627 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3358 3628
3359 my $guard = cf::lock_acquire "write_runtime"; 3629 my $guard = cf::lock_acquire "write_runtime";
3360 3630
3361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3631 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3362 or return; 3632 or return;
3363 3633
3364 my $value = $cf::RUNTIME + 90 + 10; 3634 my $value = $cf::RUNTIME + 90 + 10;
3365 # 10 is the runtime save interval, for a monotonic clock 3635 # 10 is the runtime save interval, for a monotonic clock
3366 # 60 allows for the watchdog to kill the server. 3636 # 60 allows for the watchdog to kill the server.
3376 aio_utime $fh, undef, undef; 3646 aio_utime $fh, undef, undef;
3377 3647
3378 close $fh 3648 close $fh
3379 or return; 3649 or return;
3380 3650
3381 aio_rename "$runtime~", $runtime 3651 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3382 and return; 3652 and return;
3383 3653
3384 warn "runtime file written.\n"; 3654 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3385 3655
3386 1 3656 1
3657}
3658
3659our $uuid_lock;
3660our $uuid_skip;
3661
3662sub write_uuid_sync($) {
3663 $uuid_skip ||= $_[0];
3664
3665 return if $uuid_lock;
3666 local $uuid_lock = 1;
3667
3668 my $uuid = "$LOCALDIR/uuid";
3669
3670 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3671 or return;
3672
3673 my $value = uuid_seq uuid_cur;
3674
3675 unless ($value) {
3676 warn "cowardly refusing to write zero uuid value!\n";
3677 return;
3678 }
3679
3680 my $value = uuid_str $value + $uuid_skip;
3681 $uuid_skip = 0;
3682
3683 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3684 and return;
3685
3686 # always fsync - this file is important
3687 aio_fsync $fh
3688 and return;
3689
3690 close $fh
3691 or return;
3692
3693 aio_rename "$uuid~", $uuid
3694 and return;
3695
3696 warn "uuid file written ($value).\n";
3697
3698 1
3699
3700}
3701
3702sub write_uuid($$) {
3703 my ($skip, $sync) = @_;
3704
3705 $sync ? write_uuid_sync $skip
3706 : async { write_uuid_sync $skip };
3387} 3707}
3388 3708
3389sub emergency_save() { 3709sub emergency_save() {
3390 my $freeze_guard = cf::freeze_mainloop; 3710 my $freeze_guard = cf::freeze_mainloop;
3391 3711
3392 warn "enter emergency perl save\n"; 3712 warn "emergency_perl_save: enter\n";
3393 3713
3394 cf::sync_job { 3714 cf::sync_job {
3715 # this is a trade-off: we want to be very quick here, so
3716 # save all maps without fsync, and later call a global sync
3717 # (which in turn might be very very slow)
3718 local $USE_FSYNC = 0;
3719
3395 # use a peculiar iteration method to avoid tripping on perl 3720 # use a peculiar iteration method to avoid tripping on perl
3396 # refcount bugs in for. also avoids problems with players 3721 # refcount bugs in for. also avoids problems with players
3397 # and maps saved/destroyed asynchronously. 3722 # and maps saved/destroyed asynchronously.
3398 warn "begin emergency player save\n"; 3723 warn "emergency_perl_save: begin player save\n";
3399 for my $login (keys %cf::PLAYER) { 3724 for my $login (keys %cf::PLAYER) {
3400 my $pl = $cf::PLAYER{$login} or next; 3725 my $pl = $cf::PLAYER{$login} or next;
3401 $pl->valid or next; 3726 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3727 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3403 $pl->save; 3728 $pl->save;
3404 } 3729 }
3405 warn "end emergency player save\n"; 3730 warn "emergency_perl_save: end player save\n";
3406 3731
3407 warn "begin emergency map save\n"; 3732 warn "emergency_perl_save: begin map save\n";
3408 for my $path (keys %cf::MAP) { 3733 for my $path (keys %cf::MAP) {
3409 my $map = $cf::MAP{$path} or next; 3734 my $map = $cf::MAP{$path} or next;
3410 $map->valid or next; 3735 $map->valid or next;
3411 $map->save; 3736 $map->save;
3412 } 3737 }
3413 warn "end emergency map save\n"; 3738 warn "emergency_perl_save: end map save\n";
3414 3739
3415 warn "begin emergency database checkpoint\n"; 3740 warn "emergency_perl_save: begin database checkpoint\n";
3416 BDB::db_env_txn_checkpoint $DB_ENV; 3741 BDB::db_env_txn_checkpoint $DB_ENV;
3417 warn "end emergency database checkpoint\n"; 3742 warn "emergency_perl_save: end database checkpoint\n";
3743
3744 warn "emergency_perl_save: begin write uuid\n";
3745 write_uuid_sync 1;
3746 warn "emergency_perl_save: end write uuid\n";
3418 }; 3747 };
3419 3748
3749 warn "emergency_perl_save: starting sync()\n";
3750 IO::AIO::aio_sync sub {
3751 warn "emergency_perl_save: finished sync()\n";
3752 };
3753
3420 warn "leave emergency perl save\n"; 3754 warn "emergency_perl_save: leave\n";
3421} 3755}
3422 3756
3423sub post_cleanup { 3757sub post_cleanup {
3424 my ($make_core) = @_; 3758 my ($make_core) = @_;
3425 3759
3426 warn Carp::longmess "post_cleanup backtrace" 3760 warn Carp::longmess "post_cleanup backtrace"
3427 if $make_core; 3761 if $make_core;
3762
3763 my $fh = pidfile;
3764 unlink $PIDFILE if <$fh> == $$;
3765}
3766
3767# a safer delete_package, copied from Symbol
3768sub clear_package($) {
3769 my $pkg = shift;
3770
3771 # expand to full symbol table name if needed
3772 unless ($pkg =~ /^main::.*::$/) {
3773 $pkg = "main$pkg" if $pkg =~ /^::/;
3774 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3775 $pkg .= '::' unless $pkg =~ /::$/;
3776 }
3777
3778 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3779 my $stem_symtab = *{$stem}{HASH};
3780
3781 defined $stem_symtab and exists $stem_symtab->{$leaf}
3782 or return;
3783
3784 # clear all symbols
3785 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3786 for my $name (keys %$leaf_symtab) {
3787 _gv_clear *{"$pkg$name"};
3788# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3789 }
3790 warn "cleared package $pkg\n";#d#
3428} 3791}
3429 3792
3430sub do_reload_perl() { 3793sub do_reload_perl() {
3431 # can/must only be called in main 3794 # can/must only be called in main
3432 if ($Coro::current != $Coro::main) { 3795 if ($Coro::current != $Coro::main) {
3433 warn "can only reload from main coroutine"; 3796 warn "can only reload from main coroutine";
3434 return; 3797 return;
3435 } 3798 }
3436 3799
3800 return if $RELOAD++;
3801
3802 my $t1 = AE::time;
3803
3804 while ($RELOAD) {
3437 warn "reloading..."; 3805 warn "reloading...";
3438 3806
3439 warn "entering sync_job"; 3807 warn "entering sync_job";
3440 3808
3441 cf::sync_job { 3809 cf::sync_job {
3442 cf::write_runtime; # external watchdog should not bark 3810 cf::write_runtime_sync; # external watchdog should not bark
3443 cf::emergency_save; 3811 cf::emergency_save;
3444 cf::write_runtime; # external watchdog should not bark 3812 cf::write_runtime_sync; # external watchdog should not bark
3445 3813
3446 warn "syncing database to disk"; 3814 warn "syncing database to disk";
3447 BDB::db_env_txn_checkpoint $DB_ENV; 3815 BDB::db_env_txn_checkpoint $DB_ENV;
3448 3816
3449 # if anything goes wrong in here, we should simply crash as we already saved 3817 # if anything goes wrong in here, we should simply crash as we already saved
3450 3818
3451 warn "flushing outstanding aio requests"; 3819 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; 3820 while (IO::AIO::nreqs || BDB::nreqs) {
3457 warn "iterate..."; 3821 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 } 3822 }
3483 3823
3484 warn "... nuking $pkg"; 3824 warn "cancelling all extension coros";
3485 Symbol::delete_package $pkg; 3825 $_->cancel for values %EXT_CORO;
3486 } 3826 %EXT_CORO = ();
3487 3827
3488 warn "unloading all perl modules loaded from $LIBDIR"; 3828 warn "removing commands";
3489 while (my ($k, $v) = each %INC) { 3829 %COMMAND = ();
3490 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3491 3830
3831 warn "removing ext/exti commands";
3832 %EXTCMD = ();
3833 %EXTICMD = ();
3834
3835 warn "unloading/nuking all extensions";
3836 for my $pkg (@EXTS) {
3492 warn "... unloading $k"; 3837 warn "... unloading $pkg";
3493 delete $INC{$k};
3494 3838
3495 $k =~ s/\.pm$//;
3496 $k =~ s/\//::/g;
3497
3498 if (my $cb = $k->can ("unload_module")) { 3839 if (my $cb = $pkg->can ("unload")) {
3840 eval {
3499 $cb->(); 3841 $cb->($pkg);
3842 1
3843 } or warn "$pkg unloaded, but with errors: $@";
3844 }
3845
3846 warn "... clearing $pkg";
3847 clear_package $pkg;
3500 } 3848 }
3501 3849
3502 Symbol::delete_package $k; 3850 warn "unloading all perl modules loaded from $LIBDIR";
3851 while (my ($k, $v) = each %INC) {
3852 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3853
3854 warn "... unloading $k";
3855 delete $INC{$k};
3856
3857 $k =~ s/\.pm$//;
3858 $k =~ s/\//::/g;
3859
3860 if (my $cb = $k->can ("unload_module")) {
3861 $cb->();
3862 }
3863
3864 clear_package $k;
3503 } 3865 }
3504 3866
3505 warn "getting rid of safe::, as good as possible"; 3867 warn "getting rid of safe::, as good as possible";
3506 Symbol::delete_package "safe::$_" 3868 clear_package "safe::$_"
3507 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3869 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3508 3870
3509 warn "unloading cf.pm \"a bit\""; 3871 warn "unloading cf.pm \"a bit\"";
3510 delete $INC{"cf.pm"}; 3872 delete $INC{"cf.pm"};
3511 delete $INC{"cf/pod.pm"}; 3873 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3512 3874
3513 # don't, removes xs symbols, too, 3875 # don't, removes xs symbols, too,
3514 # and global variables created in xs 3876 # and global variables created in xs
3515 #Symbol::delete_package __PACKAGE__; 3877 #clear_package __PACKAGE__;
3516 3878
3517 warn "unload completed, starting to reload now"; 3879 warn "unload completed, starting to reload now";
3518 3880
3519 warn "reloading cf.pm"; 3881 warn "reloading cf.pm";
3520 require cf; 3882 require cf;
3521 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3883 cf::_connect_to_perl_1;
3522 3884
3523 warn "loading config and database again"; 3885 warn "loading config and database again";
3524 cf::reload_config; 3886 cf::reload_config;
3525 3887
3526 warn "loading extensions"; 3888 warn "loading extensions";
3527 cf::load_extensions; 3889 cf::load_extensions;
3528 3890
3891 if ($REATTACH_ON_RELOAD) {
3529 warn "reattaching attachments to objects/players"; 3892 warn "reattaching attachments to objects/players";
3530 _global_reattach; # objects, sockets 3893 _global_reattach; # objects, sockets
3531 warn "reattaching attachments to maps"; 3894 warn "reattaching attachments to maps";
3532 reattach $_ for values %MAP; 3895 reattach $_ for values %MAP;
3533 warn "reattaching attachments to players"; 3896 warn "reattaching attachments to players";
3534 reattach $_ for values %PLAYER; 3897 reattach $_ for values %PLAYER;
3898 }
3535 3899
3900 warn "running post_init jobs";
3901 (pop @POST_INIT)->(1) while @POST_INIT;
3902
3536 warn "leaving sync_job"; 3903 warn "leaving sync_job";
3537 3904
3538 1 3905 1
3539 } or do { 3906 } or do {
3540 warn $@; 3907 warn $@;
3541 warn "error while reloading, exiting."; 3908 cf::cleanup "error while reloading, exiting.";
3542 exit 1;
3543 }; 3909 };
3544 3910
3545 warn "reloaded"; 3911 warn "reloaded";
3912 --$RELOAD;
3913 }
3914
3915 $t1 = AE::time - $t1;
3916 warn "reload completed in ${t1}s\n";
3546}; 3917};
3547 3918
3548our $RELOAD_WATCHER; # used only during reload 3919our $RELOAD_WATCHER; # used only during reload
3549 3920
3550sub reload_perl() { 3921sub reload_perl() {
3551 # doing reload synchronously and two reloads happen back-to-back, 3922 # doing reload synchronously and two reloads happen back-to-back,
3552 # coro crashes during coro_state_free->destroy here. 3923 # coro crashes during coro_state_free->destroy here.
3553 3924
3925 $RELOAD_WATCHER ||= cf::async {
3926 Coro::AIO::aio_wait cache_extensions;
3927
3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3928 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3929 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3930 undef $RELOAD_WATCHER;
3556 do_reload_perl; 3931 };
3557 }; 3932 };
3558} 3933}
3559 3934
3560register_command "reload" => sub { 3935register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3936 my ($who, $arg) = @_;
3575 3950
3576our @WAIT_FOR_TICK; 3951our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 3952our @WAIT_FOR_TICK_BEGIN;
3578 3953
3579sub wait_for_tick { 3954sub wait_for_tick {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 3955 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3582 3956
3583 my $signal = new Coro::Signal; 3957 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 3958 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 3959 $signal->wait;
3586} 3960}
3587 3961
3588sub wait_for_tick_begin { 3962sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 3963 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3591 3964
3592 my $signal = new Coro::Signal; 3965 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 3966 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 3967 $signal->wait;
3595} 3968}
3596 3969
3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3970sub tick {
3598 if ($Coro::current != $Coro::main) { 3971 if ($Coro::current != $Coro::main) {
3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3972 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3600 unless ++$bug_warning > 10; 3973 unless ++$bug_warning > 10;
3601 return; 3974 return;
3602 } 3975 }
3603 3976
3604 $NOW = $tick_start = EV::now;
3605
3606 cf::server_tick; # one server iteration 3977 cf::server_tick; # one server iteration
3607 3978
3608 $RUNTIME += $TICK; 3979 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3609 $NEXT_TICK = $_[0]->at;
3610 3980
3611 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3981 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3612 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3982 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3613 Coro::async_pool { 3983 Coro::async_pool {
3614 $Coro::current->{desc} = "runtime saver"; 3984 $Coro::current->{desc} = "runtime saver";
3615 write_runtime 3985 write_runtime_sync
3616 or warn "ERROR: unable to write runtime file: $!"; 3986 or warn "ERROR: unable to write runtime file: $!";
3617 }; 3987 };
3618 } 3988 }
3619 3989
3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3990 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3622 } 3992 }
3623 while (my $sig = shift @WAIT_FOR_TICK) { 3993 while (my $sig = shift @WAIT_FOR_TICK) {
3624 $sig->send; 3994 $sig->send;
3625 } 3995 }
3626 3996
3627 $LOAD = ($NOW - $tick_start) / $TICK; 3997 $LOAD = ($NOW - $TICK_START) / $TICK;
3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3998 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3629 3999
3630 _post_tick; 4000 if (0) {
3631}; 4001 if ($NEXT_TICK) {
3632$TICK_WATCHER->priority (EV::MAXPRI); 4002 my $jitter = $TICK_START - $NEXT_TICK;
4003 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4004 warn "jitter $JITTER\n";#d#
4005 }
4006 }
4007}
3633 4008
3634{ 4009{
3635 # configure BDB 4010 # configure BDB
3636 4011
3637 BDB::min_parallel 8; 4012 BDB::min_parallel 16;
3638 BDB::max_poll_reqs $TICK * 0.1; 4013 BDB::max_poll_reqs $TICK * 0.1;
3639 $Coro::BDB::WATCHER->priority (1); 4014 $AnyEvent::BDB::WATCHER->priority (1);
3640 4015
3641 unless ($DB_ENV) { 4016 unless ($DB_ENV) {
3642 $DB_ENV = BDB::db_env_create; 4017 $DB_ENV = BDB::db_env_create;
3643 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4018 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3644 | BDB::LOG_AUTOREMOVE, 1); 4019 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4020 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3645 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4021 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3646 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4022 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3647 4023
3648 cf::sync_job { 4024 cf::sync_job {
3649 eval { 4025 eval {
3675{ 4051{
3676 # configure IO::AIO 4052 # configure IO::AIO
3677 4053
3678 IO::AIO::min_parallel 8; 4054 IO::AIO::min_parallel 8;
3679 IO::AIO::max_poll_time $TICK * 0.1; 4055 IO::AIO::max_poll_time $TICK * 0.1;
3680 $Coro::AIO::WATCHER->priority (1); 4056 undef $AnyEvent::AIO::WATCHER;
3681} 4057}
3682 4058
3683my $_log_backtrace; 4059my $_log_backtrace;
3684 4060
3685sub _log_backtrace { 4061sub _log_backtrace {
3688 $msg =~ s/\n//; 4064 $msg =~ s/\n//;
3689 4065
3690 # limit the # of concurrent backtraces 4066 # limit the # of concurrent backtraces
3691 if ($_log_backtrace < 2) { 4067 if ($_log_backtrace < 2) {
3692 ++$_log_backtrace; 4068 ++$_log_backtrace;
4069 my $perl_bt = Carp::longmess $msg;
3693 async { 4070 async {
3694 $Coro::current->{desc} = "abt $msg"; 4071 $Coro::current->{desc} = "abt $msg";
3695 4072
3696 my @bt = fork_call { 4073 my @bt = fork_call {
3697 @addr = map { sprintf "%x", $_ } @addr; 4074 @addr = map { sprintf "%x", $_ } @addr;
3708 } 4085 }
3709 4086
3710 @funcs 4087 @funcs
3711 }; 4088 };
3712 4089
3713 LOG llevInfo, "[ABT] $msg\n"; 4090 LOG llevInfo, "[ABT] $perl_bt\n";
4091 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3714 LOG llevInfo, "[ABT] $_\n" for @bt; 4092 LOG llevInfo, "[ABT] $_\n" for @bt;
3715 --$_log_backtrace; 4093 --$_log_backtrace;
3716 }; 4094 };
3717 } else { 4095 } else {
3718 LOG llevInfo, "[ABT] $msg\n"; 4096 LOG llevInfo, "[ABT] $msg\n";
3719 LOG llevInfo, "[ABT] [suppressed]\n"; 4097 LOG llevInfo, "[ABT] [suppressed]\n";
3720 } 4098 }
3721} 4099}
3722 4100
3723# load additional modules 4101# load additional modules
3724use cf::pod; 4102require "cf/$_.pm" for @EXTRA_MODULES;
4103cf::_connect_to_perl_2;
3725 4104
3726END { cf::emergency_save } 4105END { cf::emergency_save }
3727 4106
37281 41071
3729 4108

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines