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.398 by root, Wed Dec 5 11:08:34 2007 UTC vs.
Revision 1.542 by root, Wed May 5 09:05:03 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
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use EV; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 4.1 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
18use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 56use Fcntl;
31use YAML::Syck (); 57use YAML::XS ();
32use IO::AIO 2.51 (); 58use IO::AIO ();
33use Time::HiRes; 59use Time::HiRes;
34use Compress::LZF; 60use Compress::LZF;
35use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
36 64
37# configure various modules to our taste 65# configure various modules to our taste
38# 66#
39$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 75
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 76# strictly for debugging
44$YAML::Syck::ImplicitUnicode = 1; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 78
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
49 82
50our %COMMAND = (); 83our %COMMAND = ();
51our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
52 85
53our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
54our %EXTCMD = (); 87our %EXTCMD = ();
55our %EXTICMD = (); 88our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
58 91
59our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
61 96
62our $CONFDIR = confdir; 97our $CONFDIR = confdir;
63our $DATADIR = datadir; 98our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
73 118
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 121our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
81 123
82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
86our $DB_ENV; 127our $DB_ENV;
87 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
88our %CFG; 131our %CFG;
89 132
90our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
91our $RUNTIME; 134our $RUNTIME;
135our $NOW;
92 136
93our (%PLAYER, %PLAYER_LOADING); # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
94our (%MAP, %MAP_LOADING ); # all maps 138our (%MAP, %MAP_LOADING ); # all maps
95our $LINK_MAP; # the special {link} map, which is always available 139our $LINK_MAP; # the special {link} map, which is always available
96 140
97# used to convert map paths into valid unix filenames by replacing / by ∕ 141# used to convert map paths into valid unix filenames by replacing / by ∕
98our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
99 143
100our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
101our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
102our $tick_start; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
103 153
104binmode STDOUT; 154binmode STDOUT;
105binmode STDERR; 155binmode STDERR;
106 156
107# read virtual server time, if available 157# read virtual server time, if available
108unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
109 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
110 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
111 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
112} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
113 165
114mkdir $_ 166mkdir $_
115 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
116 168
117our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
118 170
119sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
120 187
121############################################################################# 188#############################################################################
122 189
123=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
124 191
171returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
172per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
173 240
174=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
175 242
176This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
177C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
178that call. 245that call.
179 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
180=back 253=back
181 254
182=cut 255=cut
183 256
184BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
185 *CORE::GLOBAL::warn = sub { 258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
263$Coro::State::WARNHOOK = sub {
186 my $msg = join "", @_; 264 my $msg = join "", @_;
187 265
188 $msg .= "\n" 266 $msg .= "\n"
189 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
190 268
191 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
192 270
193 LOG llevError, $msg; 271 LOG llevWarn, $msg;
194 }; 272};
195} 273
274$Coro::State::DIEHOOK = sub {
275 return unless $^S eq 0; # "eq", not "=="
276
277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
280 error "DIEHOOK called in main context, Coro bug?\n";#d#
281 return;#d#
282 }#d#
283
284 # kill coroutine otherwise
285 Coro::terminate
286};
196 287
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 298for my $pkg (qw(
208 cf::global cf::attachable 299 cf::global cf::attachable
209 cf::object cf::object::player 300 cf::object cf::object::player
210 cf::client cf::player 301 cf::client cf::player
211 cf::arch cf::living 302 cf::arch cf::living
303 cf::map cf::mapspace
212 cf::map cf::party cf::region 304 cf::party cf::region
213)) { 305)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 307}
217 308
218$EV::DIED = sub { 309$EV::DIED = sub {
219 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
220}; 311};
221 312
222############################################################################# 313#############################################################################
223 314
224=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 353
263sub encode_json($) { $json_coder->encode ($_[0]) } 354sub encode_json($) { $json_coder->encode ($_[0]) }
264sub decode_json($) { $json_coder->decode ($_[0]) } 355sub decode_json($) { $json_coder->decode ($_[0]) }
265 356
357=item cf::post_init { BLOCK }
358
359Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again.
361
362The cdoeblock will have a single boolean argument to indicate whether this
363is a reload or not.
364
365=cut
366
367sub post_init(&) {
368 push @POST_INIT, shift;
369}
370
266=item cf::lock_wait $string 371=item cf::lock_wait $string
267 372
268Wait until the given lock is available. See cf::lock_acquire. 373Wait until the given lock is available. See cf::lock_acquire.
269 374
270=item my $lock = cf::lock_acquire $string 375=item my $lock = cf::lock_acquire $string
271 376
272Wait until the given lock is available and then acquires it and returns 377Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 378a L<Guard> object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 379for example when the coroutine gets canceled), the lock is automatically
275returned. 380returned.
276 381
277Locks are *not* recursive, locking from the same coro twice results in a 382Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro. 383deadlocked coro.
284 389
285Return true if the lock is currently active, i.e. somebody has locked it. 390Return true if the lock is currently active, i.e. somebody has locked it.
286 391
287=cut 392=cut
288 393
289our %LOCK; 394our $LOCKS = new Coro::SemaphoreSet;
290our %LOCKER;#d#
291 395
292sub lock_wait($) { 396sub lock_wait($) {
293 my ($key) = @_; 397 $LOCKS->wait ($_[0]);
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
299
300 # wait for lock, if any
301 while ($LOCK{$key}) {
302 push @{ $LOCK{$key} }, $Coro::current;
303 Coro::schedule;
304 }
305} 398}
306 399
307sub lock_acquire($) { 400sub lock_acquire($) {
308 my ($key) = @_; 401 $LOCKS->guard ($_[0])
309
310 # wait, to be sure we are not locked
311 lock_wait $key;
312
313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
315
316 Coro::guard {
317 delete $LOCKER{$key};#d#
318 # wake up all waiters, to be on the safe side
319 $_->ready for @{ delete $LOCK{$key} };
320 }
321} 402}
322 403
323sub lock_active($) { 404sub lock_active($) {
324 my ($key) = @_; 405 $LOCKS->count ($_[0]) < 1
325
326 ! ! $LOCK{$key}
327} 406}
328 407
329sub freeze_mainloop { 408sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 409 tick_inhibit_inc;
331 410
332 my $guard = Coro::guard { 411 &Guard::guard (\&tick_inhibit_dec);
333 $TICK_WATCHER->start;
334 };
335 $TICK_WATCHER->stop;
336 $guard
337} 412}
338 413
339=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
340 415
341Like EV::periodic, but randomly selects a starting point so that the actions 416Like EV::periodic, but randomly selects a starting point so that the actions
342get spread over timer. 417get spread over time.
343 418
344=cut 419=cut
345 420
346sub periodic($$) { 421sub periodic($$) {
347 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
364 439
365=cut 440=cut
366 441
367our @SLOT_QUEUE; 442our @SLOT_QUEUE;
368our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
369 445
370$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
371$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
372 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
373 449
374 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
375 452
376 while () { 453 while () {
377 next_job: 454 next_job:
455
378 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
379 if ($avail > 0.01) { 457
380 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
381 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
382 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
383 $job->[2]->send; 462 $job->[2]->send;
384 Coro::cede; 463 Coro::cede;
385 goto next_job; 464 goto next_job;
386 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
387 } 467 }
388 } 468 }
389 469
390 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
391 # we do not use wait_for_tick() as it returns immediately when tick is inactive 471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
392 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
393 $signal->wait; 473 $signal->wait;
394 } else { 474 } else {
475 $busy = 0;
395 Coro::schedule; 476 Coro::schedule;
396 } 477 }
397 } 478 }
398}; 479};
399 480
400sub get_slot($;$$) { 481sub get_slot($;$$) {
482 return if tick_inhibit || $Coro::current == $Coro::main;
483
401 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
402 485
403 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
404 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
405 489
406 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
407 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
408 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
434=cut 518=cut
435 519
436sub sync_job(&) { 520sub sync_job(&) {
437 my ($job) = @_; 521 my ($job) = @_;
438 522
439 if ($Coro::current == $Coro::main) { 523 if (in_main) {
440 my $time = EV::time; 524 my $time = AE::time;
441 525
442 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
443 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
444 528
445 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
446 530
447 # TODO: use suspend/resume instead
448 # (but this is cancel-safe)
449 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
450 532
451 my $busy = 1; 533 my $busy = 1;
452 my @res; 534 my @res;
453 535
454 (async { 536 (async {
455 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
456 @res = eval { $job->() }; 538 @res = eval { $job->() };
457 warn $@ if $@; 539 error $@ if $@;
458 undef $busy; 540 undef $busy;
459 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
460 542
461 while ($busy) { 543 while ($busy) {
462 if (Coro::nready) { 544 if (Coro::nready) {
464 } else { 546 } else {
465 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
466 } 548 }
467 } 549 }
468 550
469 $time = EV::time - $time; 551 my $time = AE::time - $time;
470 552
471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
473
474 $tick_start += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
475 554
476 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
477 } else { 556 } else {
478 # we are in another coroutine, how wonderful, everything just works 557 # we are in another coroutine, how wonderful, everything just works
479 558
523 }, @args; 602 }, @args;
524 603
525 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
526} 605}
527 606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
616}
617
618=item $coin = coin_from_name $name
619
620=cut
621
622our %coin_alias = (
623 "silver" => "silvercoin",
624 "silvercoin" => "silvercoin",
625 "silvercoins" => "silvercoin",
626 "gold" => "goldcoin",
627 "goldcoin" => "goldcoin",
628 "goldcoins" => "goldcoin",
629 "platinum" => "platinacoin",
630 "platinumcoin" => "platinacoin",
631 "platinumcoins" => "platinacoin",
632 "platina" => "platinacoin",
633 "platinacoin" => "platinacoin",
634 "platinacoins" => "platinacoin",
635 "royalty" => "royalty",
636 "royalties" => "royalty",
637);
638
639sub coin_from_name($) {
640 $coin_alias{$_[0]}
641 ? cf::arch::find $coin_alias{$_[0]}
642 : undef
643}
644
528=item $value = cf::db_get $family => $key 645=item $value = cf::db_get $family => $key
529 646
530Returns a single value from the environment database. 647Returns a single value from the environment database.
531 648
532=item cf::db_put $family => $key => $value 649=item cf::db_put $family => $key => $value
540within each server. 657within each server.
541 658
542=cut 659=cut
543 660
544sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
545 my ($name) = @_; 665 my ($name) = @_;
546 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
547 667
548 eval { 668 eval {
549 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
559} 679}
560 680
561our $DB; 681our $DB;
562 682
563sub db_init { 683sub db_init {
564 cf::sync_job {
565 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
566 };
567} 685}
568 686
569sub db_get($$) { 687sub db_get($$) {
570 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
571 689
572 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
573 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
574 694
575 $! ? () 695 $! ? ()
576 : $data 696 : $data
577 }
578} 697}
579 698
580sub db_put($$$) { 699sub db_put($$$) {
581 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
582 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
638 757
639 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
640 my $data = $process->(\@data); 759 my $data = $process->(\@data);
641 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
642 761
643 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
644 763
645 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
646 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
647 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
648 767
658 777
659=cut 778=cut
660 779
661sub datalog($@) { 780sub datalog($@) {
662 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
663 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
664} 783}
665 784
666=back 785=back
667 786
668=cut 787=cut
669 788
670############################################################################# 789#############################################################################
671 790
672=head2 ATTACHABLE OBJECTS 791=head2 ATTACHABLE OBJECTS
673 792
674Many objects in crossfire are so-called attachable objects. That means you can 793Many objects in deliantra are so-called attachable objects. That means you can
675attach callbacks/event handlers (a collection of which is called an "attachment") 794attach callbacks/event handlers (a collection of which is called an "attachment")
676to it. All such attachable objects support the following methods. 795to it. All such attachable objects support the following methods.
677 796
678In the following description, CLASS can be any of C<global>, C<object> 797In the following description, CLASS can be any of C<global>, C<object>
679C<player>, C<client> or C<map> (i.e. the attachable objects in 798C<player>, C<client> or C<map> (i.e. the attachable objects in
729=item cf::CLASS::attachment $name, ... 848=item cf::CLASS::attachment $name, ...
730 849
731Register an attachment by C<$name> through which attachable objects of the 850Register an attachment by C<$name> through which attachable objects of the
732given CLASS can refer to this attachment. 851given CLASS can refer to this attachment.
733 852
734Some classes such as crossfire maps and objects can specify attachments 853Some classes such as deliantra maps and objects can specify attachments
735that are attached at load/instantiate time, thus the need for a name. 854that are attached at load/instantiate time, thus the need for a name.
736 855
737These calls expect any number of the following handler/hook descriptions: 856These calls expect any number of the following handler/hook descriptions:
738 857
739=over 4 858=over 4
863 982
864 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
865 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
866 985
867 } elsif (ref $type) { 986 } elsif (ref $type) {
868 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
869 988
870 } else { 989 } else {
871 shift @arg; 990 shift @arg;
872 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
873 } 992 }
874 } 993 }
875} 994}
876 995
877sub _object_attach { 996sub _object_attach {
887 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
888 } 1007 }
889 1008
890 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
891 } else { 1010 } else {
892 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
893 } 1012 }
894 1013
895 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
896} 1015}
897 1016
956 1075
957 for (@$callbacks) { 1076 for (@$callbacks) {
958 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
959 1078
960 if ($@) { 1079 if ($@) {
961 warn "$@";
962 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
963 override; 1081 override;
964 } 1082 }
965 1083
966 return 1 if $override; 1084 return 1 if $override;
967 } 1085 }
968 1086
969 0 1087 0
970} 1088}
971 1089
972=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1090=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
973 1091
974=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1092=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
975 1093
976Generate an object-specific event with the given arguments. 1094Generate an object-specific event with the given arguments.
977 1095
1030 1148
1031sub reattach { 1149sub reattach {
1032 # basically do the same as instantiate, without calling instantiate 1150 # basically do the same as instantiate, without calling instantiate
1033 my ($obj) = @_; 1151 my ($obj) = @_;
1034 1152
1153 # no longer needed after getting rid of delete_package?
1035 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1154 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1036 1155
1037 my $registry = $obj->registry; 1156 my $registry = $obj->registry;
1038 1157
1039 @$registry = (); 1158 @$registry = ();
1040 1159
1045 for (@$attach) { 1164 for (@$attach) {
1046 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1047 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1048 } 1167 }
1049 } else { 1168 } else {
1050 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1051 } 1170 }
1052 } 1171 }
1053} 1172}
1054 1173
1055cf::attachable->attach ( 1174cf::attachable->attach (
1082 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1083 1202
1084 sync_job { 1203 sync_job {
1085 if (length $$rdata) { 1204 if (length $$rdata) {
1086 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1087 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1088 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1089 1209
1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1091 chmod SAVE_MODE, $fh; 1211 aio_chmod $fh, SAVE_MODE;
1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1093 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1215 aio_fsync $fh;
1216 }
1094 close $fh; 1217 aio_close $fh;
1095 1218
1096 if (@$objs) { 1219 if (@$objs) {
1097 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1220 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1221 aio_chmod $fh, SAVE_MODE;
1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1222 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1100 aio_write $fh, 0, (length $data), $data, 0; 1223 aio_write $fh, 0, (length $data), $data, 0;
1101 aio_fsync $fh if $cf::USE_FSYNC; 1224 if ($cf::USE_FSYNC) {
1225 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;
1226 aio_fsync $fh;
1227 }
1102 close $fh; 1228 aio_close $fh;
1103 aio_rename "$filename.pst~", "$filename.pst"; 1229 aio_rename "$filename.pst~", "$filename.pst";
1104 } 1230 }
1105 } else { 1231 } else {
1106 aio_unlink "$filename.pst"; 1232 aio_unlink "$filename.pst";
1107 } 1233 }
1108 1234
1109 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1236
1237 $filename =~ s%/[^/]+$%%;
1238 aio_pathsync $filename if $cf::USE_FSYNC;
1110 } else { 1239 } else {
1111 warn "FATAL: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1112 } 1241 }
1113 } else { 1242 } else {
1114 aio_unlink $filename; 1243 aio_unlink $filename;
1115 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1116 } 1245 }
1140 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1141 $av = $st->{objs}; 1270 $av = $st->{objs};
1142 } 1271 }
1143 1272
1144 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1145 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1146 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1147 1277
1148 ($data, $av) 1278 ($data, $av)
1149} 1279}
1150 1280
1151=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1207 my ($name, $cb) = @_; 1337 my ($name, $cb) = @_;
1208 1338
1209 $EXTICMD{$name} = $cb; 1339 $EXTICMD{$name} = $cb;
1210} 1340}
1211 1341
1342use File::Glob ();
1343
1212cf::player->attach ( 1344cf::player->attach (
1213 on_command => sub { 1345 on_unknown_command => sub {
1214 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1215 1347
1216 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1217 or return; 1349 or return;
1218 1350
1241 1373
1242 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1243 if $reply; 1375 if $reply;
1244 1376
1245 } else { 1377 } else {
1246 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1247 } 1379 }
1248 1380
1249 cf::override; 1381 cf::override;
1250 }, 1382 },
1251); 1383);
1252 1384
1385# "readahead" all extensions
1386sub cache_extensions {
1387 my $grp = IO::AIO::aio_group;
1388
1389 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1390 for (grep /\.ext$/, @{$_[0]}) {
1391 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1392 }
1393 };
1394
1395 $grp
1396}
1397
1253sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1254 cf::sync_job { 1401 cf::sync_job {
1255 my %todo; 1402 my %todo;
1256 1403
1257 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1258 next unless -r $path; 1405 next unless -r $path;
1276 1423
1277 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1278 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1279 1426
1280 $ext{source} = 1427 $ext{source} =
1281 "package $pkg; use strict; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1282 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1283 . $source 1430 . $source
1284 . "\n};\n1"; 1431 . "\n};\n1";
1285 1432
1286 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1287 } 1434 }
1288 1435
1436 my $pass = 0;
1289 my %done; 1437 my %done;
1290 while (%todo) { 1438 while (%todo) {
1291 my $progress; 1439 my $progress;
1292 1440
1441 ++$pass;
1442
1443 ext:
1293 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1294 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1295 goto skip 1446 next ext
1296 unless exists $done{$_}; 1447 unless exists $done{$_};
1297 } 1448 }
1298 1449
1299 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1300 1451
1301 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1302 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1303 : "$v->{base}: extension inactive.\n";
1304 1456
1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1305 if (exists $v->{meta}{mandatory}) { 1458 if exists $v->{meta}{mandatory};
1306 warn $msg; 1459
1307 warn "mandatory extension failed to load, exiting.\n"; 1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1308 exit 1; 1461 delete $todo{$k};
1309 } 1462 } else {
1310 1463 $done{$k} = delete $todo{$k};
1311 warn $msg; 1464 push @EXTS, $v->{pkg};
1465 $progress = 1;
1466
1467 info "$v->{base}: extension inactive.\n"
1468 unless $active;
1312 } 1469 }
1313
1314 $done{$k} = delete $todo{$k};
1315 push @EXTS, $v->{pkg};
1316 $progress = 1;
1317 } 1470 }
1318 1471
1319 skip: 1472 unless ($progress) {
1320 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1473 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1321 unless $progress; 1474
1475 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory};
1478 }
1479 }
1322 } 1480 }
1323 }; 1481 };
1324} 1482}
1325 1483
1326############################################################################# 1484#############################################################################
1327 1485
1328=back 1486=back
1329 1487
1330=head2 CORE EXTENSIONS 1488=head2 CORE EXTENSIONS
1331 1489
1332Functions and methods that extend core crossfire objects. 1490Functions and methods that extend core deliantra objects.
1333 1491
1334=cut 1492=cut
1335 1493
1336package cf::player; 1494package cf::player;
1337 1495
1380 1538
1381sub exists($) { 1539sub exists($) {
1382 my ($login) = @_; 1540 my ($login) = @_;
1383 1541
1384 $cf::PLAYER{$login} 1542 $cf::PLAYER{$login}
1385 or cf::sync_job { !aio_stat path $login } 1543 or !aio_stat path $login
1386} 1544}
1387 1545
1388sub find($) { 1546sub find($) {
1389 return $cf::PLAYER{$_[0]} || do { 1547 return $cf::PLAYER{$_[0]} || do {
1390 my $login = $_[0]; 1548 my $login = $_[0];
1402 my $f = new_from_file cf::object::thawer path $login 1560 my $f = new_from_file cf::object::thawer path $login
1403 or return; 1561 or return;
1404 1562
1405 my $pl = cf::player::load_pl $f 1563 my $pl = cf::player::load_pl $f
1406 or return; 1564 or return;
1565
1407 local $cf::PLAYER_LOADING{$login} = $pl; 1566 local $cf::PLAYER_LOADING{$login} = $pl;
1408 $f->resolve_delayed_derefs; 1567 $f->resolve_delayed_derefs;
1409 $cf::PLAYER{$login} = $pl 1568 $cf::PLAYER{$login} = $pl
1410 } 1569 }
1411 } 1570 }
1412} 1571}
1413 1572
1573cf::player->attach (
1574 on_load => sub {
1575 my ($pl, $path) = @_;
1576
1577 # restore slots saved in save, below
1578 my $slots = delete $pl->{_slots};
1579
1580 $pl->ob->current_weapon ($slots->[0]);
1581 $pl->combat_ob ($slots->[1]);
1582 $pl->ranged_ob ($slots->[2]);
1583 },
1584);
1585
1414sub save($) { 1586sub save($) {
1415 my ($pl) = @_; 1587 my ($pl) = @_;
1416 1588
1417 return if $pl->{deny_save}; 1589 return if $pl->{deny_save};
1418 1590
1421 1593
1422 return if $pl->{deny_save}; 1594 return if $pl->{deny_save};
1423 1595
1424 aio_mkdir playerdir $pl, 0770; 1596 aio_mkdir playerdir $pl, 0770;
1425 $pl->{last_save} = $cf::RUNTIME; 1597 $pl->{last_save} = $cf::RUNTIME;
1598
1599 cf::get_slot 0.01;
1600
1601 # save slots, to be restored later
1602 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1426 1603
1427 $pl->save_pl ($path); 1604 $pl->save_pl ($path);
1428 cf::cede_to_tick; 1605 cf::cede_to_tick;
1429} 1606}
1430 1607
1462 my ($pl) = @_; 1639 my ($pl) = @_;
1463 1640
1464 my $name = $pl->ob->name; 1641 my $name = $pl->ob->name;
1465 1642
1466 $pl->{deny_save} = 1; 1643 $pl->{deny_save} = 1;
1467 $pl->password ("*"); # this should lock out the player until we nuked the dir 1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1468 1645
1469 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1470 $pl->deactivate; 1647 $pl->deactivate;
1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1471 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1472 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1473 1651
1474 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1475 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
1514 1692
1515 for my $login (@$dirs) { 1693 for my $login (@$dirs) {
1516 my $path = path $login; 1694 my $path = path $login;
1517 1695
1518 # a .pst is a dead give-away for a valid player 1696 # a .pst is a dead give-away for a valid player
1519 unless (-e "$path.pst") { 1697 # if no pst file found, open and chekc for blocked users
1698 if (aio_stat "$path.pst") {
1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1699 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1521 aio_read $fh, 0, 512, my $buf, 0 or next; 1700 aio_read $fh, 0, 512, my $buf, 0 or next;
1522 $buf !~ /^password -------------$/m or next; # official not-valid tag 1701 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 } 1702 }
1524 1703
1528 1707
1529 \@logins 1708 \@logins
1530} 1709}
1531 1710
1532=item $player->maps 1711=item $player->maps
1712
1713=item cf::player::maps $login
1533 1714
1534Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1535player. May block. 1716player. May block.
1536 1717
1537=cut 1718=cut
1555 } 1736 }
1556 1737
1557 \@paths 1738 \@paths
1558} 1739}
1559 1740
1560=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1741=item $protocol_xml = $player->expand_cfpod ($cfpod)
1561 1742
1562Expand crossfire pod fragments into protocol xml. 1743Expand deliantra pod fragments into protocol xml.
1563
1564=cut
1565
1566use re 'eval';
1567
1568my $group;
1569my $interior; $interior = qr{
1570 # match a pod interior sequence sans C<< >>
1571 (?:
1572 \ (.*?)\ (?{ $group = $^N })
1573 | < (??{$interior}) >
1574 )
1575}x;
1576
1577sub expand_cfpod {
1578 my ($self, $pod) = @_;
1579
1580 my $xml;
1581
1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1585
1586 $group =~ s/&/&amp;/g;
1587 $group =~ s/</&lt;/g;
1588
1589 $xml .= $group;
1590 } elsif ($pod =~ m%\G
1591 ([BCGHITU])
1592 <
1593 (?:
1594 ([^<>]*) (?{ $group = $^N })
1595 | < $interior >
1596 )
1597 >
1598 %gcsx
1599 ) {
1600 my ($code, $data) = ($1, $group);
1601
1602 if ($code eq "B") {
1603 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1604 } elsif ($code eq "I") {
1605 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1606 } elsif ($code eq "U") {
1607 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1608 } elsif ($code eq "C") {
1609 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1610 } elsif ($code eq "T") {
1611 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1612 } elsif ($code eq "G") {
1613 my ($male, $female) = split /\|/, $data;
1614 $data = $self->gender ? $female : $male;
1615 $xml .= expand_cfpod ($self, $data);
1616 } elsif ($code eq "H") {
1617 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1619 "")
1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1631
1632 for ($xml) {
1633 # create single paragraphs (very hackish)
1634 s/(?<=\S)\n(?=\w)/ /g;
1635
1636 # compress some whitespace
1637 s/\s+\n/\n/g; # ws line-ends
1638 s/\n\n+/\n/g; # double lines
1639 s/^\n+//; # beginning lines
1640 s/\n+$//; # ending lines
1641 }
1642
1643 $xml
1644}
1645
1646no re 'eval';
1647
1648sub hintmode {
1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1650 $_[0]{hintmode}
1651}
1652 1744
1653=item $player->ext_reply ($msgid, @msg) 1745=item $player->ext_reply ($msgid, @msg)
1654 1746
1655Sends an ext reply to the player. 1747Sends an ext reply to the player.
1656 1748
1688 1780
1689=cut 1781=cut
1690 1782
1691sub find_by_path($) { 1783sub find_by_path($) {
1692 my ($path) = @_; 1784 my ($path) = @_;
1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1693 1787
1694 my ($match, $specificity); 1788 my ($match, $specificity);
1695 1789
1696 for my $region (list) { 1790 for my $region (list) {
1697 if ($region->{match} && $path =~ $region->{match}) { 1791 if ($region->{match} && $path =~ $region->{match}) {
1723our $MAX_RESET = 3600; 1817our $MAX_RESET = 3600;
1724our $DEFAULT_RESET = 3000; 1818our $DEFAULT_RESET = 3000;
1725 1819
1726sub generate_random_map { 1820sub generate_random_map {
1727 my ($self, $rmp) = @_; 1821 my ($self, $rmp) = @_;
1822
1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1824
1728 # mit "rum" bekleckern, nicht 1825 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1826 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map}, 1830 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize}, 1831 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1751 1848
1752sub register { 1849sub register {
1753 my (undef, $regex, $prio) = @_; 1850 my (undef, $regex, $prio) = @_;
1754 my $pkg = caller; 1851 my $pkg = caller;
1755 1852
1756 no strict;
1757 push @{"$pkg\::ISA"}, __PACKAGE__; 1853 push @{"$pkg\::ISA"}, __PACKAGE__;
1758 1854
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1855 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1856}
1761 1857
1762# also paths starting with '/' 1858# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1859$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1860
1765sub thawer_merge { 1861sub thawer_merge {
1766 my ($self, $merge) = @_; 1862 my ($self, $merge) = @_;
1767 1863
1768 # we have to keep some variables in memory intact 1864 # we have to keep some variables in memory intact
1854 1950
1855# the temporary/swap location 1951# the temporary/swap location
1856sub save_path { 1952sub save_path {
1857 my ($self) = @_; 1953 my ($self) = @_;
1858 1954
1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1955 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1860 "$TMPDIR/$path.map" 1956 "$TMPDIR/$path.map"
1861} 1957}
1862 1958
1863# the unique path, undef == no special unique path 1959# the unique path, undef == no special unique path
1864sub uniq_path { 1960sub uniq_path {
1865 my ($self) = @_; 1961 my ($self) = @_;
1866 1962
1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1963 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1868 "$UNIQUEDIR/$path" 1964 "$UNIQUEDIR/$path"
1869}
1870
1871# and all this just because we cannot iterate over
1872# all maps in C++...
1873sub change_all_map_light {
1874 my ($change) = @_;
1875
1876 $_->change_map_light ($change)
1877 for grep $_->outdoor, values %cf::MAP;
1878} 1965}
1879 1966
1880sub decay_objects { 1967sub decay_objects {
1881 my ($self) = @_; 1968 my ($self) = @_;
1882 1969
1966sub find { 2053sub find {
1967 my ($path, $origin) = @_; 2054 my ($path, $origin) = @_;
1968 2055
1969 $path = normalise $path, $origin && $origin->path; 2056 $path = normalise $path, $origin && $origin->path;
1970 2057
1971 cf::lock_wait "map_data:$path";#d#remove 2058 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1972 cf::lock_wait "map_find:$path"; 2059 my $guard2 = cf::lock_acquire "map_find:$path";
1973 2060
1974 $cf::MAP{$path} || do { 2061 $cf::MAP{$path} || do {
1975 my $guard1 = cf::lock_acquire "map_find:$path";
1976 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977
1978 my $map = new_from_path cf::map $path 2062 my $map = new_from_path cf::map $path
1979 or return; 2063 or return;
1980 2064
1981 $map->{last_save} = $cf::RUNTIME; 2065 $map->{last_save} = $cf::RUNTIME;
1982 2066
1984 or return; 2068 or return;
1985 2069
1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2070 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1987 # doing this can freeze the server in a sync job, obviously 2071 # doing this can freeze the server in a sync job, obviously
1988 #$cf::WAIT_FOR_TICK->wait; 2072 #$cf::WAIT_FOR_TICK->wait;
2073 undef $guard2;
1989 undef $guard1; 2074 undef $guard1;
1990 undef $guard2;
1991 $map->reset; 2075 $map->reset;
1992 return find $path; 2076 return find $path;
1993 } 2077 }
1994 2078
1995 $cf::MAP{$path} = $map 2079 $cf::MAP{$path} = $map
1996 } 2080 }
1997} 2081}
1998 2082
1999sub pre_load { } 2083sub pre_load { }
2000sub post_load { } 2084#sub post_load { } # XS
2001 2085
2002sub load { 2086sub load {
2003 my ($self) = @_; 2087 my ($self) = @_;
2004 2088
2005 local $self->{deny_reset} = 1; # loading can take a long time 2089 local $self->{deny_reset} = 1; # loading can take a long time
2022 my $f = new_from_file cf::object::thawer $self->{load_path}; 2106 my $f = new_from_file cf::object::thawer $self->{load_path};
2023 $f->skip_block; 2107 $f->skip_block;
2024 $self->_load_objects ($f) 2108 $self->_load_objects ($f)
2025 or return; 2109 or return;
2026 2110
2027 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2111 $self->post_load_original
2028 if delete $self->{load_original}; 2112 if delete $self->{load_original};
2029 2113
2030 if (my $uniq = $self->uniq_path) { 2114 if (my $uniq = $self->uniq_path) {
2031 utf8::encode $uniq; 2115 utf8::encode $uniq;
2032 unless (aio_stat $uniq) { 2116 unless (aio_stat $uniq) {
2050 unless ($self->{deny_activate}) { 2134 unless ($self->{deny_activate}) {
2051 $self->decay_objects; 2135 $self->decay_objects;
2052 $self->fix_auto_apply; 2136 $self->fix_auto_apply;
2053 $self->update_buttons; 2137 $self->update_buttons;
2054 cf::cede_to_tick; 2138 cf::cede_to_tick;
2055 $self->set_darkness_map;
2056 cf::cede_to_tick;
2057 $self->activate; 2139 $self->activate;
2058 } 2140 }
2059 2141
2060 $self->{last_save} = $cf::RUNTIME; 2142 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME); 2143 $self->last_access ($cf::RUNTIME);
2062 2144
2063 $self->in_memory (cf::MAP_IN_MEMORY); 2145 $self->in_memory (cf::MAP_ACTIVE);
2064 } 2146 }
2065 2147
2066 $self->post_load; 2148 $self->post_load;
2067} 2149}
2068 2150
2151# customize the map for a given player, i.e.
2152# return the _real_ map. used by e.g. per-player
2153# maps to change the path to ~playername/mappath
2069sub customise_for { 2154sub customise_for {
2070 my ($self, $ob) = @_; 2155 my ($self, $ob) = @_;
2071 2156
2072 return find "~" . $ob->name . "/" . $self->{path} 2157 return find "~" . $ob->name . "/" . $self->{path}
2073 if $self->per_player; 2158 if $self->per_player;
2089 or next; 2174 or next;
2090 $neigh = find $neigh, $map 2175 $neigh = find $neigh, $map
2091 or next; 2176 or next;
2092 $neigh->load; 2177 $neigh->load;
2093 2178
2179 # now find the diagonal neighbours
2094 push @neigh, 2180 push @neigh,
2095 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2181 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2096 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2182 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2097 } 2183 }
2098 2184
2105} 2191}
2106 2192
2107sub find_sync { 2193sub find_sync {
2108 my ($path, $origin) = @_; 2194 my ($path, $origin) = @_;
2109 2195
2110 cf::sync_job { find $path, $origin } 2196 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2197 if $Coro::current == $Coro::main;
2198
2199 find $path, $origin
2111} 2200}
2112 2201
2113sub do_load_sync { 2202sub do_load_sync {
2114 my ($map) = @_; 2203 my ($map) = @_;
2115 2204
2116 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2205 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2117 if $Coro::current == $Coro::main; 2206 if $Coro::current == $Coro::main;
2118 2207
2119 cf::sync_job { $map->load }; 2208 $map->load;
2120} 2209}
2121 2210
2122our %MAP_PREFETCH; 2211our %MAP_PREFETCH;
2123our $MAP_PREFETCHER = undef; 2212our $MAP_PREFETCHER = undef;
2124 2213
2126 my ($path, $origin, $load) = @_; 2215 my ($path, $origin, $load) = @_;
2127 2216
2128 $path = normalise $path, $origin && $origin->{path}; 2217 $path = normalise $path, $origin && $origin->{path};
2129 2218
2130 if (my $map = $cf::MAP{$path}) { 2219 if (my $map = $cf::MAP{$path}) {
2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2220 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2132 } 2221 }
2133 2222
2134 $MAP_PREFETCH{$path} |= $load; 2223 $MAP_PREFETCH{$path} |= $load;
2135 2224
2136 $MAP_PREFETCHER ||= cf::async { 2225 $MAP_PREFETCHER ||= cf::async {
2150 $MAP_PREFETCHER->prio (6); 2239 $MAP_PREFETCHER->prio (6);
2151 2240
2152 () 2241 ()
2153} 2242}
2154 2243
2244# common code, used by both ->save and ->swapout
2155sub save { 2245sub _save {
2156 my ($self) = @_; 2246 my ($self) = @_;
2157
2158 my $lock = cf::lock_acquire "map_data:$self->{path}";
2159 2247
2160 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2161 2249
2162 return unless $self->dirty; 2250 return unless $self->dirty;
2163 2251
2172 2260
2173 cf::async { 2261 cf::async {
2174 $Coro::current->{desc} = "map player save"; 2262 $Coro::current->{desc} = "map player save";
2175 $_->contr->save for $self->players; 2263 $_->contr->save for $self->players;
2176 }; 2264 };
2265
2266 cf::get_slot 0.02;
2177 2267
2178 if ($uniq) { 2268 if ($uniq) {
2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2269 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2180 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2270 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2181 } else { 2271 } else {
2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2272 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2183 } 2273 }
2184} 2274}
2185 2275
2276sub save {
2277 my ($self) = @_;
2278
2279 my $lock = cf::lock_acquire "map_data:$self->{path}";
2280
2281 $self->_save;
2282}
2283
2186sub swap_out { 2284sub swap_out {
2187 my ($self) = @_; 2285 my ($self) = @_;
2188 2286
2189 # save first because save cedes
2190 $self->save;
2191
2192 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2287 my $lock = cf::lock_acquire "map_data:$self->{path}";
2193 2288
2289 return if $self->in_memory != cf::MAP_ACTIVE;
2290 return if $self->{deny_save};
2194 return if $self->players; 2291 return if $self->players;
2195 return if $self->in_memory != cf::MAP_IN_MEMORY;
2196 return if $self->{deny_save};
2197 2292
2293 # first deactivate the map and "unlink" it from the core
2294 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP;
2198 $self->in_memory (cf::MAP_SWAPPED); 2296 $self->in_memory (cf::MAP_SWAPPED);
2297
2298 # then atomically save
2299 $self->_save;
2300
2301 # then free the map
2302 $self->clear;
2303}
2304
2305sub reset_at {
2306 my ($self) = @_;
2307
2308 # TODO: safety, remove and allow resettable per-player maps
2309 return 1e99 if $self->{deny_reset};
2310
2311 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2312 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2313
2314 $time + $to
2315}
2316
2317sub should_reset {
2318 my ($self) = @_;
2319
2320 $self->reset_at <= $cf::RUNTIME
2321}
2322
2323sub reset {
2324 my ($self) = @_;
2325
2326 my $lock = cf::lock_acquire "map_data:$self->{path}";
2327
2328 return if $self->players;
2329
2330 cf::trace "resetting map ", $self->path, "\n";
2331
2332 $self->in_memory (cf::MAP_SWAPPED);
2333
2334 # need to save uniques path
2335 unless ($self->{deny_save}) {
2336 my $uniq = $self->uniq_path; utf8::encode $uniq;
2337
2338 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2339 if $uniq;
2340 }
2341
2342 delete $cf::MAP{$self->path};
2199 2343
2200 $self->deactivate; 2344 $self->deactivate;
2201 $_->clear_links_to ($self) for values %cf::MAP; 2345 $_->clear_links_to ($self) for values %cf::MAP;
2202 $self->clear; 2346 $self->clear;
2203}
2204
2205sub reset_at {
2206 my ($self) = @_;
2207
2208 # TODO: safety, remove and allow resettable per-player maps
2209 return 1e99 if $self->{deny_reset};
2210
2211 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2212 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2213
2214 $time + $to
2215}
2216
2217sub should_reset {
2218 my ($self) = @_;
2219
2220 $self->reset_at <= $cf::RUNTIME
2221}
2222
2223sub reset {
2224 my ($self) = @_;
2225
2226 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227
2228 return if $self->players;
2229
2230 warn "resetting map ", $self->path;
2231
2232 $self->in_memory (cf::MAP_SWAPPED);
2233
2234 # need to save uniques path
2235 unless ($self->{deny_save}) {
2236 my $uniq = $self->uniq_path; utf8::encode $uniq;
2237
2238 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2239 if $uniq;
2240 }
2241
2242 delete $cf::MAP{$self->path};
2243
2244 $self->deactivate;
2245 $_->clear_links_to ($self) for values %cf::MAP;
2246 $self->clear;
2247 2347
2248 $self->unlink_save; 2348 $self->unlink_save;
2249 $self->destroy; 2349 $self->destroy;
2250} 2350}
2251 2351
2259 2359
2260 delete $cf::MAP{$self->path}; 2360 delete $cf::MAP{$self->path};
2261 2361
2262 $self->unlink_save; 2362 $self->unlink_save;
2263 2363
2264 bless $self, "cf::map"; 2364 bless $self, "cf::map::wrap";
2265 delete $self->{deny_reset}; 2365 delete $self->{deny_reset};
2266 $self->{deny_save} = 1; 2366 $self->{deny_save} = 1;
2267 $self->reset_timeout (1); 2367 $self->reset_timeout (1);
2268 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2368 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2269 2369
2318 2418
2319sub unique_maps() { 2419sub unique_maps() {
2320 [ 2420 [
2321 map { 2421 map {
2322 utf8::decode $_; 2422 utf8::decode $_;
2323 /\.map$/ 2423 s/\.map$//; # TODO future compatibility hack
2424 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2425 ? ()
2324 ? normalise $_ 2426 : normalise $_
2325 : ()
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2427 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2428 ]
2328} 2429}
2329 2430
2330package cf; 2431=item cf::map::static_maps
2432
2433Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2434file in the shared directory excluding F</styles> and F</editor>). May
2435block.
2436
2437=cut
2438
2439sub static_maps() {
2440 my @dirs = "";
2441 my @maps;
2442
2443 while (@dirs) {
2444 my $dir = shift @dirs;
2445
2446 next if $dir eq "/styles" || $dir eq "/editor";
2447
2448 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2449 or return;
2450
2451 for (@$files) {
2452 s/\.map$// or next;
2453 utf8::decode $_;
2454 push @maps, "$dir/$_";
2455 }
2456
2457 push @dirs, map "$dir/$_", @$dirs;
2458 }
2459
2460 \@maps
2461}
2331 2462
2332=back 2463=back
2333 2464
2334=head3 cf::object 2465=head3 cf::object
2335 2466
2339 2470
2340=over 4 2471=over 4
2341 2472
2342=item $ob->inv_recursive 2473=item $ob->inv_recursive
2343 2474
2344Returns the inventory of the object _and_ their inventories, recursively. 2475Returns the inventory of the object I<and> their inventories, recursively,
2476but I<not> the object itself.
2345 2477
2346=cut 2478=cut
2347 2479
2348sub inv_recursive_; 2480sub inv_recursive_;
2349sub inv_recursive_ { 2481sub inv_recursive_ {
2354 inv_recursive_ inv $_[0] 2486 inv_recursive_ inv $_[0]
2355} 2487}
2356 2488
2357=item $ref = $ob->ref 2489=item $ref = $ob->ref
2358 2490
2359creates and returns a persistent reference to an objetc that can be stored as a string. 2491Creates and returns a persistent reference to an object that can be stored as a string.
2360 2492
2361=item $ob = cf::object::deref ($refstring) 2493=item $ob = cf::object::deref ($refstring)
2362 2494
2363returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2495returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2364even if the object actually exists. May block. 2496even if the object actually exists. May block.
2396can be C<undef>. Does the right thing when the player is currently in a 2528can be C<undef>. Does the right thing when the player is currently in a
2397dialogue with the given NPC character. 2529dialogue with the given NPC character.
2398 2530
2399=cut 2531=cut
2400 2532
2533our $SAY_CHANNEL = {
2534 id => "say",
2535 title => "Map",
2536 reply => "say ",
2537 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2538};
2539
2540our $CHAT_CHANNEL = {
2541 id => "chat",
2542 title => "Chat",
2543 reply => "chat ",
2544 tooltip => "Player chat and shouts, global to the server.",
2545};
2546
2401# rough implementation of a future "reply" method that works 2547# rough implementation of a future "reply" method that works
2402# with dialog boxes. 2548# with dialog boxes.
2403#TODO: the first argument must go, split into a $npc->reply_to ( method 2549#TODO: the first argument must go, split into a $npc->reply_to ( method
2404sub cf::object::player::reply($$$;$) { 2550sub cf::object::player::reply($$$;$) {
2405 my ($self, $npc, $msg, $flags) = @_; 2551 my ($self, $npc, $msg, $flags) = @_;
2416 my $dialog = $pl->{npc_dialog}; 2562 my $dialog = $pl->{npc_dialog};
2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2563 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2418 2564
2419 } else { 2565 } else {
2420 $msg = $npc->name . " says: $msg" if $npc; 2566 $msg = $npc->name . " says: $msg" if $npc;
2421 $self->message ($msg, $flags); 2567 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2422 } 2568 }
2423 } 2569 }
2424} 2570}
2425 2571
2426=item $object->send_msg ($channel, $msg, $color, [extra...]) 2572=item $object->send_msg ($channel, $msg, $color, [extra...])
2451 2597
2452=item $player_object->enter_link 2598=item $player_object->enter_link
2453 2599
2454Freezes the player and moves him/her to a special map (C<{link}>). 2600Freezes the player and moves him/her to a special map (C<{link}>).
2455 2601
2456The player should be reasonably safe there for short amounts of time. You 2602The player should be reasonably safe there for short amounts of time (e.g.
2457I<MUST> call C<leave_link> as soon as possible, though. 2603for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2604though, as the player cannot control the character while it is on the link
2605map.
2458 2606
2459Will never block. 2607Will never block.
2460 2608
2461=item $player_object->leave_link ($map, $x, $y) 2609=item $player_object->leave_link ($map, $x, $y)
2462 2610
2482sub cf::object::player::enter_link { 2630sub cf::object::player::enter_link {
2483 my ($self) = @_; 2631 my ($self) = @_;
2484 2632
2485 $self->deactivate_recursive; 2633 $self->deactivate_recursive;
2486 2634
2635 ++$self->{_link_recursion};
2636
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2637 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2638
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2639 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2640 if $self->map && $self->map->{path} ne "{link}";
2491 2641
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2642 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2643}
2494 2644
2495sub cf::object::player::leave_link { 2645sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2646 my ($self, $map, $x, $y) = @_;
2497 2647
2514 ($x, $y) = (-1, -1) 2664 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2665 unless (defined $x) && (defined $y);
2516 2666
2517 # use -1 or undef as default coordinates, not 0, 0 2667 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2668 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2669 if $x <= 0 && $y <= 0;
2520 2670
2521 $map->load; 2671 $map->load;
2522 $map->load_neighbours; 2672 $map->load_neighbours;
2523 2673
2524 return unless $self->contr->active; 2674 return unless $self->contr->active;
2525 $self->activate_recursive;
2526 2675
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2676 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2677 if ($self->enter_map ($map, $x, $y)) {
2529} 2678 # entering was successful
2679 delete $self->{_link_recursion};
2680 # only activate afterwards, to support waiting in hooks
2681 $self->activate_recursive;
2682 }
2530 2683
2684}
2685
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2686=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2532 2687
2533Moves the player to the given map-path and coordinates by first freezing 2688Moves the player to the given map-path and coordinates by first freezing
2534her, loading and preparing them map, calling the provided $check callback 2689her, loading and preparing them map, calling the provided $check callback
2535that has to return the map if sucecssful, and then unfreezes the player on 2690that has to return the map if sucecssful, and then unfreezes the player on
2536the new (success) or old (failed) map position. In either case, $done will 2691the new (success) or old (failed) map position. In either case, $done will
2537be called at the end of this process. 2692be called at the end of this process.
2538 2693
2694Note that $check will be called with a potentially non-loaded map, so if
2695it needs a loaded map it has to call C<< ->load >>.
2696
2539=cut 2697=cut
2540 2698
2541our $GOTOGEN; 2699our $GOTOGEN;
2542 2700
2543sub cf::object::player::goto { 2701sub cf::object::player::goto {
2544 my ($self, $path, $x, $y, $check, $done) = @_; 2702 my ($self, $path, $x, $y, $check, $done) = @_;
2703
2704 if ($self->{_link_recursion} >= $MAX_LINKS) {
2705 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2706 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2707 ($path, $x, $y) = @$EMERGENCY_POSITION;
2708 }
2545 2709
2546 # do generation counting so two concurrent goto's will be executed in-order 2710 # do generation counting so two concurrent goto's will be executed in-order
2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2711 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2548 2712
2549 $self->enter_link; 2713 $self->enter_link;
2573 my $map = eval { 2737 my $map = eval {
2574 my $map = defined $path ? cf::map::find $path : undef; 2738 my $map = defined $path ? cf::map::find $path : undef;
2575 2739
2576 if ($map) { 2740 if ($map) {
2577 $map = $map->customise_for ($self); 2741 $map = $map->customise_for ($self);
2578 $map = $check->($map) if $check && $map; 2742 $map = $check->($map, $x, $y, $self) if $check && $map;
2579 } else { 2743 } else {
2580 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2744 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2581 } 2745 }
2582 2746
2583 $map 2747 $map
2591 if ($gen == $self->{_goto_generation}) { 2755 if ($gen == $self->{_goto_generation}) {
2592 delete $self->{_goto_generation}; 2756 delete $self->{_goto_generation};
2593 $self->leave_link ($map, $x, $y); 2757 $self->leave_link ($map, $x, $y);
2594 } 2758 }
2595 2759
2596 $done->() if $done; 2760 $done->($self) if $done;
2597 })->prio (1); 2761 })->prio (1);
2598} 2762}
2599 2763
2600=item $player_object->enter_exit ($exit_object) 2764=item $player_object->enter_exit ($exit_object)
2601 2765
2621} 2785}
2622 2786
2623sub prepare_random_map { 2787sub prepare_random_map {
2624 my ($exit) = @_; 2788 my ($exit) = @_;
2625 2789
2626 my $guard = cf::lock_acquire "exit_prepare:$exit";
2627
2628 # all this does is basically replace the /! path by 2790 # all this does is basically replace the /! path by
2629 # a new random map path (?random/...) with a seed 2791 # a new random map path (?random/...) with a seed
2630 # that depends on the exit object 2792 # that depends on the exit object
2631 2793
2632 my $rmp = parse_random_map_params $exit->msg; 2794 my $rmp = parse_random_map_params $exit->msg;
2634 if ($exit->map) { 2796 if ($exit->map) {
2635 $rmp->{region} = $exit->region->name; 2797 $rmp->{region} = $exit->region->name;
2636 $rmp->{origin_map} = $exit->map->path; 2798 $rmp->{origin_map} = $exit->map->path;
2637 $rmp->{origin_x} = $exit->x; 2799 $rmp->{origin_x} = $exit->x;
2638 $rmp->{origin_y} = $exit->y; 2800 $rmp->{origin_y} = $exit->y;
2801
2802 $exit->map->touch;
2639 } 2803 }
2640 2804
2641 $rmp->{random_seed} ||= $exit->random_seed; 2805 $rmp->{random_seed} ||= $exit->random_seed;
2642 2806
2643 my $data = cf::encode_json $rmp; 2807 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2644 my $md5 = Digest::MD5::md5_hex $data; 2808 my $md5 = Digest::MD5::md5_hex $data;
2645 my $meta = "$RANDOMDIR/$md5.meta"; 2809 my $meta = "$RANDOMDIR/$md5.meta";
2646 2810
2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2811 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2648 aio_write $fh, 0, (length $data), $data, 0; 2812 aio_write $fh, 0, (length $data), $data, 0;
2649 undef $fh; 2813 undef $fh;
2650 aio_rename "$meta~", $meta; 2814 aio_rename "$meta~", $meta;
2651 2815
2816 my $slaying = "?random/$md5";
2817
2818 if ($exit->valid) {
2652 $exit->slaying ("?random/$md5"); 2819 $exit->slaying ("?random/$md5");
2653 $exit->msg (undef); 2820 $exit->msg (undef);
2821 }
2654 } 2822 }
2655} 2823}
2656 2824
2657sub cf::object::player::enter_exit { 2825sub cf::object::player::enter_exit {
2658 my ($self, $exit) = @_; 2826 my ($self, $exit) = @_;
2659 2827
2660 return unless $self->type == cf::PLAYER; 2828 return unless $self->type == cf::PLAYER;
2661 2829
2662 if ($exit->slaying eq "/!") {
2663 #TODO: this should de-fi-ni-te-ly not be a sync-job
2664 # the problem is that $exit might not survive long enough
2665 # so it needs to be done right now, right here
2666 cf::sync_job { prepare_random_map $exit };
2667 }
2668
2669 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2670 my $hp = $exit->stats->hp;
2671 my $sp = $exit->stats->sp;
2672
2673 $self->enter_link; 2830 $self->enter_link;
2674 2831
2675 # if exit is damned, update players death & WoR home-position
2676 $self->contr->savebed ($slaying, $hp, $sp)
2677 if $exit->flag (FLAG_DAMNED);
2678
2679 (async { 2832 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2833 $Coro::current->{desc} = "enter_exit";
2681 2834
2682 $self->deactivate_recursive; # just to be sure
2683 unless (eval { 2835 unless (eval {
2836 $self->deactivate_recursive; # just to be sure
2837
2838 # random map handling
2839 {
2840 my $guard = cf::lock_acquire "exit_prepare:$exit";
2841
2842 prepare_random_map $exit
2843 if $exit->slaying eq "/!";
2844 }
2845
2846 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2847 my $x = $exit->stats->hp;
2848 my $y = $exit->stats->sp;
2849
2684 $self->goto ($slaying, $hp, $sp); 2850 $self->goto ($map, $x, $y);
2685 2851
2852 # if exit is damned, update players death & WoR home-position
2853 $self->contr->savebed ($map, $x, $y)
2854 if $exit->flag (cf::FLAG_DAMNED);
2855
2686 1; 2856 1
2687 }) { 2857 }) {
2688 $self->message ("Something went wrong deep within the crossfire server. " 2858 $self->message ("Something went wrong deep within the deliantra server. "
2689 . "I'll try to bring you back to the map you were before. " 2859 . "I'll try to bring you back to the map you were before. "
2690 . "Please report this to the dungeon master!", 2860 . "Please report this to the dungeon master!",
2691 cf::NDI_UNIQUE | cf::NDI_RED); 2861 cf::NDI_UNIQUE | cf::NDI_RED);
2692 2862
2693 warn "ERROR in enter_exit: $@"; 2863 error "ERROR in enter_exit: $@";
2694 $self->leave_link; 2864 $self->leave_link;
2695 } 2865 }
2696 })->prio (1); 2866 })->prio (1);
2697} 2867}
2698 2868
2710sub cf::client::send_drawinfo { 2880sub cf::client::send_drawinfo {
2711 my ($self, $text, $flags) = @_; 2881 my ($self, $text, $flags) = @_;
2712 2882
2713 utf8::encode $text; 2883 utf8::encode $text;
2714 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2884 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2885}
2886
2887=item $client->send_big_packet ($pkt)
2888
2889Like C<send_packet>, but tries to compress large packets, and fragments
2890them as required.
2891
2892=cut
2893
2894our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2895
2896sub cf::client::send_big_packet {
2897 my ($self, $pkt) = @_;
2898
2899 # try lzf for large packets
2900 $pkt = "lzf " . Compress::LZF::compress $pkt
2901 if 1024 <= length $pkt and $self->{can_lzf};
2902
2903 # split very large packets
2904 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2905 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2906 $pkt = "frag";
2907 }
2908
2909 $self->send_packet ($pkt);
2715} 2910}
2716 2911
2717=item $client->send_msg ($channel, $msg, $color, [extra...]) 2912=item $client->send_msg ($channel, $msg, $color, [extra...])
2718 2913
2719Send a drawinfo or msg packet to the client, formatting the msg for the 2914Send a drawinfo or msg packet to the client, formatting the msg for the
2723 2918
2724=cut 2919=cut
2725 2920
2726# non-persistent channels (usually the info channel) 2921# non-persistent channels (usually the info channel)
2727our %CHANNEL = ( 2922our %CHANNEL = (
2923 "c/motd" => {
2924 id => "infobox",
2925 title => "MOTD",
2926 reply => undef,
2927 tooltip => "The message of the day",
2928 },
2728 "c/identify" => { 2929 "c/identify" => {
2729 id => "infobox", 2930 id => "infobox",
2730 title => "Identify", 2931 title => "Identify",
2731 reply => undef, 2932 reply => undef,
2732 tooltip => "Items recently identified", 2933 tooltip => "Items recently identified",
2734 "c/examine" => { 2935 "c/examine" => {
2735 id => "infobox", 2936 id => "infobox",
2736 title => "Examine", 2937 title => "Examine",
2737 reply => undef, 2938 reply => undef,
2738 tooltip => "Signs and other items you examined", 2939 tooltip => "Signs and other items you examined",
2940 },
2941 "c/shopinfo" => {
2942 id => "infobox",
2943 title => "Shop Info",
2944 reply => undef,
2945 tooltip => "What your bargaining skill tells you about the shop",
2739 }, 2946 },
2740 "c/book" => { 2947 "c/book" => {
2741 id => "infobox", 2948 id => "infobox",
2742 title => "Book", 2949 title => "Book",
2743 reply => undef, 2950 reply => undef,
2759 id => "infobox", 2966 id => "infobox",
2760 title => "Body Parts", 2967 title => "Body Parts",
2761 reply => undef, 2968 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available", 2969 tooltip => "Shows which body parts you posess and are available",
2763 }, 2970 },
2971 "c/statistics" => {
2972 id => "infobox",
2973 title => "Statistics",
2974 reply => undef,
2975 tooltip => "Shows your primary statistics",
2976 },
2977 "c/skills" => {
2978 id => "infobox",
2979 title => "Skills",
2980 reply => undef,
2981 tooltip => "Shows your experience per skill and item power",
2982 },
2983 "c/shopitems" => {
2984 id => "infobox",
2985 title => "Shop Items",
2986 reply => undef,
2987 tooltip => "Shows the items currently for sale in this shop",
2988 },
2989 "c/resistances" => {
2990 id => "infobox",
2991 title => "Resistances",
2992 reply => undef,
2993 tooltip => "Shows your resistances",
2994 },
2995 "c/pets" => {
2996 id => "infobox",
2997 title => "Pets",
2998 reply => undef,
2999 tooltip => "Shows information abotu your pets/a specific pet",
3000 },
3001 "c/perceiveself" => {
3002 id => "infobox",
3003 title => "Perceive Self",
3004 reply => undef,
3005 tooltip => "You gained detailed knowledge about yourself",
3006 },
2764 "c/uptime" => { 3007 "c/uptime" => {
2765 id => "infobox", 3008 id => "infobox",
2766 title => "Uptime", 3009 title => "Uptime",
2767 reply => undef, 3010 reply => undef,
2768 tooltip => "How long the server has been running since last restart", 3011 tooltip => "How long the server has been running since last restart",
2771 id => "infobox", 3014 id => "infobox",
2772 title => "Map Info", 3015 title => "Map Info",
2773 reply => undef, 3016 reply => undef,
2774 tooltip => "Information related to the maps", 3017 tooltip => "Information related to the maps",
2775 }, 3018 },
3019 "c/party" => {
3020 id => "party",
3021 title => "Party",
3022 reply => "gsay ",
3023 tooltip => "Messages and chat related to your party",
3024 },
3025 "c/death" => {
3026 id => "death",
3027 title => "Death",
3028 reply => undef,
3029 tooltip => "Reason for and more info about your most recent death",
3030 },
3031 "c/say" => $SAY_CHANNEL,
3032 "c/chat" => $CHAT_CHANNEL,
2776); 3033);
2777 3034
2778sub cf::client::send_msg { 3035sub cf::client::send_msg {
2779 my ($self, $channel, $msg, $color, @extra) = @_; 3036 my ($self, $channel, $msg, $color, @extra) = @_;
2780 3037
2781 $msg = $self->pl->expand_cfpod ($msg); 3038 $msg = $self->pl->expand_cfpod ($msg)
3039 unless $color & cf::NDI_VERBATIM;
2782 3040
2783 $color &= cf::NDI_CLIENT_MASK; # just in case... 3041 $color &= cf::NDI_CLIENT_MASK; # just in case...
2784 3042
2785 # check predefined channels, for the benefit of C 3043 # check predefined channels, for the benefit of C
2786 if ($CHANNEL{$channel}) { 3044 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel}; 3045 $channel = $CHANNEL{$channel};
2788 3046
2789 $self->ext_msg (channel_info => $channel) 3047 $self->ext_msg (channel_info => $channel);
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id}; 3048 $channel = $channel->{id};
2793 3049
2794 } elsif (ref $channel) { 3050 } elsif (ref $channel) {
2795 # send meta info to client, if not yet sent 3051 # send meta info to client, if not yet sent
2796 unless (exists $self->{channel}{$channel->{id}}) { 3052 unless (exists $self->{channel}{$channel->{id}}) {
2797 $self->{channel}{$channel->{id}} = $channel; 3053 $self->{channel}{$channel->{id}} = $channel;
2798 $self->ext_msg (channel_info => $channel) 3054 $self->ext_msg (channel_info => $channel);
2799 if $self->can_msg;
2800 } 3055 }
2801 3056
2802 $channel = $channel->{id}; 3057 $channel = $channel->{id};
2803 } 3058 }
2804 3059
2805 return unless @extra || length $msg; 3060 return unless @extra || length $msg;
2806 3061
2807 if ($self->can_msg) {
2808 # default colour, mask it out 3062 # default colour, mask it out
2809 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3063 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2810 if $color & cf::NDI_DEF; 3064 if $color & cf::NDI_DEF;
2811 3065
2812 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3066 my $pkt = "msg "
3067 . $self->{json_coder}->encode (
2813 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3068 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2814 } else { 3069 );
2815 if ($color >= 0) {
2816 # replace some tags by gcfclient-compatible ones
2817 for ($msg) {
2818 1 while
2819 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2820 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2821 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2822 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2823 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2824 }
2825 3070
2826 $color &= cf::NDI_COLOR_MASK; 3071 $self->send_big_packet ($pkt);
2827
2828 utf8::encode $msg;
2829
2830 if (0 && $msg =~ /\[/) {
2831 # COMMAND/INFO
2832 $self->send_packet ("drawextinfo $color 10 8 $msg")
2833 } else {
2834 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2835 $self->send_packet ("drawinfo $color $msg")
2836 }
2837 }
2838 }
2839} 3072}
2840 3073
2841=item $client->ext_msg ($type, @msg) 3074=item $client->ext_msg ($type, @msg)
2842 3075
2843Sends an ext event to the client. 3076Sends an ext event to the client.
2846 3079
2847sub cf::client::ext_msg($$@) { 3080sub cf::client::ext_msg($$@) {
2848 my ($self, $type, @msg) = @_; 3081 my ($self, $type, @msg) = @_;
2849 3082
2850 if ($self->extcmd == 2) { 3083 if ($self->extcmd == 2) {
2851 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3084 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2852 } elsif ($self->extcmd == 1) { # TODO: remove 3085 } elsif ($self->extcmd == 1) { # TODO: remove
2853 push @msg, msgtype => "event_$type"; 3086 push @msg, msgtype => "event_$type";
2854 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3087 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2855 } 3088 }
2856} 3089}
2857 3090
2858=item $client->ext_reply ($msgid, @msg) 3091=item $client->ext_reply ($msgid, @msg)
2859 3092
2863 3096
2864sub cf::client::ext_reply($$@) { 3097sub cf::client::ext_reply($$@) {
2865 my ($self, $id, @msg) = @_; 3098 my ($self, $id, @msg) = @_;
2866 3099
2867 if ($self->extcmd == 2) { 3100 if ($self->extcmd == 2) {
2868 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2869 } elsif ($self->extcmd == 1) { 3102 } elsif ($self->extcmd == 1) {
2870 #TODO: version 1, remove 3103 #TODO: version 1, remove
2871 unshift @msg, msgtype => "reply", msgid => $id; 3104 unshift @msg, msgtype => "reply", msgid => $id;
2872 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3105 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2873 } 3106 }
2874} 3107}
2875 3108
2876=item $success = $client->query ($flags, "text", \&cb) 3109=item $success = $client->query ($flags, "text", \&cb)
2877 3110
2948 3181
2949 $ns->ext_reply ($reply, @reply) 3182 $ns->ext_reply ($reply, @reply)
2950 if $reply; 3183 if $reply;
2951 3184
2952 } else { 3185 } else {
2953 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3186 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2954 } 3187 }
2955 3188
2956 cf::override; 3189 cf::override;
2957 }, 3190 },
2958); 3191);
2978 3211
2979 $coro 3212 $coro
2980} 3213}
2981 3214
2982cf::client->attach ( 3215cf::client->attach (
2983 on_destroy => sub { 3216 on_client_destroy => sub {
2984 my ($ns) = @_; 3217 my ($ns) = @_;
2985 3218
2986 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3219 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2987 }, 3220 },
2988); 3221);
3004our $safe_hole = new Safe::Hole; 3237our $safe_hole = new Safe::Hole;
3005 3238
3006$SIG{FPE} = 'IGNORE'; 3239$SIG{FPE} = 'IGNORE';
3007 3240
3008$safe->permit_only (Opcode::opset qw( 3241$safe->permit_only (Opcode::opset qw(
3009 :base_core :base_mem :base_orig :base_math 3242 :base_core :base_mem :base_orig :base_math :base_loop
3010 grepstart grepwhile mapstart mapwhile 3243 grepstart grepwhile mapstart mapwhile
3011 sort time 3244 sort time
3012)); 3245));
3013 3246
3014# here we export the classes and methods available to script code 3247# here we export the classes and methods available to script code
3017 3250
3018The following functions and methods are available within a safe environment: 3251The following functions and methods are available within a safe environment:
3019 3252
3020 cf::object 3253 cf::object
3021 contr pay_amount pay_player map x y force_find force_add destroy 3254 contr pay_amount pay_player map x y force_find force_add destroy
3022 insert remove name archname title slaying race decrease_ob_nr 3255 insert remove name archname title slaying race decrease split
3256 value
3023 3257
3024 cf::object::player 3258 cf::object::player
3025 player 3259 player
3026 3260
3027 cf::player 3261 cf::player
3032 3266
3033=cut 3267=cut
3034 3268
3035for ( 3269for (
3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3270 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3037 insert remove inv name archname title slaying race 3271 insert remove inv nrof name archname title slaying race
3038 decrease_ob_nr destroy)], 3272 decrease split destroy change_exp value msg lore send_msg)],
3039 ["cf::object::player" => qw(player)], 3273 ["cf::object::player" => qw(player)],
3040 ["cf::player" => qw(peaceful)], 3274 ["cf::player" => qw(peaceful send_msg)],
3041 ["cf::map" => qw(trigger)], 3275 ["cf::map" => qw(trigger)],
3042) { 3276) {
3043 no strict 'refs';
3044 my ($pkg, @funs) = @$_; 3277 my ($pkg, @funs) = @$_;
3045 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3278 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3046 for @funs; 3279 for @funs;
3047} 3280}
3048 3281
3063 3296
3064 my $qcode = $code; 3297 my $qcode = $code;
3065 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3298 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3066 $qcode =~ s/\n/\\n/g; 3299 $qcode =~ s/\n/\\n/g;
3067 3300
3301 %vars = (_dummy => 0) unless %vars;
3302
3303 my @res;
3068 local $_; 3304 local $_;
3069 local @safe::cf::_safe_eval_args = values %vars;
3070 3305
3071 my $eval = 3306 my $eval =
3072 "do {\n" 3307 "do {\n"
3073 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3308 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3074 . "#line 0 \"{$qcode}\"\n" 3309 . "#line 0 \"{$qcode}\"\n"
3075 . $code 3310 . $code
3076 . "\n}" 3311 . "\n}"
3077 ; 3312 ;
3078 3313
3314 if ($CFG{safe_eval}) {
3079 sub_generation_inc; 3315 sub_generation_inc;
3316 local @safe::cf::_safe_eval_args = values %vars;
3080 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3317 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3081 sub_generation_inc; 3318 sub_generation_inc;
3319 } else {
3320 local @cf::_safe_eval_args = values %vars;
3321 @res = wantarray ? eval eval : scalar eval $eval;
3322 }
3082 3323
3083 if ($@) { 3324 if ($@) {
3084 warn "$@"; 3325 warn "$@",
3085 warn "while executing safe code '$code'\n"; 3326 "while executing safe code '$code'\n",
3086 warn "with arguments " . (join " ", %vars) . "\n"; 3327 "with arguments " . (join " ", %vars) . "\n";
3087 } 3328 }
3088 3329
3089 wantarray ? @res : $res[0] 3330 wantarray ? @res : $res[0]
3090} 3331}
3091 3332
3105=cut 3346=cut
3106 3347
3107sub register_script_function { 3348sub register_script_function {
3108 my ($fun, $cb) = @_; 3349 my ($fun, $cb) = @_;
3109 3350
3110 no strict 'refs'; 3351 $fun = "safe::$fun" if $CFG{safe_eval};
3111 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3352 *$fun = $safe_hole->wrap ($cb);
3112} 3353}
3113 3354
3114=back 3355=back
3115 3356
3116=cut 3357=cut
3117 3358
3118############################################################################# 3359#############################################################################
3119# the server's init and main functions 3360# the server's init and main functions
3361
3362# async inc loader. yay.
3363sub inc_loader {
3364 my $mod = $_[1];
3365
3366 if (in_main && !tick_inhibit) {
3367 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3368 } else {
3369 debug "loading perl module $mod\n";
3370 }
3371
3372 # 1. find real file
3373 for my $dir (@ORIG_INC) {
3374 ref $dir and next;
3375 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3376 or next;
3377
3378 $data = "#line 1 $dir/$mod\n$data";
3379
3380 open my $fh, "<", \$data or die;
3381
3382 return $fh;
3383 }
3384
3385 ()
3386}
3387
3388sub init_inc {
3389 # save original @INC
3390 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3391
3392 # make sure we can do scalar-opens
3393 open my $dummy, "<", \my $dummy2;
3394
3395 # execute some stuff so perl load's some of the core modules
3396 /Ü/ =~ /ü/i;
3397 eval { &Storable::nstore_fd };
3398
3399 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3400
3401 debug "module loading will be asynchronous from this point on.";
3402}
3120 3403
3121sub load_facedata($) { 3404sub load_facedata($) {
3122 my ($path) = @_; 3405 my ($path) = @_;
3123 3406
3124 # HACK to clear player env face cache, we need some signal framework 3407 # HACK to clear player env face cache, we need some signal framework
3125 # for this (global event?) 3408 # for this (global event?)
3126 %ext::player_env::MUSIC_FACE_CACHE = (); 3409 %ext::player_env::MUSIC_FACE_CACHE = ();
3127 3410
3128 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3411 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3129 3412
3130 warn "loading facedata from $path\n"; 3413 trace "loading facedata from $path\n";
3131 3414
3132 my $facedata; 3415 my $facedata;
3133 0 < aio_load $path, $facedata 3416 0 < aio_load $path, $facedata
3134 or die "$path: $!"; 3417 or die "$path: $!";
3135 3418
3137 3420
3138 $facedata->{version} == 2 3421 $facedata->{version} == 2
3139 or cf::cleanup "$path: version mismatch, cannot proceed."; 3422 or cf::cleanup "$path: version mismatch, cannot proceed.";
3140 3423
3141 # patch in the exptable 3424 # patch in the exptable
3425 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3142 $facedata->{resource}{"res/exp_table"} = { 3426 $facedata->{resource}{"res/exp_table"} = {
3143 type => FT_RSRC, 3427 type => FT_RSRC,
3144 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3428 data => $exp_table,
3429 hash => (Digest::MD5::md5 $exp_table),
3145 }; 3430 };
3146 cf::cede_to_tick; 3431 cf::cede_to_tick;
3147 3432
3148 { 3433 {
3149 my $faces = $facedata->{faceinfo}; 3434 my $faces = $facedata->{faceinfo};
3150 3435
3151 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
3152 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3437 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3438
3153 cf::face::set_visibility $idx, $info->{visibility}; 3439 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap}; 3440 cf::face::set_magicmap $idx, $info->{magicmap};
3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3441 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3156 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3442 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3157 3443
3158 cf::cede_to_tick; 3444 cf::cede_to_tick;
3159 } 3445 }
3160 3446
3161 while (my ($face, $info) = each %$faces) { 3447 while (my ($face, $info) = each %$faces) {
3162 next unless $info->{smooth}; 3448 next unless $info->{smooth};
3449
3163 my $idx = cf::face::find $face 3450 my $idx = cf::face::find $face
3164 or next; 3451 or next;
3452
3165 if (my $smooth = cf::face::find $info->{smooth}) { 3453 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth; 3454 cf::face::set_smooth $idx, $smooth;
3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3455 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3168 } else { 3456 } else {
3169 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3457 error "smooth face '$info->{smooth}' not found for face '$face'";
3170 } 3458 }
3171 3459
3172 cf::cede_to_tick; 3460 cf::cede_to_tick;
3173 } 3461 }
3174 } 3462 }
3183 3471
3184 cf::anim::invalidate_all; # d'oh 3472 cf::anim::invalidate_all; # d'oh
3185 } 3473 }
3186 3474
3187 { 3475 {
3188 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource}; 3476 my $res = $facedata->{resource};
3191 3477
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) { 3478 while (my ($name, $info) = each %$res) {
3479 if (defined $info->{type}) {
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3480 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data;
3197 3481
3198 if ($info->{type} & 1) { 3482 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3199 # prepend meta info 3483 cf::face::set_type $idx, $info->{type};
3200
3201 my $meta = $enc->encode ({
3202 name => $name,
3203 %{ $info->{meta} || {} },
3204 });
3205
3206 $data = pack "(w/a*)*", $meta, $info->{data};
3207 } else { 3484 } else {
3208 $data = $info->{data}; 3485 $RESOURCE{$name} = $info; # unused
3209 } 3486 }
3210 3487
3211 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3212 cf::face::set_type $idx, $info->{type};
3213
3214 cf::cede_to_tick; 3488 cf::cede_to_tick;
3215 } 3489 }
3216
3217 if ($soundconf) {
3218 $soundconf = $enc->decode (delete $soundconf->{data});
3219
3220 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3221 my $sound = $soundconf->{compat}[$_]
3222 or next;
3223
3224 my $face = cf::face::find "sound/$sound->[1]";
3225 cf::sound::set $sound->[0] => $face;
3226 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3227 }
3228
3229 while (my ($k, $v) = each %{$soundconf->{event}}) {
3230 my $face = cf::face::find "sound/$v";
3231 cf::sound::set $k => $face;
3232 }
3233 }
3234 } 3490 }
3491
3492 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3235 3493
3236 1 3494 1
3237} 3495}
3238 3496
3239register_exticmd fx_want => sub { 3497register_exticmd fx_want => sub {
3241 3499
3242 while (my ($k, $v) = each %$want) { 3500 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v); 3501 $ns->fx_want ($k, $v);
3244 } 3502 }
3245}; 3503};
3504
3505sub load_resource_file($) {
3506 my $guard = lock_acquire "load_resource_file";
3507
3508 my $status = load_resource_file_ $_[0];
3509 get_slot 0.1, 100;
3510 cf::arch::commit_load;
3511
3512 $status
3513}
3246 3514
3247sub reload_regions { 3515sub reload_regions {
3248 # HACK to clear player env face cache, we need some signal framework 3516 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?) 3517 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = (); 3518 %ext::player_env::MUSIC_FACE_CACHE = ();
3264} 3532}
3265 3533
3266sub reload_archetypes { 3534sub reload_archetypes {
3267 load_resource_file "$DATADIR/archetypes" 3535 load_resource_file "$DATADIR/archetypes"
3268 or die "unable to load archetypes\n"; 3536 or die "unable to load archetypes\n";
3269 #d# NEED to laod twice to resolve forward references
3270 # this really needs to be done in an extra post-pass
3271 # (which needs to be synchronous, so solve it differently)
3272 load_resource_file "$DATADIR/archetypes"
3273 or die "unable to load archetypes\n";
3274} 3537}
3275 3538
3276sub reload_treasures { 3539sub reload_treasures {
3277 load_resource_file "$DATADIR/treasures" 3540 load_resource_file "$DATADIR/treasures"
3278 or die "unable to load treasurelists\n"; 3541 or die "unable to load treasurelists\n";
3279} 3542}
3280 3543
3544sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n";
3546
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3551
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_]
3554 or next;
3555
3556 my $face = cf::face::find "sound/$sound->[1]";
3557 cf::sound::set $sound->[0] => $face;
3558 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3559 }
3560
3561 while (my ($k, $v) = each %{$soundconf->{event}}) {
3562 my $face = cf::face::find "sound/$v";
3563 cf::sound::set $k => $face;
3564 }
3565}
3566
3281sub reload_resources { 3567sub reload_resources {
3282 warn "reloading resource files...\n"; 3568 trace "reloading resource files...\n";
3283 3569
3570 reload_facedata;
3571 reload_sound;
3572 reload_archetypes;
3284 reload_regions; 3573 reload_regions;
3285 reload_facedata;
3286 #reload_archetypes;#d#
3287 reload_archetypes;
3288 reload_treasures; 3574 reload_treasures;
3289 3575
3290 warn "finished reloading resource files\n"; 3576 trace "finished reloading resource files\n";
3291}
3292
3293sub init {
3294 reload_resources;
3295} 3577}
3296 3578
3297sub reload_config { 3579sub reload_config {
3580 trace "reloading config file...\n";
3581
3298 open my $fh, "<:utf8", "$CONFDIR/config" 3582 open my $fh, "<:utf8", "$CONFDIR/config"
3299 or return; 3583 or return;
3300 3584
3301 local $/; 3585 local $/;
3302 *CFG = YAML::Syck::Load <$fh>; 3586 *CFG = YAML::XS::Load scalar <$fh>;
3303 3587
3304 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3588 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3305 3589
3306 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3590 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3307 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3591 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3308 3592
3309 if (exists $CFG{mlockall}) { 3593 if (exists $CFG{mlockall}) {
3311 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3595 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3312 and die "WARNING: m(un)lockall failed: $!\n"; 3596 and die "WARNING: m(un)lockall failed: $!\n";
3313 }; 3597 };
3314 warn $@ if $@; 3598 warn $@ if $@;
3315 } 3599 }
3600
3601 trace "finished reloading resource files\n";
3602}
3603
3604sub pidfile() {
3605 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3606 or die "$PIDFILE: $!";
3607 flock $fh, &Fcntl::LOCK_EX
3608 or die "$PIDFILE: flock: $!";
3609 $fh
3610}
3611
3612# make sure only one server instance is running at any one time
3613sub atomic {
3614 my $fh = pidfile;
3615
3616 my $pid = <$fh>;
3617 kill 9, $pid if $pid > 0;
3618
3619 seek $fh, 0, 0;
3620 print $fh $$;
3621}
3622
3623sub main_loop {
3624 trace "EV::loop starting\n";
3625 if (1) {
3626 EV::loop;
3627 }
3628 trace "EV::loop returned\n";
3629 goto &main_loop unless $REALLY_UNLOOP;
3316} 3630}
3317 3631
3318sub main { 3632sub main {
3633 cf::init_globals; # initialise logging
3634
3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3636 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3638 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3639
3640 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3641
3319 # we must not ever block the main coroutine 3642 # we must not ever block the main coroutine
3320 local $Coro::idle = sub { 3643 local $Coro::idle = sub {
3321 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3644 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3322 (async { 3645 (async {
3323 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3646 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT; 3647 EV::loop EV::LOOP_ONESHOT;
3325 })->prio (Coro::PRIO_MAX); 3648 })->prio (Coro::PRIO_MAX);
3326 }; 3649 };
3327 3650
3651 evthread_start IO::AIO::poll_fileno;
3652
3653 cf::sync_job {
3654 init_inc;
3655
3656 cf::init_experience;
3657 cf::init_anim;
3658 cf::init_attackmess;
3659 cf::init_dynamic;
3660
3661 cf::load_settings;
3662 cf::load_materials;
3663
3664 reload_resources;
3328 reload_config; 3665 reload_config;
3329 db_init; 3666 db_init;
3667
3668 cf::init_uuid;
3669 cf::init_signals;
3670 cf::init_skills;
3671
3672 cf::init_beforeplay;
3673
3674 atomic;
3675
3330 load_extensions; 3676 load_extensions;
3331 3677
3332 $TICK_WATCHER->start; 3678 utime time, time, $RUNTIMEFILE;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3679
3334 EV::loop; 3680 # no (long-running) fork's whatsoever before this point(!)
3681 use POSIX ();
3682 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3683
3684 (pop @POST_INIT)->(0) while @POST_INIT;
3685 };
3686
3687 cf::object::thawer::errors_are_fatal 0;
3688 info "parse errors in files are no longer fatal from this point on.\n";
3689
3690 my $free_main; $free_main = EV::idle sub {
3691 undef $free_main;
3692 undef &main; # free gobs of memory :)
3693 };
3694
3695 goto &main_loop;
3335} 3696}
3336 3697
3337############################################################################# 3698#############################################################################
3338# initialisation and cleanup 3699# initialisation and cleanup
3339 3700
3340# install some emergency cleanup handlers 3701# install some emergency cleanup handlers
3341BEGIN { 3702BEGIN {
3342 our %SIGWATCHER = (); 3703 our %SIGWATCHER = ();
3343 for my $signal (qw(INT HUP TERM)) { 3704 for my $signal (qw(INT HUP TERM)) {
3344 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3705 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3345 cf::cleanup "SIG$signal"; 3706 cf::cleanup "SIG$signal";
3346 }; 3707 };
3347 } 3708 }
3348} 3709}
3349 3710
3350sub write_runtime { 3711sub write_runtime_sync {
3351 my $runtime = "$LOCALDIR/runtime"; 3712 my $t0 = AE::time;
3352 3713
3353 # first touch the runtime file to show we are still running: 3714 # first touch the runtime file to show we are still running:
3354 # the fsync below can take a very very long time. 3715 # the fsync below can take a very very long time.
3355 3716
3356 IO::AIO::aio_utime $runtime, undef, undef; 3717 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3357 3718
3358 my $guard = cf::lock_acquire "write_runtime"; 3719 my $guard = cf::lock_acquire "write_runtime";
3359 3720
3360 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3721 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3361 or return; 3722 or return;
3362 3723
3363 my $value = $cf::RUNTIME + 90 + 10; 3724 my $value = $cf::RUNTIME + 90 + 10;
3364 # 10 is the runtime save interval, for a monotonic clock 3725 # 10 is the runtime save interval, for a monotonic clock
3365 # 60 allows for the watchdog to kill the server. 3726 # 60 allows for the watchdog to kill the server.
3375 aio_utime $fh, undef, undef; 3736 aio_utime $fh, undef, undef;
3376 3737
3377 close $fh 3738 close $fh
3378 or return; 3739 or return;
3379 3740
3380 aio_rename "$runtime~", $runtime 3741 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3381 and return; 3742 and return;
3382 3743
3383 warn "runtime file written.\n"; 3744 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3384 3745
3385 1 3746 1
3747}
3748
3749our $uuid_lock;
3750our $uuid_skip;
3751
3752sub write_uuid_sync($) {
3753 $uuid_skip ||= $_[0];
3754
3755 return if $uuid_lock;
3756 local $uuid_lock = 1;
3757
3758 my $uuid = "$LOCALDIR/uuid";
3759
3760 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3761 or return;
3762
3763 my $value = uuid_seq uuid_cur;
3764
3765 unless ($value) {
3766 info "cowardly refusing to write zero uuid value!\n";
3767 return;
3768 }
3769
3770 my $value = uuid_str $value + $uuid_skip;
3771 $uuid_skip = 0;
3772
3773 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3774 and return;
3775
3776 # always fsync - this file is important
3777 aio_fsync $fh
3778 and return;
3779
3780 close $fh
3781 or return;
3782
3783 aio_rename "$uuid~", $uuid
3784 and return;
3785
3786 trace "uuid file written ($value).\n";
3787
3788 1
3789
3790}
3791
3792sub write_uuid($$) {
3793 my ($skip, $sync) = @_;
3794
3795 $sync ? write_uuid_sync $skip
3796 : async { write_uuid_sync $skip };
3386} 3797}
3387 3798
3388sub emergency_save() { 3799sub emergency_save() {
3389 my $freeze_guard = cf::freeze_mainloop; 3800 my $freeze_guard = cf::freeze_mainloop;
3390 3801
3391 warn "enter emergency perl save\n"; 3802 info "emergency_perl_save: enter\n";
3803
3804 # this is a trade-off: we want to be very quick here, so
3805 # save all maps without fsync, and later call a global sync
3806 # (which in turn might be very very slow)
3807 local $USE_FSYNC = 0;
3392 3808
3393 cf::sync_job { 3809 cf::sync_job {
3810 cf::write_runtime_sync; # external watchdog should not bark
3811
3394 # use a peculiar iteration method to avoid tripping on perl 3812 # use a peculiar iteration method to avoid tripping on perl
3395 # refcount bugs in for. also avoids problems with players 3813 # refcount bugs in for. also avoids problems with players
3396 # and maps saved/destroyed asynchronously. 3814 # and maps saved/destroyed asynchronously.
3397 warn "begin emergency player save\n"; 3815 info "emergency_perl_save: begin player save\n";
3398 for my $login (keys %cf::PLAYER) { 3816 for my $login (keys %cf::PLAYER) {
3399 my $pl = $cf::PLAYER{$login} or next; 3817 my $pl = $cf::PLAYER{$login} or next;
3400 $pl->valid or next; 3818 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3819 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3402 $pl->save; 3820 $pl->save;
3403 } 3821 }
3404 warn "end emergency player save\n"; 3822 info "emergency_perl_save: end player save\n";
3405 3823
3406 warn "begin emergency map save\n"; 3824 cf::write_runtime_sync; # external watchdog should not bark
3825
3826 info "emergency_perl_save: begin map save\n";
3407 for my $path (keys %cf::MAP) { 3827 for my $path (keys %cf::MAP) {
3408 my $map = $cf::MAP{$path} or next; 3828 my $map = $cf::MAP{$path} or next;
3409 $map->valid or next; 3829 $map->valid or next;
3410 $map->save; 3830 $map->save;
3411 } 3831 }
3412 warn "end emergency map save\n"; 3832 info "emergency_perl_save: end map save\n";
3413 3833
3414 warn "begin emergency database checkpoint\n"; 3834 cf::write_runtime_sync; # external watchdog should not bark
3835
3836 info "emergency_perl_save: begin database checkpoint\n";
3415 BDB::db_env_txn_checkpoint $DB_ENV; 3837 BDB::db_env_txn_checkpoint $DB_ENV;
3416 warn "end emergency database checkpoint\n"; 3838 info "emergency_perl_save: end database checkpoint\n";
3839
3840 info "emergency_perl_save: begin write uuid\n";
3841 write_uuid_sync 1;
3842 info "emergency_perl_save: end write uuid\n";
3843
3844 cf::write_runtime_sync; # external watchdog should not bark
3845
3846 trace "emergency_perl_save: syncing database to disk";
3847 BDB::db_env_txn_checkpoint $DB_ENV;
3848
3849 info "emergency_perl_save: starting sync\n";
3850 IO::AIO::aio_sync sub {
3851 info "emergency_perl_save: finished sync\n";
3852 };
3853
3854 cf::write_runtime_sync; # external watchdog should not bark
3855
3856 trace "emergency_perl_save: flushing outstanding aio requests";
3857 while (IO::AIO::nreqs || BDB::nreqs) {
3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3859 }
3860
3861 cf::write_runtime_sync; # external watchdog should not bark
3417 }; 3862 };
3418 3863
3419 warn "leave emergency perl save\n"; 3864 info "emergency_perl_save: leave\n";
3420} 3865}
3421 3866
3422sub post_cleanup { 3867sub post_cleanup {
3423 my ($make_core) = @_; 3868 my ($make_core) = @_;
3424 3869
3870 IO::AIO::flush;
3871
3425 warn Carp::longmess "post_cleanup backtrace" 3872 error Carp::longmess "post_cleanup backtrace"
3426 if $make_core; 3873 if $make_core;
3874
3875 my $fh = pidfile;
3876 unlink $PIDFILE if <$fh> == $$;
3877}
3878
3879# a safer delete_package, copied from Symbol
3880sub clear_package($) {
3881 my $pkg = shift;
3882
3883 # expand to full symbol table name if needed
3884 unless ($pkg =~ /^main::.*::$/) {
3885 $pkg = "main$pkg" if $pkg =~ /^::/;
3886 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3887 $pkg .= '::' unless $pkg =~ /::$/;
3888 }
3889
3890 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3891 my $stem_symtab = *{$stem}{HASH};
3892
3893 defined $stem_symtab and exists $stem_symtab->{$leaf}
3894 or return;
3895
3896 # clear all symbols
3897 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3898 for my $name (keys %$leaf_symtab) {
3899 _gv_clear *{"$pkg$name"};
3900# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3901 }
3427} 3902}
3428 3903
3429sub do_reload_perl() { 3904sub do_reload_perl() {
3430 # can/must only be called in main 3905 # can/must only be called in main
3431 if ($Coro::current != $Coro::main) { 3906 if (in_main) {
3432 warn "can only reload from main coroutine"; 3907 error "can only reload from main coroutine";
3433 return; 3908 return;
3434 } 3909 }
3435 3910
3911 return if $RELOAD++;
3912
3913 my $t1 = AE::time;
3914
3915 while ($RELOAD) {
3436 warn "reloading..."; 3916 info "reloading...";
3437 3917
3438 warn "entering sync_job"; 3918 trace "entering sync_job";
3439 3919
3440 cf::sync_job { 3920 cf::sync_job {
3441 cf::write_runtime; # external watchdog should not bark
3442 cf::emergency_save; 3921 cf::emergency_save;
3443 cf::write_runtime; # external watchdog should not bark
3444 3922
3445 warn "syncing database to disk";
3446 BDB::db_env_txn_checkpoint $DB_ENV;
3447
3448 # if anything goes wrong in here, we should simply crash as we already saved
3449
3450 warn "flushing outstanding aio requests";
3451 for (;;) {
3452 BDB::flush;
3453 IO::AIO::flush;
3454 Coro::cede_notself;
3455 last unless IO::AIO::nreqs || BDB::nreqs;
3456 warn "iterate...";
3457 }
3458
3459 ++$RELOAD;
3460
3461 warn "cancelling all extension coros"; 3923 trace "cancelling all extension coros";
3462 $_->cancel for values %EXT_CORO; 3924 $_->cancel for values %EXT_CORO;
3463 %EXT_CORO = (); 3925 %EXT_CORO = ();
3464 3926
3465 warn "removing commands"; 3927 trace "removing commands";
3466 %COMMAND = (); 3928 %COMMAND = ();
3467 3929
3468 warn "removing ext/exti commands"; 3930 trace "removing ext/exti commands";
3469 %EXTCMD = (); 3931 %EXTCMD = ();
3470 %EXTICMD = (); 3932 %EXTICMD = ();
3471 3933
3472 warn "unloading/nuking all extensions"; 3934 trace "unloading/nuking all extensions";
3473 for my $pkg (@EXTS) { 3935 for my $pkg (@EXTS) {
3474 warn "... unloading $pkg"; 3936 trace "... unloading $pkg";
3475 3937
3476 if (my $cb = $pkg->can ("unload")) { 3938 if (my $cb = $pkg->can ("unload")) {
3477 eval { 3939 eval {
3478 $cb->($pkg); 3940 $cb->($pkg);
3479 1 3941 1
3480 } or warn "$pkg unloaded, but with errors: $@"; 3942 } or error "$pkg unloaded, but with errors: $@";
3943 }
3944
3945 trace "... clearing $pkg";
3946 clear_package $pkg;
3481 } 3947 }
3482 3948
3483 warn "... nuking $pkg";
3484 Symbol::delete_package $pkg;
3485 }
3486
3487 warn "unloading all perl modules loaded from $LIBDIR"; 3949 trace "unloading all perl modules loaded from $LIBDIR";
3488 while (my ($k, $v) = each %INC) { 3950 while (my ($k, $v) = each %INC) {
3489 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3951 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3490 3952
3491 warn "... unloading $k"; 3953 trace "... unloading $k";
3492 delete $INC{$k}; 3954 delete $INC{$k};
3493 3955
3494 $k =~ s/\.pm$//; 3956 $k =~ s/\.pm$//;
3495 $k =~ s/\//::/g; 3957 $k =~ s/\//::/g;
3496 3958
3497 if (my $cb = $k->can ("unload_module")) { 3959 if (my $cb = $k->can ("unload_module")) {
3498 $cb->(); 3960 $cb->();
3961 }
3962
3963 clear_package $k;
3499 } 3964 }
3500 3965
3501 Symbol::delete_package $k;
3502 }
3503
3504 warn "getting rid of safe::, as good as possible"; 3966 trace "getting rid of safe::, as good as possible";
3505 Symbol::delete_package "safe::$_" 3967 clear_package "safe::$_"
3506 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3968 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3507 3969
3508 warn "unloading cf.pm \"a bit\""; 3970 trace "unloading cf.pm \"a bit\"";
3509 delete $INC{"cf.pm"}; 3971 delete $INC{"cf.pm"};
3510 delete $INC{"cf/pod.pm"}; 3972 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3511 3973
3512 # don't, removes xs symbols, too, 3974 # don't, removes xs symbols, too,
3513 # and global variables created in xs 3975 # and global variables created in xs
3514 #Symbol::delete_package __PACKAGE__; 3976 #clear_package __PACKAGE__;
3515 3977
3516 warn "unload completed, starting to reload now"; 3978 info "unload completed, starting to reload now";
3517 3979
3518 warn "reloading cf.pm"; 3980 trace "reloading cf.pm";
3519 require cf; 3981 require cf;
3520 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3982 cf::_connect_to_perl_1;
3521 3983
3522 warn "loading config and database again"; 3984 trace "loading config and database again";
3523 cf::reload_config; 3985 cf::reload_config;
3524 3986
3525 warn "loading extensions"; 3987 trace "loading extensions";
3526 cf::load_extensions; 3988 cf::load_extensions;
3527 3989
3990 if ($REATTACH_ON_RELOAD) {
3528 warn "reattaching attachments to objects/players"; 3991 trace "reattaching attachments to objects/players";
3529 _global_reattach; # objects, sockets 3992 _global_reattach; # objects, sockets
3530 warn "reattaching attachments to maps"; 3993 trace "reattaching attachments to maps";
3531 reattach $_ for values %MAP; 3994 reattach $_ for values %MAP;
3532 warn "reattaching attachments to players"; 3995 trace "reattaching attachments to players";
3533 reattach $_ for values %PLAYER; 3996 reattach $_ for values %PLAYER;
3997 }
3534 3998
3999 trace "running post_init jobs";
4000 (pop @POST_INIT)->(1) while @POST_INIT;
4001
3535 warn "leaving sync_job"; 4002 trace "leaving sync_job";
3536 4003
3537 1 4004 1
3538 } or do { 4005 } or do {
3539 warn $@; 4006 error $@;
3540 warn "error while reloading, exiting."; 4007 cf::cleanup "error while reloading, exiting.";
3541 exit 1; 4008 };
4009
4010 info "reloaded";
4011 --$RELOAD;
3542 }; 4012 }
3543 4013
3544 warn "reloaded"; 4014 $t1 = AE::time - $t1;
4015 info "reload completed in ${t1}s\n";
3545}; 4016};
3546 4017
3547our $RELOAD_WATCHER; # used only during reload 4018our $RELOAD_WATCHER; # used only during reload
3548 4019
3549sub reload_perl() { 4020sub reload_perl() {
3550 # doing reload synchronously and two reloads happen back-to-back, 4021 # doing reload synchronously and two reloads happen back-to-back,
3551 # coro crashes during coro_state_free->destroy here. 4022 # coro crashes during coro_state_free->destroy here.
3552 4023
4024 $RELOAD_WATCHER ||= cf::async {
4025 Coro::AIO::aio_wait cache_extensions;
4026
3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4027 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
4028 do_reload_perl;
3554 undef $RELOAD_WATCHER; 4029 undef $RELOAD_WATCHER;
3555 do_reload_perl; 4030 };
3556 }; 4031 };
3557} 4032}
3558 4033
3559register_command "reload" => sub { 4034register_command "reload" => sub {
3560 my ($who, $arg) = @_; 4035 my ($who, $arg) = @_;
3566 reload_perl; 4041 reload_perl;
3567 }; 4042 };
3568 } 4043 }
3569}; 4044};
3570 4045
3571unshift @INC, $LIBDIR; 4046#############################################################################
3572 4047
3573my $bug_warning = 0; 4048my $bug_warning = 0;
3574 4049
3575our @WAIT_FOR_TICK; 4050our @WAIT_FOR_TICK;
3576our @WAIT_FOR_TICK_BEGIN; 4051our @WAIT_FOR_TICK_BEGIN;
3577 4052
3578sub wait_for_tick { 4053sub wait_for_tick {
3579 return unless $TICK_WATCHER->is_active;
3580 return if $Coro::current == $Coro::main; 4054 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3581 4055
3582 my $signal = new Coro::Signal; 4056 my $signal = new Coro::Signal;
3583 push @WAIT_FOR_TICK, $signal; 4057 push @WAIT_FOR_TICK, $signal;
3584 $signal->wait; 4058 $signal->wait;
3585} 4059}
3586 4060
3587sub wait_for_tick_begin { 4061sub wait_for_tick_begin {
3588 return unless $TICK_WATCHER->is_active;
3589 return if $Coro::current == $Coro::main; 4062 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3590 4063
3591 my $signal = new Coro::Signal; 4064 my $signal = new Coro::Signal;
3592 push @WAIT_FOR_TICK_BEGIN, $signal; 4065 push @WAIT_FOR_TICK_BEGIN, $signal;
3593 $signal->wait; 4066 $signal->wait;
3594} 4067}
3595 4068
3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4069sub tick {
3597 if ($Coro::current != $Coro::main) { 4070 if ($Coro::current != $Coro::main) {
3598 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4071 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3599 unless ++$bug_warning > 10; 4072 unless ++$bug_warning > 10;
3600 return; 4073 return;
3601 } 4074 }
3602 4075
3603 $NOW = $tick_start = EV::now;
3604
3605 cf::server_tick; # one server iteration 4076 cf::server_tick; # one server iteration
3606 4077
3607 $RUNTIME += $TICK; 4078 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3608 $NEXT_TICK += $TICK;
3609 4079
3610 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4080 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3611 $NEXT_RUNTIME_WRITE = $NOW + 10; 4081 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3612 Coro::async_pool { 4082 Coro::async_pool {
3613 $Coro::current->{desc} = "runtime saver"; 4083 $Coro::current->{desc} = "runtime saver";
3614 write_runtime 4084 write_runtime_sync
3615 or warn "ERROR: unable to write runtime file: $!"; 4085 or error "ERROR: unable to write runtime file: $!";
3616 }; 4086 };
3617 } 4087 }
3618 4088
3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4089 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3620 $sig->send; 4090 $sig->send;
3621 } 4091 }
3622 while (my $sig = shift @WAIT_FOR_TICK) { 4092 while (my $sig = shift @WAIT_FOR_TICK) {
3623 $sig->send; 4093 $sig->send;
3624 } 4094 }
3625 4095
3626 $LOAD = ($NOW - $tick_start) / $TICK; 4096 $LOAD = ($NOW - $TICK_START) / $TICK;
3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4097 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3628 4098
3629 _post_tick; 4099 if (0) {
3630}; 4100 if ($NEXT_TICK) {
3631$TICK_WATCHER->priority (EV::MAXPRI); 4101 my $jitter = $TICK_START - $NEXT_TICK;
4102 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4103 debug "jitter $JITTER\n";#d#
4104 }
4105 }
4106}
3632 4107
3633{ 4108{
4109 # configure BDB
4110
3634 BDB::min_parallel 8; 4111 BDB::min_parallel 16;
3635 BDB::max_poll_time $TICK * 0.1; 4112 BDB::max_poll_reqs $TICK * 0.1;
3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb; 4113 $AnyEvent::BDB::WATCHER->priority (1);
3637
3638 BDB::set_sync_prepare {
3639 my $status;
3640 my $current = $Coro::current;
3641 (
3642 sub {
3643 $status = $!;
3644 $current->ready; undef $current;
3645 },
3646 sub {
3647 Coro::schedule while defined $current;
3648 $! = $status;
3649 },
3650 )
3651 };
3652 4114
3653 unless ($DB_ENV) { 4115 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 4116 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4117 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 4118 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4119 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4120 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4121 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 4122
3660 cf::sync_job { 4123 cf::sync_job {
3661 eval { 4124 eval {
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4146 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 }; 4147 };
3685} 4148}
3686 4149
3687{ 4150{
4151 # configure IO::AIO
4152
3688 IO::AIO::min_parallel 8; 4153 IO::AIO::min_parallel 8;
3689
3690 undef $Coro::AIO::WATCHER;
3691 IO::AIO::max_poll_time $TICK * 0.1; 4154 IO::AIO::max_poll_time $TICK * 0.1;
3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 4155 undef $AnyEvent::AIO::WATCHER;
3693} 4156}
3694 4157
3695my $_log_backtrace; 4158my $_log_backtrace;
3696 4159
3697sub _log_backtrace { 4160sub _log_backtrace {
3700 $msg =~ s/\n//; 4163 $msg =~ s/\n//;
3701 4164
3702 # limit the # of concurrent backtraces 4165 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 4166 if ($_log_backtrace < 2) {
3704 ++$_log_backtrace; 4167 ++$_log_backtrace;
4168 my $perl_bt = Carp::longmess $msg;
3705 async { 4169 async {
3706 $Coro::current->{desc} = "abt $msg"; 4170 $Coro::current->{desc} = "abt $msg";
3707 4171
3708 my @bt = fork_call { 4172 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 4173 @addr = map { sprintf "%x", $_ } @addr;
3720 } 4184 }
3721 4185
3722 @funcs 4186 @funcs
3723 }; 4187 };
3724 4188
3725 LOG llevInfo, "[ABT] $msg\n"; 4189 LOG llevInfo, "[ABT] $perl_bt\n";
4190 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 4191 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 4192 --$_log_backtrace;
3728 }; 4193 };
3729 } else { 4194 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 4195 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 4196 LOG llevInfo, "[ABT] [suppressed]\n";
3732 } 4197 }
3733} 4198}
3734 4199
3735# load additional modules 4200# load additional modules
3736use cf::pod; 4201require "cf/$_.pm" for @EXTRA_MODULES;
4202cf::_connect_to_perl_2;
3737 4203
3738END { cf::emergency_save } 4204END { cf::emergency_save }
3739 4205
37401 42061
3741 4207

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines