ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.398 by root, Wed Dec 5 11:08:34 2007 UTC vs.
Revision 1.547 by root, Sun May 9 22:51:13 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines