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.558 by root, Tue Oct 5 22:35:30 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) = @_;
1735 # mit "rum" bekleckern, nicht 1863
1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1865
1736 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1740 $rmp->{exit_on_final_map},
1741 $rmp->{xsize}, $rmp->{ysize},
1742 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1743 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1744 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1745 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1746 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1747 (cf::region::find $rmp->{region}), $rmp->{custom}
1748 )
1749} 1867}
1750 1868
1751=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1752 1870
1753Register a handler for the map path matching the given regex at the 1871Register a handler for the map path matching the given regex at the
1758 1876
1759sub register { 1877sub register {
1760 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1761 my $pkg = caller; 1879 my $pkg = caller;
1762 1880
1763 no strict;
1764 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1765 1882
1766 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1767} 1884}
1768 1885
1769# also paths starting with '/' 1886# also paths starting with '/'
1770$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1887$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1771 1888
1772sub thawer_merge { 1889sub thawer_merge {
1773 my ($self, $merge) = @_; 1890 my ($self, $merge) = @_;
1774 1891
1775 # we have to keep some variables in memory intact 1892 # we have to keep some variables in memory intact
1780} 1897}
1781 1898
1782sub normalise { 1899sub normalise {
1783 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1784 1901
1785 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1786 1903
1787 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1788 1905
1789 # map plan: 1906 # map plan:
1790 # 1907 #
1805 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1806 $path = "$base/$path"; 1923 $path = "$base/$path";
1807 } 1924 }
1808 1925
1809 for ($path) { 1926 for ($path) {
1810 redo if s{//}{/};
1811 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1812 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1813 } 1929 }
1814 1930
1815 $path 1931 $path
1829 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1830 return $self; 1946 return $self;
1831 } 1947 }
1832 } 1948 }
1833 1949
1834 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1835 () 1951 ()
1836} 1952}
1837 1953
1838sub init { 1954sub init {
1839 my ($self) = @_; 1955 my ($self) = @_;
1861 1977
1862# the temporary/swap location 1978# the temporary/swap location
1863sub save_path { 1979sub save_path {
1864 my ($self) = @_; 1980 my ($self) = @_;
1865 1981
1866 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1982 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1867 "$TMPDIR/$path.map" 1983 "$TMPDIR/$path.map"
1868} 1984}
1869 1985
1870# the unique path, undef == no special unique path 1986# the unique path, undef == no special unique path
1871sub uniq_path { 1987sub uniq_path {
1872 my ($self) = @_; 1988 my ($self) = @_;
1873 1989
1874 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1990 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1875 "$UNIQUEDIR/$path" 1991 "$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} 1992}
1886 1993
1887sub decay_objects { 1994sub decay_objects {
1888 my ($self) = @_; 1995 my ($self) = @_;
1889 1996
1971 2078
1972sub find; 2079sub find;
1973sub find { 2080sub find {
1974 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
1975 2082
2083 cf::cede_to_tick;
2084
1976 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
1977 2086
1978 cf::lock_wait "map_data:$path";#d#remove 2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1979 cf::lock_wait "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
1980 2089
1981 $cf::MAP{$path} || do { 2090 $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 2091 my $map = new_from_path cf::map $path
1986 or return; 2092 or return;
1987 2093
1988 $map->{last_save} = $cf::RUNTIME; 2094 $map->{last_save} = $cf::RUNTIME;
1989 2095
1991 or return; 2097 or return;
1992 2098
1993 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2099 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1994 # doing this can freeze the server in a sync job, obviously 2100 # doing this can freeze the server in a sync job, obviously
1995 #$cf::WAIT_FOR_TICK->wait; 2101 #$cf::WAIT_FOR_TICK->wait;
2102 undef $guard2;
1996 undef $guard1; 2103 undef $guard1;
1997 undef $guard2;
1998 $map->reset; 2104 $map->reset;
1999 return find $path; 2105 return find $path;
2000 } 2106 }
2001 2107
2002 $cf::MAP{$path} = $map 2108 $cf::MAP{$path} = $map
2003 } 2109 }
2004} 2110}
2005 2111
2006sub pre_load { } 2112sub pre_load { }
2007sub post_load { } 2113#sub post_load { } # XS
2008 2114
2009sub load { 2115sub load {
2010 my ($self) = @_; 2116 my ($self) = @_;
2011 2117
2012 local $self->{deny_reset} = 1; # loading can take a long time 2118 local $self->{deny_reset} = 1; # loading can take a long time
2029 my $f = new_from_file cf::object::thawer $self->{load_path}; 2135 my $f = new_from_file cf::object::thawer $self->{load_path};
2030 $f->skip_block; 2136 $f->skip_block;
2031 $self->_load_objects ($f) 2137 $self->_load_objects ($f)
2032 or return; 2138 or return;
2033 2139
2034 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2140 $self->post_load_original
2035 if delete $self->{load_original}; 2141 if delete $self->{load_original};
2036 2142
2037 if (my $uniq = $self->uniq_path) { 2143 if (my $uniq = $self->uniq_path) {
2038 utf8::encode $uniq; 2144 utf8::encode $uniq;
2039 unless (aio_stat $uniq) { 2145 unless (aio_stat $uniq) {
2057 unless ($self->{deny_activate}) { 2163 unless ($self->{deny_activate}) {
2058 $self->decay_objects; 2164 $self->decay_objects;
2059 $self->fix_auto_apply; 2165 $self->fix_auto_apply;
2060 $self->update_buttons; 2166 $self->update_buttons;
2061 cf::cede_to_tick; 2167 cf::cede_to_tick;
2062 $self->set_darkness_map;
2063 cf::cede_to_tick;
2064 $self->activate; 2168 $self->activate;
2065 } 2169 }
2066 2170
2067 $self->{last_save} = $cf::RUNTIME; 2171 $self->{last_save} = $cf::RUNTIME;
2068 $self->last_access ($cf::RUNTIME); 2172 $self->last_access ($cf::RUNTIME);
2069 2173
2070 $self->in_memory (cf::MAP_IN_MEMORY); 2174 $self->in_memory (cf::MAP_ACTIVE);
2071 } 2175 }
2072 2176
2073 $self->post_load; 2177 $self->post_load;
2074}
2075 2178
2179 1
2180}
2181
2182# customize the map for a given player, i.e.
2183# return the _real_ map. used by e.g. per-player
2184# maps to change the path to ~playername/mappath
2076sub customise_for { 2185sub customise_for {
2077 my ($self, $ob) = @_; 2186 my ($self, $ob) = @_;
2078 2187
2079 return find "~" . $ob->name . "/" . $self->{path} 2188 return find "~" . $ob->name . "/" . $self->{path}
2080 if $self->per_player; 2189 if $self->per_player;
2096 or next; 2205 or next;
2097 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
2098 or next; 2207 or next;
2099 $neigh->load; 2208 $neigh->load;
2100 2209
2210 # now find the diagonal neighbours
2101 push @neigh, 2211 push @neigh,
2102 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2103 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2104 } 2214 }
2105 2215
2112} 2222}
2113 2223
2114sub find_sync { 2224sub find_sync {
2115 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
2116 2226
2117 cf::sync_job { find $path, $origin } 2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main;
2229
2230 find $path, $origin
2118} 2231}
2119 2232
2120sub do_load_sync { 2233sub do_load_sync {
2121 my ($map) = @_; 2234 my ($map) = @_;
2122 2235
2123 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2124 if $Coro::current == $Coro::main; 2237 if $Coro::current == $Coro::main;
2125 2238
2126 cf::sync_job { $map->load }; 2239 $map->load;
2127} 2240}
2128 2241
2129our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
2130our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
2131 2244
2133 my ($path, $origin, $load) = @_; 2246 my ($path, $origin, $load) = @_;
2134 2247
2135 $path = normalise $path, $origin && $origin->{path}; 2248 $path = normalise $path, $origin && $origin->{path};
2136 2249
2137 if (my $map = $cf::MAP{$path}) { 2250 if (my $map = $cf::MAP{$path}) {
2138 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2251 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2139 } 2252 }
2140 2253
2141 $MAP_PREFETCH{$path} |= $load; 2254 $MAP_PREFETCH{$path} |= $load;
2142 2255
2143 $MAP_PREFETCHER ||= cf::async { 2256 $MAP_PREFETCHER ||= cf::async {
2157 $MAP_PREFETCHER->prio (6); 2270 $MAP_PREFETCHER->prio (6);
2158 2271
2159 () 2272 ()
2160} 2273}
2161 2274
2275# common code, used by both ->save and ->swapout
2162sub save { 2276sub _save {
2163 my ($self) = @_; 2277 my ($self) = @_;
2164
2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
2166 2278
2167 $self->{last_save} = $cf::RUNTIME; 2279 $self->{last_save} = $cf::RUNTIME;
2168 2280
2169 return unless $self->dirty; 2281 return unless $self->dirty;
2170 2282
2179 2291
2180 cf::async { 2292 cf::async {
2181 $Coro::current->{desc} = "map player save"; 2293 $Coro::current->{desc} = "map player save";
2182 $_->contr->save for $self->players; 2294 $_->contr->save for $self->players;
2183 }; 2295 };
2296
2297 cf::get_slot 0.02;
2184 2298
2185 if ($uniq) { 2299 if ($uniq) {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2300 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2187 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2301 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2188 } else { 2302 } else {
2189 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2303 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2190 } 2304 }
2191} 2305}
2192 2306
2307sub save {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 $self->_save;
2313}
2314
2193sub swap_out { 2315sub swap_out {
2194 my ($self) = @_; 2316 my ($self) = @_;
2195 2317
2196 # save first because save cedes
2197 $self->save;
2198
2199 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2318 my $lock = cf::lock_acquire "map_data:$self->{path}";
2200 2319
2320 return if $self->in_memory != cf::MAP_ACTIVE;
2321 return if $self->{deny_save};
2201 return if $self->players; 2322 return if $self->players;
2202 return if $self->in_memory != cf::MAP_IN_MEMORY;
2203 return if $self->{deny_save};
2204 2323
2324 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP;
2205 $self->in_memory (cf::MAP_SWAPPED); 2327 $self->in_memory (cf::MAP_SWAPPED);
2328
2329 # then atomically save
2330 $self->_save;
2331
2332 # then free the map
2333 $self->clear;
2334}
2335
2336sub reset_at {
2337 my ($self) = @_;
2338
2339 # TODO: safety, remove and allow resettable per-player maps
2340 return 1e99 if $self->{deny_reset};
2341
2342 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2343 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2344
2345 $time + $to
2346}
2347
2348sub should_reset {
2349 my ($self) = @_;
2350
2351 $self->reset_at <= $cf::RUNTIME
2352}
2353
2354sub reset {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 return if $self->players;
2360
2361 cf::trace "resetting map ", $self->path, "\n";
2362
2363 $self->in_memory (cf::MAP_SWAPPED);
2364
2365 # need to save uniques path
2366 unless ($self->{deny_save}) {
2367 my $uniq = $self->uniq_path; utf8::encode $uniq;
2368
2369 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2370 if $uniq;
2371 }
2372
2373 delete $cf::MAP{$self->path};
2206 2374
2207 $self->deactivate; 2375 $self->deactivate;
2208 $_->clear_links_to ($self) for values %cf::MAP; 2376 $_->clear_links_to ($self) for values %cf::MAP;
2209 $self->clear; 2377 $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 2378
2255 $self->unlink_save; 2379 $self->unlink_save;
2256 $self->destroy; 2380 $self->destroy;
2257} 2381}
2258 2382
2266 2390
2267 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
2268 2392
2269 $self->unlink_save; 2393 $self->unlink_save;
2270 2394
2271 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
2272 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
2273 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
2274 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
2275 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2276 2400
2325 2449
2326sub unique_maps() { 2450sub unique_maps() {
2327 [ 2451 [
2328 map { 2452 map {
2329 utf8::decode $_; 2453 utf8::decode $_;
2330 /\.map$/ 2454 s/\.map$//; # TODO future compatibility hack
2455 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2456 ? ()
2331 ? normalise $_ 2457 : normalise $_
2332 : ()
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2458 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2459 ]
2335} 2460}
2336 2461
2337package cf; 2462=item cf::map::static_maps
2463
2464Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2465file in the shared directory excluding F</styles> and F</editor>). May
2466block.
2467
2468=cut
2469
2470sub static_maps() {
2471 my @dirs = "";
2472 my @maps;
2473
2474 while (@dirs) {
2475 my $dir = shift @dirs;
2476
2477 next if $dir eq "/styles" || $dir eq "/editor";
2478
2479 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2480 or return;
2481
2482 for (@$files) {
2483 s/\.map$// or next;
2484 utf8::decode $_;
2485 push @maps, "$dir/$_";
2486 }
2487
2488 push @dirs, map "$dir/$_", @$dirs;
2489 }
2490
2491 \@maps
2492}
2338 2493
2339=back 2494=back
2340 2495
2341=head3 cf::object 2496=head3 cf::object
2342 2497
2346 2501
2347=over 4 2502=over 4
2348 2503
2349=item $ob->inv_recursive 2504=item $ob->inv_recursive
2350 2505
2351Returns the inventory of the object _and_ their inventories, recursively. 2506Returns the inventory of the object I<and> their inventories, recursively,
2507but I<not> the object itself.
2352 2508
2353=cut 2509=cut
2354 2510
2355sub inv_recursive_; 2511sub inv_recursive_;
2356sub inv_recursive_ { 2512sub inv_recursive_ {
2361 inv_recursive_ inv $_[0] 2517 inv_recursive_ inv $_[0]
2362} 2518}
2363 2519
2364=item $ref = $ob->ref 2520=item $ref = $ob->ref
2365 2521
2366creates and returns a persistent reference to an objetc that can be stored as a string. 2522Creates and returns a persistent reference to an object that can be stored as a string.
2367 2523
2368=item $ob = cf::object::deref ($refstring) 2524=item $ob = cf::object::deref ($refstring)
2369 2525
2370returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2526returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2371even if the object actually exists. May block. 2527even if the object actually exists. May block.
2403can be C<undef>. Does the right thing when the player is currently in a 2559can be C<undef>. Does the right thing when the player is currently in a
2404dialogue with the given NPC character. 2560dialogue with the given NPC character.
2405 2561
2406=cut 2562=cut
2407 2563
2564our $SAY_CHANNEL = {
2565 id => "say",
2566 title => "Map",
2567 reply => "say ",
2568 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2569};
2570
2571our $CHAT_CHANNEL = {
2572 id => "chat",
2573 title => "Chat",
2574 reply => "chat ",
2575 tooltip => "Player chat and shouts, global to the server.",
2576};
2577
2408# rough implementation of a future "reply" method that works 2578# rough implementation of a future "reply" method that works
2409# with dialog boxes. 2579# with dialog boxes.
2410#TODO: the first argument must go, split into a $npc->reply_to ( method 2580#TODO: the first argument must go, split into a $npc->reply_to ( method
2411sub cf::object::player::reply($$$;$) { 2581sub cf::object::player::reply($$$;$) {
2412 my ($self, $npc, $msg, $flags) = @_; 2582 my ($self, $npc, $msg, $flags) = @_;
2423 my $dialog = $pl->{npc_dialog}; 2593 my $dialog = $pl->{npc_dialog};
2424 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2594 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2425 2595
2426 } else { 2596 } else {
2427 $msg = $npc->name . " says: $msg" if $npc; 2597 $msg = $npc->name . " says: $msg" if $npc;
2428 $self->message ($msg, $flags); 2598 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2429 } 2599 }
2430 } 2600 }
2431} 2601}
2432 2602
2433=item $object->send_msg ($channel, $msg, $color, [extra...]) 2603=item $object->send_msg ($channel, $msg, $color, [extra...])
2458 2628
2459=item $player_object->enter_link 2629=item $player_object->enter_link
2460 2630
2461Freezes the player and moves him/her to a special map (C<{link}>). 2631Freezes the player and moves him/her to a special map (C<{link}>).
2462 2632
2463The player should be reasonably safe there for short amounts of time. You 2633The player should be reasonably safe there for short amounts of time (e.g.
2464I<MUST> call C<leave_link> as soon as possible, though. 2634for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2635though, as the player cannot control the character while it is on the link
2636map.
2465 2637
2466Will never block. 2638Will never block.
2467 2639
2468=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
2469 2641
2489sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2490 my ($self) = @_; 2662 my ($self) = @_;
2491 2663
2492 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2493 2665
2666 ++$self->{_link_recursion};
2667
2494 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2495 2669
2496 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2497 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2498 2672
2499 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2673 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2500} 2674}
2501 2675
2502sub cf::object::player::leave_link { 2676sub cf::object::player::leave_link {
2503 my ($self, $map, $x, $y) = @_; 2677 my ($self, $map, $x, $y) = @_;
2504 2678
2521 ($x, $y) = (-1, -1) 2695 ($x, $y) = (-1, -1)
2522 unless (defined $x) && (defined $y); 2696 unless (defined $x) && (defined $y);
2523 2697
2524 # use -1 or undef as default coordinates, not 0, 0 2698 # use -1 or undef as default coordinates, not 0, 0
2525 ($x, $y) = ($map->enter_x, $map->enter_y) 2699 ($x, $y) = ($map->enter_x, $map->enter_y)
2526 if $x <=0 && $y <= 0; 2700 if $x <= 0 && $y <= 0;
2527 2701
2528 $map->load; 2702 $map->load;
2529 $map->load_neighbours; 2703 $map->load_neighbours;
2530 2704
2531 return unless $self->contr->active; 2705 return unless $self->contr->active;
2532 $self->activate_recursive;
2533 2706
2534 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2535 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2536} 2709 # entering was successful
2710 delete $self->{_link_recursion};
2711 # only activate afterwards, to support waiting in hooks
2712 $self->activate_recursive;
2713 }
2537 2714
2715}
2716
2538=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2717=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2539 2718
2540Moves the player to the given map-path and coordinates by first freezing 2719Moves the player to the given map-path and coordinates by first freezing
2541her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2542that has to return the map if sucecssful, and then unfreezes the player on 2721that 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 2722the new (success) or old (failed) map position. In either case, $done will
2544be called at the end of this process. 2723be called at the end of this process.
2545 2724
2725Note that $check will be called with a potentially non-loaded map, so if
2726it needs a loaded map it has to call C<< ->load >>.
2727
2546=cut 2728=cut
2547 2729
2548our $GOTOGEN; 2730our $GOTOGEN;
2549 2731
2550sub cf::object::player::goto { 2732sub cf::object::player::goto {
2551 my ($self, $path, $x, $y, $check, $done) = @_; 2733 my ($self, $path, $x, $y, $check, $done) = @_;
2734
2735 if ($self->{_link_recursion} >= $MAX_LINKS) {
2736 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2737 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2738 ($path, $x, $y) = @$EMERGENCY_POSITION;
2739 }
2552 2740
2553 # do generation counting so two concurrent goto's will be executed in-order 2741 # do generation counting so two concurrent goto's will be executed in-order
2554 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2555 2743
2556 $self->enter_link; 2744 $self->enter_link;
2580 my $map = eval { 2768 my $map = eval {
2581 my $map = defined $path ? cf::map::find $path : undef; 2769 my $map = defined $path ? cf::map::find $path : undef;
2582 2770
2583 if ($map) { 2771 if ($map) {
2584 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2585 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2586 } else { 2774 } else {
2587 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2775 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2588 } 2776 }
2589 2777
2590 $map 2778 $map
2598 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2599 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2600 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2601 } 2789 }
2602 2790
2603 $done->() if $done; 2791 $done->($self) if $done;
2604 })->prio (1); 2792 })->prio (1);
2605} 2793}
2606 2794
2607=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2608 2796
2628} 2816}
2629 2817
2630sub prepare_random_map { 2818sub prepare_random_map {
2631 my ($exit) = @_; 2819 my ($exit) = @_;
2632 2820
2633 my $guard = cf::lock_acquire "exit_prepare:$exit";
2634
2635 # all this does is basically replace the /! path by 2821 # all this does is basically replace the /! path by
2636 # a new random map path (?random/...) with a seed 2822 # a new random map path (?random/...) with a seed
2637 # that depends on the exit object 2823 # that depends on the exit object
2638 2824
2639 my $rmp = parse_random_map_params $exit->msg; 2825 my $rmp = parse_random_map_params $exit->msg;
2641 if ($exit->map) { 2827 if ($exit->map) {
2642 $rmp->{region} = $exit->region->name; 2828 $rmp->{region} = $exit->region->name;
2643 $rmp->{origin_map} = $exit->map->path; 2829 $rmp->{origin_map} = $exit->map->path;
2644 $rmp->{origin_x} = $exit->x; 2830 $rmp->{origin_x} = $exit->x;
2645 $rmp->{origin_y} = $exit->y; 2831 $rmp->{origin_y} = $exit->y;
2832
2833 $exit->map->touch;
2646 } 2834 }
2647 2835
2648 $rmp->{random_seed} ||= $exit->random_seed; 2836 $rmp->{random_seed} ||= $exit->random_seed;
2649 2837
2650 my $data = cf::encode_json $rmp; 2838 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2651 my $md5 = Digest::MD5::md5_hex $data; 2839 my $md5 = Digest::MD5::md5_hex $data;
2652 my $meta = "$RANDOMDIR/$md5.meta"; 2840 my $meta = "$RANDOMDIR/$md5.meta";
2653 2841
2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2842 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2655 aio_write $fh, 0, (length $data), $data, 0; 2843 aio_write $fh, 0, (length $data), $data, 0;
2656 undef $fh; 2844 undef $fh;
2657 aio_rename "$meta~", $meta; 2845 aio_rename "$meta~", $meta;
2658 2846
2847 my $slaying = "?random/$md5";
2848
2849 if ($exit->valid) {
2659 $exit->slaying ("?random/$md5"); 2850 $exit->slaying ("?random/$md5");
2660 $exit->msg (undef); 2851 $exit->msg (undef);
2852 }
2661 } 2853 }
2662} 2854}
2663 2855
2664sub cf::object::player::enter_exit { 2856sub cf::object::player::enter_exit {
2665 my ($self, $exit) = @_; 2857 my ($self, $exit) = @_;
2666 2858
2667 return unless $self->type == cf::PLAYER; 2859 return unless $self->type == cf::PLAYER;
2668 2860
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; 2861 $self->enter_link;
2681 2862
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 { 2863 (async {
2687 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2864 $Coro::current->{desc} = "enter_exit";
2688 2865
2689 $self->deactivate_recursive; # just to be sure
2690 unless (eval { 2866 unless (eval {
2867 $self->deactivate_recursive; # just to be sure
2868
2869 # random map handling
2870 {
2871 my $guard = cf::lock_acquire "exit_prepare:$exit";
2872
2873 prepare_random_map $exit
2874 if $exit->slaying eq "/!";
2875 }
2876
2877 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2878 my $x = $exit->stats->hp;
2879 my $y = $exit->stats->sp;
2880
2691 $self->goto ($slaying, $hp, $sp); 2881 $self->goto ($map, $x, $y);
2692 2882
2883 # if exit is damned, update players death & WoR home-position
2884 $self->contr->savebed ($map, $x, $y)
2885 if $exit->flag (cf::FLAG_DAMNED);
2886
2693 1; 2887 1
2694 }) { 2888 }) {
2695 $self->message ("Something went wrong deep within the crossfire server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2696 . "I'll try to bring you back to the map you were before. " 2890 . "I'll try to bring you back to the map you were before. "
2697 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2698 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2699 2893
2700 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2701 $self->leave_link; 2895 $self->leave_link;
2702 } 2896 }
2703 })->prio (1); 2897 })->prio (1);
2704} 2898}
2705 2899
2717sub cf::client::send_drawinfo { 2911sub cf::client::send_drawinfo {
2718 my ($self, $text, $flags) = @_; 2912 my ($self, $text, $flags) = @_;
2719 2913
2720 utf8::encode $text; 2914 utf8::encode $text;
2721 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2915 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2916}
2917
2918=item $client->send_big_packet ($pkt)
2919
2920Like C<send_packet>, but tries to compress large packets, and fragments
2921them as required.
2922
2923=cut
2924
2925our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2926
2927sub cf::client::send_big_packet {
2928 my ($self, $pkt) = @_;
2929
2930 # try lzf for large packets
2931 $pkt = "lzf " . Compress::LZF::compress $pkt
2932 if 1024 <= length $pkt and $self->{can_lzf};
2933
2934 # split very large packets
2935 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2936 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2937 $pkt = "frag";
2938 }
2939
2940 $self->send_packet ($pkt);
2722} 2941}
2723 2942
2724=item $client->send_msg ($channel, $msg, $color, [extra...]) 2943=item $client->send_msg ($channel, $msg, $color, [extra...])
2725 2944
2726Send a drawinfo or msg packet to the client, formatting the msg for the 2945Send a drawinfo or msg packet to the client, formatting the msg for the
2730 2949
2731=cut 2950=cut
2732 2951
2733# non-persistent channels (usually the info channel) 2952# non-persistent channels (usually the info channel)
2734our %CHANNEL = ( 2953our %CHANNEL = (
2954 "c/motd" => {
2955 id => "infobox",
2956 title => "MOTD",
2957 reply => undef,
2958 tooltip => "The message of the day",
2959 },
2735 "c/identify" => { 2960 "c/identify" => {
2736 id => "infobox", 2961 id => "infobox",
2737 title => "Identify", 2962 title => "Identify",
2738 reply => undef, 2963 reply => undef,
2739 tooltip => "Items recently identified", 2964 tooltip => "Items recently identified",
2741 "c/examine" => { 2966 "c/examine" => {
2742 id => "infobox", 2967 id => "infobox",
2743 title => "Examine", 2968 title => "Examine",
2744 reply => undef, 2969 reply => undef,
2745 tooltip => "Signs and other items you examined", 2970 tooltip => "Signs and other items you examined",
2971 },
2972 "c/shopinfo" => {
2973 id => "infobox",
2974 title => "Shop Info",
2975 reply => undef,
2976 tooltip => "What your bargaining skill tells you about the shop",
2746 }, 2977 },
2747 "c/book" => { 2978 "c/book" => {
2748 id => "infobox", 2979 id => "infobox",
2749 title => "Book", 2980 title => "Book",
2750 reply => undef, 2981 reply => undef,
2766 id => "infobox", 2997 id => "infobox",
2767 title => "Body Parts", 2998 title => "Body Parts",
2768 reply => undef, 2999 reply => undef,
2769 tooltip => "Shows which body parts you posess and are available", 3000 tooltip => "Shows which body parts you posess and are available",
2770 }, 3001 },
3002 "c/statistics" => {
3003 id => "infobox",
3004 title => "Statistics",
3005 reply => undef,
3006 tooltip => "Shows your primary statistics",
3007 },
3008 "c/skills" => {
3009 id => "infobox",
3010 title => "Skills",
3011 reply => undef,
3012 tooltip => "Shows your experience per skill and item power",
3013 },
3014 "c/shopitems" => {
3015 id => "infobox",
3016 title => "Shop Items",
3017 reply => undef,
3018 tooltip => "Shows the items currently for sale in this shop",
3019 },
3020 "c/resistances" => {
3021 id => "infobox",
3022 title => "Resistances",
3023 reply => undef,
3024 tooltip => "Shows your resistances",
3025 },
3026 "c/pets" => {
3027 id => "infobox",
3028 title => "Pets",
3029 reply => undef,
3030 tooltip => "Shows information abotu your pets/a specific pet",
3031 },
3032 "c/perceiveself" => {
3033 id => "infobox",
3034 title => "Perceive Self",
3035 reply => undef,
3036 tooltip => "You gained detailed knowledge about yourself",
3037 },
2771 "c/uptime" => { 3038 "c/uptime" => {
2772 id => "infobox", 3039 id => "infobox",
2773 title => "Uptime", 3040 title => "Uptime",
2774 reply => undef, 3041 reply => undef,
2775 tooltip => "How long the server has been running since last restart", 3042 tooltip => "How long the server has been running since last restart",
2778 id => "infobox", 3045 id => "infobox",
2779 title => "Map Info", 3046 title => "Map Info",
2780 reply => undef, 3047 reply => undef,
2781 tooltip => "Information related to the maps", 3048 tooltip => "Information related to the maps",
2782 }, 3049 },
3050 "c/party" => {
3051 id => "party",
3052 title => "Party",
3053 reply => "gsay ",
3054 tooltip => "Messages and chat related to your party",
3055 },
3056 "c/death" => {
3057 id => "death",
3058 title => "Death",
3059 reply => undef,
3060 tooltip => "Reason for and more info about your most recent death",
3061 },
3062 "c/say" => $SAY_CHANNEL,
3063 "c/chat" => $CHAT_CHANNEL,
2783); 3064);
2784 3065
2785sub cf::client::send_msg { 3066sub cf::client::send_msg {
2786 my ($self, $channel, $msg, $color, @extra) = @_; 3067 my ($self, $channel, $msg, $color, @extra) = @_;
2787 3068
2788 $msg = $self->pl->expand_cfpod ($msg); 3069 $msg = $self->pl->expand_cfpod ($msg)
3070 unless $color & cf::NDI_VERBATIM;
2789 3071
2790 $color &= cf::NDI_CLIENT_MASK; # just in case... 3072 $color &= cf::NDI_CLIENT_MASK; # just in case...
2791 3073
2792 # check predefined channels, for the benefit of C 3074 # check predefined channels, for the benefit of C
2793 if ($CHANNEL{$channel}) { 3075 if ($CHANNEL{$channel}) {
2794 $channel = $CHANNEL{$channel}; 3076 $channel = $CHANNEL{$channel};
2795 3077
2796 $self->ext_msg (channel_info => $channel) 3078 $self->ext_msg (channel_info => $channel);
2797 if $self->can_msg;
2798
2799 $channel = $channel->{id}; 3079 $channel = $channel->{id};
2800 3080
2801 } elsif (ref $channel) { 3081 } elsif (ref $channel) {
2802 # send meta info to client, if not yet sent 3082 # send meta info to client, if not yet sent
2803 unless (exists $self->{channel}{$channel->{id}}) { 3083 unless (exists $self->{channel}{$channel->{id}}) {
2804 $self->{channel}{$channel->{id}} = $channel; 3084 $self->{channel}{$channel->{id}} = $channel;
2805 $self->ext_msg (channel_info => $channel) 3085 $self->ext_msg (channel_info => $channel);
2806 if $self->can_msg;
2807 } 3086 }
2808 3087
2809 $channel = $channel->{id}; 3088 $channel = $channel->{id};
2810 } 3089 }
2811 3090
2812 return unless @extra || length $msg; 3091 return unless @extra || length $msg;
2813 3092
2814 if ($self->can_msg) {
2815 # default colour, mask it out 3093 # default colour, mask it out
2816 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3094 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2817 if $color & cf::NDI_DEF; 3095 if $color & cf::NDI_DEF;
2818 3096
2819 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3097 my $pkt = "msg "
3098 . $self->{json_coder}->encode (
2820 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3099 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2821 } else { 3100 );
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 3101
2833 $color &= cf::NDI_COLOR_MASK; 3102 $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} 3103}
2847 3104
2848=item $client->ext_msg ($type, @msg) 3105=item $client->ext_msg ($type, @msg)
2849 3106
2850Sends an ext event to the client. 3107Sends an ext event to the client.
2853 3110
2854sub cf::client::ext_msg($$@) { 3111sub cf::client::ext_msg($$@) {
2855 my ($self, $type, @msg) = @_; 3112 my ($self, $type, @msg) = @_;
2856 3113
2857 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2858 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2859 } elsif ($self->extcmd == 1) { # TODO: remove 3116 } elsif ($self->extcmd == 1) { # TODO: remove
2860 push @msg, msgtype => "event_$type"; 3117 push @msg, msgtype => "event_$type";
2861 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3118 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2862 } 3119 }
2863} 3120}
2864 3121
2865=item $client->ext_reply ($msgid, @msg) 3122=item $client->ext_reply ($msgid, @msg)
2866 3123
2870 3127
2871sub cf::client::ext_reply($$@) { 3128sub cf::client::ext_reply($$@) {
2872 my ($self, $id, @msg) = @_; 3129 my ($self, $id, @msg) = @_;
2873 3130
2874 if ($self->extcmd == 2) { 3131 if ($self->extcmd == 2) {
2875 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2876 } elsif ($self->extcmd == 1) { 3133 } elsif ($self->extcmd == 1) {
2877 #TODO: version 1, remove 3134 #TODO: version 1, remove
2878 unshift @msg, msgtype => "reply", msgid => $id; 3135 unshift @msg, msgtype => "reply", msgid => $id;
2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 } 3137 }
2881} 3138}
2882 3139
2883=item $success = $client->query ($flags, "text", \&cb) 3140=item $success = $client->query ($flags, "text", \&cb)
2884 3141
2955 3212
2956 $ns->ext_reply ($reply, @reply) 3213 $ns->ext_reply ($reply, @reply)
2957 if $reply; 3214 if $reply;
2958 3215
2959 } else { 3216 } else {
2960 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3217 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2961 } 3218 }
2962 3219
2963 cf::override; 3220 cf::override;
2964 }, 3221 },
2965); 3222);
2985 3242
2986 $coro 3243 $coro
2987} 3244}
2988 3245
2989cf::client->attach ( 3246cf::client->attach (
2990 on_destroy => sub { 3247 on_client_destroy => sub {
2991 my ($ns) = @_; 3248 my ($ns) = @_;
2992 3249
2993 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3250 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2994 }, 3251 },
2995); 3252);
3011our $safe_hole = new Safe::Hole; 3268our $safe_hole = new Safe::Hole;
3012 3269
3013$SIG{FPE} = 'IGNORE'; 3270$SIG{FPE} = 'IGNORE';
3014 3271
3015$safe->permit_only (Opcode::opset qw( 3272$safe->permit_only (Opcode::opset qw(
3016 :base_core :base_mem :base_orig :base_math 3273 :base_core :base_mem :base_orig :base_math :base_loop
3017 grepstart grepwhile mapstart mapwhile 3274 grepstart grepwhile mapstart mapwhile
3018 sort time 3275 sort time
3019)); 3276));
3020 3277
3021# here we export the classes and methods available to script code 3278# here we export the classes and methods available to script code
3024 3281
3025The following functions and methods are available within a safe environment: 3282The following functions and methods are available within a safe environment:
3026 3283
3027 cf::object 3284 cf::object
3028 contr pay_amount pay_player map x y force_find force_add destroy 3285 contr pay_amount pay_player map x y force_find force_add destroy
3029 insert remove name archname title slaying race decrease_ob_nr 3286 insert remove name archname title slaying race decrease split
3287 value
3030 3288
3031 cf::object::player 3289 cf::object::player
3032 player 3290 player
3033 3291
3034 cf::player 3292 cf::player
3039 3297
3040=cut 3298=cut
3041 3299
3042for ( 3300for (
3043 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3301 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3044 insert remove inv name archname title slaying race 3302 insert remove inv nrof name archname title slaying race
3045 decrease_ob_nr destroy)], 3303 decrease split destroy change_exp value msg lore send_msg)],
3046 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
3047 ["cf::player" => qw(peaceful)], 3305 ["cf::player" => qw(peaceful send_msg)],
3048 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
3049) { 3307) {
3050 no strict 'refs';
3051 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
3052 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3053 for @funs; 3310 for @funs;
3054} 3311}
3055 3312
3070 3327
3071 my $qcode = $code; 3328 my $qcode = $code;
3072 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3329 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3073 $qcode =~ s/\n/\\n/g; 3330 $qcode =~ s/\n/\\n/g;
3074 3331
3332 %vars = (_dummy => 0) unless %vars;
3333
3334 my @res;
3075 local $_; 3335 local $_;
3076 local @safe::cf::_safe_eval_args = values %vars;
3077 3336
3078 my $eval = 3337 my $eval =
3079 "do {\n" 3338 "do {\n"
3080 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3339 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3081 . "#line 0 \"{$qcode}\"\n" 3340 . "#line 0 \"{$qcode}\"\n"
3082 . $code 3341 . $code
3083 . "\n}" 3342 . "\n}"
3084 ; 3343 ;
3085 3344
3345 if ($CFG{safe_eval}) {
3086 sub_generation_inc; 3346 sub_generation_inc;
3347 local @safe::cf::_safe_eval_args = values %vars;
3087 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3348 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3088 sub_generation_inc; 3349 sub_generation_inc;
3350 } else {
3351 local @cf::_safe_eval_args = values %vars;
3352 @res = wantarray ? eval eval : scalar eval $eval;
3353 }
3089 3354
3090 if ($@) { 3355 if ($@) {
3091 warn "$@"; 3356 warn "$@",
3092 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
3093 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
3094 } 3359 }
3095 3360
3096 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
3097} 3362}
3098 3363
3112=cut 3377=cut
3113 3378
3114sub register_script_function { 3379sub register_script_function {
3115 my ($fun, $cb) = @_; 3380 my ($fun, $cb) = @_;
3116 3381
3117 no strict 'refs'; 3382 $fun = "safe::$fun" if $CFG{safe_eval};
3118 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3383 *$fun = $safe_hole->wrap ($cb);
3119} 3384}
3120 3385
3121=back 3386=back
3122 3387
3123=cut 3388=cut
3132 # for this (global event?) 3397 # for this (global event?)
3133 %ext::player_env::MUSIC_FACE_CACHE = (); 3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3134 3399
3135 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3136 3401
3137 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
3138 3403
3139 my $facedata;
3140 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
3141 or die "$path: $!"; 3405 or die "$path: $!";
3142 3406
3143 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
3144 3408
3145 $facedata->{version} == 2 3409 $facedata->{version} == 2
3146 or cf::cleanup "$path: version mismatch, cannot proceed."; 3410 or cf::cleanup "$path: version mismatch, cannot proceed.";
3147 3411
3148 # patch in the exptable 3412 # patch in the exptable
3413 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3149 $facedata->{resource}{"res/exp_table"} = { 3414 $facedata->{resource}{"res/exp_table"} = {
3150 type => FT_RSRC, 3415 type => FT_RSRC,
3151 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3416 data => $exp_table,
3417 hash => (Digest::MD5::md5 $exp_table),
3152 }; 3418 };
3153 cf::cede_to_tick; 3419 cf::cede_to_tick;
3154 3420
3155 { 3421 {
3156 my $faces = $facedata->{faceinfo}; 3422 my $faces = $facedata->{faceinfo};
3158 while (my ($face, $info) = each %$faces) { 3424 while (my ($face, $info) = each %$faces) {
3159 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3425 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3160 3426
3161 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
3162 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
3163 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3164 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3431 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3165 3432
3166 cf::cede_to_tick; 3433 cf::cede_to_tick;
3167 } 3434 }
3168 3435
3169 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
3174 3441
3175 if (my $smooth = cf::face::find $info->{smooth}) { 3442 if (my $smooth = cf::face::find $info->{smooth}) {
3176 cf::face::set_smooth $idx, $smooth; 3443 cf::face::set_smooth $idx, $smooth;
3177 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3444 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3178 } else { 3445 } else {
3179 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3446 error "smooth face '$info->{smooth}' not found for face '$face'";
3180 } 3447 }
3181 3448
3182 cf::cede_to_tick; 3449 cf::cede_to_tick;
3183 } 3450 }
3184 } 3451 }
3193 3460
3194 cf::anim::invalidate_all; # d'oh 3461 cf::anim::invalidate_all; # d'oh
3195 } 3462 }
3196 3463
3197 { 3464 {
3198 # TODO: for gcfclient pleasure, we should give resources
3199 # that gcfclient doesn't grok a >10000 face index.
3200 my $res = $facedata->{resource}; 3465 my $res = $facedata->{resource};
3201 3466
3202 while (my ($name, $info) = each %$res) { 3467 while (my ($name, $info) = each %$res) {
3203 if (defined $info->{type}) { 3468 if (defined $info->{type}) {
3204 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3469 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3205 my $data;
3206 3470
3207 if ($info->{type} & 1) { 3471 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}; 3472 cf::face::set_type $idx, $info->{type};
3222 } else { 3473 } else {
3223 $RESOURCE{$name} = $info; 3474 $RESOURCE{$name} = $info; # unused
3224 } 3475 }
3225 3476
3226 cf::cede_to_tick; 3477 cf::cede_to_tick;
3227 } 3478 }
3228 } 3479 }
3229 3480
3230 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3481 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3231 3482
3232 1 3483 1
3233} 3484}
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 3485
3255register_exticmd fx_want => sub { 3486register_exticmd fx_want => sub {
3256 my ($ns, $want) = @_; 3487 my ($ns, $want) = @_;
3257 3488
3258 while (my ($k, $v) = each %$want) { 3489 while (my ($k, $v) = each %$want) {
3259 $ns->fx_want ($k, $v); 3490 $ns->fx_want ($k, $v);
3260 } 3491 }
3261}; 3492};
3493
3494sub load_resource_file($) {
3495 my $guard = lock_acquire "load_resource_file";
3496
3497 my $status = load_resource_file_ $_[0];
3498 get_slot 0.1, 100;
3499 cf::arch::commit_load;
3500
3501 $status
3502}
3262 3503
3263sub reload_regions { 3504sub reload_regions {
3264 # HACK to clear player env face cache, we need some signal framework 3505 # HACK to clear player env face cache, we need some signal framework
3265 # for this (global event?) 3506 # for this (global event?)
3266 %ext::player_env::MUSIC_FACE_CACHE = (); 3507 %ext::player_env::MUSIC_FACE_CACHE = ();
3280} 3521}
3281 3522
3282sub reload_archetypes { 3523sub reload_archetypes {
3283 load_resource_file "$DATADIR/archetypes" 3524 load_resource_file "$DATADIR/archetypes"
3284 or die "unable to load archetypes\n"; 3525 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} 3526}
3291 3527
3292sub reload_treasures { 3528sub reload_treasures {
3293 load_resource_file "$DATADIR/treasures" 3529 load_resource_file "$DATADIR/treasures"
3294 or die "unable to load treasurelists\n"; 3530 or die "unable to load treasurelists\n";
3295} 3531}
3296 3532
3533sub reload_sound {
3534 trace "loading sound config from $DATADIR/sound\n";
3535
3536 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3537 or die "$DATADIR/sound $!";
3538
3539 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3540
3541 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3542 my $sound = $soundconf->{compat}[$_]
3543 or next;
3544
3545 my $face = cf::face::find "sound/$sound->[1]";
3546 cf::sound::set $sound->[0] => $face;
3547 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3548 }
3549
3550 while (my ($k, $v) = each %{$soundconf->{event}}) {
3551 my $face = cf::face::find "sound/$v";
3552 cf::sound::set $k => $face;
3553 }
3554}
3555
3297sub reload_resources { 3556sub reload_resources {
3298 warn "reloading resource files...\n"; 3557 trace "reloading resource files...\n";
3299 3558
3559 reload_exp_table;
3560 reload_materials;
3561 reload_facedata;
3562 reload_sound;
3563 reload_archetypes;
3300 reload_regions; 3564 reload_regions;
3301 reload_facedata;
3302 #reload_archetypes;#d#
3303 reload_archetypes;
3304 reload_treasures; 3565 reload_treasures;
3305 3566
3306 warn "finished reloading resource files\n"; 3567 trace "finished reloading resource files\n";
3307}
3308
3309sub init {
3310 reload_resources;
3311} 3568}
3312 3569
3313sub reload_config { 3570sub reload_config {
3314 open my $fh, "<:utf8", "$CONFDIR/config" 3571 trace "reloading config file...\n";
3315 or return;
3316 3572
3317 local $/; 3573 0 < aio_load "$CONFDIR/config", my $config
3318 *CFG = YAML::Syck::Load <$fh>; 3574 or die "$CONFDIR/config: $!";
3319 3575
3576 utf8::decode $config;
3577 *CFG = yaml_load $config;
3578
3320 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3579 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3321 3580
3322 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3581 $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}; 3582 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3324 3583
3325 if (exists $CFG{mlockall}) { 3584 if (exists $CFG{mlockall}) {
3329 }; 3588 };
3330 warn $@ if $@; 3589 warn $@ if $@;
3331 } 3590 }
3332} 3591}
3333 3592
3593sub pidfile() {
3594 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3595 or die "$PIDFILE: $!";
3596 flock $fh, &Fcntl::LOCK_EX
3597 or die "$PIDFILE: flock: $!";
3598 $fh
3599}
3600
3601# make sure only one server instance is running at any one time
3602sub atomic {
3603 my $fh = pidfile;
3604
3605 my $pid = <$fh>;
3606 kill 9, $pid if $pid > 0;
3607
3608 seek $fh, 0, 0;
3609 print $fh $$;
3610}
3611
3612sub main_loop {
3613 trace "EV::loop starting\n";
3614 if (1) {
3615 EV::loop;
3616 }
3617 trace "EV::loop returned\n";
3618 goto &main_loop unless $REALLY_UNLOOP;
3619}
3620
3334sub main { 3621sub main {
3622 cf::init_globals; # initialise logging
3623
3624 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3625 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3626 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3627 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3628
3629 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3630
3335 # we must not ever block the main coroutine 3631 # we must not ever block the main coroutine
3336 local $Coro::idle = sub { 3632 local $Coro::idle = sub {
3337 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3633 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3338 (async { 3634 (async {
3339 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3635 $Coro::current->{desc} = "IDLE BUG HANDLER";
3340 EV::loop EV::LOOP_ONESHOT; 3636 EV::loop EV::LOOP_ONESHOT;
3341 })->prio (Coro::PRIO_MAX); 3637 })->prio (Coro::PRIO_MAX);
3342 }; 3638 };
3343 3639
3640 evthread_start IO::AIO::poll_fileno;
3641
3642 cf::sync_job {
3643 cf::incloader::init ();
3644
3645 cf::init_anim;
3646 cf::init_attackmess;
3647 cf::init_dynamic;
3648
3649 cf::load_settings;
3650
3651 reload_resources;
3344 reload_config; 3652 reload_config;
3345 db_init; 3653 db_init;
3654
3655 cf::init_uuid;
3656 cf::init_signals;
3657 cf::init_skills;
3658
3659 cf::init_beforeplay;
3660
3661 atomic;
3662
3346 load_extensions; 3663 load_extensions;
3347 3664
3348 $TICK_WATCHER->start; 3665 utime time, time, $RUNTIMEFILE;
3349 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3666
3350 EV::loop; 3667 # no (long-running) fork's whatsoever before this point(!)
3668 use POSIX ();
3669 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3670
3671 cf::_post_init 0;
3672 };
3673
3674 cf::object::thawer::errors_are_fatal 0;
3675 info "parse errors in files are no longer fatal from this point on.\n";
3676
3677 my $free_main; $free_main = EV::idle sub {
3678 undef $free_main;
3679 undef &main; # free gobs of memory :)
3680 };
3681
3682 goto &main_loop;
3351} 3683}
3352 3684
3353############################################################################# 3685#############################################################################
3354# initialisation and cleanup 3686# initialisation and cleanup
3355 3687
3356# install some emergency cleanup handlers 3688# install some emergency cleanup handlers
3357BEGIN { 3689BEGIN {
3358 our %SIGWATCHER = (); 3690 our %SIGWATCHER = ();
3359 for my $signal (qw(INT HUP TERM)) { 3691 for my $signal (qw(INT HUP TERM)) {
3360 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3692 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3361 cf::cleanup "SIG$signal"; 3693 cf::cleanup "SIG$signal";
3362 }; 3694 };
3363 } 3695 }
3364} 3696}
3365 3697
3366sub write_runtime { 3698sub write_runtime_sync {
3367 my $runtime = "$LOCALDIR/runtime"; 3699 my $t0 = AE::time;
3368 3700
3369 # first touch the runtime file to show we are still running: 3701 # first touch the runtime file to show we are still running:
3370 # the fsync below can take a very very long time. 3702 # the fsync below can take a very very long time.
3371 3703
3372 IO::AIO::aio_utime $runtime, undef, undef; 3704 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3373 3705
3374 my $guard = cf::lock_acquire "write_runtime"; 3706 my $guard = cf::lock_acquire "write_runtime";
3375 3707
3376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3708 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3377 or return; 3709 or return;
3378 3710
3379 my $value = $cf::RUNTIME + 90 + 10; 3711 my $value = $cf::RUNTIME + 90 + 10;
3380 # 10 is the runtime save interval, for a monotonic clock 3712 # 10 is the runtime save interval, for a monotonic clock
3381 # 60 allows for the watchdog to kill the server. 3713 # 60 allows for the watchdog to kill the server.
3391 aio_utime $fh, undef, undef; 3723 aio_utime $fh, undef, undef;
3392 3724
3393 close $fh 3725 close $fh
3394 or return; 3726 or return;
3395 3727
3396 aio_rename "$runtime~", $runtime 3728 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3397 and return; 3729 and return;
3398 3730
3399 warn "runtime file written.\n"; 3731 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3400 3732
3401 1 3733 1
3734}
3735
3736our $uuid_lock;
3737our $uuid_skip;
3738
3739sub write_uuid_sync($) {
3740 $uuid_skip ||= $_[0];
3741
3742 return if $uuid_lock;
3743 local $uuid_lock = 1;
3744
3745 my $uuid = "$LOCALDIR/uuid";
3746
3747 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3748 or return;
3749
3750 my $value = uuid_seq uuid_cur;
3751
3752 unless ($value) {
3753 info "cowardly refusing to write zero uuid value!\n";
3754 return;
3755 }
3756
3757 my $value = uuid_str $value + $uuid_skip;
3758 $uuid_skip = 0;
3759
3760 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3761 and return;
3762
3763 # always fsync - this file is important
3764 aio_fsync $fh
3765 and return;
3766
3767 close $fh
3768 or return;
3769
3770 aio_rename "$uuid~", $uuid
3771 and return;
3772
3773 trace "uuid file written ($value).\n";
3774
3775 1
3776
3777}
3778
3779sub write_uuid($$) {
3780 my ($skip, $sync) = @_;
3781
3782 $sync ? write_uuid_sync $skip
3783 : async { write_uuid_sync $skip };
3402} 3784}
3403 3785
3404sub emergency_save() { 3786sub emergency_save() {
3405 my $freeze_guard = cf::freeze_mainloop; 3787 my $freeze_guard = cf::freeze_mainloop;
3406 3788
3407 warn "enter emergency perl save\n"; 3789 info "emergency_perl_save: enter\n";
3790
3791 # this is a trade-off: we want to be very quick here, so
3792 # save all maps without fsync, and later call a global sync
3793 # (which in turn might be very very slow)
3794 local $USE_FSYNC = 0;
3408 3795
3409 cf::sync_job { 3796 cf::sync_job {
3797 cf::write_runtime_sync; # external watchdog should not bark
3798
3410 # use a peculiar iteration method to avoid tripping on perl 3799 # use a peculiar iteration method to avoid tripping on perl
3411 # refcount bugs in for. also avoids problems with players 3800 # refcount bugs in for. also avoids problems with players
3412 # and maps saved/destroyed asynchronously. 3801 # and maps saved/destroyed asynchronously.
3413 warn "begin emergency player save\n"; 3802 info "emergency_perl_save: begin player save\n";
3414 for my $login (keys %cf::PLAYER) { 3803 for my $login (keys %cf::PLAYER) {
3415 my $pl = $cf::PLAYER{$login} or next; 3804 my $pl = $cf::PLAYER{$login} or next;
3416 $pl->valid or next; 3805 $pl->valid or next;
3417 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3806 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3418 $pl->save; 3807 $pl->save;
3419 } 3808 }
3420 warn "end emergency player save\n"; 3809 info "emergency_perl_save: end player save\n";
3421 3810
3422 warn "begin emergency map save\n"; 3811 cf::write_runtime_sync; # external watchdog should not bark
3812
3813 info "emergency_perl_save: begin map save\n";
3423 for my $path (keys %cf::MAP) { 3814 for my $path (keys %cf::MAP) {
3424 my $map = $cf::MAP{$path} or next; 3815 my $map = $cf::MAP{$path} or next;
3425 $map->valid or next; 3816 $map->valid or next;
3426 $map->save; 3817 $map->save;
3427 } 3818 }
3428 warn "end emergency map save\n"; 3819 info "emergency_perl_save: end map save\n";
3429 3820
3430 warn "begin emergency database checkpoint\n"; 3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3823 info "emergency_perl_save: begin database checkpoint\n";
3431 BDB::db_env_txn_checkpoint $DB_ENV; 3824 BDB::db_env_txn_checkpoint $DB_ENV;
3432 warn "end emergency database checkpoint\n"; 3825 info "emergency_perl_save: end database checkpoint\n";
3826
3827 info "emergency_perl_save: begin write uuid\n";
3828 write_uuid_sync 1;
3829 info "emergency_perl_save: end write uuid\n";
3830
3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3833 trace "emergency_perl_save: syncing database to disk";
3834 BDB::db_env_txn_checkpoint $DB_ENV;
3835
3836 info "emergency_perl_save: starting sync\n";
3837 IO::AIO::aio_sync sub {
3838 info "emergency_perl_save: finished sync\n";
3839 };
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: flushing outstanding aio requests";
3844 while (IO::AIO::nreqs || BDB::nreqs) {
3845 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3846 }
3847
3848 cf::write_runtime_sync; # external watchdog should not bark
3433 }; 3849 };
3434 3850
3435 warn "leave emergency perl save\n"; 3851 info "emergency_perl_save: leave\n";
3436} 3852}
3437 3853
3438sub post_cleanup { 3854sub post_cleanup {
3439 my ($make_core) = @_; 3855 my ($make_core) = @_;
3440 3856
3857 IO::AIO::flush;
3858
3441 warn Carp::longmess "post_cleanup backtrace" 3859 error Carp::longmess "post_cleanup backtrace"
3442 if $make_core; 3860 if $make_core;
3861
3862 my $fh = pidfile;
3863 unlink $PIDFILE if <$fh> == $$;
3864}
3865
3866# a safer delete_package, copied from Symbol
3867sub clear_package($) {
3868 my $pkg = shift;
3869
3870 # expand to full symbol table name if needed
3871 unless ($pkg =~ /^main::.*::$/) {
3872 $pkg = "main$pkg" if $pkg =~ /^::/;
3873 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3874 $pkg .= '::' unless $pkg =~ /::$/;
3875 }
3876
3877 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3878 my $stem_symtab = *{$stem}{HASH};
3879
3880 defined $stem_symtab and exists $stem_symtab->{$leaf}
3881 or return;
3882
3883 # clear all symbols
3884 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3885 for my $name (keys %$leaf_symtab) {
3886 _gv_clear *{"$pkg$name"};
3887# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3888 }
3443} 3889}
3444 3890
3445sub do_reload_perl() { 3891sub do_reload_perl() {
3446 # can/must only be called in main 3892 # can/must only be called in main
3447 if ($Coro::current != $Coro::main) { 3893 unless (in_main) {
3448 warn "can only reload from main coroutine"; 3894 error "can only reload from main coroutine";
3449 return; 3895 return;
3450 } 3896 }
3451 3897
3452 warn "reloading..."; 3898 return if $RELOAD++;
3453 3899
3454 warn "entering sync_job"; 3900 my $t1 = AE::time;
3455 3901
3902 while ($RELOAD) {
3903 cf::get_slot 0.1, -1, "reload_perl";
3904 info "perl_reload: reloading...";
3905
3906 trace "perl_reload: entering sync_job";
3907
3456 cf::sync_job { 3908 cf::sync_job {
3457 cf::write_runtime; # external watchdog should not bark
3458 cf::emergency_save; 3909 #cf::emergency_save;
3459 cf::write_runtime; # external watchdog should not bark
3460 3910
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"; 3911 trace "perl_reload: cancelling all extension coros";
3478 $_->cancel for values %EXT_CORO; 3912 $_->cancel for values %EXT_CORO;
3479 %EXT_CORO = (); 3913 %EXT_CORO = ();
3480 3914
3481 warn "removing commands"; 3915 trace "perl_reload: removing commands";
3482 %COMMAND = (); 3916 %COMMAND = ();
3483 3917
3484 warn "removing ext/exti commands"; 3918 trace "perl_reload: removing ext/exti commands";
3485 %EXTCMD = (); 3919 %EXTCMD = ();
3486 %EXTICMD = (); 3920 %EXTICMD = ();
3487 3921
3488 warn "unloading/nuking all extensions"; 3922 trace "perl_reload: unloading/nuking all extensions";
3489 for my $pkg (@EXTS) { 3923 for my $pkg (@EXTS) {
3490 warn "... unloading $pkg"; 3924 trace "... unloading $pkg";
3491 3925
3492 if (my $cb = $pkg->can ("unload")) { 3926 if (my $cb = $pkg->can ("unload")) {
3493 eval { 3927 eval {
3494 $cb->($pkg); 3928 $cb->($pkg);
3495 1 3929 1
3496 } or warn "$pkg unloaded, but with errors: $@"; 3930 } or error "$pkg unloaded, but with errors: $@";
3931 }
3932
3933 trace "... clearing $pkg";
3934 clear_package $pkg;
3497 } 3935 }
3498 3936
3499 warn "... nuking $pkg";
3500 Symbol::delete_package $pkg;
3501 }
3502
3503 warn "unloading all perl modules loaded from $LIBDIR"; 3937 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3504 while (my ($k, $v) = each %INC) { 3938 while (my ($k, $v) = each %INC) {
3505 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3939 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3506 3940
3507 warn "... unloading $k"; 3941 trace "... unloading $k";
3508 delete $INC{$k}; 3942 delete $INC{$k};
3509 3943
3510 $k =~ s/\.pm$//; 3944 $k =~ s/\.pm$//;
3511 $k =~ s/\//::/g; 3945 $k =~ s/\//::/g;
3512 3946
3513 if (my $cb = $k->can ("unload_module")) { 3947 if (my $cb = $k->can ("unload_module")) {
3514 $cb->(); 3948 $cb->();
3949 }
3950
3951 clear_package $k;
3515 } 3952 }
3516 3953
3517 Symbol::delete_package $k;
3518 }
3519
3520 warn "getting rid of safe::, as good as possible"; 3954 trace "perl_reload: getting rid of safe::, as good as possible";
3521 Symbol::delete_package "safe::$_" 3955 clear_package "safe::$_"
3522 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3956 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3523 3957
3524 warn "unloading cf.pm \"a bit\""; 3958 trace "perl_reload: unloading cf.pm \"a bit\"";
3525 delete $INC{"cf.pm"}; 3959 delete $INC{"cf.pm"};
3526 delete $INC{"cf/pod.pm"}; 3960 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3527 3961
3528 # don't, removes xs symbols, too, 3962 # don't, removes xs symbols, too,
3529 # and global variables created in xs 3963 # and global variables created in xs
3530 #Symbol::delete_package __PACKAGE__; 3964 #clear_package __PACKAGE__;
3531 3965
3532 warn "unload completed, starting to reload now"; 3966 info "perl_reload: unload completed, starting to reload now";
3533 3967
3534 warn "reloading cf.pm"; 3968 trace "perl_reload: reloading cf.pm";
3535 require cf; 3969 require cf;
3536 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3970 cf::_connect_to_perl_1;
3537 3971
3538 warn "loading config and database again"; 3972 trace "perl_reload: loading config and database again";
3539 cf::reload_config; 3973 cf::reload_config;
3540 3974
3541 warn "loading extensions"; 3975 trace "perl_reload: loading extensions";
3542 cf::load_extensions; 3976 cf::load_extensions;
3543 3977
3978 if ($REATTACH_ON_RELOAD) {
3544 warn "reattaching attachments to objects/players"; 3979 trace "perl_reload: reattaching attachments to objects/players";
3545 _global_reattach; # objects, sockets 3980 _global_reattach; # objects, sockets
3546 warn "reattaching attachments to maps"; 3981 trace "perl_reload: reattaching attachments to maps";
3547 reattach $_ for values %MAP; 3982 reattach $_ for values %MAP;
3548 warn "reattaching attachments to players"; 3983 trace "perl_reload: reattaching attachments to players";
3549 reattach $_ for values %PLAYER; 3984 reattach $_ for values %PLAYER;
3985 }
3550 3986
3551 warn "leaving sync_job"; 3987 cf::_post_init 1;
3552 3988
3989 trace "perl_reload: leaving sync_job";
3990
3553 1 3991 1
3554 } or do { 3992 } or do {
3555 warn $@; 3993 error $@;
3556 warn "error while reloading, exiting."; 3994 cf::cleanup "perl_reload: error, exiting.";
3557 exit 1; 3995 };
3996
3997 --$RELOAD;
3558 }; 3998 }
3559 3999
3560 warn "reloaded"; 4000 $t1 = AE::time - $t1;
4001 info "perl_reload: completed in ${t1}s\n";
3561}; 4002};
3562 4003
3563our $RELOAD_WATCHER; # used only during reload 4004our $RELOAD_WATCHER; # used only during reload
3564 4005
3565sub reload_perl() { 4006sub reload_perl() {
3566 # doing reload synchronously and two reloads happen back-to-back, 4007 # doing reload synchronously and two reloads happen back-to-back,
3567 # coro crashes during coro_state_free->destroy here. 4008 # coro crashes during coro_state_free->destroy here.
3568 4009
4010 $RELOAD_WATCHER ||= cf::async {
4011 Coro::AIO::aio_wait cache_extensions;
4012
3569 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4013 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
4014 do_reload_perl;
3570 undef $RELOAD_WATCHER; 4015 undef $RELOAD_WATCHER;
3571 do_reload_perl; 4016 };
3572 }; 4017 };
3573} 4018}
3574 4019
3575register_command "reload" => sub { 4020register_command "reload" => sub {
3576 my ($who, $arg) = @_; 4021 my ($who, $arg) = @_;
3582 reload_perl; 4027 reload_perl;
3583 }; 4028 };
3584 } 4029 }
3585}; 4030};
3586 4031
3587unshift @INC, $LIBDIR; 4032#############################################################################
3588 4033
3589my $bug_warning = 0; 4034my $bug_warning = 0;
3590 4035
3591our @WAIT_FOR_TICK; 4036our @WAIT_FOR_TICK;
3592our @WAIT_FOR_TICK_BEGIN; 4037our @WAIT_FOR_TICK_BEGIN;
3593 4038
3594sub wait_for_tick { 4039sub wait_for_tick() {
3595 return unless $TICK_WATCHER->is_active;
3596 return if $Coro::current == $Coro::main; 4040 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3597 4041
3598 my $signal = new Coro::Signal; 4042 my $signal = new Coro::Signal;
3599 push @WAIT_FOR_TICK, $signal; 4043 push @WAIT_FOR_TICK, $signal;
3600 $signal->wait; 4044 $signal->wait;
3601} 4045}
3602 4046
3603sub wait_for_tick_begin { 4047sub wait_for_tick_begin() {
3604 return unless $TICK_WATCHER->is_active;
3605 return if $Coro::current == $Coro::main; 4048 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3606 4049
3607 my $signal = new Coro::Signal; 4050 my $signal = new Coro::Signal;
3608 push @WAIT_FOR_TICK_BEGIN, $signal; 4051 push @WAIT_FOR_TICK_BEGIN, $signal;
3609 $signal->wait; 4052 $signal->wait;
3610} 4053}
3611 4054
3612$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4055sub tick {
3613 if ($Coro::current != $Coro::main) { 4056 if ($Coro::current != $Coro::main) {
3614 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4057 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3615 unless ++$bug_warning > 10; 4058 unless ++$bug_warning > 10;
3616 return; 4059 return;
3617 } 4060 }
3618 4061
3619 $NOW = $tick_start = EV::now;
3620
3621 cf::server_tick; # one server iteration 4062 cf::server_tick; # one server iteration
3622 4063
3623 $RUNTIME += $TICK; 4064 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3624 $NEXT_TICK = $_[0]->at;
3625 4065
3626 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4066 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3627 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4067 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3628 Coro::async_pool { 4068 Coro::async_pool {
3629 $Coro::current->{desc} = "runtime saver"; 4069 $Coro::current->{desc} = "runtime saver";
3630 write_runtime 4070 write_runtime_sync
3631 or warn "ERROR: unable to write runtime file: $!"; 4071 or error "ERROR: unable to write runtime file: $!";
3632 }; 4072 };
3633 } 4073 }
3634 4074
3635 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4075 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3636 $sig->send; 4076 $sig->send;
3637 } 4077 }
3638 while (my $sig = shift @WAIT_FOR_TICK) { 4078 while (my $sig = shift @WAIT_FOR_TICK) {
3639 $sig->send; 4079 $sig->send;
3640 } 4080 }
3641 4081
3642 $LOAD = ($NOW - $tick_start) / $TICK; 4082 $LOAD = ($NOW - $TICK_START) / $TICK;
3643 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4083 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3644 4084
3645 _post_tick; 4085 if (0) {
3646}; 4086 if ($NEXT_TICK) {
3647$TICK_WATCHER->priority (EV::MAXPRI); 4087 my $jitter = $TICK_START - $NEXT_TICK;
4088 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4089 debug "jitter $JITTER\n";#d#
4090 }
4091 }
4092}
3648 4093
3649{ 4094{
3650 # configure BDB 4095 # configure BDB
3651 4096
3652 BDB::min_parallel 8; 4097 BDB::min_parallel 16;
3653 BDB::max_poll_reqs $TICK * 0.1; 4098 BDB::max_poll_reqs $TICK * 0.1;
3654 $Coro::BDB::WATCHER->priority (1); 4099 $AnyEvent::BDB::WATCHER->priority (1);
3655 4100
3656 unless ($DB_ENV) { 4101 unless ($DB_ENV) {
3657 $DB_ENV = BDB::db_env_create; 4102 $DB_ENV = BDB::db_env_create;
3658 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4103 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3659 | BDB::LOG_AUTOREMOVE, 1); 4104 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4105 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3660 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4106 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3661 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4107 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3662 4108
3663 cf::sync_job { 4109 cf::sync_job {
3664 eval { 4110 eval {
3690{ 4136{
3691 # configure IO::AIO 4137 # configure IO::AIO
3692 4138
3693 IO::AIO::min_parallel 8; 4139 IO::AIO::min_parallel 8;
3694 IO::AIO::max_poll_time $TICK * 0.1; 4140 IO::AIO::max_poll_time $TICK * 0.1;
3695 $Coro::AIO::WATCHER->priority (1); 4141 undef $AnyEvent::AIO::WATCHER;
3696} 4142}
3697 4143
3698my $_log_backtrace; 4144our $_log_backtrace;
4145our $_log_backtrace_last;
3699 4146
3700sub _log_backtrace { 4147sub _log_backtrace {
3701 my ($msg, @addr) = @_; 4148 my ($msg, @addr) = @_;
3702 4149
3703 $msg =~ s/\n//; 4150 $msg =~ s/\n$//;
3704 4151
4152 if ($_log_backtrace_last eq $msg) {
4153 LOG llevInfo, "[ABT] $msg\n";
4154 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3705 # limit the # of concurrent backtraces 4155 # limit the # of concurrent backtraces
3706 if ($_log_backtrace < 2) { 4156 } elsif ($_log_backtrace < 2) {
4157 $_log_backtrace_last = $msg;
3707 ++$_log_backtrace; 4158 ++$_log_backtrace;
4159 my $perl_bt = Carp::longmess $msg;
3708 async { 4160 async {
3709 $Coro::current->{desc} = "abt $msg"; 4161 $Coro::current->{desc} = "abt $msg";
3710 4162
3711 my @bt = fork_call { 4163 my @bt = fork_call {
3712 @addr = map { sprintf "%x", $_ } @addr; 4164 @addr = map { sprintf "%x", $_ } @addr;
3723 } 4175 }
3724 4176
3725 @funcs 4177 @funcs
3726 }; 4178 };
3727 4179
3728 LOG llevInfo, "[ABT] $msg\n"; 4180 LOG llevInfo, "[ABT] $perl_bt\n";
4181 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3729 LOG llevInfo, "[ABT] $_\n" for @bt; 4182 LOG llevInfo, "[ABT] $_\n" for @bt;
3730 --$_log_backtrace; 4183 --$_log_backtrace;
3731 }; 4184 };
3732 } else { 4185 } else {
3733 LOG llevInfo, "[ABT] $msg\n"; 4186 LOG llevInfo, "[ABT] $msg\n";
3734 LOG llevInfo, "[ABT] [suppressed]\n"; 4187 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3735 } 4188 }
3736} 4189}
3737 4190
3738# load additional modules 4191# load additional modules
3739use cf::pod; 4192require "cf/$_.pm" for @EXTRA_MODULES;
4193cf::_connect_to_perl_2;
3740 4194
3741END { cf::emergency_save } 4195END { cf::emergency_save }
3742 4196
37431 41971
3744 4198

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines