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.417 by root, Fri Apr 11 14:09:57 2008 UTC vs.
Revision 1.549 by root, Tue May 11 13:19:59 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
301=item cf::lock_wait $string 388=item cf::lock_wait $string
302 389
303Wait until the given lock is available. See cf::lock_acquire. 390Wait until the given lock is available. See cf::lock_acquire.
304 391
305=item my $lock = cf::lock_acquire $string 392=item my $lock = cf::lock_acquire $string
306 393
307Wait until the given lock is available and then acquires it and returns 394Wait 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, 395a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 396for example when the coroutine gets canceled), the lock is automatically
310returned. 397returned.
311 398
312Locks are *not* recursive, locking from the same coro twice results in a 399Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 400deadlocked coro.
… …
319 406
320Return true if the lock is currently active, i.e. somebody has locked it. 407Return true if the lock is currently active, i.e. somebody has locked it.
321 408
322=cut 409=cut
323 410
324our %LOCK; 411our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 412
327sub lock_wait($) { 413sub lock_wait($) {
328 my ($key) = @_; 414 $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} 415}
341 416
342sub lock_acquire($) { 417sub lock_acquire($) {
343 my ($key) = @_; 418 $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} 419}
357 420
358sub lock_active($) { 421sub lock_active($) {
359 my ($key) = @_; 422 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 423}
363 424
364sub freeze_mainloop { 425sub freeze_mainloop {
365 tick_inhibit_inc; 426 tick_inhibit_inc;
366 427
367 Coro::guard \&tick_inhibit_dec; 428 &Guard::guard (\&tick_inhibit_dec);
368} 429}
369 430
370=item cf::periodic $interval, $cb 431=item cf::periodic $interval, $cb
371 432
372Like EV::periodic, but randomly selects a starting point so that the actions 433Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer. 434get spread over time.
374 435
375=cut 436=cut
376 437
377sub periodic($$) { 438sub periodic($$) {
378 my ($interval, $cb) = @_; 439 my ($interval, $cb) = @_;
… …
395 456
396=cut 457=cut
397 458
398our @SLOT_QUEUE; 459our @SLOT_QUEUE;
399our $SLOT_QUEUE; 460our $SLOT_QUEUE;
461our $SLOT_DECAY = 0.9;
400 462
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 463$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 464$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 465 $Coro::current->desc ("timeslot manager");
404 466
405 my $signal = new Coro::Signal; 467 my $signal = new Coro::Signal;
468 my $busy;
406 469
407 while () { 470 while () {
408 next_job: 471 next_job:
472
409 my $avail = cf::till_tick; 473 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 474
411 for (0 .. $#SLOT_QUEUE) { 475 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 476 if ($SLOT_QUEUE[$_][0] <= $avail) {
477 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 478 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 479 $job->[2]->send;
415 Coro::cede; 480 Coro::cede;
416 goto next_job; 481 goto next_job;
417 } 482 } else {
483 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 484 }
419 } 485 }
420 486
421 if (@SLOT_QUEUE) { 487 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 488 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 489 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 490 $signal->wait;
425 } else { 491 } else {
492 $busy = 0;
426 Coro::schedule; 493 Coro::schedule;
427 } 494 }
428 } 495 }
429}; 496};
430 497
431sub get_slot($;$$) { 498sub get_slot($;$$) {
499 return if tick_inhibit || $Coro::current == $Coro::main;
500
432 my ($time, $pri, $name) = @_; 501 my ($time, $pri, $name) = @_;
433 502
434 $time = $TICK * .6 if $time > $TICK * .6; 503 $time = clamp $time, 0.01, $TICK * .6;
504
435 my $sig = new Coro::Signal; 505 my $sig = new Coro::Signal;
436 506
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 507 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 508 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready; 509 $SLOT_QUEUE->ready;
… …
465=cut 535=cut
466 536
467sub sync_job(&) { 537sub sync_job(&) {
468 my ($job) = @_; 538 my ($job) = @_;
469 539
470 if ($Coro::current == $Coro::main) { 540 if (in_main) {
471 my $time = EV::time; 541 my $time = AE::time;
472 542
473 # this is the main coro, too bad, we have to block 543 # this is the main coro, too bad, we have to block
474 # till the operation succeeds, freezing the server :/ 544 # till the operation succeeds, freezing the server :/
475 545
476 LOG llevError, Carp::longmess "sync job";#d# 546 #LOG llevError, Carp::longmess "sync job";#d#
477 547
478 my $freeze_guard = freeze_mainloop; 548 my $freeze_guard = freeze_mainloop;
479 549
480 my $busy = 1; 550 my $busy = 1;
481 my @res; 551 my @res;
482 552
483 (async { 553 (async {
484 $Coro::current->desc ("sync job coro"); 554 $Coro::current->desc ("sync job coro");
485 @res = eval { $job->() }; 555 @res = eval { $job->() };
486 warn $@ if $@; 556 error $@ if $@;
487 undef $busy; 557 undef $busy;
488 })->prio (Coro::PRIO_MAX); 558 })->prio (Coro::PRIO_MAX);
489 559
490 while ($busy) { 560 while ($busy) {
491 if (Coro::nready) { 561 if (Coro::nready) {
… …
493 } else { 563 } else {
494 EV::loop EV::LOOP_ONESHOT; 564 EV::loop EV::LOOP_ONESHOT;
495 } 565 }
496 } 566 }
497 567
498 my $time = EV::time - $time; 568 my $time = AE::time - $time;
499 569
500 $TICK_START += $time; # do not account sync jobs to server load 570 $TICK_START += $time; # do not account sync jobs to server load
501 571
502 wantarray ? @res : $res[0] 572 wantarray ? @res : $res[0]
503 } else { 573 } else {
… …
525 $EXT_CORO{$coro+0} = $coro; 595 $EXT_CORO{$coro+0} = $coro;
526 596
527 $coro 597 $coro
528} 598}
529 599
530=item fork_call { }, $args 600=item fork_call { }, @args
531 601
532Executes the given code block with the given arguments in a seperate 602Executes the given code block with the given arguments in a seperate
533process, returning the results. Everything must be serialisable with 603process, returning the results. Everything must be serialisable with
534Coro::Storable. May, of course, block. Note that the executed sub may 604Coro::Storable. May, of course, block. Note that the executed sub may
535never block itself or use any form of event handling. 605never block itself or use any form of event handling.
536 606
537=cut 607=cut
538 608
609sub post_fork {
610 reset_signals;
611}
612
539sub fork_call(&@) { 613sub fork_call(&@) {
540 my ($cb, @args) = @_; 614 my ($cb, @args) = @_;
541 615
542 # we seemingly have to make a local copy of the whole thing, 616 # we seemingly have to make a local copy of the whole thing,
543 # otherwise perl prematurely frees the stuff :/ 617 # otherwise perl prematurely frees the stuff :/
544 # TODO: investigate and fix (likely this will be rather laborious) 618 # TODO: investigate and fix (likely this will be rather laborious)
545 619
546 my @res = Coro::Util::fork_eval { 620 my @res = Coro::Util::fork_eval {
547 reset_signals; 621 cf::post_fork;
548 &$cb 622 &$cb
549 }, @args; 623 } @args;
550 624
551 wantarray ? @res : $res[-1] 625 wantarray ? @res : $res[-1]
626}
627
628sub objinfo {
629 (
630 "counter value" => cf::object::object_count,
631 "objects created" => cf::object::create_count,
632 "objects destroyed" => cf::object::destroy_count,
633 "freelist size" => cf::object::free_count,
634 "allocated objects" => cf::object::objects_size,
635 "active objects" => cf::object::actives_size,
636 )
552} 637}
553 638
554=item $coin = coin_from_name $name 639=item $coin = coin_from_name $name
555 640
556=cut 641=cut
… …
593within each server. 678within each server.
594 679
595=cut 680=cut
596 681
597sub db_table($) { 682sub db_table($) {
683 cf::error "db_get called from main context"
684 if $Coro::current == $Coro::main;
685
598 my ($name) = @_; 686 my ($name) = @_;
599 my $db = BDB::db_create $DB_ENV; 687 my $db = BDB::db_create $DB_ENV;
600 688
601 eval { 689 eval {
602 $db->set_flags (BDB::CHKSUM); 690 $db->set_flags (BDB::CHKSUM);
… …
612} 700}
613 701
614our $DB; 702our $DB;
615 703
616sub db_init { 704sub db_init {
617 cf::sync_job {
618 $DB ||= db_table "db"; 705 $DB ||= db_table "db";
619 };
620} 706}
621 707
622sub db_get($$) { 708sub db_get($$) {
623 my $key = "$_[0]/$_[1]"; 709 my $key = "$_[0]/$_[1]";
624 710
625 cf::sync_job { 711 cf::error "db_get called from main context"
712 if $Coro::current == $Coro::main;
713
626 BDB::db_get $DB, undef, $key, my $data; 714 BDB::db_get $DB, undef, $key, my $data;
627 715
628 $! ? () 716 $! ? ()
629 : $data 717 : $data
630 }
631} 718}
632 719
633sub db_put($$$) { 720sub db_put($$$) {
634 BDB::dbreq_pri 4; 721 BDB::dbreq_pri 4;
635 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 722 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
691 778
692 my $t1 = Time::HiRes::time; 779 my $t1 = Time::HiRes::time;
693 my $data = $process->(\@data); 780 my $data = $process->(\@data);
694 my $t2 = Time::HiRes::time; 781 my $t2 = Time::HiRes::time;
695 782
696 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 783 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
697 784
698 db_put cache => "$id/data", $data; 785 db_put cache => "$id/data", $data;
699 db_put cache => "$id/md5" , $md5; 786 db_put cache => "$id/md5" , $md5;
700 db_put cache => "$id/meta", $meta; 787 db_put cache => "$id/meta", $meta;
701 788
… …
711 798
712=cut 799=cut
713 800
714sub datalog($@) { 801sub datalog($@) {
715 my ($type, %kv) = @_; 802 my ($type, %kv) = @_;
716 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 803 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
717} 804}
718 805
719=back 806=back
720 807
721=cut 808=cut
722 809
723############################################################################# 810#############################################################################
724 811
725=head2 ATTACHABLE OBJECTS 812=head2 ATTACHABLE OBJECTS
726 813
727Many objects in crossfire are so-called attachable objects. That means you can 814Many objects in deliantra are so-called attachable objects. That means you can
728attach callbacks/event handlers (a collection of which is called an "attachment") 815attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 816to it. All such attachable objects support the following methods.
730 817
731In the following description, CLASS can be any of C<global>, C<object> 818In the following description, CLASS can be any of C<global>, C<object>
732C<player>, C<client> or C<map> (i.e. the attachable objects in 819C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
782=item cf::CLASS::attachment $name, ... 869=item cf::CLASS::attachment $name, ...
783 870
784Register an attachment by C<$name> through which attachable objects of the 871Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 872given CLASS can refer to this attachment.
786 873
787Some classes such as crossfire maps and objects can specify attachments 874Some classes such as deliantra maps and objects can specify attachments
788that are attached at load/instantiate time, thus the need for a name. 875that are attached at load/instantiate time, thus the need for a name.
789 876
790These calls expect any number of the following handler/hook descriptions: 877These calls expect any number of the following handler/hook descriptions:
791 878
792=over 4 879=over 4
… …
916 1003
917 } elsif (exists $cb_id{$type}) { 1004 } elsif (exists $cb_id{$type}) {
918 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1005 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
919 1006
920 } elsif (ref $type) { 1007 } elsif (ref $type) {
921 warn "attaching objects not supported, ignoring.\n"; 1008 error "attaching objects not supported, ignoring.\n";
922 1009
923 } else { 1010 } else {
924 shift @arg; 1011 shift @arg;
925 warn "attach argument '$type' not supported, ignoring.\n"; 1012 error "attach argument '$type' not supported, ignoring.\n";
926 } 1013 }
927 } 1014 }
928} 1015}
929 1016
930sub _object_attach { 1017sub _object_attach {
… …
940 _attach $registry, $klass, @attach; 1027 _attach $registry, $klass, @attach;
941 } 1028 }
942 1029
943 $obj->{$name} = \%arg; 1030 $obj->{$name} = \%arg;
944 } else { 1031 } else {
945 warn "object uses attachment '$name' which is not available, postponing.\n"; 1032 info "object uses attachment '$name' which is not available, postponing.\n";
946 } 1033 }
947 1034
948 $obj->{_attachment}{$name} = undef; 1035 $obj->{_attachment}{$name} = undef;
949} 1036}
950 1037
… …
1009 1096
1010 for (@$callbacks) { 1097 for (@$callbacks) {
1011 eval { &{$_->[1]} }; 1098 eval { &{$_->[1]} };
1012 1099
1013 if ($@) { 1100 if ($@) {
1014 warn "$@";
1015 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1101 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1016 override; 1102 override;
1017 } 1103 }
1018 1104
1019 return 1 if $override; 1105 return 1 if $override;
1020 } 1106 }
… …
1083 1169
1084sub reattach { 1170sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1171 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1172 my ($obj) = @_;
1087 1173
1174 # no longer needed after getting rid of delete_package?
1088 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1175 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1089 1176
1090 my $registry = $obj->registry; 1177 my $registry = $obj->registry;
1091 1178
1092 @$registry = (); 1179 @$registry = ();
1093 1180
… …
1098 for (@$attach) { 1185 for (@$attach) {
1099 my ($klass, @attach) = @$_; 1186 my ($klass, @attach) = @$_;
1100 _attach $registry, $klass, @attach; 1187 _attach $registry, $klass, @attach;
1101 } 1188 }
1102 } else { 1189 } else {
1103 warn "object uses attachment '$name' that is not available, postponing.\n"; 1190 info "object uses attachment '$name' that is not available, postponing.\n";
1104 } 1191 }
1105 } 1192 }
1106} 1193}
1107 1194
1108cf::attachable->attach ( 1195cf::attachable->attach (
… …
1135 my ($filename, $rdata, $objs) = @_; 1222 my ($filename, $rdata, $objs) = @_;
1136 1223
1137 sync_job { 1224 sync_job {
1138 if (length $$rdata) { 1225 if (length $$rdata) {
1139 utf8::decode (my $decname = $filename); 1226 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1227 trace sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1228 $decname, length $$rdata, scalar @$objs
1229 if $VERBOSE_IO;
1142 1230
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1231 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1232 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1233 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1234 if ($cf::USE_FSYNC) {
1235 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;
1236 aio_fsync $fh;
1237 }
1147 close $fh; 1238 aio_close $fh;
1148 1239
1149 if (@$objs) { 1240 if (@$objs) {
1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1241 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1151 chmod SAVE_MODE, $fh; 1242 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1243 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1244 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1245 if ($cf::USE_FSYNC) {
1246 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;
1247 aio_fsync $fh;
1248 }
1155 close $fh; 1249 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1250 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1251 }
1158 } else { 1252 } else {
1159 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1160 } 1254 }
1161 1255
1162 aio_rename "$filename~", $filename; 1256 aio_rename "$filename~", $filename;
1257
1258 $filename =~ s%/[^/]+$%%;
1259 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1260 } else {
1164 warn "FATAL: $filename~: $!\n"; 1261 error "unable to save objects: $filename~: $!\n";
1165 } 1262 }
1166 } else { 1263 } else {
1167 aio_unlink $filename; 1264 aio_unlink $filename;
1168 aio_unlink "$filename.pst"; 1265 aio_unlink "$filename.pst";
1169 } 1266 }
… …
1193 my $st = eval { Coro::Storable::thaw $av }; 1290 my $st = eval { Coro::Storable::thaw $av };
1194 $av = $st->{objs}; 1291 $av = $st->{objs};
1195 } 1292 }
1196 1293
1197 utf8::decode (my $decname = $filename); 1294 utf8::decode (my $decname = $filename);
1198 warn sprintf "loading %s (%d,%d)\n", 1295 trace sprintf "loading %s (%d,%d)\n",
1199 $decname, length $data, scalar @{$av || []}; 1296 $decname, length $data, scalar @{$av || []}
1297 if $VERBOSE_IO;
1200 1298
1201 ($data, $av) 1299 ($data, $av)
1202} 1300}
1203 1301
1204=head2 COMMAND CALLBACKS 1302=head2 COMMAND CALLBACKS
… …
1260 my ($name, $cb) = @_; 1358 my ($name, $cb) = @_;
1261 1359
1262 $EXTICMD{$name} = $cb; 1360 $EXTICMD{$name} = $cb;
1263} 1361}
1264 1362
1363use File::Glob ();
1364
1265cf::player->attach ( 1365cf::player->attach (
1266 on_command => sub { 1366 on_unknown_command => sub {
1267 my ($pl, $name, $params) = @_; 1367 my ($pl, $name, $params) = @_;
1268 1368
1269 my $cb = $COMMAND{$name} 1369 my $cb = $COMMAND{$name}
1270 or return; 1370 or return;
1271 1371
… …
1294 1394
1295 $pl->ext_reply ($reply, @reply) 1395 $pl->ext_reply ($reply, @reply)
1296 if $reply; 1396 if $reply;
1297 1397
1298 } else { 1398 } else {
1299 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1399 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1300 } 1400 }
1301 1401
1302 cf::override; 1402 cf::override;
1303 }, 1403 },
1304); 1404);
1305 1405
1406# "readahead" all extensions
1407sub cache_extensions {
1408 my $grp = IO::AIO::aio_group;
1409
1410 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1411 for (grep /\.ext$/, @{$_[0]}) {
1412 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1413 }
1414 };
1415
1416 $grp
1417}
1418
1306sub load_extensions { 1419sub load_extensions {
1420 info "loading extensions...";
1421
1307 cf::sync_job { 1422 cf::sync_job {
1308 my %todo; 1423 my %todo;
1309 1424
1310 for my $path (<$LIBDIR/*.ext>) { 1425 for my $path (<$LIBDIR/*.ext>) {
1311 next unless -r $path; 1426 next unless -r $path;
… …
1329 1444
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1445 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1446 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1447
1333 $ext{source} = 1448 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1449 "package $pkg; use common::sense;\n"
1335 . "#line 1 \"$path\"\n{\n" 1450 . "#line 1 \"$path\"\n{\n"
1336 . $source 1451 . $source
1337 . "\n};\n1"; 1452 . "\n};\n1";
1338 1453
1339 $todo{$base} = \%ext; 1454 $todo{$base} = \%ext;
1340 } 1455 }
1341 1456
1457 my $pass = 0;
1342 my %done; 1458 my %done;
1343 while (%todo) { 1459 while (%todo) {
1344 my $progress; 1460 my $progress;
1345 1461
1462 ++$pass;
1463
1464 ext:
1346 while (my ($k, $v) = each %todo) { 1465 while (my ($k, $v) = each %todo) {
1347 for (split /,\s*/, $v->{meta}{depends}) { 1466 for (split /,\s*/, $v->{meta}{depends}) {
1348 goto skip 1467 next ext
1349 unless exists $done{$_}; 1468 unless exists $done{$_};
1350 } 1469 }
1351 1470
1352 warn "... loading '$k' into '$v->{pkg}'\n"; 1471 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1353 1472
1354 unless (eval $v->{source}) { 1473 my $active = eval $v->{source};
1474
1475 if (length $@) {
1355 my $msg = $@ ? "$v->{path}: $@\n" 1476 error "$v->{path}: $@\n";
1356 : "$v->{base}: extension inactive.\n";
1357 1477
1358 if (exists $v->{meta}{mandatory}) {
1359 warn $msg;
1360 cf::cleanup "mandatory extension failed to load, exiting."; 1478 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1361 } 1479 if exists $v->{meta}{mandatory};
1362 1480
1363 warn $msg; 1481 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1482 delete $todo{$k};
1483 } else {
1484 $done{$k} = delete $todo{$k};
1485 push @EXTS, $v->{pkg};
1486 $progress = 1;
1487
1488 info "$v->{base}: extension inactive.\n"
1489 unless $active;
1364 } 1490 }
1365
1366 $done{$k} = delete $todo{$k};
1367 push @EXTS, $v->{pkg};
1368 $progress = 1;
1369 } 1491 }
1370 1492
1371 skip: 1493 unless ($progress) {
1372 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1494 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1373 unless $progress; 1495
1496 while (my ($k, $v) = each %todo) {
1497 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1498 if exists $v->{meta}{mandatory};
1499 }
1500 }
1374 } 1501 }
1375 }; 1502 };
1376} 1503}
1377 1504
1378############################################################################# 1505#############################################################################
1379 1506
1380=back 1507=back
1381 1508
1382=head2 CORE EXTENSIONS 1509=head2 CORE EXTENSIONS
1383 1510
1384Functions and methods that extend core crossfire objects. 1511Functions and methods that extend core deliantra objects.
1385 1512
1386=cut 1513=cut
1387 1514
1388package cf::player; 1515package cf::player;
1389 1516
… …
1432 1559
1433sub exists($) { 1560sub exists($) {
1434 my ($login) = @_; 1561 my ($login) = @_;
1435 1562
1436 $cf::PLAYER{$login} 1563 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1564 or !aio_stat path $login
1438} 1565}
1439 1566
1440sub find($) { 1567sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1568 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1569 my $login = $_[0];
… …
1454 my $f = new_from_file cf::object::thawer path $login 1581 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1582 or return;
1456 1583
1457 my $pl = cf::player::load_pl $f 1584 my $pl = cf::player::load_pl $f
1458 or return; 1585 or return;
1586
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1587 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1588 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1589 $cf::PLAYER{$login} = $pl
1462 } 1590 }
1463 } 1591 }
1464} 1592}
1465 1593
1594cf::player->attach (
1595 on_load => sub {
1596 my ($pl, $path) = @_;
1597
1598 # restore slots saved in save, below
1599 my $slots = delete $pl->{_slots};
1600
1601 $pl->ob->current_weapon ($slots->[0]);
1602 $pl->combat_ob ($slots->[1]);
1603 $pl->ranged_ob ($slots->[2]);
1604 },
1605);
1606
1466sub save($) { 1607sub save($) {
1467 my ($pl) = @_; 1608 my ($pl) = @_;
1468 1609
1469 return if $pl->{deny_save}; 1610 return if $pl->{deny_save};
1470 1611
… …
1473 1614
1474 return if $pl->{deny_save}; 1615 return if $pl->{deny_save};
1475 1616
1476 aio_mkdir playerdir $pl, 0770; 1617 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1618 $pl->{last_save} = $cf::RUNTIME;
1619
1620 cf::get_slot 0.01;
1621
1622 # save slots, to be restored later
1623 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1478 1624
1479 $pl->save_pl ($path); 1625 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1626 cf::cede_to_tick;
1481} 1627}
1482 1628
… …
1514 my ($pl) = @_; 1660 my ($pl) = @_;
1515 1661
1516 my $name = $pl->ob->name; 1662 my $name = $pl->ob->name;
1517 1663
1518 $pl->{deny_save} = 1; 1664 $pl->{deny_save} = 1;
1519 $pl->password ("*"); # this should lock out the player until we nuked the dir 1665 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1520 1666
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1522 $pl->deactivate; 1668 $pl->deactivate;
1669
1670 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1671 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1672 ext::highscore::check ($pl->ob);
1673
1524 $pl->ns->destroy if $pl->ns; 1674 $pl->ns->destroy if $pl->ns;
1525 1675
1526 my $path = playerdir $pl; 1676 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1677 my $temp = "$path~$cf::RUNTIME~deleting~";
1528 aio_rename $path, $temp; 1678 aio_rename $path, $temp;
… …
1566 1716
1567 for my $login (@$dirs) { 1717 for my $login (@$dirs) {
1568 my $path = path $login; 1718 my $path = path $login;
1569 1719
1570 # a .pst is a dead give-away for a valid player 1720 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1721 # if no pst file found, open and chekc for blocked users
1722 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1723 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1724 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1725 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1726 }
1576 1727
… …
1580 1731
1581 \@logins 1732 \@logins
1582} 1733}
1583 1734
1584=item $player->maps 1735=item $player->maps
1736
1737=item cf::player::maps $login
1585 1738
1586Returns an arrayref of map paths that are private for this 1739Returns an arrayref of map paths that are private for this
1587player. May block. 1740player. May block.
1588 1741
1589=cut 1742=cut
… …
1607 } 1760 }
1608 1761
1609 \@paths 1762 \@paths
1610} 1763}
1611 1764
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1765=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1766
1614Expand crossfire pod fragments into protocol xml. 1767Expand deliantra pod fragments into protocol xml.
1615
1616=cut
1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1629sub expand_cfpod {
1630 my ($self, $pod) = @_;
1631
1632 my $xml;
1633
1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group;
1642 } elsif ($pod =~ m%\G
1643 ([BCGHITU])
1644 <
1645 (?:
1646 ([^<>]*) (?{ $group = $^N })
1647 | < $interior >
1648 )
1649 >
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "")
1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1694
1695 $xml
1696}
1697
1698no re 'eval';
1699
1700sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode}
1703}
1704 1768
1705=item $player->ext_reply ($msgid, @msg) 1769=item $player->ext_reply ($msgid, @msg)
1706 1770
1707Sends an ext reply to the player. 1771Sends an ext reply to the player.
1708 1772
… …
1740 1804
1741=cut 1805=cut
1742 1806
1743sub find_by_path($) { 1807sub find_by_path($) {
1744 my ($path) = @_; 1808 my ($path) = @_;
1809
1810 $path =~ s/^~[^\/]*//; # skip ~login
1745 1811
1746 my ($match, $specificity); 1812 my ($match, $specificity);
1747 1813
1748 for my $region (list) { 1814 for my $region (list) {
1749 if ($region->{match} && $path =~ $region->{match}) { 1815 if ($region->{match} && $path =~ $region->{match}) {
… …
1775our $MAX_RESET = 3600; 1841our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 1842our $DEFAULT_RESET = 3000;
1777 1843
1778sub generate_random_map { 1844sub generate_random_map {
1779 my ($self, $rmp) = @_; 1845 my ($self, $rmp) = @_;
1846
1847 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1848
1780 # mit "rum" bekleckern, nicht 1849 # mit "rum" bekleckern, nicht
1781 $self->_create_random_map ( 1850 $self->_create_random_map (
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1851 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1852 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1853 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1785 $rmp->{exit_on_final_map}, 1854 $rmp->{exit_on_final_map},
1786 $rmp->{xsize}, $rmp->{ysize}, 1855 $rmp->{xsize}, $rmp->{ysize},
1787 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1856 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1788 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1857 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1803 1872
1804sub register { 1873sub register {
1805 my (undef, $regex, $prio) = @_; 1874 my (undef, $regex, $prio) = @_;
1806 my $pkg = caller; 1875 my $pkg = caller;
1807 1876
1808 no strict;
1809 push @{"$pkg\::ISA"}, __PACKAGE__; 1877 push @{"$pkg\::ISA"}, __PACKAGE__;
1810 1878
1811 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1879 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1812} 1880}
1813 1881
1814# also paths starting with '/' 1882# also paths starting with '/'
1815$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1883$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1816 1884
1817sub thawer_merge { 1885sub thawer_merge {
1818 my ($self, $merge) = @_; 1886 my ($self, $merge) = @_;
1819 1887
1820 # we have to keep some variables in memory intact 1888 # we have to keep some variables in memory intact
… …
1825} 1893}
1826 1894
1827sub normalise { 1895sub normalise {
1828 my ($path, $base) = @_; 1896 my ($path, $base) = @_;
1829 1897
1830 $path = "$path"; # make sure its a string 1898 $path = "$path"; # make sure it's a string
1831 1899
1832 $path =~ s/\.map$//; 1900 $path =~ s/\.map$//;
1833 1901
1834 # map plan: 1902 # map plan:
1835 # 1903 #
… …
1874 $self->init; # pass $1 etc. 1942 $self->init; # pass $1 etc.
1875 return $self; 1943 return $self;
1876 } 1944 }
1877 } 1945 }
1878 1946
1879 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1947 Carp::cluck "unable to resolve path '$path' (base '$base')";
1880 () 1948 ()
1881} 1949}
1882 1950
1883sub init { 1951sub init {
1884 my ($self) = @_; 1952 my ($self) = @_;
… …
1906 1974
1907# the temporary/swap location 1975# the temporary/swap location
1908sub save_path { 1976sub save_path {
1909 my ($self) = @_; 1977 my ($self) = @_;
1910 1978
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1979 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 1980 "$TMPDIR/$path.map"
1913} 1981}
1914 1982
1915# the unique path, undef == no special unique path 1983# the unique path, undef == no special unique path
1916sub uniq_path { 1984sub uniq_path {
1917 my ($self) = @_; 1985 my ($self) = @_;
1918 1986
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1987 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 1988 "$UNIQUEDIR/$path"
1921}
1922
1923# and all this just because we cannot iterate over
1924# all maps in C++...
1925sub change_all_map_light {
1926 my ($change) = @_;
1927
1928 $_->change_map_light ($change)
1929 for grep $_->outdoor, values %cf::MAP;
1930} 1989}
1931 1990
1932sub decay_objects { 1991sub decay_objects {
1933 my ($self) = @_; 1992 my ($self) = @_;
1934 1993
… …
2016 2075
2017sub find; 2076sub find;
2018sub find { 2077sub find {
2019 my ($path, $origin) = @_; 2078 my ($path, $origin) = @_;
2020 2079
2080 cf::cede_to_tick;
2081
2021 $path = normalise $path, $origin && $origin->path; 2082 $path = normalise $path, $origin && $origin->path;
2022 2083
2023 cf::lock_wait "map_data:$path";#d#remove 2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2024 cf::lock_wait "map_find:$path"; 2085 my $guard2 = cf::lock_acquire "map_find:$path";
2025 2086
2026 $cf::MAP{$path} || do { 2087 $cf::MAP{$path} || do {
2027 my $guard1 = cf::lock_acquire "map_find:$path";
2028 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2029
2030 my $map = new_from_path cf::map $path 2088 my $map = new_from_path cf::map $path
2031 or return; 2089 or return;
2032 2090
2033 $map->{last_save} = $cf::RUNTIME; 2091 $map->{last_save} = $cf::RUNTIME;
2034 2092
… …
2036 or return; 2094 or return;
2037 2095
2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2096 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2039 # doing this can freeze the server in a sync job, obviously 2097 # doing this can freeze the server in a sync job, obviously
2040 #$cf::WAIT_FOR_TICK->wait; 2098 #$cf::WAIT_FOR_TICK->wait;
2099 undef $guard2;
2041 undef $guard1; 2100 undef $guard1;
2042 undef $guard2;
2043 $map->reset; 2101 $map->reset;
2044 return find $path; 2102 return find $path;
2045 } 2103 }
2046 2104
2047 $cf::MAP{$path} = $map 2105 $cf::MAP{$path} = $map
2048 } 2106 }
2049} 2107}
2050 2108
2051sub pre_load { } 2109sub pre_load { }
2052sub post_load { } 2110#sub post_load { } # XS
2053 2111
2054sub load { 2112sub load {
2055 my ($self) = @_; 2113 my ($self) = @_;
2056 2114
2057 local $self->{deny_reset} = 1; # loading can take a long time 2115 local $self->{deny_reset} = 1; # loading can take a long time
… …
2074 my $f = new_from_file cf::object::thawer $self->{load_path}; 2132 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block; 2133 $f->skip_block;
2076 $self->_load_objects ($f) 2134 $self->_load_objects ($f)
2077 or return; 2135 or return;
2078 2136
2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2137 $self->post_load_original
2080 if delete $self->{load_original}; 2138 if delete $self->{load_original};
2081 2139
2082 if (my $uniq = $self->uniq_path) { 2140 if (my $uniq = $self->uniq_path) {
2083 utf8::encode $uniq; 2141 utf8::encode $uniq;
2084 unless (aio_stat $uniq) { 2142 unless (aio_stat $uniq) {
… …
2102 unless ($self->{deny_activate}) { 2160 unless ($self->{deny_activate}) {
2103 $self->decay_objects; 2161 $self->decay_objects;
2104 $self->fix_auto_apply; 2162 $self->fix_auto_apply;
2105 $self->update_buttons; 2163 $self->update_buttons;
2106 cf::cede_to_tick; 2164 cf::cede_to_tick;
2107 $self->set_darkness_map;
2108 cf::cede_to_tick;
2109 $self->activate; 2165 $self->activate;
2110 } 2166 }
2111 2167
2112 $self->{last_save} = $cf::RUNTIME; 2168 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME); 2169 $self->last_access ($cf::RUNTIME);
2114 2170
2115 $self->in_memory (cf::MAP_IN_MEMORY); 2171 $self->in_memory (cf::MAP_ACTIVE);
2116 } 2172 }
2117 2173
2118 $self->post_load; 2174 $self->post_load;
2119} 2175}
2120 2176
2177# customize the map for a given player, i.e.
2178# return the _real_ map. used by e.g. per-player
2179# maps to change the path to ~playername/mappath
2121sub customise_for { 2180sub customise_for {
2122 my ($self, $ob) = @_; 2181 my ($self, $ob) = @_;
2123 2182
2124 return find "~" . $ob->name . "/" . $self->{path} 2183 return find "~" . $ob->name . "/" . $self->{path}
2125 if $self->per_player; 2184 if $self->per_player;
… …
2141 or next; 2200 or next;
2142 $neigh = find $neigh, $map 2201 $neigh = find $neigh, $map
2143 or next; 2202 or next;
2144 $neigh->load; 2203 $neigh->load;
2145 2204
2205 # now find the diagonal neighbours
2146 push @neigh, 2206 push @neigh,
2147 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2207 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2148 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2208 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2149 } 2209 }
2150 2210
… …
2157} 2217}
2158 2218
2159sub find_sync { 2219sub find_sync {
2160 my ($path, $origin) = @_; 2220 my ($path, $origin) = @_;
2161 2221
2162 cf::sync_job { find $path, $origin } 2222 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2223 if $Coro::current == $Coro::main;
2224
2225 find $path, $origin
2163} 2226}
2164 2227
2165sub do_load_sync { 2228sub do_load_sync {
2166 my ($map) = @_; 2229 my ($map) = @_;
2167 2230
2168 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2169 if $Coro::current == $Coro::main; 2232 if $Coro::current == $Coro::main;
2170 2233
2171 cf::sync_job { $map->load }; 2234 $map->load;
2172} 2235}
2173 2236
2174our %MAP_PREFETCH; 2237our %MAP_PREFETCH;
2175our $MAP_PREFETCHER = undef; 2238our $MAP_PREFETCHER = undef;
2176 2239
… …
2178 my ($path, $origin, $load) = @_; 2241 my ($path, $origin, $load) = @_;
2179 2242
2180 $path = normalise $path, $origin && $origin->{path}; 2243 $path = normalise $path, $origin && $origin->{path};
2181 2244
2182 if (my $map = $cf::MAP{$path}) { 2245 if (my $map = $cf::MAP{$path}) {
2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2246 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2184 } 2247 }
2185 2248
2186 $MAP_PREFETCH{$path} |= $load; 2249 $MAP_PREFETCH{$path} |= $load;
2187 2250
2188 $MAP_PREFETCHER ||= cf::async { 2251 $MAP_PREFETCHER ||= cf::async {
… …
2202 $MAP_PREFETCHER->prio (6); 2265 $MAP_PREFETCHER->prio (6);
2203 2266
2204 () 2267 ()
2205} 2268}
2206 2269
2270# common code, used by both ->save and ->swapout
2207sub save { 2271sub _save {
2208 my ($self) = @_; 2272 my ($self) = @_;
2209
2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211 2273
2212 $self->{last_save} = $cf::RUNTIME; 2274 $self->{last_save} = $cf::RUNTIME;
2213 2275
2214 return unless $self->dirty; 2276 return unless $self->dirty;
2215 2277
… …
2224 2286
2225 cf::async { 2287 cf::async {
2226 $Coro::current->{desc} = "map player save"; 2288 $Coro::current->{desc} = "map player save";
2227 $_->contr->save for $self->players; 2289 $_->contr->save for $self->players;
2228 }; 2290 };
2291
2292 cf::get_slot 0.02;
2229 2293
2230 if ($uniq) { 2294 if ($uniq) {
2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2295 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2296 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2233 } else { 2297 } else {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2298 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2235 } 2299 }
2236} 2300}
2237 2301
2302sub save {
2303 my ($self) = @_;
2304
2305 my $lock = cf::lock_acquire "map_data:$self->{path}";
2306
2307 $self->_save;
2308}
2309
2238sub swap_out { 2310sub swap_out {
2239 my ($self) = @_; 2311 my ($self) = @_;
2240 2312
2241 # save first because save cedes
2242 $self->save;
2243
2244 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245 2314
2315 return if $self->in_memory != cf::MAP_ACTIVE;
2316 return if $self->{deny_save};
2246 return if $self->players; 2317 return if $self->players;
2247 return if $self->in_memory != cf::MAP_IN_MEMORY;
2248 return if $self->{deny_save};
2249 2318
2319 # first deactivate the map and "unlink" it from the core
2320 $self->deactivate;
2321 $_->clear_links_to ($self) for values %cf::MAP;
2250 $self->in_memory (cf::MAP_SWAPPED); 2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # then atomically save
2325 $self->_save;
2326
2327 # then free the map
2328 $self->clear;
2329}
2330
2331sub reset_at {
2332 my ($self) = @_;
2333
2334 # TODO: safety, remove and allow resettable per-player maps
2335 return 1e99 if $self->{deny_reset};
2336
2337 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2338 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2339
2340 $time + $to
2341}
2342
2343sub should_reset {
2344 my ($self) = @_;
2345
2346 $self->reset_at <= $cf::RUNTIME
2347}
2348
2349sub reset {
2350 my ($self) = @_;
2351
2352 my $lock = cf::lock_acquire "map_data:$self->{path}";
2353
2354 return if $self->players;
2355
2356 cf::trace "resetting map ", $self->path, "\n";
2357
2358 $self->in_memory (cf::MAP_SWAPPED);
2359
2360 # need to save uniques path
2361 unless ($self->{deny_save}) {
2362 my $uniq = $self->uniq_path; utf8::encode $uniq;
2363
2364 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2365 if $uniq;
2366 }
2367
2368 delete $cf::MAP{$self->path};
2251 2369
2252 $self->deactivate; 2370 $self->deactivate;
2253 $_->clear_links_to ($self) for values %cf::MAP; 2371 $_->clear_links_to ($self) for values %cf::MAP;
2254 $self->clear; 2372 $self->clear;
2255}
2256
2257sub reset_at {
2258 my ($self) = @_;
2259
2260 # TODO: safety, remove and allow resettable per-player maps
2261 return 1e99 if $self->{deny_reset};
2262
2263 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2264 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2265
2266 $time + $to
2267}
2268
2269sub should_reset {
2270 my ($self) = @_;
2271
2272 $self->reset_at <= $cf::RUNTIME
2273}
2274
2275sub reset {
2276 my ($self) = @_;
2277
2278 my $lock = cf::lock_acquire "map_data:$self->{path}";
2279
2280 return if $self->players;
2281
2282 warn "resetting map ", $self->path;
2283
2284 $self->in_memory (cf::MAP_SWAPPED);
2285
2286 # need to save uniques path
2287 unless ($self->{deny_save}) {
2288 my $uniq = $self->uniq_path; utf8::encode $uniq;
2289
2290 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2291 if $uniq;
2292 }
2293
2294 delete $cf::MAP{$self->path};
2295
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
2298 $self->clear;
2299 2373
2300 $self->unlink_save; 2374 $self->unlink_save;
2301 $self->destroy; 2375 $self->destroy;
2302} 2376}
2303 2377
… …
2311 2385
2312 delete $cf::MAP{$self->path}; 2386 delete $cf::MAP{$self->path};
2313 2387
2314 $self->unlink_save; 2388 $self->unlink_save;
2315 2389
2316 bless $self, "cf::map"; 2390 bless $self, "cf::map::wrap";
2317 delete $self->{deny_reset}; 2391 delete $self->{deny_reset};
2318 $self->{deny_save} = 1; 2392 $self->{deny_save} = 1;
2319 $self->reset_timeout (1); 2393 $self->reset_timeout (1);
2320 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2394 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2321 2395
… …
2370 2444
2371sub unique_maps() { 2445sub unique_maps() {
2372 [ 2446 [
2373 map { 2447 map {
2374 utf8::decode $_; 2448 utf8::decode $_;
2375 /\.map$/ 2449 s/\.map$//; # TODO future compatibility hack
2450 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2451 ? ()
2376 ? normalise $_ 2452 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2453 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2454 ]
2380} 2455}
2381 2456
2457=item cf::map::static_maps
2458
2459Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2460file in the shared directory excluding F</styles> and F</editor>). May
2461block.
2462
2463=cut
2464
2465sub static_maps() {
2466 my @dirs = "";
2467 my @maps;
2468
2469 while (@dirs) {
2470 my $dir = shift @dirs;
2471
2472 next if $dir eq "/styles" || $dir eq "/editor";
2473
2474 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2475 or return;
2476
2477 for (@$files) {
2478 s/\.map$// or next;
2479 utf8::decode $_;
2480 push @maps, "$dir/$_";
2481 }
2482
2483 push @dirs, map "$dir/$_", @$dirs;
2484 }
2485
2486 \@maps
2487}
2488
2382=back 2489=back
2383 2490
2384=head3 cf::object 2491=head3 cf::object
2385 2492
2386=cut 2493=cut
… …
2389 2496
2390=over 4 2497=over 4
2391 2498
2392=item $ob->inv_recursive 2499=item $ob->inv_recursive
2393 2500
2394Returns the inventory of the object _and_ their inventories, recursively. 2501Returns the inventory of the object I<and> their inventories, recursively,
2502but I<not> the object itself.
2395 2503
2396=cut 2504=cut
2397 2505
2398sub inv_recursive_; 2506sub inv_recursive_;
2399sub inv_recursive_ { 2507sub inv_recursive_ {
… …
2404 inv_recursive_ inv $_[0] 2512 inv_recursive_ inv $_[0]
2405} 2513}
2406 2514
2407=item $ref = $ob->ref 2515=item $ref = $ob->ref
2408 2516
2409creates and returns a persistent reference to an objetc that can be stored as a string. 2517Creates and returns a persistent reference to an object that can be stored as a string.
2410 2518
2411=item $ob = cf::object::deref ($refstring) 2519=item $ob = cf::object::deref ($refstring)
2412 2520
2413returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2521returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2414even if the object actually exists. May block. 2522even if the object actually exists. May block.
… …
2446can be C<undef>. Does the right thing when the player is currently in a 2554can be C<undef>. Does the right thing when the player is currently in a
2447dialogue with the given NPC character. 2555dialogue with the given NPC character.
2448 2556
2449=cut 2557=cut
2450 2558
2559our $SAY_CHANNEL = {
2560 id => "say",
2561 title => "Map",
2562 reply => "say ",
2563 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2564};
2565
2566our $CHAT_CHANNEL = {
2567 id => "chat",
2568 title => "Chat",
2569 reply => "chat ",
2570 tooltip => "Player chat and shouts, global to the server.",
2571};
2572
2451# rough implementation of a future "reply" method that works 2573# rough implementation of a future "reply" method that works
2452# with dialog boxes. 2574# with dialog boxes.
2453#TODO: the first argument must go, split into a $npc->reply_to ( method 2575#TODO: the first argument must go, split into a $npc->reply_to ( method
2454sub cf::object::player::reply($$$;$) { 2576sub cf::object::player::reply($$$;$) {
2455 my ($self, $npc, $msg, $flags) = @_; 2577 my ($self, $npc, $msg, $flags) = @_;
… …
2466 my $dialog = $pl->{npc_dialog}; 2588 my $dialog = $pl->{npc_dialog};
2467 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2589 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2468 2590
2469 } else { 2591 } else {
2470 $msg = $npc->name . " says: $msg" if $npc; 2592 $msg = $npc->name . " says: $msg" if $npc;
2471 $self->message ($msg, $flags); 2593 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2472 } 2594 }
2473 } 2595 }
2474} 2596}
2475 2597
2476=item $object->send_msg ($channel, $msg, $color, [extra...]) 2598=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2501 2623
2502=item $player_object->enter_link 2624=item $player_object->enter_link
2503 2625
2504Freezes the player and moves him/her to a special map (C<{link}>). 2626Freezes the player and moves him/her to a special map (C<{link}>).
2505 2627
2506The player should be reasonably safe there for short amounts of time. You 2628The player should be reasonably safe there for short amounts of time (e.g.
2507I<MUST> call C<leave_link> as soon as possible, though. 2629for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2630though, as the player cannot control the character while it is on the link
2631map.
2508 2632
2509Will never block. 2633Will never block.
2510 2634
2511=item $player_object->leave_link ($map, $x, $y) 2635=item $player_object->leave_link ($map, $x, $y)
2512 2636
… …
2532sub cf::object::player::enter_link { 2656sub cf::object::player::enter_link {
2533 my ($self) = @_; 2657 my ($self) = @_;
2534 2658
2535 $self->deactivate_recursive; 2659 $self->deactivate_recursive;
2536 2660
2661 ++$self->{_link_recursion};
2662
2537 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2663 return if UNIVERSAL::isa $self->map, "ext::map_link";
2538 2664
2539 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2665 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2540 if $self->map && $self->map->{path} ne "{link}"; 2666 if $self->map && $self->map->{path} ne "{link}";
2541 2667
2542 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2668 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2543} 2669}
2544 2670
2545sub cf::object::player::leave_link { 2671sub cf::object::player::leave_link {
2546 my ($self, $map, $x, $y) = @_; 2672 my ($self, $map, $x, $y) = @_;
2547 2673
… …
2564 ($x, $y) = (-1, -1) 2690 ($x, $y) = (-1, -1)
2565 unless (defined $x) && (defined $y); 2691 unless (defined $x) && (defined $y);
2566 2692
2567 # use -1 or undef as default coordinates, not 0, 0 2693 # use -1 or undef as default coordinates, not 0, 0
2568 ($x, $y) = ($map->enter_x, $map->enter_y) 2694 ($x, $y) = ($map->enter_x, $map->enter_y)
2569 if $x <=0 && $y <= 0; 2695 if $x <= 0 && $y <= 0;
2570 2696
2571 $map->load; 2697 $map->load;
2572 $map->load_neighbours; 2698 $map->load_neighbours;
2573 2699
2574 return unless $self->contr->active; 2700 return unless $self->contr->active;
2575 $self->activate_recursive;
2576 2701
2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2702 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2578 $self->enter_map ($map, $x, $y); 2703 if ($self->enter_map ($map, $x, $y)) {
2579} 2704 # entering was successful
2705 delete $self->{_link_recursion};
2706 # only activate afterwards, to support waiting in hooks
2707 $self->activate_recursive;
2708 }
2580 2709
2710}
2711
2581=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2712=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2582 2713
2583Moves the player to the given map-path and coordinates by first freezing 2714Moves the player to the given map-path and coordinates by first freezing
2584her, loading and preparing them map, calling the provided $check callback 2715her, loading and preparing them map, calling the provided $check callback
2585that has to return the map if sucecssful, and then unfreezes the player on 2716that has to return the map if sucecssful, and then unfreezes the player on
2586the new (success) or old (failed) map position. In either case, $done will 2717the new (success) or old (failed) map position. In either case, $done will
2587be called at the end of this process. 2718be called at the end of this process.
2588 2719
2720Note that $check will be called with a potentially non-loaded map, so if
2721it needs a loaded map it has to call C<< ->load >>.
2722
2589=cut 2723=cut
2590 2724
2591our $GOTOGEN; 2725our $GOTOGEN;
2592 2726
2593sub cf::object::player::goto { 2727sub cf::object::player::goto {
2594 my ($self, $path, $x, $y, $check, $done) = @_; 2728 my ($self, $path, $x, $y, $check, $done) = @_;
2729
2730 if ($self->{_link_recursion} >= $MAX_LINKS) {
2731 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2732 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2733 ($path, $x, $y) = @$EMERGENCY_POSITION;
2734 }
2595 2735
2596 # do generation counting so two concurrent goto's will be executed in-order 2736 # do generation counting so two concurrent goto's will be executed in-order
2597 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2737 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2598 2738
2599 $self->enter_link; 2739 $self->enter_link;
… …
2623 my $map = eval { 2763 my $map = eval {
2624 my $map = defined $path ? cf::map::find $path : undef; 2764 my $map = defined $path ? cf::map::find $path : undef;
2625 2765
2626 if ($map) { 2766 if ($map) {
2627 $map = $map->customise_for ($self); 2767 $map = $map->customise_for ($self);
2628 $map = $check->($map) if $check && $map; 2768 $map = $check->($map, $x, $y, $self) if $check && $map;
2629 } else { 2769 } else {
2630 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2770 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2631 } 2771 }
2632 2772
2633 $map 2773 $map
… …
2641 if ($gen == $self->{_goto_generation}) { 2781 if ($gen == $self->{_goto_generation}) {
2642 delete $self->{_goto_generation}; 2782 delete $self->{_goto_generation};
2643 $self->leave_link ($map, $x, $y); 2783 $self->leave_link ($map, $x, $y);
2644 } 2784 }
2645 2785
2646 $done->() if $done; 2786 $done->($self) if $done;
2647 })->prio (1); 2787 })->prio (1);
2648} 2788}
2649 2789
2650=item $player_object->enter_exit ($exit_object) 2790=item $player_object->enter_exit ($exit_object)
2651 2791
… …
2671} 2811}
2672 2812
2673sub prepare_random_map { 2813sub prepare_random_map {
2674 my ($exit) = @_; 2814 my ($exit) = @_;
2675 2815
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 # all this does is basically replace the /! path by 2816 # all this does is basically replace the /! path by
2679 # a new random map path (?random/...) with a seed 2817 # a new random map path (?random/...) with a seed
2680 # that depends on the exit object 2818 # that depends on the exit object
2681 2819
2682 my $rmp = parse_random_map_params $exit->msg; 2820 my $rmp = parse_random_map_params $exit->msg;
… …
2684 if ($exit->map) { 2822 if ($exit->map) {
2685 $rmp->{region} = $exit->region->name; 2823 $rmp->{region} = $exit->region->name;
2686 $rmp->{origin_map} = $exit->map->path; 2824 $rmp->{origin_map} = $exit->map->path;
2687 $rmp->{origin_x} = $exit->x; 2825 $rmp->{origin_x} = $exit->x;
2688 $rmp->{origin_y} = $exit->y; 2826 $rmp->{origin_y} = $exit->y;
2827
2828 $exit->map->touch;
2689 } 2829 }
2690 2830
2691 $rmp->{random_seed} ||= $exit->random_seed; 2831 $rmp->{random_seed} ||= $exit->random_seed;
2692 2832
2693 my $data = cf::encode_json $rmp; 2833 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2694 my $md5 = Digest::MD5::md5_hex $data; 2834 my $md5 = Digest::MD5::md5_hex $data;
2695 my $meta = "$RANDOMDIR/$md5.meta"; 2835 my $meta = "$RANDOMDIR/$md5.meta";
2696 2836
2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2837 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2698 aio_write $fh, 0, (length $data), $data, 0; 2838 aio_write $fh, 0, (length $data), $data, 0;
2699 undef $fh; 2839 undef $fh;
2700 aio_rename "$meta~", $meta; 2840 aio_rename "$meta~", $meta;
2701 2841
2842 my $slaying = "?random/$md5";
2843
2844 if ($exit->valid) {
2702 $exit->slaying ("?random/$md5"); 2845 $exit->slaying ("?random/$md5");
2703 $exit->msg (undef); 2846 $exit->msg (undef);
2847 }
2704 } 2848 }
2705} 2849}
2706 2850
2707sub cf::object::player::enter_exit { 2851sub cf::object::player::enter_exit {
2708 my ($self, $exit) = @_; 2852 my ($self, $exit) = @_;
2709 2853
2710 return unless $self->type == cf::PLAYER; 2854 return unless $self->type == cf::PLAYER;
2711 2855
2712 if ($exit->slaying eq "/!") {
2713 #TODO: this should de-fi-ni-te-ly not be a sync-job
2714 # the problem is that $exit might not survive long enough
2715 # so it needs to be done right now, right here
2716 cf::sync_job { prepare_random_map $exit };
2717 }
2718
2719 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2720 my $hp = $exit->stats->hp;
2721 my $sp = $exit->stats->sp;
2722
2723 $self->enter_link; 2856 $self->enter_link;
2724 2857
2725 # if exit is damned, update players death & WoR home-position
2726 $self->contr->savebed ($slaying, $hp, $sp)
2727 if $exit->flag (FLAG_DAMNED);
2728
2729 (async { 2858 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2859 $Coro::current->{desc} = "enter_exit";
2731 2860
2732 $self->deactivate_recursive; # just to be sure
2733 unless (eval { 2861 unless (eval {
2862 $self->deactivate_recursive; # just to be sure
2863
2864 # random map handling
2865 {
2866 my $guard = cf::lock_acquire "exit_prepare:$exit";
2867
2868 prepare_random_map $exit
2869 if $exit->slaying eq "/!";
2870 }
2871
2872 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2873 my $x = $exit->stats->hp;
2874 my $y = $exit->stats->sp;
2875
2734 $self->goto ($slaying, $hp, $sp); 2876 $self->goto ($map, $x, $y);
2735 2877
2878 # if exit is damned, update players death & WoR home-position
2879 $self->contr->savebed ($map, $x, $y)
2880 if $exit->flag (cf::FLAG_DAMNED);
2881
2736 1; 2882 1
2737 }) { 2883 }) {
2738 $self->message ("Something went wrong deep within the crossfire server. " 2884 $self->message ("Something went wrong deep within the deliantra server. "
2739 . "I'll try to bring you back to the map you were before. " 2885 . "I'll try to bring you back to the map you were before. "
2740 . "Please report this to the dungeon master!", 2886 . "Please report this to the dungeon master!",
2741 cf::NDI_UNIQUE | cf::NDI_RED); 2887 cf::NDI_UNIQUE | cf::NDI_RED);
2742 2888
2743 warn "ERROR in enter_exit: $@"; 2889 error "ERROR in enter_exit: $@";
2744 $self->leave_link; 2890 $self->leave_link;
2745 } 2891 }
2746 })->prio (1); 2892 })->prio (1);
2747} 2893}
2748 2894
… …
2760sub cf::client::send_drawinfo { 2906sub cf::client::send_drawinfo {
2761 my ($self, $text, $flags) = @_; 2907 my ($self, $text, $flags) = @_;
2762 2908
2763 utf8::encode $text; 2909 utf8::encode $text;
2764 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2910 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2911}
2912
2913=item $client->send_big_packet ($pkt)
2914
2915Like C<send_packet>, but tries to compress large packets, and fragments
2916them as required.
2917
2918=cut
2919
2920our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2921
2922sub cf::client::send_big_packet {
2923 my ($self, $pkt) = @_;
2924
2925 # try lzf for large packets
2926 $pkt = "lzf " . Compress::LZF::compress $pkt
2927 if 1024 <= length $pkt and $self->{can_lzf};
2928
2929 # split very large packets
2930 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2931 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2932 $pkt = "frag";
2933 }
2934
2935 $self->send_packet ($pkt);
2765} 2936}
2766 2937
2767=item $client->send_msg ($channel, $msg, $color, [extra...]) 2938=item $client->send_msg ($channel, $msg, $color, [extra...])
2768 2939
2769Send a drawinfo or msg packet to the client, formatting the msg for the 2940Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2773 2944
2774=cut 2945=cut
2775 2946
2776# non-persistent channels (usually the info channel) 2947# non-persistent channels (usually the info channel)
2777our %CHANNEL = ( 2948our %CHANNEL = (
2949 "c/motd" => {
2950 id => "infobox",
2951 title => "MOTD",
2952 reply => undef,
2953 tooltip => "The message of the day",
2954 },
2778 "c/identify" => { 2955 "c/identify" => {
2779 id => "infobox", 2956 id => "infobox",
2780 title => "Identify", 2957 title => "Identify",
2781 reply => undef, 2958 reply => undef,
2782 tooltip => "Items recently identified", 2959 tooltip => "Items recently identified",
… …
2784 "c/examine" => { 2961 "c/examine" => {
2785 id => "infobox", 2962 id => "infobox",
2786 title => "Examine", 2963 title => "Examine",
2787 reply => undef, 2964 reply => undef,
2788 tooltip => "Signs and other items you examined", 2965 tooltip => "Signs and other items you examined",
2966 },
2967 "c/shopinfo" => {
2968 id => "infobox",
2969 title => "Shop Info",
2970 reply => undef,
2971 tooltip => "What your bargaining skill tells you about the shop",
2789 }, 2972 },
2790 "c/book" => { 2973 "c/book" => {
2791 id => "infobox", 2974 id => "infobox",
2792 title => "Book", 2975 title => "Book",
2793 reply => undef, 2976 reply => undef,
… …
2809 id => "infobox", 2992 id => "infobox",
2810 title => "Body Parts", 2993 title => "Body Parts",
2811 reply => undef, 2994 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 2995 tooltip => "Shows which body parts you posess and are available",
2813 }, 2996 },
2997 "c/statistics" => {
2998 id => "infobox",
2999 title => "Statistics",
3000 reply => undef,
3001 tooltip => "Shows your primary statistics",
3002 },
3003 "c/skills" => {
3004 id => "infobox",
3005 title => "Skills",
3006 reply => undef,
3007 tooltip => "Shows your experience per skill and item power",
3008 },
3009 "c/shopitems" => {
3010 id => "infobox",
3011 title => "Shop Items",
3012 reply => undef,
3013 tooltip => "Shows the items currently for sale in this shop",
3014 },
3015 "c/resistances" => {
3016 id => "infobox",
3017 title => "Resistances",
3018 reply => undef,
3019 tooltip => "Shows your resistances",
3020 },
3021 "c/pets" => {
3022 id => "infobox",
3023 title => "Pets",
3024 reply => undef,
3025 tooltip => "Shows information abotu your pets/a specific pet",
3026 },
3027 "c/perceiveself" => {
3028 id => "infobox",
3029 title => "Perceive Self",
3030 reply => undef,
3031 tooltip => "You gained detailed knowledge about yourself",
3032 },
2814 "c/uptime" => { 3033 "c/uptime" => {
2815 id => "infobox", 3034 id => "infobox",
2816 title => "Uptime", 3035 title => "Uptime",
2817 reply => undef, 3036 reply => undef,
2818 tooltip => "How long the server has been running since last restart", 3037 tooltip => "How long the server has been running since last restart",
… …
2821 id => "infobox", 3040 id => "infobox",
2822 title => "Map Info", 3041 title => "Map Info",
2823 reply => undef, 3042 reply => undef,
2824 tooltip => "Information related to the maps", 3043 tooltip => "Information related to the maps",
2825 }, 3044 },
3045 "c/party" => {
3046 id => "party",
3047 title => "Party",
3048 reply => "gsay ",
3049 tooltip => "Messages and chat related to your party",
3050 },
3051 "c/death" => {
3052 id => "death",
3053 title => "Death",
3054 reply => undef,
3055 tooltip => "Reason for and more info about your most recent death",
3056 },
3057 "c/say" => $SAY_CHANNEL,
3058 "c/chat" => $CHAT_CHANNEL,
2826); 3059);
2827 3060
2828sub cf::client::send_msg { 3061sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_; 3062 my ($self, $channel, $msg, $color, @extra) = @_;
2830 3063
2831 $msg = $self->pl->expand_cfpod ($msg); 3064 $msg = $self->pl->expand_cfpod ($msg)
3065 unless $color & cf::NDI_VERBATIM;
2832 3066
2833 $color &= cf::NDI_CLIENT_MASK; # just in case... 3067 $color &= cf::NDI_CLIENT_MASK; # just in case...
2834 3068
2835 # check predefined channels, for the benefit of C 3069 # check predefined channels, for the benefit of C
2836 if ($CHANNEL{$channel}) { 3070 if ($CHANNEL{$channel}) {
2837 $channel = $CHANNEL{$channel}; 3071 $channel = $CHANNEL{$channel};
2838 3072
2839 $self->ext_msg (channel_info => $channel) 3073 $self->ext_msg (channel_info => $channel);
2840 if $self->can_msg;
2841
2842 $channel = $channel->{id}; 3074 $channel = $channel->{id};
2843 3075
2844 } elsif (ref $channel) { 3076 } elsif (ref $channel) {
2845 # send meta info to client, if not yet sent 3077 # send meta info to client, if not yet sent
2846 unless (exists $self->{channel}{$channel->{id}}) { 3078 unless (exists $self->{channel}{$channel->{id}}) {
2847 $self->{channel}{$channel->{id}} = $channel; 3079 $self->{channel}{$channel->{id}} = $channel;
2848 $self->ext_msg (channel_info => $channel) 3080 $self->ext_msg (channel_info => $channel);
2849 if $self->can_msg;
2850 } 3081 }
2851 3082
2852 $channel = $channel->{id}; 3083 $channel = $channel->{id};
2853 } 3084 }
2854 3085
2855 return unless @extra || length $msg; 3086 return unless @extra || length $msg;
2856 3087
2857 if ($self->can_msg) {
2858 # default colour, mask it out 3088 # default colour, mask it out
2859 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3089 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2860 if $color & cf::NDI_DEF; 3090 if $color & cf::NDI_DEF;
2861 3091
2862 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3092 my $pkt = "msg "
3093 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3094 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 } else { 3095 );
2865 if ($color >= 0) {
2866 # replace some tags by gcfclient-compatible ones
2867 for ($msg) {
2868 1 while
2869 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2870 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2871 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2872 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2873 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2874 }
2875 3096
2876 $color &= cf::NDI_COLOR_MASK; 3097 $self->send_big_packet ($pkt);
2877
2878 utf8::encode $msg;
2879
2880 if (0 && $msg =~ /\[/) {
2881 # COMMAND/INFO
2882 $self->send_packet ("drawextinfo $color 10 8 $msg")
2883 } else {
2884 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2885 $self->send_packet ("drawinfo $color $msg")
2886 }
2887 }
2888 }
2889} 3098}
2890 3099
2891=item $client->ext_msg ($type, @msg) 3100=item $client->ext_msg ($type, @msg)
2892 3101
2893Sends an ext event to the client. 3102Sends an ext event to the client.
… …
2896 3105
2897sub cf::client::ext_msg($$@) { 3106sub cf::client::ext_msg($$@) {
2898 my ($self, $type, @msg) = @_; 3107 my ($self, $type, @msg) = @_;
2899 3108
2900 if ($self->extcmd == 2) { 3109 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3110 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2902 } elsif ($self->extcmd == 1) { # TODO: remove 3111 } elsif ($self->extcmd == 1) { # TODO: remove
2903 push @msg, msgtype => "event_$type"; 3112 push @msg, msgtype => "event_$type";
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3113 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2905 } 3114 }
2906} 3115}
2907 3116
2908=item $client->ext_reply ($msgid, @msg) 3117=item $client->ext_reply ($msgid, @msg)
2909 3118
… …
2913 3122
2914sub cf::client::ext_reply($$@) { 3123sub cf::client::ext_reply($$@) {
2915 my ($self, $id, @msg) = @_; 3124 my ($self, $id, @msg) = @_;
2916 3125
2917 if ($self->extcmd == 2) { 3126 if ($self->extcmd == 2) {
2918 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2919 } elsif ($self->extcmd == 1) { 3128 } elsif ($self->extcmd == 1) {
2920 #TODO: version 1, remove 3129 #TODO: version 1, remove
2921 unshift @msg, msgtype => "reply", msgid => $id; 3130 unshift @msg, msgtype => "reply", msgid => $id;
2922 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3131 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2923 } 3132 }
2924} 3133}
2925 3134
2926=item $success = $client->query ($flags, "text", \&cb) 3135=item $success = $client->query ($flags, "text", \&cb)
2927 3136
… …
2998 3207
2999 $ns->ext_reply ($reply, @reply) 3208 $ns->ext_reply ($reply, @reply)
3000 if $reply; 3209 if $reply;
3001 3210
3002 } else { 3211 } else {
3003 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3212 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3004 } 3213 }
3005 3214
3006 cf::override; 3215 cf::override;
3007 }, 3216 },
3008); 3217);
… …
3028 3237
3029 $coro 3238 $coro
3030} 3239}
3031 3240
3032cf::client->attach ( 3241cf::client->attach (
3033 on_destroy => sub { 3242 on_client_destroy => sub {
3034 my ($ns) = @_; 3243 my ($ns) = @_;
3035 3244
3036 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3245 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3037 }, 3246 },
3038); 3247);
… …
3054our $safe_hole = new Safe::Hole; 3263our $safe_hole = new Safe::Hole;
3055 3264
3056$SIG{FPE} = 'IGNORE'; 3265$SIG{FPE} = 'IGNORE';
3057 3266
3058$safe->permit_only (Opcode::opset qw( 3267$safe->permit_only (Opcode::opset qw(
3059 :base_core :base_mem :base_orig :base_math 3268 :base_core :base_mem :base_orig :base_math :base_loop
3060 grepstart grepwhile mapstart mapwhile 3269 grepstart grepwhile mapstart mapwhile
3061 sort time 3270 sort time
3062)); 3271));
3063 3272
3064# here we export the classes and methods available to script code 3273# here we export the classes and methods available to script code
… …
3067 3276
3068The following functions and methods are available within a safe environment: 3277The following functions and methods are available within a safe environment:
3069 3278
3070 cf::object 3279 cf::object
3071 contr pay_amount pay_player map x y force_find force_add destroy 3280 contr pay_amount pay_player map x y force_find force_add destroy
3072 insert remove name archname title slaying race decrease_ob_nr 3281 insert remove name archname title slaying race decrease split
3282 value
3073 3283
3074 cf::object::player 3284 cf::object::player
3075 player 3285 player
3076 3286
3077 cf::player 3287 cf::player
… …
3082 3292
3083=cut 3293=cut
3084 3294
3085for ( 3295for (
3086 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3296 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3087 insert remove inv name archname title slaying race 3297 insert remove inv nrof name archname title slaying race
3088 decrease_ob_nr destroy)], 3298 decrease split destroy change_exp value msg lore send_msg)],
3089 ["cf::object::player" => qw(player)], 3299 ["cf::object::player" => qw(player)],
3090 ["cf::player" => qw(peaceful)], 3300 ["cf::player" => qw(peaceful send_msg)],
3091 ["cf::map" => qw(trigger)], 3301 ["cf::map" => qw(trigger)],
3092) { 3302) {
3093 no strict 'refs';
3094 my ($pkg, @funs) = @$_; 3303 my ($pkg, @funs) = @$_;
3095 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3304 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3096 for @funs; 3305 for @funs;
3097} 3306}
3098 3307
… …
3113 3322
3114 my $qcode = $code; 3323 my $qcode = $code;
3115 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3324 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3116 $qcode =~ s/\n/\\n/g; 3325 $qcode =~ s/\n/\\n/g;
3117 3326
3327 %vars = (_dummy => 0) unless %vars;
3328
3329 my @res;
3118 local $_; 3330 local $_;
3119 local @safe::cf::_safe_eval_args = values %vars;
3120 3331
3121 my $eval = 3332 my $eval =
3122 "do {\n" 3333 "do {\n"
3123 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3334 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3124 . "#line 0 \"{$qcode}\"\n" 3335 . "#line 0 \"{$qcode}\"\n"
3125 . $code 3336 . $code
3126 . "\n}" 3337 . "\n}"
3127 ; 3338 ;
3128 3339
3340 if ($CFG{safe_eval}) {
3129 sub_generation_inc; 3341 sub_generation_inc;
3342 local @safe::cf::_safe_eval_args = values %vars;
3130 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3343 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3131 sub_generation_inc; 3344 sub_generation_inc;
3345 } else {
3346 local @cf::_safe_eval_args = values %vars;
3347 @res = wantarray ? eval eval : scalar eval $eval;
3348 }
3132 3349
3133 if ($@) { 3350 if ($@) {
3134 warn "$@"; 3351 warn "$@",
3135 warn "while executing safe code '$code'\n"; 3352 "while executing safe code '$code'\n",
3136 warn "with arguments " . (join " ", %vars) . "\n"; 3353 "with arguments " . (join " ", %vars) . "\n";
3137 } 3354 }
3138 3355
3139 wantarray ? @res : $res[0] 3356 wantarray ? @res : $res[0]
3140} 3357}
3141 3358
… …
3155=cut 3372=cut
3156 3373
3157sub register_script_function { 3374sub register_script_function {
3158 my ($fun, $cb) = @_; 3375 my ($fun, $cb) = @_;
3159 3376
3160 no strict 'refs'; 3377 $fun = "safe::$fun" if $CFG{safe_eval};
3161 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3378 *$fun = $safe_hole->wrap ($cb);
3162} 3379}
3163 3380
3164=back 3381=back
3165 3382
3166=cut 3383=cut
… …
3175 # for this (global event?) 3392 # for this (global event?)
3176 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3177 3394
3178 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3395 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3179 3396
3180 warn "loading facedata from $path\n"; 3397 trace "loading facedata from $path\n";
3181 3398
3182 my $facedata;
3183 0 < aio_load $path, $facedata 3399 0 < aio_load $path, my $facedata
3184 or die "$path: $!"; 3400 or die "$path: $!";
3185 3401
3186 $facedata = Coro::Storable::thaw $facedata; 3402 $facedata = Coro::Storable::thaw $facedata;
3187 3403
3188 $facedata->{version} == 2 3404 $facedata->{version} == 2
3189 or cf::cleanup "$path: version mismatch, cannot proceed."; 3405 or cf::cleanup "$path: version mismatch, cannot proceed.";
3190 3406
3191 # patch in the exptable 3407 # patch in the exptable
3408 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3192 $facedata->{resource}{"res/exp_table"} = { 3409 $facedata->{resource}{"res/exp_table"} = {
3193 type => FT_RSRC, 3410 type => FT_RSRC,
3194 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3411 data => $exp_table,
3412 hash => (Digest::MD5::md5 $exp_table),
3195 }; 3413 };
3196 cf::cede_to_tick; 3414 cf::cede_to_tick;
3197 3415
3198 { 3416 {
3199 my $faces = $facedata->{faceinfo}; 3417 my $faces = $facedata->{faceinfo};
… …
3201 while (my ($face, $info) = each %$faces) { 3419 while (my ($face, $info) = each %$faces) {
3202 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3420 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3203 3421
3204 cf::face::set_visibility $idx, $info->{visibility}; 3422 cf::face::set_visibility $idx, $info->{visibility};
3205 cf::face::set_magicmap $idx, $info->{magicmap}; 3423 cf::face::set_magicmap $idx, $info->{magicmap};
3206 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3424 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3207 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3425 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3208 3426
3209 cf::cede_to_tick; 3427 cf::cede_to_tick;
3210 } 3428 }
3211 3429
3212 while (my ($face, $info) = each %$faces) { 3430 while (my ($face, $info) = each %$faces) {
… …
3217 3435
3218 if (my $smooth = cf::face::find $info->{smooth}) { 3436 if (my $smooth = cf::face::find $info->{smooth}) {
3219 cf::face::set_smooth $idx, $smooth; 3437 cf::face::set_smooth $idx, $smooth;
3220 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3438 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3221 } else { 3439 } else {
3222 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3440 error "smooth face '$info->{smooth}' not found for face '$face'";
3223 } 3441 }
3224 3442
3225 cf::cede_to_tick; 3443 cf::cede_to_tick;
3226 } 3444 }
3227 } 3445 }
… …
3236 3454
3237 cf::anim::invalidate_all; # d'oh 3455 cf::anim::invalidate_all; # d'oh
3238 } 3456 }
3239 3457
3240 { 3458 {
3241 # TODO: for gcfclient pleasure, we should give resources
3242 # that gcfclient doesn't grok a >10000 face index.
3243 my $res = $facedata->{resource}; 3459 my $res = $facedata->{resource};
3244 3460
3245 while (my ($name, $info) = each %$res) { 3461 while (my ($name, $info) = each %$res) {
3246 if (defined $info->{type}) { 3462 if (defined $info->{type}) {
3247 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3463 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3248 my $data;
3249 3464
3250 if ($info->{type} & 1) { 3465 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3251 # prepend meta info
3252
3253 my $meta = $enc->encode ({
3254 name => $name,
3255 %{ $info->{meta} || {} },
3256 });
3257
3258 $data = pack "(w/a*)*", $meta, $info->{data};
3259 } else {
3260 $data = $info->{data};
3261 }
3262
3263 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3264 cf::face::set_type $idx, $info->{type}; 3466 cf::face::set_type $idx, $info->{type};
3265 } else { 3467 } else {
3266 $RESOURCE{$name} = $info; 3468 $RESOURCE{$name} = $info; # unused
3267 } 3469 }
3268 3470
3269 cf::cede_to_tick; 3471 cf::cede_to_tick;
3270 } 3472 }
3271 } 3473 }
3272 3474
3273 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3475 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3274 3476
3275 1 3477 1
3276} 3478}
3277
3278cf::global->attach (on_resource_update => sub {
3279 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3280 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3281
3282 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3283 my $sound = $soundconf->{compat}[$_]
3284 or next;
3285
3286 my $face = cf::face::find "sound/$sound->[1]";
3287 cf::sound::set $sound->[0] => $face;
3288 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3289 }
3290
3291 while (my ($k, $v) = each %{$soundconf->{event}}) {
3292 my $face = cf::face::find "sound/$v";
3293 cf::sound::set $k => $face;
3294 }
3295 }
3296});
3297 3479
3298register_exticmd fx_want => sub { 3480register_exticmd fx_want => sub {
3299 my ($ns, $want) = @_; 3481 my ($ns, $want) = @_;
3300 3482
3301 while (my ($k, $v) = each %$want) { 3483 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v); 3484 $ns->fx_want ($k, $v);
3303 } 3485 }
3304}; 3486};
3487
3488sub load_resource_file($) {
3489 my $guard = lock_acquire "load_resource_file";
3490
3491 my $status = load_resource_file_ $_[0];
3492 get_slot 0.1, 100;
3493 cf::arch::commit_load;
3494
3495 $status
3496}
3305 3497
3306sub reload_regions { 3498sub reload_regions {
3307 # HACK to clear player env face cache, we need some signal framework 3499 # HACK to clear player env face cache, we need some signal framework
3308 # for this (global event?) 3500 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = (); 3501 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3323} 3515}
3324 3516
3325sub reload_archetypes { 3517sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes" 3518 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n"; 3519 or die "unable to load archetypes\n";
3328 #d# NEED to laod twice to resolve forward references
3329 # this really needs to be done in an extra post-pass
3330 # (which needs to be synchronous, so solve it differently)
3331 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n";
3333} 3520}
3334 3521
3335sub reload_treasures { 3522sub reload_treasures {
3336 load_resource_file "$DATADIR/treasures" 3523 load_resource_file "$DATADIR/treasures"
3337 or die "unable to load treasurelists\n"; 3524 or die "unable to load treasurelists\n";
3338} 3525}
3339 3526
3527sub reload_sound {
3528 trace "loading sound config from $DATADIR/sound\n";
3529
3530 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3531 or die "$DATADIR/sound $!";
3532
3533 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3534
3535 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3536 my $sound = $soundconf->{compat}[$_]
3537 or next;
3538
3539 my $face = cf::face::find "sound/$sound->[1]";
3540 cf::sound::set $sound->[0] => $face;
3541 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3542 }
3543
3544 while (my ($k, $v) = each %{$soundconf->{event}}) {
3545 my $face = cf::face::find "sound/$v";
3546 cf::sound::set $k => $face;
3547 }
3548}
3549
3340sub reload_resources { 3550sub reload_resources {
3341 warn "reloading resource files...\n"; 3551 trace "reloading resource files...\n";
3342 3552
3553 reload_exp_table;
3554 reload_materials;
3555 reload_facedata;
3556 reload_sound;
3557 reload_archetypes;
3343 reload_regions; 3558 reload_regions;
3344 reload_facedata;
3345 #reload_archetypes;#d#
3346 reload_archetypes;
3347 reload_treasures; 3559 reload_treasures;
3348 3560
3349 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3350}
3351
3352sub init {
3353 reload_resources;
3354} 3562}
3355 3563
3356sub reload_config { 3564sub reload_config {
3357 open my $fh, "<:utf8", "$CONFDIR/config" 3565 trace "reloading config file...\n";
3358 or return;
3359 3566
3360 local $/; 3567 0 < aio_load "$CONFDIR/config", my $config
3361 *CFG = YAML::Load <$fh>; 3568 or die "$CONFDIR/config: $!";
3362 3569
3570 utf8::decode $config;
3571 *CFG = yaml_load $config;
3572
3363 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3364 3574
3365 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3575 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3366 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3576 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3367 3577
3368 if (exists $CFG{mlockall}) { 3578 if (exists $CFG{mlockall}) {
… …
3372 }; 3582 };
3373 warn $@ if $@; 3583 warn $@ if $@;
3374 } 3584 }
3375} 3585}
3376 3586
3587sub pidfile() {
3588 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3589 or die "$PIDFILE: $!";
3590 flock $fh, &Fcntl::LOCK_EX
3591 or die "$PIDFILE: flock: $!";
3592 $fh
3593}
3594
3595# make sure only one server instance is running at any one time
3596sub atomic {
3597 my $fh = pidfile;
3598
3599 my $pid = <$fh>;
3600 kill 9, $pid if $pid > 0;
3601
3602 seek $fh, 0, 0;
3603 print $fh $$;
3604}
3605
3606sub main_loop {
3607 trace "EV::loop starting\n";
3608 if (1) {
3609 EV::loop;
3610 }
3611 trace "EV::loop returned\n";
3612 goto &main_loop unless $REALLY_UNLOOP;
3613}
3614
3377sub main { 3615sub main {
3616 cf::init_globals; # initialise logging
3617
3618 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3619 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3620 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3621 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3622
3623 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3624
3378 # we must not ever block the main coroutine 3625 # we must not ever block the main coroutine
3379 local $Coro::idle = sub { 3626 local $Coro::idle = sub {
3380 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3627 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3381 (async { 3628 (async {
3382 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3629 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT; 3630 EV::loop EV::LOOP_ONESHOT;
3384 })->prio (Coro::PRIO_MAX); 3631 })->prio (Coro::PRIO_MAX);
3385 }; 3632 };
3386 3633
3387 reload_config;
3388 db_init;
3389 load_extensions;
3390
3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno; 3634 evthread_start IO::AIO::poll_fileno;
3393 EV::loop; 3635
3636 cf::sync_job {
3637 cf::incloader::init ();
3638
3639 cf::init_anim;
3640 cf::init_attackmess;
3641 cf::init_dynamic;
3642
3643 cf::load_settings;
3644
3645 reload_resources;
3646 reload_config;
3647 db_init;
3648
3649 cf::init_uuid;
3650 cf::init_signals;
3651 cf::init_skills;
3652
3653 cf::init_beforeplay;
3654
3655 atomic;
3656
3657 load_extensions;
3658
3659 utime time, time, $RUNTIMEFILE;
3660
3661 # no (long-running) fork's whatsoever before this point(!)
3662 use POSIX ();
3663 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3664
3665 (pop @POST_INIT)->(0) while @POST_INIT;
3666 };
3667
3668 cf::object::thawer::errors_are_fatal 0;
3669 info "parse errors in files are no longer fatal from this point on.\n";
3670
3671 my $free_main; $free_main = EV::idle sub {
3672 undef $free_main;
3673 undef &main; # free gobs of memory :)
3674 };
3675
3676 goto &main_loop;
3394} 3677}
3395 3678
3396############################################################################# 3679#############################################################################
3397# initialisation and cleanup 3680# initialisation and cleanup
3398 3681
3399# install some emergency cleanup handlers 3682# install some emergency cleanup handlers
3400BEGIN { 3683BEGIN {
3401 our %SIGWATCHER = (); 3684 our %SIGWATCHER = ();
3402 for my $signal (qw(INT HUP TERM)) { 3685 for my $signal (qw(INT HUP TERM)) {
3403 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3686 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3404 cf::cleanup "SIG$signal"; 3687 cf::cleanup "SIG$signal";
3405 }; 3688 };
3406 } 3689 }
3407} 3690}
3408 3691
3409sub write_runtime_sync { 3692sub write_runtime_sync {
3410 my $runtime = "$LOCALDIR/runtime"; 3693 my $t0 = AE::time;
3411 3694
3412 # first touch the runtime file to show we are still running: 3695 # first touch the runtime file to show we are still running:
3413 # the fsync below can take a very very long time. 3696 # the fsync below can take a very very long time.
3414 3697
3415 IO::AIO::aio_utime $runtime, undef, undef; 3698 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3416 3699
3417 my $guard = cf::lock_acquire "write_runtime"; 3700 my $guard = cf::lock_acquire "write_runtime";
3418 3701
3419 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3702 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3420 or return; 3703 or return;
3421 3704
3422 my $value = $cf::RUNTIME + 90 + 10; 3705 my $value = $cf::RUNTIME + 90 + 10;
3423 # 10 is the runtime save interval, for a monotonic clock 3706 # 10 is the runtime save interval, for a monotonic clock
3424 # 60 allows for the watchdog to kill the server. 3707 # 60 allows for the watchdog to kill the server.
… …
3434 aio_utime $fh, undef, undef; 3717 aio_utime $fh, undef, undef;
3435 3718
3436 close $fh 3719 close $fh
3437 or return; 3720 or return;
3438 3721
3439 aio_rename "$runtime~", $runtime 3722 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3440 and return; 3723 and return;
3441 3724
3442 warn "runtime file written.\n"; 3725 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3443 3726
3444 1 3727 1
3445} 3728}
3446 3729
3447our $uuid_lock; 3730our $uuid_lock;
… …
3456 my $uuid = "$LOCALDIR/uuid"; 3739 my $uuid = "$LOCALDIR/uuid";
3457 3740
3458 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3741 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3459 or return; 3742 or return;
3460 3743
3461 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3744 my $value = uuid_seq uuid_cur;
3745
3746 unless ($value) {
3747 info "cowardly refusing to write zero uuid value!\n";
3748 return;
3749 }
3750
3751 my $value = uuid_str $value + $uuid_skip;
3462 $uuid_skip = 0; 3752 $uuid_skip = 0;
3463 3753
3464 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3754 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3465 and return; 3755 and return;
3466 3756
… …
3472 or return; 3762 or return;
3473 3763
3474 aio_rename "$uuid~", $uuid 3764 aio_rename "$uuid~", $uuid
3475 and return; 3765 and return;
3476 3766
3477 warn "uuid file written ($value).\n"; 3767 trace "uuid file written ($value).\n";
3478 3768
3479 1 3769 1
3480 3770
3481} 3771}
3482 3772
… …
3488} 3778}
3489 3779
3490sub emergency_save() { 3780sub emergency_save() {
3491 my $freeze_guard = cf::freeze_mainloop; 3781 my $freeze_guard = cf::freeze_mainloop;
3492 3782
3493 warn "enter emergency perl save\n"; 3783 info "emergency_perl_save: enter\n";
3784
3785 # this is a trade-off: we want to be very quick here, so
3786 # save all maps without fsync, and later call a global sync
3787 # (which in turn might be very very slow)
3788 local $USE_FSYNC = 0;
3494 3789
3495 cf::sync_job { 3790 cf::sync_job {
3791 cf::write_runtime_sync; # external watchdog should not bark
3792
3496 # use a peculiar iteration method to avoid tripping on perl 3793 # use a peculiar iteration method to avoid tripping on perl
3497 # refcount bugs in for. also avoids problems with players 3794 # refcount bugs in for. also avoids problems with players
3498 # and maps saved/destroyed asynchronously. 3795 # and maps saved/destroyed asynchronously.
3499 warn "begin emergency player save\n"; 3796 info "emergency_perl_save: begin player save\n";
3500 for my $login (keys %cf::PLAYER) { 3797 for my $login (keys %cf::PLAYER) {
3501 my $pl = $cf::PLAYER{$login} or next; 3798 my $pl = $cf::PLAYER{$login} or next;
3502 $pl->valid or next; 3799 $pl->valid or next;
3503 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3800 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3504 $pl->save; 3801 $pl->save;
3505 } 3802 }
3506 warn "end emergency player save\n"; 3803 info "emergency_perl_save: end player save\n";
3507 3804
3508 warn "begin emergency map save\n"; 3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3807 info "emergency_perl_save: begin map save\n";
3509 for my $path (keys %cf::MAP) { 3808 for my $path (keys %cf::MAP) {
3510 my $map = $cf::MAP{$path} or next; 3809 my $map = $cf::MAP{$path} or next;
3511 $map->valid or next; 3810 $map->valid or next;
3512 $map->save; 3811 $map->save;
3513 } 3812 }
3514 warn "end emergency map save\n"; 3813 info "emergency_perl_save: end map save\n";
3515 3814
3516 warn "begin emergency database checkpoint\n"; 3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 info "emergency_perl_save: begin database checkpoint\n";
3517 BDB::db_env_txn_checkpoint $DB_ENV; 3818 BDB::db_env_txn_checkpoint $DB_ENV;
3518 warn "end emergency database checkpoint\n"; 3819 info "emergency_perl_save: end database checkpoint\n";
3519 3820
3520 warn "begin write uuid\n"; 3821 info "emergency_perl_save: begin write uuid\n";
3521 write_uuid_sync 1; 3822 write_uuid_sync 1;
3522 warn "end write uuid\n"; 3823 info "emergency_perl_save: end write uuid\n";
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: syncing database to disk";
3828 BDB::db_env_txn_checkpoint $DB_ENV;
3829
3830 info "emergency_perl_save: starting sync\n";
3831 IO::AIO::aio_sync sub {
3832 info "emergency_perl_save: finished sync\n";
3833 };
3834
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3837 trace "emergency_perl_save: flushing outstanding aio requests";
3838 while (IO::AIO::nreqs || BDB::nreqs) {
3839 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3840 }
3841
3842 cf::write_runtime_sync; # external watchdog should not bark
3523 }; 3843 };
3524 3844
3525 warn "leave emergency perl save\n"; 3845 info "emergency_perl_save: leave\n";
3526} 3846}
3527 3847
3528sub post_cleanup { 3848sub post_cleanup {
3529 my ($make_core) = @_; 3849 my ($make_core) = @_;
3530 3850
3851 IO::AIO::flush;
3852
3531 warn Carp::longmess "post_cleanup backtrace" 3853 error Carp::longmess "post_cleanup backtrace"
3532 if $make_core; 3854 if $make_core;
3855
3856 my $fh = pidfile;
3857 unlink $PIDFILE if <$fh> == $$;
3858}
3859
3860# a safer delete_package, copied from Symbol
3861sub clear_package($) {
3862 my $pkg = shift;
3863
3864 # expand to full symbol table name if needed
3865 unless ($pkg =~ /^main::.*::$/) {
3866 $pkg = "main$pkg" if $pkg =~ /^::/;
3867 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3868 $pkg .= '::' unless $pkg =~ /::$/;
3869 }
3870
3871 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3872 my $stem_symtab = *{$stem}{HASH};
3873
3874 defined $stem_symtab and exists $stem_symtab->{$leaf}
3875 or return;
3876
3877 # clear all symbols
3878 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3879 for my $name (keys %$leaf_symtab) {
3880 _gv_clear *{"$pkg$name"};
3881# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3882 }
3533} 3883}
3534 3884
3535sub do_reload_perl() { 3885sub do_reload_perl() {
3536 # can/must only be called in main 3886 # can/must only be called in main
3537 if ($Coro::current != $Coro::main) { 3887 unless (in_main) {
3538 warn "can only reload from main coroutine"; 3888 error "can only reload from main coroutine";
3539 return; 3889 return;
3540 } 3890 }
3541 3891
3892 return if $RELOAD++;
3893
3894 my $t1 = AE::time;
3895
3896 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl";
3542 warn "reloading..."; 3898 info "reloading...";
3543 3899
3544 warn "entering sync_job"; 3900 trace "entering sync_job";
3545 3901
3546 cf::sync_job { 3902 cf::sync_job {
3547 cf::write_runtime_sync; # external watchdog should not bark
3548 cf::emergency_save; 3903 #cf::emergency_save;
3549 cf::write_runtime_sync; # external watchdog should not bark
3550 3904
3551 warn "syncing database to disk";
3552 BDB::db_env_txn_checkpoint $DB_ENV;
3553
3554 # if anything goes wrong in here, we should simply crash as we already saved
3555
3556 warn "flushing outstanding aio requests";
3557 for (;;) {
3558 BDB::flush;
3559 IO::AIO::flush;
3560 Coro::cede_notself;
3561 last unless IO::AIO::nreqs || BDB::nreqs;
3562 warn "iterate...";
3563 }
3564
3565 ++$RELOAD;
3566
3567 warn "cancelling all extension coros"; 3905 trace "cancelling all extension coros";
3568 $_->cancel for values %EXT_CORO; 3906 $_->cancel for values %EXT_CORO;
3569 %EXT_CORO = (); 3907 %EXT_CORO = ();
3570 3908
3571 warn "removing commands"; 3909 trace "removing commands";
3572 %COMMAND = (); 3910 %COMMAND = ();
3573 3911
3574 warn "removing ext/exti commands"; 3912 trace "removing ext/exti commands";
3575 %EXTCMD = (); 3913 %EXTCMD = ();
3576 %EXTICMD = (); 3914 %EXTICMD = ();
3577 3915
3578 warn "unloading/nuking all extensions"; 3916 trace "unloading/nuking all extensions";
3579 for my $pkg (@EXTS) { 3917 for my $pkg (@EXTS) {
3580 warn "... unloading $pkg"; 3918 trace "... unloading $pkg";
3581 3919
3582 if (my $cb = $pkg->can ("unload")) { 3920 if (my $cb = $pkg->can ("unload")) {
3583 eval { 3921 eval {
3584 $cb->($pkg); 3922 $cb->($pkg);
3585 1 3923 1
3586 } or warn "$pkg unloaded, but with errors: $@"; 3924 } or error "$pkg unloaded, but with errors: $@";
3925 }
3926
3927 trace "... clearing $pkg";
3928 clear_package $pkg;
3587 } 3929 }
3588 3930
3589 warn "... nuking $pkg";
3590 Symbol::delete_package $pkg;
3591 }
3592
3593 warn "unloading all perl modules loaded from $LIBDIR"; 3931 trace "unloading all perl modules loaded from $LIBDIR";
3594 while (my ($k, $v) = each %INC) { 3932 while (my ($k, $v) = each %INC) {
3595 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3596 3934
3597 warn "... unloading $k"; 3935 trace "... unloading $k";
3598 delete $INC{$k}; 3936 delete $INC{$k};
3599 3937
3600 $k =~ s/\.pm$//; 3938 $k =~ s/\.pm$//;
3601 $k =~ s/\//::/g; 3939 $k =~ s/\//::/g;
3602 3940
3603 if (my $cb = $k->can ("unload_module")) { 3941 if (my $cb = $k->can ("unload_module")) {
3604 $cb->(); 3942 $cb->();
3943 }
3944
3945 clear_package $k;
3605 } 3946 }
3606 3947
3607 Symbol::delete_package $k;
3608 }
3609
3610 warn "getting rid of safe::, as good as possible"; 3948 trace "getting rid of safe::, as good as possible";
3611 Symbol::delete_package "safe::$_" 3949 clear_package "safe::$_"
3612 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3950 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3613 3951
3614 warn "unloading cf.pm \"a bit\""; 3952 trace "unloading cf.pm \"a bit\"";
3615 delete $INC{"cf.pm"}; 3953 delete $INC{"cf.pm"};
3616 delete $INC{"cf/pod.pm"}; 3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3617 3955
3618 # don't, removes xs symbols, too, 3956 # don't, removes xs symbols, too,
3619 # and global variables created in xs 3957 # and global variables created in xs
3620 #Symbol::delete_package __PACKAGE__; 3958 #clear_package __PACKAGE__;
3621 3959
3622 warn "unload completed, starting to reload now"; 3960 info "unload completed, starting to reload now";
3623 3961
3624 warn "reloading cf.pm"; 3962 trace "reloading cf.pm";
3625 require cf; 3963 require cf;
3626 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3964 cf::_connect_to_perl_1;
3627 3965
3628 warn "loading config and database again"; 3966 trace "loading config and database again";
3629 cf::reload_config; 3967 cf::reload_config;
3630 3968
3631 warn "loading extensions"; 3969 trace "loading extensions";
3632 cf::load_extensions; 3970 cf::load_extensions;
3633 3971
3972 if ($REATTACH_ON_RELOAD) {
3634 warn "reattaching attachments to objects/players"; 3973 trace "reattaching attachments to objects/players";
3635 _global_reattach; # objects, sockets 3974 _global_reattach; # objects, sockets
3636 warn "reattaching attachments to maps"; 3975 trace "reattaching attachments to maps";
3637 reattach $_ for values %MAP; 3976 reattach $_ for values %MAP;
3638 warn "reattaching attachments to players"; 3977 trace "reattaching attachments to players";
3639 reattach $_ for values %PLAYER; 3978 reattach $_ for values %PLAYER;
3979 }
3640 3980
3981 trace "running post_init jobs";
3982 (pop @POST_INIT)->(1) while @POST_INIT;
3983
3641 warn "leaving sync_job"; 3984 trace "leaving sync_job";
3642 3985
3643 1 3986 1
3644 } or do { 3987 } or do {
3645 warn $@; 3988 error $@;
3646 cf::cleanup "error while reloading, exiting."; 3989 cf::cleanup "error while reloading, exiting.";
3990 };
3991
3992 info "reloaded";
3993 --$RELOAD;
3647 }; 3994 }
3648 3995
3649 warn "reloaded"; 3996 $t1 = AE::time - $t1;
3997 info "reload completed in ${t1}s\n";
3650}; 3998};
3651 3999
3652our $RELOAD_WATCHER; # used only during reload 4000our $RELOAD_WATCHER; # used only during reload
3653 4001
3654sub reload_perl() { 4002sub reload_perl() {
3655 # doing reload synchronously and two reloads happen back-to-back, 4003 # doing reload synchronously and two reloads happen back-to-back,
3656 # coro crashes during coro_state_free->destroy here. 4004 # coro crashes during coro_state_free->destroy here.
3657 4005
4006 $RELOAD_WATCHER ||= cf::async {
4007 Coro::AIO::aio_wait cache_extensions;
4008
3658 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4009 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3659 do_reload_perl; 4010 do_reload_perl;
3660 undef $RELOAD_WATCHER; 4011 undef $RELOAD_WATCHER;
4012 };
3661 }; 4013 };
3662} 4014}
3663 4015
3664register_command "reload" => sub { 4016register_command "reload" => sub {
3665 my ($who, $arg) = @_; 4017 my ($who, $arg) = @_;
… …
3671 reload_perl; 4023 reload_perl;
3672 }; 4024 };
3673 } 4025 }
3674}; 4026};
3675 4027
3676unshift @INC, $LIBDIR; 4028#############################################################################
3677 4029
3678my $bug_warning = 0; 4030my $bug_warning = 0;
3679 4031
3680our @WAIT_FOR_TICK; 4032our @WAIT_FOR_TICK;
3681our @WAIT_FOR_TICK_BEGIN; 4033our @WAIT_FOR_TICK_BEGIN;
3682 4034
3683sub wait_for_tick { 4035sub wait_for_tick() {
3684 return if tick_inhibit;
3685 return if $Coro::current == $Coro::main; 4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3686 4037
3687 my $signal = new Coro::Signal; 4038 my $signal = new Coro::Signal;
3688 push @WAIT_FOR_TICK, $signal; 4039 push @WAIT_FOR_TICK, $signal;
3689 $signal->wait; 4040 $signal->wait;
3690} 4041}
3691 4042
3692sub wait_for_tick_begin { 4043sub wait_for_tick_begin() {
3693 return if tick_inhibit;
3694 return if $Coro::current == $Coro::main; 4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3695 4045
3696 my $signal = new Coro::Signal; 4046 my $signal = new Coro::Signal;
3697 push @WAIT_FOR_TICK_BEGIN, $signal; 4047 push @WAIT_FOR_TICK_BEGIN, $signal;
3698 $signal->wait; 4048 $signal->wait;
3699} 4049}
… …
3705 return; 4055 return;
3706 } 4056 }
3707 4057
3708 cf::server_tick; # one server iteration 4058 cf::server_tick; # one server iteration
3709 4059
4060 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4061
3710 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4062 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3711 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4063 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3712 Coro::async_pool { 4064 Coro::async_pool {
3713 $Coro::current->{desc} = "runtime saver"; 4065 $Coro::current->{desc} = "runtime saver";
3714 write_runtime_sync 4066 write_runtime_sync
3715 or warn "ERROR: unable to write runtime file: $!"; 4067 or error "ERROR: unable to write runtime file: $!";
3716 }; 4068 };
3717 } 4069 }
3718 4070
3719 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3720 $sig->send; 4072 $sig->send;
… …
3728 4080
3729 if (0) { 4081 if (0) {
3730 if ($NEXT_TICK) { 4082 if ($NEXT_TICK) {
3731 my $jitter = $TICK_START - $NEXT_TICK; 4083 my $jitter = $TICK_START - $NEXT_TICK;
3732 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4084 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3733 warn "jitter $JITTER\n";#d# 4085 debug "jitter $JITTER\n";#d#
3734 } 4086 }
3735 } 4087 }
3736} 4088}
3737 4089
3738{ 4090{
3739 # configure BDB 4091 # configure BDB
3740 4092
3741 BDB::min_parallel 8; 4093 BDB::min_parallel 16;
3742 BDB::max_poll_reqs $TICK * 0.1; 4094 BDB::max_poll_reqs $TICK * 0.1;
3743 $Coro::BDB::WATCHER->priority (1); 4095 $AnyEvent::BDB::WATCHER->priority (1);
3744 4096
3745 unless ($DB_ENV) { 4097 unless ($DB_ENV) {
3746 $DB_ENV = BDB::db_env_create; 4098 $DB_ENV = BDB::db_env_create;
3747 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4099 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3748 | BDB::LOG_AUTOREMOVE, 1); 4100 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4101 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3749 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4102 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3750 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4103 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3751 4104
3752 cf::sync_job { 4105 cf::sync_job {
3753 eval { 4106 eval {
… …
3779{ 4132{
3780 # configure IO::AIO 4133 # configure IO::AIO
3781 4134
3782 IO::AIO::min_parallel 8; 4135 IO::AIO::min_parallel 8;
3783 IO::AIO::max_poll_time $TICK * 0.1; 4136 IO::AIO::max_poll_time $TICK * 0.1;
3784 $Coro::AIO::WATCHER->priority (1); 4137 undef $AnyEvent::AIO::WATCHER;
3785} 4138}
3786 4139
3787my $_log_backtrace; 4140my $_log_backtrace;
3788 4141
3789sub _log_backtrace { 4142sub _log_backtrace {
… …
3792 $msg =~ s/\n//; 4145 $msg =~ s/\n//;
3793 4146
3794 # limit the # of concurrent backtraces 4147 # limit the # of concurrent backtraces
3795 if ($_log_backtrace < 2) { 4148 if ($_log_backtrace < 2) {
3796 ++$_log_backtrace; 4149 ++$_log_backtrace;
4150 my $perl_bt = Carp::longmess $msg;
3797 async { 4151 async {
3798 $Coro::current->{desc} = "abt $msg"; 4152 $Coro::current->{desc} = "abt $msg";
3799 4153
3800 my @bt = fork_call { 4154 my @bt = fork_call {
3801 @addr = map { sprintf "%x", $_ } @addr; 4155 @addr = map { sprintf "%x", $_ } @addr;
… …
3812 } 4166 }
3813 4167
3814 @funcs 4168 @funcs
3815 }; 4169 };
3816 4170
3817 LOG llevInfo, "[ABT] $msg\n"; 4171 LOG llevInfo, "[ABT] $perl_bt\n";
4172 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3818 LOG llevInfo, "[ABT] $_\n" for @bt; 4173 LOG llevInfo, "[ABT] $_\n" for @bt;
3819 --$_log_backtrace; 4174 --$_log_backtrace;
3820 }; 4175 };
3821 } else { 4176 } else {
3822 LOG llevInfo, "[ABT] $msg\n"; 4177 LOG llevInfo, "[ABT] $msg\n";
3823 LOG llevInfo, "[ABT] [suppressed]\n"; 4178 LOG llevInfo, "[ABT] [suppressed]\n";
3824 } 4179 }
3825} 4180}
3826 4181
3827# load additional modules 4182# load additional modules
3828use cf::pod; 4183require "cf/$_.pm" for @EXTRA_MODULES;
4184cf::_connect_to_perl_2;
3829 4185
3830END { cf::emergency_save } 4186END { cf::emergency_save }
3831 4187
38321 41881
3833 4189

Diff Legend

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