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.410 by root, Tue Jan 15 12:02:24 2008 UTC vs.
Revision 1.557 by root, Tue Oct 5 21:40:05 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines