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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines