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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines