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.418 by root, Fri Apr 11 21:09:53 2008 UTC vs.
Revision 1.524 by root, Sun Apr 18 07:08:07 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
25use 5.10.0;
24use utf8; 26use utf8;
25use strict; 27use strict qw(vars subs);
26 28
27use Symbol; 29use Symbol;
28use List::Util; 30use List::Util;
29use Socket; 31use Socket;
30use EV 3.2; 32use EV;
31use Opcode; 33use Opcode;
32use Safe; 34use Safe;
33use Safe::Hole; 35use Safe::Hole;
34use Storable (); 36use Storable ();
37use Carp ();
35 38
39use Guard ();
36use Coro 4.50 (); 40use Coro ();
37use Coro::State; 41use Coro::State;
38use Coro::Handle; 42use Coro::Handle;
39use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
40use Coro::Timer; 45use Coro::Timer;
41use Coro::Signal; 46use Coro::Signal;
42use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
43use Coro::AIO; 50use Coro::AIO;
44use Coro::BDB; 51use Coro::BDB 1.6;
45use Coro::Storable; 52use Coro::Storable;
46use Coro::Util (); 53use Coro::Util ();
47 54
48use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
49use BDB (); 56use BDB ();
50use Data::Dumper; 57use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 58use Fcntl;
53use YAML (); 59use YAML::XS ();
54use IO::AIO 2.51 (); 60use IO::AIO ();
55use Time::HiRes; 61use Time::HiRes;
56use Compress::LZF; 62use Compress::LZF;
57use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
58 66
59# configure various modules to our taste 67# configure various modules to our taste
60# 68#
61$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64 77
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66 80
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
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;
93 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 118our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
99 120
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 124our $DB_ENV;
105 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
106our %CFG; 128our %CFG;
107 129
108our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 131our $RUNTIME;
110our $NOW; 132our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 143our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
123 145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
150
124binmode STDOUT; 151binmode STDOUT;
125binmode STDERR; 152binmode STDERR;
126 153
127# read virtual server time, if available 154# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
132} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
133 162
134mkdir $_ 163mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 165
137our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
138 167
139sub cf::map::normalise; 168sub cf::map::normalise;
169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
174#############################################################################
175
176%REFLECT = ();
177for (@REFLECT) {
178 my $reflect = JSON::XS::decode_json $_;
179 $REFLECT{$reflect->{class}} = $reflect;
180}
181
182# this is decidedly evil
183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
140 184
141############################################################################# 185#############################################################################
142 186
143=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
144 188
191returns directly I<after> the tick processing (and consequently, can only wake one process 235returns directly I<after> the tick processing (and consequently, can only wake one process
192per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 236per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
193 237
194=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
195 239
196This array contains the results of the last C<invoke ()> call. When 240This 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 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 242that call.
199 243
244=item %cf::REFLECT
245
246Contains, for each (C++) class name, a hash reference with information
247about object members (methods, scalars, arrays and flags) and other
248metadata, which is useful for introspection.
249
200=back 250=back
201 251
202=cut 252=cut
203 253
204BEGIN { 254$Coro::State::WARNHOOK = sub {
205 *CORE::GLOBAL::warn = sub {
206 my $msg = join "", @_; 255 my $msg = join "", @_;
207 256
208 $msg .= "\n" 257 $msg .= "\n"
209 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
210 259
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 261
213 LOG llevError, $msg; 262 LOG llevError, $msg;
214 }; 263};
215}
216 264
217$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
219 267
220 if ($Coro::current == $Coro::main) {#d# 268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 272 return;#d#
223 }#d# 273 }#d#
224 274
225 # kill coroutine otherwise 275 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 276 Coro::terminate
228}; 277};
229
230$SIG{__DIE__} = sub { }; #d#?
231 278
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 289for my $pkg (qw(
243 cf::global cf::attachable 290 cf::global cf::attachable
244 cf::object cf::object::player 291 cf::object cf::object::player
245 cf::client cf::player 292 cf::client cf::player
246 cf::arch cf::living 293 cf::arch cf::living
294 cf::map cf::mapspace
247 cf::map cf::party cf::region 295 cf::party cf::region
248)) { 296)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 298}
252 299
253$EV::DIED = sub { 300$EV::DIED = sub {
254 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
255}; 302};
256 303
257############################################################################# 304#############################################################################
258 305
259=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 344
298sub encode_json($) { $json_coder->encode ($_[0]) } 345sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 346sub decode_json($) { $json_coder->decode ($_[0]) }
300 347
348=item cf::post_init { BLOCK }
349
350Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again.
352
353The cdoeblock will have a single boolean argument to indicate whether this
354is a reload or not.
355
356=cut
357
358sub post_init(&) {
359 push @POST_INIT, shift;
360}
361
301=item cf::lock_wait $string 362=item cf::lock_wait $string
302 363
303Wait until the given lock is available. See cf::lock_acquire. 364Wait until the given lock is available. See cf::lock_acquire.
304 365
305=item my $lock = cf::lock_acquire $string 366=item my $lock = cf::lock_acquire $string
306 367
307Wait until the given lock is available and then acquires it and returns 368Wait 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, 369a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 370for example when the coroutine gets canceled), the lock is automatically
310returned. 371returned.
311 372
312Locks are *not* recursive, locking from the same coro twice results in a 373Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 374deadlocked coro.
319 380
320Return true if the lock is currently active, i.e. somebody has locked it. 381Return true if the lock is currently active, i.e. somebody has locked it.
321 382
322=cut 383=cut
323 384
324our %LOCK; 385our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 386
327sub lock_wait($) { 387sub lock_wait($) {
328 my ($key) = @_; 388 $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} 389}
341 390
342sub lock_acquire($) { 391sub lock_acquire($) {
343 my ($key) = @_; 392 $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} 393}
357 394
358sub lock_active($) { 395sub lock_active($) {
359 my ($key) = @_; 396 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 397}
363 398
364sub freeze_mainloop { 399sub freeze_mainloop {
365 tick_inhibit_inc; 400 tick_inhibit_inc;
366 401
367 Coro::guard \&tick_inhibit_dec; 402 &Guard::guard (\&tick_inhibit_dec);
368} 403}
369 404
370=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
371 406
372Like EV::periodic, but randomly selects a starting point so that the actions 407Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer. 408get spread over time.
374 409
375=cut 410=cut
376 411
377sub periodic($$) { 412sub periodic($$) {
378 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
395 430
396=cut 431=cut
397 432
398our @SLOT_QUEUE; 433our @SLOT_QUEUE;
399our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
400 436
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
404 440
405 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
406 443
407 while () { 444 while () {
408 next_job: 445 next_job:
446
409 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 448
411 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 453 $job->[2]->send;
415 Coro::cede; 454 Coro::cede;
416 goto next_job; 455 goto next_job;
417 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 458 }
419 } 459 }
420 460
421 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 464 $signal->wait;
425 } else { 465 } else {
466 $busy = 0;
426 Coro::schedule; 467 Coro::schedule;
427 } 468 }
428 } 469 }
429}; 470};
430 471
431sub get_slot($;$$) { 472sub get_slot($;$$) {
473 return if tick_inhibit || $Coro::current == $Coro::main;
474
432 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
433 476
434 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
435 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
436 480
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
466 510
467sub sync_job(&) { 511sub sync_job(&) {
468 my ($job) = @_; 512 my ($job) = @_;
469 513
470 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
471 my $time = EV::time; 515 my $time = AE::time;
472 516
473 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
474 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
475 519
476 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
493 } else { 537 } else {
494 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
495 } 539 }
496 } 540 }
497 541
498 my $time = EV::time - $time; 542 my $time = AE::time - $time;
499 543
500 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
501 545
502 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
503 } else { 547 } else {
547 reset_signals; 591 reset_signals;
548 &$cb 592 &$cb
549 }, @args; 593 }, @args;
550 594
551 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
552} 607}
553 608
554=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
555 610
556=cut 611=cut
722 777
723############################################################################# 778#############################################################################
724 779
725=head2 ATTACHABLE OBJECTS 780=head2 ATTACHABLE OBJECTS
726 781
727Many objects in crossfire are so-called attachable objects. That means you can 782Many objects in deliantra are so-called attachable objects. That means you can
728attach callbacks/event handlers (a collection of which is called an "attachment") 783attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 784to it. All such attachable objects support the following methods.
730 785
731In the following description, CLASS can be any of C<global>, C<object> 786In 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 787C<player>, C<client> or C<map> (i.e. the attachable objects in
782=item cf::CLASS::attachment $name, ... 837=item cf::CLASS::attachment $name, ...
783 838
784Register an attachment by C<$name> through which attachable objects of the 839Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 840given CLASS can refer to this attachment.
786 841
787Some classes such as crossfire maps and objects can specify attachments 842Some classes such as deliantra maps and objects can specify attachments
788that are attached at load/instantiate time, thus the need for a name. 843that are attached at load/instantiate time, thus the need for a name.
789 844
790These calls expect any number of the following handler/hook descriptions: 845These calls expect any number of the following handler/hook descriptions:
791 846
792=over 4 847=over 4
1083 1138
1084sub reattach { 1139sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1140 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1141 my ($obj) = @_;
1087 1142
1143 # no longer needed after getting rid of delete_package?
1088 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1144 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1089 1145
1090 my $registry = $obj->registry; 1146 my $registry = $obj->registry;
1091 1147
1092 @$registry = (); 1148 @$registry = ();
1093 1149
1139 utf8::decode (my $decname = $filename); 1195 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1196 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1142 1198
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1200 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1202 if ($cf::USE_FSYNC) {
1203 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;
1204 aio_fsync $fh;
1205 }
1147 close $fh; 1206 aio_close $fh;
1148 1207
1149 if (@$objs) { 1208 if (@$objs) {
1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1209 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1151 chmod SAVE_MODE, $fh; 1210 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 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;
1215 aio_fsync $fh;
1216 }
1155 close $fh; 1217 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1219 }
1158 } else { 1220 } else {
1159 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1160 } 1222 }
1161 1223
1162 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1225
1226 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1228 } else {
1164 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1165 } 1230 }
1166 } else { 1231 } else {
1167 aio_unlink $filename; 1232 aio_unlink $filename;
1168 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1169 } 1234 }
1260 my ($name, $cb) = @_; 1325 my ($name, $cb) = @_;
1261 1326
1262 $EXTICMD{$name} = $cb; 1327 $EXTICMD{$name} = $cb;
1263} 1328}
1264 1329
1330use File::Glob ();
1331
1265cf::player->attach ( 1332cf::player->attach (
1266 on_command => sub { 1333 on_unknown_command => sub {
1267 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1268 1335
1269 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1270 or return; 1337 or return;
1271 1338
1301 1368
1302 cf::override; 1369 cf::override;
1303 }, 1370 },
1304); 1371);
1305 1372
1373# "readahead" all extensions
1374sub cache_extensions {
1375 my $grp = IO::AIO::aio_group;
1376
1377 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1378 for (grep /\.ext$/, @{$_[0]}) {
1379 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1380 }
1381 };
1382
1383 $grp
1384}
1385
1306sub load_extensions { 1386sub load_extensions {
1307 cf::sync_job { 1387 cf::sync_job {
1308 my %todo; 1388 my %todo;
1309 1389
1310 for my $path (<$LIBDIR/*.ext>) { 1390 for my $path (<$LIBDIR/*.ext>) {
1329 1409
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1412
1333 $ext{source} = 1413 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1415 . "#line 1 \"$path\"\n{\n"
1336 . $source 1416 . $source
1337 . "\n};\n1"; 1417 . "\n};\n1";
1338 1418
1339 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1340 } 1420 }
1341 1421
1422 my $pass = 0;
1342 my %done; 1423 my %done;
1343 while (%todo) { 1424 while (%todo) {
1344 my $progress; 1425 my $progress;
1345 1426
1427 ++$pass;
1428
1429 ext:
1346 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1347 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1348 goto skip 1432 next ext
1349 unless exists $done{$_}; 1433 unless exists $done{$_};
1350 } 1434 }
1351 1435
1352 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1353 1437
1354 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1355 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1356 : "$v->{base}: extension inactive.\n";
1357 1442
1358 if (exists $v->{meta}{mandatory}) {
1359 warn $msg;
1360 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1361 } 1444 if exists $v->{meta}{mandatory};
1362 1445
1363 warn $msg; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1447 delete $todo{$k};
1448 } else {
1449 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1364 } 1455 }
1365
1366 $done{$k} = delete $todo{$k};
1367 push @EXTS, $v->{pkg};
1368 $progress = 1;
1369 } 1456 }
1370 1457
1371 skip: 1458 unless ($progress) {
1372 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1373 unless $progress; 1460
1461 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory};
1464 }
1465 }
1374 } 1466 }
1375 }; 1467 };
1376} 1468}
1377 1469
1378############################################################################# 1470#############################################################################
1379 1471
1380=back 1472=back
1381 1473
1382=head2 CORE EXTENSIONS 1474=head2 CORE EXTENSIONS
1383 1475
1384Functions and methods that extend core crossfire objects. 1476Functions and methods that extend core deliantra objects.
1385 1477
1386=cut 1478=cut
1387 1479
1388package cf::player; 1480package cf::player;
1389 1481
1432 1524
1433sub exists($) { 1525sub exists($) {
1434 my ($login) = @_; 1526 my ($login) = @_;
1435 1527
1436 $cf::PLAYER{$login} 1528 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1529 or !aio_stat path $login
1438} 1530}
1439 1531
1440sub find($) { 1532sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1533 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1534 my $login = $_[0];
1454 my $f = new_from_file cf::object::thawer path $login 1546 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1547 or return;
1456 1548
1457 my $pl = cf::player::load_pl $f 1549 my $pl = cf::player::load_pl $f
1458 or return; 1550 or return;
1551
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1552 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1553 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1462 } 1555 }
1463 } 1556 }
1464} 1557}
1465 1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1571
1466sub save($) { 1572sub save($) {
1467 my ($pl) = @_; 1573 my ($pl) = @_;
1468 1574
1469 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1470 1576
1473 1579
1474 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1475 1581
1476 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1584
1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1478 1589
1479 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1591 cf::cede_to_tick;
1481} 1592}
1482 1593
1514 my ($pl) = @_; 1625 my ($pl) = @_;
1515 1626
1516 my $name = $pl->ob->name; 1627 my $name = $pl->ob->name;
1517 1628
1518 $pl->{deny_save} = 1; 1629 $pl->{deny_save} = 1;
1519 $pl->password ("*"); # this should lock out the player until we nuked the dir 1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1520 1631
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1633 $pl->deactivate;
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1636 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1637 $pl->ns->destroy if $pl->ns;
1525 1638
1526 my $path = playerdir $pl; 1639 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1640 my $temp = "$path~$cf::RUNTIME~deleting~";
1566 1679
1567 for my $login (@$dirs) { 1680 for my $login (@$dirs) {
1568 my $path = path $login; 1681 my $path = path $login;
1569 1682
1570 # a .pst is a dead give-away for a valid player 1683 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1684 # if no pst file found, open and chekc for blocked users
1685 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1686 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1687 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1688 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1689 }
1576 1690
1580 1694
1581 \@logins 1695 \@logins
1582} 1696}
1583 1697
1584=item $player->maps 1698=item $player->maps
1699
1700=item cf::player::maps $login
1585 1701
1586Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1587player. May block. 1703player. May block.
1588 1704
1589=cut 1705=cut
1607 } 1723 }
1608 1724
1609 \@paths 1725 \@paths
1610} 1726}
1611 1727
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1728=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1729
1614Expand crossfire pod fragments into protocol xml. 1730Expand 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 1731
1705=item $player->ext_reply ($msgid, @msg) 1732=item $player->ext_reply ($msgid, @msg)
1706 1733
1707Sends an ext reply to the player. 1734Sends an ext reply to the player.
1708 1735
1740 1767
1741=cut 1768=cut
1742 1769
1743sub find_by_path($) { 1770sub find_by_path($) {
1744 my ($path) = @_; 1771 my ($path) = @_;
1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1745 1774
1746 my ($match, $specificity); 1775 my ($match, $specificity);
1747 1776
1748 for my $region (list) { 1777 for my $region (list) {
1749 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1781 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1782 1811
1783 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1784 $self->_create_random_map ( 1813 $self->_create_random_map (
1785 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1786 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1787 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1788 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1789 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1790 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1791 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1813 1842
1814 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1815} 1844}
1816 1845
1817# also paths starting with '/' 1846# also paths starting with '/'
1818$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1847$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1819 1848
1820sub thawer_merge { 1849sub thawer_merge {
1821 my ($self, $merge) = @_; 1850 my ($self, $merge) = @_;
1822 1851
1823 # we have to keep some variables in memory intact 1852 # we have to keep some variables in memory intact
1909 1938
1910# the temporary/swap location 1939# the temporary/swap location
1911sub save_path { 1940sub save_path {
1912 my ($self) = @_; 1941 my ($self) = @_;
1913 1942
1914 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1943 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1915 "$TMPDIR/$path.map" 1944 "$TMPDIR/$path.map"
1916} 1945}
1917 1946
1918# the unique path, undef == no special unique path 1947# the unique path, undef == no special unique path
1919sub uniq_path { 1948sub uniq_path {
1920 my ($self) = @_; 1949 my ($self) = @_;
1921 1950
1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1951 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1923 "$UNIQUEDIR/$path" 1952 "$UNIQUEDIR/$path"
1924}
1925
1926# and all this just because we cannot iterate over
1927# all maps in C++...
1928sub change_all_map_light {
1929 my ($change) = @_;
1930
1931 $_->change_map_light ($change)
1932 for grep $_->outdoor, values %cf::MAP;
1933} 1953}
1934 1954
1935sub decay_objects { 1955sub decay_objects {
1936 my ($self) = @_; 1956 my ($self) = @_;
1937 1957
2021sub find { 2041sub find {
2022 my ($path, $origin) = @_; 2042 my ($path, $origin) = @_;
2023 2043
2024 $path = normalise $path, $origin && $origin->path; 2044 $path = normalise $path, $origin && $origin->path;
2025 2045
2026 cf::lock_wait "map_data:$path";#d#remove 2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2027 cf::lock_wait "map_find:$path"; 2047 my $guard2 = cf::lock_acquire "map_find:$path";
2028 2048
2029 $cf::MAP{$path} || do { 2049 $cf::MAP{$path} || do {
2030 my $guard1 = cf::lock_acquire "map_find:$path";
2031 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2032
2033 my $map = new_from_path cf::map $path 2050 my $map = new_from_path cf::map $path
2034 or return; 2051 or return;
2035 2052
2036 $map->{last_save} = $cf::RUNTIME; 2053 $map->{last_save} = $cf::RUNTIME;
2037 2054
2039 or return; 2056 or return;
2040 2057
2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2058 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2042 # doing this can freeze the server in a sync job, obviously 2059 # doing this can freeze the server in a sync job, obviously
2043 #$cf::WAIT_FOR_TICK->wait; 2060 #$cf::WAIT_FOR_TICK->wait;
2061 undef $guard2;
2044 undef $guard1; 2062 undef $guard1;
2045 undef $guard2;
2046 $map->reset; 2063 $map->reset;
2047 return find $path; 2064 return find $path;
2048 } 2065 }
2049 2066
2050 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
2051 } 2068 }
2052} 2069}
2053 2070
2054sub pre_load { } 2071sub pre_load { }
2055sub post_load { } 2072#sub post_load { } # XS
2056 2073
2057sub load { 2074sub load {
2058 my ($self) = @_; 2075 my ($self) = @_;
2059 2076
2060 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
2077 my $f = new_from_file cf::object::thawer $self->{load_path}; 2094 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block; 2095 $f->skip_block;
2079 $self->_load_objects ($f) 2096 $self->_load_objects ($f)
2080 or return; 2097 or return;
2081 2098
2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2099 $self->post_load_original
2083 if delete $self->{load_original}; 2100 if delete $self->{load_original};
2084 2101
2085 if (my $uniq = $self->uniq_path) { 2102 if (my $uniq = $self->uniq_path) {
2086 utf8::encode $uniq; 2103 utf8::encode $uniq;
2087 unless (aio_stat $uniq) { 2104 unless (aio_stat $uniq) {
2105 unless ($self->{deny_activate}) { 2122 unless ($self->{deny_activate}) {
2106 $self->decay_objects; 2123 $self->decay_objects;
2107 $self->fix_auto_apply; 2124 $self->fix_auto_apply;
2108 $self->update_buttons; 2125 $self->update_buttons;
2109 cf::cede_to_tick; 2126 cf::cede_to_tick;
2110 $self->set_darkness_map;
2111 cf::cede_to_tick;
2112 $self->activate; 2127 $self->activate;
2113 } 2128 }
2114 2129
2115 $self->{last_save} = $cf::RUNTIME; 2130 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME); 2131 $self->last_access ($cf::RUNTIME);
2117 2132
2118 $self->in_memory (cf::MAP_IN_MEMORY); 2133 $self->in_memory (cf::MAP_ACTIVE);
2119 } 2134 }
2120 2135
2121 $self->post_load; 2136 $self->post_load;
2122} 2137}
2123 2138
2139# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath
2124sub customise_for { 2142sub customise_for {
2125 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2126 2144
2127 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2128 if $self->per_player; 2146 if $self->per_player;
2181 my ($path, $origin, $load) = @_; 2199 my ($path, $origin, $load) = @_;
2182 2200
2183 $path = normalise $path, $origin && $origin->{path}; 2201 $path = normalise $path, $origin && $origin->{path};
2184 2202
2185 if (my $map = $cf::MAP{$path}) { 2203 if (my $map = $cf::MAP{$path}) {
2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2204 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2187 } 2205 }
2188 2206
2189 $MAP_PREFETCH{$path} |= $load; 2207 $MAP_PREFETCH{$path} |= $load;
2190 2208
2191 $MAP_PREFETCHER ||= cf::async { 2209 $MAP_PREFETCHER ||= cf::async {
2205 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2206 2224
2207 () 2225 ()
2208} 2226}
2209 2227
2228# common code, used by both ->save and ->swapout
2210sub save { 2229sub _save {
2211 my ($self) = @_; 2230 my ($self) = @_;
2212
2213 my $lock = cf::lock_acquire "map_data:$self->{path}";
2214 2231
2215 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2216 2233
2217 return unless $self->dirty; 2234 return unless $self->dirty;
2218 2235
2227 2244
2228 cf::async { 2245 cf::async {
2229 $Coro::current->{desc} = "map player save"; 2246 $Coro::current->{desc} = "map player save";
2230 $_->contr->save for $self->players; 2247 $_->contr->save for $self->players;
2231 }; 2248 };
2249
2250 cf::get_slot 0.02;
2232 2251
2233 if ($uniq) { 2252 if ($uniq) {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2253 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2235 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2254 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2236 } else { 2255 } else {
2237 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2256 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2238 } 2257 }
2239} 2258}
2240 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2241sub swap_out { 2268sub swap_out {
2242 my ($self) = @_; 2269 my ($self) = @_;
2243 2270
2244 # save first because save cedes
2245 $self->save;
2246
2247 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2248 2272
2273 return if $self->in_memory != cf::MAP_ACTIVE;
2274 return if $self->{deny_save};
2249 return if $self->players; 2275 return if $self->players;
2250 return if $self->in_memory != cf::MAP_IN_MEMORY;
2251 return if $self->{deny_save};
2252 2276
2277 # first deactivate the map and "unlink" it from the core
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2253 $self->in_memory (cf::MAP_SWAPPED); 2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2286 $self->clear;
2287}
2288
2289sub reset_at {
2290 my ($self) = @_;
2291
2292 # TODO: safety, remove and allow resettable per-player maps
2293 return 1e99 if $self->{deny_reset};
2294
2295 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2296 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2297
2298 $time + $to
2299}
2300
2301sub should_reset {
2302 my ($self) = @_;
2303
2304 $self->reset_at <= $cf::RUNTIME
2305}
2306
2307sub reset {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 return if $self->players;
2313
2314 warn "resetting map ", $self->path, "\n";
2315
2316 $self->in_memory (cf::MAP_SWAPPED);
2317
2318 # need to save uniques path
2319 unless ($self->{deny_save}) {
2320 my $uniq = $self->uniq_path; utf8::encode $uniq;
2321
2322 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2323 if $uniq;
2324 }
2325
2326 delete $cf::MAP{$self->path};
2254 2327
2255 $self->deactivate; 2328 $self->deactivate;
2256 $_->clear_links_to ($self) for values %cf::MAP; 2329 $_->clear_links_to ($self) for values %cf::MAP;
2257 $self->clear; 2330 $self->clear;
2258}
2259
2260sub reset_at {
2261 my ($self) = @_;
2262
2263 # TODO: safety, remove and allow resettable per-player maps
2264 return 1e99 if $self->{deny_reset};
2265
2266 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2267 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2268
2269 $time + $to
2270}
2271
2272sub should_reset {
2273 my ($self) = @_;
2274
2275 $self->reset_at <= $cf::RUNTIME
2276}
2277
2278sub reset {
2279 my ($self) = @_;
2280
2281 my $lock = cf::lock_acquire "map_data:$self->{path}";
2282
2283 return if $self->players;
2284
2285 warn "resetting map ", $self->path;
2286
2287 $self->in_memory (cf::MAP_SWAPPED);
2288
2289 # need to save uniques path
2290 unless ($self->{deny_save}) {
2291 my $uniq = $self->uniq_path; utf8::encode $uniq;
2292
2293 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2294 if $uniq;
2295 }
2296
2297 delete $cf::MAP{$self->path};
2298
2299 $self->deactivate;
2300 $_->clear_links_to ($self) for values %cf::MAP;
2301 $self->clear;
2302 2331
2303 $self->unlink_save; 2332 $self->unlink_save;
2304 $self->destroy; 2333 $self->destroy;
2305} 2334}
2306 2335
2314 2343
2315 delete $cf::MAP{$self->path}; 2344 delete $cf::MAP{$self->path};
2316 2345
2317 $self->unlink_save; 2346 $self->unlink_save;
2318 2347
2319 bless $self, "cf::map"; 2348 bless $self, "cf::map::wrap";
2320 delete $self->{deny_reset}; 2349 delete $self->{deny_reset};
2321 $self->{deny_save} = 1; 2350 $self->{deny_save} = 1;
2322 $self->reset_timeout (1); 2351 $self->reset_timeout (1);
2323 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2324 2353
2373 2402
2374sub unique_maps() { 2403sub unique_maps() {
2375 [ 2404 [
2376 map { 2405 map {
2377 utf8::decode $_; 2406 utf8::decode $_;
2378 /\.map$/ 2407 s/\.map$//; # TODO future compatibility hack
2408 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2409 ? ()
2379 ? normalise $_ 2410 : normalise $_
2380 : ()
2381 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2382 ] 2412 ]
2383} 2413}
2384 2414
2415=item cf::map::static_maps
2416
2417Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2418file in the shared directory excluding F</styles> and F</editor>). May
2419block.
2420
2421=cut
2422
2423sub static_maps() {
2424 my @dirs = "";
2425 my @maps;
2426
2427 while (@dirs) {
2428 my $dir = shift @dirs;
2429
2430 next if $dir eq "/styles" || $dir eq "/editor";
2431
2432 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2433 or return;
2434
2435 for (@$files) {
2436 s/\.map$// or next;
2437 utf8::decode $_;
2438 push @maps, "$dir/$_";
2439 }
2440
2441 push @dirs, map "$dir/$_", @$dirs;
2442 }
2443
2444 \@maps
2445}
2446
2385=back 2447=back
2386 2448
2387=head3 cf::object 2449=head3 cf::object
2388 2450
2389=cut 2451=cut
2392 2454
2393=over 4 2455=over 4
2394 2456
2395=item $ob->inv_recursive 2457=item $ob->inv_recursive
2396 2458
2397Returns the inventory of the object _and_ their inventories, recursively. 2459Returns the inventory of the object I<and> their inventories, recursively,
2460but I<not> the object itself.
2398 2461
2399=cut 2462=cut
2400 2463
2401sub inv_recursive_; 2464sub inv_recursive_;
2402sub inv_recursive_ { 2465sub inv_recursive_ {
2407 inv_recursive_ inv $_[0] 2470 inv_recursive_ inv $_[0]
2408} 2471}
2409 2472
2410=item $ref = $ob->ref 2473=item $ref = $ob->ref
2411 2474
2412creates and returns a persistent reference to an objetc that can be stored as a string. 2475Creates and returns a persistent reference to an object that can be stored as a string.
2413 2476
2414=item $ob = cf::object::deref ($refstring) 2477=item $ob = cf::object::deref ($refstring)
2415 2478
2416returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2479returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2417even if the object actually exists. May block. 2480even if the object actually exists. May block.
2449can be C<undef>. Does the right thing when the player is currently in a 2512can be C<undef>. Does the right thing when the player is currently in a
2450dialogue with the given NPC character. 2513dialogue with the given NPC character.
2451 2514
2452=cut 2515=cut
2453 2516
2517our $SAY_CHANNEL = {
2518 id => "say",
2519 title => "Map",
2520 reply => "say ",
2521 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2522};
2523
2524our $CHAT_CHANNEL = {
2525 id => "chat",
2526 title => "Chat",
2527 reply => "chat ",
2528 tooltip => "Player chat and shouts, global to the server.",
2529};
2530
2454# rough implementation of a future "reply" method that works 2531# rough implementation of a future "reply" method that works
2455# with dialog boxes. 2532# with dialog boxes.
2456#TODO: the first argument must go, split into a $npc->reply_to ( method 2533#TODO: the first argument must go, split into a $npc->reply_to ( method
2457sub cf::object::player::reply($$$;$) { 2534sub cf::object::player::reply($$$;$) {
2458 my ($self, $npc, $msg, $flags) = @_; 2535 my ($self, $npc, $msg, $flags) = @_;
2469 my $dialog = $pl->{npc_dialog}; 2546 my $dialog = $pl->{npc_dialog};
2470 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2547 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2471 2548
2472 } else { 2549 } else {
2473 $msg = $npc->name . " says: $msg" if $npc; 2550 $msg = $npc->name . " says: $msg" if $npc;
2474 $self->message ($msg, $flags); 2551 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2475 } 2552 }
2476 } 2553 }
2477} 2554}
2478 2555
2479=item $object->send_msg ($channel, $msg, $color, [extra...]) 2556=item $object->send_msg ($channel, $msg, $color, [extra...])
2504 2581
2505=item $player_object->enter_link 2582=item $player_object->enter_link
2506 2583
2507Freezes the player and moves him/her to a special map (C<{link}>). 2584Freezes the player and moves him/her to a special map (C<{link}>).
2508 2585
2509The player should be reasonably safe there for short amounts of time. You 2586The player should be reasonably safe there for short amounts of time (e.g.
2510I<MUST> call C<leave_link> as soon as possible, though. 2587for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link
2589map.
2511 2590
2512Will never block. 2591Will never block.
2513 2592
2514=item $player_object->leave_link ($map, $x, $y) 2593=item $player_object->leave_link ($map, $x, $y)
2515 2594
2540 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2541 2620
2542 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2543 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2544 2623
2545 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2546} 2625}
2547 2626
2548sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2549 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2550 2629
2567 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2568 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2569 2648
2570 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2571 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2572 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2573 2652
2574 $map->load; 2653 $map->load;
2575 $map->load_neighbours; 2654 $map->load_neighbours;
2576 2655
2577 return unless $self->contr->active; 2656 return unless $self->contr->active;
2578 $self->activate_recursive;
2579 2657
2580 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2581 $self->enter_map ($map, $x, $y); 2659 $self->enter_map ($map, $x, $y);
2660
2661 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive;
2582} 2663}
2583 2664
2584=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2585 2666
2586Moves the player to the given map-path and coordinates by first freezing 2667Moves the player to the given map-path and coordinates by first freezing
2587her, loading and preparing them map, calling the provided $check callback 2668her, loading and preparing them map, calling the provided $check callback
2588that has to return the map if sucecssful, and then unfreezes the player on 2669that has to return the map if sucecssful, and then unfreezes the player on
2589the new (success) or old (failed) map position. In either case, $done will 2670the new (success) or old (failed) map position. In either case, $done will
2590be called at the end of this process. 2671be called at the end of this process.
2672
2673Note that $check will be called with a potentially non-loaded map, so if
2674it needs a loaded map it has to call C<< ->load >>.
2591 2675
2592=cut 2676=cut
2593 2677
2594our $GOTOGEN; 2678our $GOTOGEN;
2595 2679
2674} 2758}
2675 2759
2676sub prepare_random_map { 2760sub prepare_random_map {
2677 my ($exit) = @_; 2761 my ($exit) = @_;
2678 2762
2679 my $guard = cf::lock_acquire "exit_prepare:$exit";
2680
2681 # all this does is basically replace the /! path by 2763 # all this does is basically replace the /! path by
2682 # a new random map path (?random/...) with a seed 2764 # a new random map path (?random/...) with a seed
2683 # that depends on the exit object 2765 # that depends on the exit object
2684 2766
2685 my $rmp = parse_random_map_params $exit->msg; 2767 my $rmp = parse_random_map_params $exit->msg;
2687 if ($exit->map) { 2769 if ($exit->map) {
2688 $rmp->{region} = $exit->region->name; 2770 $rmp->{region} = $exit->region->name;
2689 $rmp->{origin_map} = $exit->map->path; 2771 $rmp->{origin_map} = $exit->map->path;
2690 $rmp->{origin_x} = $exit->x; 2772 $rmp->{origin_x} = $exit->x;
2691 $rmp->{origin_y} = $exit->y; 2773 $rmp->{origin_y} = $exit->y;
2774
2775 $exit->map->touch;
2692 } 2776 }
2693 2777
2694 $rmp->{random_seed} ||= $exit->random_seed; 2778 $rmp->{random_seed} ||= $exit->random_seed;
2695 2779
2696 my $data = cf::encode_json $rmp; 2780 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2697 my $md5 = Digest::MD5::md5_hex $data; 2781 my $md5 = Digest::MD5::md5_hex $data;
2698 my $meta = "$RANDOMDIR/$md5.meta"; 2782 my $meta = "$RANDOMDIR/$md5.meta";
2699 2783
2700 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2784 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2701 aio_write $fh, 0, (length $data), $data, 0; 2785 aio_write $fh, 0, (length $data), $data, 0;
2702 undef $fh; 2786 undef $fh;
2703 aio_rename "$meta~", $meta; 2787 aio_rename "$meta~", $meta;
2704 2788
2789 my $slaying = "?random/$md5";
2790
2791 if ($exit->valid) {
2705 $exit->slaying ("?random/$md5"); 2792 $exit->slaying ("?random/$md5");
2706 $exit->msg (undef); 2793 $exit->msg (undef);
2794 }
2707 } 2795 }
2708} 2796}
2709 2797
2710sub cf::object::player::enter_exit { 2798sub cf::object::player::enter_exit {
2711 my ($self, $exit) = @_; 2799 my ($self, $exit) = @_;
2712 2800
2713 return unless $self->type == cf::PLAYER; 2801 return unless $self->type == cf::PLAYER;
2714 2802
2715 if ($exit->slaying eq "/!") {
2716 #TODO: this should de-fi-ni-te-ly not be a sync-job
2717 # the problem is that $exit might not survive long enough
2718 # so it needs to be done right now, right here
2719 cf::sync_job { prepare_random_map $exit };
2720 }
2721
2722 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2723 my $hp = $exit->stats->hp;
2724 my $sp = $exit->stats->sp;
2725
2726 $self->enter_link; 2803 $self->enter_link;
2727 2804
2728 # if exit is damned, update players death & WoR home-position
2729 $self->contr->savebed ($slaying, $hp, $sp)
2730 if $exit->flag (FLAG_DAMNED);
2731
2732 (async { 2805 (async {
2733 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2806 $Coro::current->{desc} = "enter_exit";
2734 2807
2735 $self->deactivate_recursive; # just to be sure
2736 unless (eval { 2808 unless (eval {
2809 $self->deactivate_recursive; # just to be sure
2810
2811 # random map handling
2812 {
2813 my $guard = cf::lock_acquire "exit_prepare:$exit";
2814
2815 prepare_random_map $exit
2816 if $exit->slaying eq "/!";
2817 }
2818
2819 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2820 my $x = $exit->stats->hp;
2821 my $y = $exit->stats->sp;
2822
2737 $self->goto ($slaying, $hp, $sp); 2823 $self->goto ($map, $x, $y);
2738 2824
2825 # if exit is damned, update players death & WoR home-position
2826 $self->contr->savebed ($map, $x, $y)
2827 if $exit->flag (cf::FLAG_DAMNED);
2828
2739 1; 2829 1
2740 }) { 2830 }) {
2741 $self->message ("Something went wrong deep within the crossfire server. " 2831 $self->message ("Something went wrong deep within the deliantra server. "
2742 . "I'll try to bring you back to the map you were before. " 2832 . "I'll try to bring you back to the map you were before. "
2743 . "Please report this to the dungeon master!", 2833 . "Please report this to the dungeon master!",
2744 cf::NDI_UNIQUE | cf::NDI_RED); 2834 cf::NDI_UNIQUE | cf::NDI_RED);
2745 2835
2746 warn "ERROR in enter_exit: $@"; 2836 warn "ERROR in enter_exit: $@";
2763sub cf::client::send_drawinfo { 2853sub cf::client::send_drawinfo {
2764 my ($self, $text, $flags) = @_; 2854 my ($self, $text, $flags) = @_;
2765 2855
2766 utf8::encode $text; 2856 utf8::encode $text;
2767 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2857 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2858}
2859
2860=item $client->send_big_packet ($pkt)
2861
2862Like C<send_packet>, but tries to compress large packets, and fragments
2863them as required.
2864
2865=cut
2866
2867our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2868
2869sub cf::client::send_big_packet {
2870 my ($self, $pkt) = @_;
2871
2872 # try lzf for large packets
2873 $pkt = "lzf " . Compress::LZF::compress $pkt
2874 if 1024 <= length $pkt and $self->{can_lzf};
2875
2876 # split very large packets
2877 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2878 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2879 $pkt = "frag";
2880 }
2881
2882 $self->send_packet ($pkt);
2768} 2883}
2769 2884
2770=item $client->send_msg ($channel, $msg, $color, [extra...]) 2885=item $client->send_msg ($channel, $msg, $color, [extra...])
2771 2886
2772Send a drawinfo or msg packet to the client, formatting the msg for the 2887Send a drawinfo or msg packet to the client, formatting the msg for the
2776 2891
2777=cut 2892=cut
2778 2893
2779# non-persistent channels (usually the info channel) 2894# non-persistent channels (usually the info channel)
2780our %CHANNEL = ( 2895our %CHANNEL = (
2896 "c/motd" => {
2897 id => "infobox",
2898 title => "MOTD",
2899 reply => undef,
2900 tooltip => "The message of the day",
2901 },
2781 "c/identify" => { 2902 "c/identify" => {
2782 id => "infobox", 2903 id => "infobox",
2783 title => "Identify", 2904 title => "Identify",
2784 reply => undef, 2905 reply => undef,
2785 tooltip => "Items recently identified", 2906 tooltip => "Items recently identified",
2787 "c/examine" => { 2908 "c/examine" => {
2788 id => "infobox", 2909 id => "infobox",
2789 title => "Examine", 2910 title => "Examine",
2790 reply => undef, 2911 reply => undef,
2791 tooltip => "Signs and other items you examined", 2912 tooltip => "Signs and other items you examined",
2913 },
2914 "c/shopinfo" => {
2915 id => "infobox",
2916 title => "Shop Info",
2917 reply => undef,
2918 tooltip => "What your bargaining skill tells you about the shop",
2792 }, 2919 },
2793 "c/book" => { 2920 "c/book" => {
2794 id => "infobox", 2921 id => "infobox",
2795 title => "Book", 2922 title => "Book",
2796 reply => undef, 2923 reply => undef,
2812 id => "infobox", 2939 id => "infobox",
2813 title => "Body Parts", 2940 title => "Body Parts",
2814 reply => undef, 2941 reply => undef,
2815 tooltip => "Shows which body parts you posess and are available", 2942 tooltip => "Shows which body parts you posess and are available",
2816 }, 2943 },
2944 "c/statistics" => {
2945 id => "infobox",
2946 title => "Statistics",
2947 reply => undef,
2948 tooltip => "Shows your primary statistics",
2949 },
2950 "c/skills" => {
2951 id => "infobox",
2952 title => "Skills",
2953 reply => undef,
2954 tooltip => "Shows your experience per skill and item power",
2955 },
2956 "c/shopitems" => {
2957 id => "infobox",
2958 title => "Shop Items",
2959 reply => undef,
2960 tooltip => "Shows the items currently for sale in this shop",
2961 },
2962 "c/resistances" => {
2963 id => "infobox",
2964 title => "Resistances",
2965 reply => undef,
2966 tooltip => "Shows your resistances",
2967 },
2968 "c/pets" => {
2969 id => "infobox",
2970 title => "Pets",
2971 reply => undef,
2972 tooltip => "Shows information abotu your pets/a specific pet",
2973 },
2974 "c/perceiveself" => {
2975 id => "infobox",
2976 title => "Perceive Self",
2977 reply => undef,
2978 tooltip => "You gained detailed knowledge about yourself",
2979 },
2817 "c/uptime" => { 2980 "c/uptime" => {
2818 id => "infobox", 2981 id => "infobox",
2819 title => "Uptime", 2982 title => "Uptime",
2820 reply => undef, 2983 reply => undef,
2821 tooltip => "How long the server has been running since last restart", 2984 tooltip => "How long the server has been running since last restart",
2824 id => "infobox", 2987 id => "infobox",
2825 title => "Map Info", 2988 title => "Map Info",
2826 reply => undef, 2989 reply => undef,
2827 tooltip => "Information related to the maps", 2990 tooltip => "Information related to the maps",
2828 }, 2991 },
2992 "c/party" => {
2993 id => "party",
2994 title => "Party",
2995 reply => "gsay ",
2996 tooltip => "Messages and chat related to your party",
2997 },
2998 "c/death" => {
2999 id => "death",
3000 title => "Death",
3001 reply => undef,
3002 tooltip => "Reason for and more info about your most recent death",
3003 },
3004 "c/say" => $SAY_CHANNEL,
3005 "c/chat" => $CHAT_CHANNEL,
2829); 3006);
2830 3007
2831sub cf::client::send_msg { 3008sub cf::client::send_msg {
2832 my ($self, $channel, $msg, $color, @extra) = @_; 3009 my ($self, $channel, $msg, $color, @extra) = @_;
2833 3010
2834 $msg = $self->pl->expand_cfpod ($msg); 3011 $msg = $self->pl->expand_cfpod ($msg)
3012 unless $color & cf::NDI_VERBATIM;
2835 3013
2836 $color &= cf::NDI_CLIENT_MASK; # just in case... 3014 $color &= cf::NDI_CLIENT_MASK; # just in case...
2837 3015
2838 # check predefined channels, for the benefit of C 3016 # check predefined channels, for the benefit of C
2839 if ($CHANNEL{$channel}) { 3017 if ($CHANNEL{$channel}) {
2840 $channel = $CHANNEL{$channel}; 3018 $channel = $CHANNEL{$channel};
2841 3019
2842 $self->ext_msg (channel_info => $channel) 3020 $self->ext_msg (channel_info => $channel);
2843 if $self->can_msg;
2844
2845 $channel = $channel->{id}; 3021 $channel = $channel->{id};
2846 3022
2847 } elsif (ref $channel) { 3023 } elsif (ref $channel) {
2848 # send meta info to client, if not yet sent 3024 # send meta info to client, if not yet sent
2849 unless (exists $self->{channel}{$channel->{id}}) { 3025 unless (exists $self->{channel}{$channel->{id}}) {
2850 $self->{channel}{$channel->{id}} = $channel; 3026 $self->{channel}{$channel->{id}} = $channel;
2851 $self->ext_msg (channel_info => $channel) 3027 $self->ext_msg (channel_info => $channel);
2852 if $self->can_msg;
2853 } 3028 }
2854 3029
2855 $channel = $channel->{id}; 3030 $channel = $channel->{id};
2856 } 3031 }
2857 3032
2858 return unless @extra || length $msg; 3033 return unless @extra || length $msg;
2859 3034
2860 if ($self->can_msg) {
2861 # default colour, mask it out 3035 # default colour, mask it out
2862 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3036 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2863 if $color & cf::NDI_DEF; 3037 if $color & cf::NDI_DEF;
2864 3038
2865 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3039 my $pkt = "msg "
3040 . $self->{json_coder}->encode (
2866 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3041 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2867 } else { 3042 );
2868 if ($color >= 0) {
2869 # replace some tags by gcfclient-compatible ones
2870 for ($msg) {
2871 1 while
2872 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2873 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2874 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2875 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2876 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2877 }
2878 3043
2879 $color &= cf::NDI_COLOR_MASK; 3044 $self->send_big_packet ($pkt);
2880
2881 utf8::encode $msg;
2882
2883 if (0 && $msg =~ /\[/) {
2884 # COMMAND/INFO
2885 $self->send_packet ("drawextinfo $color 10 8 $msg")
2886 } else {
2887 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2888 $self->send_packet ("drawinfo $color $msg")
2889 }
2890 }
2891 }
2892} 3045}
2893 3046
2894=item $client->ext_msg ($type, @msg) 3047=item $client->ext_msg ($type, @msg)
2895 3048
2896Sends an ext event to the client. 3049Sends an ext event to the client.
2899 3052
2900sub cf::client::ext_msg($$@) { 3053sub cf::client::ext_msg($$@) {
2901 my ($self, $type, @msg) = @_; 3054 my ($self, $type, @msg) = @_;
2902 3055
2903 if ($self->extcmd == 2) { 3056 if ($self->extcmd == 2) {
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3057 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2905 } elsif ($self->extcmd == 1) { # TODO: remove 3058 } elsif ($self->extcmd == 1) { # TODO: remove
2906 push @msg, msgtype => "event_$type"; 3059 push @msg, msgtype => "event_$type";
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3060 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2908 } 3061 }
2909} 3062}
2910 3063
2911=item $client->ext_reply ($msgid, @msg) 3064=item $client->ext_reply ($msgid, @msg)
2912 3065
2916 3069
2917sub cf::client::ext_reply($$@) { 3070sub cf::client::ext_reply($$@) {
2918 my ($self, $id, @msg) = @_; 3071 my ($self, $id, @msg) = @_;
2919 3072
2920 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2921 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2922 } elsif ($self->extcmd == 1) { 3075 } elsif ($self->extcmd == 1) {
2923 #TODO: version 1, remove 3076 #TODO: version 1, remove
2924 unshift @msg, msgtype => "reply", msgid => $id; 3077 unshift @msg, msgtype => "reply", msgid => $id;
2925 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3078 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2926 } 3079 }
2927} 3080}
2928 3081
2929=item $success = $client->query ($flags, "text", \&cb) 3082=item $success = $client->query ($flags, "text", \&cb)
2930 3083
3031 3184
3032 $coro 3185 $coro
3033} 3186}
3034 3187
3035cf::client->attach ( 3188cf::client->attach (
3036 on_destroy => sub { 3189 on_client_destroy => sub {
3037 my ($ns) = @_; 3190 my ($ns) = @_;
3038 3191
3039 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3192 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3040 }, 3193 },
3041); 3194);
3057our $safe_hole = new Safe::Hole; 3210our $safe_hole = new Safe::Hole;
3058 3211
3059$SIG{FPE} = 'IGNORE'; 3212$SIG{FPE} = 'IGNORE';
3060 3213
3061$safe->permit_only (Opcode::opset qw( 3214$safe->permit_only (Opcode::opset qw(
3062 :base_core :base_mem :base_orig :base_math 3215 :base_core :base_mem :base_orig :base_math :base_loop
3063 grepstart grepwhile mapstart mapwhile 3216 grepstart grepwhile mapstart mapwhile
3064 sort time 3217 sort time
3065)); 3218));
3066 3219
3067# here we export the classes and methods available to script code 3220# here we export the classes and methods available to script code
3070 3223
3071The following functions and methods are available within a safe environment: 3224The following functions and methods are available within a safe environment:
3072 3225
3073 cf::object 3226 cf::object
3074 contr pay_amount pay_player map x y force_find force_add destroy 3227 contr pay_amount pay_player map x y force_find force_add destroy
3075 insert remove name archname title slaying race decrease_ob_nr 3228 insert remove name archname title slaying race decrease split
3229 value
3076 3230
3077 cf::object::player 3231 cf::object::player
3078 player 3232 player
3079 3233
3080 cf::player 3234 cf::player
3085 3239
3086=cut 3240=cut
3087 3241
3088for ( 3242for (
3089 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3243 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3090 insert remove inv name archname title slaying race 3244 insert remove inv nrof name archname title slaying race
3091 decrease_ob_nr destroy)], 3245 decrease split destroy change_exp value msg lore send_msg)],
3092 ["cf::object::player" => qw(player)], 3246 ["cf::object::player" => qw(player)],
3093 ["cf::player" => qw(peaceful)], 3247 ["cf::player" => qw(peaceful send_msg)],
3094 ["cf::map" => qw(trigger)], 3248 ["cf::map" => qw(trigger)],
3095) { 3249) {
3096 no strict 'refs'; 3250 no strict 'refs';
3097 my ($pkg, @funs) = @$_; 3251 my ($pkg, @funs) = @$_;
3098 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3116 3270
3117 my $qcode = $code; 3271 my $qcode = $code;
3118 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3272 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3119 $qcode =~ s/\n/\\n/g; 3273 $qcode =~ s/\n/\\n/g;
3120 3274
3275 %vars = (_dummy => 0) unless %vars;
3276
3277 my @res;
3121 local $_; 3278 local $_;
3122 local @safe::cf::_safe_eval_args = values %vars;
3123 3279
3124 my $eval = 3280 my $eval =
3125 "do {\n" 3281 "do {\n"
3126 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3282 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3127 . "#line 0 \"{$qcode}\"\n" 3283 . "#line 0 \"{$qcode}\"\n"
3128 . $code 3284 . $code
3129 . "\n}" 3285 . "\n}"
3130 ; 3286 ;
3131 3287
3288 if ($CFG{safe_eval}) {
3132 sub_generation_inc; 3289 sub_generation_inc;
3290 local @safe::cf::_safe_eval_args = values %vars;
3133 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3291 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3134 sub_generation_inc; 3292 sub_generation_inc;
3293 } else {
3294 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval;
3296 }
3135 3297
3136 if ($@) { 3298 if ($@) {
3137 warn "$@"; 3299 warn "$@";
3138 warn "while executing safe code '$code'\n"; 3300 warn "while executing safe code '$code'\n";
3139 warn "with arguments " . (join " ", %vars) . "\n"; 3301 warn "with arguments " . (join " ", %vars) . "\n";
3158=cut 3320=cut
3159 3321
3160sub register_script_function { 3322sub register_script_function {
3161 my ($fun, $cb) = @_; 3323 my ($fun, $cb) = @_;
3162 3324
3163 no strict 'refs'; 3325 $fun = "safe::$fun" if $CFG{safe_eval};
3164 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3326 *$fun = $safe_hole->wrap ($cb);
3165} 3327}
3166 3328
3167=back 3329=back
3168 3330
3169=cut 3331=cut
3190 3352
3191 $facedata->{version} == 2 3353 $facedata->{version} == 2
3192 or cf::cleanup "$path: version mismatch, cannot proceed."; 3354 or cf::cleanup "$path: version mismatch, cannot proceed.";
3193 3355
3194 # patch in the exptable 3356 # patch in the exptable
3357 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3195 $facedata->{resource}{"res/exp_table"} = { 3358 $facedata->{resource}{"res/exp_table"} = {
3196 type => FT_RSRC, 3359 type => FT_RSRC,
3197 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3360 data => $exp_table,
3361 hash => (Digest::MD5::md5 $exp_table),
3198 }; 3362 };
3199 cf::cede_to_tick; 3363 cf::cede_to_tick;
3200 3364
3201 { 3365 {
3202 my $faces = $facedata->{faceinfo}; 3366 my $faces = $facedata->{faceinfo};
3204 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3205 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3369 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3206 3370
3207 cf::face::set_visibility $idx, $info->{visibility}; 3371 cf::face::set_visibility $idx, $info->{visibility};
3208 cf::face::set_magicmap $idx, $info->{magicmap}; 3372 cf::face::set_magicmap $idx, $info->{magicmap};
3209 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3210 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3211 3375
3212 cf::cede_to_tick; 3376 cf::cede_to_tick;
3213 } 3377 }
3214 3378
3215 while (my ($face, $info) = each %$faces) { 3379 while (my ($face, $info) = each %$faces) {
3239 3403
3240 cf::anim::invalidate_all; # d'oh 3404 cf::anim::invalidate_all; # d'oh
3241 } 3405 }
3242 3406
3243 { 3407 {
3244 # TODO: for gcfclient pleasure, we should give resources
3245 # that gcfclient doesn't grok a >10000 face index.
3246 my $res = $facedata->{resource}; 3408 my $res = $facedata->{resource};
3247 3409
3248 while (my ($name, $info) = each %$res) { 3410 while (my ($name, $info) = each %$res) {
3249 if (defined $info->{type}) { 3411 if (defined $info->{type}) {
3250 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3412 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3251 my $data;
3252 3413
3253 if ($info->{type} & 1) { 3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3254 # prepend meta info
3255
3256 my $meta = $enc->encode ({
3257 name => $name,
3258 %{ $info->{meta} || {} },
3259 });
3260
3261 $data = pack "(w/a*)*", $meta, $info->{data};
3262 } else {
3263 $data = $info->{data};
3264 }
3265
3266 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3267 cf::face::set_type $idx, $info->{type}; 3415 cf::face::set_type $idx, $info->{type};
3268 } else { 3416 } else {
3269 $RESOURCE{$name} = $info; 3417 $RESOURCE{$name} = $info;
3270 } 3418 }
3271 3419
3304 while (my ($k, $v) = each %$want) { 3452 while (my ($k, $v) = each %$want) {
3305 $ns->fx_want ($k, $v); 3453 $ns->fx_want ($k, $v);
3306 } 3454 }
3307}; 3455};
3308 3456
3457sub load_resource_file($) {
3458 my $guard = lock_acquire "load_resource_file";
3459
3460 my $status = load_resource_file_ $_[0];
3461 get_slot 0.1, 100;
3462 cf::arch::commit_load;
3463
3464 $status
3465}
3466
3309sub reload_regions { 3467sub reload_regions {
3310 # HACK to clear player env face cache, we need some signal framework 3468 # HACK to clear player env face cache, we need some signal framework
3311 # for this (global event?) 3469 # for this (global event?)
3312 %ext::player_env::MUSIC_FACE_CACHE = (); 3470 %ext::player_env::MUSIC_FACE_CACHE = ();
3313 3471
3326} 3484}
3327 3485
3328sub reload_archetypes { 3486sub reload_archetypes {
3329 load_resource_file "$DATADIR/archetypes" 3487 load_resource_file "$DATADIR/archetypes"
3330 or die "unable to load archetypes\n"; 3488 or die "unable to load archetypes\n";
3331 #d# NEED to laod twice to resolve forward references
3332 # this really needs to be done in an extra post-pass
3333 # (which needs to be synchronous, so solve it differently)
3334 load_resource_file "$DATADIR/archetypes"
3335 or die "unable to load archetypes\n";
3336} 3489}
3337 3490
3338sub reload_treasures { 3491sub reload_treasures {
3339 load_resource_file "$DATADIR/treasures" 3492 load_resource_file "$DATADIR/treasures"
3340 or die "unable to load treasurelists\n"; 3493 or die "unable to load treasurelists\n";
3341} 3494}
3342 3495
3343sub reload_resources { 3496sub reload_resources {
3344 warn "reloading resource files...\n"; 3497 warn "reloading resource files...\n";
3345 3498
3499 reload_facedata;
3500 reload_archetypes;
3346 reload_regions; 3501 reload_regions;
3347 reload_facedata;
3348 #reload_archetypes;#d#
3349 reload_archetypes;
3350 reload_treasures; 3502 reload_treasures;
3351 3503
3352 warn "finished reloading resource files\n"; 3504 warn "finished reloading resource files\n";
3353} 3505}
3354 3506
3355sub init {
3356 reload_resources;
3357}
3358
3359sub reload_config { 3507sub reload_config {
3508 warn "reloading config file...\n";
3509
3360 open my $fh, "<:utf8", "$CONFDIR/config" 3510 open my $fh, "<:utf8", "$CONFDIR/config"
3361 or return; 3511 or return;
3362 3512
3363 local $/; 3513 local $/;
3364 *CFG = YAML::Load <$fh>; 3514 *CFG = YAML::XS::Load scalar <$fh>;
3365 3515
3366 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3367 3517
3368 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3369 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3373 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3374 and die "WARNING: m(un)lockall failed: $!\n"; 3524 and die "WARNING: m(un)lockall failed: $!\n";
3375 }; 3525 };
3376 warn $@ if $@; 3526 warn $@ if $@;
3377 } 3527 }
3528
3529 warn "finished reloading resource files\n";
3530}
3531
3532sub pidfile() {
3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534 or die "$PIDFILE: $!";
3535 flock $fh, &Fcntl::LOCK_EX
3536 or die "$PIDFILE: flock: $!";
3537 $fh
3538}
3539
3540# make sure only one server instance is running at any one time
3541sub atomic {
3542 my $fh = pidfile;
3543
3544 my $pid = <$fh>;
3545 kill 9, $pid if $pid > 0;
3546
3547 seek $fh, 0, 0;
3548 print $fh $$;
3549}
3550
3551sub main_loop {
3552 warn "EV::loop starting\n";
3553 if (1) {
3554 EV::loop;
3555 }
3556 warn "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP;
3378} 3558}
3379 3559
3380sub main { 3560sub main {
3561 cf::init_globals; # initialise logging
3562
3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567
3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3569
3381 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
3382 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
3383 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3572 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3384 (async { 3573 (async {
3385 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3574 $Coro::current->{desc} = "IDLE BUG HANDLER";
3386 EV::loop EV::LOOP_ONESHOT; 3575 EV::loop EV::LOOP_ONESHOT;
3387 })->prio (Coro::PRIO_MAX); 3576 })->prio (Coro::PRIO_MAX);
3388 }; 3577 };
3389 3578
3390 reload_config;
3391 db_init;
3392 load_extensions;
3393
3394 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 evthread_start IO::AIO::poll_fileno; 3579 evthread_start IO::AIO::poll_fileno;
3396 EV::loop; 3580
3581 cf::sync_job {
3582 cf::init_experience;
3583 cf::init_anim;
3584 cf::init_attackmess;
3585 cf::init_dynamic;
3586
3587 cf::load_settings;
3588 cf::load_materials;
3589
3590 reload_resources;
3591 reload_config;
3592 db_init;
3593
3594 cf::init_uuid;
3595 cf::init_signals;
3596 cf::init_skills;
3597
3598 cf::init_beforeplay;
3599
3600 atomic;
3601
3602 load_extensions;
3603
3604 utime time, time, $RUNTIMEFILE;
3605
3606 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX ();
3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3609
3610 (pop @POST_INIT)->(0) while @POST_INIT;
3611 };
3612
3613 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n";
3615
3616 main_loop;
3397} 3617}
3398 3618
3399############################################################################# 3619#############################################################################
3400# initialisation and cleanup 3620# initialisation and cleanup
3401 3621
3402# install some emergency cleanup handlers 3622# install some emergency cleanup handlers
3403BEGIN { 3623BEGIN {
3404 our %SIGWATCHER = (); 3624 our %SIGWATCHER = ();
3405 for my $signal (qw(INT HUP TERM)) { 3625 for my $signal (qw(INT HUP TERM)) {
3406 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3626 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3407 cf::cleanup "SIG$signal"; 3627 cf::cleanup "SIG$signal";
3408 }; 3628 };
3409 } 3629 }
3410} 3630}
3411 3631
3412sub write_runtime_sync { 3632sub write_runtime_sync {
3413 my $runtime = "$LOCALDIR/runtime"; 3633 my $t0 = AE::time;
3414 3634
3415 # first touch the runtime file to show we are still running: 3635 # first touch the runtime file to show we are still running:
3416 # the fsync below can take a very very long time. 3636 # the fsync below can take a very very long time.
3417 3637
3418 IO::AIO::aio_utime $runtime, undef, undef; 3638 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3419 3639
3420 my $guard = cf::lock_acquire "write_runtime"; 3640 my $guard = cf::lock_acquire "write_runtime";
3421 3641
3422 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3642 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3423 or return; 3643 or return;
3424 3644
3425 my $value = $cf::RUNTIME + 90 + 10; 3645 my $value = $cf::RUNTIME + 90 + 10;
3426 # 10 is the runtime save interval, for a monotonic clock 3646 # 10 is the runtime save interval, for a monotonic clock
3427 # 60 allows for the watchdog to kill the server. 3647 # 60 allows for the watchdog to kill the server.
3437 aio_utime $fh, undef, undef; 3657 aio_utime $fh, undef, undef;
3438 3658
3439 close $fh 3659 close $fh
3440 or return; 3660 or return;
3441 3661
3442 aio_rename "$runtime~", $runtime 3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3443 and return; 3663 and return;
3444 3664
3445 warn "runtime file written.\n"; 3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3446 3666
3447 1 3667 1
3448} 3668}
3449 3669
3450our $uuid_lock; 3670our $uuid_lock;
3459 my $uuid = "$LOCALDIR/uuid"; 3679 my $uuid = "$LOCALDIR/uuid";
3460 3680
3461 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3681 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3462 or return; 3682 or return;
3463 3683
3464 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3684 my $value = uuid_seq uuid_cur;
3685
3686 unless ($value) {
3687 warn "cowardly refusing to write zero uuid value!\n";
3688 return;
3689 }
3690
3691 my $value = uuid_str $value + $uuid_skip;
3465 $uuid_skip = 0; 3692 $uuid_skip = 0;
3466 3693
3467 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3694 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3468 and return; 3695 and return;
3469 3696
3491} 3718}
3492 3719
3493sub emergency_save() { 3720sub emergency_save() {
3494 my $freeze_guard = cf::freeze_mainloop; 3721 my $freeze_guard = cf::freeze_mainloop;
3495 3722
3496 warn "enter emergency perl save\n"; 3723 warn "emergency_perl_save: enter\n";
3497 3724
3498 cf::sync_job { 3725 cf::sync_job {
3726 # this is a trade-off: we want to be very quick here, so
3727 # save all maps without fsync, and later call a global sync
3728 # (which in turn might be very very slow)
3729 local $USE_FSYNC = 0;
3730
3499 # use a peculiar iteration method to avoid tripping on perl 3731 # use a peculiar iteration method to avoid tripping on perl
3500 # refcount bugs in for. also avoids problems with players 3732 # refcount bugs in for. also avoids problems with players
3501 # and maps saved/destroyed asynchronously. 3733 # and maps saved/destroyed asynchronously.
3502 warn "begin emergency player save\n"; 3734 warn "emergency_perl_save: begin player save\n";
3503 for my $login (keys %cf::PLAYER) { 3735 for my $login (keys %cf::PLAYER) {
3504 my $pl = $cf::PLAYER{$login} or next; 3736 my $pl = $cf::PLAYER{$login} or next;
3505 $pl->valid or next; 3737 $pl->valid or next;
3506 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3507 $pl->save; 3739 $pl->save;
3508 } 3740 }
3509 warn "end emergency player save\n"; 3741 warn "emergency_perl_save: end player save\n";
3510 3742
3511 warn "begin emergency map save\n"; 3743 warn "emergency_perl_save: begin map save\n";
3512 for my $path (keys %cf::MAP) { 3744 for my $path (keys %cf::MAP) {
3513 my $map = $cf::MAP{$path} or next; 3745 my $map = $cf::MAP{$path} or next;
3514 $map->valid or next; 3746 $map->valid or next;
3515 $map->save; 3747 $map->save;
3516 } 3748 }
3517 warn "end emergency map save\n"; 3749 warn "emergency_perl_save: end map save\n";
3518 3750
3519 warn "begin emergency database checkpoint\n"; 3751 warn "emergency_perl_save: begin database checkpoint\n";
3520 BDB::db_env_txn_checkpoint $DB_ENV; 3752 BDB::db_env_txn_checkpoint $DB_ENV;
3521 warn "end emergency database checkpoint\n"; 3753 warn "emergency_perl_save: end database checkpoint\n";
3522 3754
3523 warn "begin write uuid\n"; 3755 warn "emergency_perl_save: begin write uuid\n";
3524 write_uuid_sync 1; 3756 write_uuid_sync 1;
3525 warn "end write uuid\n"; 3757 warn "emergency_perl_save: end write uuid\n";
3526 }; 3758 };
3527 3759
3760 warn "emergency_perl_save: starting sync()\n";
3761 IO::AIO::aio_sync sub {
3762 warn "emergency_perl_save: finished sync()\n";
3763 };
3764
3528 warn "leave emergency perl save\n"; 3765 warn "emergency_perl_save: leave\n";
3529} 3766}
3530 3767
3531sub post_cleanup { 3768sub post_cleanup {
3532 my ($make_core) = @_; 3769 my ($make_core) = @_;
3533 3770
3534 warn Carp::longmess "post_cleanup backtrace" 3771 warn Carp::longmess "post_cleanup backtrace"
3535 if $make_core; 3772 if $make_core;
3773
3774 my $fh = pidfile;
3775 unlink $PIDFILE if <$fh> == $$;
3776}
3777
3778# a safer delete_package, copied from Symbol
3779sub clear_package($) {
3780 my $pkg = shift;
3781
3782 # expand to full symbol table name if needed
3783 unless ($pkg =~ /^main::.*::$/) {
3784 $pkg = "main$pkg" if $pkg =~ /^::/;
3785 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3786 $pkg .= '::' unless $pkg =~ /::$/;
3787 }
3788
3789 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3790 my $stem_symtab = *{$stem}{HASH};
3791
3792 defined $stem_symtab and exists $stem_symtab->{$leaf}
3793 or return;
3794
3795 # clear all symbols
3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3797 for my $name (keys %$leaf_symtab) {
3798 _gv_clear *{"$pkg$name"};
3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3800 }
3536} 3801}
3537 3802
3538sub do_reload_perl() { 3803sub do_reload_perl() {
3539 # can/must only be called in main 3804 # can/must only be called in main
3540 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3541 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3542 return; 3807 return;
3543 } 3808 }
3544 3809
3810 return if $RELOAD++;
3811
3812 my $t1 = AE::time;
3813
3814 while ($RELOAD) {
3545 warn "reloading..."; 3815 warn "reloading...";
3546 3816
3547 warn "entering sync_job"; 3817 warn "entering sync_job";
3548 3818
3549 cf::sync_job { 3819 cf::sync_job {
3550 cf::write_runtime_sync; # external watchdog should not bark 3820 cf::write_runtime_sync; # external watchdog should not bark
3551 cf::emergency_save; 3821 cf::emergency_save;
3552 cf::write_runtime_sync; # external watchdog should not bark 3822 cf::write_runtime_sync; # external watchdog should not bark
3553 3823
3554 warn "syncing database to disk"; 3824 warn "syncing database to disk";
3555 BDB::db_env_txn_checkpoint $DB_ENV; 3825 BDB::db_env_txn_checkpoint $DB_ENV;
3556 3826
3557 # if anything goes wrong in here, we should simply crash as we already saved 3827 # if anything goes wrong in here, we should simply crash as we already saved
3558 3828
3559 warn "flushing outstanding aio requests"; 3829 warn "flushing outstanding aio requests";
3560 for (;;) {
3561 BDB::flush;
3562 IO::AIO::flush;
3563 Coro::cede_notself;
3564 last unless IO::AIO::nreqs || BDB::nreqs; 3830 while (IO::AIO::nreqs || BDB::nreqs) {
3565 warn "iterate..."; 3831 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3566 }
3567
3568 ++$RELOAD;
3569
3570 warn "cancelling all extension coros";
3571 $_->cancel for values %EXT_CORO;
3572 %EXT_CORO = ();
3573
3574 warn "removing commands";
3575 %COMMAND = ();
3576
3577 warn "removing ext/exti commands";
3578 %EXTCMD = ();
3579 %EXTICMD = ();
3580
3581 warn "unloading/nuking all extensions";
3582 for my $pkg (@EXTS) {
3583 warn "... unloading $pkg";
3584
3585 if (my $cb = $pkg->can ("unload")) {
3586 eval {
3587 $cb->($pkg);
3588 1
3589 } or warn "$pkg unloaded, but with errors: $@";
3590 } 3832 }
3591 3833
3592 warn "... nuking $pkg"; 3834 warn "cancelling all extension coros";
3593 Symbol::delete_package $pkg; 3835 $_->cancel for values %EXT_CORO;
3594 } 3836 %EXT_CORO = ();
3595 3837
3596 warn "unloading all perl modules loaded from $LIBDIR"; 3838 warn "removing commands";
3597 while (my ($k, $v) = each %INC) { 3839 %COMMAND = ();
3598 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3599 3840
3841 warn "removing ext/exti commands";
3842 %EXTCMD = ();
3843 %EXTICMD = ();
3844
3845 warn "unloading/nuking all extensions";
3846 for my $pkg (@EXTS) {
3600 warn "... unloading $k"; 3847 warn "... unloading $pkg";
3601 delete $INC{$k};
3602 3848
3603 $k =~ s/\.pm$//;
3604 $k =~ s/\//::/g;
3605
3606 if (my $cb = $k->can ("unload_module")) { 3849 if (my $cb = $pkg->can ("unload")) {
3850 eval {
3607 $cb->(); 3851 $cb->($pkg);
3852 1
3853 } or warn "$pkg unloaded, but with errors: $@";
3854 }
3855
3856 warn "... clearing $pkg";
3857 clear_package $pkg;
3608 } 3858 }
3609 3859
3610 Symbol::delete_package $k; 3860 warn "unloading all perl modules loaded from $LIBDIR";
3861 while (my ($k, $v) = each %INC) {
3862 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3863
3864 warn "... unloading $k";
3865 delete $INC{$k};
3866
3867 $k =~ s/\.pm$//;
3868 $k =~ s/\//::/g;
3869
3870 if (my $cb = $k->can ("unload_module")) {
3871 $cb->();
3872 }
3873
3874 clear_package $k;
3611 } 3875 }
3612 3876
3613 warn "getting rid of safe::, as good as possible"; 3877 warn "getting rid of safe::, as good as possible";
3614 Symbol::delete_package "safe::$_" 3878 clear_package "safe::$_"
3615 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3616 3880
3617 warn "unloading cf.pm \"a bit\""; 3881 warn "unloading cf.pm \"a bit\"";
3618 delete $INC{"cf.pm"}; 3882 delete $INC{"cf.pm"};
3619 delete $INC{"cf/pod.pm"}; 3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3620 3884
3621 # don't, removes xs symbols, too, 3885 # don't, removes xs symbols, too,
3622 # and global variables created in xs 3886 # and global variables created in xs
3623 #Symbol::delete_package __PACKAGE__; 3887 #clear_package __PACKAGE__;
3624 3888
3625 warn "unload completed, starting to reload now"; 3889 warn "unload completed, starting to reload now";
3626 3890
3627 warn "reloading cf.pm"; 3891 warn "reloading cf.pm";
3628 require cf; 3892 require cf;
3629 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3893 cf::_connect_to_perl_1;
3630 3894
3631 warn "loading config and database again"; 3895 warn "loading config and database again";
3632 cf::reload_config; 3896 cf::reload_config;
3633 3897
3634 warn "loading extensions"; 3898 warn "loading extensions";
3635 cf::load_extensions; 3899 cf::load_extensions;
3636 3900
3901 if ($REATTACH_ON_RELOAD) {
3637 warn "reattaching attachments to objects/players"; 3902 warn "reattaching attachments to objects/players";
3638 _global_reattach; # objects, sockets 3903 _global_reattach; # objects, sockets
3639 warn "reattaching attachments to maps"; 3904 warn "reattaching attachments to maps";
3640 reattach $_ for values %MAP; 3905 reattach $_ for values %MAP;
3641 warn "reattaching attachments to players"; 3906 warn "reattaching attachments to players";
3642 reattach $_ for values %PLAYER; 3907 reattach $_ for values %PLAYER;
3908 }
3643 3909
3910 warn "running post_init jobs";
3911 (pop @POST_INIT)->(1) while @POST_INIT;
3912
3644 warn "leaving sync_job"; 3913 warn "leaving sync_job";
3645 3914
3646 1 3915 1
3647 } or do { 3916 } or do {
3648 warn $@; 3917 warn $@;
3649 cf::cleanup "error while reloading, exiting."; 3918 cf::cleanup "error while reloading, exiting.";
3650 }; 3919 };
3651 3920
3652 warn "reloaded"; 3921 warn "reloaded";
3922 --$RELOAD;
3923 }
3924
3925 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n";
3653}; 3927};
3654 3928
3655our $RELOAD_WATCHER; # used only during reload 3929our $RELOAD_WATCHER; # used only during reload
3656 3930
3657sub reload_perl() { 3931sub reload_perl() {
3658 # doing reload synchronously and two reloads happen back-to-back, 3932 # doing reload synchronously and two reloads happen back-to-back,
3659 # coro crashes during coro_state_free->destroy here. 3933 # coro crashes during coro_state_free->destroy here.
3660 3934
3935 $RELOAD_WATCHER ||= cf::async {
3936 Coro::AIO::aio_wait cache_extensions;
3937
3661 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3938 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3662 do_reload_perl; 3939 do_reload_perl;
3663 undef $RELOAD_WATCHER; 3940 undef $RELOAD_WATCHER;
3941 };
3664 }; 3942 };
3665} 3943}
3666 3944
3667register_command "reload" => sub { 3945register_command "reload" => sub {
3668 my ($who, $arg) = @_; 3946 my ($who, $arg) = @_;
3682 3960
3683our @WAIT_FOR_TICK; 3961our @WAIT_FOR_TICK;
3684our @WAIT_FOR_TICK_BEGIN; 3962our @WAIT_FOR_TICK_BEGIN;
3685 3963
3686sub wait_for_tick { 3964sub wait_for_tick {
3687 return if tick_inhibit;
3688 return if $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3689 3966
3690 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3691 push @WAIT_FOR_TICK, $signal; 3968 push @WAIT_FOR_TICK, $signal;
3692 $signal->wait; 3969 $signal->wait;
3693} 3970}
3694 3971
3695sub wait_for_tick_begin { 3972sub wait_for_tick_begin {
3696 return if tick_inhibit;
3697 return if $Coro::current == $Coro::main; 3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3698 3974
3699 my $signal = new Coro::Signal; 3975 my $signal = new Coro::Signal;
3700 push @WAIT_FOR_TICK_BEGIN, $signal; 3976 push @WAIT_FOR_TICK_BEGIN, $signal;
3701 $signal->wait; 3977 $signal->wait;
3702} 3978}
3707 unless ++$bug_warning > 10; 3983 unless ++$bug_warning > 10;
3708 return; 3984 return;
3709 } 3985 }
3710 3986
3711 cf::server_tick; # one server iteration 3987 cf::server_tick; # one server iteration
3988
3989 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3712 3990
3713 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3991 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3714 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3715 Coro::async_pool { 3993 Coro::async_pool {
3716 $Coro::current->{desc} = "runtime saver"; 3994 $Coro::current->{desc} = "runtime saver";
3739} 4017}
3740 4018
3741{ 4019{
3742 # configure BDB 4020 # configure BDB
3743 4021
3744 BDB::min_parallel 8; 4022 BDB::min_parallel 16;
3745 BDB::max_poll_reqs $TICK * 0.1; 4023 BDB::max_poll_reqs $TICK * 0.1;
3746 $Coro::BDB::WATCHER->priority (1); 4024 $AnyEvent::BDB::WATCHER->priority (1);
3747 4025
3748 unless ($DB_ENV) { 4026 unless ($DB_ENV) {
3749 $DB_ENV = BDB::db_env_create; 4027 $DB_ENV = BDB::db_env_create;
3750 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4028 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3751 | BDB::LOG_AUTOREMOVE, 1); 4029 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4030 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3752 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4031 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3753 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4032 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3754 4033
3755 cf::sync_job { 4034 cf::sync_job {
3756 eval { 4035 eval {
3782{ 4061{
3783 # configure IO::AIO 4062 # configure IO::AIO
3784 4063
3785 IO::AIO::min_parallel 8; 4064 IO::AIO::min_parallel 8;
3786 IO::AIO::max_poll_time $TICK * 0.1; 4065 IO::AIO::max_poll_time $TICK * 0.1;
3787 $Coro::AIO::WATCHER->priority (1); 4066 undef $AnyEvent::AIO::WATCHER;
3788} 4067}
3789 4068
3790my $_log_backtrace; 4069my $_log_backtrace;
3791 4070
3792sub _log_backtrace { 4071sub _log_backtrace {
3795 $msg =~ s/\n//; 4074 $msg =~ s/\n//;
3796 4075
3797 # limit the # of concurrent backtraces 4076 # limit the # of concurrent backtraces
3798 if ($_log_backtrace < 2) { 4077 if ($_log_backtrace < 2) {
3799 ++$_log_backtrace; 4078 ++$_log_backtrace;
4079 my $perl_bt = Carp::longmess $msg;
3800 async { 4080 async {
3801 $Coro::current->{desc} = "abt $msg"; 4081 $Coro::current->{desc} = "abt $msg";
3802 4082
3803 my @bt = fork_call { 4083 my @bt = fork_call {
3804 @addr = map { sprintf "%x", $_ } @addr; 4084 @addr = map { sprintf "%x", $_ } @addr;
3815 } 4095 }
3816 4096
3817 @funcs 4097 @funcs
3818 }; 4098 };
3819 4099
3820 LOG llevInfo, "[ABT] $msg\n"; 4100 LOG llevInfo, "[ABT] $perl_bt\n";
4101 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3821 LOG llevInfo, "[ABT] $_\n" for @bt; 4102 LOG llevInfo, "[ABT] $_\n" for @bt;
3822 --$_log_backtrace; 4103 --$_log_backtrace;
3823 }; 4104 };
3824 } else { 4105 } else {
3825 LOG llevInfo, "[ABT] $msg\n"; 4106 LOG llevInfo, "[ABT] $msg\n";
3826 LOG llevInfo, "[ABT] [suppressed]\n"; 4107 LOG llevInfo, "[ABT] [suppressed]\n";
3827 } 4108 }
3828} 4109}
3829 4110
3830# load additional modules 4111# load additional modules
3831use cf::pod; 4112require "cf/$_.pm" for @EXTRA_MODULES;
4113cf::_connect_to_perl_2;
3832 4114
3833END { cf::emergency_save } 4115END { cf::emergency_save }
3834 4116
38351 41171
3836 4118

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines