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.414 by root, Thu Apr 10 09:10:45 2008 UTC vs.
Revision 1.555 by root, Wed Jun 30 01:32:56 2010 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines