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.407 by root, Sun Jan 13 09:53:53 2008 UTC vs.
Revision 1.553 by root, Tue May 18 21:30:16 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}
198 278
199$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
280 return unless $^S eq 0; # "eq", not "=="
281
200 warn Carp::longmess $_[0]; 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
201 Coro::terminate; 290 Coro::terminate
202}; 291};
203 292
204@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
205@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
206@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
214for my $pkg (qw( 303for my $pkg (qw(
215 cf::global cf::attachable 304 cf::global cf::attachable
216 cf::object cf::object::player 305 cf::object cf::object::player
217 cf::client cf::player 306 cf::client cf::player
218 cf::arch cf::living 307 cf::arch cf::living
308 cf::map cf::mapspace
219 cf::map cf::party cf::region 309 cf::party cf::region
220)) { 310)) {
221 no strict 'refs';
222 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
223} 312}
224 313
225$EV::DIED = sub { 314$EV::DIED = sub {
226 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
227}; 316};
228 317
229############################################################################# 318#############################################################################
230 319
231=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
268our $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
269 358
270sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
271sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
272 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
388sub _post_init {
389 trace "running post_init jobs";
390
391 # run them in parallel...
392
393 my @join;
394
395 while () {
396 push @join, map &Coro::async ($_, 0), @POST_INIT;
397 @POST_INIT = ();
398
399 @join or last;
400
401 (pop @join)->join;
402 }
403}
404
273=item cf::lock_wait $string 405=item cf::lock_wait $string
274 406
275Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
276 408
277=item my $lock = cf::lock_acquire $string 409=item my $lock = cf::lock_acquire $string
278 410
279Wait until the given lock is available and then acquires it and returns 411Wait until the given lock is available and then acquires it and returns
280a Coro::guard object. If the guard object gets destroyed (goes out of scope, 412a L<Guard> object. If the guard object gets destroyed (goes out of scope,
281for example when the coroutine gets canceled), the lock is automatically 413for example when the coroutine gets canceled), the lock is automatically
282returned. 414returned.
283 415
284Locks are *not* recursive, locking from the same coro twice results in a 416Locks are *not* recursive, locking from the same coro twice results in a
285deadlocked coro. 417deadlocked coro.
291 423
292Return true if the lock is currently active, i.e. somebody has locked it. 424Return true if the lock is currently active, i.e. somebody has locked it.
293 425
294=cut 426=cut
295 427
296our %LOCK; 428our $LOCKS = new Coro::SemaphoreSet;
297our %LOCKER;#d#
298 429
299sub lock_wait($) { 430sub lock_wait($) {
300 my ($key) = @_; 431 $LOCKS->wait ($_[0]);
301
302 if ($LOCKER{$key} == $Coro::current) {#d#
303 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
304 return;#d#
305 }#d#
306
307 # wait for lock, if any
308 while ($LOCK{$key}) {
309 push @{ $LOCK{$key} }, $Coro::current;
310 Coro::schedule;
311 }
312} 432}
313 433
314sub lock_acquire($) { 434sub lock_acquire($) {
315 my ($key) = @_; 435 $LOCKS->guard ($_[0])
316
317 # wait, to be sure we are not locked
318 lock_wait $key;
319
320 $LOCK{$key} = [];
321 $LOCKER{$key} = $Coro::current;#d#
322
323 Coro::guard {
324 delete $LOCKER{$key};#d#
325 # wake up all waiters, to be on the safe side
326 $_->ready for @{ delete $LOCK{$key} };
327 }
328} 436}
329 437
330sub lock_active($) { 438sub lock_active($) {
331 my ($key) = @_; 439 $LOCKS->count ($_[0]) < 1
332
333 ! ! $LOCK{$key}
334} 440}
335 441
336sub freeze_mainloop { 442sub freeze_mainloop {
337 return unless $TICK_WATCHER->is_active; 443 tick_inhibit_inc;
338 444
339 my $guard = Coro::guard { 445 &Guard::guard (\&tick_inhibit_dec);
340 $TICK_WATCHER->start;
341 };
342 $TICK_WATCHER->stop;
343 $guard
344} 446}
345 447
346=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
347 449
348Like EV::periodic, but randomly selects a starting point so that the actions 450Like EV::periodic, but randomly selects a starting point so that the actions
349get spread over timer. 451get spread over time.
350 452
351=cut 453=cut
352 454
353sub periodic($$) { 455sub periodic($$) {
354 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
371 473
372=cut 474=cut
373 475
374our @SLOT_QUEUE; 476our @SLOT_QUEUE;
375our $SLOT_QUEUE; 477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
376 479
377$SLOT_QUEUE->cancel if $SLOT_QUEUE; 480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
378$SLOT_QUEUE = Coro::async { 481$SLOT_QUEUE = Coro::async {
379 $Coro::current->desc ("timeslot manager"); 482 $Coro::current->desc ("timeslot manager");
380 483
381 my $signal = new Coro::Signal; 484 my $signal = new Coro::Signal;
485 my $busy;
382 486
383 while () { 487 while () {
384 next_job: 488 next_job:
489
385 my $avail = cf::till_tick; 490 my $avail = cf::till_tick;
386 if ($avail > 0.01) { 491
387 for (0 .. $#SLOT_QUEUE) { 492 for (0 .. $#SLOT_QUEUE) {
388 if ($SLOT_QUEUE[$_][0] < $avail) { 493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
389 my $job = splice @SLOT_QUEUE, $_, 1, (); 495 my $job = splice @SLOT_QUEUE, $_, 1, ();
390 $job->[2]->send; 496 $job->[2]->send;
391 Coro::cede; 497 Coro::cede;
392 goto next_job; 498 goto next_job;
393 } 499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
394 } 501 }
395 } 502 }
396 503
397 if (@SLOT_QUEUE) { 504 if (@SLOT_QUEUE) {
398 # we do not use wait_for_tick() as it returns immediately when tick is inactive 505 # we do not use wait_for_tick() as it returns immediately when tick is inactive
399 push @cf::WAIT_FOR_TICK, $signal; 506 push @cf::WAIT_FOR_TICK, $signal;
400 $signal->wait; 507 $signal->wait;
401 } else { 508 } else {
509 $busy = 0;
402 Coro::schedule; 510 Coro::schedule;
403 } 511 }
404 } 512 }
405}; 513};
406 514
407sub get_slot($;$$) { 515sub get_slot($;$$) {
516 return if tick_inhibit || $Coro::current == $Coro::main;
517
408 my ($time, $pri, $name) = @_; 518 my ($time, $pri, $name) = @_;
409 519
410 $time = $TICK * .6 if $time > $TICK * .6; 520 $time = clamp $time, 0.01, $TICK * .6;
521
411 my $sig = new Coro::Signal; 522 my $sig = new Coro::Signal;
412 523
413 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
414 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
415 $SLOT_QUEUE->ready; 526 $SLOT_QUEUE->ready;
441=cut 552=cut
442 553
443sub sync_job(&) { 554sub sync_job(&) {
444 my ($job) = @_; 555 my ($job) = @_;
445 556
446 if ($Coro::current == $Coro::main) { 557 if (in_main) {
447 my $time = EV::time; 558 my $time = AE::time;
448 559
449 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
450 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
451 562
452 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
453 564
454 # TODO: use suspend/resume instead
455 # (but this is cancel-safe)
456 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
457 566
458 my $busy = 1; 567 my $busy = 1;
459 my @res; 568 my @res;
460 569
461 (async { 570 (async {
462 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
463 @res = eval { $job->() }; 572 @res = eval { $job->() };
464 warn $@ if $@; 573 error $@ if $@;
465 undef $busy; 574 undef $busy;
466 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
467 576
468 while ($busy) { 577 while ($busy) {
469 if (Coro::nready) { 578 if (Coro::nready) {
471 } else { 580 } else {
472 EV::loop EV::LOOP_ONESHOT; 581 EV::loop EV::LOOP_ONESHOT;
473 } 582 }
474 } 583 }
475 584
476 $time = EV::time - $time; 585 my $time = AE::time - $time;
477 586
478 LOG llevError | logBacktrace, Carp::longmess "long sync job"
479 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
480
481 $tick_start += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
482 588
483 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
484 } else { 590 } else {
485 # we are in another coroutine, how wonderful, everything just works 591 # we are in another coroutine, how wonderful, everything just works
486 592
506 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
507 613
508 $coro 614 $coro
509} 615}
510 616
511=item fork_call { }, $args 617=item fork_call { }, @args
512 618
513Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
514process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
515Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
516never block itself or use any form of event handling. 622never block itself or use any form of event handling.
517 623
518=cut 624=cut
519 625
626sub post_fork {
627 reset_signals;
628}
629
520sub fork_call(&@) { 630sub fork_call(&@) {
521 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
522 632
523 # we seemingly have to make a local copy of the whole thing, 633 # we seemingly have to make a local copy of the whole thing,
524 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
525 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
526 636
527 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
528 reset_signals; 638 cf::post_fork;
529 &$cb 639 &$cb
530 }, @args; 640 } @args;
531 641
532 wantarray ? @res : $res[-1] 642 wantarray ? @res : $res[-1]
643}
644
645sub objinfo {
646 (
647 "counter value" => cf::object::object_count,
648 "objects created" => cf::object::create_count,
649 "objects destroyed" => cf::object::destroy_count,
650 "freelist size" => cf::object::free_count,
651 "allocated objects" => cf::object::objects_size,
652 "active objects" => cf::object::actives_size,
653 )
654}
655
656=item $coin = coin_from_name $name
657
658=cut
659
660our %coin_alias = (
661 "silver" => "silvercoin",
662 "silvercoin" => "silvercoin",
663 "silvercoins" => "silvercoin",
664 "gold" => "goldcoin",
665 "goldcoin" => "goldcoin",
666 "goldcoins" => "goldcoin",
667 "platinum" => "platinacoin",
668 "platinumcoin" => "platinacoin",
669 "platinumcoins" => "platinacoin",
670 "platina" => "platinacoin",
671 "platinacoin" => "platinacoin",
672 "platinacoins" => "platinacoin",
673 "royalty" => "royalty",
674 "royalties" => "royalty",
675);
676
677sub coin_from_name($) {
678 $coin_alias{$_[0]}
679 ? cf::arch::find $coin_alias{$_[0]}
680 : undef
533} 681}
534 682
535=item $value = cf::db_get $family => $key 683=item $value = cf::db_get $family => $key
536 684
537Returns a single value from the environment database. 685Returns a single value from the environment database.
547within each server. 695within each server.
548 696
549=cut 697=cut
550 698
551sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
552 my ($name) = @_; 703 my ($name) = @_;
553 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
554 705
555 eval { 706 eval {
556 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
566} 717}
567 718
568our $DB; 719our $DB;
569 720
570sub db_init { 721sub db_init {
571 cf::sync_job {
572 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
573 };
574} 723}
575 724
576sub db_get($$) { 725sub db_get($$) {
577 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
578 727
579 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
580 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
581 732
582 $! ? () 733 $! ? ()
583 : $data 734 : $data
584 }
585} 735}
586 736
587sub db_put($$$) { 737sub db_put($$$) {
588 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
589 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
645 795
646 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
647 my $data = $process->(\@data); 797 my $data = $process->(\@data);
648 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
649 799
650 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
651 801
652 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
653 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
654 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
655 805
665 815
666=cut 816=cut
667 817
668sub datalog($@) { 818sub datalog($@) {
669 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
670 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
671} 821}
672 822
673=back 823=back
674 824
675=cut 825=cut
676 826
677############################################################################# 827#############################################################################
678 828
679=head2 ATTACHABLE OBJECTS 829=head2 ATTACHABLE OBJECTS
680 830
681Many objects in crossfire are so-called attachable objects. That means you can 831Many objects in deliantra are so-called attachable objects. That means you can
682attach callbacks/event handlers (a collection of which is called an "attachment") 832attach callbacks/event handlers (a collection of which is called an "attachment")
683to it. All such attachable objects support the following methods. 833to it. All such attachable objects support the following methods.
684 834
685In the following description, CLASS can be any of C<global>, C<object> 835In the following description, CLASS can be any of C<global>, C<object>
686C<player>, C<client> or C<map> (i.e. the attachable objects in 836C<player>, C<client> or C<map> (i.e. the attachable objects in
736=item cf::CLASS::attachment $name, ... 886=item cf::CLASS::attachment $name, ...
737 887
738Register an attachment by C<$name> through which attachable objects of the 888Register an attachment by C<$name> through which attachable objects of the
739given CLASS can refer to this attachment. 889given CLASS can refer to this attachment.
740 890
741Some classes such as crossfire maps and objects can specify attachments 891Some classes such as deliantra maps and objects can specify attachments
742that are attached at load/instantiate time, thus the need for a name. 892that are attached at load/instantiate time, thus the need for a name.
743 893
744These calls expect any number of the following handler/hook descriptions: 894These calls expect any number of the following handler/hook descriptions:
745 895
746=over 4 896=over 4
870 1020
871 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
872 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
873 1023
874 } elsif (ref $type) { 1024 } elsif (ref $type) {
875 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
876 1026
877 } else { 1027 } else {
878 shift @arg; 1028 shift @arg;
879 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
880 } 1030 }
881 } 1031 }
882} 1032}
883 1033
884sub _object_attach { 1034sub _object_attach {
894 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
895 } 1045 }
896 1046
897 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
898 } else { 1048 } else {
899 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
900 } 1050 }
901 1051
902 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
903} 1053}
904 1054
963 1113
964 for (@$callbacks) { 1114 for (@$callbacks) {
965 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
966 1116
967 if ($@) { 1117 if ($@) {
968 warn "$@";
969 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
970 override; 1119 override;
971 } 1120 }
972 1121
973 return 1 if $override; 1122 return 1 if $override;
974 } 1123 }
1037 1186
1038sub reattach { 1187sub reattach {
1039 # basically do the same as instantiate, without calling instantiate 1188 # basically do the same as instantiate, without calling instantiate
1040 my ($obj) = @_; 1189 my ($obj) = @_;
1041 1190
1191 # no longer needed after getting rid of delete_package?
1042 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1192 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1043 1193
1044 my $registry = $obj->registry; 1194 my $registry = $obj->registry;
1045 1195
1046 @$registry = (); 1196 @$registry = ();
1047 1197
1052 for (@$attach) { 1202 for (@$attach) {
1053 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1054 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1055 } 1205 }
1056 } else { 1206 } else {
1057 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1058 } 1208 }
1059 } 1209 }
1060} 1210}
1061 1211
1062cf::attachable->attach ( 1212cf::attachable->attach (
1089 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1090 1240
1091 sync_job { 1241 sync_job {
1092 if (length $$rdata) { 1242 if (length $$rdata) {
1093 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1094 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1095 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1096 1247
1097 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1249 aio_chmod $fh, SAVE_MODE;
1099 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1100 aio_fsync $fh if $cf::USE_FSYNC; 1251 if ($cf::USE_FSYNC) {
1252 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;
1253 aio_fsync $fh;
1254 }
1101 close $fh; 1255 aio_close $fh;
1102 1256
1103 if (@$objs) { 1257 if (@$objs) {
1104 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1258 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1259 aio_chmod $fh, SAVE_MODE;
1106 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1260 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1107 aio_write $fh, 0, (length $data), $data, 0; 1261 aio_write $fh, 0, (length $data), $data, 0;
1108 aio_fsync $fh if $cf::USE_FSYNC; 1262 if ($cf::USE_FSYNC) {
1263 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;
1264 aio_fsync $fh;
1265 }
1109 close $fh; 1266 aio_close $fh;
1110 aio_rename "$filename.pst~", "$filename.pst"; 1267 aio_rename "$filename.pst~", "$filename.pst";
1111 } 1268 }
1112 } else { 1269 } else {
1113 aio_unlink "$filename.pst"; 1270 aio_unlink "$filename.pst";
1114 } 1271 }
1115 1272
1116 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1274
1275 $filename =~ s%/[^/]+$%%;
1276 aio_pathsync $filename if $cf::USE_FSYNC;
1117 } else { 1277 } else {
1118 warn "FATAL: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1119 } 1279 }
1120 } else { 1280 } else {
1121 aio_unlink $filename; 1281 aio_unlink $filename;
1122 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1123 } 1283 }
1147 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1148 $av = $st->{objs}; 1308 $av = $st->{objs};
1149 } 1309 }
1150 1310
1151 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1152 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1153 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1154 1315
1155 ($data, $av) 1316 ($data, $av)
1156} 1317}
1157 1318
1158=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
1214 my ($name, $cb) = @_; 1375 my ($name, $cb) = @_;
1215 1376
1216 $EXTICMD{$name} = $cb; 1377 $EXTICMD{$name} = $cb;
1217} 1378}
1218 1379
1380use File::Glob ();
1381
1219cf::player->attach ( 1382cf::player->attach (
1220 on_command => sub { 1383 on_unknown_command => sub {
1221 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1222 1385
1223 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1224 or return; 1387 or return;
1225 1388
1248 1411
1249 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1250 if $reply; 1413 if $reply;
1251 1414
1252 } else { 1415 } else {
1253 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1254 } 1417 }
1255 1418
1256 cf::override; 1419 cf::override;
1257 }, 1420 },
1258); 1421);
1259 1422
1423# "readahead" all extensions
1424sub cache_extensions {
1425 my $grp = IO::AIO::aio_group;
1426
1427 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1428 for (grep /\.ext$/, @{$_[0]}) {
1429 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1430 }
1431 };
1432
1433 $grp
1434}
1435
1260sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1261 cf::sync_job { 1439 cf::sync_job {
1262 my %todo; 1440 my %todo;
1263 1441
1264 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1265 next unless -r $path; 1443 next unless -r $path;
1283 1461
1284 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1285 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1286 1464
1287 $ext{source} = 1465 $ext{source} =
1288 "package $pkg; use strict; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1289 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1290 . $source 1468 . $source
1291 . "\n};\n1"; 1469 . "\n};\n1";
1292 1470
1293 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1294 } 1472 }
1295 1473
1474 my $pass = 0;
1296 my %done; 1475 my %done;
1297 while (%todo) { 1476 while (%todo) {
1298 my $progress; 1477 my $progress;
1299 1478
1479 ++$pass;
1480
1481 ext:
1300 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1301 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1302 goto skip 1484 next ext
1303 unless exists $done{$_}; 1485 unless exists $done{$_};
1304 } 1486 }
1305 1487
1306 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1307 1489
1308 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1309 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1310 : "$v->{base}: extension inactive.\n";
1311 1494
1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1312 if (exists $v->{meta}{mandatory}) { 1496 if exists $v->{meta}{mandatory};
1313 warn $msg; 1497
1314 warn "mandatory extension failed to load, exiting.\n"; 1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1315 exit 1; 1499 delete $todo{$k};
1316 } 1500 } else {
1317 1501 $done{$k} = delete $todo{$k};
1318 warn $msg; 1502 push @EXTS, $v->{pkg};
1503 $progress = 1;
1504
1505 info "$v->{base}: extension inactive.\n"
1506 unless $active;
1319 } 1507 }
1320
1321 $done{$k} = delete $todo{$k};
1322 push @EXTS, $v->{pkg};
1323 $progress = 1;
1324 } 1508 }
1325 1509
1326 skip: 1510 unless ($progress) {
1327 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1328 unless $progress; 1512
1513 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory};
1516 }
1517 }
1329 } 1518 }
1330 }; 1519 };
1331} 1520}
1332 1521
1333############################################################################# 1522#############################################################################
1334 1523
1335=back 1524=back
1336 1525
1337=head2 CORE EXTENSIONS 1526=head2 CORE EXTENSIONS
1338 1527
1339Functions and methods that extend core crossfire objects. 1528Functions and methods that extend core deliantra objects.
1340 1529
1341=cut 1530=cut
1342 1531
1343package cf::player; 1532package cf::player;
1344 1533
1387 1576
1388sub exists($) { 1577sub exists($) {
1389 my ($login) = @_; 1578 my ($login) = @_;
1390 1579
1391 $cf::PLAYER{$login} 1580 $cf::PLAYER{$login}
1392 or cf::sync_job { !aio_stat path $login } 1581 or !aio_stat path $login
1393} 1582}
1394 1583
1395sub find($) { 1584sub find($) {
1396 return $cf::PLAYER{$_[0]} || do { 1585 return $cf::PLAYER{$_[0]} || do {
1397 my $login = $_[0]; 1586 my $login = $_[0];
1409 my $f = new_from_file cf::object::thawer path $login 1598 my $f = new_from_file cf::object::thawer path $login
1410 or return; 1599 or return;
1411 1600
1412 my $pl = cf::player::load_pl $f 1601 my $pl = cf::player::load_pl $f
1413 or return; 1602 or return;
1603
1414 local $cf::PLAYER_LOADING{$login} = $pl; 1604 local $cf::PLAYER_LOADING{$login} = $pl;
1415 $f->resolve_delayed_derefs; 1605 $f->resolve_delayed_derefs;
1416 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1417 } 1607 }
1418 } 1608 }
1419} 1609}
1420 1610
1611cf::player->attach (
1612 on_load => sub {
1613 my ($pl, $path) = @_;
1614
1615 # restore slots saved in save, below
1616 my $slots = delete $pl->{_slots};
1617
1618 $pl->ob->current_weapon ($slots->[0]);
1619 $pl->combat_ob ($slots->[1]);
1620 $pl->ranged_ob ($slots->[2]);
1621 },
1622);
1623
1421sub save($) { 1624sub save($) {
1422 my ($pl) = @_; 1625 my ($pl) = @_;
1423 1626
1424 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1425 1628
1428 1631
1429 return if $pl->{deny_save}; 1632 return if $pl->{deny_save};
1430 1633
1431 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1432 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1636
1637 cf::get_slot 0.01;
1638
1639 # save slots, to be restored later
1640 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1433 1641
1434 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1435 cf::cede_to_tick; 1643 cf::cede_to_tick;
1436} 1644}
1437 1645
1469 my ($pl) = @_; 1677 my ($pl) = @_;
1470 1678
1471 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1472 1680
1473 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1474 $pl->password ("*"); # this should lock out the player until we nuked the dir 1682 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1475 1683
1476 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1477 $pl->deactivate; 1685 $pl->deactivate;
1686
1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1478 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1479 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1480 1692
1481 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1482 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1483 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
1521 1733
1522 for my $login (@$dirs) { 1734 for my $login (@$dirs) {
1523 my $path = path $login; 1735 my $path = path $login;
1524 1736
1525 # a .pst is a dead give-away for a valid player 1737 # a .pst is a dead give-away for a valid player
1526 unless (-e "$path.pst") { 1738 # if no pst file found, open and chekc for blocked users
1739 if (aio_stat "$path.pst") {
1527 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1740 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1528 aio_read $fh, 0, 512, my $buf, 0 or next; 1741 aio_read $fh, 0, 512, my $buf, 0 or next;
1529 $buf !~ /^password -------------$/m or next; # official not-valid tag 1742 $buf !~ /^password -------------$/m or next; # official not-valid tag
1530 } 1743 }
1531 1744
1535 1748
1536 \@logins 1749 \@logins
1537} 1750}
1538 1751
1539=item $player->maps 1752=item $player->maps
1753
1754=item cf::player::maps $login
1540 1755
1541Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1542player. May block. 1757player. May block.
1543 1758
1544=cut 1759=cut
1562 } 1777 }
1563 1778
1564 \@paths 1779 \@paths
1565} 1780}
1566 1781
1567=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1782=item $protocol_xml = $player->expand_cfpod ($cfpod)
1568 1783
1569Expand crossfire pod fragments into protocol xml. 1784Expand deliantra pod fragments into protocol xml.
1570
1571=cut
1572
1573use re 'eval';
1574
1575my $group;
1576my $interior; $interior = qr{
1577 # match a pod interior sequence sans C<< >>
1578 (?:
1579 \ (.*?)\ (?{ $group = $^N })
1580 | < (??{$interior}) >
1581 )
1582}x;
1583
1584sub expand_cfpod {
1585 my ($self, $pod) = @_;
1586
1587 my $xml;
1588
1589 while () {
1590 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1591 $group = $1;
1592
1593 $group =~ s/&/&amp;/g;
1594 $group =~ s/</&lt;/g;
1595
1596 $xml .= $group;
1597 } elsif ($pod =~ m%\G
1598 ([BCGHITU])
1599 <
1600 (?:
1601 ([^<>]*) (?{ $group = $^N })
1602 | < $interior >
1603 )
1604 >
1605 %gcsx
1606 ) {
1607 my ($code, $data) = ($1, $group);
1608
1609 if ($code eq "B") {
1610 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1611 } elsif ($code eq "I") {
1612 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1613 } elsif ($code eq "U") {
1614 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1615 } elsif ($code eq "C") {
1616 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1617 } elsif ($code eq "T") {
1618 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1619 } elsif ($code eq "G") {
1620 my ($male, $female) = split /\|/, $data;
1621 $data = $self->gender ? $female : $male;
1622 $xml .= expand_cfpod ($self, $data);
1623 } elsif ($code eq "H") {
1624 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1625 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1626 "")
1627 [$self->{hintmode}];
1628 } else {
1629 $xml .= "error processing '$code($data)' directive";
1630 }
1631 } else {
1632 if ($pod =~ /\G(.+)/) {
1633 warn "parse error while expanding $pod (at $1)";
1634 }
1635 last;
1636 }
1637 }
1638
1639 for ($xml) {
1640 # create single paragraphs (very hackish)
1641 s/(?<=\S)\n(?=\w)/ /g;
1642
1643 # compress some whitespace
1644 s/\s+\n/\n/g; # ws line-ends
1645 s/\n\n+/\n/g; # double lines
1646 s/^\n+//; # beginning lines
1647 s/\n+$//; # ending lines
1648 }
1649
1650 $xml
1651}
1652
1653no re 'eval';
1654
1655sub hintmode {
1656 $_[0]{hintmode} = $_[1] if @_ > 1;
1657 $_[0]{hintmode}
1658}
1659 1785
1660=item $player->ext_reply ($msgid, @msg) 1786=item $player->ext_reply ($msgid, @msg)
1661 1787
1662Sends an ext reply to the player. 1788Sends an ext reply to the player.
1663 1789
1695 1821
1696=cut 1822=cut
1697 1823
1698sub find_by_path($) { 1824sub find_by_path($) {
1699 my ($path) = @_; 1825 my ($path) = @_;
1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1700 1828
1701 my ($match, $specificity); 1829 my ($match, $specificity);
1702 1830
1703 for my $region (list) { 1831 for my $region (list) {
1704 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1730our $MAX_RESET = 3600; 1858our $MAX_RESET = 3600;
1731our $DEFAULT_RESET = 3000; 1859our $DEFAULT_RESET = 3000;
1732 1860
1733sub generate_random_map { 1861sub generate_random_map {
1734 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1863
1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1865
1735 # mit "rum" bekleckern, nicht 1866 # mit "rum" bekleckern, nicht
1736 $self->_create_random_map ( 1867 $self->_create_random_map (
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1869 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1870 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1740 $rmp->{exit_on_final_map}, 1871 $rmp->{exit_on_final_map},
1741 $rmp->{xsize}, $rmp->{ysize}, 1872 $rmp->{xsize}, $rmp->{ysize},
1742 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1873 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1743 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1874 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1758 1889
1759sub register { 1890sub register {
1760 my (undef, $regex, $prio) = @_; 1891 my (undef, $regex, $prio) = @_;
1761 my $pkg = caller; 1892 my $pkg = caller;
1762 1893
1763 no strict;
1764 push @{"$pkg\::ISA"}, __PACKAGE__; 1894 push @{"$pkg\::ISA"}, __PACKAGE__;
1765 1895
1766 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1896 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1767} 1897}
1768 1898
1769# also paths starting with '/' 1899# also paths starting with '/'
1770$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1900$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1771 1901
1772sub thawer_merge { 1902sub thawer_merge {
1773 my ($self, $merge) = @_; 1903 my ($self, $merge) = @_;
1774 1904
1775 # we have to keep some variables in memory intact 1905 # we have to keep some variables in memory intact
1780} 1910}
1781 1911
1782sub normalise { 1912sub normalise {
1783 my ($path, $base) = @_; 1913 my ($path, $base) = @_;
1784 1914
1785 $path = "$path"; # make sure its a string 1915 $path = "$path"; # make sure it's a string
1786 1916
1787 $path =~ s/\.map$//; 1917 $path =~ s/\.map$//;
1788 1918
1789 # map plan: 1919 # map plan:
1790 # 1920 #
1805 $base =~ s{[^/]+/?$}{}; 1935 $base =~ s{[^/]+/?$}{};
1806 $path = "$base/$path"; 1936 $path = "$base/$path";
1807 } 1937 }
1808 1938
1809 for ($path) { 1939 for ($path) {
1810 redo if s{//}{/};
1811 redo if s{/\.?/}{/}; 1940 redo if s{/\.?/}{/};
1812 redo if s{/[^/]+/\.\./}{/}; 1941 redo if s{/[^/]+/\.\./}{/};
1813 } 1942 }
1814 1943
1815 $path 1944 $path
1829 $self->init; # pass $1 etc. 1958 $self->init; # pass $1 etc.
1830 return $self; 1959 return $self;
1831 } 1960 }
1832 } 1961 }
1833 1962
1834 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1963 Carp::cluck "unable to resolve path '$path' (base '$base')";
1835 () 1964 ()
1836} 1965}
1837 1966
1838sub init { 1967sub init {
1839 my ($self) = @_; 1968 my ($self) = @_;
1861 1990
1862# the temporary/swap location 1991# the temporary/swap location
1863sub save_path { 1992sub save_path {
1864 my ($self) = @_; 1993 my ($self) = @_;
1865 1994
1866 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1995 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1867 "$TMPDIR/$path.map" 1996 "$TMPDIR/$path.map"
1868} 1997}
1869 1998
1870# the unique path, undef == no special unique path 1999# the unique path, undef == no special unique path
1871sub uniq_path { 2000sub uniq_path {
1872 my ($self) = @_; 2001 my ($self) = @_;
1873 2002
1874 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2003 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1875 "$UNIQUEDIR/$path" 2004 "$UNIQUEDIR/$path"
1876}
1877
1878# and all this just because we cannot iterate over
1879# all maps in C++...
1880sub change_all_map_light {
1881 my ($change) = @_;
1882
1883 $_->change_map_light ($change)
1884 for grep $_->outdoor, values %cf::MAP;
1885} 2005}
1886 2006
1887sub decay_objects { 2007sub decay_objects {
1888 my ($self) = @_; 2008 my ($self) = @_;
1889 2009
1971 2091
1972sub find; 2092sub find;
1973sub find { 2093sub find {
1974 my ($path, $origin) = @_; 2094 my ($path, $origin) = @_;
1975 2095
2096 cf::cede_to_tick;
2097
1976 $path = normalise $path, $origin && $origin->path; 2098 $path = normalise $path, $origin && $origin->path;
1977 2099
1978 cf::lock_wait "map_data:$path";#d#remove 2100 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1979 cf::lock_wait "map_find:$path"; 2101 my $guard2 = cf::lock_acquire "map_find:$path";
1980 2102
1981 $cf::MAP{$path} || do { 2103 $cf::MAP{$path} || do {
1982 my $guard1 = cf::lock_acquire "map_find:$path";
1983 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1984
1985 my $map = new_from_path cf::map $path 2104 my $map = new_from_path cf::map $path
1986 or return; 2105 or return;
1987 2106
1988 $map->{last_save} = $cf::RUNTIME; 2107 $map->{last_save} = $cf::RUNTIME;
1989 2108
1991 or return; 2110 or return;
1992 2111
1993 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2112 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1994 # doing this can freeze the server in a sync job, obviously 2113 # doing this can freeze the server in a sync job, obviously
1995 #$cf::WAIT_FOR_TICK->wait; 2114 #$cf::WAIT_FOR_TICK->wait;
2115 undef $guard2;
1996 undef $guard1; 2116 undef $guard1;
1997 undef $guard2;
1998 $map->reset; 2117 $map->reset;
1999 return find $path; 2118 return find $path;
2000 } 2119 }
2001 2120
2002 $cf::MAP{$path} = $map 2121 $cf::MAP{$path} = $map
2003 } 2122 }
2004} 2123}
2005 2124
2006sub pre_load { } 2125sub pre_load { }
2007sub post_load { } 2126#sub post_load { } # XS
2008 2127
2009sub load { 2128sub load {
2010 my ($self) = @_; 2129 my ($self) = @_;
2011 2130
2012 local $self->{deny_reset} = 1; # loading can take a long time 2131 local $self->{deny_reset} = 1; # loading can take a long time
2029 my $f = new_from_file cf::object::thawer $self->{load_path}; 2148 my $f = new_from_file cf::object::thawer $self->{load_path};
2030 $f->skip_block; 2149 $f->skip_block;
2031 $self->_load_objects ($f) 2150 $self->_load_objects ($f)
2032 or return; 2151 or return;
2033 2152
2034 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2153 $self->post_load_original
2035 if delete $self->{load_original}; 2154 if delete $self->{load_original};
2036 2155
2037 if (my $uniq = $self->uniq_path) { 2156 if (my $uniq = $self->uniq_path) {
2038 utf8::encode $uniq; 2157 utf8::encode $uniq;
2039 unless (aio_stat $uniq) { 2158 unless (aio_stat $uniq) {
2057 unless ($self->{deny_activate}) { 2176 unless ($self->{deny_activate}) {
2058 $self->decay_objects; 2177 $self->decay_objects;
2059 $self->fix_auto_apply; 2178 $self->fix_auto_apply;
2060 $self->update_buttons; 2179 $self->update_buttons;
2061 cf::cede_to_tick; 2180 cf::cede_to_tick;
2062 $self->set_darkness_map;
2063 cf::cede_to_tick;
2064 $self->activate; 2181 $self->activate;
2065 } 2182 }
2066 2183
2067 $self->{last_save} = $cf::RUNTIME; 2184 $self->{last_save} = $cf::RUNTIME;
2068 $self->last_access ($cf::RUNTIME); 2185 $self->last_access ($cf::RUNTIME);
2069 2186
2070 $self->in_memory (cf::MAP_IN_MEMORY); 2187 $self->in_memory (cf::MAP_ACTIVE);
2071 } 2188 }
2072 2189
2073 $self->post_load; 2190 $self->post_load;
2074}
2075 2191
2192 1
2193}
2194
2195# customize the map for a given player, i.e.
2196# return the _real_ map. used by e.g. per-player
2197# maps to change the path to ~playername/mappath
2076sub customise_for { 2198sub customise_for {
2077 my ($self, $ob) = @_; 2199 my ($self, $ob) = @_;
2078 2200
2079 return find "~" . $ob->name . "/" . $self->{path} 2201 return find "~" . $ob->name . "/" . $self->{path}
2080 if $self->per_player; 2202 if $self->per_player;
2096 or next; 2218 or next;
2097 $neigh = find $neigh, $map 2219 $neigh = find $neigh, $map
2098 or next; 2220 or next;
2099 $neigh->load; 2221 $neigh->load;
2100 2222
2223 # now find the diagonal neighbours
2101 push @neigh, 2224 push @neigh,
2102 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2225 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2103 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2226 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2104 } 2227 }
2105 2228
2112} 2235}
2113 2236
2114sub find_sync { 2237sub find_sync {
2115 my ($path, $origin) = @_; 2238 my ($path, $origin) = @_;
2116 2239
2117 cf::sync_job { find $path, $origin } 2240 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2241 if $Coro::current == $Coro::main;
2242
2243 find $path, $origin
2118} 2244}
2119 2245
2120sub do_load_sync { 2246sub do_load_sync {
2121 my ($map) = @_; 2247 my ($map) = @_;
2122 2248
2123 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2249 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2124 if $Coro::current == $Coro::main; 2250 if $Coro::current == $Coro::main;
2125 2251
2126 cf::sync_job { $map->load }; 2252 $map->load;
2127} 2253}
2128 2254
2129our %MAP_PREFETCH; 2255our %MAP_PREFETCH;
2130our $MAP_PREFETCHER = undef; 2256our $MAP_PREFETCHER = undef;
2131 2257
2133 my ($path, $origin, $load) = @_; 2259 my ($path, $origin, $load) = @_;
2134 2260
2135 $path = normalise $path, $origin && $origin->{path}; 2261 $path = normalise $path, $origin && $origin->{path};
2136 2262
2137 if (my $map = $cf::MAP{$path}) { 2263 if (my $map = $cf::MAP{$path}) {
2138 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2264 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2139 } 2265 }
2140 2266
2141 $MAP_PREFETCH{$path} |= $load; 2267 $MAP_PREFETCH{$path} |= $load;
2142 2268
2143 $MAP_PREFETCHER ||= cf::async { 2269 $MAP_PREFETCHER ||= cf::async {
2157 $MAP_PREFETCHER->prio (6); 2283 $MAP_PREFETCHER->prio (6);
2158 2284
2159 () 2285 ()
2160} 2286}
2161 2287
2288# common code, used by both ->save and ->swapout
2162sub save { 2289sub _save {
2163 my ($self) = @_; 2290 my ($self) = @_;
2164
2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
2166 2291
2167 $self->{last_save} = $cf::RUNTIME; 2292 $self->{last_save} = $cf::RUNTIME;
2168 2293
2169 return unless $self->dirty; 2294 return unless $self->dirty;
2170 2295
2179 2304
2180 cf::async { 2305 cf::async {
2181 $Coro::current->{desc} = "map player save"; 2306 $Coro::current->{desc} = "map player save";
2182 $_->contr->save for $self->players; 2307 $_->contr->save for $self->players;
2183 }; 2308 };
2309
2310 cf::get_slot 0.02;
2184 2311
2185 if ($uniq) { 2312 if ($uniq) {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2313 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2187 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2314 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2188 } else { 2315 } else {
2189 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2316 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2190 } 2317 }
2191} 2318}
2192 2319
2320sub save {
2321 my ($self) = @_;
2322
2323 my $lock = cf::lock_acquire "map_data:$self->{path}";
2324
2325 $self->_save;
2326}
2327
2193sub swap_out { 2328sub swap_out {
2194 my ($self) = @_; 2329 my ($self) = @_;
2195 2330
2196 # save first because save cedes
2197 $self->save;
2198
2199 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2331 my $lock = cf::lock_acquire "map_data:$self->{path}";
2200 2332
2333 return if $self->in_memory != cf::MAP_ACTIVE;
2334 return if $self->{deny_save};
2201 return if $self->players; 2335 return if $self->players;
2202 return if $self->in_memory != cf::MAP_IN_MEMORY;
2203 return if $self->{deny_save};
2204 2336
2337 # first deactivate the map and "unlink" it from the core
2338 $self->deactivate;
2339 $_->clear_links_to ($self) for values %cf::MAP;
2205 $self->in_memory (cf::MAP_SWAPPED); 2340 $self->in_memory (cf::MAP_SWAPPED);
2341
2342 # then atomically save
2343 $self->_save;
2344
2345 # then free the map
2346 $self->clear;
2347}
2348
2349sub reset_at {
2350 my ($self) = @_;
2351
2352 # TODO: safety, remove and allow resettable per-player maps
2353 return 1e99 if $self->{deny_reset};
2354
2355 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2356 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2357
2358 $time + $to
2359}
2360
2361sub should_reset {
2362 my ($self) = @_;
2363
2364 $self->reset_at <= $cf::RUNTIME
2365}
2366
2367sub reset {
2368 my ($self) = @_;
2369
2370 my $lock = cf::lock_acquire "map_data:$self->{path}";
2371
2372 return if $self->players;
2373
2374 cf::trace "resetting map ", $self->path, "\n";
2375
2376 $self->in_memory (cf::MAP_SWAPPED);
2377
2378 # need to save uniques path
2379 unless ($self->{deny_save}) {
2380 my $uniq = $self->uniq_path; utf8::encode $uniq;
2381
2382 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2383 if $uniq;
2384 }
2385
2386 delete $cf::MAP{$self->path};
2206 2387
2207 $self->deactivate; 2388 $self->deactivate;
2208 $_->clear_links_to ($self) for values %cf::MAP; 2389 $_->clear_links_to ($self) for values %cf::MAP;
2209 $self->clear; 2390 $self->clear;
2210}
2211
2212sub reset_at {
2213 my ($self) = @_;
2214
2215 # TODO: safety, remove and allow resettable per-player maps
2216 return 1e99 if $self->{deny_reset};
2217
2218 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2219 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2220
2221 $time + $to
2222}
2223
2224sub should_reset {
2225 my ($self) = @_;
2226
2227 $self->reset_at <= $cf::RUNTIME
2228}
2229
2230sub reset {
2231 my ($self) = @_;
2232
2233 my $lock = cf::lock_acquire "map_data:$self->{path}";
2234
2235 return if $self->players;
2236
2237 warn "resetting map ", $self->path;
2238
2239 $self->in_memory (cf::MAP_SWAPPED);
2240
2241 # need to save uniques path
2242 unless ($self->{deny_save}) {
2243 my $uniq = $self->uniq_path; utf8::encode $uniq;
2244
2245 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2246 if $uniq;
2247 }
2248
2249 delete $cf::MAP{$self->path};
2250
2251 $self->deactivate;
2252 $_->clear_links_to ($self) for values %cf::MAP;
2253 $self->clear;
2254 2391
2255 $self->unlink_save; 2392 $self->unlink_save;
2256 $self->destroy; 2393 $self->destroy;
2257} 2394}
2258 2395
2266 2403
2267 delete $cf::MAP{$self->path}; 2404 delete $cf::MAP{$self->path};
2268 2405
2269 $self->unlink_save; 2406 $self->unlink_save;
2270 2407
2271 bless $self, "cf::map"; 2408 bless $self, "cf::map::wrap";
2272 delete $self->{deny_reset}; 2409 delete $self->{deny_reset};
2273 $self->{deny_save} = 1; 2410 $self->{deny_save} = 1;
2274 $self->reset_timeout (1); 2411 $self->reset_timeout (1);
2275 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2412 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2276 2413
2325 2462
2326sub unique_maps() { 2463sub unique_maps() {
2327 [ 2464 [
2328 map { 2465 map {
2329 utf8::decode $_; 2466 utf8::decode $_;
2330 /\.map$/ 2467 s/\.map$//; # TODO future compatibility hack
2468 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2469 ? ()
2331 ? normalise $_ 2470 : normalise $_
2332 : ()
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2471 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2472 ]
2335} 2473}
2336 2474
2337package cf; 2475=item cf::map::static_maps
2476
2477Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2478file in the shared directory excluding F</styles> and F</editor>). May
2479block.
2480
2481=cut
2482
2483sub static_maps() {
2484 my @dirs = "";
2485 my @maps;
2486
2487 while (@dirs) {
2488 my $dir = shift @dirs;
2489
2490 next if $dir eq "/styles" || $dir eq "/editor";
2491
2492 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2493 or return;
2494
2495 for (@$files) {
2496 s/\.map$// or next;
2497 utf8::decode $_;
2498 push @maps, "$dir/$_";
2499 }
2500
2501 push @dirs, map "$dir/$_", @$dirs;
2502 }
2503
2504 \@maps
2505}
2338 2506
2339=back 2507=back
2340 2508
2341=head3 cf::object 2509=head3 cf::object
2342 2510
2346 2514
2347=over 4 2515=over 4
2348 2516
2349=item $ob->inv_recursive 2517=item $ob->inv_recursive
2350 2518
2351Returns the inventory of the object _and_ their inventories, recursively. 2519Returns the inventory of the object I<and> their inventories, recursively,
2520but I<not> the object itself.
2352 2521
2353=cut 2522=cut
2354 2523
2355sub inv_recursive_; 2524sub inv_recursive_;
2356sub inv_recursive_ { 2525sub inv_recursive_ {
2361 inv_recursive_ inv $_[0] 2530 inv_recursive_ inv $_[0]
2362} 2531}
2363 2532
2364=item $ref = $ob->ref 2533=item $ref = $ob->ref
2365 2534
2366creates and returns a persistent reference to an objetc that can be stored as a string. 2535Creates and returns a persistent reference to an object that can be stored as a string.
2367 2536
2368=item $ob = cf::object::deref ($refstring) 2537=item $ob = cf::object::deref ($refstring)
2369 2538
2370returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2539returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2371even if the object actually exists. May block. 2540even if the object actually exists. May block.
2403can be C<undef>. Does the right thing when the player is currently in a 2572can be C<undef>. Does the right thing when the player is currently in a
2404dialogue with the given NPC character. 2573dialogue with the given NPC character.
2405 2574
2406=cut 2575=cut
2407 2576
2577our $SAY_CHANNEL = {
2578 id => "say",
2579 title => "Map",
2580 reply => "say ",
2581 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2582};
2583
2584our $CHAT_CHANNEL = {
2585 id => "chat",
2586 title => "Chat",
2587 reply => "chat ",
2588 tooltip => "Player chat and shouts, global to the server.",
2589};
2590
2408# rough implementation of a future "reply" method that works 2591# rough implementation of a future "reply" method that works
2409# with dialog boxes. 2592# with dialog boxes.
2410#TODO: the first argument must go, split into a $npc->reply_to ( method 2593#TODO: the first argument must go, split into a $npc->reply_to ( method
2411sub cf::object::player::reply($$$;$) { 2594sub cf::object::player::reply($$$;$) {
2412 my ($self, $npc, $msg, $flags) = @_; 2595 my ($self, $npc, $msg, $flags) = @_;
2423 my $dialog = $pl->{npc_dialog}; 2606 my $dialog = $pl->{npc_dialog};
2424 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2607 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2425 2608
2426 } else { 2609 } else {
2427 $msg = $npc->name . " says: $msg" if $npc; 2610 $msg = $npc->name . " says: $msg" if $npc;
2428 $self->message ($msg, $flags); 2611 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2429 } 2612 }
2430 } 2613 }
2431} 2614}
2432 2615
2433=item $object->send_msg ($channel, $msg, $color, [extra...]) 2616=item $object->send_msg ($channel, $msg, $color, [extra...])
2458 2641
2459=item $player_object->enter_link 2642=item $player_object->enter_link
2460 2643
2461Freezes the player and moves him/her to a special map (C<{link}>). 2644Freezes the player and moves him/her to a special map (C<{link}>).
2462 2645
2463The player should be reasonably safe there for short amounts of time. You 2646The player should be reasonably safe there for short amounts of time (e.g.
2464I<MUST> call C<leave_link> as soon as possible, though. 2647for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2648though, as the player cannot control the character while it is on the link
2649map.
2465 2650
2466Will never block. 2651Will never block.
2467 2652
2468=item $player_object->leave_link ($map, $x, $y) 2653=item $player_object->leave_link ($map, $x, $y)
2469 2654
2489sub cf::object::player::enter_link { 2674sub cf::object::player::enter_link {
2490 my ($self) = @_; 2675 my ($self) = @_;
2491 2676
2492 $self->deactivate_recursive; 2677 $self->deactivate_recursive;
2493 2678
2679 ++$self->{_link_recursion};
2680
2494 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2681 return if UNIVERSAL::isa $self->map, "ext::map_link";
2495 2682
2496 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2683 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2497 if $self->map && $self->map->{path} ne "{link}"; 2684 if $self->map && $self->map->{path} ne "{link}";
2498 2685
2499 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2686 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2500} 2687}
2501 2688
2502sub cf::object::player::leave_link { 2689sub cf::object::player::leave_link {
2503 my ($self, $map, $x, $y) = @_; 2690 my ($self, $map, $x, $y) = @_;
2504 2691
2521 ($x, $y) = (-1, -1) 2708 ($x, $y) = (-1, -1)
2522 unless (defined $x) && (defined $y); 2709 unless (defined $x) && (defined $y);
2523 2710
2524 # use -1 or undef as default coordinates, not 0, 0 2711 # use -1 or undef as default coordinates, not 0, 0
2525 ($x, $y) = ($map->enter_x, $map->enter_y) 2712 ($x, $y) = ($map->enter_x, $map->enter_y)
2526 if $x <=0 && $y <= 0; 2713 if $x <= 0 && $y <= 0;
2527 2714
2528 $map->load; 2715 $map->load;
2529 $map->load_neighbours; 2716 $map->load_neighbours;
2530 2717
2531 return unless $self->contr->active; 2718 return unless $self->contr->active;
2532 $self->activate_recursive;
2533 2719
2534 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2720 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2535 $self->enter_map ($map, $x, $y); 2721 if ($self->enter_map ($map, $x, $y)) {
2536} 2722 # entering was successful
2723 delete $self->{_link_recursion};
2724 # only activate afterwards, to support waiting in hooks
2725 $self->activate_recursive;
2726 }
2537 2727
2728}
2729
2538=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2730=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2539 2731
2540Moves the player to the given map-path and coordinates by first freezing 2732Moves the player to the given map-path and coordinates by first freezing
2541her, loading and preparing them map, calling the provided $check callback 2733her, loading and preparing them map, calling the provided $check callback
2542that has to return the map if sucecssful, and then unfreezes the player on 2734that has to return the map if sucecssful, and then unfreezes the player on
2543the new (success) or old (failed) map position. In either case, $done will 2735the new (success) or old (failed) map position. In either case, $done will
2544be called at the end of this process. 2736be called at the end of this process.
2545 2737
2738Note that $check will be called with a potentially non-loaded map, so if
2739it needs a loaded map it has to call C<< ->load >>.
2740
2546=cut 2741=cut
2547 2742
2548our $GOTOGEN; 2743our $GOTOGEN;
2549 2744
2550sub cf::object::player::goto { 2745sub cf::object::player::goto {
2551 my ($self, $path, $x, $y, $check, $done) = @_; 2746 my ($self, $path, $x, $y, $check, $done) = @_;
2747
2748 if ($self->{_link_recursion} >= $MAX_LINKS) {
2749 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2750 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2751 ($path, $x, $y) = @$EMERGENCY_POSITION;
2752 }
2552 2753
2553 # do generation counting so two concurrent goto's will be executed in-order 2754 # do generation counting so two concurrent goto's will be executed in-order
2554 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2755 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2555 2756
2556 $self->enter_link; 2757 $self->enter_link;
2580 my $map = eval { 2781 my $map = eval {
2581 my $map = defined $path ? cf::map::find $path : undef; 2782 my $map = defined $path ? cf::map::find $path : undef;
2582 2783
2583 if ($map) { 2784 if ($map) {
2584 $map = $map->customise_for ($self); 2785 $map = $map->customise_for ($self);
2585 $map = $check->($map) if $check && $map; 2786 $map = $check->($map, $x, $y, $self) if $check && $map;
2586 } else { 2787 } else {
2587 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2788 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2588 } 2789 }
2589 2790
2590 $map 2791 $map
2598 if ($gen == $self->{_goto_generation}) { 2799 if ($gen == $self->{_goto_generation}) {
2599 delete $self->{_goto_generation}; 2800 delete $self->{_goto_generation};
2600 $self->leave_link ($map, $x, $y); 2801 $self->leave_link ($map, $x, $y);
2601 } 2802 }
2602 2803
2603 $done->() if $done; 2804 $done->($self) if $done;
2604 })->prio (1); 2805 })->prio (1);
2605} 2806}
2606 2807
2607=item $player_object->enter_exit ($exit_object) 2808=item $player_object->enter_exit ($exit_object)
2608 2809
2628} 2829}
2629 2830
2630sub prepare_random_map { 2831sub prepare_random_map {
2631 my ($exit) = @_; 2832 my ($exit) = @_;
2632 2833
2633 my $guard = cf::lock_acquire "exit_prepare:$exit";
2634
2635 # all this does is basically replace the /! path by 2834 # all this does is basically replace the /! path by
2636 # a new random map path (?random/...) with a seed 2835 # a new random map path (?random/...) with a seed
2637 # that depends on the exit object 2836 # that depends on the exit object
2638 2837
2639 my $rmp = parse_random_map_params $exit->msg; 2838 my $rmp = parse_random_map_params $exit->msg;
2641 if ($exit->map) { 2840 if ($exit->map) {
2642 $rmp->{region} = $exit->region->name; 2841 $rmp->{region} = $exit->region->name;
2643 $rmp->{origin_map} = $exit->map->path; 2842 $rmp->{origin_map} = $exit->map->path;
2644 $rmp->{origin_x} = $exit->x; 2843 $rmp->{origin_x} = $exit->x;
2645 $rmp->{origin_y} = $exit->y; 2844 $rmp->{origin_y} = $exit->y;
2845
2846 $exit->map->touch;
2646 } 2847 }
2647 2848
2648 $rmp->{random_seed} ||= $exit->random_seed; 2849 $rmp->{random_seed} ||= $exit->random_seed;
2649 2850
2650 my $data = cf::encode_json $rmp; 2851 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2651 my $md5 = Digest::MD5::md5_hex $data; 2852 my $md5 = Digest::MD5::md5_hex $data;
2652 my $meta = "$RANDOMDIR/$md5.meta"; 2853 my $meta = "$RANDOMDIR/$md5.meta";
2653 2854
2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2855 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2655 aio_write $fh, 0, (length $data), $data, 0; 2856 aio_write $fh, 0, (length $data), $data, 0;
2656 undef $fh; 2857 undef $fh;
2657 aio_rename "$meta~", $meta; 2858 aio_rename "$meta~", $meta;
2658 2859
2860 my $slaying = "?random/$md5";
2861
2862 if ($exit->valid) {
2659 $exit->slaying ("?random/$md5"); 2863 $exit->slaying ("?random/$md5");
2660 $exit->msg (undef); 2864 $exit->msg (undef);
2865 }
2661 } 2866 }
2662} 2867}
2663 2868
2664sub cf::object::player::enter_exit { 2869sub cf::object::player::enter_exit {
2665 my ($self, $exit) = @_; 2870 my ($self, $exit) = @_;
2666 2871
2667 return unless $self->type == cf::PLAYER; 2872 return unless $self->type == cf::PLAYER;
2668 2873
2669 if ($exit->slaying eq "/!") {
2670 #TODO: this should de-fi-ni-te-ly not be a sync-job
2671 # the problem is that $exit might not survive long enough
2672 # so it needs to be done right now, right here
2673 cf::sync_job { prepare_random_map $exit };
2674 }
2675
2676 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2677 my $hp = $exit->stats->hp;
2678 my $sp = $exit->stats->sp;
2679
2680 $self->enter_link; 2874 $self->enter_link;
2681 2875
2682 # if exit is damned, update players death & WoR home-position
2683 $self->contr->savebed ($slaying, $hp, $sp)
2684 if $exit->flag (FLAG_DAMNED);
2685
2686 (async { 2876 (async {
2687 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2877 $Coro::current->{desc} = "enter_exit";
2688 2878
2689 $self->deactivate_recursive; # just to be sure
2690 unless (eval { 2879 unless (eval {
2880 $self->deactivate_recursive; # just to be sure
2881
2882 # random map handling
2883 {
2884 my $guard = cf::lock_acquire "exit_prepare:$exit";
2885
2886 prepare_random_map $exit
2887 if $exit->slaying eq "/!";
2888 }
2889
2890 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2891 my $x = $exit->stats->hp;
2892 my $y = $exit->stats->sp;
2893
2691 $self->goto ($slaying, $hp, $sp); 2894 $self->goto ($map, $x, $y);
2692 2895
2896 # if exit is damned, update players death & WoR home-position
2897 $self->contr->savebed ($map, $x, $y)
2898 if $exit->flag (cf::FLAG_DAMNED);
2899
2693 1; 2900 1
2694 }) { 2901 }) {
2695 $self->message ("Something went wrong deep within the crossfire server. " 2902 $self->message ("Something went wrong deep within the deliantra server. "
2696 . "I'll try to bring you back to the map you were before. " 2903 . "I'll try to bring you back to the map you were before. "
2697 . "Please report this to the dungeon master!", 2904 . "Please report this to the dungeon master!",
2698 cf::NDI_UNIQUE | cf::NDI_RED); 2905 cf::NDI_UNIQUE | cf::NDI_RED);
2699 2906
2700 warn "ERROR in enter_exit: $@"; 2907 error "ERROR in enter_exit: $@";
2701 $self->leave_link; 2908 $self->leave_link;
2702 } 2909 }
2703 })->prio (1); 2910 })->prio (1);
2704} 2911}
2705 2912
2717sub cf::client::send_drawinfo { 2924sub cf::client::send_drawinfo {
2718 my ($self, $text, $flags) = @_; 2925 my ($self, $text, $flags) = @_;
2719 2926
2720 utf8::encode $text; 2927 utf8::encode $text;
2721 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2928 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2929}
2930
2931=item $client->send_big_packet ($pkt)
2932
2933Like C<send_packet>, but tries to compress large packets, and fragments
2934them as required.
2935
2936=cut
2937
2938our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2939
2940sub cf::client::send_big_packet {
2941 my ($self, $pkt) = @_;
2942
2943 # try lzf for large packets
2944 $pkt = "lzf " . Compress::LZF::compress $pkt
2945 if 1024 <= length $pkt and $self->{can_lzf};
2946
2947 # split very large packets
2948 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2949 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2950 $pkt = "frag";
2951 }
2952
2953 $self->send_packet ($pkt);
2722} 2954}
2723 2955
2724=item $client->send_msg ($channel, $msg, $color, [extra...]) 2956=item $client->send_msg ($channel, $msg, $color, [extra...])
2725 2957
2726Send a drawinfo or msg packet to the client, formatting the msg for the 2958Send a drawinfo or msg packet to the client, formatting the msg for the
2730 2962
2731=cut 2963=cut
2732 2964
2733# non-persistent channels (usually the info channel) 2965# non-persistent channels (usually the info channel)
2734our %CHANNEL = ( 2966our %CHANNEL = (
2967 "c/motd" => {
2968 id => "infobox",
2969 title => "MOTD",
2970 reply => undef,
2971 tooltip => "The message of the day",
2972 },
2735 "c/identify" => { 2973 "c/identify" => {
2736 id => "infobox", 2974 id => "infobox",
2737 title => "Identify", 2975 title => "Identify",
2738 reply => undef, 2976 reply => undef,
2739 tooltip => "Items recently identified", 2977 tooltip => "Items recently identified",
2741 "c/examine" => { 2979 "c/examine" => {
2742 id => "infobox", 2980 id => "infobox",
2743 title => "Examine", 2981 title => "Examine",
2744 reply => undef, 2982 reply => undef,
2745 tooltip => "Signs and other items you examined", 2983 tooltip => "Signs and other items you examined",
2984 },
2985 "c/shopinfo" => {
2986 id => "infobox",
2987 title => "Shop Info",
2988 reply => undef,
2989 tooltip => "What your bargaining skill tells you about the shop",
2746 }, 2990 },
2747 "c/book" => { 2991 "c/book" => {
2748 id => "infobox", 2992 id => "infobox",
2749 title => "Book", 2993 title => "Book",
2750 reply => undef, 2994 reply => undef,
2766 id => "infobox", 3010 id => "infobox",
2767 title => "Body Parts", 3011 title => "Body Parts",
2768 reply => undef, 3012 reply => undef,
2769 tooltip => "Shows which body parts you posess and are available", 3013 tooltip => "Shows which body parts you posess and are available",
2770 }, 3014 },
3015 "c/statistics" => {
3016 id => "infobox",
3017 title => "Statistics",
3018 reply => undef,
3019 tooltip => "Shows your primary statistics",
3020 },
3021 "c/skills" => {
3022 id => "infobox",
3023 title => "Skills",
3024 reply => undef,
3025 tooltip => "Shows your experience per skill and item power",
3026 },
3027 "c/shopitems" => {
3028 id => "infobox",
3029 title => "Shop Items",
3030 reply => undef,
3031 tooltip => "Shows the items currently for sale in this shop",
3032 },
3033 "c/resistances" => {
3034 id => "infobox",
3035 title => "Resistances",
3036 reply => undef,
3037 tooltip => "Shows your resistances",
3038 },
3039 "c/pets" => {
3040 id => "infobox",
3041 title => "Pets",
3042 reply => undef,
3043 tooltip => "Shows information abotu your pets/a specific pet",
3044 },
3045 "c/perceiveself" => {
3046 id => "infobox",
3047 title => "Perceive Self",
3048 reply => undef,
3049 tooltip => "You gained detailed knowledge about yourself",
3050 },
2771 "c/uptime" => { 3051 "c/uptime" => {
2772 id => "infobox", 3052 id => "infobox",
2773 title => "Uptime", 3053 title => "Uptime",
2774 reply => undef, 3054 reply => undef,
2775 tooltip => "How long the server has been running since last restart", 3055 tooltip => "How long the server has been running since last restart",
2778 id => "infobox", 3058 id => "infobox",
2779 title => "Map Info", 3059 title => "Map Info",
2780 reply => undef, 3060 reply => undef,
2781 tooltip => "Information related to the maps", 3061 tooltip => "Information related to the maps",
2782 }, 3062 },
3063 "c/party" => {
3064 id => "party",
3065 title => "Party",
3066 reply => "gsay ",
3067 tooltip => "Messages and chat related to your party",
3068 },
3069 "c/death" => {
3070 id => "death",
3071 title => "Death",
3072 reply => undef,
3073 tooltip => "Reason for and more info about your most recent death",
3074 },
3075 "c/say" => $SAY_CHANNEL,
3076 "c/chat" => $CHAT_CHANNEL,
2783); 3077);
2784 3078
2785sub cf::client::send_msg { 3079sub cf::client::send_msg {
2786 my ($self, $channel, $msg, $color, @extra) = @_; 3080 my ($self, $channel, $msg, $color, @extra) = @_;
2787 3081
2788 $msg = $self->pl->expand_cfpod ($msg); 3082 $msg = $self->pl->expand_cfpod ($msg)
3083 unless $color & cf::NDI_VERBATIM;
2789 3084
2790 $color &= cf::NDI_CLIENT_MASK; # just in case... 3085 $color &= cf::NDI_CLIENT_MASK; # just in case...
2791 3086
2792 # check predefined channels, for the benefit of C 3087 # check predefined channels, for the benefit of C
2793 if ($CHANNEL{$channel}) { 3088 if ($CHANNEL{$channel}) {
2794 $channel = $CHANNEL{$channel}; 3089 $channel = $CHANNEL{$channel};
2795 3090
2796 $self->ext_msg (channel_info => $channel) 3091 $self->ext_msg (channel_info => $channel);
2797 if $self->can_msg;
2798
2799 $channel = $channel->{id}; 3092 $channel = $channel->{id};
2800 3093
2801 } elsif (ref $channel) { 3094 } elsif (ref $channel) {
2802 # send meta info to client, if not yet sent 3095 # send meta info to client, if not yet sent
2803 unless (exists $self->{channel}{$channel->{id}}) { 3096 unless (exists $self->{channel}{$channel->{id}}) {
2804 $self->{channel}{$channel->{id}} = $channel; 3097 $self->{channel}{$channel->{id}} = $channel;
2805 $self->ext_msg (channel_info => $channel) 3098 $self->ext_msg (channel_info => $channel);
2806 if $self->can_msg;
2807 } 3099 }
2808 3100
2809 $channel = $channel->{id}; 3101 $channel = $channel->{id};
2810 } 3102 }
2811 3103
2812 return unless @extra || length $msg; 3104 return unless @extra || length $msg;
2813 3105
2814 if ($self->can_msg) {
2815 # default colour, mask it out 3106 # default colour, mask it out
2816 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3107 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2817 if $color & cf::NDI_DEF; 3108 if $color & cf::NDI_DEF;
2818 3109
2819 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3110 my $pkt = "msg "
3111 . $self->{json_coder}->encode (
2820 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3112 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2821 } else { 3113 );
2822 if ($color >= 0) {
2823 # replace some tags by gcfclient-compatible ones
2824 for ($msg) {
2825 1 while
2826 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2827 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2828 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2829 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2830 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2831 }
2832 3114
2833 $color &= cf::NDI_COLOR_MASK; 3115 $self->send_big_packet ($pkt);
2834
2835 utf8::encode $msg;
2836
2837 if (0 && $msg =~ /\[/) {
2838 # COMMAND/INFO
2839 $self->send_packet ("drawextinfo $color 10 8 $msg")
2840 } else {
2841 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2842 $self->send_packet ("drawinfo $color $msg")
2843 }
2844 }
2845 }
2846} 3116}
2847 3117
2848=item $client->ext_msg ($type, @msg) 3118=item $client->ext_msg ($type, @msg)
2849 3119
2850Sends an ext event to the client. 3120Sends an ext event to the client.
2853 3123
2854sub cf::client::ext_msg($$@) { 3124sub cf::client::ext_msg($$@) {
2855 my ($self, $type, @msg) = @_; 3125 my ($self, $type, @msg) = @_;
2856 3126
2857 if ($self->extcmd == 2) { 3127 if ($self->extcmd == 2) {
2858 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3128 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2859 } elsif ($self->extcmd == 1) { # TODO: remove 3129 } elsif ($self->extcmd == 1) { # TODO: remove
2860 push @msg, msgtype => "event_$type"; 3130 push @msg, msgtype => "event_$type";
2861 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3131 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2862 } 3132 }
2863} 3133}
2864 3134
2865=item $client->ext_reply ($msgid, @msg) 3135=item $client->ext_reply ($msgid, @msg)
2866 3136
2870 3140
2871sub cf::client::ext_reply($$@) { 3141sub cf::client::ext_reply($$@) {
2872 my ($self, $id, @msg) = @_; 3142 my ($self, $id, @msg) = @_;
2873 3143
2874 if ($self->extcmd == 2) { 3144 if ($self->extcmd == 2) {
2875 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3145 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2876 } elsif ($self->extcmd == 1) { 3146 } elsif ($self->extcmd == 1) {
2877 #TODO: version 1, remove 3147 #TODO: version 1, remove
2878 unshift @msg, msgtype => "reply", msgid => $id; 3148 unshift @msg, msgtype => "reply", msgid => $id;
2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3149 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 } 3150 }
2881} 3151}
2882 3152
2883=item $success = $client->query ($flags, "text", \&cb) 3153=item $success = $client->query ($flags, "text", \&cb)
2884 3154
2955 3225
2956 $ns->ext_reply ($reply, @reply) 3226 $ns->ext_reply ($reply, @reply)
2957 if $reply; 3227 if $reply;
2958 3228
2959 } else { 3229 } else {
2960 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3230 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2961 } 3231 }
2962 3232
2963 cf::override; 3233 cf::override;
2964 }, 3234 },
2965); 3235);
2985 3255
2986 $coro 3256 $coro
2987} 3257}
2988 3258
2989cf::client->attach ( 3259cf::client->attach (
2990 on_destroy => sub { 3260 on_client_destroy => sub {
2991 my ($ns) = @_; 3261 my ($ns) = @_;
2992 3262
2993 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3263 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2994 }, 3264 },
2995); 3265);
3011our $safe_hole = new Safe::Hole; 3281our $safe_hole = new Safe::Hole;
3012 3282
3013$SIG{FPE} = 'IGNORE'; 3283$SIG{FPE} = 'IGNORE';
3014 3284
3015$safe->permit_only (Opcode::opset qw( 3285$safe->permit_only (Opcode::opset qw(
3016 :base_core :base_mem :base_orig :base_math 3286 :base_core :base_mem :base_orig :base_math :base_loop
3017 grepstart grepwhile mapstart mapwhile 3287 grepstart grepwhile mapstart mapwhile
3018 sort time 3288 sort time
3019)); 3289));
3020 3290
3021# here we export the classes and methods available to script code 3291# here we export the classes and methods available to script code
3024 3294
3025The following functions and methods are available within a safe environment: 3295The following functions and methods are available within a safe environment:
3026 3296
3027 cf::object 3297 cf::object
3028 contr pay_amount pay_player map x y force_find force_add destroy 3298 contr pay_amount pay_player map x y force_find force_add destroy
3029 insert remove name archname title slaying race decrease_ob_nr 3299 insert remove name archname title slaying race decrease split
3300 value
3030 3301
3031 cf::object::player 3302 cf::object::player
3032 player 3303 player
3033 3304
3034 cf::player 3305 cf::player
3039 3310
3040=cut 3311=cut
3041 3312
3042for ( 3313for (
3043 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3314 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3044 insert remove inv name archname title slaying race 3315 insert remove inv nrof name archname title slaying race
3045 decrease_ob_nr destroy)], 3316 decrease split destroy change_exp value msg lore send_msg)],
3046 ["cf::object::player" => qw(player)], 3317 ["cf::object::player" => qw(player)],
3047 ["cf::player" => qw(peaceful)], 3318 ["cf::player" => qw(peaceful send_msg)],
3048 ["cf::map" => qw(trigger)], 3319 ["cf::map" => qw(trigger)],
3049) { 3320) {
3050 no strict 'refs';
3051 my ($pkg, @funs) = @$_; 3321 my ($pkg, @funs) = @$_;
3052 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3322 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3053 for @funs; 3323 for @funs;
3054} 3324}
3055 3325
3070 3340
3071 my $qcode = $code; 3341 my $qcode = $code;
3072 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3342 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3073 $qcode =~ s/\n/\\n/g; 3343 $qcode =~ s/\n/\\n/g;
3074 3344
3345 %vars = (_dummy => 0) unless %vars;
3346
3347 my @res;
3075 local $_; 3348 local $_;
3076 local @safe::cf::_safe_eval_args = values %vars;
3077 3349
3078 my $eval = 3350 my $eval =
3079 "do {\n" 3351 "do {\n"
3080 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3352 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3081 . "#line 0 \"{$qcode}\"\n" 3353 . "#line 0 \"{$qcode}\"\n"
3082 . $code 3354 . $code
3083 . "\n}" 3355 . "\n}"
3084 ; 3356 ;
3085 3357
3358 if ($CFG{safe_eval}) {
3086 sub_generation_inc; 3359 sub_generation_inc;
3360 local @safe::cf::_safe_eval_args = values %vars;
3087 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3361 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3088 sub_generation_inc; 3362 sub_generation_inc;
3363 } else {
3364 local @cf::_safe_eval_args = values %vars;
3365 @res = wantarray ? eval eval : scalar eval $eval;
3366 }
3089 3367
3090 if ($@) { 3368 if ($@) {
3091 warn "$@"; 3369 warn "$@",
3092 warn "while executing safe code '$code'\n"; 3370 "while executing safe code '$code'\n",
3093 warn "with arguments " . (join " ", %vars) . "\n"; 3371 "with arguments " . (join " ", %vars) . "\n";
3094 } 3372 }
3095 3373
3096 wantarray ? @res : $res[0] 3374 wantarray ? @res : $res[0]
3097} 3375}
3098 3376
3112=cut 3390=cut
3113 3391
3114sub register_script_function { 3392sub register_script_function {
3115 my ($fun, $cb) = @_; 3393 my ($fun, $cb) = @_;
3116 3394
3117 no strict 'refs'; 3395 $fun = "safe::$fun" if $CFG{safe_eval};
3118 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3396 *$fun = $safe_hole->wrap ($cb);
3119} 3397}
3120 3398
3121=back 3399=back
3122 3400
3123=cut 3401=cut
3132 # for this (global event?) 3410 # for this (global event?)
3133 %ext::player_env::MUSIC_FACE_CACHE = (); 3411 %ext::player_env::MUSIC_FACE_CACHE = ();
3134 3412
3135 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3413 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3136 3414
3137 warn "loading facedata from $path\n"; 3415 trace "loading facedata from $path\n";
3138 3416
3139 my $facedata;
3140 0 < aio_load $path, $facedata 3417 0 < aio_load $path, my $facedata
3141 or die "$path: $!"; 3418 or die "$path: $!";
3142 3419
3143 $facedata = Coro::Storable::thaw $facedata; 3420 $facedata = Coro::Storable::thaw $facedata;
3144 3421
3145 $facedata->{version} == 2 3422 $facedata->{version} == 2
3146 or cf::cleanup "$path: version mismatch, cannot proceed."; 3423 or cf::cleanup "$path: version mismatch, cannot proceed.";
3147 3424
3148 # patch in the exptable 3425 # patch in the exptable
3426 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3149 $facedata->{resource}{"res/exp_table"} = { 3427 $facedata->{resource}{"res/exp_table"} = {
3150 type => FT_RSRC, 3428 type => FT_RSRC,
3151 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3429 data => $exp_table,
3430 hash => (Digest::MD5::md5 $exp_table),
3152 }; 3431 };
3153 cf::cede_to_tick; 3432 cf::cede_to_tick;
3154 3433
3155 { 3434 {
3156 my $faces = $facedata->{faceinfo}; 3435 my $faces = $facedata->{faceinfo};
3158 while (my ($face, $info) = each %$faces) { 3437 while (my ($face, $info) = each %$faces) {
3159 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3438 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3160 3439
3161 cf::face::set_visibility $idx, $info->{visibility}; 3440 cf::face::set_visibility $idx, $info->{visibility};
3162 cf::face::set_magicmap $idx, $info->{magicmap}; 3441 cf::face::set_magicmap $idx, $info->{magicmap};
3163 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3442 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3164 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3443 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3165 3444
3166 cf::cede_to_tick; 3445 cf::cede_to_tick;
3167 } 3446 }
3168 3447
3169 while (my ($face, $info) = each %$faces) { 3448 while (my ($face, $info) = each %$faces) {
3174 3453
3175 if (my $smooth = cf::face::find $info->{smooth}) { 3454 if (my $smooth = cf::face::find $info->{smooth}) {
3176 cf::face::set_smooth $idx, $smooth; 3455 cf::face::set_smooth $idx, $smooth;
3177 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3456 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3178 } else { 3457 } else {
3179 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3458 error "smooth face '$info->{smooth}' not found for face '$face'";
3180 } 3459 }
3181 3460
3182 cf::cede_to_tick; 3461 cf::cede_to_tick;
3183 } 3462 }
3184 } 3463 }
3193 3472
3194 cf::anim::invalidate_all; # d'oh 3473 cf::anim::invalidate_all; # d'oh
3195 } 3474 }
3196 3475
3197 { 3476 {
3198 # TODO: for gcfclient pleasure, we should give resources
3199 # that gcfclient doesn't grok a >10000 face index.
3200 my $res = $facedata->{resource}; 3477 my $res = $facedata->{resource};
3201 3478
3202 while (my ($name, $info) = each %$res) { 3479 while (my ($name, $info) = each %$res) {
3203 if (defined $info->{type}) { 3480 if (defined $info->{type}) {
3204 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3481 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3205 my $data;
3206 3482
3207 if ($info->{type} & 1) { 3483 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3208 # prepend meta info
3209
3210 my $meta = $enc->encode ({
3211 name => $name,
3212 %{ $info->{meta} || {} },
3213 });
3214
3215 $data = pack "(w/a*)*", $meta, $info->{data};
3216 } else {
3217 $data = $info->{data};
3218 }
3219
3220 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3221 cf::face::set_type $idx, $info->{type}; 3484 cf::face::set_type $idx, $info->{type};
3222 } else { 3485 } else {
3223 $RESOURCE{$name} = $info; 3486 $RESOURCE{$name} = $info; # unused
3224 } 3487 }
3225 3488
3226 cf::cede_to_tick; 3489 cf::cede_to_tick;
3227 } 3490 }
3228 } 3491 }
3229 3492
3230 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3493 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3231 3494
3232 1 3495 1
3233} 3496}
3234
3235cf::global->attach (on_resource_update => sub {
3236 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3237 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3238
3239 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3240 my $sound = $soundconf->{compat}[$_]
3241 or next;
3242
3243 my $face = cf::face::find "sound/$sound->[1]";
3244 cf::sound::set $sound->[0] => $face;
3245 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3246 }
3247
3248 while (my ($k, $v) = each %{$soundconf->{event}}) {
3249 my $face = cf::face::find "sound/$v";
3250 cf::sound::set $k => $face;
3251 }
3252 }
3253});
3254 3497
3255register_exticmd fx_want => sub { 3498register_exticmd fx_want => sub {
3256 my ($ns, $want) = @_; 3499 my ($ns, $want) = @_;
3257 3500
3258 while (my ($k, $v) = each %$want) { 3501 while (my ($k, $v) = each %$want) {
3259 $ns->fx_want ($k, $v); 3502 $ns->fx_want ($k, $v);
3260 } 3503 }
3261}; 3504};
3505
3506sub load_resource_file($) {
3507 my $guard = lock_acquire "load_resource_file";
3508
3509 my $status = load_resource_file_ $_[0];
3510 get_slot 0.1, 100;
3511 cf::arch::commit_load;
3512
3513 $status
3514}
3262 3515
3263sub reload_regions { 3516sub reload_regions {
3264 # HACK to clear player env face cache, we need some signal framework 3517 # HACK to clear player env face cache, we need some signal framework
3265 # for this (global event?) 3518 # for this (global event?)
3266 %ext::player_env::MUSIC_FACE_CACHE = (); 3519 %ext::player_env::MUSIC_FACE_CACHE = ();
3280} 3533}
3281 3534
3282sub reload_archetypes { 3535sub reload_archetypes {
3283 load_resource_file "$DATADIR/archetypes" 3536 load_resource_file "$DATADIR/archetypes"
3284 or die "unable to load archetypes\n"; 3537 or die "unable to load archetypes\n";
3285 #d# NEED to laod twice to resolve forward references
3286 # this really needs to be done in an extra post-pass
3287 # (which needs to be synchronous, so solve it differently)
3288 load_resource_file "$DATADIR/archetypes"
3289 or die "unable to load archetypes\n";
3290} 3538}
3291 3539
3292sub reload_treasures { 3540sub reload_treasures {
3293 load_resource_file "$DATADIR/treasures" 3541 load_resource_file "$DATADIR/treasures"
3294 or die "unable to load treasurelists\n"; 3542 or die "unable to load treasurelists\n";
3295} 3543}
3296 3544
3545sub reload_sound {
3546 trace "loading sound config from $DATADIR/sound\n";
3547
3548 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3549 or die "$DATADIR/sound $!";
3550
3551 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3552
3553 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3554 my $sound = $soundconf->{compat}[$_]
3555 or next;
3556
3557 my $face = cf::face::find "sound/$sound->[1]";
3558 cf::sound::set $sound->[0] => $face;
3559 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3560 }
3561
3562 while (my ($k, $v) = each %{$soundconf->{event}}) {
3563 my $face = cf::face::find "sound/$v";
3564 cf::sound::set $k => $face;
3565 }
3566}
3567
3297sub reload_resources { 3568sub reload_resources {
3298 warn "reloading resource files...\n"; 3569 trace "reloading resource files...\n";
3299 3570
3571 reload_exp_table;
3572 reload_materials;
3573 reload_facedata;
3574 reload_sound;
3575 reload_archetypes;
3300 reload_regions; 3576 reload_regions;
3301 reload_facedata;
3302 #reload_archetypes;#d#
3303 reload_archetypes;
3304 reload_treasures; 3577 reload_treasures;
3305 3578
3306 warn "finished reloading resource files\n"; 3579 trace "finished reloading resource files\n";
3307}
3308
3309sub init {
3310 reload_resources;
3311} 3580}
3312 3581
3313sub reload_config { 3582sub reload_config {
3314 open my $fh, "<:utf8", "$CONFDIR/config" 3583 trace "reloading config file...\n";
3315 or return;
3316 3584
3317 local $/; 3585 0 < aio_load "$CONFDIR/config", my $config
3318 *CFG = YAML::Syck::Load <$fh>; 3586 or die "$CONFDIR/config: $!";
3319 3587
3588 utf8::decode $config;
3589 *CFG = yaml_load $config;
3590
3320 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3591 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3321 3592
3322 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3593 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3323 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3594 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3324 3595
3325 if (exists $CFG{mlockall}) { 3596 if (exists $CFG{mlockall}) {
3329 }; 3600 };
3330 warn $@ if $@; 3601 warn $@ if $@;
3331 } 3602 }
3332} 3603}
3333 3604
3605sub pidfile() {
3606 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3607 or die "$PIDFILE: $!";
3608 flock $fh, &Fcntl::LOCK_EX
3609 or die "$PIDFILE: flock: $!";
3610 $fh
3611}
3612
3613# make sure only one server instance is running at any one time
3614sub atomic {
3615 my $fh = pidfile;
3616
3617 my $pid = <$fh>;
3618 kill 9, $pid if $pid > 0;
3619
3620 seek $fh, 0, 0;
3621 print $fh $$;
3622}
3623
3624sub main_loop {
3625 trace "EV::loop starting\n";
3626 if (1) {
3627 EV::loop;
3628 }
3629 trace "EV::loop returned\n";
3630 goto &main_loop unless $REALLY_UNLOOP;
3631}
3632
3334sub main { 3633sub main {
3634 cf::init_globals; # initialise logging
3635
3636 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3637 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3638 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3639 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3640
3641 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3642
3335 # we must not ever block the main coroutine 3643 # we must not ever block the main coroutine
3336 local $Coro::idle = sub { 3644 local $Coro::idle = sub {
3337 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3645 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3338 (async { 3646 (async {
3339 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3647 $Coro::current->{desc} = "IDLE BUG HANDLER";
3340 EV::loop EV::LOOP_ONESHOT; 3648 EV::loop EV::LOOP_ONESHOT;
3341 })->prio (Coro::PRIO_MAX); 3649 })->prio (Coro::PRIO_MAX);
3342 }; 3650 };
3343 3651
3652 evthread_start IO::AIO::poll_fileno;
3653
3654 cf::sync_job {
3655 cf::incloader::init ();
3656
3657 cf::init_anim;
3658 cf::init_attackmess;
3659 cf::init_dynamic;
3660
3661 cf::load_settings;
3662
3663 reload_resources;
3344 reload_config; 3664 reload_config;
3345 db_init; 3665 db_init;
3666
3667 cf::init_uuid;
3668 cf::init_signals;
3669 cf::init_skills;
3670
3671 cf::init_beforeplay;
3672
3673 atomic;
3674
3346 load_extensions; 3675 load_extensions;
3347 3676
3348 $TICK_WATCHER->start; 3677 utime time, time, $RUNTIMEFILE;
3349 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3678
3350 EV::loop; 3679 # no (long-running) fork's whatsoever before this point(!)
3680 use POSIX ();
3681 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3682
3683 cf::_post_init 0;
3684 };
3685
3686 cf::object::thawer::errors_are_fatal 0;
3687 info "parse errors in files are no longer fatal from this point on.\n";
3688
3689 my $free_main; $free_main = EV::idle sub {
3690 undef $free_main;
3691 undef &main; # free gobs of memory :)
3692 };
3693
3694 goto &main_loop;
3351} 3695}
3352 3696
3353############################################################################# 3697#############################################################################
3354# initialisation and cleanup 3698# initialisation and cleanup
3355 3699
3356# install some emergency cleanup handlers 3700# install some emergency cleanup handlers
3357BEGIN { 3701BEGIN {
3358 our %SIGWATCHER = (); 3702 our %SIGWATCHER = ();
3359 for my $signal (qw(INT HUP TERM)) { 3703 for my $signal (qw(INT HUP TERM)) {
3360 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3704 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3361 cf::cleanup "SIG$signal"; 3705 cf::cleanup "SIG$signal";
3362 }; 3706 };
3363 } 3707 }
3364} 3708}
3365 3709
3366sub write_runtime { 3710sub write_runtime_sync {
3367 my $runtime = "$LOCALDIR/runtime"; 3711 my $t0 = AE::time;
3368 3712
3369 # first touch the runtime file to show we are still running: 3713 # first touch the runtime file to show we are still running:
3370 # the fsync below can take a very very long time. 3714 # the fsync below can take a very very long time.
3371 3715
3372 IO::AIO::aio_utime $runtime, undef, undef; 3716 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3373 3717
3374 my $guard = cf::lock_acquire "write_runtime"; 3718 my $guard = cf::lock_acquire "write_runtime";
3375 3719
3376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3720 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3377 or return; 3721 or return;
3378 3722
3379 my $value = $cf::RUNTIME + 90 + 10; 3723 my $value = $cf::RUNTIME + 90 + 10;
3380 # 10 is the runtime save interval, for a monotonic clock 3724 # 10 is the runtime save interval, for a monotonic clock
3381 # 60 allows for the watchdog to kill the server. 3725 # 60 allows for the watchdog to kill the server.
3391 aio_utime $fh, undef, undef; 3735 aio_utime $fh, undef, undef;
3392 3736
3393 close $fh 3737 close $fh
3394 or return; 3738 or return;
3395 3739
3396 aio_rename "$runtime~", $runtime 3740 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3397 and return; 3741 and return;
3398 3742
3399 warn "runtime file written.\n"; 3743 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3400 3744
3401 1 3745 1
3746}
3747
3748our $uuid_lock;
3749our $uuid_skip;
3750
3751sub write_uuid_sync($) {
3752 $uuid_skip ||= $_[0];
3753
3754 return if $uuid_lock;
3755 local $uuid_lock = 1;
3756
3757 my $uuid = "$LOCALDIR/uuid";
3758
3759 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3760 or return;
3761
3762 my $value = uuid_seq uuid_cur;
3763
3764 unless ($value) {
3765 info "cowardly refusing to write zero uuid value!\n";
3766 return;
3767 }
3768
3769 my $value = uuid_str $value + $uuid_skip;
3770 $uuid_skip = 0;
3771
3772 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3773 and return;
3774
3775 # always fsync - this file is important
3776 aio_fsync $fh
3777 and return;
3778
3779 close $fh
3780 or return;
3781
3782 aio_rename "$uuid~", $uuid
3783 and return;
3784
3785 trace "uuid file written ($value).\n";
3786
3787 1
3788
3789}
3790
3791sub write_uuid($$) {
3792 my ($skip, $sync) = @_;
3793
3794 $sync ? write_uuid_sync $skip
3795 : async { write_uuid_sync $skip };
3402} 3796}
3403 3797
3404sub emergency_save() { 3798sub emergency_save() {
3405 my $freeze_guard = cf::freeze_mainloop; 3799 my $freeze_guard = cf::freeze_mainloop;
3406 3800
3407 warn "enter emergency perl save\n"; 3801 info "emergency_perl_save: enter\n";
3802
3803 # this is a trade-off: we want to be very quick here, so
3804 # save all maps without fsync, and later call a global sync
3805 # (which in turn might be very very slow)
3806 local $USE_FSYNC = 0;
3408 3807
3409 cf::sync_job { 3808 cf::sync_job {
3809 cf::write_runtime_sync; # external watchdog should not bark
3810
3410 # use a peculiar iteration method to avoid tripping on perl 3811 # use a peculiar iteration method to avoid tripping on perl
3411 # refcount bugs in for. also avoids problems with players 3812 # refcount bugs in for. also avoids problems with players
3412 # and maps saved/destroyed asynchronously. 3813 # and maps saved/destroyed asynchronously.
3413 warn "begin emergency player save\n"; 3814 info "emergency_perl_save: begin player save\n";
3414 for my $login (keys %cf::PLAYER) { 3815 for my $login (keys %cf::PLAYER) {
3415 my $pl = $cf::PLAYER{$login} or next; 3816 my $pl = $cf::PLAYER{$login} or next;
3416 $pl->valid or next; 3817 $pl->valid or next;
3417 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3818 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3418 $pl->save; 3819 $pl->save;
3419 } 3820 }
3420 warn "end emergency player save\n"; 3821 info "emergency_perl_save: end player save\n";
3421 3822
3422 warn "begin emergency map save\n"; 3823 cf::write_runtime_sync; # external watchdog should not bark
3824
3825 info "emergency_perl_save: begin map save\n";
3423 for my $path (keys %cf::MAP) { 3826 for my $path (keys %cf::MAP) {
3424 my $map = $cf::MAP{$path} or next; 3827 my $map = $cf::MAP{$path} or next;
3425 $map->valid or next; 3828 $map->valid or next;
3426 $map->save; 3829 $map->save;
3427 } 3830 }
3428 warn "end emergency map save\n"; 3831 info "emergency_perl_save: end map save\n";
3429 3832
3430 warn "begin emergency database checkpoint\n"; 3833 cf::write_runtime_sync; # external watchdog should not bark
3834
3835 info "emergency_perl_save: begin database checkpoint\n";
3431 BDB::db_env_txn_checkpoint $DB_ENV; 3836 BDB::db_env_txn_checkpoint $DB_ENV;
3432 warn "end emergency database checkpoint\n"; 3837 info "emergency_perl_save: end database checkpoint\n";
3838
3839 info "emergency_perl_save: begin write uuid\n";
3840 write_uuid_sync 1;
3841 info "emergency_perl_save: end write uuid\n";
3842
3843 cf::write_runtime_sync; # external watchdog should not bark
3844
3845 trace "emergency_perl_save: syncing database to disk";
3846 BDB::db_env_txn_checkpoint $DB_ENV;
3847
3848 info "emergency_perl_save: starting sync\n";
3849 IO::AIO::aio_sync sub {
3850 info "emergency_perl_save: finished sync\n";
3851 };
3852
3853 cf::write_runtime_sync; # external watchdog should not bark
3854
3855 trace "emergency_perl_save: flushing outstanding aio requests";
3856 while (IO::AIO::nreqs || BDB::nreqs) {
3857 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3858 }
3859
3860 cf::write_runtime_sync; # external watchdog should not bark
3433 }; 3861 };
3434 3862
3435 warn "leave emergency perl save\n"; 3863 info "emergency_perl_save: leave\n";
3436} 3864}
3437 3865
3438sub post_cleanup { 3866sub post_cleanup {
3439 my ($make_core) = @_; 3867 my ($make_core) = @_;
3440 3868
3869 IO::AIO::flush;
3870
3441 warn Carp::longmess "post_cleanup backtrace" 3871 error Carp::longmess "post_cleanup backtrace"
3442 if $make_core; 3872 if $make_core;
3873
3874 my $fh = pidfile;
3875 unlink $PIDFILE if <$fh> == $$;
3876}
3877
3878# a safer delete_package, copied from Symbol
3879sub clear_package($) {
3880 my $pkg = shift;
3881
3882 # expand to full symbol table name if needed
3883 unless ($pkg =~ /^main::.*::$/) {
3884 $pkg = "main$pkg" if $pkg =~ /^::/;
3885 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3886 $pkg .= '::' unless $pkg =~ /::$/;
3887 }
3888
3889 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3890 my $stem_symtab = *{$stem}{HASH};
3891
3892 defined $stem_symtab and exists $stem_symtab->{$leaf}
3893 or return;
3894
3895 # clear all symbols
3896 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3897 for my $name (keys %$leaf_symtab) {
3898 _gv_clear *{"$pkg$name"};
3899# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3900 }
3443} 3901}
3444 3902
3445sub do_reload_perl() { 3903sub do_reload_perl() {
3446 # can/must only be called in main 3904 # can/must only be called in main
3447 if ($Coro::current != $Coro::main) { 3905 unless (in_main) {
3448 warn "can only reload from main coroutine"; 3906 error "can only reload from main coroutine";
3449 return; 3907 return;
3450 } 3908 }
3451 3909
3452 warn "reloading..."; 3910 return if $RELOAD++;
3453 3911
3454 warn "entering sync_job"; 3912 my $t1 = AE::time;
3455 3913
3914 while ($RELOAD) {
3915 cf::get_slot 0.1, -1, "reload_perl";
3916 info "perl_reload: reloading...";
3917
3918 trace "perl_reload: entering sync_job";
3919
3456 cf::sync_job { 3920 cf::sync_job {
3457 cf::write_runtime; # external watchdog should not bark
3458 cf::emergency_save; 3921 #cf::emergency_save;
3459 cf::write_runtime; # external watchdog should not bark
3460 3922
3461 warn "syncing database to disk";
3462 BDB::db_env_txn_checkpoint $DB_ENV;
3463
3464 # if anything goes wrong in here, we should simply crash as we already saved
3465
3466 warn "flushing outstanding aio requests";
3467 for (;;) {
3468 BDB::flush;
3469 IO::AIO::flush;
3470 Coro::cede_notself;
3471 last unless IO::AIO::nreqs || BDB::nreqs;
3472 warn "iterate...";
3473 }
3474
3475 ++$RELOAD;
3476
3477 warn "cancelling all extension coros"; 3923 trace "perl_reload: cancelling all extension coros";
3478 $_->cancel for values %EXT_CORO; 3924 $_->cancel for values %EXT_CORO;
3479 %EXT_CORO = (); 3925 %EXT_CORO = ();
3480 3926
3481 warn "removing commands"; 3927 trace "perl_reload: removing commands";
3482 %COMMAND = (); 3928 %COMMAND = ();
3483 3929
3484 warn "removing ext/exti commands"; 3930 trace "perl_reload: removing ext/exti commands";
3485 %EXTCMD = (); 3931 %EXTCMD = ();
3486 %EXTICMD = (); 3932 %EXTICMD = ();
3487 3933
3488 warn "unloading/nuking all extensions"; 3934 trace "perl_reload: unloading/nuking all extensions";
3489 for my $pkg (@EXTS) { 3935 for my $pkg (@EXTS) {
3490 warn "... unloading $pkg"; 3936 trace "... unloading $pkg";
3491 3937
3492 if (my $cb = $pkg->can ("unload")) { 3938 if (my $cb = $pkg->can ("unload")) {
3493 eval { 3939 eval {
3494 $cb->($pkg); 3940 $cb->($pkg);
3495 1 3941 1
3496 } or warn "$pkg unloaded, but with errors: $@"; 3942 } or error "$pkg unloaded, but with errors: $@";
3943 }
3944
3945 trace "... clearing $pkg";
3946 clear_package $pkg;
3497 } 3947 }
3498 3948
3499 warn "... nuking $pkg";
3500 Symbol::delete_package $pkg;
3501 }
3502
3503 warn "unloading all perl modules loaded from $LIBDIR"; 3949 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3504 while (my ($k, $v) = each %INC) { 3950 while (my ($k, $v) = each %INC) {
3505 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3951 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3506 3952
3507 warn "... unloading $k"; 3953 trace "... unloading $k";
3508 delete $INC{$k}; 3954 delete $INC{$k};
3509 3955
3510 $k =~ s/\.pm$//; 3956 $k =~ s/\.pm$//;
3511 $k =~ s/\//::/g; 3957 $k =~ s/\//::/g;
3512 3958
3513 if (my $cb = $k->can ("unload_module")) { 3959 if (my $cb = $k->can ("unload_module")) {
3514 $cb->(); 3960 $cb->();
3961 }
3962
3963 clear_package $k;
3515 } 3964 }
3516 3965
3517 Symbol::delete_package $k;
3518 }
3519
3520 warn "getting rid of safe::, as good as possible"; 3966 trace "perl_reload: getting rid of safe::, as good as possible";
3521 Symbol::delete_package "safe::$_" 3967 clear_package "safe::$_"
3522 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3968 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3523 3969
3524 warn "unloading cf.pm \"a bit\""; 3970 trace "perl_reload: unloading cf.pm \"a bit\"";
3525 delete $INC{"cf.pm"}; 3971 delete $INC{"cf.pm"};
3526 delete $INC{"cf/pod.pm"}; 3972 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3527 3973
3528 # don't, removes xs symbols, too, 3974 # don't, removes xs symbols, too,
3529 # and global variables created in xs 3975 # and global variables created in xs
3530 #Symbol::delete_package __PACKAGE__; 3976 #clear_package __PACKAGE__;
3531 3977
3532 warn "unload completed, starting to reload now"; 3978 info "perl_reload: unload completed, starting to reload now";
3533 3979
3534 warn "reloading cf.pm"; 3980 trace "perl_reload: reloading cf.pm";
3535 require cf; 3981 require cf;
3536 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3982 cf::_connect_to_perl_1;
3537 3983
3538 warn "loading config and database again"; 3984 trace "perl_reload: loading config and database again";
3539 cf::reload_config; 3985 cf::reload_config;
3540 3986
3541 warn "loading extensions"; 3987 trace "perl_reload: loading extensions";
3542 cf::load_extensions; 3988 cf::load_extensions;
3543 3989
3990 if ($REATTACH_ON_RELOAD) {
3544 warn "reattaching attachments to objects/players"; 3991 trace "perl_reload: reattaching attachments to objects/players";
3545 _global_reattach; # objects, sockets 3992 _global_reattach; # objects, sockets
3546 warn "reattaching attachments to maps"; 3993 trace "perl_reload: reattaching attachments to maps";
3547 reattach $_ for values %MAP; 3994 reattach $_ for values %MAP;
3548 warn "reattaching attachments to players"; 3995 trace "perl_reload: reattaching attachments to players";
3549 reattach $_ for values %PLAYER; 3996 reattach $_ for values %PLAYER;
3997 }
3550 3998
3551 warn "leaving sync_job"; 3999 cf::_post_init 1;
3552 4000
4001 trace "perl_reload: leaving sync_job";
4002
3553 1 4003 1
3554 } or do { 4004 } or do {
3555 warn $@; 4005 error $@;
3556 warn "error while reloading, exiting."; 4006 cf::cleanup "perl_reload: error, exiting.";
3557 exit 1; 4007 };
4008
4009 --$RELOAD;
3558 }; 4010 }
3559 4011
3560 warn "reloaded"; 4012 $t1 = AE::time - $t1;
4013 info "perl_reload: completed in ${t1}s\n";
3561}; 4014};
3562 4015
3563our $RELOAD_WATCHER; # used only during reload 4016our $RELOAD_WATCHER; # used only during reload
3564 4017
3565sub reload_perl() { 4018sub reload_perl() {
3566 # doing reload synchronously and two reloads happen back-to-back, 4019 # doing reload synchronously and two reloads happen back-to-back,
3567 # coro crashes during coro_state_free->destroy here. 4020 # coro crashes during coro_state_free->destroy here.
3568 4021
4022 $RELOAD_WATCHER ||= cf::async {
4023 Coro::AIO::aio_wait cache_extensions;
4024
3569 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4025 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
4026 do_reload_perl;
3570 undef $RELOAD_WATCHER; 4027 undef $RELOAD_WATCHER;
3571 do_reload_perl; 4028 };
3572 }; 4029 };
3573} 4030}
3574 4031
3575register_command "reload" => sub { 4032register_command "reload" => sub {
3576 my ($who, $arg) = @_; 4033 my ($who, $arg) = @_;
3582 reload_perl; 4039 reload_perl;
3583 }; 4040 };
3584 } 4041 }
3585}; 4042};
3586 4043
3587unshift @INC, $LIBDIR; 4044#############################################################################
3588 4045
3589my $bug_warning = 0; 4046my $bug_warning = 0;
3590 4047
3591our @WAIT_FOR_TICK; 4048our @WAIT_FOR_TICK;
3592our @WAIT_FOR_TICK_BEGIN; 4049our @WAIT_FOR_TICK_BEGIN;
3593 4050
3594sub wait_for_tick { 4051sub wait_for_tick() {
3595 return unless $TICK_WATCHER->is_active;
3596 return if $Coro::current == $Coro::main; 4052 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3597 4053
3598 my $signal = new Coro::Signal; 4054 my $signal = new Coro::Signal;
3599 push @WAIT_FOR_TICK, $signal; 4055 push @WAIT_FOR_TICK, $signal;
3600 $signal->wait; 4056 $signal->wait;
3601} 4057}
3602 4058
3603sub wait_for_tick_begin { 4059sub wait_for_tick_begin() {
3604 return unless $TICK_WATCHER->is_active;
3605 return if $Coro::current == $Coro::main; 4060 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3606 4061
3607 my $signal = new Coro::Signal; 4062 my $signal = new Coro::Signal;
3608 push @WAIT_FOR_TICK_BEGIN, $signal; 4063 push @WAIT_FOR_TICK_BEGIN, $signal;
3609 $signal->wait; 4064 $signal->wait;
3610} 4065}
3611 4066
3612$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4067sub tick {
3613 if ($Coro::current != $Coro::main) { 4068 if ($Coro::current != $Coro::main) {
3614 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4069 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3615 unless ++$bug_warning > 10; 4070 unless ++$bug_warning > 10;
3616 return; 4071 return;
3617 } 4072 }
3618 4073
3619 $NOW = $tick_start = EV::now;
3620
3621 cf::server_tick; # one server iteration 4074 cf::server_tick; # one server iteration
3622 4075
3623 $RUNTIME += $TICK; 4076 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3624 $NEXT_TICK = $_[0]->at;
3625 4077
3626 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4078 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3627 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4079 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3628 Coro::async_pool { 4080 Coro::async_pool {
3629 $Coro::current->{desc} = "runtime saver"; 4081 $Coro::current->{desc} = "runtime saver";
3630 write_runtime 4082 write_runtime_sync
3631 or warn "ERROR: unable to write runtime file: $!"; 4083 or error "ERROR: unable to write runtime file: $!";
3632 }; 4084 };
3633 } 4085 }
3634 4086
3635 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4087 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3636 $sig->send; 4088 $sig->send;
3637 } 4089 }
3638 while (my $sig = shift @WAIT_FOR_TICK) { 4090 while (my $sig = shift @WAIT_FOR_TICK) {
3639 $sig->send; 4091 $sig->send;
3640 } 4092 }
3641 4093
3642 $LOAD = ($NOW - $tick_start) / $TICK; 4094 $LOAD = ($NOW - $TICK_START) / $TICK;
3643 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4095 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3644 4096
3645 _post_tick; 4097 if (0) {
3646}; 4098 if ($NEXT_TICK) {
3647$TICK_WATCHER->priority (EV::MAXPRI); 4099 my $jitter = $TICK_START - $NEXT_TICK;
4100 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4101 debug "jitter $JITTER\n";#d#
4102 }
4103 }
4104}
3648 4105
3649{ 4106{
3650 # configure BDB 4107 # configure BDB
3651 4108
3652 BDB::min_parallel 8; 4109 BDB::min_parallel 16;
3653 BDB::max_poll_reqs $TICK * 0.1; 4110 BDB::max_poll_reqs $TICK * 0.1;
3654 $Coro::BDB::WATCHER->priority (1); 4111 $AnyEvent::BDB::WATCHER->priority (1);
3655 4112
3656 unless ($DB_ENV) { 4113 unless ($DB_ENV) {
3657 $DB_ENV = BDB::db_env_create; 4114 $DB_ENV = BDB::db_env_create;
3658 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4115 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3659 | BDB::LOG_AUTOREMOVE, 1); 4116 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4117 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3660 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4118 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3661 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4119 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3662 4120
3663 cf::sync_job { 4121 cf::sync_job {
3664 eval { 4122 eval {
3690{ 4148{
3691 # configure IO::AIO 4149 # configure IO::AIO
3692 4150
3693 IO::AIO::min_parallel 8; 4151 IO::AIO::min_parallel 8;
3694 IO::AIO::max_poll_time $TICK * 0.1; 4152 IO::AIO::max_poll_time $TICK * 0.1;
3695 $Coro::AIO::WATCHER->priority (1); 4153 undef $AnyEvent::AIO::WATCHER;
3696} 4154}
3697 4155
3698my $_log_backtrace; 4156our $_log_backtrace;
4157our $_log_backtrace_last;
3699 4158
3700sub _log_backtrace { 4159sub _log_backtrace {
3701 my ($msg, @addr) = @_; 4160 my ($msg, @addr) = @_;
3702 4161
3703 $msg =~ s/\n//; 4162 $msg =~ s/\n$//;
3704 4163
4164 if ($_log_backtrace_last eq $msg) {
4165 LOG llevInfo, "[ABT] $msg\n";
4166 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3705 # limit the # of concurrent backtraces 4167 # limit the # of concurrent backtraces
3706 if ($_log_backtrace < 2) { 4168 } elsif ($_log_backtrace < 2) {
4169 $_log_backtrace_last = $msg;
3707 ++$_log_backtrace; 4170 ++$_log_backtrace;
4171 my $perl_bt = Carp::longmess $msg;
3708 async { 4172 async {
3709 $Coro::current->{desc} = "abt $msg"; 4173 $Coro::current->{desc} = "abt $msg";
3710 4174
3711 my @bt = fork_call { 4175 my @bt = fork_call {
3712 @addr = map { sprintf "%x", $_ } @addr; 4176 @addr = map { sprintf "%x", $_ } @addr;
3723 } 4187 }
3724 4188
3725 @funcs 4189 @funcs
3726 }; 4190 };
3727 4191
3728 LOG llevInfo, "[ABT] $msg\n"; 4192 LOG llevInfo, "[ABT] $perl_bt\n";
4193 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3729 LOG llevInfo, "[ABT] $_\n" for @bt; 4194 LOG llevInfo, "[ABT] $_\n" for @bt;
3730 --$_log_backtrace; 4195 --$_log_backtrace;
3731 }; 4196 };
3732 } else { 4197 } else {
3733 LOG llevInfo, "[ABT] $msg\n"; 4198 LOG llevInfo, "[ABT] $msg\n";
3734 LOG llevInfo, "[ABT] [suppressed]\n"; 4199 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3735 } 4200 }
3736} 4201}
3737 4202
3738# load additional modules 4203# load additional modules
3739use cf::pod; 4204require "cf/$_.pm" for @EXTRA_MODULES;
4205cf::_connect_to_perl_2;
3740 4206
3741END { cf::emergency_save } 4207END { cf::emergency_save }
3742 4208
37431 42091
3744 4210

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines