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.416 by root, Fri Apr 11 13:59:06 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]
614}
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 )
552} 625}
553 626
554=item $coin = coin_from_name $name 627=item $coin = coin_from_name $name
555 628
556=cut 629=cut
… …
593within each server. 666within each server.
594 667
595=cut 668=cut
596 669
597sub db_table($) { 670sub db_table($) {
671 cf::error "db_get called from main context"
672 if $Coro::current == $Coro::main;
673
598 my ($name) = @_; 674 my ($name) = @_;
599 my $db = BDB::db_create $DB_ENV; 675 my $db = BDB::db_create $DB_ENV;
600 676
601 eval { 677 eval {
602 $db->set_flags (BDB::CHKSUM); 678 $db->set_flags (BDB::CHKSUM);
… …
612} 688}
613 689
614our $DB; 690our $DB;
615 691
616sub db_init { 692sub db_init {
617 cf::sync_job {
618 $DB ||= db_table "db"; 693 $DB ||= db_table "db";
619 };
620} 694}
621 695
622sub db_get($$) { 696sub db_get($$) {
623 my $key = "$_[0]/$_[1]"; 697 my $key = "$_[0]/$_[1]";
624 698
625 cf::sync_job { 699 cf::error "db_get called from main context"
700 if $Coro::current == $Coro::main;
701
626 BDB::db_get $DB, undef, $key, my $data; 702 BDB::db_get $DB, undef, $key, my $data;
627 703
628 $! ? () 704 $! ? ()
629 : $data 705 : $data
630 }
631} 706}
632 707
633sub db_put($$$) { 708sub db_put($$$) {
634 BDB::dbreq_pri 4; 709 BDB::dbreq_pri 4;
635 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 710 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
691 766
692 my $t1 = Time::HiRes::time; 767 my $t1 = Time::HiRes::time;
693 my $data = $process->(\@data); 768 my $data = $process->(\@data);
694 my $t2 = Time::HiRes::time; 769 my $t2 = Time::HiRes::time;
695 770
696 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 771 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
697 772
698 db_put cache => "$id/data", $data; 773 db_put cache => "$id/data", $data;
699 db_put cache => "$id/md5" , $md5; 774 db_put cache => "$id/md5" , $md5;
700 db_put cache => "$id/meta", $meta; 775 db_put cache => "$id/meta", $meta;
701 776
… …
711 786
712=cut 787=cut
713 788
714sub datalog($@) { 789sub datalog($@) {
715 my ($type, %kv) = @_; 790 my ($type, %kv) = @_;
716 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 791 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
717} 792}
718 793
719=back 794=back
720 795
721=cut 796=cut
722 797
723############################################################################# 798#############################################################################
724 799
725=head2 ATTACHABLE OBJECTS 800=head2 ATTACHABLE OBJECTS
726 801
727Many 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
728attach callbacks/event handlers (a collection of which is called an "attachment") 803attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 804to it. All such attachable objects support the following methods.
730 805
731In 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>
732C<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
… …
782=item cf::CLASS::attachment $name, ... 857=item cf::CLASS::attachment $name, ...
783 858
784Register an attachment by C<$name> through which attachable objects of the 859Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 860given CLASS can refer to this attachment.
786 861
787Some classes such as crossfire maps and objects can specify attachments 862Some classes such as deliantra maps and objects can specify attachments
788that 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.
789 864
790These calls expect any number of the following handler/hook descriptions: 865These calls expect any number of the following handler/hook descriptions:
791 866
792=over 4 867=over 4
… …
916 991
917 } elsif (exists $cb_id{$type}) { 992 } elsif (exists $cb_id{$type}) {
918 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 993 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
919 994
920 } elsif (ref $type) { 995 } elsif (ref $type) {
921 warn "attaching objects not supported, ignoring.\n"; 996 error "attaching objects not supported, ignoring.\n";
922 997
923 } else { 998 } else {
924 shift @arg; 999 shift @arg;
925 warn "attach argument '$type' not supported, ignoring.\n"; 1000 error "attach argument '$type' not supported, ignoring.\n";
926 } 1001 }
927 } 1002 }
928} 1003}
929 1004
930sub _object_attach { 1005sub _object_attach {
… …
940 _attach $registry, $klass, @attach; 1015 _attach $registry, $klass, @attach;
941 } 1016 }
942 1017
943 $obj->{$name} = \%arg; 1018 $obj->{$name} = \%arg;
944 } else { 1019 } else {
945 warn "object uses attachment '$name' which is not available, postponing.\n"; 1020 info "object uses attachment '$name' which is not available, postponing.\n";
946 } 1021 }
947 1022
948 $obj->{_attachment}{$name} = undef; 1023 $obj->{_attachment}{$name} = undef;
949} 1024}
950 1025
… …
1009 1084
1010 for (@$callbacks) { 1085 for (@$callbacks) {
1011 eval { &{$_->[1]} }; 1086 eval { &{$_->[1]} };
1012 1087
1013 if ($@) { 1088 if ($@) {
1014 warn "$@";
1015 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1089 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1016 override; 1090 override;
1017 } 1091 }
1018 1092
1019 return 1 if $override; 1093 return 1 if $override;
1020 } 1094 }
… …
1083 1157
1084sub reattach { 1158sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1159 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1160 my ($obj) = @_;
1087 1161
1162 # no longer needed after getting rid of delete_package?
1088 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
1089 1164
1090 my $registry = $obj->registry; 1165 my $registry = $obj->registry;
1091 1166
1092 @$registry = (); 1167 @$registry = ();
1093 1168
… …
1098 for (@$attach) { 1173 for (@$attach) {
1099 my ($klass, @attach) = @$_; 1174 my ($klass, @attach) = @$_;
1100 _attach $registry, $klass, @attach; 1175 _attach $registry, $klass, @attach;
1101 } 1176 }
1102 } else { 1177 } else {
1103 warn "object uses attachment '$name' that is not available, postponing.\n"; 1178 info "object uses attachment '$name' that is not available, postponing.\n";
1104 } 1179 }
1105 } 1180 }
1106} 1181}
1107 1182
1108cf::attachable->attach ( 1183cf::attachable->attach (
… …
1135 my ($filename, $rdata, $objs) = @_; 1210 my ($filename, $rdata, $objs) = @_;
1136 1211
1137 sync_job { 1212 sync_job {
1138 if (length $$rdata) { 1213 if (length $$rdata) {
1139 utf8::decode (my $decname = $filename); 1214 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1215 trace sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1216 $decname, length $$rdata, scalar @$objs
1217 if $VERBOSE_IO;
1142 1218
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1219 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1220 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1221 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 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 }
1147 close $fh; 1226 aio_close $fh;
1148 1227
1149 if (@$objs) { 1228 if (@$objs) {
1150 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) {
1151 chmod SAVE_MODE, $fh; 1230 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1231 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1232 aio_write $fh, 0, (length $data), $data, 0;
1154 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 }
1155 close $fh; 1237 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1238 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1239 }
1158 } else { 1240 } else {
1159 aio_unlink "$filename.pst"; 1241 aio_unlink "$filename.pst";
1160 } 1242 }
1161 1243
1162 aio_rename "$filename~", $filename; 1244 aio_rename "$filename~", $filename;
1245
1246 $filename =~ s%/[^/]+$%%;
1247 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1248 } else {
1164 warn "FATAL: $filename~: $!\n"; 1249 error "unable to save objects: $filename~: $!\n";
1165 } 1250 }
1166 } else { 1251 } else {
1167 aio_unlink $filename; 1252 aio_unlink $filename;
1168 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1169 } 1254 }
… …
1193 my $st = eval { Coro::Storable::thaw $av }; 1278 my $st = eval { Coro::Storable::thaw $av };
1194 $av = $st->{objs}; 1279 $av = $st->{objs};
1195 } 1280 }
1196 1281
1197 utf8::decode (my $decname = $filename); 1282 utf8::decode (my $decname = $filename);
1198 warn sprintf "loading %s (%d,%d)\n", 1283 trace sprintf "loading %s (%d,%d)\n",
1199 $decname, length $data, scalar @{$av || []}; 1284 $decname, length $data, scalar @{$av || []}
1285 if $VERBOSE_IO;
1200 1286
1201 ($data, $av) 1287 ($data, $av)
1202} 1288}
1203 1289
1204=head2 COMMAND CALLBACKS 1290=head2 COMMAND CALLBACKS
… …
1260 my ($name, $cb) = @_; 1346 my ($name, $cb) = @_;
1261 1347
1262 $EXTICMD{$name} = $cb; 1348 $EXTICMD{$name} = $cb;
1263} 1349}
1264 1350
1351use File::Glob ();
1352
1265cf::player->attach ( 1353cf::player->attach (
1266 on_command => sub { 1354 on_unknown_command => sub {
1267 my ($pl, $name, $params) = @_; 1355 my ($pl, $name, $params) = @_;
1268 1356
1269 my $cb = $COMMAND{$name} 1357 my $cb = $COMMAND{$name}
1270 or return; 1358 or return;
1271 1359
… …
1294 1382
1295 $pl->ext_reply ($reply, @reply) 1383 $pl->ext_reply ($reply, @reply)
1296 if $reply; 1384 if $reply;
1297 1385
1298 } else { 1386 } else {
1299 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1387 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1300 } 1388 }
1301 1389
1302 cf::override; 1390 cf::override;
1303 }, 1391 },
1304); 1392);
1305 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
1306sub load_extensions { 1407sub load_extensions {
1408 info "loading extensions...";
1409
1307 cf::sync_job { 1410 cf::sync_job {
1308 my %todo; 1411 my %todo;
1309 1412
1310 for my $path (<$LIBDIR/*.ext>) { 1413 for my $path (<$LIBDIR/*.ext>) {
1311 next unless -r $path; 1414 next unless -r $path;
… …
1329 1432
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1433 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1434 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1435
1333 $ext{source} = 1436 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1437 "package $pkg; use common::sense;\n"
1335 . "#line 1 \"$path\"\n{\n" 1438 . "#line 1 \"$path\"\n{\n"
1336 . $source 1439 . $source
1337 . "\n};\n1"; 1440 . "\n};\n1";
1338 1441
1339 $todo{$base} = \%ext; 1442 $todo{$base} = \%ext;
1340 } 1443 }
1341 1444
1445 my $pass = 0;
1342 my %done; 1446 my %done;
1343 while (%todo) { 1447 while (%todo) {
1344 my $progress; 1448 my $progress;
1345 1449
1450 ++$pass;
1451
1452 ext:
1346 while (my ($k, $v) = each %todo) { 1453 while (my ($k, $v) = each %todo) {
1347 for (split /,\s*/, $v->{meta}{depends}) { 1454 for (split /,\s*/, $v->{meta}{depends}) {
1348 goto skip 1455 next ext
1349 unless exists $done{$_}; 1456 unless exists $done{$_};
1350 } 1457 }
1351 1458
1352 warn "... loading '$k' into '$v->{pkg}'\n"; 1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1353 1460
1354 unless (eval $v->{source}) { 1461 my $active = eval $v->{source};
1462
1463 if (length $@) {
1355 my $msg = $@ ? "$v->{path}: $@\n" 1464 error "$v->{path}: $@\n";
1356 : "$v->{base}: extension inactive.\n";
1357 1465
1358 if (exists $v->{meta}{mandatory}) {
1359 warn $msg;
1360 cf::cleanup "mandatory extension failed to load, exiting."; 1466 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1361 } 1467 if exists $v->{meta}{mandatory};
1362 1468
1363 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;
1364 } 1478 }
1365
1366 $done{$k} = delete $todo{$k};
1367 push @EXTS, $v->{pkg};
1368 $progress = 1;
1369 } 1479 }
1370 1480
1371 skip: 1481 unless ($progress) {
1372 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1482 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1373 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 }
1374 } 1489 }
1375 }; 1490 };
1376} 1491}
1377 1492
1378############################################################################# 1493#############################################################################
1379 1494
1380=back 1495=back
1381 1496
1382=head2 CORE EXTENSIONS 1497=head2 CORE EXTENSIONS
1383 1498
1384Functions and methods that extend core crossfire objects. 1499Functions and methods that extend core deliantra objects.
1385 1500
1386=cut 1501=cut
1387 1502
1388package cf::player; 1503package cf::player;
1389 1504
… …
1432 1547
1433sub exists($) { 1548sub exists($) {
1434 my ($login) = @_; 1549 my ($login) = @_;
1435 1550
1436 $cf::PLAYER{$login} 1551 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1552 or !aio_stat path $login
1438} 1553}
1439 1554
1440sub find($) { 1555sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1556 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1557 my $login = $_[0];
… …
1454 my $f = new_from_file cf::object::thawer path $login 1569 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1570 or return;
1456 1571
1457 my $pl = cf::player::load_pl $f 1572 my $pl = cf::player::load_pl $f
1458 or return; 1573 or return;
1574
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1575 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1576 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1577 $cf::PLAYER{$login} = $pl
1462 } 1578 }
1463 } 1579 }
1464} 1580}
1465 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
1466sub save($) { 1595sub save($) {
1467 my ($pl) = @_; 1596 my ($pl) = @_;
1468 1597
1469 return if $pl->{deny_save}; 1598 return if $pl->{deny_save};
1470 1599
… …
1473 1602
1474 return if $pl->{deny_save}; 1603 return if $pl->{deny_save};
1475 1604
1476 aio_mkdir playerdir $pl, 0770; 1605 aio_mkdir playerdir $pl, 0770;
1477 $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];
1478 1612
1479 $pl->save_pl ($path); 1613 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1614 cf::cede_to_tick;
1481} 1615}
1482 1616
… …
1514 my ($pl) = @_; 1648 my ($pl) = @_;
1515 1649
1516 my $name = $pl->ob->name; 1650 my $name = $pl->ob->name;
1517 1651
1518 $pl->{deny_save} = 1; 1652 $pl->{deny_save} = 1;
1519 $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
1520 1654
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $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
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1662 $pl->ns->destroy if $pl->ns;
1525 1663
1526 my $path = playerdir $pl; 1664 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1665 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1566 1704
1567 for my $login (@$dirs) { 1705 for my $login (@$dirs) {
1568 my $path = path $login; 1706 my $path = path $login;
1569 1707
1570 # a .pst is a dead give-away for a valid player 1708 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1709 # if no pst file found, open and chekc for blocked users
1710 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1711 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1712 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1713 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1714 }
1576 1715
… …
1580 1719
1581 \@logins 1720 \@logins
1582} 1721}
1583 1722
1584=item $player->maps 1723=item $player->maps
1724
1725=item cf::player::maps $login
1585 1726
1586Returns an arrayref of map paths that are private for this 1727Returns an arrayref of map paths that are private for this
1587player. May block. 1728player. May block.
1588 1729
1589=cut 1730=cut
… …
1607 } 1748 }
1608 1749
1609 \@paths 1750 \@paths
1610} 1751}
1611 1752
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1753=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1754
1614Expand crossfire pod fragments into protocol xml. 1755Expand deliantra pod fragments into protocol xml.
1615
1616=cut
1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1629sub expand_cfpod {
1630 my ($self, $pod) = @_;
1631
1632 my $xml;
1633
1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group;
1642 } elsif ($pod =~ m%\G
1643 ([BCGHITU])
1644 <
1645 (?:
1646 ([^<>]*) (?{ $group = $^N })
1647 | < $interior >
1648 )
1649 >
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "")
1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1694
1695 $xml
1696}
1697
1698no re 'eval';
1699
1700sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode}
1703}
1704 1756
1705=item $player->ext_reply ($msgid, @msg) 1757=item $player->ext_reply ($msgid, @msg)
1706 1758
1707Sends an ext reply to the player. 1759Sends an ext reply to the player.
1708 1760
… …
1740 1792
1741=cut 1793=cut
1742 1794
1743sub find_by_path($) { 1795sub find_by_path($) {
1744 my ($path) = @_; 1796 my ($path) = @_;
1797
1798 $path =~ s/^~[^\/]*//; # skip ~login
1745 1799
1746 my ($match, $specificity); 1800 my ($match, $specificity);
1747 1801
1748 for my $region (list) { 1802 for my $region (list) {
1749 if ($region->{match} && $path =~ $region->{match}) { 1803 if ($region->{match} && $path =~ $region->{match}) {
… …
1775our $MAX_RESET = 3600; 1829our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 1830our $DEFAULT_RESET = 3000;
1777 1831
1778sub generate_random_map { 1832sub generate_random_map {
1779 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
1780 # mit "rum" bekleckern, nicht 1837 # mit "rum" bekleckern, nicht
1781 $self->_create_random_map ( 1838 $self->_create_random_map (
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1839 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1840 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1841 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1785 $rmp->{exit_on_final_map}, 1842 $rmp->{exit_on_final_map},
1786 $rmp->{xsize}, $rmp->{ysize}, 1843 $rmp->{xsize}, $rmp->{ysize},
1787 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1844 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1788 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1845 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1803 1860
1804sub register { 1861sub register {
1805 my (undef, $regex, $prio) = @_; 1862 my (undef, $regex, $prio) = @_;
1806 my $pkg = caller; 1863 my $pkg = caller;
1807 1864
1808 no strict;
1809 push @{"$pkg\::ISA"}, __PACKAGE__; 1865 push @{"$pkg\::ISA"}, __PACKAGE__;
1810 1866
1811 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1867 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1812} 1868}
1813 1869
1814# also paths starting with '/' 1870# also paths starting with '/'
1815$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1871$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1816 1872
1817sub thawer_merge { 1873sub thawer_merge {
1818 my ($self, $merge) = @_; 1874 my ($self, $merge) = @_;
1819 1875
1820 # we have to keep some variables in memory intact 1876 # we have to keep some variables in memory intact
… …
1825} 1881}
1826 1882
1827sub normalise { 1883sub normalise {
1828 my ($path, $base) = @_; 1884 my ($path, $base) = @_;
1829 1885
1830 $path = "$path"; # make sure its a string 1886 $path = "$path"; # make sure it's a string
1831 1887
1832 $path =~ s/\.map$//; 1888 $path =~ s/\.map$//;
1833 1889
1834 # map plan: 1890 # map plan:
1835 # 1891 #
… …
1874 $self->init; # pass $1 etc. 1930 $self->init; # pass $1 etc.
1875 return $self; 1931 return $self;
1876 } 1932 }
1877 } 1933 }
1878 1934
1879 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1935 Carp::cluck "unable to resolve path '$path' (base '$base')";
1880 () 1936 ()
1881} 1937}
1882 1938
1883sub init { 1939sub init {
1884 my ($self) = @_; 1940 my ($self) = @_;
… …
1906 1962
1907# the temporary/swap location 1963# the temporary/swap location
1908sub save_path { 1964sub save_path {
1909 my ($self) = @_; 1965 my ($self) = @_;
1910 1966
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1967 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 1968 "$TMPDIR/$path.map"
1913} 1969}
1914 1970
1915# the unique path, undef == no special unique path 1971# the unique path, undef == no special unique path
1916sub uniq_path { 1972sub uniq_path {
1917 my ($self) = @_; 1973 my ($self) = @_;
1918 1974
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1975 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 1976 "$UNIQUEDIR/$path"
1921}
1922
1923# and all this just because we cannot iterate over
1924# all maps in C++...
1925sub change_all_map_light {
1926 my ($change) = @_;
1927
1928 $_->change_map_light ($change)
1929 for grep $_->outdoor, values %cf::MAP;
1930} 1977}
1931 1978
1932sub decay_objects { 1979sub decay_objects {
1933 my ($self) = @_; 1980 my ($self) = @_;
1934 1981
… …
2016 2063
2017sub find; 2064sub find;
2018sub find { 2065sub find {
2019 my ($path, $origin) = @_; 2066 my ($path, $origin) = @_;
2020 2067
2068 cf::cede_to_tick;
2069
2021 $path = normalise $path, $origin && $origin->path; 2070 $path = normalise $path, $origin && $origin->path;
2022 2071
2023 cf::lock_wait "map_data:$path";#d#remove 2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2024 cf::lock_wait "map_find:$path"; 2073 my $guard2 = cf::lock_acquire "map_find:$path";
2025 2074
2026 $cf::MAP{$path} || do { 2075 $cf::MAP{$path} || do {
2027 my $guard1 = cf::lock_acquire "map_find:$path";
2028 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2029
2030 my $map = new_from_path cf::map $path 2076 my $map = new_from_path cf::map $path
2031 or return; 2077 or return;
2032 2078
2033 $map->{last_save} = $cf::RUNTIME; 2079 $map->{last_save} = $cf::RUNTIME;
2034 2080
… …
2036 or return; 2082 or return;
2037 2083
2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2084 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2039 # doing this can freeze the server in a sync job, obviously 2085 # doing this can freeze the server in a sync job, obviously
2040 #$cf::WAIT_FOR_TICK->wait; 2086 #$cf::WAIT_FOR_TICK->wait;
2087 undef $guard2;
2041 undef $guard1; 2088 undef $guard1;
2042 undef $guard2;
2043 $map->reset; 2089 $map->reset;
2044 return find $path; 2090 return find $path;
2045 } 2091 }
2046 2092
2047 $cf::MAP{$path} = $map 2093 $cf::MAP{$path} = $map
2048 } 2094 }
2049} 2095}
2050 2096
2051sub pre_load { } 2097sub pre_load { }
2052sub post_load { } 2098#sub post_load { } # XS
2053 2099
2054sub load { 2100sub load {
2055 my ($self) = @_; 2101 my ($self) = @_;
2056 2102
2057 local $self->{deny_reset} = 1; # loading can take a long time 2103 local $self->{deny_reset} = 1; # loading can take a long time
… …
2074 my $f = new_from_file cf::object::thawer $self->{load_path}; 2120 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block; 2121 $f->skip_block;
2076 $self->_load_objects ($f) 2122 $self->_load_objects ($f)
2077 or return; 2123 or return;
2078 2124
2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2125 $self->post_load_original
2080 if delete $self->{load_original}; 2126 if delete $self->{load_original};
2081 2127
2082 if (my $uniq = $self->uniq_path) { 2128 if (my $uniq = $self->uniq_path) {
2083 utf8::encode $uniq; 2129 utf8::encode $uniq;
2084 unless (aio_stat $uniq) { 2130 unless (aio_stat $uniq) {
… …
2102 unless ($self->{deny_activate}) { 2148 unless ($self->{deny_activate}) {
2103 $self->decay_objects; 2149 $self->decay_objects;
2104 $self->fix_auto_apply; 2150 $self->fix_auto_apply;
2105 $self->update_buttons; 2151 $self->update_buttons;
2106 cf::cede_to_tick; 2152 cf::cede_to_tick;
2107 $self->set_darkness_map;
2108 cf::cede_to_tick;
2109 $self->activate; 2153 $self->activate;
2110 } 2154 }
2111 2155
2112 $self->{last_save} = $cf::RUNTIME; 2156 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME); 2157 $self->last_access ($cf::RUNTIME);
2114 2158
2115 $self->in_memory (cf::MAP_IN_MEMORY); 2159 $self->in_memory (cf::MAP_ACTIVE);
2116 } 2160 }
2117 2161
2118 $self->post_load; 2162 $self->post_load;
2119} 2163}
2120 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
2121sub customise_for { 2168sub customise_for {
2122 my ($self, $ob) = @_; 2169 my ($self, $ob) = @_;
2123 2170
2124 return find "~" . $ob->name . "/" . $self->{path} 2171 return find "~" . $ob->name . "/" . $self->{path}
2125 if $self->per_player; 2172 if $self->per_player;
… …
2141 or next; 2188 or next;
2142 $neigh = find $neigh, $map 2189 $neigh = find $neigh, $map
2143 or next; 2190 or next;
2144 $neigh->load; 2191 $neigh->load;
2145 2192
2193 # now find the diagonal neighbours
2146 push @neigh, 2194 push @neigh,
2147 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2148 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2149 } 2197 }
2150 2198
… …
2157} 2205}
2158 2206
2159sub find_sync { 2207sub find_sync {
2160 my ($path, $origin) = @_; 2208 my ($path, $origin) = @_;
2161 2209
2162 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
2163} 2214}
2164 2215
2165sub do_load_sync { 2216sub do_load_sync {
2166 my ($map) = @_; 2217 my ($map) = @_;
2167 2218
2168 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2169 if $Coro::current == $Coro::main; 2220 if $Coro::current == $Coro::main;
2170 2221
2171 cf::sync_job { $map->load }; 2222 $map->load;
2172} 2223}
2173 2224
2174our %MAP_PREFETCH; 2225our %MAP_PREFETCH;
2175our $MAP_PREFETCHER = undef; 2226our $MAP_PREFETCHER = undef;
2176 2227
… …
2178 my ($path, $origin, $load) = @_; 2229 my ($path, $origin, $load) = @_;
2179 2230
2180 $path = normalise $path, $origin && $origin->{path}; 2231 $path = normalise $path, $origin && $origin->{path};
2181 2232
2182 if (my $map = $cf::MAP{$path}) { 2233 if (my $map = $cf::MAP{$path}) {
2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2234 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2184 } 2235 }
2185 2236
2186 $MAP_PREFETCH{$path} |= $load; 2237 $MAP_PREFETCH{$path} |= $load;
2187 2238
2188 $MAP_PREFETCHER ||= cf::async { 2239 $MAP_PREFETCHER ||= cf::async {
… …
2202 $MAP_PREFETCHER->prio (6); 2253 $MAP_PREFETCHER->prio (6);
2203 2254
2204 () 2255 ()
2205} 2256}
2206 2257
2258# common code, used by both ->save and ->swapout
2207sub save { 2259sub _save {
2208 my ($self) = @_; 2260 my ($self) = @_;
2209
2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211 2261
2212 $self->{last_save} = $cf::RUNTIME; 2262 $self->{last_save} = $cf::RUNTIME;
2213 2263
2214 return unless $self->dirty; 2264 return unless $self->dirty;
2215 2265
… …
2224 2274
2225 cf::async { 2275 cf::async {
2226 $Coro::current->{desc} = "map player save"; 2276 $Coro::current->{desc} = "map player save";
2227 $_->contr->save for $self->players; 2277 $_->contr->save for $self->players;
2228 }; 2278 };
2279
2280 cf::get_slot 0.02;
2229 2281
2230 if ($uniq) { 2282 if ($uniq) {
2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2283 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2284 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2233 } else { 2285 } else {
2234 $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);
2235 } 2287 }
2236} 2288}
2237 2289
2290sub save {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 $self->_save;
2296}
2297
2238sub swap_out { 2298sub swap_out {
2239 my ($self) = @_; 2299 my ($self) = @_;
2240 2300
2241 # save first because save cedes
2242 $self->save;
2243
2244 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2301 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245 2302
2303 return if $self->in_memory != cf::MAP_ACTIVE;
2304 return if $self->{deny_save};
2246 return if $self->players; 2305 return if $self->players;
2247 return if $self->in_memory != cf::MAP_IN_MEMORY;
2248 return if $self->{deny_save};
2249 2306
2307 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2250 $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};
2251 2357
2252 $self->deactivate; 2358 $self->deactivate;
2253 $_->clear_links_to ($self) for values %cf::MAP; 2359 $_->clear_links_to ($self) for values %cf::MAP;
2254 $self->clear; 2360 $self->clear;
2255}
2256
2257sub reset_at {
2258 my ($self) = @_;
2259
2260 # TODO: safety, remove and allow resettable per-player maps
2261 return 1e99 if $self->{deny_reset};
2262
2263 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2264 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2265
2266 $time + $to
2267}
2268
2269sub should_reset {
2270 my ($self) = @_;
2271
2272 $self->reset_at <= $cf::RUNTIME
2273}
2274
2275sub reset {
2276 my ($self) = @_;
2277
2278 my $lock = cf::lock_acquire "map_data:$self->{path}";
2279
2280 return if $self->players;
2281
2282 warn "resetting map ", $self->path;
2283
2284 $self->in_memory (cf::MAP_SWAPPED);
2285
2286 # need to save uniques path
2287 unless ($self->{deny_save}) {
2288 my $uniq = $self->uniq_path; utf8::encode $uniq;
2289
2290 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2291 if $uniq;
2292 }
2293
2294 delete $cf::MAP{$self->path};
2295
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
2298 $self->clear;
2299 2361
2300 $self->unlink_save; 2362 $self->unlink_save;
2301 $self->destroy; 2363 $self->destroy;
2302} 2364}
2303 2365
… …
2311 2373
2312 delete $cf::MAP{$self->path}; 2374 delete $cf::MAP{$self->path};
2313 2375
2314 $self->unlink_save; 2376 $self->unlink_save;
2315 2377
2316 bless $self, "cf::map"; 2378 bless $self, "cf::map::wrap";
2317 delete $self->{deny_reset}; 2379 delete $self->{deny_reset};
2318 $self->{deny_save} = 1; 2380 $self->{deny_save} = 1;
2319 $self->reset_timeout (1); 2381 $self->reset_timeout (1);
2320 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2382 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2321 2383
… …
2370 2432
2371sub unique_maps() { 2433sub unique_maps() {
2372 [ 2434 [
2373 map { 2435 map {
2374 utf8::decode $_; 2436 utf8::decode $_;
2375 /\.map$/ 2437 s/\.map$//; # TODO future compatibility hack
2438 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2439 ? ()
2376 ? normalise $_ 2440 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2441 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2442 ]
2380} 2443}
2381 2444
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}
2476
2382=back 2477=back
2383 2478
2384=head3 cf::object 2479=head3 cf::object
2385 2480
2386=cut 2481=cut
… …
2389 2484
2390=over 4 2485=over 4
2391 2486
2392=item $ob->inv_recursive 2487=item $ob->inv_recursive
2393 2488
2394Returns 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.
2395 2491
2396=cut 2492=cut
2397 2493
2398sub inv_recursive_; 2494sub inv_recursive_;
2399sub inv_recursive_ { 2495sub inv_recursive_ {
… …
2404 inv_recursive_ inv $_[0] 2500 inv_recursive_ inv $_[0]
2405} 2501}
2406 2502
2407=item $ref = $ob->ref 2503=item $ref = $ob->ref
2408 2504
2409creates 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.
2410 2506
2411=item $ob = cf::object::deref ($refstring) 2507=item $ob = cf::object::deref ($refstring)
2412 2508
2413returns 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,
2414even if the object actually exists. May block. 2510even if the object actually exists. May block.
… …
2446can 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
2447dialogue with the given NPC character. 2543dialogue with the given NPC character.
2448 2544
2449=cut 2545=cut
2450 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
2451# rough implementation of a future "reply" method that works 2561# rough implementation of a future "reply" method that works
2452# with dialog boxes. 2562# with dialog boxes.
2453#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
2454sub cf::object::player::reply($$$;$) { 2564sub cf::object::player::reply($$$;$) {
2455 my ($self, $npc, $msg, $flags) = @_; 2565 my ($self, $npc, $msg, $flags) = @_;
… …
2466 my $dialog = $pl->{npc_dialog}; 2576 my $dialog = $pl->{npc_dialog};
2467 $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));
2468 2578
2469 } else { 2579 } else {
2470 $msg = $npc->name . " says: $msg" if $npc; 2580 $msg = $npc->name . " says: $msg" if $npc;
2471 $self->message ($msg, $flags); 2581 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2472 } 2582 }
2473 } 2583 }
2474} 2584}
2475 2585
2476=item $object->send_msg ($channel, $msg, $color, [extra...]) 2586=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2501 2611
2502=item $player_object->enter_link 2612=item $player_object->enter_link
2503 2613
2504Freezes 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}>).
2505 2615
2506The 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.
2507I<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.
2508 2620
2509Will never block. 2621Will never block.
2510 2622
2511=item $player_object->leave_link ($map, $x, $y) 2623=item $player_object->leave_link ($map, $x, $y)
2512 2624
… …
2532sub cf::object::player::enter_link { 2644sub cf::object::player::enter_link {
2533 my ($self) = @_; 2645 my ($self) = @_;
2534 2646
2535 $self->deactivate_recursive; 2647 $self->deactivate_recursive;
2536 2648
2649 ++$self->{_link_recursion};
2650
2537 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2651 return if UNIVERSAL::isa $self->map, "ext::map_link";
2538 2652
2539 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2653 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2540 if $self->map && $self->map->{path} ne "{link}"; 2654 if $self->map && $self->map->{path} ne "{link}";
2541 2655
2542 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2656 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2543} 2657}
2544 2658
2545sub cf::object::player::leave_link { 2659sub cf::object::player::leave_link {
2546 my ($self, $map, $x, $y) = @_; 2660 my ($self, $map, $x, $y) = @_;
2547 2661
… …
2564 ($x, $y) = (-1, -1) 2678 ($x, $y) = (-1, -1)
2565 unless (defined $x) && (defined $y); 2679 unless (defined $x) && (defined $y);
2566 2680
2567 # use -1 or undef as default coordinates, not 0, 0 2681 # use -1 or undef as default coordinates, not 0, 0
2568 ($x, $y) = ($map->enter_x, $map->enter_y) 2682 ($x, $y) = ($map->enter_x, $map->enter_y)
2569 if $x <=0 && $y <= 0; 2683 if $x <= 0 && $y <= 0;
2570 2684
2571 $map->load; 2685 $map->load;
2572 $map->load_neighbours; 2686 $map->load_neighbours;
2573 2687
2574 return unless $self->contr->active; 2688 return unless $self->contr->active;
2575 $self->activate_recursive;
2576 2689
2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2578 $self->enter_map ($map, $x, $y); 2691 if ($self->enter_map ($map, $x, $y)) {
2579} 2692 # entering was successful
2693 delete $self->{_link_recursion};
2694 # only activate afterwards, to support waiting in hooks
2695 $self->activate_recursive;
2696 }
2580 2697
2698}
2699
2581=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)]])
2582 2701
2583Moves 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
2584her, loading and preparing them map, calling the provided $check callback 2703her, loading and preparing them map, calling the provided $check callback
2585that 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
2586the 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
2587be called at the end of this process. 2706be called at the end of this process.
2588 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
2589=cut 2711=cut
2590 2712
2591our $GOTOGEN; 2713our $GOTOGEN;
2592 2714
2593sub cf::object::player::goto { 2715sub cf::object::player::goto {
2594 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 }
2595 2723
2596 # 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
2597 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2725 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2598 2726
2599 $self->enter_link; 2727 $self->enter_link;
… …
2623 my $map = eval { 2751 my $map = eval {
2624 my $map = defined $path ? cf::map::find $path : undef; 2752 my $map = defined $path ? cf::map::find $path : undef;
2625 2753
2626 if ($map) { 2754 if ($map) {
2627 $map = $map->customise_for ($self); 2755 $map = $map->customise_for ($self);
2628 $map = $check->($map) if $check && $map; 2756 $map = $check->($map, $x, $y, $self) if $check && $map;
2629 } else { 2757 } else {
2630 $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);
2631 } 2759 }
2632 2760
2633 $map 2761 $map
… …
2641 if ($gen == $self->{_goto_generation}) { 2769 if ($gen == $self->{_goto_generation}) {
2642 delete $self->{_goto_generation}; 2770 delete $self->{_goto_generation};
2643 $self->leave_link ($map, $x, $y); 2771 $self->leave_link ($map, $x, $y);
2644 } 2772 }
2645 2773
2646 $done->() if $done; 2774 $done->($self) if $done;
2647 })->prio (1); 2775 })->prio (1);
2648} 2776}
2649 2777
2650=item $player_object->enter_exit ($exit_object) 2778=item $player_object->enter_exit ($exit_object)
2651 2779
… …
2671} 2799}
2672 2800
2673sub prepare_random_map { 2801sub prepare_random_map {
2674 my ($exit) = @_; 2802 my ($exit) = @_;
2675 2803
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 # all this does is basically replace the /! path by 2804 # all this does is basically replace the /! path by
2679 # a new random map path (?random/...) with a seed 2805 # a new random map path (?random/...) with a seed
2680 # that depends on the exit object 2806 # that depends on the exit object
2681 2807
2682 my $rmp = parse_random_map_params $exit->msg; 2808 my $rmp = parse_random_map_params $exit->msg;
… …
2684 if ($exit->map) { 2810 if ($exit->map) {
2685 $rmp->{region} = $exit->region->name; 2811 $rmp->{region} = $exit->region->name;
2686 $rmp->{origin_map} = $exit->map->path; 2812 $rmp->{origin_map} = $exit->map->path;
2687 $rmp->{origin_x} = $exit->x; 2813 $rmp->{origin_x} = $exit->x;
2688 $rmp->{origin_y} = $exit->y; 2814 $rmp->{origin_y} = $exit->y;
2815
2816 $exit->map->touch;
2689 } 2817 }
2690 2818
2691 $rmp->{random_seed} ||= $exit->random_seed; 2819 $rmp->{random_seed} ||= $exit->random_seed;
2692 2820
2693 my $data = cf::encode_json $rmp; 2821 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2694 my $md5 = Digest::MD5::md5_hex $data; 2822 my $md5 = Digest::MD5::md5_hex $data;
2695 my $meta = "$RANDOMDIR/$md5.meta"; 2823 my $meta = "$RANDOMDIR/$md5.meta";
2696 2824
2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2825 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2698 aio_write $fh, 0, (length $data), $data, 0; 2826 aio_write $fh, 0, (length $data), $data, 0;
2699 undef $fh; 2827 undef $fh;
2700 aio_rename "$meta~", $meta; 2828 aio_rename "$meta~", $meta;
2701 2829
2830 my $slaying = "?random/$md5";
2831
2832 if ($exit->valid) {
2702 $exit->slaying ("?random/$md5"); 2833 $exit->slaying ("?random/$md5");
2703 $exit->msg (undef); 2834 $exit->msg (undef);
2835 }
2704 } 2836 }
2705} 2837}
2706 2838
2707sub cf::object::player::enter_exit { 2839sub cf::object::player::enter_exit {
2708 my ($self, $exit) = @_; 2840 my ($self, $exit) = @_;
2709 2841
2710 return unless $self->type == cf::PLAYER; 2842 return unless $self->type == cf::PLAYER;
2711 2843
2712 if ($exit->slaying eq "/!") {
2713 #TODO: this should de-fi-ni-te-ly not be a sync-job
2714 # the problem is that $exit might not survive long enough
2715 # so it needs to be done right now, right here
2716 cf::sync_job { prepare_random_map $exit };
2717 }
2718
2719 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2720 my $hp = $exit->stats->hp;
2721 my $sp = $exit->stats->sp;
2722
2723 $self->enter_link; 2844 $self->enter_link;
2724 2845
2725 # if exit is damned, update players death & WoR home-position
2726 $self->contr->savebed ($slaying, $hp, $sp)
2727 if $exit->flag (FLAG_DAMNED);
2728
2729 (async { 2846 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2847 $Coro::current->{desc} = "enter_exit";
2731 2848
2732 $self->deactivate_recursive; # just to be sure
2733 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
2734 $self->goto ($slaying, $hp, $sp); 2864 $self->goto ($map, $x, $y);
2735 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
2736 1; 2870 1
2737 }) { 2871 }) {
2738 $self->message ("Something went wrong deep within the crossfire server. " 2872 $self->message ("Something went wrong deep within the deliantra server. "
2739 . "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. "
2740 . "Please report this to the dungeon master!", 2874 . "Please report this to the dungeon master!",
2741 cf::NDI_UNIQUE | cf::NDI_RED); 2875 cf::NDI_UNIQUE | cf::NDI_RED);
2742 2876
2743 warn "ERROR in enter_exit: $@"; 2877 error "ERROR in enter_exit: $@";
2744 $self->leave_link; 2878 $self->leave_link;
2745 } 2879 }
2746 })->prio (1); 2880 })->prio (1);
2747} 2881}
2748 2882
… …
2760sub cf::client::send_drawinfo { 2894sub cf::client::send_drawinfo {
2761 my ($self, $text, $flags) = @_; 2895 my ($self, $text, $flags) = @_;
2762 2896
2763 utf8::encode $text; 2897 utf8::encode $text;
2764 $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);
2765} 2924}
2766 2925
2767=item $client->send_msg ($channel, $msg, $color, [extra...]) 2926=item $client->send_msg ($channel, $msg, $color, [extra...])
2768 2927
2769Send 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
… …
2773 2932
2774=cut 2933=cut
2775 2934
2776# non-persistent channels (usually the info channel) 2935# non-persistent channels (usually the info channel)
2777our %CHANNEL = ( 2936our %CHANNEL = (
2937 "c/motd" => {
2938 id => "infobox",
2939 title => "MOTD",
2940 reply => undef,
2941 tooltip => "The message of the day",
2942 },
2778 "c/identify" => { 2943 "c/identify" => {
2779 id => "infobox", 2944 id => "infobox",
2780 title => "Identify", 2945 title => "Identify",
2781 reply => undef, 2946 reply => undef,
2782 tooltip => "Items recently identified", 2947 tooltip => "Items recently identified",
… …
2784 "c/examine" => { 2949 "c/examine" => {
2785 id => "infobox", 2950 id => "infobox",
2786 title => "Examine", 2951 title => "Examine",
2787 reply => undef, 2952 reply => undef,
2788 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",
2789 }, 2960 },
2790 "c/book" => { 2961 "c/book" => {
2791 id => "infobox", 2962 id => "infobox",
2792 title => "Book", 2963 title => "Book",
2793 reply => undef, 2964 reply => undef,
… …
2809 id => "infobox", 2980 id => "infobox",
2810 title => "Body Parts", 2981 title => "Body Parts",
2811 reply => undef, 2982 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 2983 tooltip => "Shows which body parts you posess and are available",
2813 }, 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 },
2814 "c/uptime" => { 3021 "c/uptime" => {
2815 id => "infobox", 3022 id => "infobox",
2816 title => "Uptime", 3023 title => "Uptime",
2817 reply => undef, 3024 reply => undef,
2818 tooltip => "How long the server has been running since last restart", 3025 tooltip => "How long the server has been running since last restart",
… …
2821 id => "infobox", 3028 id => "infobox",
2822 title => "Map Info", 3029 title => "Map Info",
2823 reply => undef, 3030 reply => undef,
2824 tooltip => "Information related to the maps", 3031 tooltip => "Information related to the maps",
2825 }, 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,
2826); 3047);
2827 3048
2828sub cf::client::send_msg { 3049sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_; 3050 my ($self, $channel, $msg, $color, @extra) = @_;
2830 3051
2831 $msg = $self->pl->expand_cfpod ($msg); 3052 $msg = $self->pl->expand_cfpod ($msg)
3053 unless $color & cf::NDI_VERBATIM;
2832 3054
2833 $color &= cf::NDI_CLIENT_MASK; # just in case... 3055 $color &= cf::NDI_CLIENT_MASK; # just in case...
2834 3056
2835 # check predefined channels, for the benefit of C 3057 # check predefined channels, for the benefit of C
2836 if ($CHANNEL{$channel}) { 3058 if ($CHANNEL{$channel}) {
2837 $channel = $CHANNEL{$channel}; 3059 $channel = $CHANNEL{$channel};
2838 3060
2839 $self->ext_msg (channel_info => $channel) 3061 $self->ext_msg (channel_info => $channel);
2840 if $self->can_msg;
2841
2842 $channel = $channel->{id}; 3062 $channel = $channel->{id};
2843 3063
2844 } elsif (ref $channel) { 3064 } elsif (ref $channel) {
2845 # send meta info to client, if not yet sent 3065 # send meta info to client, if not yet sent
2846 unless (exists $self->{channel}{$channel->{id}}) { 3066 unless (exists $self->{channel}{$channel->{id}}) {
2847 $self->{channel}{$channel->{id}} = $channel; 3067 $self->{channel}{$channel->{id}} = $channel;
2848 $self->ext_msg (channel_info => $channel) 3068 $self->ext_msg (channel_info => $channel);
2849 if $self->can_msg;
2850 } 3069 }
2851 3070
2852 $channel = $channel->{id}; 3071 $channel = $channel->{id};
2853 } 3072 }
2854 3073
2855 return unless @extra || length $msg; 3074 return unless @extra || length $msg;
2856 3075
2857 if ($self->can_msg) {
2858 # default colour, mask it out 3076 # default colour, mask it out
2859 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3077 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2860 if $color & cf::NDI_DEF; 3078 if $color & cf::NDI_DEF;
2861 3079
2862 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3080 my $pkt = "msg "
3081 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3082 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 } else { 3083 );
2865 if ($color >= 0) {
2866 # replace some tags by gcfclient-compatible ones
2867 for ($msg) {
2868 1 while
2869 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2870 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2871 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2872 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2873 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2874 }
2875 3084
2876 $color &= cf::NDI_COLOR_MASK; 3085 $self->send_big_packet ($pkt);
2877
2878 utf8::encode $msg;
2879
2880 if (0 && $msg =~ /\[/) {
2881 # COMMAND/INFO
2882 $self->send_packet ("drawextinfo $color 10 8 $msg")
2883 } else {
2884 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2885 $self->send_packet ("drawinfo $color $msg")
2886 }
2887 }
2888 }
2889} 3086}
2890 3087
2891=item $client->ext_msg ($type, @msg) 3088=item $client->ext_msg ($type, @msg)
2892 3089
2893Sends an ext event to the client. 3090Sends an ext event to the client.
… …
2896 3093
2897sub cf::client::ext_msg($$@) { 3094sub cf::client::ext_msg($$@) {
2898 my ($self, $type, @msg) = @_; 3095 my ($self, $type, @msg) = @_;
2899 3096
2900 if ($self->extcmd == 2) { 3097 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3098 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2902 } elsif ($self->extcmd == 1) { # TODO: remove 3099 } elsif ($self->extcmd == 1) { # TODO: remove
2903 push @msg, msgtype => "event_$type"; 3100 push @msg, msgtype => "event_$type";
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2905 } 3102 }
2906} 3103}
2907 3104
2908=item $client->ext_reply ($msgid, @msg) 3105=item $client->ext_reply ($msgid, @msg)
2909 3106
… …
2913 3110
2914sub cf::client::ext_reply($$@) { 3111sub cf::client::ext_reply($$@) {
2915 my ($self, $id, @msg) = @_; 3112 my ($self, $id, @msg) = @_;
2916 3113
2917 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2918 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2919 } elsif ($self->extcmd == 1) { 3116 } elsif ($self->extcmd == 1) {
2920 #TODO: version 1, remove 3117 #TODO: version 1, remove
2921 unshift @msg, msgtype => "reply", msgid => $id; 3118 unshift @msg, msgtype => "reply", msgid => $id;
2922 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2923 } 3120 }
2924} 3121}
2925 3122
2926=item $success = $client->query ($flags, "text", \&cb) 3123=item $success = $client->query ($flags, "text", \&cb)
2927 3124
… …
2998 3195
2999 $ns->ext_reply ($reply, @reply) 3196 $ns->ext_reply ($reply, @reply)
3000 if $reply; 3197 if $reply;
3001 3198
3002 } else { 3199 } else {
3003 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";
3004 } 3201 }
3005 3202
3006 cf::override; 3203 cf::override;
3007 }, 3204 },
3008); 3205);
… …
3028 3225
3029 $coro 3226 $coro
3030} 3227}
3031 3228
3032cf::client->attach ( 3229cf::client->attach (
3033 on_destroy => sub { 3230 on_client_destroy => sub {
3034 my ($ns) = @_; 3231 my ($ns) = @_;
3035 3232
3036 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3233 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3037 }, 3234 },
3038); 3235);
… …
3054our $safe_hole = new Safe::Hole; 3251our $safe_hole = new Safe::Hole;
3055 3252
3056$SIG{FPE} = 'IGNORE'; 3253$SIG{FPE} = 'IGNORE';
3057 3254
3058$safe->permit_only (Opcode::opset qw( 3255$safe->permit_only (Opcode::opset qw(
3059 :base_core :base_mem :base_orig :base_math 3256 :base_core :base_mem :base_orig :base_math :base_loop
3060 grepstart grepwhile mapstart mapwhile 3257 grepstart grepwhile mapstart mapwhile
3061 sort time 3258 sort time
3062)); 3259));
3063 3260
3064# here we export the classes and methods available to script code 3261# here we export the classes and methods available to script code
… …
3067 3264
3068The following functions and methods are available within a safe environment: 3265The following functions and methods are available within a safe environment:
3069 3266
3070 cf::object 3267 cf::object
3071 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
3072 insert remove name archname title slaying race decrease_ob_nr 3269 insert remove name archname title slaying race decrease split
3270 value
3073 3271
3074 cf::object::player 3272 cf::object::player
3075 player 3273 player
3076 3274
3077 cf::player 3275 cf::player
… …
3082 3280
3083=cut 3281=cut
3084 3282
3085for ( 3283for (
3086 ["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
3087 insert remove inv name archname title slaying race 3285 insert remove inv nrof name archname title slaying race
3088 decrease_ob_nr destroy)], 3286 decrease split destroy change_exp value msg lore send_msg)],
3089 ["cf::object::player" => qw(player)], 3287 ["cf::object::player" => qw(player)],
3090 ["cf::player" => qw(peaceful)], 3288 ["cf::player" => qw(peaceful send_msg)],
3091 ["cf::map" => qw(trigger)], 3289 ["cf::map" => qw(trigger)],
3092) { 3290) {
3093 no strict 'refs';
3094 my ($pkg, @funs) = @$_; 3291 my ($pkg, @funs) = @$_;
3095 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3292 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3096 for @funs; 3293 for @funs;
3097} 3294}
3098 3295
… …
3113 3310
3114 my $qcode = $code; 3311 my $qcode = $code;
3115 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3312 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3116 $qcode =~ s/\n/\\n/g; 3313 $qcode =~ s/\n/\\n/g;
3117 3314
3315 %vars = (_dummy => 0) unless %vars;
3316
3317 my @res;
3118 local $_; 3318 local $_;
3119 local @safe::cf::_safe_eval_args = values %vars;
3120 3319
3121 my $eval = 3320 my $eval =
3122 "do {\n" 3321 "do {\n"
3123 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3322 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3124 . "#line 0 \"{$qcode}\"\n" 3323 . "#line 0 \"{$qcode}\"\n"
3125 . $code 3324 . $code
3126 . "\n}" 3325 . "\n}"
3127 ; 3326 ;
3128 3327
3328 if ($CFG{safe_eval}) {
3129 sub_generation_inc; 3329 sub_generation_inc;
3330 local @safe::cf::_safe_eval_args = values %vars;
3130 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3331 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3131 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 }
3132 3337
3133 if ($@) { 3338 if ($@) {
3134 warn "$@"; 3339 warn "$@",
3135 warn "while executing safe code '$code'\n"; 3340 "while executing safe code '$code'\n",
3136 warn "with arguments " . (join " ", %vars) . "\n"; 3341 "with arguments " . (join " ", %vars) . "\n";
3137 } 3342 }
3138 3343
3139 wantarray ? @res : $res[0] 3344 wantarray ? @res : $res[0]
3140} 3345}
3141 3346
… …
3155=cut 3360=cut
3156 3361
3157sub register_script_function { 3362sub register_script_function {
3158 my ($fun, $cb) = @_; 3363 my ($fun, $cb) = @_;
3159 3364
3160 no strict 'refs'; 3365 $fun = "safe::$fun" if $CFG{safe_eval};
3161 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3366 *$fun = $safe_hole->wrap ($cb);
3162} 3367}
3163 3368
3164=back 3369=back
3165 3370
3166=cut 3371=cut
… …
3175 # for this (global event?) 3380 # for this (global event?)
3176 %ext::player_env::MUSIC_FACE_CACHE = (); 3381 %ext::player_env::MUSIC_FACE_CACHE = ();
3177 3382
3178 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3383 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3179 3384
3180 warn "loading facedata from $path\n"; 3385 trace "loading facedata from $path\n";
3181 3386
3182 my $facedata;
3183 0 < aio_load $path, $facedata 3387 0 < aio_load $path, my $facedata
3184 or die "$path: $!"; 3388 or die "$path: $!";
3185 3389
3186 $facedata = Coro::Storable::thaw $facedata; 3390 $facedata = Coro::Storable::thaw $facedata;
3187 3391
3188 $facedata->{version} == 2 3392 $facedata->{version} == 2
3189 or cf::cleanup "$path: version mismatch, cannot proceed."; 3393 or cf::cleanup "$path: version mismatch, cannot proceed.";
3190 3394
3191 # 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]);
3192 $facedata->{resource}{"res/exp_table"} = { 3397 $facedata->{resource}{"res/exp_table"} = {
3193 type => FT_RSRC, 3398 type => FT_RSRC,
3194 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),
3195 }; 3401 };
3196 cf::cede_to_tick; 3402 cf::cede_to_tick;
3197 3403
3198 { 3404 {
3199 my $faces = $facedata->{faceinfo}; 3405 my $faces = $facedata->{faceinfo};
… …
3201 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
3202 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3408 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3203 3409
3204 cf::face::set_visibility $idx, $info->{visibility}; 3410 cf::face::set_visibility $idx, $info->{visibility};
3205 cf::face::set_magicmap $idx, $info->{magicmap}; 3411 cf::face::set_magicmap $idx, $info->{magicmap};
3206 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3412 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3207 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3413 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3208 3414
3209 cf::cede_to_tick; 3415 cf::cede_to_tick;
3210 } 3416 }
3211 3417
3212 while (my ($face, $info) = each %$faces) { 3418 while (my ($face, $info) = each %$faces) {
… …
3217 3423
3218 if (my $smooth = cf::face::find $info->{smooth}) { 3424 if (my $smooth = cf::face::find $info->{smooth}) {
3219 cf::face::set_smooth $idx, $smooth; 3425 cf::face::set_smooth $idx, $smooth;
3220 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3426 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3221 } else { 3427 } else {
3222 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3428 error "smooth face '$info->{smooth}' not found for face '$face'";
3223 } 3429 }
3224 3430
3225 cf::cede_to_tick; 3431 cf::cede_to_tick;
3226 } 3432 }
3227 } 3433 }
… …
3236 3442
3237 cf::anim::invalidate_all; # d'oh 3443 cf::anim::invalidate_all; # d'oh
3238 } 3444 }
3239 3445
3240 { 3446 {
3241 # TODO: for gcfclient pleasure, we should give resources
3242 # that gcfclient doesn't grok a >10000 face index.
3243 my $res = $facedata->{resource}; 3447 my $res = $facedata->{resource};
3244 3448
3245 while (my ($name, $info) = each %$res) { 3449 while (my ($name, $info) = each %$res) {
3246 if (defined $info->{type}) { 3450 if (defined $info->{type}) {
3247 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3451 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3248 my $data;
3249 3452
3250 if ($info->{type} & 1) { 3453 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3251 # prepend meta info
3252
3253 my $meta = $enc->encode ({
3254 name => $name,
3255 %{ $info->{meta} || {} },
3256 });
3257
3258 $data = pack "(w/a*)*", $meta, $info->{data};
3259 } else {
3260 $data = $info->{data};
3261 }
3262
3263 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3264 cf::face::set_type $idx, $info->{type}; 3454 cf::face::set_type $idx, $info->{type};
3265 } else { 3455 } else {
3266 $RESOURCE{$name} = $info; 3456 $RESOURCE{$name} = $info; # unused
3267 } 3457 }
3268 3458
3269 cf::cede_to_tick; 3459 cf::cede_to_tick;
3270 } 3460 }
3271 } 3461 }
3272 3462
3273 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3463 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3274 3464
3275 1 3465 1
3276} 3466}
3277
3278cf::global->attach (on_resource_update => sub {
3279 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3280 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3281
3282 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3283 my $sound = $soundconf->{compat}[$_]
3284 or next;
3285
3286 my $face = cf::face::find "sound/$sound->[1]";
3287 cf::sound::set $sound->[0] => $face;
3288 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3289 }
3290
3291 while (my ($k, $v) = each %{$soundconf->{event}}) {
3292 my $face = cf::face::find "sound/$v";
3293 cf::sound::set $k => $face;
3294 }
3295 }
3296});
3297 3467
3298register_exticmd fx_want => sub { 3468register_exticmd fx_want => sub {
3299 my ($ns, $want) = @_; 3469 my ($ns, $want) = @_;
3300 3470
3301 while (my ($k, $v) = each %$want) { 3471 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v); 3472 $ns->fx_want ($k, $v);
3303 } 3473 }
3304}; 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}
3305 3485
3306sub reload_regions { 3486sub reload_regions {
3307 # 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
3308 # for this (global event?) 3488 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = (); 3489 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3323} 3503}
3324 3504
3325sub reload_archetypes { 3505sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes" 3506 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n"; 3507 or die "unable to load archetypes\n";
3328 #d# NEED to laod twice to resolve forward references
3329 # this really needs to be done in an extra post-pass
3330 # (which needs to be synchronous, so solve it differently)
3331 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n";
3333} 3508}
3334 3509
3335sub reload_treasures { 3510sub reload_treasures {
3336 load_resource_file "$DATADIR/treasures" 3511 load_resource_file "$DATADIR/treasures"
3337 or die "unable to load treasurelists\n"; 3512 or die "unable to load treasurelists\n";
3338} 3513}
3339 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
3340sub reload_resources { 3538sub reload_resources {
3341 warn "reloading resource files...\n"; 3539 trace "reloading resource files...\n";
3342 3540
3541 reload_exp_table;
3542 reload_materials;
3543 reload_facedata;
3544 reload_sound;
3545 reload_archetypes;
3343 reload_regions; 3546 reload_regions;
3344 reload_facedata;
3345 #reload_archetypes;#d#
3346 reload_archetypes;
3347 reload_treasures; 3547 reload_treasures;
3348 3548
3349 warn "finished reloading resource files\n"; 3549 trace "finished reloading resource files\n";
3350}
3351
3352sub init {
3353 reload_resources;
3354} 3550}
3355 3551
3356sub reload_config { 3552sub reload_config {
3357 open my $fh, "<:utf8", "$CONFDIR/config" 3553 trace "reloading config file...\n";
3358 or return;
3359 3554
3360 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...
3361 *CFG = YAML::Load <$fh>; 3561 *CFG = YAML::XS::Load $config;
3362 3562
3363 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3364 3564
3365 $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};
3366 $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};
3367 3567
3368 if (exists $CFG{mlockall}) { 3568 if (exists $CFG{mlockall}) {
… …
3372 }; 3572 };
3373 warn $@ if $@; 3573 warn $@ if $@;
3374 } 3574 }
3375} 3575}
3376 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
3377sub 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
3378 # we must not ever block the main coroutine 3615 # we must not ever block the main coroutine
3379 local $Coro::idle = sub { 3616 local $Coro::idle = sub {
3380 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#
3381 (async { 3618 (async {
3382 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3619 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT; 3620 EV::loop EV::LOOP_ONESHOT;
3384 })->prio (Coro::PRIO_MAX); 3621 })->prio (Coro::PRIO_MAX);
3385 }; 3622 };
3386 3623
3387 reload_config;
3388 db_init;
3389 load_extensions;
3390
3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno; 3624 evthread_start IO::AIO::poll_fileno;
3393 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;
3394} 3667}
3395 3668
3396############################################################################# 3669#############################################################################
3397# initialisation and cleanup 3670# initialisation and cleanup
3398 3671
3399# install some emergency cleanup handlers 3672# install some emergency cleanup handlers
3400BEGIN { 3673BEGIN {
3401 our %SIGWATCHER = (); 3674 our %SIGWATCHER = ();
3402 for my $signal (qw(INT HUP TERM)) { 3675 for my $signal (qw(INT HUP TERM)) {
3403 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3676 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3404 cf::cleanup "SIG$signal"; 3677 cf::cleanup "SIG$signal";
3405 }; 3678 };
3406 } 3679 }
3407} 3680}
3408 3681
3409sub write_runtime { 3682sub write_runtime_sync {
3410 my $runtime = "$LOCALDIR/runtime"; 3683 my $t0 = AE::time;
3411 3684
3412 # first touch the runtime file to show we are still running: 3685 # first touch the runtime file to show we are still running:
3413 # the fsync below can take a very very long time. 3686 # the fsync below can take a very very long time.
3414 3687
3415 IO::AIO::aio_utime $runtime, undef, undef; 3688 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3416 3689
3417 my $guard = cf::lock_acquire "write_runtime"; 3690 my $guard = cf::lock_acquire "write_runtime";
3418 3691
3419 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3692 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3420 or return; 3693 or return;
3421 3694
3422 my $value = $cf::RUNTIME + 90 + 10; 3695 my $value = $cf::RUNTIME + 90 + 10;
3423 # 10 is the runtime save interval, for a monotonic clock 3696 # 10 is the runtime save interval, for a monotonic clock
3424 # 60 allows for the watchdog to kill the server. 3697 # 60 allows for the watchdog to kill the server.
… …
3434 aio_utime $fh, undef, undef; 3707 aio_utime $fh, undef, undef;
3435 3708
3436 close $fh 3709 close $fh
3437 or return; 3710 or return;
3438 3711
3439 aio_rename "$runtime~", $runtime 3712 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3440 and return; 3713 and return;
3441 3714
3442 warn "runtime file written.\n"; 3715 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3443 3716
3444 1 3717 1
3445} 3718}
3446 3719
3447our $uuid_lock; 3720our $uuid_lock;
… …
3456 my $uuid = "$LOCALDIR/uuid"; 3729 my $uuid = "$LOCALDIR/uuid";
3457 3730
3458 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3731 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3459 or return; 3732 or return;
3460 3733
3461 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 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;
3462 $uuid_skip = 0; 3742 $uuid_skip = 0;
3463 3743
3464 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3744 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3465 and return; 3745 and return;
3466 3746
… …
3472 or return; 3752 or return;
3473 3753
3474 aio_rename "$uuid~", $uuid 3754 aio_rename "$uuid~", $uuid
3475 and return; 3755 and return;
3476 3756
3477 warn "uuid file written ($value).\n"; 3757 trace "uuid file written ($value).\n";
3478 3758
3479 1 3759 1
3480 3760
3481} 3761}
3482 3762
… …
3488} 3768}
3489 3769
3490sub emergency_save() { 3770sub emergency_save() {
3491 my $freeze_guard = cf::freeze_mainloop; 3771 my $freeze_guard = cf::freeze_mainloop;
3492 3772
3493 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;
3494 3779
3495 cf::sync_job { 3780 cf::sync_job {
3781 cf::write_runtime_sync; # external watchdog should not bark
3782
3496 # use a peculiar iteration method to avoid tripping on perl 3783 # use a peculiar iteration method to avoid tripping on perl
3497 # refcount bugs in for. also avoids problems with players 3784 # refcount bugs in for. also avoids problems with players
3498 # and maps saved/destroyed asynchronously. 3785 # and maps saved/destroyed asynchronously.
3499 warn "begin emergency player save\n"; 3786 info "emergency_perl_save: begin player save\n";
3500 for my $login (keys %cf::PLAYER) { 3787 for my $login (keys %cf::PLAYER) {
3501 my $pl = $cf::PLAYER{$login} or next; 3788 my $pl = $cf::PLAYER{$login} or next;
3502 $pl->valid or next; 3789 $pl->valid or next;
3503 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3790 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3504 $pl->save; 3791 $pl->save;
3505 } 3792 }
3506 warn "end emergency player save\n"; 3793 info "emergency_perl_save: end player save\n";
3507 3794
3508 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";
3509 for my $path (keys %cf::MAP) { 3798 for my $path (keys %cf::MAP) {
3510 my $map = $cf::MAP{$path} or next; 3799 my $map = $cf::MAP{$path} or next;
3511 $map->valid or next; 3800 $map->valid or next;
3512 $map->save; 3801 $map->save;
3513 } 3802 }
3514 warn "end emergency map save\n"; 3803 info "emergency_perl_save: end map save\n";
3515 3804
3516 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";
3517 BDB::db_env_txn_checkpoint $DB_ENV; 3808 BDB::db_env_txn_checkpoint $DB_ENV;
3518 warn "end emergency database checkpoint\n"; 3809 info "emergency_perl_save: end database checkpoint\n";
3519 3810
3520 warn "begin write uuid\n"; 3811 info "emergency_perl_save: begin write uuid\n";
3521 write_uuid_sync 1; 3812 write_uuid_sync 1;
3522 warn "end write uuid\n"; 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
3523 }; 3833 };
3524 3834
3525 warn "leave emergency perl save\n"; 3835 info "emergency_perl_save: leave\n";
3526} 3836}
3527 3837
3528sub post_cleanup { 3838sub post_cleanup {
3529 my ($make_core) = @_; 3839 my ($make_core) = @_;
3530 3840
3841 IO::AIO::flush;
3842
3531 warn Carp::longmess "post_cleanup backtrace" 3843 error Carp::longmess "post_cleanup backtrace"
3532 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 }
3533} 3873}
3534 3874
3535sub do_reload_perl() { 3875sub do_reload_perl() {
3536 # can/must only be called in main 3876 # can/must only be called in main
3537 if ($Coro::current != $Coro::main) { 3877 unless (in_main) {
3538 warn "can only reload from main coroutine"; 3878 error "can only reload from main coroutine";
3539 return; 3879 return;
3540 } 3880 }
3541 3881
3882 return if $RELOAD++;
3883
3884 my $t1 = AE::time;
3885
3886 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl";
3542 warn "reloading..."; 3888 info "reloading...";
3543 3889
3544 warn "entering sync_job"; 3890 trace "entering sync_job";
3545 3891
3546 cf::sync_job { 3892 cf::sync_job {
3547 cf::write_runtime; # external watchdog should not bark
3548 cf::emergency_save; 3893 #cf::emergency_save;
3549 cf::write_runtime; # external watchdog should not bark
3550 3894
3551 warn "syncing database to disk";
3552 BDB::db_env_txn_checkpoint $DB_ENV;
3553
3554 # if anything goes wrong in here, we should simply crash as we already saved
3555
3556 warn "flushing outstanding aio requests";
3557 for (;;) {
3558 BDB::flush;
3559 IO::AIO::flush;
3560 Coro::cede_notself;
3561 last unless IO::AIO::nreqs || BDB::nreqs;
3562 warn "iterate...";
3563 }
3564
3565 ++$RELOAD;
3566
3567 warn "cancelling all extension coros"; 3895 trace "cancelling all extension coros";
3568 $_->cancel for values %EXT_CORO; 3896 $_->cancel for values %EXT_CORO;
3569 %EXT_CORO = (); 3897 %EXT_CORO = ();
3570 3898
3571 warn "removing commands"; 3899 trace "removing commands";
3572 %COMMAND = (); 3900 %COMMAND = ();
3573 3901
3574 warn "removing ext/exti commands"; 3902 trace "removing ext/exti commands";
3575 %EXTCMD = (); 3903 %EXTCMD = ();
3576 %EXTICMD = (); 3904 %EXTICMD = ();
3577 3905
3578 warn "unloading/nuking all extensions"; 3906 trace "unloading/nuking all extensions";
3579 for my $pkg (@EXTS) { 3907 for my $pkg (@EXTS) {
3580 warn "... unloading $pkg"; 3908 trace "... unloading $pkg";
3581 3909
3582 if (my $cb = $pkg->can ("unload")) { 3910 if (my $cb = $pkg->can ("unload")) {
3583 eval { 3911 eval {
3584 $cb->($pkg); 3912 $cb->($pkg);
3585 1 3913 1
3586 } 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;
3587 } 3919 }
3588 3920
3589 warn "... nuking $pkg";
3590 Symbol::delete_package $pkg;
3591 }
3592
3593 warn "unloading all perl modules loaded from $LIBDIR"; 3921 trace "unloading all perl modules loaded from $LIBDIR";
3594 while (my ($k, $v) = each %INC) { 3922 while (my ($k, $v) = each %INC) {
3595 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3596 3924
3597 warn "... unloading $k"; 3925 trace "... unloading $k";
3598 delete $INC{$k}; 3926 delete $INC{$k};
3599 3927
3600 $k =~ s/\.pm$//; 3928 $k =~ s/\.pm$//;
3601 $k =~ s/\//::/g; 3929 $k =~ s/\//::/g;
3602 3930
3603 if (my $cb = $k->can ("unload_module")) { 3931 if (my $cb = $k->can ("unload_module")) {
3604 $cb->(); 3932 $cb->();
3933 }
3934
3935 clear_package $k;
3605 } 3936 }
3606 3937
3607 Symbol::delete_package $k;
3608 }
3609
3610 warn "getting rid of safe::, as good as possible"; 3938 trace "getting rid of safe::, as good as possible";
3611 Symbol::delete_package "safe::$_" 3939 clear_package "safe::$_"
3612 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);
3613 3941
3614 warn "unloading cf.pm \"a bit\""; 3942 trace "unloading cf.pm \"a bit\"";
3615 delete $INC{"cf.pm"}; 3943 delete $INC{"cf.pm"};
3616 delete $INC{"cf/pod.pm"}; 3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3617 3945
3618 # don't, removes xs symbols, too, 3946 # don't, removes xs symbols, too,
3619 # and global variables created in xs 3947 # and global variables created in xs
3620 #Symbol::delete_package __PACKAGE__; 3948 #clear_package __PACKAGE__;
3621 3949
3622 warn "unload completed, starting to reload now"; 3950 info "unload completed, starting to reload now";
3623 3951
3624 warn "reloading cf.pm"; 3952 trace "reloading cf.pm";
3625 require cf; 3953 require cf;
3626 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3954 cf::_connect_to_perl_1;
3627 3955
3628 warn "loading config and database again"; 3956 trace "loading config and database again";
3629 cf::reload_config; 3957 cf::reload_config;
3630 3958
3631 warn "loading extensions"; 3959 trace "loading extensions";
3632 cf::load_extensions; 3960 cf::load_extensions;
3633 3961
3962 if ($REATTACH_ON_RELOAD) {
3634 warn "reattaching attachments to objects/players"; 3963 trace "reattaching attachments to objects/players";
3635 _global_reattach; # objects, sockets 3964 _global_reattach; # objects, sockets
3636 warn "reattaching attachments to maps"; 3965 trace "reattaching attachments to maps";
3637 reattach $_ for values %MAP; 3966 reattach $_ for values %MAP;
3638 warn "reattaching attachments to players"; 3967 trace "reattaching attachments to players";
3639 reattach $_ for values %PLAYER; 3968 reattach $_ for values %PLAYER;
3969 }
3640 3970
3971 trace "running post_init jobs";
3972 (pop @POST_INIT)->(1) while @POST_INIT;
3973
3641 warn "leaving sync_job"; 3974 trace "leaving sync_job";
3642 3975
3643 1 3976 1
3644 } or do { 3977 } or do {
3645 warn $@; 3978 error $@;
3646 cf::cleanup "error while reloading, exiting."; 3979 cf::cleanup "error while reloading, exiting.";
3980 };
3981
3982 info "reloaded";
3983 --$RELOAD;
3647 }; 3984 }
3648 3985
3649 warn "reloaded"; 3986 $t1 = AE::time - $t1;
3987 info "reload completed in ${t1}s\n";
3650}; 3988};
3651 3989
3652our $RELOAD_WATCHER; # used only during reload 3990our $RELOAD_WATCHER; # used only during reload
3653 3991
3654sub reload_perl() { 3992sub reload_perl() {
3655 # doing reload synchronously and two reloads happen back-to-back, 3993 # doing reload synchronously and two reloads happen back-to-back,
3656 # coro crashes during coro_state_free->destroy here. 3994 # coro crashes during coro_state_free->destroy here.
3657 3995
3996 $RELOAD_WATCHER ||= cf::async {
3997 Coro::AIO::aio_wait cache_extensions;
3998
3658 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3999 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3659 do_reload_perl; 4000 do_reload_perl;
3660 undef $RELOAD_WATCHER; 4001 undef $RELOAD_WATCHER;
4002 };
3661 }; 4003 };
3662} 4004}
3663 4005
3664register_command "reload" => sub { 4006register_command "reload" => sub {
3665 my ($who, $arg) = @_; 4007 my ($who, $arg) = @_;
… …
3671 reload_perl; 4013 reload_perl;
3672 }; 4014 };
3673 } 4015 }
3674}; 4016};
3675 4017
3676unshift @INC, $LIBDIR; 4018#############################################################################
3677 4019
3678my $bug_warning = 0; 4020my $bug_warning = 0;
3679 4021
3680our @WAIT_FOR_TICK; 4022our @WAIT_FOR_TICK;
3681our @WAIT_FOR_TICK_BEGIN; 4023our @WAIT_FOR_TICK_BEGIN;
3682 4024
3683sub wait_for_tick { 4025sub wait_for_tick() {
3684 return if tick_inhibit;
3685 return if $Coro::current == $Coro::main; 4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3686 4027
3687 my $signal = new Coro::Signal; 4028 my $signal = new Coro::Signal;
3688 push @WAIT_FOR_TICK, $signal; 4029 push @WAIT_FOR_TICK, $signal;
3689 $signal->wait; 4030 $signal->wait;
3690} 4031}
3691 4032
3692sub wait_for_tick_begin { 4033sub wait_for_tick_begin() {
3693 return if tick_inhibit;
3694 return if $Coro::current == $Coro::main; 4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3695 4035
3696 my $signal = new Coro::Signal; 4036 my $signal = new Coro::Signal;
3697 push @WAIT_FOR_TICK_BEGIN, $signal; 4037 push @WAIT_FOR_TICK_BEGIN, $signal;
3698 $signal->wait; 4038 $signal->wait;
3699} 4039}
… …
3705 return; 4045 return;
3706 } 4046 }
3707 4047
3708 cf::server_tick; # one server iteration 4048 cf::server_tick; # one server iteration
3709 4049
4050 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4051
3710 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4052 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3711 $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.;
3712 Coro::async_pool { 4054 Coro::async_pool {
3713 $Coro::current->{desc} = "runtime saver"; 4055 $Coro::current->{desc} = "runtime saver";
3714 write_runtime 4056 write_runtime_sync
3715 or warn "ERROR: unable to write runtime file: $!"; 4057 or error "ERROR: unable to write runtime file: $!";
3716 }; 4058 };
3717 } 4059 }
3718 4060
3719 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3720 $sig->send; 4062 $sig->send;
… …
3728 4070
3729 if (0) { 4071 if (0) {
3730 if ($NEXT_TICK) { 4072 if ($NEXT_TICK) {
3731 my $jitter = $TICK_START - $NEXT_TICK; 4073 my $jitter = $TICK_START - $NEXT_TICK;
3732 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4074 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3733 warn "jitter $JITTER\n";#d# 4075 debug "jitter $JITTER\n";#d#
3734 } 4076 }
3735 } 4077 }
3736} 4078}
3737 4079
3738{ 4080{
3739 # configure BDB 4081 # configure BDB
3740 4082
3741 BDB::min_parallel 8; 4083 BDB::min_parallel 16;
3742 BDB::max_poll_reqs $TICK * 0.1; 4084 BDB::max_poll_reqs $TICK * 0.1;
3743 $Coro::BDB::WATCHER->priority (1); 4085 $AnyEvent::BDB::WATCHER->priority (1);
3744 4086
3745 unless ($DB_ENV) { 4087 unless ($DB_ENV) {
3746 $DB_ENV = BDB::db_env_create; 4088 $DB_ENV = BDB::db_env_create;
3747 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4089 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3748 | 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;
3749 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4092 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3750 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4093 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3751 4094
3752 cf::sync_job { 4095 cf::sync_job {
3753 eval { 4096 eval {
… …
3779{ 4122{
3780 # configure IO::AIO 4123 # configure IO::AIO
3781 4124
3782 IO::AIO::min_parallel 8; 4125 IO::AIO::min_parallel 8;
3783 IO::AIO::max_poll_time $TICK * 0.1; 4126 IO::AIO::max_poll_time $TICK * 0.1;
3784 $Coro::AIO::WATCHER->priority (1); 4127 undef $AnyEvent::AIO::WATCHER;
3785} 4128}
3786 4129
3787my $_log_backtrace; 4130my $_log_backtrace;
3788 4131
3789sub _log_backtrace { 4132sub _log_backtrace {
… …
3792 $msg =~ s/\n//; 4135 $msg =~ s/\n//;
3793 4136
3794 # limit the # of concurrent backtraces 4137 # limit the # of concurrent backtraces
3795 if ($_log_backtrace < 2) { 4138 if ($_log_backtrace < 2) {
3796 ++$_log_backtrace; 4139 ++$_log_backtrace;
4140 my $perl_bt = Carp::longmess $msg;
3797 async { 4141 async {
3798 $Coro::current->{desc} = "abt $msg"; 4142 $Coro::current->{desc} = "abt $msg";
3799 4143
3800 my @bt = fork_call { 4144 my @bt = fork_call {
3801 @addr = map { sprintf "%x", $_ } @addr; 4145 @addr = map { sprintf "%x", $_ } @addr;
… …
3812 } 4156 }
3813 4157
3814 @funcs 4158 @funcs
3815 }; 4159 };
3816 4160
3817 LOG llevInfo, "[ABT] $msg\n"; 4161 LOG llevInfo, "[ABT] $perl_bt\n";
4162 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3818 LOG llevInfo, "[ABT] $_\n" for @bt; 4163 LOG llevInfo, "[ABT] $_\n" for @bt;
3819 --$_log_backtrace; 4164 --$_log_backtrace;
3820 }; 4165 };
3821 } else { 4166 } else {
3822 LOG llevInfo, "[ABT] $msg\n"; 4167 LOG llevInfo, "[ABT] $msg\n";
3823 LOG llevInfo, "[ABT] [suppressed]\n"; 4168 LOG llevInfo, "[ABT] [suppressed]\n";
3824 } 4169 }
3825} 4170}
3826 4171
3827# load additional modules 4172# load additional modules
3828use cf::pod; 4173require "cf/$_.pm" for @EXTRA_MODULES;
4174cf::_connect_to_perl_2;
3829 4175
3830END { cf::emergency_save } 4176END { cf::emergency_save }
3831 4177
38321 41781
3833 4179

Diff Legend

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