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.411 by root, Fri Feb 1 15:54:07 2008 UTC vs.
Revision 1.556 by root, Sat Jul 3 01:49:18 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 (); 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$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45 78
46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
47 82
48our %COMMAND = (); 83our %COMMAND = ();
49our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
50 85
51our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
52our %EXTCMD = (); 87our %EXTCMD = ();
53our %EXTICMD = (); 88our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
56 91
57our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
59 96
60our $CONFDIR = confdir; 97our $CONFDIR = confdir;
61our $DATADIR = datadir; 98our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
71our %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;
72 118
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 121our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
79 123
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 127our $DB_ENV;
85 128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
86our %CFG; 131our %CFG;
87 132
88our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 134our $RUNTIME;
90our $NOW; 135our $NOW;
96# 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 ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 143
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
101our $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 :)
102 153
103binmode STDOUT; 154binmode STDOUT;
104binmode STDERR; 155binmode STDERR;
105 156
106# read virtual server time, if available 157# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
111} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
112 165
113mkdir $_ 166mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 168
116our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
117 170
118sub 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::"} };
119 187
120############################################################################# 188#############################################################################
121 189
122=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
123 191
165from wherever your confdir points to. 233from wherever your confdir points to.
166 234
167=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
168 236
169These 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
170returns 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
171per 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.
172 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
173=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
174 247
175This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
176C<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
177that call. 250that call.
178 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
179=back 258=back
180 259
181=cut 260=cut
182 261
183BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
184 *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 {
185 my $msg = join "", @_; 269 my $msg = join "", @_;
186 270
187 $msg .= "\n" 271 $msg .= "\n"
188 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
189 273
190 $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;
191 275
192 LOG llevError, $msg; 276 LOG llevWarn, $msg;
193 }; 277};
194}
195 278
196$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
197 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
198 281
199 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d# 286 return;#d#
202 }#d# 287 }#d#
203 288
204 # kill coroutine otherwise 289 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate 290 Coro::terminate
207}; 291};
208
209$SIG{__DIE__} = sub { }; #d#?
210 292
211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
221for my $pkg (qw( 303for my $pkg (qw(
222 cf::global cf::attachable 304 cf::global cf::attachable
223 cf::object cf::object::player 305 cf::object cf::object::player
224 cf::client cf::player 306 cf::client cf::player
225 cf::arch cf::living 307 cf::arch cf::living
308 cf::map cf::mapspace
226 cf::map cf::party cf::region 309 cf::party cf::region
227)) { 310)) {
228 no strict 'refs';
229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
230} 312}
231 313
232$EV::DIED = sub { 314$EV::DIED = sub {
233 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
234}; 316};
235 317
236############################################################################# 318#############################################################################
237 319
238=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
275our $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
276 358
277sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
278sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
279 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
280=item cf::lock_wait $string 405=item cf::lock_wait $string
281 406
282Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
283 408
284=item my $lock = cf::lock_acquire $string 409=item my $lock = cf::lock_acquire $string
285 410
286Wait 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
287a 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,
288for example when the coroutine gets canceled), the lock is automatically 413for example when the coroutine gets canceled), the lock is automatically
289returned. 414returned.
290 415
291Locks 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
292deadlocked coro. 417deadlocked coro.
298 423
299Return 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.
300 425
301=cut 426=cut
302 427
303our %LOCK; 428our $LOCKS = new Coro::SemaphoreSet;
304our %LOCKER;#d#
305 429
306sub lock_wait($) { 430sub lock_wait($) {
307 my ($key) = @_; 431 $LOCKS->wait ($_[0]);
308
309 if ($LOCKER{$key} == $Coro::current) {#d#
310 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
311 return;#d#
312 }#d#
313
314 # wait for lock, if any
315 while ($LOCK{$key}) {
316 push @{ $LOCK{$key} }, $Coro::current;
317 Coro::schedule;
318 }
319} 432}
320 433
321sub lock_acquire($) { 434sub lock_acquire($) {
322 my ($key) = @_; 435 $LOCKS->guard ($_[0])
323
324 # wait, to be sure we are not locked
325 lock_wait $key;
326
327 $LOCK{$key} = [];
328 $LOCKER{$key} = $Coro::current;#d#
329
330 Coro::guard {
331 delete $LOCKER{$key};#d#
332 # wake up all waiters, to be on the safe side
333 $_->ready for @{ delete $LOCK{$key} };
334 }
335} 436}
336 437
337sub lock_active($) { 438sub lock_active($) {
338 my ($key) = @_; 439 $LOCKS->count ($_[0]) < 1
339
340 ! ! $LOCK{$key}
341} 440}
342 441
343sub freeze_mainloop { 442sub freeze_mainloop {
344 return unless $TICK_WATCHER->is_active; 443 tick_inhibit_inc;
345 444
346 my $guard = Coro::guard { 445 &Guard::guard (\&tick_inhibit_dec);
347 $TICK_WATCHER->start;
348 };
349 $TICK_WATCHER->stop;
350 $guard
351} 446}
352 447
353=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
354 449
355Like 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
356get spread over timer. 451get spread over time.
357 452
358=cut 453=cut
359 454
360sub periodic($$) { 455sub periodic($$) {
361 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
378 473
379=cut 474=cut
380 475
381our @SLOT_QUEUE; 476our @SLOT_QUEUE;
382our $SLOT_QUEUE; 477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
383 479
384$SLOT_QUEUE->cancel if $SLOT_QUEUE; 480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
385$SLOT_QUEUE = Coro::async { 481$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager"); 482 $Coro::current->desc ("timeslot manager");
387 483
388 my $signal = new Coro::Signal; 484 my $signal = new Coro::Signal;
485 my $busy;
389 486
390 while () { 487 while () {
391 next_job: 488 next_job:
489
392 my $avail = cf::till_tick; 490 my $avail = cf::till_tick;
393 if ($avail > 0.01) { 491
394 for (0 .. $#SLOT_QUEUE) { 492 for (0 .. $#SLOT_QUEUE) {
395 if ($SLOT_QUEUE[$_][0] < $avail) { 493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
396 my $job = splice @SLOT_QUEUE, $_, 1, (); 495 my $job = splice @SLOT_QUEUE, $_, 1, ();
397 $job->[2]->send; 496 $job->[2]->send;
398 Coro::cede; 497 Coro::cede;
399 goto next_job; 498 goto next_job;
400 } 499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
401 } 501 }
402 } 502 }
403 503
404 if (@SLOT_QUEUE) { 504 if (@SLOT_QUEUE) {
405 # 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
406 push @cf::WAIT_FOR_TICK, $signal; 506 push @cf::WAIT_FOR_TICK, $signal;
407 $signal->wait; 507 $signal->wait;
408 } else { 508 } else {
509 $busy = 0;
409 Coro::schedule; 510 Coro::schedule;
410 } 511 }
411 } 512 }
412}; 513};
413 514
414sub get_slot($;$$) { 515sub get_slot($;$$) {
516 return if tick_inhibit || $Coro::current == $Coro::main;
517
415 my ($time, $pri, $name) = @_; 518 my ($time, $pri, $name) = @_;
416 519
417 $time = $TICK * .6 if $time > $TICK * .6; 520 $time = clamp $time, 0.01, $TICK * .6;
521
418 my $sig = new Coro::Signal; 522 my $sig = new Coro::Signal;
419 523
420 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
421 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
422 $SLOT_QUEUE->ready; 526 $SLOT_QUEUE->ready;
448=cut 552=cut
449 553
450sub sync_job(&) { 554sub sync_job(&) {
451 my ($job) = @_; 555 my ($job) = @_;
452 556
453 if ($Coro::current == $Coro::main) { 557 if (in_main) {
454 my $time = EV::time; 558 my $time = AE::time;
455 559
456 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
457 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
458 562
459 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
460 564
461 # TODO: use suspend/resume instead
462 # (but this is cancel-safe)
463 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
464 566
465 my $busy = 1; 567 my $busy = 1;
466 my @res; 568 my @res;
467 569
468 (async { 570 (async {
469 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
470 @res = eval { $job->() }; 572 @res = eval { $job->() };
471 warn $@ if $@; 573 error $@ if $@;
472 undef $busy; 574 undef $busy;
473 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
474 576
475 while ($busy) { 577 while ($busy) {
476 if (Coro::nready) { 578 if (Coro::nready) {
478 } else { 580 } else {
479 EV::loop EV::LOOP_ONESHOT; 581 EV::loop EV::LOOP_ONESHOT;
480 } 582 }
481 } 583 }
482 584
483 $time = EV::time - $time; 585 my $time = AE::time - $time;
484 586
485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
487
488 $tick_start += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
489 588
490 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
491 } else { 590 } else {
492 # we are in another coroutine, how wonderful, everything just works 591 # we are in another coroutine, how wonderful, everything just works
493 592
513 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
514 613
515 $coro 614 $coro
516} 615}
517 616
518=item fork_call { }, $args 617=item fork_call { }, @args
519 618
520Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
521process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
522Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
523never block itself or use any form of event handling. 622never block itself or use any form of event handling.
524 623
525=cut 624=cut
526 625
626sub post_fork {
627 reset_signals;
628}
629
527sub fork_call(&@) { 630sub fork_call(&@) {
528 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
529 632
530 # 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,
531 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
532 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
533 636
534 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
535 reset_signals; 638 cf::post_fork;
536 &$cb 639 &$cb
537 }, @args; 640 } @args;
538 641
539 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
540} 681}
541 682
542=item $value = cf::db_get $family => $key 683=item $value = cf::db_get $family => $key
543 684
544Returns a single value from the environment database. 685Returns a single value from the environment database.
554within each server. 695within each server.
555 696
556=cut 697=cut
557 698
558sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
559 my ($name) = @_; 703 my ($name) = @_;
560 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
561 705
562 eval { 706 eval {
563 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
573} 717}
574 718
575our $DB; 719our $DB;
576 720
577sub db_init { 721sub db_init {
578 cf::sync_job {
579 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
580 };
581} 723}
582 724
583sub db_get($$) { 725sub db_get($$) {
584 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
585 727
586 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
587 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
588 732
589 $! ? () 733 $! ? ()
590 : $data 734 : $data
591 }
592} 735}
593 736
594sub db_put($$$) { 737sub db_put($$$) {
595 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
596 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
652 795
653 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
654 my $data = $process->(\@data); 797 my $data = $process->(\@data);
655 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
656 799
657 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
658 801
659 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
660 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
661 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
662 805
672 815
673=cut 816=cut
674 817
675sub datalog($@) { 818sub datalog($@) {
676 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
677 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
678} 821}
679 822
680=back 823=back
681 824
682=cut 825=cut
683 826
684############################################################################# 827#############################################################################
685 828
686=head2 ATTACHABLE OBJECTS 829=head2 ATTACHABLE OBJECTS
687 830
688Many 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
689attach callbacks/event handlers (a collection of which is called an "attachment") 832attach callbacks/event handlers (a collection of which is called an "attachment")
690to it. All such attachable objects support the following methods. 833to it. All such attachable objects support the following methods.
691 834
692In 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>
693C<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
743=item cf::CLASS::attachment $name, ... 886=item cf::CLASS::attachment $name, ...
744 887
745Register an attachment by C<$name> through which attachable objects of the 888Register an attachment by C<$name> through which attachable objects of the
746given CLASS can refer to this attachment. 889given CLASS can refer to this attachment.
747 890
748Some classes such as crossfire maps and objects can specify attachments 891Some classes such as deliantra maps and objects can specify attachments
749that 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.
750 893
751These calls expect any number of the following handler/hook descriptions: 894These calls expect any number of the following handler/hook descriptions:
752 895
753=over 4 896=over 4
877 1020
878 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
879 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
880 1023
881 } elsif (ref $type) { 1024 } elsif (ref $type) {
882 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
883 1026
884 } else { 1027 } else {
885 shift @arg; 1028 shift @arg;
886 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
887 } 1030 }
888 } 1031 }
889} 1032}
890 1033
891sub _object_attach { 1034sub _object_attach {
901 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
902 } 1045 }
903 1046
904 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
905 } else { 1048 } else {
906 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
907 } 1050 }
908 1051
909 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
910} 1053}
911 1054
970 1113
971 for (@$callbacks) { 1114 for (@$callbacks) {
972 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
973 1116
974 if ($@) { 1117 if ($@) {
975 warn "$@";
976 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
977 override; 1119 override;
978 } 1120 }
979 1121
980 return 1 if $override; 1122 return 1 if $override;
981 } 1123 }
1044 1186
1045sub reattach { 1187sub reattach {
1046 # basically do the same as instantiate, without calling instantiate 1188 # basically do the same as instantiate, without calling instantiate
1047 my ($obj) = @_; 1189 my ($obj) = @_;
1048 1190
1191 # no longer needed after getting rid of delete_package?
1049 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
1050 1193
1051 my $registry = $obj->registry; 1194 my $registry = $obj->registry;
1052 1195
1053 @$registry = (); 1196 @$registry = ();
1054 1197
1059 for (@$attach) { 1202 for (@$attach) {
1060 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1061 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1062 } 1205 }
1063 } else { 1206 } else {
1064 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1065 } 1208 }
1066 } 1209 }
1067} 1210}
1068 1211
1069cf::attachable->attach ( 1212cf::attachable->attach (
1096 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1097 1240
1098 sync_job { 1241 sync_job {
1099 if (length $$rdata) { 1242 if (length $$rdata) {
1100 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1101 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1102 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1103 1247
1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1249 aio_chmod $fh, SAVE_MODE;
1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1107 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 }
1108 close $fh; 1255 aio_close $fh;
1109 1256
1110 if (@$objs) { 1257 if (@$objs) {
1111 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) {
1112 chmod SAVE_MODE, $fh; 1259 aio_chmod $fh, SAVE_MODE;
1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1260 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1114 aio_write $fh, 0, (length $data), $data, 0; 1261 aio_write $fh, 0, (length $data), $data, 0;
1115 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 }
1116 close $fh; 1266 aio_close $fh;
1117 aio_rename "$filename.pst~", "$filename.pst"; 1267 aio_rename "$filename.pst~", "$filename.pst";
1118 } 1268 }
1119 } else { 1269 } else {
1120 aio_unlink "$filename.pst"; 1270 aio_unlink "$filename.pst";
1121 } 1271 }
1122 1272
1123 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1274
1275 $filename =~ s%/[^/]+$%%;
1276 aio_pathsync $filename if $cf::USE_FSYNC;
1124 } else { 1277 } else {
1125 warn "FATAL: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1126 } 1279 }
1127 } else { 1280 } else {
1128 aio_unlink $filename; 1281 aio_unlink $filename;
1129 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1130 } 1283 }
1154 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs}; 1308 $av = $st->{objs};
1156 } 1309 }
1157 1310
1158 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1159 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1160 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1161 1315
1162 ($data, $av) 1316 ($data, $av)
1163} 1317}
1164 1318
1165=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
1221 my ($name, $cb) = @_; 1375 my ($name, $cb) = @_;
1222 1376
1223 $EXTICMD{$name} = $cb; 1377 $EXTICMD{$name} = $cb;
1224} 1378}
1225 1379
1380use File::Glob ();
1381
1226cf::player->attach ( 1382cf::player->attach (
1227 on_command => sub { 1383 on_unknown_command => sub {
1228 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1229 1385
1230 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1231 or return; 1387 or return;
1232 1388
1255 1411
1256 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1257 if $reply; 1413 if $reply;
1258 1414
1259 } else { 1415 } else {
1260 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1261 } 1417 }
1262 1418
1263 cf::override; 1419 cf::override;
1264 }, 1420 },
1265); 1421);
1266 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
1267sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1268 cf::sync_job { 1439 cf::sync_job {
1269 my %todo; 1440 my %todo;
1270 1441
1271 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1272 next unless -r $path; 1443 next unless -r $path;
1290 1461
1291 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1292 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1293 1464
1294 $ext{source} = 1465 $ext{source} =
1295 "package $pkg; use strict; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1296 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1297 . $source 1468 . $source
1298 . "\n};\n1"; 1469 . "\n};\n1";
1299 1470
1300 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1301 } 1472 }
1302 1473
1474 my $pass = 0;
1303 my %done; 1475 my %done;
1304 while (%todo) { 1476 while (%todo) {
1305 my $progress; 1477 my $progress;
1306 1478
1479 ++$pass;
1480
1481 ext:
1307 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1308 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1309 goto skip 1484 next ext
1310 unless exists $done{$_}; 1485 unless exists $done{$_};
1311 } 1486 }
1312 1487
1313 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1314 1489
1315 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1316 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1317 : "$v->{base}: extension inactive.\n";
1318 1494
1319 if (exists $v->{meta}{mandatory}) {
1320 warn $msg;
1321 cf::cleanup "mandatory extension failed to load, exiting."; 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1322 } 1496 if exists $v->{meta}{mandatory};
1323 1497
1324 warn $msg; 1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1499 delete $todo{$k};
1500 } else {
1501 $done{$k} = delete $todo{$k};
1502 push @EXTS, $v->{pkg};
1503 $progress = 1;
1504
1505 info "$v->{base}: extension inactive.\n"
1506 unless $active;
1325 } 1507 }
1326
1327 $done{$k} = delete $todo{$k};
1328 push @EXTS, $v->{pkg};
1329 $progress = 1;
1330 } 1508 }
1331 1509
1332 skip: 1510 unless ($progress) {
1333 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1334 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 }
1335 } 1518 }
1336 }; 1519 };
1337} 1520}
1338 1521
1339############################################################################# 1522#############################################################################
1340 1523
1341=back 1524=back
1342 1525
1343=head2 CORE EXTENSIONS 1526=head2 CORE EXTENSIONS
1344 1527
1345Functions and methods that extend core crossfire objects. 1528Functions and methods that extend core deliantra objects.
1346 1529
1347=cut 1530=cut
1348 1531
1349package cf::player; 1532package cf::player;
1350 1533
1393 1576
1394sub exists($) { 1577sub exists($) {
1395 my ($login) = @_; 1578 my ($login) = @_;
1396 1579
1397 $cf::PLAYER{$login} 1580 $cf::PLAYER{$login}
1398 or cf::sync_job { !aio_stat path $login } 1581 or !aio_stat path $login
1399} 1582}
1400 1583
1401sub find($) { 1584sub find($) {
1402 return $cf::PLAYER{$_[0]} || do { 1585 return $cf::PLAYER{$_[0]} || do {
1403 my $login = $_[0]; 1586 my $login = $_[0];
1415 my $f = new_from_file cf::object::thawer path $login 1598 my $f = new_from_file cf::object::thawer path $login
1416 or return; 1599 or return;
1417 1600
1418 my $pl = cf::player::load_pl $f 1601 my $pl = cf::player::load_pl $f
1419 or return; 1602 or return;
1603
1420 local $cf::PLAYER_LOADING{$login} = $pl; 1604 local $cf::PLAYER_LOADING{$login} = $pl;
1421 $f->resolve_delayed_derefs; 1605 $f->resolve_delayed_derefs;
1422 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1423 } 1607 }
1424 } 1608 }
1425} 1609}
1426 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
1427sub save($) { 1624sub save($) {
1428 my ($pl) = @_; 1625 my ($pl) = @_;
1429 1626
1430 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1431 1628
1434 1631
1435 return if $pl->{deny_save}; 1632 return if $pl->{deny_save};
1436 1633
1437 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1438 $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];
1439 1641
1440 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1441 cf::cede_to_tick; 1643 cf::cede_to_tick;
1442} 1644}
1443 1645
1475 my ($pl) = @_; 1677 my ($pl) = @_;
1476 1678
1477 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1478 1680
1479 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1480 $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
1481 1683
1482 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1483 $pl->deactivate; 1685 $pl->deactivate;
1686
1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1484 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1485 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1486 1692
1487 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1488 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1489 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
1527 1733
1528 for my $login (@$dirs) { 1734 for my $login (@$dirs) {
1529 my $path = path $login; 1735 my $path = path $login;
1530 1736
1531 # a .pst is a dead give-away for a valid player 1737 # a .pst is a dead give-away for a valid player
1532 unless (-e "$path.pst") { 1738 # if no pst file found, open and chekc for blocked users
1739 if (aio_stat "$path.pst") {
1533 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1740 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1534 aio_read $fh, 0, 512, my $buf, 0 or next; 1741 aio_read $fh, 0, 512, my $buf, 0 or next;
1535 $buf !~ /^password -------------$/m or next; # official not-valid tag 1742 $buf !~ /^password -------------$/m or next; # official not-valid tag
1536 } 1743 }
1537 1744
1541 1748
1542 \@logins 1749 \@logins
1543} 1750}
1544 1751
1545=item $player->maps 1752=item $player->maps
1753
1754=item cf::player::maps $login
1546 1755
1547Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1548player. May block. 1757player. May block.
1549 1758
1550=cut 1759=cut
1568 } 1777 }
1569 1778
1570 \@paths 1779 \@paths
1571} 1780}
1572 1781
1573=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1782=item $protocol_xml = $player->expand_cfpod ($cfpod)
1574 1783
1575Expand crossfire pod fragments into protocol xml. 1784Expand deliantra pod fragments into protocol xml.
1576
1577=cut
1578
1579use re 'eval';
1580
1581my $group;
1582my $interior; $interior = qr{
1583 # match a pod interior sequence sans C<< >>
1584 (?:
1585 \ (.*?)\ (?{ $group = $^N })
1586 | < (??{$interior}) >
1587 )
1588}x;
1589
1590sub expand_cfpod {
1591 my ($self, $pod) = @_;
1592
1593 my $xml;
1594
1595 while () {
1596 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1597 $group = $1;
1598
1599 $group =~ s/&/&amp;/g;
1600 $group =~ s/</&lt;/g;
1601
1602 $xml .= $group;
1603 } elsif ($pod =~ m%\G
1604 ([BCGHITU])
1605 <
1606 (?:
1607 ([^<>]*) (?{ $group = $^N })
1608 | < $interior >
1609 )
1610 >
1611 %gcsx
1612 ) {
1613 my ($code, $data) = ($1, $group);
1614
1615 if ($code eq "B") {
1616 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1617 } elsif ($code eq "I") {
1618 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1619 } elsif ($code eq "U") {
1620 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1621 } elsif ($code eq "C") {
1622 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1623 } elsif ($code eq "T") {
1624 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1625 } elsif ($code eq "G") {
1626 my ($male, $female) = split /\|/, $data;
1627 $data = $self->gender ? $female : $male;
1628 $xml .= expand_cfpod ($self, $data);
1629 } elsif ($code eq "H") {
1630 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1631 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1632 "")
1633 [$self->{hintmode}];
1634 } else {
1635 $xml .= "error processing '$code($data)' directive";
1636 }
1637 } else {
1638 if ($pod =~ /\G(.+)/) {
1639 warn "parse error while expanding $pod (at $1)";
1640 }
1641 last;
1642 }
1643 }
1644
1645 for ($xml) {
1646 # create single paragraphs (very hackish)
1647 s/(?<=\S)\n(?=\w)/ /g;
1648
1649 # compress some whitespace
1650 s/\s+\n/\n/g; # ws line-ends
1651 s/\n\n+/\n/g; # double lines
1652 s/^\n+//; # beginning lines
1653 s/\n+$//; # ending lines
1654 }
1655
1656 $xml
1657}
1658
1659no re 'eval';
1660
1661sub hintmode {
1662 $_[0]{hintmode} = $_[1] if @_ > 1;
1663 $_[0]{hintmode}
1664}
1665 1785
1666=item $player->ext_reply ($msgid, @msg) 1786=item $player->ext_reply ($msgid, @msg)
1667 1787
1668Sends an ext reply to the player. 1788Sends an ext reply to the player.
1669 1789
1701 1821
1702=cut 1822=cut
1703 1823
1704sub find_by_path($) { 1824sub find_by_path($) {
1705 my ($path) = @_; 1825 my ($path) = @_;
1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1706 1828
1707 my ($match, $specificity); 1829 my ($match, $specificity);
1708 1830
1709 for my $region (list) { 1831 for my $region (list) {
1710 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1736our $MAX_RESET = 3600; 1858our $MAX_RESET = 3600;
1737our $DEFAULT_RESET = 3000; 1859our $DEFAULT_RESET = 3000;
1738 1860
1739sub generate_random_map { 1861sub generate_random_map {
1740 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1741 # mit "rum" bekleckern, nicht 1863
1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1865
1742 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1743 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1744 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1745 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1746 $rmp->{exit_on_final_map},
1747 $rmp->{xsize}, $rmp->{ysize},
1748 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1749 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1750 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1751 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1752 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1753 (cf::region::find $rmp->{region}), $rmp->{custom}
1754 )
1755} 1867}
1756 1868
1757=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1758 1870
1759Register 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
1764 1876
1765sub register { 1877sub register {
1766 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1767 my $pkg = caller; 1879 my $pkg = caller;
1768 1880
1769 no strict;
1770 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1771 1882
1772 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1773} 1884}
1774 1885
1775# also paths starting with '/' 1886# also paths starting with '/'
1776$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1887$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1777 1888
1778sub thawer_merge { 1889sub thawer_merge {
1779 my ($self, $merge) = @_; 1890 my ($self, $merge) = @_;
1780 1891
1781 # we have to keep some variables in memory intact 1892 # we have to keep some variables in memory intact
1786} 1897}
1787 1898
1788sub normalise { 1899sub normalise {
1789 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1790 1901
1791 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1792 1903
1793 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1794 1905
1795 # map plan: 1906 # map plan:
1796 # 1907 #
1811 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1812 $path = "$base/$path"; 1923 $path = "$base/$path";
1813 } 1924 }
1814 1925
1815 for ($path) { 1926 for ($path) {
1816 redo if s{//}{/};
1817 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1818 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1819 } 1929 }
1820 1930
1821 $path 1931 $path
1835 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1836 return $self; 1946 return $self;
1837 } 1947 }
1838 } 1948 }
1839 1949
1840 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1841 () 1951 ()
1842} 1952}
1843 1953
1844sub init { 1954sub init {
1845 my ($self) = @_; 1955 my ($self) = @_;
1867 1977
1868# the temporary/swap location 1978# the temporary/swap location
1869sub save_path { 1979sub save_path {
1870 my ($self) = @_; 1980 my ($self) = @_;
1871 1981
1872 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1982 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1873 "$TMPDIR/$path.map" 1983 "$TMPDIR/$path.map"
1874} 1984}
1875 1985
1876# the unique path, undef == no special unique path 1986# the unique path, undef == no special unique path
1877sub uniq_path { 1987sub uniq_path {
1878 my ($self) = @_; 1988 my ($self) = @_;
1879 1989
1880 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1990 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1881 "$UNIQUEDIR/$path" 1991 "$UNIQUEDIR/$path"
1882}
1883
1884# and all this just because we cannot iterate over
1885# all maps in C++...
1886sub change_all_map_light {
1887 my ($change) = @_;
1888
1889 $_->change_map_light ($change)
1890 for grep $_->outdoor, values %cf::MAP;
1891} 1992}
1892 1993
1893sub decay_objects { 1994sub decay_objects {
1894 my ($self) = @_; 1995 my ($self) = @_;
1895 1996
1977 2078
1978sub find; 2079sub find;
1979sub find { 2080sub find {
1980 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
1981 2082
2083 cf::cede_to_tick;
2084
1982 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
1983 2086
1984 cf::lock_wait "map_data:$path";#d#remove 2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1985 cf::lock_wait "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
1986 2089
1987 $cf::MAP{$path} || do { 2090 $cf::MAP{$path} || do {
1988 my $guard1 = cf::lock_acquire "map_find:$path";
1989 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1990
1991 my $map = new_from_path cf::map $path 2091 my $map = new_from_path cf::map $path
1992 or return; 2092 or return;
1993 2093
1994 $map->{last_save} = $cf::RUNTIME; 2094 $map->{last_save} = $cf::RUNTIME;
1995 2095
1997 or return; 2097 or return;
1998 2098
1999 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2099 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2000 # doing this can freeze the server in a sync job, obviously 2100 # doing this can freeze the server in a sync job, obviously
2001 #$cf::WAIT_FOR_TICK->wait; 2101 #$cf::WAIT_FOR_TICK->wait;
2102 undef $guard2;
2002 undef $guard1; 2103 undef $guard1;
2003 undef $guard2;
2004 $map->reset; 2104 $map->reset;
2005 return find $path; 2105 return find $path;
2006 } 2106 }
2007 2107
2008 $cf::MAP{$path} = $map 2108 $cf::MAP{$path} = $map
2009 } 2109 }
2010} 2110}
2011 2111
2012sub pre_load { } 2112sub pre_load { }
2013sub post_load { } 2113#sub post_load { } # XS
2014 2114
2015sub load { 2115sub load {
2016 my ($self) = @_; 2116 my ($self) = @_;
2017 2117
2018 local $self->{deny_reset} = 1; # loading can take a long time 2118 local $self->{deny_reset} = 1; # loading can take a long time
2035 my $f = new_from_file cf::object::thawer $self->{load_path}; 2135 my $f = new_from_file cf::object::thawer $self->{load_path};
2036 $f->skip_block; 2136 $f->skip_block;
2037 $self->_load_objects ($f) 2137 $self->_load_objects ($f)
2038 or return; 2138 or return;
2039 2139
2040 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2140 $self->post_load_original
2041 if delete $self->{load_original}; 2141 if delete $self->{load_original};
2042 2142
2043 if (my $uniq = $self->uniq_path) { 2143 if (my $uniq = $self->uniq_path) {
2044 utf8::encode $uniq; 2144 utf8::encode $uniq;
2045 unless (aio_stat $uniq) { 2145 unless (aio_stat $uniq) {
2063 unless ($self->{deny_activate}) { 2163 unless ($self->{deny_activate}) {
2064 $self->decay_objects; 2164 $self->decay_objects;
2065 $self->fix_auto_apply; 2165 $self->fix_auto_apply;
2066 $self->update_buttons; 2166 $self->update_buttons;
2067 cf::cede_to_tick; 2167 cf::cede_to_tick;
2068 $self->set_darkness_map;
2069 cf::cede_to_tick;
2070 $self->activate; 2168 $self->activate;
2071 } 2169 }
2072 2170
2073 $self->{last_save} = $cf::RUNTIME; 2171 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME); 2172 $self->last_access ($cf::RUNTIME);
2075 2173
2076 $self->in_memory (cf::MAP_IN_MEMORY); 2174 $self->in_memory (cf::MAP_ACTIVE);
2077 } 2175 }
2078 2176
2079 $self->post_load; 2177 $self->post_load;
2080}
2081 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
2082sub customise_for { 2185sub customise_for {
2083 my ($self, $ob) = @_; 2186 my ($self, $ob) = @_;
2084 2187
2085 return find "~" . $ob->name . "/" . $self->{path} 2188 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2189 if $self->per_player;
2102 or next; 2205 or next;
2103 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
2104 or next; 2207 or next;
2105 $neigh->load; 2208 $neigh->load;
2106 2209
2210 # now find the diagonal neighbours
2107 push @neigh, 2211 push @neigh,
2108 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2109 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2110 } 2214 }
2111 2215
2118} 2222}
2119 2223
2120sub find_sync { 2224sub find_sync {
2121 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
2122 2226
2123 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
2124} 2231}
2125 2232
2126sub do_load_sync { 2233sub do_load_sync {
2127 my ($map) = @_; 2234 my ($map) = @_;
2128 2235
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main; 2237 if $Coro::current == $Coro::main;
2131 2238
2132 cf::sync_job { $map->load }; 2239 $map->load;
2133} 2240}
2134 2241
2135our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
2136our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
2137 2244
2139 my ($path, $origin, $load) = @_; 2246 my ($path, $origin, $load) = @_;
2140 2247
2141 $path = normalise $path, $origin && $origin->{path}; 2248 $path = normalise $path, $origin && $origin->{path};
2142 2249
2143 if (my $map = $cf::MAP{$path}) { 2250 if (my $map = $cf::MAP{$path}) {
2144 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2251 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2145 } 2252 }
2146 2253
2147 $MAP_PREFETCH{$path} |= $load; 2254 $MAP_PREFETCH{$path} |= $load;
2148 2255
2149 $MAP_PREFETCHER ||= cf::async { 2256 $MAP_PREFETCHER ||= cf::async {
2163 $MAP_PREFETCHER->prio (6); 2270 $MAP_PREFETCHER->prio (6);
2164 2271
2165 () 2272 ()
2166} 2273}
2167 2274
2275# common code, used by both ->save and ->swapout
2168sub save { 2276sub _save {
2169 my ($self) = @_; 2277 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2278
2173 $self->{last_save} = $cf::RUNTIME; 2279 $self->{last_save} = $cf::RUNTIME;
2174 2280
2175 return unless $self->dirty; 2281 return unless $self->dirty;
2176 2282
2185 2291
2186 cf::async { 2292 cf::async {
2187 $Coro::current->{desc} = "map player save"; 2293 $Coro::current->{desc} = "map player save";
2188 $_->contr->save for $self->players; 2294 $_->contr->save for $self->players;
2189 }; 2295 };
2296
2297 cf::get_slot 0.02;
2190 2298
2191 if ($uniq) { 2299 if ($uniq) {
2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2300 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2193 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2301 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2194 } else { 2302 } else {
2195 $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);
2196 } 2304 }
2197} 2305}
2198 2306
2307sub save {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 $self->_save;
2313}
2314
2199sub swap_out { 2315sub swap_out {
2200 my ($self) = @_; 2316 my ($self) = @_;
2201 2317
2202 # save first because save cedes
2203 $self->save;
2204
2205 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2318 my $lock = cf::lock_acquire "map_data:$self->{path}";
2206 2319
2320 return if $self->in_memory != cf::MAP_ACTIVE;
2321 return if $self->{deny_save};
2207 return if $self->players; 2322 return if $self->players;
2208 return if $self->in_memory != cf::MAP_IN_MEMORY;
2209 return if $self->{deny_save};
2210 2323
2324 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP;
2211 $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};
2212 2374
2213 $self->deactivate; 2375 $self->deactivate;
2214 $_->clear_links_to ($self) for values %cf::MAP; 2376 $_->clear_links_to ($self) for values %cf::MAP;
2215 $self->clear; 2377 $self->clear;
2216}
2217
2218sub reset_at {
2219 my ($self) = @_;
2220
2221 # TODO: safety, remove and allow resettable per-player maps
2222 return 1e99 if $self->{deny_reset};
2223
2224 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2225 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2226
2227 $time + $to
2228}
2229
2230sub should_reset {
2231 my ($self) = @_;
2232
2233 $self->reset_at <= $cf::RUNTIME
2234}
2235
2236sub reset {
2237 my ($self) = @_;
2238
2239 my $lock = cf::lock_acquire "map_data:$self->{path}";
2240
2241 return if $self->players;
2242
2243 warn "resetting map ", $self->path;
2244
2245 $self->in_memory (cf::MAP_SWAPPED);
2246
2247 # need to save uniques path
2248 unless ($self->{deny_save}) {
2249 my $uniq = $self->uniq_path; utf8::encode $uniq;
2250
2251 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2252 if $uniq;
2253 }
2254
2255 delete $cf::MAP{$self->path};
2256
2257 $self->deactivate;
2258 $_->clear_links_to ($self) for values %cf::MAP;
2259 $self->clear;
2260 2378
2261 $self->unlink_save; 2379 $self->unlink_save;
2262 $self->destroy; 2380 $self->destroy;
2263} 2381}
2264 2382
2272 2390
2273 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
2274 2392
2275 $self->unlink_save; 2393 $self->unlink_save;
2276 2394
2277 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
2278 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
2279 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
2280 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
2281 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2282 2400
2331 2449
2332sub unique_maps() { 2450sub unique_maps() {
2333 [ 2451 [
2334 map { 2452 map {
2335 utf8::decode $_; 2453 utf8::decode $_;
2336 /\.map$/ 2454 s/\.map$//; # TODO future compatibility hack
2455 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2456 ? ()
2337 ? normalise $_ 2457 : normalise $_
2338 : ()
2339 } @{ aio_readdir $UNIQUEDIR or [] } 2458 } @{ aio_readdir $UNIQUEDIR or [] }
2340 ] 2459 ]
2341} 2460}
2342 2461
2343package 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}
2344 2493
2345=back 2494=back
2346 2495
2347=head3 cf::object 2496=head3 cf::object
2348 2497
2352 2501
2353=over 4 2502=over 4
2354 2503
2355=item $ob->inv_recursive 2504=item $ob->inv_recursive
2356 2505
2357Returns 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.
2358 2508
2359=cut 2509=cut
2360 2510
2361sub inv_recursive_; 2511sub inv_recursive_;
2362sub inv_recursive_ { 2512sub inv_recursive_ {
2367 inv_recursive_ inv $_[0] 2517 inv_recursive_ inv $_[0]
2368} 2518}
2369 2519
2370=item $ref = $ob->ref 2520=item $ref = $ob->ref
2371 2521
2372creates 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.
2373 2523
2374=item $ob = cf::object::deref ($refstring) 2524=item $ob = cf::object::deref ($refstring)
2375 2525
2376returns 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,
2377even if the object actually exists. May block. 2527even if the object actually exists. May block.
2409can 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
2410dialogue with the given NPC character. 2560dialogue with the given NPC character.
2411 2561
2412=cut 2562=cut
2413 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
2414# rough implementation of a future "reply" method that works 2578# rough implementation of a future "reply" method that works
2415# with dialog boxes. 2579# with dialog boxes.
2416#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
2417sub cf::object::player::reply($$$;$) { 2581sub cf::object::player::reply($$$;$) {
2418 my ($self, $npc, $msg, $flags) = @_; 2582 my ($self, $npc, $msg, $flags) = @_;
2429 my $dialog = $pl->{npc_dialog}; 2593 my $dialog = $pl->{npc_dialog};
2430 $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));
2431 2595
2432 } else { 2596 } else {
2433 $msg = $npc->name . " says: $msg" if $npc; 2597 $msg = $npc->name . " says: $msg" if $npc;
2434 $self->message ($msg, $flags); 2598 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2435 } 2599 }
2436 } 2600 }
2437} 2601}
2438 2602
2439=item $object->send_msg ($channel, $msg, $color, [extra...]) 2603=item $object->send_msg ($channel, $msg, $color, [extra...])
2464 2628
2465=item $player_object->enter_link 2629=item $player_object->enter_link
2466 2630
2467Freezes 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}>).
2468 2632
2469The 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.
2470I<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.
2471 2637
2472Will never block. 2638Will never block.
2473 2639
2474=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
2475 2641
2495sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2496 my ($self) = @_; 2662 my ($self) = @_;
2497 2663
2498 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2499 2665
2666 ++$self->{_link_recursion};
2667
2500 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2501 2669
2502 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2503 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2504 2672
2505 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2673 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2506} 2674}
2507 2675
2508sub cf::object::player::leave_link { 2676sub cf::object::player::leave_link {
2509 my ($self, $map, $x, $y) = @_; 2677 my ($self, $map, $x, $y) = @_;
2510 2678
2527 ($x, $y) = (-1, -1) 2695 ($x, $y) = (-1, -1)
2528 unless (defined $x) && (defined $y); 2696 unless (defined $x) && (defined $y);
2529 2697
2530 # use -1 or undef as default coordinates, not 0, 0 2698 # use -1 or undef as default coordinates, not 0, 0
2531 ($x, $y) = ($map->enter_x, $map->enter_y) 2699 ($x, $y) = ($map->enter_x, $map->enter_y)
2532 if $x <=0 && $y <= 0; 2700 if $x <= 0 && $y <= 0;
2533 2701
2534 $map->load; 2702 $map->load;
2535 $map->load_neighbours; 2703 $map->load_neighbours;
2536 2704
2537 return unless $self->contr->active; 2705 return unless $self->contr->active;
2538 $self->activate_recursive;
2539 2706
2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2541 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2542} 2709 # entering was successful
2710 delete $self->{_link_recursion};
2711 # only activate afterwards, to support waiting in hooks
2712 $self->activate_recursive;
2713 }
2543 2714
2715}
2716
2544=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)]])
2545 2718
2546Moves 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
2547her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2548that 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
2549the 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
2550be called at the end of this process. 2723be called at the end of this process.
2551 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
2552=cut 2728=cut
2553 2729
2554our $GOTOGEN; 2730our $GOTOGEN;
2555 2731
2556sub cf::object::player::goto { 2732sub cf::object::player::goto {
2557 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 }
2558 2740
2559 # 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
2560 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2561 2743
2562 $self->enter_link; 2744 $self->enter_link;
2586 my $map = eval { 2768 my $map = eval {
2587 my $map = defined $path ? cf::map::find $path : undef; 2769 my $map = defined $path ? cf::map::find $path : undef;
2588 2770
2589 if ($map) { 2771 if ($map) {
2590 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2591 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2592 } else { 2774 } else {
2593 $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);
2594 } 2776 }
2595 2777
2596 $map 2778 $map
2604 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2605 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2606 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2607 } 2789 }
2608 2790
2609 $done->() if $done; 2791 $done->($self) if $done;
2610 })->prio (1); 2792 })->prio (1);
2611} 2793}
2612 2794
2613=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2614 2796
2634} 2816}
2635 2817
2636sub prepare_random_map { 2818sub prepare_random_map {
2637 my ($exit) = @_; 2819 my ($exit) = @_;
2638 2820
2639 my $guard = cf::lock_acquire "exit_prepare:$exit";
2640
2641 # all this does is basically replace the /! path by 2821 # all this does is basically replace the /! path by
2642 # a new random map path (?random/...) with a seed 2822 # a new random map path (?random/...) with a seed
2643 # that depends on the exit object 2823 # that depends on the exit object
2644 2824
2645 my $rmp = parse_random_map_params $exit->msg; 2825 my $rmp = parse_random_map_params $exit->msg;
2647 if ($exit->map) { 2827 if ($exit->map) {
2648 $rmp->{region} = $exit->region->name; 2828 $rmp->{region} = $exit->region->name;
2649 $rmp->{origin_map} = $exit->map->path; 2829 $rmp->{origin_map} = $exit->map->path;
2650 $rmp->{origin_x} = $exit->x; 2830 $rmp->{origin_x} = $exit->x;
2651 $rmp->{origin_y} = $exit->y; 2831 $rmp->{origin_y} = $exit->y;
2832
2833 $exit->map->touch;
2652 } 2834 }
2653 2835
2654 $rmp->{random_seed} ||= $exit->random_seed; 2836 $rmp->{random_seed} ||= $exit->random_seed;
2655 2837
2656 my $data = cf::encode_json $rmp; 2838 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2657 my $md5 = Digest::MD5::md5_hex $data; 2839 my $md5 = Digest::MD5::md5_hex $data;
2658 my $meta = "$RANDOMDIR/$md5.meta"; 2840 my $meta = "$RANDOMDIR/$md5.meta";
2659 2841
2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2842 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2661 aio_write $fh, 0, (length $data), $data, 0; 2843 aio_write $fh, 0, (length $data), $data, 0;
2662 undef $fh; 2844 undef $fh;
2663 aio_rename "$meta~", $meta; 2845 aio_rename "$meta~", $meta;
2664 2846
2847 my $slaying = "?random/$md5";
2848
2849 if ($exit->valid) {
2665 $exit->slaying ("?random/$md5"); 2850 $exit->slaying ("?random/$md5");
2666 $exit->msg (undef); 2851 $exit->msg (undef);
2852 }
2667 } 2853 }
2668} 2854}
2669 2855
2670sub cf::object::player::enter_exit { 2856sub cf::object::player::enter_exit {
2671 my ($self, $exit) = @_; 2857 my ($self, $exit) = @_;
2672 2858
2673 return unless $self->type == cf::PLAYER; 2859 return unless $self->type == cf::PLAYER;
2674 2860
2675 if ($exit->slaying eq "/!") {
2676 #TODO: this should de-fi-ni-te-ly not be a sync-job
2677 # the problem is that $exit might not survive long enough
2678 # so it needs to be done right now, right here
2679 cf::sync_job { prepare_random_map $exit };
2680 }
2681
2682 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2683 my $hp = $exit->stats->hp;
2684 my $sp = $exit->stats->sp;
2685
2686 $self->enter_link; 2861 $self->enter_link;
2687 2862
2688 # if exit is damned, update players death & WoR home-position
2689 $self->contr->savebed ($slaying, $hp, $sp)
2690 if $exit->flag (FLAG_DAMNED);
2691
2692 (async { 2863 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2864 $Coro::current->{desc} = "enter_exit";
2694 2865
2695 $self->deactivate_recursive; # just to be sure
2696 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
2697 $self->goto ($slaying, $hp, $sp); 2881 $self->goto ($map, $x, $y);
2698 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
2699 1; 2887 1
2700 }) { 2888 }) {
2701 $self->message ("Something went wrong deep within the crossfire server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2702 . "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. "
2703 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2704 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2705 2893
2706 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2707 $self->leave_link; 2895 $self->leave_link;
2708 } 2896 }
2709 })->prio (1); 2897 })->prio (1);
2710} 2898}
2711 2899
2723sub cf::client::send_drawinfo { 2911sub cf::client::send_drawinfo {
2724 my ($self, $text, $flags) = @_; 2912 my ($self, $text, $flags) = @_;
2725 2913
2726 utf8::encode $text; 2914 utf8::encode $text;
2727 $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);
2728} 2941}
2729 2942
2730=item $client->send_msg ($channel, $msg, $color, [extra...]) 2943=item $client->send_msg ($channel, $msg, $color, [extra...])
2731 2944
2732Send 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
2736 2949
2737=cut 2950=cut
2738 2951
2739# non-persistent channels (usually the info channel) 2952# non-persistent channels (usually the info channel)
2740our %CHANNEL = ( 2953our %CHANNEL = (
2954 "c/motd" => {
2955 id => "infobox",
2956 title => "MOTD",
2957 reply => undef,
2958 tooltip => "The message of the day",
2959 },
2741 "c/identify" => { 2960 "c/identify" => {
2742 id => "infobox", 2961 id => "infobox",
2743 title => "Identify", 2962 title => "Identify",
2744 reply => undef, 2963 reply => undef,
2745 tooltip => "Items recently identified", 2964 tooltip => "Items recently identified",
2747 "c/examine" => { 2966 "c/examine" => {
2748 id => "infobox", 2967 id => "infobox",
2749 title => "Examine", 2968 title => "Examine",
2750 reply => undef, 2969 reply => undef,
2751 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",
2752 }, 2977 },
2753 "c/book" => { 2978 "c/book" => {
2754 id => "infobox", 2979 id => "infobox",
2755 title => "Book", 2980 title => "Book",
2756 reply => undef, 2981 reply => undef,
2772 id => "infobox", 2997 id => "infobox",
2773 title => "Body Parts", 2998 title => "Body Parts",
2774 reply => undef, 2999 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available", 3000 tooltip => "Shows which body parts you posess and are available",
2776 }, 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 },
2777 "c/uptime" => { 3038 "c/uptime" => {
2778 id => "infobox", 3039 id => "infobox",
2779 title => "Uptime", 3040 title => "Uptime",
2780 reply => undef, 3041 reply => undef,
2781 tooltip => "How long the server has been running since last restart", 3042 tooltip => "How long the server has been running since last restart",
2784 id => "infobox", 3045 id => "infobox",
2785 title => "Map Info", 3046 title => "Map Info",
2786 reply => undef, 3047 reply => undef,
2787 tooltip => "Information related to the maps", 3048 tooltip => "Information related to the maps",
2788 }, 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,
2789); 3064);
2790 3065
2791sub cf::client::send_msg { 3066sub cf::client::send_msg {
2792 my ($self, $channel, $msg, $color, @extra) = @_; 3067 my ($self, $channel, $msg, $color, @extra) = @_;
2793 3068
2794 $msg = $self->pl->expand_cfpod ($msg); 3069 $msg = $self->pl->expand_cfpod ($msg)
3070 unless $color & cf::NDI_VERBATIM;
2795 3071
2796 $color &= cf::NDI_CLIENT_MASK; # just in case... 3072 $color &= cf::NDI_CLIENT_MASK; # just in case...
2797 3073
2798 # check predefined channels, for the benefit of C 3074 # check predefined channels, for the benefit of C
2799 if ($CHANNEL{$channel}) { 3075 if ($CHANNEL{$channel}) {
2800 $channel = $CHANNEL{$channel}; 3076 $channel = $CHANNEL{$channel};
2801 3077
2802 $self->ext_msg (channel_info => $channel) 3078 $self->ext_msg (channel_info => $channel);
2803 if $self->can_msg;
2804
2805 $channel = $channel->{id}; 3079 $channel = $channel->{id};
2806 3080
2807 } elsif (ref $channel) { 3081 } elsif (ref $channel) {
2808 # send meta info to client, if not yet sent 3082 # send meta info to client, if not yet sent
2809 unless (exists $self->{channel}{$channel->{id}}) { 3083 unless (exists $self->{channel}{$channel->{id}}) {
2810 $self->{channel}{$channel->{id}} = $channel; 3084 $self->{channel}{$channel->{id}} = $channel;
2811 $self->ext_msg (channel_info => $channel) 3085 $self->ext_msg (channel_info => $channel);
2812 if $self->can_msg;
2813 } 3086 }
2814 3087
2815 $channel = $channel->{id}; 3088 $channel = $channel->{id};
2816 } 3089 }
2817 3090
2818 return unless @extra || length $msg; 3091 return unless @extra || length $msg;
2819 3092
2820 if ($self->can_msg) {
2821 # default colour, mask it out 3093 # default colour, mask it out
2822 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3094 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2823 if $color & cf::NDI_DEF; 3095 if $color & cf::NDI_DEF;
2824 3096
2825 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3097 my $pkt = "msg "
3098 . $self->{json_coder}->encode (
2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3099 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2827 } else { 3100 );
2828 if ($color >= 0) {
2829 # replace some tags by gcfclient-compatible ones
2830 for ($msg) {
2831 1 while
2832 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2833 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2834 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2835 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2836 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2837 }
2838 3101
2839 $color &= cf::NDI_COLOR_MASK; 3102 $self->send_big_packet ($pkt);
2840
2841 utf8::encode $msg;
2842
2843 if (0 && $msg =~ /\[/) {
2844 # COMMAND/INFO
2845 $self->send_packet ("drawextinfo $color 10 8 $msg")
2846 } else {
2847 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2848 $self->send_packet ("drawinfo $color $msg")
2849 }
2850 }
2851 }
2852} 3103}
2853 3104
2854=item $client->ext_msg ($type, @msg) 3105=item $client->ext_msg ($type, @msg)
2855 3106
2856Sends an ext event to the client. 3107Sends an ext event to the client.
2859 3110
2860sub cf::client::ext_msg($$@) { 3111sub cf::client::ext_msg($$@) {
2861 my ($self, $type, @msg) = @_; 3112 my ($self, $type, @msg) = @_;
2862 3113
2863 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2864 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2865 } elsif ($self->extcmd == 1) { # TODO: remove 3116 } elsif ($self->extcmd == 1) { # TODO: remove
2866 push @msg, msgtype => "event_$type"; 3117 push @msg, msgtype => "event_$type";
2867 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3118 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2868 } 3119 }
2869} 3120}
2870 3121
2871=item $client->ext_reply ($msgid, @msg) 3122=item $client->ext_reply ($msgid, @msg)
2872 3123
2876 3127
2877sub cf::client::ext_reply($$@) { 3128sub cf::client::ext_reply($$@) {
2878 my ($self, $id, @msg) = @_; 3129 my ($self, $id, @msg) = @_;
2879 3130
2880 if ($self->extcmd == 2) { 3131 if ($self->extcmd == 2) {
2881 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2882 } elsif ($self->extcmd == 1) { 3133 } elsif ($self->extcmd == 1) {
2883 #TODO: version 1, remove 3134 #TODO: version 1, remove
2884 unshift @msg, msgtype => "reply", msgid => $id; 3135 unshift @msg, msgtype => "reply", msgid => $id;
2885 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2886 } 3137 }
2887} 3138}
2888 3139
2889=item $success = $client->query ($flags, "text", \&cb) 3140=item $success = $client->query ($flags, "text", \&cb)
2890 3141
2961 3212
2962 $ns->ext_reply ($reply, @reply) 3213 $ns->ext_reply ($reply, @reply)
2963 if $reply; 3214 if $reply;
2964 3215
2965 } else { 3216 } else {
2966 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";
2967 } 3218 }
2968 3219
2969 cf::override; 3220 cf::override;
2970 }, 3221 },
2971); 3222);
2991 3242
2992 $coro 3243 $coro
2993} 3244}
2994 3245
2995cf::client->attach ( 3246cf::client->attach (
2996 on_destroy => sub { 3247 on_client_destroy => sub {
2997 my ($ns) = @_; 3248 my ($ns) = @_;
2998 3249
2999 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3250 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3000 }, 3251 },
3001); 3252);
3017our $safe_hole = new Safe::Hole; 3268our $safe_hole = new Safe::Hole;
3018 3269
3019$SIG{FPE} = 'IGNORE'; 3270$SIG{FPE} = 'IGNORE';
3020 3271
3021$safe->permit_only (Opcode::opset qw( 3272$safe->permit_only (Opcode::opset qw(
3022 :base_core :base_mem :base_orig :base_math 3273 :base_core :base_mem :base_orig :base_math :base_loop
3023 grepstart grepwhile mapstart mapwhile 3274 grepstart grepwhile mapstart mapwhile
3024 sort time 3275 sort time
3025)); 3276));
3026 3277
3027# here we export the classes and methods available to script code 3278# here we export the classes and methods available to script code
3030 3281
3031The following functions and methods are available within a safe environment: 3282The following functions and methods are available within a safe environment:
3032 3283
3033 cf::object 3284 cf::object
3034 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
3035 insert remove name archname title slaying race decrease_ob_nr 3286 insert remove name archname title slaying race decrease split
3287 value
3036 3288
3037 cf::object::player 3289 cf::object::player
3038 player 3290 player
3039 3291
3040 cf::player 3292 cf::player
3045 3297
3046=cut 3298=cut
3047 3299
3048for ( 3300for (
3049 ["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
3050 insert remove inv name archname title slaying race 3302 insert remove inv nrof name archname title slaying race
3051 decrease_ob_nr destroy)], 3303 decrease split destroy change_exp value msg lore send_msg)],
3052 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
3053 ["cf::player" => qw(peaceful)], 3305 ["cf::player" => qw(peaceful send_msg)],
3054 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
3055) { 3307) {
3056 no strict 'refs';
3057 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
3058 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3059 for @funs; 3310 for @funs;
3060} 3311}
3061 3312
3076 3327
3077 my $qcode = $code; 3328 my $qcode = $code;
3078 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3329 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3079 $qcode =~ s/\n/\\n/g; 3330 $qcode =~ s/\n/\\n/g;
3080 3331
3332 %vars = (_dummy => 0) unless %vars;
3333
3334 my @res;
3081 local $_; 3335 local $_;
3082 local @safe::cf::_safe_eval_args = values %vars;
3083 3336
3084 my $eval = 3337 my $eval =
3085 "do {\n" 3338 "do {\n"
3086 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3339 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3087 . "#line 0 \"{$qcode}\"\n" 3340 . "#line 0 \"{$qcode}\"\n"
3088 . $code 3341 . $code
3089 . "\n}" 3342 . "\n}"
3090 ; 3343 ;
3091 3344
3345 if ($CFG{safe_eval}) {
3092 sub_generation_inc; 3346 sub_generation_inc;
3347 local @safe::cf::_safe_eval_args = values %vars;
3093 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3348 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3094 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 }
3095 3354
3096 if ($@) { 3355 if ($@) {
3097 warn "$@"; 3356 warn "$@",
3098 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
3099 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
3100 } 3359 }
3101 3360
3102 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
3103} 3362}
3104 3363
3118=cut 3377=cut
3119 3378
3120sub register_script_function { 3379sub register_script_function {
3121 my ($fun, $cb) = @_; 3380 my ($fun, $cb) = @_;
3122 3381
3123 no strict 'refs'; 3382 $fun = "safe::$fun" if $CFG{safe_eval};
3124 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3383 *$fun = $safe_hole->wrap ($cb);
3125} 3384}
3126 3385
3127=back 3386=back
3128 3387
3129=cut 3388=cut
3138 # for this (global event?) 3397 # for this (global event?)
3139 %ext::player_env::MUSIC_FACE_CACHE = (); 3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3140 3399
3141 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3142 3401
3143 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
3144 3403
3145 my $facedata;
3146 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
3147 or die "$path: $!"; 3405 or die "$path: $!";
3148 3406
3149 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
3150 3408
3151 $facedata->{version} == 2 3409 $facedata->{version} == 2
3152 or cf::cleanup "$path: version mismatch, cannot proceed."; 3410 or cf::cleanup "$path: version mismatch, cannot proceed.";
3153 3411
3154 # 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]);
3155 $facedata->{resource}{"res/exp_table"} = { 3414 $facedata->{resource}{"res/exp_table"} = {
3156 type => FT_RSRC, 3415 type => FT_RSRC,
3157 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),
3158 }; 3418 };
3159 cf::cede_to_tick; 3419 cf::cede_to_tick;
3160 3420
3161 { 3421 {
3162 my $faces = $facedata->{faceinfo}; 3422 my $faces = $facedata->{faceinfo};
3164 while (my ($face, $info) = each %$faces) { 3424 while (my ($face, $info) = each %$faces) {
3165 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3425 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3166 3426
3167 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
3168 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
3169 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3170 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3171 3431
3172 cf::cede_to_tick; 3432 cf::cede_to_tick;
3173 } 3433 }
3174 3434
3175 while (my ($face, $info) = each %$faces) { 3435 while (my ($face, $info) = each %$faces) {
3180 3440
3181 if (my $smooth = cf::face::find $info->{smooth}) { 3441 if (my $smooth = cf::face::find $info->{smooth}) {
3182 cf::face::set_smooth $idx, $smooth; 3442 cf::face::set_smooth $idx, $smooth;
3183 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3443 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3184 } else { 3444 } else {
3185 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3445 error "smooth face '$info->{smooth}' not found for face '$face'";
3186 } 3446 }
3187 3447
3188 cf::cede_to_tick; 3448 cf::cede_to_tick;
3189 } 3449 }
3190 } 3450 }
3199 3459
3200 cf::anim::invalidate_all; # d'oh 3460 cf::anim::invalidate_all; # d'oh
3201 } 3461 }
3202 3462
3203 { 3463 {
3204 # TODO: for gcfclient pleasure, we should give resources
3205 # that gcfclient doesn't grok a >10000 face index.
3206 my $res = $facedata->{resource}; 3464 my $res = $facedata->{resource};
3207 3465
3208 while (my ($name, $info) = each %$res) { 3466 while (my ($name, $info) = each %$res) {
3209 if (defined $info->{type}) { 3467 if (defined $info->{type}) {
3210 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3468 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3211 my $data;
3212 3469
3213 if ($info->{type} & 1) { 3470 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3214 # prepend meta info
3215
3216 my $meta = $enc->encode ({
3217 name => $name,
3218 %{ $info->{meta} || {} },
3219 });
3220
3221 $data = pack "(w/a*)*", $meta, $info->{data};
3222 } else {
3223 $data = $info->{data};
3224 }
3225
3226 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3227 cf::face::set_type $idx, $info->{type}; 3471 cf::face::set_type $idx, $info->{type};
3228 } else { 3472 } else {
3229 $RESOURCE{$name} = $info; 3473 $RESOURCE{$name} = $info; # unused
3230 } 3474 }
3231 3475
3232 cf::cede_to_tick; 3476 cf::cede_to_tick;
3233 } 3477 }
3234 } 3478 }
3235 3479
3236 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3480 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3237 3481
3238 1 3482 1
3239} 3483}
3240
3241cf::global->attach (on_resource_update => sub {
3242 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3243 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3244
3245 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3246 my $sound = $soundconf->{compat}[$_]
3247 or next;
3248
3249 my $face = cf::face::find "sound/$sound->[1]";
3250 cf::sound::set $sound->[0] => $face;
3251 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3252 }
3253
3254 while (my ($k, $v) = each %{$soundconf->{event}}) {
3255 my $face = cf::face::find "sound/$v";
3256 cf::sound::set $k => $face;
3257 }
3258 }
3259});
3260 3484
3261register_exticmd fx_want => sub { 3485register_exticmd fx_want => sub {
3262 my ($ns, $want) = @_; 3486 my ($ns, $want) = @_;
3263 3487
3264 while (my ($k, $v) = each %$want) { 3488 while (my ($k, $v) = each %$want) {
3265 $ns->fx_want ($k, $v); 3489 $ns->fx_want ($k, $v);
3266 } 3490 }
3267}; 3491};
3492
3493sub load_resource_file($) {
3494 my $guard = lock_acquire "load_resource_file";
3495
3496 my $status = load_resource_file_ $_[0];
3497 get_slot 0.1, 100;
3498 cf::arch::commit_load;
3499
3500 $status
3501}
3268 3502
3269sub reload_regions { 3503sub reload_regions {
3270 # HACK to clear player env face cache, we need some signal framework 3504 # HACK to clear player env face cache, we need some signal framework
3271 # for this (global event?) 3505 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = (); 3506 %ext::player_env::MUSIC_FACE_CACHE = ();
3286} 3520}
3287 3521
3288sub reload_archetypes { 3522sub reload_archetypes {
3289 load_resource_file "$DATADIR/archetypes" 3523 load_resource_file "$DATADIR/archetypes"
3290 or die "unable to load archetypes\n"; 3524 or die "unable to load archetypes\n";
3291 #d# NEED to laod twice to resolve forward references
3292 # this really needs to be done in an extra post-pass
3293 # (which needs to be synchronous, so solve it differently)
3294 load_resource_file "$DATADIR/archetypes"
3295 or die "unable to load archetypes\n";
3296} 3525}
3297 3526
3298sub reload_treasures { 3527sub reload_treasures {
3299 load_resource_file "$DATADIR/treasures" 3528 load_resource_file "$DATADIR/treasures"
3300 or die "unable to load treasurelists\n"; 3529 or die "unable to load treasurelists\n";
3301} 3530}
3302 3531
3532sub reload_sound {
3533 trace "loading sound config from $DATADIR/sound\n";
3534
3535 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3536 or die "$DATADIR/sound $!";
3537
3538 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3539
3540 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3541 my $sound = $soundconf->{compat}[$_]
3542 or next;
3543
3544 my $face = cf::face::find "sound/$sound->[1]";
3545 cf::sound::set $sound->[0] => $face;
3546 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3547 }
3548
3549 while (my ($k, $v) = each %{$soundconf->{event}}) {
3550 my $face = cf::face::find "sound/$v";
3551 cf::sound::set $k => $face;
3552 }
3553}
3554
3303sub reload_resources { 3555sub reload_resources {
3304 warn "reloading resource files...\n"; 3556 trace "reloading resource files...\n";
3305 3557
3558 reload_exp_table;
3559 reload_materials;
3560 reload_facedata;
3561 reload_sound;
3562 reload_archetypes;
3306 reload_regions; 3563 reload_regions;
3307 reload_facedata;
3308 #reload_archetypes;#d#
3309 reload_archetypes;
3310 reload_treasures; 3564 reload_treasures;
3311 3565
3312 warn "finished reloading resource files\n"; 3566 trace "finished reloading resource files\n";
3313}
3314
3315sub init {
3316 reload_resources;
3317} 3567}
3318 3568
3319sub reload_config { 3569sub reload_config {
3320 open my $fh, "<:utf8", "$CONFDIR/config" 3570 trace "reloading config file...\n";
3321 or return;
3322 3571
3323 local $/; 3572 0 < aio_load "$CONFDIR/config", my $config
3324 *CFG = YAML::Load <$fh>; 3573 or die "$CONFDIR/config: $!";
3325 3574
3575 utf8::decode $config;
3576 *CFG = yaml_load $config;
3577
3326 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3578 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3327 3579
3328 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3580 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3329 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3581 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3330 3582
3331 if (exists $CFG{mlockall}) { 3583 if (exists $CFG{mlockall}) {
3335 }; 3587 };
3336 warn $@ if $@; 3588 warn $@ if $@;
3337 } 3589 }
3338} 3590}
3339 3591
3592sub pidfile() {
3593 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3594 or die "$PIDFILE: $!";
3595 flock $fh, &Fcntl::LOCK_EX
3596 or die "$PIDFILE: flock: $!";
3597 $fh
3598}
3599
3600# make sure only one server instance is running at any one time
3601sub atomic {
3602 my $fh = pidfile;
3603
3604 my $pid = <$fh>;
3605 kill 9, $pid if $pid > 0;
3606
3607 seek $fh, 0, 0;
3608 print $fh $$;
3609}
3610
3611sub main_loop {
3612 trace "EV::loop starting\n";
3613 if (1) {
3614 EV::loop;
3615 }
3616 trace "EV::loop returned\n";
3617 goto &main_loop unless $REALLY_UNLOOP;
3618}
3619
3340sub main { 3620sub main {
3621 cf::init_globals; # initialise logging
3622
3623 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3624 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3625 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3626 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3627
3628 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3629
3341 # we must not ever block the main coroutine 3630 # we must not ever block the main coroutine
3342 local $Coro::idle = sub { 3631 local $Coro::idle = sub {
3343 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3632 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3344 (async { 3633 (async {
3345 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3634 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT; 3635 EV::loop EV::LOOP_ONESHOT;
3347 })->prio (Coro::PRIO_MAX); 3636 })->prio (Coro::PRIO_MAX);
3348 }; 3637 };
3349 3638
3639 evthread_start IO::AIO::poll_fileno;
3640
3641 cf::sync_job {
3642 cf::incloader::init ();
3643
3644 cf::init_anim;
3645 cf::init_attackmess;
3646 cf::init_dynamic;
3647
3648 cf::load_settings;
3649
3650 reload_resources;
3350 reload_config; 3651 reload_config;
3351 db_init; 3652 db_init;
3653
3654 cf::init_uuid;
3655 cf::init_signals;
3656 cf::init_skills;
3657
3658 cf::init_beforeplay;
3659
3660 atomic;
3661
3352 load_extensions; 3662 load_extensions;
3353 3663
3354 $TICK_WATCHER->start; 3664 utime time, time, $RUNTIMEFILE;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3665
3356 EV::loop; 3666 # no (long-running) fork's whatsoever before this point(!)
3667 use POSIX ();
3668 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3669
3670 cf::_post_init 0;
3671 };
3672
3673 cf::object::thawer::errors_are_fatal 0;
3674 info "parse errors in files are no longer fatal from this point on.\n";
3675
3676 my $free_main; $free_main = EV::idle sub {
3677 undef $free_main;
3678 undef &main; # free gobs of memory :)
3679 };
3680
3681 goto &main_loop;
3357} 3682}
3358 3683
3359############################################################################# 3684#############################################################################
3360# initialisation and cleanup 3685# initialisation and cleanup
3361 3686
3362# install some emergency cleanup handlers 3687# install some emergency cleanup handlers
3363BEGIN { 3688BEGIN {
3364 our %SIGWATCHER = (); 3689 our %SIGWATCHER = ();
3365 for my $signal (qw(INT HUP TERM)) { 3690 for my $signal (qw(INT HUP TERM)) {
3366 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3691 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3367 cf::cleanup "SIG$signal"; 3692 cf::cleanup "SIG$signal";
3368 }; 3693 };
3369 } 3694 }
3370} 3695}
3371 3696
3372sub write_runtime { 3697sub write_runtime_sync {
3373 my $runtime = "$LOCALDIR/runtime"; 3698 my $t0 = AE::time;
3374 3699
3375 # first touch the runtime file to show we are still running: 3700 # first touch the runtime file to show we are still running:
3376 # the fsync below can take a very very long time. 3701 # the fsync below can take a very very long time.
3377 3702
3378 IO::AIO::aio_utime $runtime, undef, undef; 3703 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3379 3704
3380 my $guard = cf::lock_acquire "write_runtime"; 3705 my $guard = cf::lock_acquire "write_runtime";
3381 3706
3382 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3707 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3383 or return; 3708 or return;
3384 3709
3385 my $value = $cf::RUNTIME + 90 + 10; 3710 my $value = $cf::RUNTIME + 90 + 10;
3386 # 10 is the runtime save interval, for a monotonic clock 3711 # 10 is the runtime save interval, for a monotonic clock
3387 # 60 allows for the watchdog to kill the server. 3712 # 60 allows for the watchdog to kill the server.
3397 aio_utime $fh, undef, undef; 3722 aio_utime $fh, undef, undef;
3398 3723
3399 close $fh 3724 close $fh
3400 or return; 3725 or return;
3401 3726
3402 aio_rename "$runtime~", $runtime 3727 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3403 and return; 3728 and return;
3404 3729
3405 warn "runtime file written.\n"; 3730 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3406 3731
3407 1 3732 1
3733}
3734
3735our $uuid_lock;
3736our $uuid_skip;
3737
3738sub write_uuid_sync($) {
3739 $uuid_skip ||= $_[0];
3740
3741 return if $uuid_lock;
3742 local $uuid_lock = 1;
3743
3744 my $uuid = "$LOCALDIR/uuid";
3745
3746 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3747 or return;
3748
3749 my $value = uuid_seq uuid_cur;
3750
3751 unless ($value) {
3752 info "cowardly refusing to write zero uuid value!\n";
3753 return;
3754 }
3755
3756 my $value = uuid_str $value + $uuid_skip;
3757 $uuid_skip = 0;
3758
3759 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3760 and return;
3761
3762 # always fsync - this file is important
3763 aio_fsync $fh
3764 and return;
3765
3766 close $fh
3767 or return;
3768
3769 aio_rename "$uuid~", $uuid
3770 and return;
3771
3772 trace "uuid file written ($value).\n";
3773
3774 1
3775
3776}
3777
3778sub write_uuid($$) {
3779 my ($skip, $sync) = @_;
3780
3781 $sync ? write_uuid_sync $skip
3782 : async { write_uuid_sync $skip };
3408} 3783}
3409 3784
3410sub emergency_save() { 3785sub emergency_save() {
3411 my $freeze_guard = cf::freeze_mainloop; 3786 my $freeze_guard = cf::freeze_mainloop;
3412 3787
3413 warn "enter emergency perl save\n"; 3788 info "emergency_perl_save: enter\n";
3789
3790 # this is a trade-off: we want to be very quick here, so
3791 # save all maps without fsync, and later call a global sync
3792 # (which in turn might be very very slow)
3793 local $USE_FSYNC = 0;
3414 3794
3415 cf::sync_job { 3795 cf::sync_job {
3796 cf::write_runtime_sync; # external watchdog should not bark
3797
3416 # use a peculiar iteration method to avoid tripping on perl 3798 # use a peculiar iteration method to avoid tripping on perl
3417 # refcount bugs in for. also avoids problems with players 3799 # refcount bugs in for. also avoids problems with players
3418 # and maps saved/destroyed asynchronously. 3800 # and maps saved/destroyed asynchronously.
3419 warn "begin emergency player save\n"; 3801 info "emergency_perl_save: begin player save\n";
3420 for my $login (keys %cf::PLAYER) { 3802 for my $login (keys %cf::PLAYER) {
3421 my $pl = $cf::PLAYER{$login} or next; 3803 my $pl = $cf::PLAYER{$login} or next;
3422 $pl->valid or next; 3804 $pl->valid or next;
3423 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3805 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3424 $pl->save; 3806 $pl->save;
3425 } 3807 }
3426 warn "end emergency player save\n"; 3808 info "emergency_perl_save: end player save\n";
3427 3809
3428 warn "begin emergency map save\n"; 3810 cf::write_runtime_sync; # external watchdog should not bark
3811
3812 info "emergency_perl_save: begin map save\n";
3429 for my $path (keys %cf::MAP) { 3813 for my $path (keys %cf::MAP) {
3430 my $map = $cf::MAP{$path} or next; 3814 my $map = $cf::MAP{$path} or next;
3431 $map->valid or next; 3815 $map->valid or next;
3432 $map->save; 3816 $map->save;
3433 } 3817 }
3434 warn "end emergency map save\n"; 3818 info "emergency_perl_save: end map save\n";
3435 3819
3436 warn "begin emergency database checkpoint\n"; 3820 cf::write_runtime_sync; # external watchdog should not bark
3821
3822 info "emergency_perl_save: begin database checkpoint\n";
3437 BDB::db_env_txn_checkpoint $DB_ENV; 3823 BDB::db_env_txn_checkpoint $DB_ENV;
3438 warn "end emergency database checkpoint\n"; 3824 info "emergency_perl_save: end database checkpoint\n";
3825
3826 info "emergency_perl_save: begin write uuid\n";
3827 write_uuid_sync 1;
3828 info "emergency_perl_save: end write uuid\n";
3829
3830 cf::write_runtime_sync; # external watchdog should not bark
3831
3832 trace "emergency_perl_save: syncing database to disk";
3833 BDB::db_env_txn_checkpoint $DB_ENV;
3834
3835 info "emergency_perl_save: starting sync\n";
3836 IO::AIO::aio_sync sub {
3837 info "emergency_perl_save: finished sync\n";
3838 };
3839
3840 cf::write_runtime_sync; # external watchdog should not bark
3841
3842 trace "emergency_perl_save: flushing outstanding aio requests";
3843 while (IO::AIO::nreqs || BDB::nreqs) {
3844 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3845 }
3846
3847 cf::write_runtime_sync; # external watchdog should not bark
3439 }; 3848 };
3440 3849
3441 warn "leave emergency perl save\n"; 3850 info "emergency_perl_save: leave\n";
3442} 3851}
3443 3852
3444sub post_cleanup { 3853sub post_cleanup {
3445 my ($make_core) = @_; 3854 my ($make_core) = @_;
3446 3855
3856 IO::AIO::flush;
3857
3447 warn Carp::longmess "post_cleanup backtrace" 3858 error Carp::longmess "post_cleanup backtrace"
3448 if $make_core; 3859 if $make_core;
3860
3861 my $fh = pidfile;
3862 unlink $PIDFILE if <$fh> == $$;
3863}
3864
3865# a safer delete_package, copied from Symbol
3866sub clear_package($) {
3867 my $pkg = shift;
3868
3869 # expand to full symbol table name if needed
3870 unless ($pkg =~ /^main::.*::$/) {
3871 $pkg = "main$pkg" if $pkg =~ /^::/;
3872 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3873 $pkg .= '::' unless $pkg =~ /::$/;
3874 }
3875
3876 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3877 my $stem_symtab = *{$stem}{HASH};
3878
3879 defined $stem_symtab and exists $stem_symtab->{$leaf}
3880 or return;
3881
3882 # clear all symbols
3883 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3884 for my $name (keys %$leaf_symtab) {
3885 _gv_clear *{"$pkg$name"};
3886# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3887 }
3449} 3888}
3450 3889
3451sub do_reload_perl() { 3890sub do_reload_perl() {
3452 # can/must only be called in main 3891 # can/must only be called in main
3453 if ($Coro::current != $Coro::main) { 3892 unless (in_main) {
3454 warn "can only reload from main coroutine"; 3893 error "can only reload from main coroutine";
3455 return; 3894 return;
3456 } 3895 }
3457 3896
3458 warn "reloading..."; 3897 return if $RELOAD++;
3459 3898
3460 warn "entering sync_job"; 3899 my $t1 = AE::time;
3461 3900
3901 while ($RELOAD) {
3902 cf::get_slot 0.1, -1, "reload_perl";
3903 info "perl_reload: reloading...";
3904
3905 trace "perl_reload: entering sync_job";
3906
3462 cf::sync_job { 3907 cf::sync_job {
3463 cf::write_runtime; # external watchdog should not bark
3464 cf::emergency_save; 3908 #cf::emergency_save;
3465 cf::write_runtime; # external watchdog should not bark
3466 3909
3467 warn "syncing database to disk";
3468 BDB::db_env_txn_checkpoint $DB_ENV;
3469
3470 # if anything goes wrong in here, we should simply crash as we already saved
3471
3472 warn "flushing outstanding aio requests";
3473 for (;;) {
3474 BDB::flush;
3475 IO::AIO::flush;
3476 Coro::cede_notself;
3477 last unless IO::AIO::nreqs || BDB::nreqs;
3478 warn "iterate...";
3479 }
3480
3481 ++$RELOAD;
3482
3483 warn "cancelling all extension coros"; 3910 trace "perl_reload: cancelling all extension coros";
3484 $_->cancel for values %EXT_CORO; 3911 $_->cancel for values %EXT_CORO;
3485 %EXT_CORO = (); 3912 %EXT_CORO = ();
3486 3913
3487 warn "removing commands"; 3914 trace "perl_reload: removing commands";
3488 %COMMAND = (); 3915 %COMMAND = ();
3489 3916
3490 warn "removing ext/exti commands"; 3917 trace "perl_reload: removing ext/exti commands";
3491 %EXTCMD = (); 3918 %EXTCMD = ();
3492 %EXTICMD = (); 3919 %EXTICMD = ();
3493 3920
3494 warn "unloading/nuking all extensions"; 3921 trace "perl_reload: unloading/nuking all extensions";
3495 for my $pkg (@EXTS) { 3922 for my $pkg (@EXTS) {
3496 warn "... unloading $pkg"; 3923 trace "... unloading $pkg";
3497 3924
3498 if (my $cb = $pkg->can ("unload")) { 3925 if (my $cb = $pkg->can ("unload")) {
3499 eval { 3926 eval {
3500 $cb->($pkg); 3927 $cb->($pkg);
3501 1 3928 1
3502 } or warn "$pkg unloaded, but with errors: $@"; 3929 } or error "$pkg unloaded, but with errors: $@";
3930 }
3931
3932 trace "... clearing $pkg";
3933 clear_package $pkg;
3503 } 3934 }
3504 3935
3505 warn "... nuking $pkg";
3506 Symbol::delete_package $pkg;
3507 }
3508
3509 warn "unloading all perl modules loaded from $LIBDIR"; 3936 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3510 while (my ($k, $v) = each %INC) { 3937 while (my ($k, $v) = each %INC) {
3511 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3938 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3512 3939
3513 warn "... unloading $k"; 3940 trace "... unloading $k";
3514 delete $INC{$k}; 3941 delete $INC{$k};
3515 3942
3516 $k =~ s/\.pm$//; 3943 $k =~ s/\.pm$//;
3517 $k =~ s/\//::/g; 3944 $k =~ s/\//::/g;
3518 3945
3519 if (my $cb = $k->can ("unload_module")) { 3946 if (my $cb = $k->can ("unload_module")) {
3520 $cb->(); 3947 $cb->();
3948 }
3949
3950 clear_package $k;
3521 } 3951 }
3522 3952
3523 Symbol::delete_package $k;
3524 }
3525
3526 warn "getting rid of safe::, as good as possible"; 3953 trace "perl_reload: getting rid of safe::, as good as possible";
3527 Symbol::delete_package "safe::$_" 3954 clear_package "safe::$_"
3528 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3955 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3529 3956
3530 warn "unloading cf.pm \"a bit\""; 3957 trace "perl_reload: unloading cf.pm \"a bit\"";
3531 delete $INC{"cf.pm"}; 3958 delete $INC{"cf.pm"};
3532 delete $INC{"cf/pod.pm"}; 3959 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3533 3960
3534 # don't, removes xs symbols, too, 3961 # don't, removes xs symbols, too,
3535 # and global variables created in xs 3962 # and global variables created in xs
3536 #Symbol::delete_package __PACKAGE__; 3963 #clear_package __PACKAGE__;
3537 3964
3538 warn "unload completed, starting to reload now"; 3965 info "perl_reload: unload completed, starting to reload now";
3539 3966
3540 warn "reloading cf.pm"; 3967 trace "perl_reload: reloading cf.pm";
3541 require cf; 3968 require cf;
3542 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3969 cf::_connect_to_perl_1;
3543 3970
3544 warn "loading config and database again"; 3971 trace "perl_reload: loading config and database again";
3545 cf::reload_config; 3972 cf::reload_config;
3546 3973
3547 warn "loading extensions"; 3974 trace "perl_reload: loading extensions";
3548 cf::load_extensions; 3975 cf::load_extensions;
3549 3976
3977 if ($REATTACH_ON_RELOAD) {
3550 warn "reattaching attachments to objects/players"; 3978 trace "perl_reload: reattaching attachments to objects/players";
3551 _global_reattach; # objects, sockets 3979 _global_reattach; # objects, sockets
3552 warn "reattaching attachments to maps"; 3980 trace "perl_reload: reattaching attachments to maps";
3553 reattach $_ for values %MAP; 3981 reattach $_ for values %MAP;
3554 warn "reattaching attachments to players"; 3982 trace "perl_reload: reattaching attachments to players";
3555 reattach $_ for values %PLAYER; 3983 reattach $_ for values %PLAYER;
3984 }
3556 3985
3557 warn "leaving sync_job"; 3986 cf::_post_init 1;
3558 3987
3988 trace "perl_reload: leaving sync_job";
3989
3559 1 3990 1
3560 } or do { 3991 } or do {
3561 warn $@; 3992 error $@;
3562 cf::cleanup "error while reloading, exiting."; 3993 cf::cleanup "perl_reload: error, exiting.";
3994 };
3995
3996 --$RELOAD;
3563 }; 3997 }
3564 3998
3565 warn "reloaded"; 3999 $t1 = AE::time - $t1;
4000 info "perl_reload: completed in ${t1}s\n";
3566}; 4001};
3567 4002
3568our $RELOAD_WATCHER; # used only during reload 4003our $RELOAD_WATCHER; # used only during reload
3569 4004
3570sub reload_perl() { 4005sub reload_perl() {
3571 # doing reload synchronously and two reloads happen back-to-back, 4006 # doing reload synchronously and two reloads happen back-to-back,
3572 # coro crashes during coro_state_free->destroy here. 4007 # coro crashes during coro_state_free->destroy here.
3573 4008
4009 $RELOAD_WATCHER ||= cf::async {
4010 Coro::AIO::aio_wait cache_extensions;
4011
3574 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4012 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3575 do_reload_perl; 4013 do_reload_perl;
3576 undef $RELOAD_WATCHER; 4014 undef $RELOAD_WATCHER;
4015 };
3577 }; 4016 };
3578} 4017}
3579 4018
3580register_command "reload" => sub { 4019register_command "reload" => sub {
3581 my ($who, $arg) = @_; 4020 my ($who, $arg) = @_;
3587 reload_perl; 4026 reload_perl;
3588 }; 4027 };
3589 } 4028 }
3590}; 4029};
3591 4030
3592unshift @INC, $LIBDIR; 4031#############################################################################
3593 4032
3594my $bug_warning = 0; 4033my $bug_warning = 0;
3595 4034
3596our @WAIT_FOR_TICK; 4035our @WAIT_FOR_TICK;
3597our @WAIT_FOR_TICK_BEGIN; 4036our @WAIT_FOR_TICK_BEGIN;
3598 4037
3599sub wait_for_tick { 4038sub wait_for_tick() {
3600 return unless $TICK_WATCHER->is_active;
3601 return if $Coro::current == $Coro::main; 4039 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3602 4040
3603 my $signal = new Coro::Signal; 4041 my $signal = new Coro::Signal;
3604 push @WAIT_FOR_TICK, $signal; 4042 push @WAIT_FOR_TICK, $signal;
3605 $signal->wait; 4043 $signal->wait;
3606} 4044}
3607 4045
3608sub wait_for_tick_begin { 4046sub wait_for_tick_begin() {
3609 return unless $TICK_WATCHER->is_active;
3610 return if $Coro::current == $Coro::main; 4047 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3611 4048
3612 my $signal = new Coro::Signal; 4049 my $signal = new Coro::Signal;
3613 push @WAIT_FOR_TICK_BEGIN, $signal; 4050 push @WAIT_FOR_TICK_BEGIN, $signal;
3614 $signal->wait; 4051 $signal->wait;
3615} 4052}
3616 4053
3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4054sub tick {
3618 if ($Coro::current != $Coro::main) { 4055 if ($Coro::current != $Coro::main) {
3619 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4056 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3620 unless ++$bug_warning > 10; 4057 unless ++$bug_warning > 10;
3621 return; 4058 return;
3622 } 4059 }
3623 4060
3624 $NOW = $tick_start = EV::now;
3625
3626 cf::server_tick; # one server iteration 4061 cf::server_tick; # one server iteration
3627 4062
3628 $RUNTIME += $TICK; 4063 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3629 $NEXT_TICK = $_[0]->at;
3630 4064
3631 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4065 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4066 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3633 Coro::async_pool { 4067 Coro::async_pool {
3634 $Coro::current->{desc} = "runtime saver"; 4068 $Coro::current->{desc} = "runtime saver";
3635 write_runtime 4069 write_runtime_sync
3636 or warn "ERROR: unable to write runtime file: $!"; 4070 or error "ERROR: unable to write runtime file: $!";
3637 }; 4071 };
3638 } 4072 }
3639 4073
3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4074 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3641 $sig->send; 4075 $sig->send;
3642 } 4076 }
3643 while (my $sig = shift @WAIT_FOR_TICK) { 4077 while (my $sig = shift @WAIT_FOR_TICK) {
3644 $sig->send; 4078 $sig->send;
3645 } 4079 }
3646 4080
3647 $LOAD = ($NOW - $tick_start) / $TICK; 4081 $LOAD = ($NOW - $TICK_START) / $TICK;
3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4082 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3649 4083
3650 _post_tick; 4084 if (0) {
3651}; 4085 if ($NEXT_TICK) {
3652$TICK_WATCHER->priority (EV::MAXPRI); 4086 my $jitter = $TICK_START - $NEXT_TICK;
4087 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4088 debug "jitter $JITTER\n";#d#
4089 }
4090 }
4091}
3653 4092
3654{ 4093{
3655 # configure BDB 4094 # configure BDB
3656 4095
3657 BDB::min_parallel 8; 4096 BDB::min_parallel 16;
3658 BDB::max_poll_reqs $TICK * 0.1; 4097 BDB::max_poll_reqs $TICK * 0.1;
3659 $Coro::BDB::WATCHER->priority (1); 4098 $AnyEvent::BDB::WATCHER->priority (1);
3660 4099
3661 unless ($DB_ENV) { 4100 unless ($DB_ENV) {
3662 $DB_ENV = BDB::db_env_create; 4101 $DB_ENV = BDB::db_env_create;
3663 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4102 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3664 | BDB::LOG_AUTOREMOVE, 1); 4103 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4104 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3665 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4105 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3666 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4106 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3667 4107
3668 cf::sync_job { 4108 cf::sync_job {
3669 eval { 4109 eval {
3695{ 4135{
3696 # configure IO::AIO 4136 # configure IO::AIO
3697 4137
3698 IO::AIO::min_parallel 8; 4138 IO::AIO::min_parallel 8;
3699 IO::AIO::max_poll_time $TICK * 0.1; 4139 IO::AIO::max_poll_time $TICK * 0.1;
3700 $Coro::AIO::WATCHER->priority (1); 4140 undef $AnyEvent::AIO::WATCHER;
3701} 4141}
3702 4142
3703my $_log_backtrace; 4143our $_log_backtrace;
4144our $_log_backtrace_last;
3704 4145
3705sub _log_backtrace { 4146sub _log_backtrace {
3706 my ($msg, @addr) = @_; 4147 my ($msg, @addr) = @_;
3707 4148
3708 $msg =~ s/\n//; 4149 $msg =~ s/\n$//;
3709 4150
4151 if ($_log_backtrace_last eq $msg) {
4152 LOG llevInfo, "[ABT] $msg\n";
4153 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3710 # limit the # of concurrent backtraces 4154 # limit the # of concurrent backtraces
3711 if ($_log_backtrace < 2) { 4155 } elsif ($_log_backtrace < 2) {
4156 $_log_backtrace_last = $msg;
3712 ++$_log_backtrace; 4157 ++$_log_backtrace;
4158 my $perl_bt = Carp::longmess $msg;
3713 async { 4159 async {
3714 $Coro::current->{desc} = "abt $msg"; 4160 $Coro::current->{desc} = "abt $msg";
3715 4161
3716 my @bt = fork_call { 4162 my @bt = fork_call {
3717 @addr = map { sprintf "%x", $_ } @addr; 4163 @addr = map { sprintf "%x", $_ } @addr;
3728 } 4174 }
3729 4175
3730 @funcs 4176 @funcs
3731 }; 4177 };
3732 4178
3733 LOG llevInfo, "[ABT] $msg\n"; 4179 LOG llevInfo, "[ABT] $perl_bt\n";
4180 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3734 LOG llevInfo, "[ABT] $_\n" for @bt; 4181 LOG llevInfo, "[ABT] $_\n" for @bt;
3735 --$_log_backtrace; 4182 --$_log_backtrace;
3736 }; 4183 };
3737 } else { 4184 } else {
3738 LOG llevInfo, "[ABT] $msg\n"; 4185 LOG llevInfo, "[ABT] $msg\n";
3739 LOG llevInfo, "[ABT] [suppressed]\n"; 4186 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3740 } 4187 }
3741} 4188}
3742 4189
3743# load additional modules 4190# load additional modules
3744use cf::pod; 4191require "cf/$_.pm" for @EXTRA_MODULES;
4192cf::_connect_to_perl_2;
3745 4193
3746END { cf::emergency_save } 4194END { cf::emergency_save }
3747 4195
37481 41961
3749 4197

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines