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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.414 by root, Thu Apr 10 09:10:45 2008 UTC vs.
Revision 1.547 by root, Sun May 9 22:51:13 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 cf::post_init { BLOCK }
363
364Execute the given codeblock, I<after> all extensions have been (re-)loaded,
365but I<before> the server starts ticking again.
366
367The cdoeblock will have a single boolean argument to indicate whether this
368is a reload or not.
369
370=cut
371
372sub post_init(&) {
373 push @POST_INIT, shift;
374}
375
301=item cf::lock_wait $string 376=item cf::lock_wait $string
302 377
303Wait until the given lock is available. See cf::lock_acquire. 378Wait until the given lock is available. See cf::lock_acquire.
304 379
305=item my $lock = cf::lock_acquire $string 380=item my $lock = cf::lock_acquire $string
306 381
307Wait until the given lock is available and then acquires it and returns 382Wait until the given lock is available and then acquires it and returns
308a Coro::guard object. If the guard object gets destroyed (goes out of scope, 383a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 384for example when the coroutine gets canceled), the lock is automatically
310returned. 385returned.
311 386
312Locks are *not* recursive, locking from the same coro twice results in a 387Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 388deadlocked coro.
… …
319 394
320Return true if the lock is currently active, i.e. somebody has locked it. 395Return true if the lock is currently active, i.e. somebody has locked it.
321 396
322=cut 397=cut
323 398
324our %LOCK; 399our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 400
327sub lock_wait($) { 401sub lock_wait($) {
328 my ($key) = @_; 402 $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} 403}
341 404
342sub lock_acquire($) { 405sub lock_acquire($) {
343 my ($key) = @_; 406 $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} 407}
357 408
358sub lock_active($) { 409sub lock_active($) {
359 my ($key) = @_; 410 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 411}
363 412
364sub freeze_mainloop { 413sub freeze_mainloop {
365 tick_inhibit_inc; 414 tick_inhibit_inc;
366 415
367 Coro::guard \&tick_inhibit_dec; 416 &Guard::guard (\&tick_inhibit_dec);
368} 417}
369 418
370=item cf::periodic $interval, $cb 419=item cf::periodic $interval, $cb
371 420
372Like EV::periodic, but randomly selects a starting point so that the actions 421Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer. 422get spread over time.
374 423
375=cut 424=cut
376 425
377sub periodic($$) { 426sub periodic($$) {
378 my ($interval, $cb) = @_; 427 my ($interval, $cb) = @_;
… …
395 444
396=cut 445=cut
397 446
398our @SLOT_QUEUE; 447our @SLOT_QUEUE;
399our $SLOT_QUEUE; 448our $SLOT_QUEUE;
449our $SLOT_DECAY = 0.9;
400 450
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 451$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 452$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 453 $Coro::current->desc ("timeslot manager");
404 454
405 my $signal = new Coro::Signal; 455 my $signal = new Coro::Signal;
456 my $busy;
406 457
407 while () { 458 while () {
408 next_job: 459 next_job:
460
409 my $avail = cf::till_tick; 461 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 462
411 for (0 .. $#SLOT_QUEUE) { 463 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 464 if ($SLOT_QUEUE[$_][0] <= $avail) {
465 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 466 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 467 $job->[2]->send;
415 Coro::cede; 468 Coro::cede;
416 goto next_job; 469 goto next_job;
417 } 470 } else {
471 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 472 }
419 } 473 }
420 474
421 if (@SLOT_QUEUE) { 475 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 476 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 477 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 478 $signal->wait;
425 } else { 479 } else {
480 $busy = 0;
426 Coro::schedule; 481 Coro::schedule;
427 } 482 }
428 } 483 }
429}; 484};
430 485
431sub get_slot($;$$) { 486sub get_slot($;$$) {
487 return if tick_inhibit || $Coro::current == $Coro::main;
488
432 my ($time, $pri, $name) = @_; 489 my ($time, $pri, $name) = @_;
433 490
434 $time = $TICK * .6 if $time > $TICK * .6; 491 $time = clamp $time, 0.01, $TICK * .6;
492
435 my $sig = new Coro::Signal; 493 my $sig = new Coro::Signal;
436 494
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 495 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 496 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready; 497 $SLOT_QUEUE->ready;
… …
465=cut 523=cut
466 524
467sub sync_job(&) { 525sub sync_job(&) {
468 my ($job) = @_; 526 my ($job) = @_;
469 527
470 if ($Coro::current == $Coro::main) { 528 if (in_main) {
471 my $time = EV::time; 529 my $time = AE::time;
472 530
473 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
474 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
475 533
476 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
477 535
478 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
479 537
480 my $busy = 1; 538 my $busy = 1;
481 my @res; 539 my @res;
482 540
483 (async { 541 (async {
484 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
485 @res = eval { $job->() }; 543 @res = eval { $job->() };
486 warn $@ if $@; 544 error $@ if $@;
487 undef $busy; 545 undef $busy;
488 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
489 547
490 while ($busy) { 548 while ($busy) {
491 if (Coro::nready) { 549 if (Coro::nready) {
… …
493 } else { 551 } else {
494 EV::loop EV::LOOP_ONESHOT; 552 EV::loop EV::LOOP_ONESHOT;
495 } 553 }
496 } 554 }
497 555
498 my $time = EV::time - $time; 556 my $time = AE::time - $time;
499 557
500 $TICK_START += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
501 559
502 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
503 } else { 561 } else {
… …
534Coro::Storable. May, of course, block. Note that the executed sub may 592Coro::Storable. May, of course, block. Note that the executed sub may
535never block itself or use any form of event handling. 593never block itself or use any form of event handling.
536 594
537=cut 595=cut
538 596
597sub post_fork {
598 reset_signals;
599}
600
539sub fork_call(&@) { 601sub fork_call(&@) {
540 my ($cb, @args) = @_; 602 my ($cb, @args) = @_;
541 603
542 # we seemingly have to make a local copy of the whole thing, 604 # we seemingly have to make a local copy of the whole thing,
543 # otherwise perl prematurely frees the stuff :/ 605 # otherwise perl prematurely frees the stuff :/
544 # TODO: investigate and fix (likely this will be rather laborious) 606 # TODO: investigate and fix (likely this will be rather laborious)
545 607
546 my @res = Coro::Util::fork_eval { 608 my @res = Coro::Util::fork_eval {
547 reset_signals; 609 cf::post_fork;
548 &$cb 610 &$cb
549 }, @args; 611 }, @args;
550 612
551 wantarray ? @res : $res[-1] 613 wantarray ? @res : $res[-1]
552} 614}
553 615
616sub objinfo {
617 (
618 "counter value" => cf::object::object_count,
619 "objects created" => cf::object::create_count,
620 "objects destroyed" => cf::object::destroy_count,
621 "freelist size" => cf::object::free_count,
622 "allocated objects" => cf::object::objects_size,
623 "active objects" => cf::object::actives_size,
624 )
625}
626
627=item $coin = coin_from_name $name
628
629=cut
630
631our %coin_alias = (
632 "silver" => "silvercoin",
633 "silvercoin" => "silvercoin",
634 "silvercoins" => "silvercoin",
635 "gold" => "goldcoin",
636 "goldcoin" => "goldcoin",
637 "goldcoins" => "goldcoin",
638 "platinum" => "platinacoin",
639 "platinumcoin" => "platinacoin",
640 "platinumcoins" => "platinacoin",
641 "platina" => "platinacoin",
642 "platinacoin" => "platinacoin",
643 "platinacoins" => "platinacoin",
644 "royalty" => "royalty",
645 "royalties" => "royalty",
646);
647
648sub coin_from_name($) {
649 $coin_alias{$_[0]}
650 ? cf::arch::find $coin_alias{$_[0]}
651 : undef
652}
653
554=item $value = cf::db_get $family => $key 654=item $value = cf::db_get $family => $key
555 655
556Returns a single value from the environment database. 656Returns a single value from the environment database.
557 657
558=item cf::db_put $family => $key => $value 658=item cf::db_put $family => $key => $value
… …
566within each server. 666within each server.
567 667
568=cut 668=cut
569 669
570sub db_table($) { 670sub db_table($) {
671 cf::error "db_get called from main context"
672 if $Coro::current == $Coro::main;
673
571 my ($name) = @_; 674 my ($name) = @_;
572 my $db = BDB::db_create $DB_ENV; 675 my $db = BDB::db_create $DB_ENV;
573 676
574 eval { 677 eval {
575 $db->set_flags (BDB::CHKSUM); 678 $db->set_flags (BDB::CHKSUM);
… …
585} 688}
586 689
587our $DB; 690our $DB;
588 691
589sub db_init { 692sub db_init {
590 cf::sync_job {
591 $DB ||= db_table "db"; 693 $DB ||= db_table "db";
592 };
593} 694}
594 695
595sub db_get($$) { 696sub db_get($$) {
596 my $key = "$_[0]/$_[1]"; 697 my $key = "$_[0]/$_[1]";
597 698
598 cf::sync_job { 699 cf::error "db_get called from main context"
700 if $Coro::current == $Coro::main;
701
599 BDB::db_get $DB, undef, $key, my $data; 702 BDB::db_get $DB, undef, $key, my $data;
600 703
601 $! ? () 704 $! ? ()
602 : $data 705 : $data
603 }
604} 706}
605 707
606sub db_put($$$) { 708sub db_put($$$) {
607 BDB::dbreq_pri 4; 709 BDB::dbreq_pri 4;
608 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 710 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
664 766
665 my $t1 = Time::HiRes::time; 767 my $t1 = Time::HiRes::time;
666 my $data = $process->(\@data); 768 my $data = $process->(\@data);
667 my $t2 = Time::HiRes::time; 769 my $t2 = Time::HiRes::time;
668 770
669 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 771 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
670 772
671 db_put cache => "$id/data", $data; 773 db_put cache => "$id/data", $data;
672 db_put cache => "$id/md5" , $md5; 774 db_put cache => "$id/md5" , $md5;
673 db_put cache => "$id/meta", $meta; 775 db_put cache => "$id/meta", $meta;
674 776
… …
684 786
685=cut 787=cut
686 788
687sub datalog($@) { 789sub datalog($@) {
688 my ($type, %kv) = @_; 790 my ($type, %kv) = @_;
689 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 791 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
690} 792}
691 793
692=back 794=back
693 795
694=cut 796=cut
695 797
696############################################################################# 798#############################################################################
697 799
698=head2 ATTACHABLE OBJECTS 800=head2 ATTACHABLE OBJECTS
699 801
700Many objects in crossfire are so-called attachable objects. That means you can 802Many objects in deliantra are so-called attachable objects. That means you can
701attach callbacks/event handlers (a collection of which is called an "attachment") 803attach callbacks/event handlers (a collection of which is called an "attachment")
702to it. All such attachable objects support the following methods. 804to it. All such attachable objects support the following methods.
703 805
704In the following description, CLASS can be any of C<global>, C<object> 806In the following description, CLASS can be any of C<global>, C<object>
705C<player>, C<client> or C<map> (i.e. the attachable objects in 807C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
755=item cf::CLASS::attachment $name, ... 857=item cf::CLASS::attachment $name, ...
756 858
757Register an attachment by C<$name> through which attachable objects of the 859Register an attachment by C<$name> through which attachable objects of the
758given CLASS can refer to this attachment. 860given CLASS can refer to this attachment.
759 861
760Some classes such as crossfire maps and objects can specify attachments 862Some classes such as deliantra maps and objects can specify attachments
761that are attached at load/instantiate time, thus the need for a name. 863that are attached at load/instantiate time, thus the need for a name.
762 864
763These calls expect any number of the following handler/hook descriptions: 865These calls expect any number of the following handler/hook descriptions:
764 866
765=over 4 867=over 4
… …
889 991
890 } elsif (exists $cb_id{$type}) { 992 } elsif (exists $cb_id{$type}) {
891 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 993 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
892 994
893 } elsif (ref $type) { 995 } elsif (ref $type) {
894 warn "attaching objects not supported, ignoring.\n"; 996 error "attaching objects not supported, ignoring.\n";
895 997
896 } else { 998 } else {
897 shift @arg; 999 shift @arg;
898 warn "attach argument '$type' not supported, ignoring.\n"; 1000 error "attach argument '$type' not supported, ignoring.\n";
899 } 1001 }
900 } 1002 }
901} 1003}
902 1004
903sub _object_attach { 1005sub _object_attach {
… …
913 _attach $registry, $klass, @attach; 1015 _attach $registry, $klass, @attach;
914 } 1016 }
915 1017
916 $obj->{$name} = \%arg; 1018 $obj->{$name} = \%arg;
917 } else { 1019 } else {
918 warn "object uses attachment '$name' which is not available, postponing.\n"; 1020 info "object uses attachment '$name' which is not available, postponing.\n";
919 } 1021 }
920 1022
921 $obj->{_attachment}{$name} = undef; 1023 $obj->{_attachment}{$name} = undef;
922} 1024}
923 1025
… …
982 1084
983 for (@$callbacks) { 1085 for (@$callbacks) {
984 eval { &{$_->[1]} }; 1086 eval { &{$_->[1]} };
985 1087
986 if ($@) { 1088 if ($@) {
987 warn "$@";
988 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1089 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
989 override; 1090 override;
990 } 1091 }
991 1092
992 return 1 if $override; 1093 return 1 if $override;
993 } 1094 }
… …
1056 1157
1057sub reattach { 1158sub reattach {
1058 # basically do the same as instantiate, without calling instantiate 1159 # basically do the same as instantiate, without calling instantiate
1059 my ($obj) = @_; 1160 my ($obj) = @_;
1060 1161
1162 # no longer needed after getting rid of delete_package?
1061 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1163 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1062 1164
1063 my $registry = $obj->registry; 1165 my $registry = $obj->registry;
1064 1166
1065 @$registry = (); 1167 @$registry = ();
1066 1168
… …
1071 for (@$attach) { 1173 for (@$attach) {
1072 my ($klass, @attach) = @$_; 1174 my ($klass, @attach) = @$_;
1073 _attach $registry, $klass, @attach; 1175 _attach $registry, $klass, @attach;
1074 } 1176 }
1075 } else { 1177 } else {
1076 warn "object uses attachment '$name' that is not available, postponing.\n"; 1178 info "object uses attachment '$name' that is not available, postponing.\n";
1077 } 1179 }
1078 } 1180 }
1079} 1181}
1080 1182
1081cf::attachable->attach ( 1183cf::attachable->attach (
… …
1108 my ($filename, $rdata, $objs) = @_; 1210 my ($filename, $rdata, $objs) = @_;
1109 1211
1110 sync_job { 1212 sync_job {
1111 if (length $$rdata) { 1213 if (length $$rdata) {
1112 utf8::decode (my $decname = $filename); 1214 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1215 trace sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1216 $decname, length $$rdata, scalar @$objs
1217 if $VERBOSE_IO;
1115 1218
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1219 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1220 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1221 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 aio_fsync $fh if $cf::USE_FSYNC; 1222 if ($cf::USE_FSYNC) {
1223 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1224 aio_fsync $fh;
1225 }
1120 close $fh; 1226 aio_close $fh;
1121 1227
1122 if (@$objs) { 1228 if (@$objs) {
1123 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1229 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1124 chmod SAVE_MODE, $fh; 1230 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1231 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1232 aio_write $fh, 0, (length $data), $data, 0;
1127 aio_fsync $fh if $cf::USE_FSYNC; 1233 if ($cf::USE_FSYNC) {
1234 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1235 aio_fsync $fh;
1236 }
1128 close $fh; 1237 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1238 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1239 }
1131 } else { 1240 } else {
1132 aio_unlink "$filename.pst"; 1241 aio_unlink "$filename.pst";
1133 } 1242 }
1134 1243
1135 aio_rename "$filename~", $filename; 1244 aio_rename "$filename~", $filename;
1245
1246 $filename =~ s%/[^/]+$%%;
1247 aio_pathsync $filename if $cf::USE_FSYNC;
1136 } else { 1248 } else {
1137 warn "FATAL: $filename~: $!\n"; 1249 error "unable to save objects: $filename~: $!\n";
1138 } 1250 }
1139 } else { 1251 } else {
1140 aio_unlink $filename; 1252 aio_unlink $filename;
1141 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1142 } 1254 }
… …
1166 my $st = eval { Coro::Storable::thaw $av }; 1278 my $st = eval { Coro::Storable::thaw $av };
1167 $av = $st->{objs}; 1279 $av = $st->{objs};
1168 } 1280 }
1169 1281
1170 utf8::decode (my $decname = $filename); 1282 utf8::decode (my $decname = $filename);
1171 warn sprintf "loading %s (%d,%d)\n", 1283 trace sprintf "loading %s (%d,%d)\n",
1172 $decname, length $data, scalar @{$av || []}; 1284 $decname, length $data, scalar @{$av || []}
1285 if $VERBOSE_IO;
1173 1286
1174 ($data, $av) 1287 ($data, $av)
1175} 1288}
1176 1289
1177=head2 COMMAND CALLBACKS 1290=head2 COMMAND CALLBACKS
… …
1233 my ($name, $cb) = @_; 1346 my ($name, $cb) = @_;
1234 1347
1235 $EXTICMD{$name} = $cb; 1348 $EXTICMD{$name} = $cb;
1236} 1349}
1237 1350
1351use File::Glob ();
1352
1238cf::player->attach ( 1353cf::player->attach (
1239 on_command => sub { 1354 on_unknown_command => sub {
1240 my ($pl, $name, $params) = @_; 1355 my ($pl, $name, $params) = @_;
1241 1356
1242 my $cb = $COMMAND{$name} 1357 my $cb = $COMMAND{$name}
1243 or return; 1358 or return;
1244 1359
… …
1267 1382
1268 $pl->ext_reply ($reply, @reply) 1383 $pl->ext_reply ($reply, @reply)
1269 if $reply; 1384 if $reply;
1270 1385
1271 } else { 1386 } else {
1272 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1387 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1273 } 1388 }
1274 1389
1275 cf::override; 1390 cf::override;
1276 }, 1391 },
1277); 1392);
1278 1393
1394# "readahead" all extensions
1395sub cache_extensions {
1396 my $grp = IO::AIO::aio_group;
1397
1398 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1399 for (grep /\.ext$/, @{$_[0]}) {
1400 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1401 }
1402 };
1403
1404 $grp
1405}
1406
1279sub load_extensions { 1407sub load_extensions {
1408 info "loading extensions...";
1409
1280 cf::sync_job { 1410 cf::sync_job {
1281 my %todo; 1411 my %todo;
1282 1412
1283 for my $path (<$LIBDIR/*.ext>) { 1413 for my $path (<$LIBDIR/*.ext>) {
1284 next unless -r $path; 1414 next unless -r $path;
… …
1302 1432
1303 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1433 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1304 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1434 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1305 1435
1306 $ext{source} = 1436 $ext{source} =
1307 "package $pkg; use strict; use utf8;\n" 1437 "package $pkg; use common::sense;\n"
1308 . "#line 1 \"$path\"\n{\n" 1438 . "#line 1 \"$path\"\n{\n"
1309 . $source 1439 . $source
1310 . "\n};\n1"; 1440 . "\n};\n1";
1311 1441
1312 $todo{$base} = \%ext; 1442 $todo{$base} = \%ext;
1313 } 1443 }
1314 1444
1445 my $pass = 0;
1315 my %done; 1446 my %done;
1316 while (%todo) { 1447 while (%todo) {
1317 my $progress; 1448 my $progress;
1318 1449
1450 ++$pass;
1451
1452 ext:
1319 while (my ($k, $v) = each %todo) { 1453 while (my ($k, $v) = each %todo) {
1320 for (split /,\s*/, $v->{meta}{depends}) { 1454 for (split /,\s*/, $v->{meta}{depends}) {
1321 goto skip 1455 next ext
1322 unless exists $done{$_}; 1456 unless exists $done{$_};
1323 } 1457 }
1324 1458
1325 warn "... loading '$k' into '$v->{pkg}'\n"; 1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1326 1460
1327 unless (eval $v->{source}) { 1461 my $active = eval $v->{source};
1462
1463 if (length $@) {
1328 my $msg = $@ ? "$v->{path}: $@\n" 1464 error "$v->{path}: $@\n";
1329 : "$v->{base}: extension inactive.\n";
1330 1465
1331 if (exists $v->{meta}{mandatory}) {
1332 warn $msg;
1333 cf::cleanup "mandatory extension failed to load, exiting."; 1466 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1334 } 1467 if exists $v->{meta}{mandatory};
1335 1468
1336 warn $msg; 1469 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1470 delete $todo{$k};
1471 } else {
1472 $done{$k} = delete $todo{$k};
1473 push @EXTS, $v->{pkg};
1474 $progress = 1;
1475
1476 info "$v->{base}: extension inactive.\n"
1477 unless $active;
1337 } 1478 }
1338
1339 $done{$k} = delete $todo{$k};
1340 push @EXTS, $v->{pkg};
1341 $progress = 1;
1342 } 1479 }
1343 1480
1344 skip: 1481 unless ($progress) {
1345 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1482 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1346 unless $progress; 1483
1484 while (my ($k, $v) = each %todo) {
1485 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1486 if exists $v->{meta}{mandatory};
1487 }
1488 }
1347 } 1489 }
1348 }; 1490 };
1349} 1491}
1350 1492
1351############################################################################# 1493#############################################################################
1352 1494
1353=back 1495=back
1354 1496
1355=head2 CORE EXTENSIONS 1497=head2 CORE EXTENSIONS
1356 1498
1357Functions and methods that extend core crossfire objects. 1499Functions and methods that extend core deliantra objects.
1358 1500
1359=cut 1501=cut
1360 1502
1361package cf::player; 1503package cf::player;
1362 1504
… …
1405 1547
1406sub exists($) { 1548sub exists($) {
1407 my ($login) = @_; 1549 my ($login) = @_;
1408 1550
1409 $cf::PLAYER{$login} 1551 $cf::PLAYER{$login}
1410 or cf::sync_job { !aio_stat path $login } 1552 or !aio_stat path $login
1411} 1553}
1412 1554
1413sub find($) { 1555sub find($) {
1414 return $cf::PLAYER{$_[0]} || do { 1556 return $cf::PLAYER{$_[0]} || do {
1415 my $login = $_[0]; 1557 my $login = $_[0];
… …
1427 my $f = new_from_file cf::object::thawer path $login 1569 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1570 or return;
1429 1571
1430 my $pl = cf::player::load_pl $f 1572 my $pl = cf::player::load_pl $f
1431 or return; 1573 or return;
1574
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1575 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1576 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1577 $cf::PLAYER{$login} = $pl
1435 } 1578 }
1436 } 1579 }
1437} 1580}
1438 1581
1582cf::player->attach (
1583 on_load => sub {
1584 my ($pl, $path) = @_;
1585
1586 # restore slots saved in save, below
1587 my $slots = delete $pl->{_slots};
1588
1589 $pl->ob->current_weapon ($slots->[0]);
1590 $pl->combat_ob ($slots->[1]);
1591 $pl->ranged_ob ($slots->[2]);
1592 },
1593);
1594
1439sub save($) { 1595sub save($) {
1440 my ($pl) = @_; 1596 my ($pl) = @_;
1441 1597
1442 return if $pl->{deny_save}; 1598 return if $pl->{deny_save};
1443 1599
… …
1446 1602
1447 return if $pl->{deny_save}; 1603 return if $pl->{deny_save};
1448 1604
1449 aio_mkdir playerdir $pl, 0770; 1605 aio_mkdir playerdir $pl, 0770;
1450 $pl->{last_save} = $cf::RUNTIME; 1606 $pl->{last_save} = $cf::RUNTIME;
1607
1608 cf::get_slot 0.01;
1609
1610 # save slots, to be restored later
1611 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1451 1612
1452 $pl->save_pl ($path); 1613 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1614 cf::cede_to_tick;
1454} 1615}
1455 1616
… …
1487 my ($pl) = @_; 1648 my ($pl) = @_;
1488 1649
1489 my $name = $pl->ob->name; 1650 my $name = $pl->ob->name;
1490 1651
1491 $pl->{deny_save} = 1; 1652 $pl->{deny_save} = 1;
1492 $pl->password ("*"); # this should lock out the player until we nuked the dir 1653 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1493 1654
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1495 $pl->deactivate; 1656 $pl->deactivate;
1657
1658 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1659 ext::highscore::check ($pl->ob);
1660
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1497 $pl->ns->destroy if $pl->ns; 1662 $pl->ns->destroy if $pl->ns;
1498 1663
1499 my $path = playerdir $pl; 1664 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1665 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1539 1704
1540 for my $login (@$dirs) { 1705 for my $login (@$dirs) {
1541 my $path = path $login; 1706 my $path = path $login;
1542 1707
1543 # a .pst is a dead give-away for a valid player 1708 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1709 # if no pst file found, open and chekc for blocked users
1710 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1711 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1712 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1713 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1714 }
1549 1715
… …
1553 1719
1554 \@logins 1720 \@logins
1555} 1721}
1556 1722
1557=item $player->maps 1723=item $player->maps
1724
1725=item cf::player::maps $login
1558 1726
1559Returns an arrayref of map paths that are private for this 1727Returns an arrayref of map paths that are private for this
1560player. May block. 1728player. May block.
1561 1729
1562=cut 1730=cut
… …
1580 } 1748 }
1581 1749
1582 \@paths 1750 \@paths
1583} 1751}
1584 1752
1585=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1753=item $protocol_xml = $player->expand_cfpod ($cfpod)
1586 1754
1587Expand crossfire pod fragments into protocol xml. 1755Expand deliantra pod fragments into protocol xml.
1588
1589=cut
1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1602sub expand_cfpod {
1603 my ($self, $pod) = @_;
1604
1605 my $xml;
1606
1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1610
1611 $group =~ s/&/&amp;/g;
1612 $group =~ s/</&lt;/g;
1613
1614 $xml .= $group;
1615 } elsif ($pod =~ m%\G
1616 ([BCGHITU])
1617 <
1618 (?:
1619 ([^<>]*) (?{ $group = $^N })
1620 | < $interior >
1621 )
1622 >
1623 %gcsx
1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1644 "")
1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1656
1657 for ($xml) {
1658 # create single paragraphs (very hackish)
1659 s/(?<=\S)\n(?=\w)/ /g;
1660
1661 # compress some whitespace
1662 s/\s+\n/\n/g; # ws line-ends
1663 s/\n\n+/\n/g; # double lines
1664 s/^\n+//; # beginning lines
1665 s/\n+$//; # ending lines
1666 }
1667
1668 $xml
1669}
1670
1671no re 'eval';
1672
1673sub hintmode {
1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1675 $_[0]{hintmode}
1676}
1677 1756
1678=item $player->ext_reply ($msgid, @msg) 1757=item $player->ext_reply ($msgid, @msg)
1679 1758
1680Sends an ext reply to the player. 1759Sends an ext reply to the player.
1681 1760
… …
1713 1792
1714=cut 1793=cut
1715 1794
1716sub find_by_path($) { 1795sub find_by_path($) {
1717 my ($path) = @_; 1796 my ($path) = @_;
1797
1798 $path =~ s/^~[^\/]*//; # skip ~login
1718 1799
1719 my ($match, $specificity); 1800 my ($match, $specificity);
1720 1801
1721 for my $region (list) { 1802 for my $region (list) {
1722 if ($region->{match} && $path =~ $region->{match}) { 1803 if ($region->{match} && $path =~ $region->{match}) {
… …
1748our $MAX_RESET = 3600; 1829our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1830our $DEFAULT_RESET = 3000;
1750 1831
1751sub generate_random_map { 1832sub generate_random_map {
1752 my ($self, $rmp) = @_; 1833 my ($self, $rmp) = @_;
1834
1835 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1836
1753 # mit "rum" bekleckern, nicht 1837 # mit "rum" bekleckern, nicht
1754 $self->_create_random_map ( 1838 $self->_create_random_map (
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1839 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1840 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1841 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1758 $rmp->{exit_on_final_map}, 1842 $rmp->{exit_on_final_map},
1759 $rmp->{xsize}, $rmp->{ysize}, 1843 $rmp->{xsize}, $rmp->{ysize},
1760 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1844 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1761 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1845 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1776 1860
1777sub register { 1861sub register {
1778 my (undef, $regex, $prio) = @_; 1862 my (undef, $regex, $prio) = @_;
1779 my $pkg = caller; 1863 my $pkg = caller;
1780 1864
1781 no strict;
1782 push @{"$pkg\::ISA"}, __PACKAGE__; 1865 push @{"$pkg\::ISA"}, __PACKAGE__;
1783 1866
1784 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1867 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1785} 1868}
1786 1869
1787# also paths starting with '/' 1870# also paths starting with '/'
1788$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1871$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1789 1872
1790sub thawer_merge { 1873sub thawer_merge {
1791 my ($self, $merge) = @_; 1874 my ($self, $merge) = @_;
1792 1875
1793 # we have to keep some variables in memory intact 1876 # we have to keep some variables in memory intact
… …
1798} 1881}
1799 1882
1800sub normalise { 1883sub normalise {
1801 my ($path, $base) = @_; 1884 my ($path, $base) = @_;
1802 1885
1803 $path = "$path"; # make sure its a string 1886 $path = "$path"; # make sure it's a string
1804 1887
1805 $path =~ s/\.map$//; 1888 $path =~ s/\.map$//;
1806 1889
1807 # map plan: 1890 # map plan:
1808 # 1891 #
… …
1847 $self->init; # pass $1 etc. 1930 $self->init; # pass $1 etc.
1848 return $self; 1931 return $self;
1849 } 1932 }
1850 } 1933 }
1851 1934
1852 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1935 Carp::cluck "unable to resolve path '$path' (base '$base')";
1853 () 1936 ()
1854} 1937}
1855 1938
1856sub init { 1939sub init {
1857 my ($self) = @_; 1940 my ($self) = @_;
… …
1879 1962
1880# the temporary/swap location 1963# the temporary/swap location
1881sub save_path { 1964sub save_path {
1882 my ($self) = @_; 1965 my ($self) = @_;
1883 1966
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1967 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 1968 "$TMPDIR/$path.map"
1886} 1969}
1887 1970
1888# the unique path, undef == no special unique path 1971# the unique path, undef == no special unique path
1889sub uniq_path { 1972sub uniq_path {
1890 my ($self) = @_; 1973 my ($self) = @_;
1891 1974
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1975 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 1976 "$UNIQUEDIR/$path"
1894}
1895
1896# and all this just because we cannot iterate over
1897# all maps in C++...
1898sub change_all_map_light {
1899 my ($change) = @_;
1900
1901 $_->change_map_light ($change)
1902 for grep $_->outdoor, values %cf::MAP;
1903} 1977}
1904 1978
1905sub decay_objects { 1979sub decay_objects {
1906 my ($self) = @_; 1980 my ($self) = @_;
1907 1981
… …
1989 2063
1990sub find; 2064sub find;
1991sub find { 2065sub find {
1992 my ($path, $origin) = @_; 2066 my ($path, $origin) = @_;
1993 2067
2068 cf::cede_to_tick;
2069
1994 $path = normalise $path, $origin && $origin->path; 2070 $path = normalise $path, $origin && $origin->path;
1995 2071
1996 cf::lock_wait "map_data:$path";#d#remove 2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 2073 my $guard2 = cf::lock_acquire "map_find:$path";
1998 2074
1999 $cf::MAP{$path} || do { 2075 $cf::MAP{$path} || do {
2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2002
2003 my $map = new_from_path cf::map $path 2076 my $map = new_from_path cf::map $path
2004 or return; 2077 or return;
2005 2078
2006 $map->{last_save} = $cf::RUNTIME; 2079 $map->{last_save} = $cf::RUNTIME;
2007 2080
… …
2009 or return; 2082 or return;
2010 2083
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2084 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 2085 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 2086 #$cf::WAIT_FOR_TICK->wait;
2087 undef $guard2;
2014 undef $guard1; 2088 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 2089 $map->reset;
2017 return find $path; 2090 return find $path;
2018 } 2091 }
2019 2092
2020 $cf::MAP{$path} = $map 2093 $cf::MAP{$path} = $map
2021 } 2094 }
2022} 2095}
2023 2096
2024sub pre_load { } 2097sub pre_load { }
2025sub post_load { } 2098#sub post_load { } # XS
2026 2099
2027sub load { 2100sub load {
2028 my ($self) = @_; 2101 my ($self) = @_;
2029 2102
2030 local $self->{deny_reset} = 1; # loading can take a long time 2103 local $self->{deny_reset} = 1; # loading can take a long time
… …
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2120 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2121 $f->skip_block;
2049 $self->_load_objects ($f) 2122 $self->_load_objects ($f)
2050 or return; 2123 or return;
2051 2124
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2125 $self->post_load_original
2053 if delete $self->{load_original}; 2126 if delete $self->{load_original};
2054 2127
2055 if (my $uniq = $self->uniq_path) { 2128 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2129 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2130 unless (aio_stat $uniq) {
… …
2075 unless ($self->{deny_activate}) { 2148 unless ($self->{deny_activate}) {
2076 $self->decay_objects; 2149 $self->decay_objects;
2077 $self->fix_auto_apply; 2150 $self->fix_auto_apply;
2078 $self->update_buttons; 2151 $self->update_buttons;
2079 cf::cede_to_tick; 2152 cf::cede_to_tick;
2080 $self->set_darkness_map;
2081 cf::cede_to_tick;
2082 $self->activate; 2153 $self->activate;
2083 } 2154 }
2084 2155
2085 $self->{last_save} = $cf::RUNTIME; 2156 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2157 $self->last_access ($cf::RUNTIME);
2087 2158
2088 $self->in_memory (cf::MAP_IN_MEMORY); 2159 $self->in_memory (cf::MAP_ACTIVE);
2089 } 2160 }
2090 2161
2091 $self->post_load; 2162 $self->post_load;
2092} 2163}
2093 2164
2165# customize the map for a given player, i.e.
2166# return the _real_ map. used by e.g. per-player
2167# maps to change the path to ~playername/mappath
2094sub customise_for { 2168sub customise_for {
2095 my ($self, $ob) = @_; 2169 my ($self, $ob) = @_;
2096 2170
2097 return find "~" . $ob->name . "/" . $self->{path} 2171 return find "~" . $ob->name . "/" . $self->{path}
2098 if $self->per_player; 2172 if $self->per_player;
… …
2114 or next; 2188 or next;
2115 $neigh = find $neigh, $map 2189 $neigh = find $neigh, $map
2116 or next; 2190 or next;
2117 $neigh->load; 2191 $neigh->load;
2118 2192
2193 # now find the diagonal neighbours
2119 push @neigh, 2194 push @neigh,
2120 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2121 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2122 } 2197 }
2123 2198
… …
2130} 2205}
2131 2206
2132sub find_sync { 2207sub find_sync {
2133 my ($path, $origin) = @_; 2208 my ($path, $origin) = @_;
2134 2209
2135 cf::sync_job { find $path, $origin } 2210 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211 if $Coro::current == $Coro::main;
2212
2213 find $path, $origin
2136} 2214}
2137 2215
2138sub do_load_sync { 2216sub do_load_sync {
2139 my ($map) = @_; 2217 my ($map) = @_;
2140 2218
2141 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2142 if $Coro::current == $Coro::main; 2220 if $Coro::current == $Coro::main;
2143 2221
2144 cf::sync_job { $map->load }; 2222 $map->load;
2145} 2223}
2146 2224
2147our %MAP_PREFETCH; 2225our %MAP_PREFETCH;
2148our $MAP_PREFETCHER = undef; 2226our $MAP_PREFETCHER = undef;
2149 2227
… …
2151 my ($path, $origin, $load) = @_; 2229 my ($path, $origin, $load) = @_;
2152 2230
2153 $path = normalise $path, $origin && $origin->{path}; 2231 $path = normalise $path, $origin && $origin->{path};
2154 2232
2155 if (my $map = $cf::MAP{$path}) { 2233 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2234 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2157 } 2235 }
2158 2236
2159 $MAP_PREFETCH{$path} |= $load; 2237 $MAP_PREFETCH{$path} |= $load;
2160 2238
2161 $MAP_PREFETCHER ||= cf::async { 2239 $MAP_PREFETCHER ||= cf::async {
… …
2175 $MAP_PREFETCHER->prio (6); 2253 $MAP_PREFETCHER->prio (6);
2176 2254
2177 () 2255 ()
2178} 2256}
2179 2257
2258# common code, used by both ->save and ->swapout
2180sub save { 2259sub _save {
2181 my ($self) = @_; 2260 my ($self) = @_;
2182
2183 my $lock = cf::lock_acquire "map_data:$self->{path}";
2184 2261
2185 $self->{last_save} = $cf::RUNTIME; 2262 $self->{last_save} = $cf::RUNTIME;
2186 2263
2187 return unless $self->dirty; 2264 return unless $self->dirty;
2188 2265
… …
2197 2274
2198 cf::async { 2275 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2276 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2277 $_->contr->save for $self->players;
2201 }; 2278 };
2279
2280 cf::get_slot 0.02;
2202 2281
2203 if ($uniq) { 2282 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2283 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2284 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2285 } else {
2207 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2286 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2208 } 2287 }
2209} 2288}
2210 2289
2290sub save {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 $self->_save;
2296}
2297
2211sub swap_out { 2298sub swap_out {
2212 my ($self) = @_; 2299 my ($self) = @_;
2213 2300
2214 # save first because save cedes
2215 $self->save;
2216
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2301 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2302
2303 return if $self->in_memory != cf::MAP_ACTIVE;
2304 return if $self->{deny_save};
2219 return if $self->players; 2305 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY;
2221 return if $self->{deny_save};
2222 2306
2307 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2223 $self->in_memory (cf::MAP_SWAPPED); 2310 $self->in_memory (cf::MAP_SWAPPED);
2311
2312 # then atomically save
2313 $self->_save;
2314
2315 # then free the map
2316 $self->clear;
2317}
2318
2319sub reset_at {
2320 my ($self) = @_;
2321
2322 # TODO: safety, remove and allow resettable per-player maps
2323 return 1e99 if $self->{deny_reset};
2324
2325 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2326 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2327
2328 $time + $to
2329}
2330
2331sub should_reset {
2332 my ($self) = @_;
2333
2334 $self->reset_at <= $cf::RUNTIME
2335}
2336
2337sub reset {
2338 my ($self) = @_;
2339
2340 my $lock = cf::lock_acquire "map_data:$self->{path}";
2341
2342 return if $self->players;
2343
2344 cf::trace "resetting map ", $self->path, "\n";
2345
2346 $self->in_memory (cf::MAP_SWAPPED);
2347
2348 # need to save uniques path
2349 unless ($self->{deny_save}) {
2350 my $uniq = $self->uniq_path; utf8::encode $uniq;
2351
2352 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2353 if $uniq;
2354 }
2355
2356 delete $cf::MAP{$self->path};
2224 2357
2225 $self->deactivate; 2358 $self->deactivate;
2226 $_->clear_links_to ($self) for values %cf::MAP; 2359 $_->clear_links_to ($self) for values %cf::MAP;
2227 $self->clear; 2360 $self->clear;
2228}
2229
2230sub reset_at {
2231 my ($self) = @_;
2232
2233 # TODO: safety, remove and allow resettable per-player maps
2234 return 1e99 if $self->{deny_reset};
2235
2236 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2237 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2238
2239 $time + $to
2240}
2241
2242sub should_reset {
2243 my ($self) = @_;
2244
2245 $self->reset_at <= $cf::RUNTIME
2246}
2247
2248sub reset {
2249 my ($self) = @_;
2250
2251 my $lock = cf::lock_acquire "map_data:$self->{path}";
2252
2253 return if $self->players;
2254
2255 warn "resetting map ", $self->path;
2256
2257 $self->in_memory (cf::MAP_SWAPPED);
2258
2259 # need to save uniques path
2260 unless ($self->{deny_save}) {
2261 my $uniq = $self->uniq_path; utf8::encode $uniq;
2262
2263 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2264 if $uniq;
2265 }
2266
2267 delete $cf::MAP{$self->path};
2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
2271 $self->clear;
2272 2361
2273 $self->unlink_save; 2362 $self->unlink_save;
2274 $self->destroy; 2363 $self->destroy;
2275} 2364}
2276 2365
… …
2284 2373
2285 delete $cf::MAP{$self->path}; 2374 delete $cf::MAP{$self->path};
2286 2375
2287 $self->unlink_save; 2376 $self->unlink_save;
2288 2377
2289 bless $self, "cf::map"; 2378 bless $self, "cf::map::wrap";
2290 delete $self->{deny_reset}; 2379 delete $self->{deny_reset};
2291 $self->{deny_save} = 1; 2380 $self->{deny_save} = 1;
2292 $self->reset_timeout (1); 2381 $self->reset_timeout (1);
2293 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2382 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2294 2383
… …
2343 2432
2344sub unique_maps() { 2433sub unique_maps() {
2345 [ 2434 [
2346 map { 2435 map {
2347 utf8::decode $_; 2436 utf8::decode $_;
2348 /\.map$/ 2437 s/\.map$//; # TODO future compatibility hack
2438 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2439 ? ()
2349 ? normalise $_ 2440 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2441 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2442 ]
2353} 2443}
2354 2444
2355package cf; 2445=item cf::map::static_maps
2446
2447Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2448file in the shared directory excluding F</styles> and F</editor>). May
2449block.
2450
2451=cut
2452
2453sub static_maps() {
2454 my @dirs = "";
2455 my @maps;
2456
2457 while (@dirs) {
2458 my $dir = shift @dirs;
2459
2460 next if $dir eq "/styles" || $dir eq "/editor";
2461
2462 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2463 or return;
2464
2465 for (@$files) {
2466 s/\.map$// or next;
2467 utf8::decode $_;
2468 push @maps, "$dir/$_";
2469 }
2470
2471 push @dirs, map "$dir/$_", @$dirs;
2472 }
2473
2474 \@maps
2475}
2356 2476
2357=back 2477=back
2358 2478
2359=head3 cf::object 2479=head3 cf::object
2360 2480
… …
2364 2484
2365=over 4 2485=over 4
2366 2486
2367=item $ob->inv_recursive 2487=item $ob->inv_recursive
2368 2488
2369Returns the inventory of the object _and_ their inventories, recursively. 2489Returns the inventory of the object I<and> their inventories, recursively,
2490but I<not> the object itself.
2370 2491
2371=cut 2492=cut
2372 2493
2373sub inv_recursive_; 2494sub inv_recursive_;
2374sub inv_recursive_ { 2495sub inv_recursive_ {
… …
2379 inv_recursive_ inv $_[0] 2500 inv_recursive_ inv $_[0]
2380} 2501}
2381 2502
2382=item $ref = $ob->ref 2503=item $ref = $ob->ref
2383 2504
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2505Creates and returns a persistent reference to an object that can be stored as a string.
2385 2506
2386=item $ob = cf::object::deref ($refstring) 2507=item $ob = cf::object::deref ($refstring)
2387 2508
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2509returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block. 2510even if the object actually exists. May block.
… …
2421can be C<undef>. Does the right thing when the player is currently in a 2542can be C<undef>. Does the right thing when the player is currently in a
2422dialogue with the given NPC character. 2543dialogue with the given NPC character.
2423 2544
2424=cut 2545=cut
2425 2546
2547our $SAY_CHANNEL = {
2548 id => "say",
2549 title => "Map",
2550 reply => "say ",
2551 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2552};
2553
2554our $CHAT_CHANNEL = {
2555 id => "chat",
2556 title => "Chat",
2557 reply => "chat ",
2558 tooltip => "Player chat and shouts, global to the server.",
2559};
2560
2426# rough implementation of a future "reply" method that works 2561# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2562# with dialog boxes.
2428#TODO: the first argument must go, split into a $npc->reply_to ( method 2563#TODO: the first argument must go, split into a $npc->reply_to ( method
2429sub cf::object::player::reply($$$;$) { 2564sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2565 my ($self, $npc, $msg, $flags) = @_;
… …
2441 my $dialog = $pl->{npc_dialog}; 2576 my $dialog = $pl->{npc_dialog};
2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2577 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2443 2578
2444 } else { 2579 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2580 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2581 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2582 }
2448 } 2583 }
2449} 2584}
2450 2585
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2586=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2476 2611
2477=item $player_object->enter_link 2612=item $player_object->enter_link
2478 2613
2479Freezes the player and moves him/her to a special map (C<{link}>). 2614Freezes the player and moves him/her to a special map (C<{link}>).
2480 2615
2481The player should be reasonably safe there for short amounts of time. You 2616The player should be reasonably safe there for short amounts of time (e.g.
2482I<MUST> call C<leave_link> as soon as possible, though. 2617for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2618though, as the player cannot control the character while it is on the link
2619map.
2483 2620
2484Will never block. 2621Will never block.
2485 2622
2486=item $player_object->leave_link ($map, $x, $y) 2623=item $player_object->leave_link ($map, $x, $y)
2487 2624
… …
2507sub cf::object::player::enter_link { 2644sub cf::object::player::enter_link {
2508 my ($self) = @_; 2645 my ($self) = @_;
2509 2646
2510 $self->deactivate_recursive; 2647 $self->deactivate_recursive;
2511 2648
2649 ++$self->{_link_recursion};
2650
2512 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2651 return if UNIVERSAL::isa $self->map, "ext::map_link";
2513 2652
2514 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2653 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2515 if $self->map && $self->map->{path} ne "{link}"; 2654 if $self->map && $self->map->{path} ne "{link}";
2516 2655
2517 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2656 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2518} 2657}
2519 2658
2520sub cf::object::player::leave_link { 2659sub cf::object::player::leave_link {
2521 my ($self, $map, $x, $y) = @_; 2660 my ($self, $map, $x, $y) = @_;
2522 2661
… …
2539 ($x, $y) = (-1, -1) 2678 ($x, $y) = (-1, -1)
2540 unless (defined $x) && (defined $y); 2679 unless (defined $x) && (defined $y);
2541 2680
2542 # use -1 or undef as default coordinates, not 0, 0 2681 # use -1 or undef as default coordinates, not 0, 0
2543 ($x, $y) = ($map->enter_x, $map->enter_y) 2682 ($x, $y) = ($map->enter_x, $map->enter_y)
2544 if $x <=0 && $y <= 0; 2683 if $x <= 0 && $y <= 0;
2545 2684
2546 $map->load; 2685 $map->load;
2547 $map->load_neighbours; 2686 $map->load_neighbours;
2548 2687
2549 return unless $self->contr->active; 2688 return unless $self->contr->active;
2550 $self->activate_recursive;
2551 2689
2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2553 $self->enter_map ($map, $x, $y); 2691 if ($self->enter_map ($map, $x, $y)) {
2554} 2692 # entering was successful
2693 delete $self->{_link_recursion};
2694 # only activate afterwards, to support waiting in hooks
2695 $self->activate_recursive;
2696 }
2555 2697
2698}
2699
2556=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2700=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2557 2701
2558Moves the player to the given map-path and coordinates by first freezing 2702Moves the player to the given map-path and coordinates by first freezing
2559her, loading and preparing them map, calling the provided $check callback 2703her, loading and preparing them map, calling the provided $check callback
2560that has to return the map if sucecssful, and then unfreezes the player on 2704that has to return the map if sucecssful, and then unfreezes the player on
2561the new (success) or old (failed) map position. In either case, $done will 2705the new (success) or old (failed) map position. In either case, $done will
2562be called at the end of this process. 2706be called at the end of this process.
2563 2707
2708Note that $check will be called with a potentially non-loaded map, so if
2709it needs a loaded map it has to call C<< ->load >>.
2710
2564=cut 2711=cut
2565 2712
2566our $GOTOGEN; 2713our $GOTOGEN;
2567 2714
2568sub cf::object::player::goto { 2715sub cf::object::player::goto {
2569 my ($self, $path, $x, $y, $check, $done) = @_; 2716 my ($self, $path, $x, $y, $check, $done) = @_;
2717
2718 if ($self->{_link_recursion} >= $MAX_LINKS) {
2719 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2720 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2721 ($path, $x, $y) = @$EMERGENCY_POSITION;
2722 }
2570 2723
2571 # do generation counting so two concurrent goto's will be executed in-order 2724 # do generation counting so two concurrent goto's will be executed in-order
2572 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2725 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2573 2726
2574 $self->enter_link; 2727 $self->enter_link;
… …
2598 my $map = eval { 2751 my $map = eval {
2599 my $map = defined $path ? cf::map::find $path : undef; 2752 my $map = defined $path ? cf::map::find $path : undef;
2600 2753
2601 if ($map) { 2754 if ($map) {
2602 $map = $map->customise_for ($self); 2755 $map = $map->customise_for ($self);
2603 $map = $check->($map) if $check && $map; 2756 $map = $check->($map, $x, $y, $self) if $check && $map;
2604 } else { 2757 } else {
2605 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2758 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2606 } 2759 }
2607 2760
2608 $map 2761 $map
… …
2616 if ($gen == $self->{_goto_generation}) { 2769 if ($gen == $self->{_goto_generation}) {
2617 delete $self->{_goto_generation}; 2770 delete $self->{_goto_generation};
2618 $self->leave_link ($map, $x, $y); 2771 $self->leave_link ($map, $x, $y);
2619 } 2772 }
2620 2773
2621 $done->() if $done; 2774 $done->($self) if $done;
2622 })->prio (1); 2775 })->prio (1);
2623} 2776}
2624 2777
2625=item $player_object->enter_exit ($exit_object) 2778=item $player_object->enter_exit ($exit_object)
2626 2779
… …
2646} 2799}
2647 2800
2648sub prepare_random_map { 2801sub prepare_random_map {
2649 my ($exit) = @_; 2802 my ($exit) = @_;
2650 2803
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2804 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2805 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2806 # that depends on the exit object
2656 2807
2657 my $rmp = parse_random_map_params $exit->msg; 2808 my $rmp = parse_random_map_params $exit->msg;
… …
2659 if ($exit->map) { 2810 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2811 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2812 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2813 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2814 $rmp->{origin_y} = $exit->y;
2815
2816 $exit->map->touch;
2664 } 2817 }
2665 2818
2666 $rmp->{random_seed} ||= $exit->random_seed; 2819 $rmp->{random_seed} ||= $exit->random_seed;
2667 2820
2668 my $data = cf::encode_json $rmp; 2821 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2822 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2823 my $meta = "$RANDOMDIR/$md5.meta";
2671 2824
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2825 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2826 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2827 undef $fh;
2675 aio_rename "$meta~", $meta; 2828 aio_rename "$meta~", $meta;
2676 2829
2830 my $slaying = "?random/$md5";
2831
2832 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2833 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2834 $exit->msg (undef);
2835 }
2679 } 2836 }
2680} 2837}
2681 2838
2682sub cf::object::player::enter_exit { 2839sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2840 my ($self, $exit) = @_;
2684 2841
2685 return unless $self->type == cf::PLAYER; 2842 return unless $self->type == cf::PLAYER;
2686 2843
2687 if ($exit->slaying eq "/!") {
2688 #TODO: this should de-fi-ni-te-ly not be a sync-job
2689 # the problem is that $exit might not survive long enough
2690 # so it needs to be done right now, right here
2691 cf::sync_job { prepare_random_map $exit };
2692 }
2693
2694 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2695 my $hp = $exit->stats->hp;
2696 my $sp = $exit->stats->sp;
2697
2698 $self->enter_link; 2844 $self->enter_link;
2699 2845
2700 # if exit is damned, update players death & WoR home-position
2701 $self->contr->savebed ($slaying, $hp, $sp)
2702 if $exit->flag (FLAG_DAMNED);
2703
2704 (async { 2846 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2847 $Coro::current->{desc} = "enter_exit";
2706 2848
2707 $self->deactivate_recursive; # just to be sure
2708 unless (eval { 2849 unless (eval {
2850 $self->deactivate_recursive; # just to be sure
2851
2852 # random map handling
2853 {
2854 my $guard = cf::lock_acquire "exit_prepare:$exit";
2855
2856 prepare_random_map $exit
2857 if $exit->slaying eq "/!";
2858 }
2859
2860 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2861 my $x = $exit->stats->hp;
2862 my $y = $exit->stats->sp;
2863
2709 $self->goto ($slaying, $hp, $sp); 2864 $self->goto ($map, $x, $y);
2710 2865
2866 # if exit is damned, update players death & WoR home-position
2867 $self->contr->savebed ($map, $x, $y)
2868 if $exit->flag (cf::FLAG_DAMNED);
2869
2711 1; 2870 1
2712 }) { 2871 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2872 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "I'll try to bring you back to the map you were before. " 2873 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 2874 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2875 cf::NDI_UNIQUE | cf::NDI_RED);
2717 2876
2718 warn "ERROR in enter_exit: $@"; 2877 error "ERROR in enter_exit: $@";
2719 $self->leave_link; 2878 $self->leave_link;
2720 } 2879 }
2721 })->prio (1); 2880 })->prio (1);
2722} 2881}
2723 2882
… …
2735sub cf::client::send_drawinfo { 2894sub cf::client::send_drawinfo {
2736 my ($self, $text, $flags) = @_; 2895 my ($self, $text, $flags) = @_;
2737 2896
2738 utf8::encode $text; 2897 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2898 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2899}
2900
2901=item $client->send_big_packet ($pkt)
2902
2903Like C<send_packet>, but tries to compress large packets, and fragments
2904them as required.
2905
2906=cut
2907
2908our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2909
2910sub cf::client::send_big_packet {
2911 my ($self, $pkt) = @_;
2912
2913 # try lzf for large packets
2914 $pkt = "lzf " . Compress::LZF::compress $pkt
2915 if 1024 <= length $pkt and $self->{can_lzf};
2916
2917 # split very large packets
2918 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2919 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2920 $pkt = "frag";
2921 }
2922
2923 $self->send_packet ($pkt);
2740} 2924}
2741 2925
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 2926=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 2927
2744Send a drawinfo or msg packet to the client, formatting the msg for the 2928Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2748 2932
2749=cut 2933=cut
2750 2934
2751# non-persistent channels (usually the info channel) 2935# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 2936our %CHANNEL = (
2937 "c/motd" => {
2938 id => "infobox",
2939 title => "MOTD",
2940 reply => undef,
2941 tooltip => "The message of the day",
2942 },
2753 "c/identify" => { 2943 "c/identify" => {
2754 id => "infobox", 2944 id => "infobox",
2755 title => "Identify", 2945 title => "Identify",
2756 reply => undef, 2946 reply => undef,
2757 tooltip => "Items recently identified", 2947 tooltip => "Items recently identified",
… …
2759 "c/examine" => { 2949 "c/examine" => {
2760 id => "infobox", 2950 id => "infobox",
2761 title => "Examine", 2951 title => "Examine",
2762 reply => undef, 2952 reply => undef,
2763 tooltip => "Signs and other items you examined", 2953 tooltip => "Signs and other items you examined",
2954 },
2955 "c/shopinfo" => {
2956 id => "infobox",
2957 title => "Shop Info",
2958 reply => undef,
2959 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 2960 },
2765 "c/book" => { 2961 "c/book" => {
2766 id => "infobox", 2962 id => "infobox",
2767 title => "Book", 2963 title => "Book",
2768 reply => undef, 2964 reply => undef,
… …
2784 id => "infobox", 2980 id => "infobox",
2785 title => "Body Parts", 2981 title => "Body Parts",
2786 reply => undef, 2982 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 2983 tooltip => "Shows which body parts you posess and are available",
2788 }, 2984 },
2985 "c/statistics" => {
2986 id => "infobox",
2987 title => "Statistics",
2988 reply => undef,
2989 tooltip => "Shows your primary statistics",
2990 },
2991 "c/skills" => {
2992 id => "infobox",
2993 title => "Skills",
2994 reply => undef,
2995 tooltip => "Shows your experience per skill and item power",
2996 },
2997 "c/shopitems" => {
2998 id => "infobox",
2999 title => "Shop Items",
3000 reply => undef,
3001 tooltip => "Shows the items currently for sale in this shop",
3002 },
3003 "c/resistances" => {
3004 id => "infobox",
3005 title => "Resistances",
3006 reply => undef,
3007 tooltip => "Shows your resistances",
3008 },
3009 "c/pets" => {
3010 id => "infobox",
3011 title => "Pets",
3012 reply => undef,
3013 tooltip => "Shows information abotu your pets/a specific pet",
3014 },
3015 "c/perceiveself" => {
3016 id => "infobox",
3017 title => "Perceive Self",
3018 reply => undef,
3019 tooltip => "You gained detailed knowledge about yourself",
3020 },
2789 "c/uptime" => { 3021 "c/uptime" => {
2790 id => "infobox", 3022 id => "infobox",
2791 title => "Uptime", 3023 title => "Uptime",
2792 reply => undef, 3024 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 3025 tooltip => "How long the server has been running since last restart",
… …
2796 id => "infobox", 3028 id => "infobox",
2797 title => "Map Info", 3029 title => "Map Info",
2798 reply => undef, 3030 reply => undef,
2799 tooltip => "Information related to the maps", 3031 tooltip => "Information related to the maps",
2800 }, 3032 },
3033 "c/party" => {
3034 id => "party",
3035 title => "Party",
3036 reply => "gsay ",
3037 tooltip => "Messages and chat related to your party",
3038 },
3039 "c/death" => {
3040 id => "death",
3041 title => "Death",
3042 reply => undef,
3043 tooltip => "Reason for and more info about your most recent death",
3044 },
3045 "c/say" => $SAY_CHANNEL,
3046 "c/chat" => $CHAT_CHANNEL,
2801); 3047);
2802 3048
2803sub cf::client::send_msg { 3049sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 3050 my ($self, $channel, $msg, $color, @extra) = @_;
2805 3051
2806 $msg = $self->pl->expand_cfpod ($msg); 3052 $msg = $self->pl->expand_cfpod ($msg)
3053 unless $color & cf::NDI_VERBATIM;
2807 3054
2808 $color &= cf::NDI_CLIENT_MASK; # just in case... 3055 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809 3056
2810 # check predefined channels, for the benefit of C 3057 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 3058 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 3059 $channel = $CHANNEL{$channel};
2813 3060
2814 $self->ext_msg (channel_info => $channel) 3061 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 3062 $channel = $channel->{id};
2818 3063
2819 } elsif (ref $channel) { 3064 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 3065 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 3066 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 3067 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 3068 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 3069 }
2826 3070
2827 $channel = $channel->{id}; 3071 $channel = $channel->{id};
2828 } 3072 }
2829 3073
2830 return unless @extra || length $msg; 3074 return unless @extra || length $msg;
2831 3075
2832 if ($self->can_msg) {
2833 # default colour, mask it out 3076 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3077 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 3078 if $color & cf::NDI_DEF;
2836 3079
2837 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3080 my $pkt = "msg "
3081 . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3082 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2839 } else { 3083 );
2840 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones
2842 for ($msg) {
2843 1 while
2844 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2845 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2846 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2847 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2848 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2849 }
2850 3084
2851 $color &= cf::NDI_COLOR_MASK; 3085 $self->send_big_packet ($pkt);
2852
2853 utf8::encode $msg;
2854
2855 if (0 && $msg =~ /\[/) {
2856 # COMMAND/INFO
2857 $self->send_packet ("drawextinfo $color 10 8 $msg")
2858 } else {
2859 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2860 $self->send_packet ("drawinfo $color $msg")
2861 }
2862 }
2863 }
2864} 3086}
2865 3087
2866=item $client->ext_msg ($type, @msg) 3088=item $client->ext_msg ($type, @msg)
2867 3089
2868Sends an ext event to the client. 3090Sends an ext event to the client.
… …
2871 3093
2872sub cf::client::ext_msg($$@) { 3094sub cf::client::ext_msg($$@) {
2873 my ($self, $type, @msg) = @_; 3095 my ($self, $type, @msg) = @_;
2874 3096
2875 if ($self->extcmd == 2) { 3097 if ($self->extcmd == 2) {
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3098 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2877 } elsif ($self->extcmd == 1) { # TODO: remove 3099 } elsif ($self->extcmd == 1) { # TODO: remove
2878 push @msg, msgtype => "event_$type"; 3100 push @msg, msgtype => "event_$type";
2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 } 3102 }
2881} 3103}
2882 3104
2883=item $client->ext_reply ($msgid, @msg) 3105=item $client->ext_reply ($msgid, @msg)
2884 3106
… …
2888 3110
2889sub cf::client::ext_reply($$@) { 3111sub cf::client::ext_reply($$@) {
2890 my ($self, $id, @msg) = @_; 3112 my ($self, $id, @msg) = @_;
2891 3113
2892 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2893 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2894 } elsif ($self->extcmd == 1) { 3116 } elsif ($self->extcmd == 1) {
2895 #TODO: version 1, remove 3117 #TODO: version 1, remove
2896 unshift @msg, msgtype => "reply", msgid => $id; 3118 unshift @msg, msgtype => "reply", msgid => $id;
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2898 } 3120 }
2899} 3121}
2900 3122
2901=item $success = $client->query ($flags, "text", \&cb) 3123=item $success = $client->query ($flags, "text", \&cb)
2902 3124
… …
2973 3195
2974 $ns->ext_reply ($reply, @reply) 3196 $ns->ext_reply ($reply, @reply)
2975 if $reply; 3197 if $reply;
2976 3198
2977 } else { 3199 } else {
2978 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3200 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2979 } 3201 }
2980 3202
2981 cf::override; 3203 cf::override;
2982 }, 3204 },
2983); 3205);
… …
3003 3225
3004 $coro 3226 $coro
3005} 3227}
3006 3228
3007cf::client->attach ( 3229cf::client->attach (
3008 on_destroy => sub { 3230 on_client_destroy => sub {
3009 my ($ns) = @_; 3231 my ($ns) = @_;
3010 3232
3011 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3233 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3012 }, 3234 },
3013); 3235);
… …
3029our $safe_hole = new Safe::Hole; 3251our $safe_hole = new Safe::Hole;
3030 3252
3031$SIG{FPE} = 'IGNORE'; 3253$SIG{FPE} = 'IGNORE';
3032 3254
3033$safe->permit_only (Opcode::opset qw( 3255$safe->permit_only (Opcode::opset qw(
3034 :base_core :base_mem :base_orig :base_math 3256 :base_core :base_mem :base_orig :base_math :base_loop
3035 grepstart grepwhile mapstart mapwhile 3257 grepstart grepwhile mapstart mapwhile
3036 sort time 3258 sort time
3037)); 3259));
3038 3260
3039# here we export the classes and methods available to script code 3261# here we export the classes and methods available to script code
… …
3042 3264
3043The following functions and methods are available within a safe environment: 3265The following functions and methods are available within a safe environment:
3044 3266
3045 cf::object 3267 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy 3268 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr 3269 insert remove name archname title slaying race decrease split
3270 value
3048 3271
3049 cf::object::player 3272 cf::object::player
3050 player 3273 player
3051 3274
3052 cf::player 3275 cf::player
… …
3057 3280
3058=cut 3281=cut
3059 3282
3060for ( 3283for (
3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3284 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race 3285 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3286 decrease split destroy change_exp value msg lore send_msg)],
3064 ["cf::object::player" => qw(player)], 3287 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3288 ["cf::player" => qw(peaceful send_msg)],
3066 ["cf::map" => qw(trigger)], 3289 ["cf::map" => qw(trigger)],
3067) { 3290) {
3068 no strict 'refs';
3069 my ($pkg, @funs) = @$_; 3291 my ($pkg, @funs) = @$_;
3070 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3292 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3071 for @funs; 3293 for @funs;
3072} 3294}
3073 3295
… …
3088 3310
3089 my $qcode = $code; 3311 my $qcode = $code;
3090 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3312 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3091 $qcode =~ s/\n/\\n/g; 3313 $qcode =~ s/\n/\\n/g;
3092 3314
3315 %vars = (_dummy => 0) unless %vars;
3316
3317 my @res;
3093 local $_; 3318 local $_;
3094 local @safe::cf::_safe_eval_args = values %vars;
3095 3319
3096 my $eval = 3320 my $eval =
3097 "do {\n" 3321 "do {\n"
3098 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3322 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3099 . "#line 0 \"{$qcode}\"\n" 3323 . "#line 0 \"{$qcode}\"\n"
3100 . $code 3324 . $code
3101 . "\n}" 3325 . "\n}"
3102 ; 3326 ;
3103 3327
3328 if ($CFG{safe_eval}) {
3104 sub_generation_inc; 3329 sub_generation_inc;
3330 local @safe::cf::_safe_eval_args = values %vars;
3105 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3331 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3106 sub_generation_inc; 3332 sub_generation_inc;
3333 } else {
3334 local @cf::_safe_eval_args = values %vars;
3335 @res = wantarray ? eval eval : scalar eval $eval;
3336 }
3107 3337
3108 if ($@) { 3338 if ($@) {
3109 warn "$@"; 3339 warn "$@",
3110 warn "while executing safe code '$code'\n"; 3340 "while executing safe code '$code'\n",
3111 warn "with arguments " . (join " ", %vars) . "\n"; 3341 "with arguments " . (join " ", %vars) . "\n";
3112 } 3342 }
3113 3343
3114 wantarray ? @res : $res[0] 3344 wantarray ? @res : $res[0]
3115} 3345}
3116 3346
… …
3130=cut 3360=cut
3131 3361
3132sub register_script_function { 3362sub register_script_function {
3133 my ($fun, $cb) = @_; 3363 my ($fun, $cb) = @_;
3134 3364
3135 no strict 'refs'; 3365 $fun = "safe::$fun" if $CFG{safe_eval};
3136 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3366 *$fun = $safe_hole->wrap ($cb);
3137} 3367}
3138 3368
3139=back 3369=back
3140 3370
3141=cut 3371=cut
… …
3150 # for this (global event?) 3380 # for this (global event?)
3151 %ext::player_env::MUSIC_FACE_CACHE = (); 3381 %ext::player_env::MUSIC_FACE_CACHE = ();
3152 3382
3153 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3383 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3154 3384
3155 warn "loading facedata from $path\n"; 3385 trace "loading facedata from $path\n";
3156 3386
3157 my $facedata;
3158 0 < aio_load $path, $facedata 3387 0 < aio_load $path, my $facedata
3159 or die "$path: $!"; 3388 or die "$path: $!";
3160 3389
3161 $facedata = Coro::Storable::thaw $facedata; 3390 $facedata = Coro::Storable::thaw $facedata;
3162 3391
3163 $facedata->{version} == 2 3392 $facedata->{version} == 2
3164 or cf::cleanup "$path: version mismatch, cannot proceed."; 3393 or cf::cleanup "$path: version mismatch, cannot proceed.";
3165 3394
3166 # patch in the exptable 3395 # patch in the exptable
3396 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3167 $facedata->{resource}{"res/exp_table"} = { 3397 $facedata->{resource}{"res/exp_table"} = {
3168 type => FT_RSRC, 3398 type => FT_RSRC,
3169 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3399 data => $exp_table,
3400 hash => (Digest::MD5::md5 $exp_table),
3170 }; 3401 };
3171 cf::cede_to_tick; 3402 cf::cede_to_tick;
3172 3403
3173 { 3404 {
3174 my $faces = $facedata->{faceinfo}; 3405 my $faces = $facedata->{faceinfo};
… …
3176 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
3177 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3408 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178 3409
3179 cf::face::set_visibility $idx, $info->{visibility}; 3410 cf::face::set_visibility $idx, $info->{visibility};
3180 cf::face::set_magicmap $idx, $info->{magicmap}; 3411 cf::face::set_magicmap $idx, $info->{magicmap};
3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3412 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3413 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3183 3414
3184 cf::cede_to_tick; 3415 cf::cede_to_tick;
3185 } 3416 }
3186 3417
3187 while (my ($face, $info) = each %$faces) { 3418 while (my ($face, $info) = each %$faces) {
… …
3192 3423
3193 if (my $smooth = cf::face::find $info->{smooth}) { 3424 if (my $smooth = cf::face::find $info->{smooth}) {
3194 cf::face::set_smooth $idx, $smooth; 3425 cf::face::set_smooth $idx, $smooth;
3195 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3426 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3196 } else { 3427 } else {
3197 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3428 error "smooth face '$info->{smooth}' not found for face '$face'";
3198 } 3429 }
3199 3430
3200 cf::cede_to_tick; 3431 cf::cede_to_tick;
3201 } 3432 }
3202 } 3433 }
… …
3211 3442
3212 cf::anim::invalidate_all; # d'oh 3443 cf::anim::invalidate_all; # d'oh
3213 } 3444 }
3214 3445
3215 { 3446 {
3216 # TODO: for gcfclient pleasure, we should give resources
3217 # that gcfclient doesn't grok a >10000 face index.
3218 my $res = $facedata->{resource}; 3447 my $res = $facedata->{resource};
3219 3448
3220 while (my ($name, $info) = each %$res) { 3449 while (my ($name, $info) = each %$res) {
3221 if (defined $info->{type}) { 3450 if (defined $info->{type}) {
3222 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3451 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3223 my $data;
3224 3452
3225 if ($info->{type} & 1) { 3453 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3226 # prepend meta info
3227
3228 my $meta = $enc->encode ({
3229 name => $name,
3230 %{ $info->{meta} || {} },
3231 });
3232
3233 $data = pack "(w/a*)*", $meta, $info->{data};
3234 } else {
3235 $data = $info->{data};
3236 }
3237
3238 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3239 cf::face::set_type $idx, $info->{type}; 3454 cf::face::set_type $idx, $info->{type};
3240 } else { 3455 } else {
3241 $RESOURCE{$name} = $info; 3456 $RESOURCE{$name} = $info; # unused
3242 } 3457 }
3243 3458
3244 cf::cede_to_tick; 3459 cf::cede_to_tick;
3245 } 3460 }
3246 } 3461 }
3247 3462
3248 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3463 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3249 3464
3250 1 3465 1
3251} 3466}
3252
3253cf::global->attach (on_resource_update => sub {
3254 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3255 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3256
3257 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3258 my $sound = $soundconf->{compat}[$_]
3259 or next;
3260
3261 my $face = cf::face::find "sound/$sound->[1]";
3262 cf::sound::set $sound->[0] => $face;
3263 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3264 }
3265
3266 while (my ($k, $v) = each %{$soundconf->{event}}) {
3267 my $face = cf::face::find "sound/$v";
3268 cf::sound::set $k => $face;
3269 }
3270 }
3271});
3272 3467
3273register_exticmd fx_want => sub { 3468register_exticmd fx_want => sub {
3274 my ($ns, $want) = @_; 3469 my ($ns, $want) = @_;
3275 3470
3276 while (my ($k, $v) = each %$want) { 3471 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3472 $ns->fx_want ($k, $v);
3278 } 3473 }
3279}; 3474};
3475
3476sub load_resource_file($) {
3477 my $guard = lock_acquire "load_resource_file";
3478
3479 my $status = load_resource_file_ $_[0];
3480 get_slot 0.1, 100;
3481 cf::arch::commit_load;
3482
3483 $status
3484}
3280 3485
3281sub reload_regions { 3486sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework 3487 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?) 3488 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3489 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3298} 3503}
3299 3504
3300sub reload_archetypes { 3505sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3506 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3507 or die "unable to load archetypes\n";
3303 #d# NEED to laod twice to resolve forward references
3304 # this really needs to be done in an extra post-pass
3305 # (which needs to be synchronous, so solve it differently)
3306 load_resource_file "$DATADIR/archetypes"
3307 or die "unable to load archetypes\n";
3308} 3508}
3309 3509
3310sub reload_treasures { 3510sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3511 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3512 or die "unable to load treasurelists\n";
3313} 3513}
3314 3514
3515sub reload_sound {
3516 trace "loading sound config from $DATADIR/sound\n";
3517
3518 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519 or die "$DATADIR/sound $!";
3520
3521 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3522
3523 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524 my $sound = $soundconf->{compat}[$_]
3525 or next;
3526
3527 my $face = cf::face::find "sound/$sound->[1]";
3528 cf::sound::set $sound->[0] => $face;
3529 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3530 }
3531
3532 while (my ($k, $v) = each %{$soundconf->{event}}) {
3533 my $face = cf::face::find "sound/$v";
3534 cf::sound::set $k => $face;
3535 }
3536}
3537
3315sub reload_resources { 3538sub reload_resources {
3316 warn "reloading resource files...\n"; 3539 trace "reloading resource files...\n";
3317 3540
3541 reload_exp_table;
3542 reload_materials;
3543 reload_facedata;
3544 reload_sound;
3545 reload_archetypes;
3318 reload_regions; 3546 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3547 reload_treasures;
3323 3548
3324 warn "finished reloading resource files\n"; 3549 trace "finished reloading resource files\n";
3325}
3326
3327sub init {
3328 reload_resources;
3329} 3550}
3330 3551
3331sub reload_config { 3552sub reload_config {
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3553 trace "reloading config file...\n";
3333 or return;
3334 3554
3335 local $/; 3555 0 < aio_load "$CONFDIR/config", my $config
3556 or die "$CONFDIR/config: $!";
3557
3558 utf8::decode $config;
3559
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3336 *CFG = YAML::Load <$fh>; 3561 *CFG = YAML::XS::Load $config;
3337 3562
3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3339 3564
3340 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3565 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3341 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3566 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3342 3567
3343 if (exists $CFG{mlockall}) { 3568 if (exists $CFG{mlockall}) {
… …
3347 }; 3572 };
3348 warn $@ if $@; 3573 warn $@ if $@;
3349 } 3574 }
3350} 3575}
3351 3576
3577sub pidfile() {
3578 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3579 or die "$PIDFILE: $!";
3580 flock $fh, &Fcntl::LOCK_EX
3581 or die "$PIDFILE: flock: $!";
3582 $fh
3583}
3584
3585# make sure only one server instance is running at any one time
3586sub atomic {
3587 my $fh = pidfile;
3588
3589 my $pid = <$fh>;
3590 kill 9, $pid if $pid > 0;
3591
3592 seek $fh, 0, 0;
3593 print $fh $$;
3594}
3595
3596sub main_loop {
3597 trace "EV::loop starting\n";
3598 if (1) {
3599 EV::loop;
3600 }
3601 trace "EV::loop returned\n";
3602 goto &main_loop unless $REALLY_UNLOOP;
3603}
3604
3352sub main { 3605sub main {
3606 cf::init_globals; # initialise logging
3607
3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3609 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3612
3613 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3614
3353 # we must not ever block the main coroutine 3615 # we must not ever block the main coroutine
3354 local $Coro::idle = sub { 3616 local $Coro::idle = sub {
3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3617 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3356 (async { 3618 (async {
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3619 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3620 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3621 })->prio (Coro::PRIO_MAX);
3360 }; 3622 };
3361 3623
3362 reload_config;
3363 db_init;
3364 load_extensions;
3365
3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno; 3624 evthread_start IO::AIO::poll_fileno;
3368 EV::loop; 3625
3626 cf::sync_job {
3627 cf::incloader::init ();
3628
3629 cf::init_anim;
3630 cf::init_attackmess;
3631 cf::init_dynamic;
3632
3633 cf::load_settings;
3634
3635 reload_resources;
3636 reload_config;
3637 db_init;
3638
3639 cf::init_uuid;
3640 cf::init_signals;
3641 cf::init_skills;
3642
3643 cf::init_beforeplay;
3644
3645 atomic;
3646
3647 load_extensions;
3648
3649 utime time, time, $RUNTIMEFILE;
3650
3651 # no (long-running) fork's whatsoever before this point(!)
3652 use POSIX ();
3653 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3654
3655 (pop @POST_INIT)->(0) while @POST_INIT;
3656 };
3657
3658 cf::object::thawer::errors_are_fatal 0;
3659 info "parse errors in files are no longer fatal from this point on.\n";
3660
3661 my $free_main; $free_main = EV::idle sub {
3662 undef $free_main;
3663 undef &main; # free gobs of memory :)
3664 };
3665
3666 goto &main_loop;
3369} 3667}
3370 3668
3371############################################################################# 3669#############################################################################
3372# initialisation and cleanup 3670# initialisation and cleanup
3373 3671
3374# install some emergency cleanup handlers 3672# install some emergency cleanup handlers
3375BEGIN { 3673BEGIN {
3376 our %SIGWATCHER = (); 3674 our %SIGWATCHER = ();
3377 for my $signal (qw(INT HUP TERM)) { 3675 for my $signal (qw(INT HUP TERM)) {
3378 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3676 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3379 cf::cleanup "SIG$signal"; 3677 cf::cleanup "SIG$signal";
3380 }; 3678 };
3381 } 3679 }
3382} 3680}
3383 3681
3384sub write_runtime { 3682sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime"; 3683 my $t0 = AE::time;
3386 3684
3387 # first touch the runtime file to show we are still running: 3685 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3686 # the fsync below can take a very very long time.
3389 3687
3390 IO::AIO::aio_utime $runtime, undef, undef; 3688 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3391 3689
3392 my $guard = cf::lock_acquire "write_runtime"; 3690 my $guard = cf::lock_acquire "write_runtime";
3393 3691
3394 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3692 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3395 or return; 3693 or return;
3396 3694
3397 my $value = $cf::RUNTIME + 90 + 10; 3695 my $value = $cf::RUNTIME + 90 + 10;
3398 # 10 is the runtime save interval, for a monotonic clock 3696 # 10 is the runtime save interval, for a monotonic clock
3399 # 60 allows for the watchdog to kill the server. 3697 # 60 allows for the watchdog to kill the server.
… …
3409 aio_utime $fh, undef, undef; 3707 aio_utime $fh, undef, undef;
3410 3708
3411 close $fh 3709 close $fh
3412 or return; 3710 or return;
3413 3711
3414 aio_rename "$runtime~", $runtime 3712 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3415 and return; 3713 and return;
3416 3714
3417 warn "runtime file written.\n"; 3715 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3418 3716
3419 1 3717 1
3718}
3719
3720our $uuid_lock;
3721our $uuid_skip;
3722
3723sub write_uuid_sync($) {
3724 $uuid_skip ||= $_[0];
3725
3726 return if $uuid_lock;
3727 local $uuid_lock = 1;
3728
3729 my $uuid = "$LOCALDIR/uuid";
3730
3731 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3732 or return;
3733
3734 my $value = uuid_seq uuid_cur;
3735
3736 unless ($value) {
3737 info "cowardly refusing to write zero uuid value!\n";
3738 return;
3739 }
3740
3741 my $value = uuid_str $value + $uuid_skip;
3742 $uuid_skip = 0;
3743
3744 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3745 and return;
3746
3747 # always fsync - this file is important
3748 aio_fsync $fh
3749 and return;
3750
3751 close $fh
3752 or return;
3753
3754 aio_rename "$uuid~", $uuid
3755 and return;
3756
3757 trace "uuid file written ($value).\n";
3758
3759 1
3760
3761}
3762
3763sub write_uuid($$) {
3764 my ($skip, $sync) = @_;
3765
3766 $sync ? write_uuid_sync $skip
3767 : async { write_uuid_sync $skip };
3420} 3768}
3421 3769
3422sub emergency_save() { 3770sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3771 my $freeze_guard = cf::freeze_mainloop;
3424 3772
3425 warn "enter emergency perl save\n"; 3773 info "emergency_perl_save: enter\n";
3774
3775 # this is a trade-off: we want to be very quick here, so
3776 # save all maps without fsync, and later call a global sync
3777 # (which in turn might be very very slow)
3778 local $USE_FSYNC = 0;
3426 3779
3427 cf::sync_job { 3780 cf::sync_job {
3781 cf::write_runtime_sync; # external watchdog should not bark
3782
3428 # use a peculiar iteration method to avoid tripping on perl 3783 # use a peculiar iteration method to avoid tripping on perl
3429 # refcount bugs in for. also avoids problems with players 3784 # refcount bugs in for. also avoids problems with players
3430 # and maps saved/destroyed asynchronously. 3785 # and maps saved/destroyed asynchronously.
3431 warn "begin emergency player save\n"; 3786 info "emergency_perl_save: begin player save\n";
3432 for my $login (keys %cf::PLAYER) { 3787 for my $login (keys %cf::PLAYER) {
3433 my $pl = $cf::PLAYER{$login} or next; 3788 my $pl = $cf::PLAYER{$login} or next;
3434 $pl->valid or next; 3789 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3790 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3436 $pl->save; 3791 $pl->save;
3437 } 3792 }
3438 warn "end emergency player save\n"; 3793 info "emergency_perl_save: end player save\n";
3439 3794
3440 warn "begin emergency map save\n"; 3795 cf::write_runtime_sync; # external watchdog should not bark
3796
3797 info "emergency_perl_save: begin map save\n";
3441 for my $path (keys %cf::MAP) { 3798 for my $path (keys %cf::MAP) {
3442 my $map = $cf::MAP{$path} or next; 3799 my $map = $cf::MAP{$path} or next;
3443 $map->valid or next; 3800 $map->valid or next;
3444 $map->save; 3801 $map->save;
3445 } 3802 }
3446 warn "end emergency map save\n"; 3803 info "emergency_perl_save: end map save\n";
3447 3804
3448 warn "begin emergency database checkpoint\n"; 3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3807 info "emergency_perl_save: begin database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3808 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3809 info "emergency_perl_save: end database checkpoint\n";
3810
3811 info "emergency_perl_save: begin write uuid\n";
3812 write_uuid_sync 1;
3813 info "emergency_perl_save: end write uuid\n";
3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 trace "emergency_perl_save: syncing database to disk";
3818 BDB::db_env_txn_checkpoint $DB_ENV;
3819
3820 info "emergency_perl_save: starting sync\n";
3821 IO::AIO::aio_sync sub {
3822 info "emergency_perl_save: finished sync\n";
3823 };
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: flushing outstanding aio requests";
3828 while (IO::AIO::nreqs || BDB::nreqs) {
3829 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3830 }
3831
3832 cf::write_runtime_sync; # external watchdog should not bark
3451 }; 3833 };
3452 3834
3453 warn "leave emergency perl save\n"; 3835 info "emergency_perl_save: leave\n";
3454} 3836}
3455 3837
3456sub post_cleanup { 3838sub post_cleanup {
3457 my ($make_core) = @_; 3839 my ($make_core) = @_;
3458 3840
3841 IO::AIO::flush;
3842
3459 warn Carp::longmess "post_cleanup backtrace" 3843 error Carp::longmess "post_cleanup backtrace"
3460 if $make_core; 3844 if $make_core;
3845
3846 my $fh = pidfile;
3847 unlink $PIDFILE if <$fh> == $$;
3848}
3849
3850# a safer delete_package, copied from Symbol
3851sub clear_package($) {
3852 my $pkg = shift;
3853
3854 # expand to full symbol table name if needed
3855 unless ($pkg =~ /^main::.*::$/) {
3856 $pkg = "main$pkg" if $pkg =~ /^::/;
3857 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3858 $pkg .= '::' unless $pkg =~ /::$/;
3859 }
3860
3861 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3862 my $stem_symtab = *{$stem}{HASH};
3863
3864 defined $stem_symtab and exists $stem_symtab->{$leaf}
3865 or return;
3866
3867 # clear all symbols
3868 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3869 for my $name (keys %$leaf_symtab) {
3870 _gv_clear *{"$pkg$name"};
3871# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3872 }
3461} 3873}
3462 3874
3463sub do_reload_perl() { 3875sub do_reload_perl() {
3464 # can/must only be called in main 3876 # can/must only be called in main
3465 if ($Coro::current != $Coro::main) { 3877 unless (in_main) {
3466 warn "can only reload from main coroutine"; 3878 error "can only reload from main coroutine";
3467 return; 3879 return;
3468 } 3880 }
3469 3881
3882 return if $RELOAD++;
3883
3884 my $t1 = AE::time;
3885
3886 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl";
3470 warn "reloading..."; 3888 info "reloading...";
3471 3889
3472 warn "entering sync_job"; 3890 trace "entering sync_job";
3473 3891
3474 cf::sync_job { 3892 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark
3476 cf::emergency_save; 3893 #cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark
3478 3894
3479 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV;
3481
3482 # if anything goes wrong in here, we should simply crash as we already saved
3483
3484 warn "flushing outstanding aio requests";
3485 for (;;) {
3486 BDB::flush;
3487 IO::AIO::flush;
3488 Coro::cede_notself;
3489 last unless IO::AIO::nreqs || BDB::nreqs;
3490 warn "iterate...";
3491 }
3492
3493 ++$RELOAD;
3494
3495 warn "cancelling all extension coros"; 3895 trace "cancelling all extension coros";
3496 $_->cancel for values %EXT_CORO; 3896 $_->cancel for values %EXT_CORO;
3497 %EXT_CORO = (); 3897 %EXT_CORO = ();
3498 3898
3499 warn "removing commands"; 3899 trace "removing commands";
3500 %COMMAND = (); 3900 %COMMAND = ();
3501 3901
3502 warn "removing ext/exti commands"; 3902 trace "removing ext/exti commands";
3503 %EXTCMD = (); 3903 %EXTCMD = ();
3504 %EXTICMD = (); 3904 %EXTICMD = ();
3505 3905
3506 warn "unloading/nuking all extensions"; 3906 trace "unloading/nuking all extensions";
3507 for my $pkg (@EXTS) { 3907 for my $pkg (@EXTS) {
3508 warn "... unloading $pkg"; 3908 trace "... unloading $pkg";
3509 3909
3510 if (my $cb = $pkg->can ("unload")) { 3910 if (my $cb = $pkg->can ("unload")) {
3511 eval { 3911 eval {
3512 $cb->($pkg); 3912 $cb->($pkg);
3513 1 3913 1
3514 } or warn "$pkg unloaded, but with errors: $@"; 3914 } or error "$pkg unloaded, but with errors: $@";
3915 }
3916
3917 trace "... clearing $pkg";
3918 clear_package $pkg;
3515 } 3919 }
3516 3920
3517 warn "... nuking $pkg";
3518 Symbol::delete_package $pkg;
3519 }
3520
3521 warn "unloading all perl modules loaded from $LIBDIR"; 3921 trace "unloading all perl modules loaded from $LIBDIR";
3522 while (my ($k, $v) = each %INC) { 3922 while (my ($k, $v) = each %INC) {
3523 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3524 3924
3525 warn "... unloading $k"; 3925 trace "... unloading $k";
3526 delete $INC{$k}; 3926 delete $INC{$k};
3527 3927
3528 $k =~ s/\.pm$//; 3928 $k =~ s/\.pm$//;
3529 $k =~ s/\//::/g; 3929 $k =~ s/\//::/g;
3530 3930
3531 if (my $cb = $k->can ("unload_module")) { 3931 if (my $cb = $k->can ("unload_module")) {
3532 $cb->(); 3932 $cb->();
3933 }
3934
3935 clear_package $k;
3533 } 3936 }
3534 3937
3535 Symbol::delete_package $k;
3536 }
3537
3538 warn "getting rid of safe::, as good as possible"; 3938 trace "getting rid of safe::, as good as possible";
3539 Symbol::delete_package "safe::$_" 3939 clear_package "safe::$_"
3540 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3940 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3541 3941
3542 warn "unloading cf.pm \"a bit\""; 3942 trace "unloading cf.pm \"a bit\"";
3543 delete $INC{"cf.pm"}; 3943 delete $INC{"cf.pm"};
3544 delete $INC{"cf/pod.pm"}; 3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3545 3945
3546 # don't, removes xs symbols, too, 3946 # don't, removes xs symbols, too,
3547 # and global variables created in xs 3947 # and global variables created in xs
3548 #Symbol::delete_package __PACKAGE__; 3948 #clear_package __PACKAGE__;
3549 3949
3550 warn "unload completed, starting to reload now"; 3950 info "unload completed, starting to reload now";
3551 3951
3552 warn "reloading cf.pm"; 3952 trace "reloading cf.pm";
3553 require cf; 3953 require cf;
3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3954 cf::_connect_to_perl_1;
3555 3955
3556 warn "loading config and database again"; 3956 trace "loading config and database again";
3557 cf::reload_config; 3957 cf::reload_config;
3558 3958
3559 warn "loading extensions"; 3959 trace "loading extensions";
3560 cf::load_extensions; 3960 cf::load_extensions;
3561 3961
3962 if ($REATTACH_ON_RELOAD) {
3562 warn "reattaching attachments to objects/players"; 3963 trace "reattaching attachments to objects/players";
3563 _global_reattach; # objects, sockets 3964 _global_reattach; # objects, sockets
3564 warn "reattaching attachments to maps"; 3965 trace "reattaching attachments to maps";
3565 reattach $_ for values %MAP; 3966 reattach $_ for values %MAP;
3566 warn "reattaching attachments to players"; 3967 trace "reattaching attachments to players";
3567 reattach $_ for values %PLAYER; 3968 reattach $_ for values %PLAYER;
3969 }
3568 3970
3971 trace "running post_init jobs";
3972 (pop @POST_INIT)->(1) while @POST_INIT;
3973
3569 warn "leaving sync_job"; 3974 trace "leaving sync_job";
3570 3975
3571 1 3976 1
3572 } or do { 3977 } or do {
3573 warn $@; 3978 error $@;
3574 cf::cleanup "error while reloading, exiting."; 3979 cf::cleanup "error while reloading, exiting.";
3980 };
3981
3982 info "reloaded";
3983 --$RELOAD;
3575 }; 3984 }
3576 3985
3577 warn "reloaded"; 3986 $t1 = AE::time - $t1;
3987 info "reload completed in ${t1}s\n";
3578}; 3988};
3579 3989
3580our $RELOAD_WATCHER; # used only during reload 3990our $RELOAD_WATCHER; # used only during reload
3581 3991
3582sub reload_perl() { 3992sub reload_perl() {
3583 # doing reload synchronously and two reloads happen back-to-back, 3993 # doing reload synchronously and two reloads happen back-to-back,
3584 # coro crashes during coro_state_free->destroy here. 3994 # coro crashes during coro_state_free->destroy here.
3585 3995
3996 $RELOAD_WATCHER ||= cf::async {
3997 Coro::AIO::aio_wait cache_extensions;
3998
3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3999 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3587 do_reload_perl; 4000 do_reload_perl;
3588 undef $RELOAD_WATCHER; 4001 undef $RELOAD_WATCHER;
4002 };
3589 }; 4003 };
3590} 4004}
3591 4005
3592register_command "reload" => sub { 4006register_command "reload" => sub {
3593 my ($who, $arg) = @_; 4007 my ($who, $arg) = @_;
… …
3599 reload_perl; 4013 reload_perl;
3600 }; 4014 };
3601 } 4015 }
3602}; 4016};
3603 4017
3604unshift @INC, $LIBDIR; 4018#############################################################################
3605 4019
3606my $bug_warning = 0; 4020my $bug_warning = 0;
3607 4021
3608our @WAIT_FOR_TICK; 4022our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN; 4023our @WAIT_FOR_TICK_BEGIN;
3610 4024
3611sub wait_for_tick { 4025sub wait_for_tick() {
3612 return if tick_inhibit;
3613 return if $Coro::current == $Coro::main; 4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3614 4027
3615 my $signal = new Coro::Signal; 4028 my $signal = new Coro::Signal;
3616 push @WAIT_FOR_TICK, $signal; 4029 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait; 4030 $signal->wait;
3618} 4031}
3619 4032
3620sub wait_for_tick_begin { 4033sub wait_for_tick_begin() {
3621 return if tick_inhibit;
3622 return if $Coro::current == $Coro::main; 4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3623 4035
3624 my $signal = new Coro::Signal; 4036 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 4037 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 4038 $signal->wait;
3627} 4039}
… …
3633 return; 4045 return;
3634 } 4046 }
3635 4047
3636 cf::server_tick; # one server iteration 4048 cf::server_tick; # one server iteration
3637 4049
4050 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4051
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4052 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4053 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 4054 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 4055 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 4056 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 4057 or error "ERROR: unable to write runtime file: $!";
3644 }; 4058 };
3645 } 4059 }
3646 4060
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3648 $sig->send; 4062 $sig->send;
… …
3656 4070
3657 if (0) { 4071 if (0) {
3658 if ($NEXT_TICK) { 4072 if ($NEXT_TICK) {
3659 my $jitter = $TICK_START - $NEXT_TICK; 4073 my $jitter = $TICK_START - $NEXT_TICK;
3660 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4074 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3661 warn "jitter $JITTER\n";#d# 4075 debug "jitter $JITTER\n";#d#
3662 } 4076 }
3663 } 4077 }
3664} 4078}
3665 4079
3666{ 4080{
3667 # configure BDB 4081 # configure BDB
3668 4082
3669 BDB::min_parallel 8; 4083 BDB::min_parallel 16;
3670 BDB::max_poll_reqs $TICK * 0.1; 4084 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 4085 $AnyEvent::BDB::WATCHER->priority (1);
3672 4086
3673 unless ($DB_ENV) { 4087 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 4088 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4089 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | BDB::LOG_AUTOREMOVE, 1); 4090 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4091 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4092 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4093 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 4094
3680 cf::sync_job { 4095 cf::sync_job {
3681 eval { 4096 eval {
… …
3707{ 4122{
3708 # configure IO::AIO 4123 # configure IO::AIO
3709 4124
3710 IO::AIO::min_parallel 8; 4125 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 4126 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 4127 undef $AnyEvent::AIO::WATCHER;
3713} 4128}
3714 4129
3715my $_log_backtrace; 4130my $_log_backtrace;
3716 4131
3717sub _log_backtrace { 4132sub _log_backtrace {
… …
3720 $msg =~ s/\n//; 4135 $msg =~ s/\n//;
3721 4136
3722 # limit the # of concurrent backtraces 4137 # limit the # of concurrent backtraces
3723 if ($_log_backtrace < 2) { 4138 if ($_log_backtrace < 2) {
3724 ++$_log_backtrace; 4139 ++$_log_backtrace;
4140 my $perl_bt = Carp::longmess $msg;
3725 async { 4141 async {
3726 $Coro::current->{desc} = "abt $msg"; 4142 $Coro::current->{desc} = "abt $msg";
3727 4143
3728 my @bt = fork_call { 4144 my @bt = fork_call {
3729 @addr = map { sprintf "%x", $_ } @addr; 4145 @addr = map { sprintf "%x", $_ } @addr;
… …
3740 } 4156 }
3741 4157
3742 @funcs 4158 @funcs
3743 }; 4159 };
3744 4160
3745 LOG llevInfo, "[ABT] $msg\n"; 4161 LOG llevInfo, "[ABT] $perl_bt\n";
4162 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3746 LOG llevInfo, "[ABT] $_\n" for @bt; 4163 LOG llevInfo, "[ABT] $_\n" for @bt;
3747 --$_log_backtrace; 4164 --$_log_backtrace;
3748 }; 4165 };
3749 } else { 4166 } else {
3750 LOG llevInfo, "[ABT] $msg\n"; 4167 LOG llevInfo, "[ABT] $msg\n";
3751 LOG llevInfo, "[ABT] [suppressed]\n"; 4168 LOG llevInfo, "[ABT] [suppressed]\n";
3752 } 4169 }
3753} 4170}
3754 4171
3755# load additional modules 4172# load additional modules
3756use cf::pod; 4173require "cf/$_.pm" for @EXTRA_MODULES;
4174cf::_connect_to_perl_2;
3757 4175
3758END { cf::emergency_save } 4176END { cf::emergency_save }
3759 4177
37601 41781
3761 4179

Diff Legend

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