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.427 by root, Sat Apr 26 12:25:45 2008 UTC vs.
Revision 1.531 by root, Wed Apr 28 21:07:41 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; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
93 118
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 121our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
99 123
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 127our $DB_ENV;
105 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
106our %CFG; 131our %CFG;
107 132
108our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 134our $RUNTIME;
110our $NOW; 135our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 146our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
123 148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
153
124binmode STDOUT; 154binmode STDOUT;
125binmode STDERR; 155binmode STDERR;
126 156
127# read virtual server time, if available 157# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
132} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
133 165
134mkdir $_ 166mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 168
137our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
138 170
139sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
140 187
141############################################################################# 188#############################################################################
142 189
143=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
144 191
191returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
192per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
193 240
194=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
195 242
196This array contains the results of the last C<invoke ()> call. When 243This 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 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 245that call.
199 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
200=back 253=back
201 254
202=cut 255=cut
203 256
204BEGIN { 257$Coro::State::WARNHOOK = sub {
205 *CORE::GLOBAL::warn = sub {
206 my $msg = join "", @_; 258 my $msg = join "", @_;
207 259
208 $msg .= "\n" 260 $msg .= "\n"
209 unless $msg =~ /\n$/; 261 unless $msg =~ /\n$/;
210 262
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 263 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 264
213 LOG llevError, $msg; 265 LOG llevError, $msg;
214 }; 266};
215}
216 267
217$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
219 270
220 if ($Coro::current == $Coro::main) {#d# 271 warn Carp::longmess $_[0];
272
273 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 275 return;#d#
223 }#d# 276 }#d#
224 277
225 # kill coroutine otherwise 278 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 279 Coro::terminate
228}; 280};
229
230$SIG{__DIE__} = sub { }; #d#?
231 281
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 282@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 283@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 284@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 285@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 292for my $pkg (qw(
243 cf::global cf::attachable 293 cf::global cf::attachable
244 cf::object cf::object::player 294 cf::object cf::object::player
245 cf::client cf::player 295 cf::client cf::player
246 cf::arch cf::living 296 cf::arch cf::living
297 cf::map cf::mapspace
247 cf::map cf::party cf::region 298 cf::party cf::region
248)) { 299)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 301}
252 302
253$EV::DIED = sub { 303$EV::DIED = sub {
254 warn "error in event callback: @_"; 304 Carp::cluck "error in event callback: @_";
255}; 305};
256 306
257############################################################################# 307#############################################################################
258 308
259=head2 UTILITY FUNCTIONS 309=head2 UTILITY FUNCTIONS
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 346our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 347
298sub encode_json($) { $json_coder->encode ($_[0]) } 348sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 349sub decode_json($) { $json_coder->decode ($_[0]) }
300 350
351=item cf::post_init { BLOCK }
352
353Execute the given codeblock, I<after> all extensions have been (re-)loaded,
354but I<before> the server starts ticking again.
355
356The cdoeblock will have a single boolean argument to indicate whether this
357is a reload or not.
358
359=cut
360
361sub post_init(&) {
362 push @POST_INIT, shift;
363}
364
301=item cf::lock_wait $string 365=item cf::lock_wait $string
302 366
303Wait until the given lock is available. See cf::lock_acquire. 367Wait until the given lock is available. See cf::lock_acquire.
304 368
305=item my $lock = cf::lock_acquire $string 369=item my $lock = cf::lock_acquire $string
306 370
307Wait until the given lock is available and then acquires it and returns 371Wait 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, 372a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 373for example when the coroutine gets canceled), the lock is automatically
310returned. 374returned.
311 375
312Locks are *not* recursive, locking from the same coro twice results in a 376Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 377deadlocked coro.
319 383
320Return true if the lock is currently active, i.e. somebody has locked it. 384Return true if the lock is currently active, i.e. somebody has locked it.
321 385
322=cut 386=cut
323 387
324our %LOCK; 388our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 389
327sub lock_wait($) { 390sub lock_wait($) {
328 my ($key) = @_; 391 $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} 392}
341 393
342sub lock_acquire($) { 394sub lock_acquire($) {
343 my ($key) = @_; 395 $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} 396}
357 397
358sub lock_active($) { 398sub lock_active($) {
359 my ($key) = @_; 399 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 400}
363 401
364sub freeze_mainloop { 402sub freeze_mainloop {
365 tick_inhibit_inc; 403 tick_inhibit_inc;
366 404
367 Coro::guard \&tick_inhibit_dec; 405 &Guard::guard (\&tick_inhibit_dec);
368} 406}
369 407
370=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
371 409
372Like EV::periodic, but randomly selects a starting point so that the actions 410Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer. 411get spread over time.
374 412
375=cut 413=cut
376 414
377sub periodic($$) { 415sub periodic($$) {
378 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
395 433
396=cut 434=cut
397 435
398our @SLOT_QUEUE; 436our @SLOT_QUEUE;
399our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
400 439
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
404 443
405 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
406 446
407 while () { 447 while () {
408 next_job: 448 next_job:
449
409 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 451
411 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 456 $job->[2]->send;
415 Coro::cede; 457 Coro::cede;
416 goto next_job; 458 goto next_job;
417 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 461 }
419 } 462 }
420 463
421 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 465 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 467 $signal->wait;
425 } else { 468 } else {
469 $busy = 0;
426 Coro::schedule; 470 Coro::schedule;
427 } 471 }
428 } 472 }
429}; 473};
430 474
431sub get_slot($;$$) { 475sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main; 476 return if tick_inhibit || $Coro::current == $Coro::main;
433 477
434 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
435 479
436 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
437 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
438 483
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
468 513
469sub sync_job(&) { 514sub sync_job(&) {
470 my ($job) = @_; 515 my ($job) = @_;
471 516
472 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
473 my $time = EV::time; 518 my $time = AE::time;
474 519
475 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
476 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
477 522
478 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
495 } else { 540 } else {
496 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
497 } 542 }
498 } 543 }
499 544
500 my $time = EV::time - $time; 545 my $time = AE::time - $time;
501 546
502 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
503 548
504 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
505 } else { 550 } else {
549 reset_signals; 594 reset_signals;
550 &$cb 595 &$cb
551 }, @args; 596 }, @args;
552 597
553 wantarray ? @res : $res[-1] 598 wantarray ? @res : $res[-1]
599}
600
601sub objinfo {
602 (
603 "counter value" => cf::object::object_count,
604 "objects created" => cf::object::create_count,
605 "objects destroyed" => cf::object::destroy_count,
606 "freelist size" => cf::object::free_count,
607 "allocated objects" => cf::object::objects_size,
608 "active objects" => cf::object::actives_size,
609 )
554} 610}
555 611
556=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
557 613
558=cut 614=cut
724 780
725############################################################################# 781#############################################################################
726 782
727=head2 ATTACHABLE OBJECTS 783=head2 ATTACHABLE OBJECTS
728 784
729Many objects in crossfire are so-called attachable objects. That means you can 785Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 786attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 787to it. All such attachable objects support the following methods.
732 788
733In the following description, CLASS can be any of C<global>, C<object> 789In the following description, CLASS can be any of C<global>, C<object>
734C<player>, C<client> or C<map> (i.e. the attachable objects in 790C<player>, C<client> or C<map> (i.e. the attachable objects in
784=item cf::CLASS::attachment $name, ... 840=item cf::CLASS::attachment $name, ...
785 841
786Register an attachment by C<$name> through which attachable objects of the 842Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 843given CLASS can refer to this attachment.
788 844
789Some classes such as crossfire maps and objects can specify attachments 845Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 846that are attached at load/instantiate time, thus the need for a name.
791 847
792These calls expect any number of the following handler/hook descriptions: 848These calls expect any number of the following handler/hook descriptions:
793 849
794=over 4 850=over 4
1085 1141
1086sub reattach { 1142sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1143 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1144 my ($obj) = @_;
1089 1145
1146 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1147 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1148
1092 my $registry = $obj->registry; 1149 my $registry = $obj->registry;
1093 1150
1094 @$registry = (); 1151 @$registry = ();
1095 1152
1138 1195
1139 sync_job { 1196 sync_job {
1140 if (length $$rdata) { 1197 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1144 1202
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1206 if ($cf::USE_FSYNC) {
1207 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;
1208 aio_fsync $fh;
1209 }
1149 aio_close $fh; 1210 aio_close $fh;
1150 1211
1151 if (@$objs) { 1212 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1213 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1214 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1215 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1216 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1217 if ($cf::USE_FSYNC) {
1218 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;
1219 aio_fsync $fh;
1220 }
1157 aio_close $fh; 1221 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1222 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1223 }
1160 } else { 1224 } else {
1161 aio_unlink "$filename.pst"; 1225 aio_unlink "$filename.pst";
1162 } 1226 }
1163 1227
1164 aio_rename "$filename~", $filename; 1228 aio_rename "$filename~", $filename;
1229
1230 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1232 } else {
1166 warn "FATAL: $filename~: $!\n"; 1233 warn "unable to save objects: $filename~: $!\n";
1167 } 1234 }
1168 } else { 1235 } else {
1169 aio_unlink $filename; 1236 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1171 } 1238 }
1196 $av = $st->{objs}; 1263 $av = $st->{objs};
1197 } 1264 }
1198 1265
1199 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1200 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1201 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1202 1270
1203 ($data, $av) 1271 ($data, $av)
1204} 1272}
1205 1273
1206=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
1262 my ($name, $cb) = @_; 1330 my ($name, $cb) = @_;
1263 1331
1264 $EXTICMD{$name} = $cb; 1332 $EXTICMD{$name} = $cb;
1265} 1333}
1266 1334
1335use File::Glob ();
1336
1267cf::player->attach ( 1337cf::player->attach (
1268 on_command => sub { 1338 on_unknown_command => sub {
1269 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1270 1340
1271 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1272 or return; 1342 or return;
1273 1343
1303 1373
1304 cf::override; 1374 cf::override;
1305 }, 1375 },
1306); 1376);
1307 1377
1378# "readahead" all extensions
1379sub cache_extensions {
1380 my $grp = IO::AIO::aio_group;
1381
1382 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1383 for (grep /\.ext$/, @{$_[0]}) {
1384 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1385 }
1386 };
1387
1388 $grp
1389}
1390
1308sub load_extensions { 1391sub load_extensions {
1309 cf::sync_job { 1392 cf::sync_job {
1310 my %todo; 1393 my %todo;
1311 1394
1312 for my $path (<$LIBDIR/*.ext>) { 1395 for my $path (<$LIBDIR/*.ext>) {
1331 1414
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1415 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1416 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1417
1335 $ext{source} = 1418 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1419 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1420 . "#line 1 \"$path\"\n{\n"
1338 . $source 1421 . $source
1339 . "\n};\n1"; 1422 . "\n};\n1";
1340 1423
1341 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1342 } 1425 }
1343 1426
1427 my $pass = 0;
1344 my %done; 1428 my %done;
1345 while (%todo) { 1429 while (%todo) {
1346 my $progress; 1430 my $progress;
1347 1431
1432 ++$pass;
1433
1434 ext:
1348 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1349 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1350 goto skip 1437 next ext
1351 unless exists $done{$_}; 1438 unless exists $done{$_};
1352 } 1439 }
1353 1440
1354 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1355 1442
1356 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1357 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1358 : "$v->{base}: extension inactive.\n";
1359 1447
1360 if (exists $v->{meta}{mandatory}) {
1361 warn $msg;
1362 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1363 } 1449 if exists $v->{meta}{mandatory};
1364 1450
1365 warn $msg; 1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1452 delete $todo{$k};
1453 } else {
1454 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg};
1456 $progress = 1;
1457
1458 warn "$v->{base}: extension inactive.\n"
1459 unless $active;
1366 } 1460 }
1367
1368 $done{$k} = delete $todo{$k};
1369 push @EXTS, $v->{pkg};
1370 $progress = 1;
1371 } 1461 }
1372 1462
1373 skip: 1463 unless ($progress) {
1374 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1375 unless $progress; 1465
1466 while (my ($k, $v) = each %todo) {
1467 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468 if exists $v->{meta}{mandatory};
1469 }
1470 }
1376 } 1471 }
1377 }; 1472 };
1378} 1473}
1379 1474
1380############################################################################# 1475#############################################################################
1381 1476
1382=back 1477=back
1383 1478
1384=head2 CORE EXTENSIONS 1479=head2 CORE EXTENSIONS
1385 1480
1386Functions and methods that extend core crossfire objects. 1481Functions and methods that extend core deliantra objects.
1387 1482
1388=cut 1483=cut
1389 1484
1390package cf::player; 1485package cf::player;
1391 1486
1434 1529
1435sub exists($) { 1530sub exists($) {
1436 my ($login) = @_; 1531 my ($login) = @_;
1437 1532
1438 $cf::PLAYER{$login} 1533 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1534 or !aio_stat path $login
1440} 1535}
1441 1536
1442sub find($) { 1537sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1538 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1539 my $login = $_[0];
1464 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1465 } 1560 }
1466 } 1561 }
1467} 1562}
1468 1563
1564cf::player->attach (
1565 on_load => sub {
1566 my ($pl, $path) = @_;
1567
1568 # restore slots saved in save, below
1569 my $slots = delete $pl->{_slots};
1570
1571 $pl->ob->current_weapon ($slots->[0]);
1572 $pl->combat_ob ($slots->[1]);
1573 $pl->ranged_ob ($slots->[2]);
1574 },
1575);
1576
1469sub save($) { 1577sub save($) {
1470 my ($pl) = @_; 1578 my ($pl) = @_;
1471 1579
1472 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1473 1581
1478 1586
1479 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1480 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1481 1589
1482 cf::get_slot 0.01; 1590 cf::get_slot 0.01;
1591
1592 # save slots, to be restored later
1593 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1483 1594
1484 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1485 cf::cede_to_tick; 1596 cf::cede_to_tick;
1486} 1597}
1487 1598
1519 my ($pl) = @_; 1630 my ($pl) = @_;
1520 1631
1521 my $name = $pl->ob->name; 1632 my $name = $pl->ob->name;
1522 1633
1523 $pl->{deny_save} = 1; 1634 $pl->{deny_save} = 1;
1524 $pl->password ("*"); # this should lock out the player until we nuked the dir 1635 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1525 1636
1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1527 $pl->deactivate; 1638 $pl->deactivate;
1639 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1528 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1529 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1530 1642
1531 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1532 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
1587 \@logins 1699 \@logins
1588} 1700}
1589 1701
1590=item $player->maps 1702=item $player->maps
1591 1703
1704=item cf::player::maps $login
1705
1592Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1593player. May block. 1707player. May block.
1594 1708
1595=cut 1709=cut
1596 1710
1613 } 1727 }
1614 1728
1615 \@paths 1729 \@paths
1616} 1730}
1617 1731
1618=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1732=item $protocol_xml = $player->expand_cfpod ($cfpod)
1619 1733
1620Expand crossfire pod fragments into protocol xml. 1734Expand deliantra pod fragments into protocol xml.
1621
1622=cut
1623
1624use re 'eval';
1625
1626my $group;
1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1629 (?:
1630 \ (.*?)\ (?{ $group = $^N })
1631 | < (??{$interior}) >
1632 )
1633}x;
1634
1635sub expand_cfpod {
1636 my ($self, $pod) = @_;
1637
1638 my $xml;
1639
1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1643
1644 $group =~ s/&/&amp;/g;
1645 $group =~ s/</&lt;/g;
1646
1647 $xml .= $group;
1648 } elsif ($pod =~ m%\G
1649 ([BCGHITU])
1650 <
1651 (?:
1652 ([^<>]*) (?{ $group = $^N })
1653 | < $interior >
1654 )
1655 >
1656 %gcsx
1657 ) {
1658 my ($code, $data) = ($1, $group);
1659
1660 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662 } elsif ($code eq "I") {
1663 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664 } elsif ($code eq "U") {
1665 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668 } elsif ($code eq "T") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670 } elsif ($code eq "G") {
1671 my ($male, $female) = split /\|/, $data;
1672 $data = $self->gender ? $female : $male;
1673 $xml .= expand_cfpod ($self, $data);
1674 } elsif ($code eq "H") {
1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1677 "")
1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1689
1690 for ($xml) {
1691 # create single paragraphs (very hackish)
1692 s/(?<=\S)\n(?=\w)/ /g;
1693
1694 # compress some whitespace
1695 s/\s+\n/\n/g; # ws line-ends
1696 s/\n\n+/\n/g; # double lines
1697 s/^\n+//; # beginning lines
1698 s/\n+$//; # ending lines
1699 }
1700
1701 $xml
1702}
1703
1704no re 'eval';
1705
1706sub hintmode {
1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1708 $_[0]{hintmode}
1709}
1710 1735
1711=item $player->ext_reply ($msgid, @msg) 1736=item $player->ext_reply ($msgid, @msg)
1712 1737
1713Sends an ext reply to the player. 1738Sends an ext reply to the player.
1714 1739
1746 1771
1747=cut 1772=cut
1748 1773
1749sub find_by_path($) { 1774sub find_by_path($) {
1750 my ($path) = @_; 1775 my ($path) = @_;
1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1751 1778
1752 my ($match, $specificity); 1779 my ($match, $specificity);
1753 1780
1754 for my $region (list) { 1781 for my $region (list) {
1755 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
1787 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1814 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1788 1815
1789 # mit "rum" bekleckern, nicht 1816 # mit "rum" bekleckern, nicht
1790 $self->_create_random_map ( 1817 $self->_create_random_map (
1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1794 $rmp->{exit_on_final_map}, 1821 $rmp->{exit_on_final_map},
1795 $rmp->{xsize}, $rmp->{ysize}, 1822 $rmp->{xsize}, $rmp->{ysize},
1796 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1797 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1819 1846
1820 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1821} 1848}
1822 1849
1823# also paths starting with '/' 1850# also paths starting with '/'
1824$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1825 1852
1826sub thawer_merge { 1853sub thawer_merge {
1827 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1828 1855
1829 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
1927 1954
1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1955 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1929 "$UNIQUEDIR/$path" 1956 "$UNIQUEDIR/$path"
1930} 1957}
1931 1958
1932# and all this just because we cannot iterate over
1933# all maps in C++...
1934sub change_all_map_light {
1935 my ($change) = @_;
1936
1937 $_->change_map_light ($change)
1938 for grep $_->outdoor, values %cf::MAP;
1939}
1940
1941sub decay_objects { 1959sub decay_objects {
1942 my ($self) = @_; 1960 my ($self) = @_;
1943 1961
1944 return if $self->{deny_reset}; 1962 return if $self->{deny_reset};
1945 1963
2027sub find { 2045sub find {
2028 my ($path, $origin) = @_; 2046 my ($path, $origin) = @_;
2029 2047
2030 $path = normalise $path, $origin && $origin->path; 2048 $path = normalise $path, $origin && $origin->path;
2031 2049
2032 cf::lock_wait "map_data:$path";#d#remove 2050 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2033 cf::lock_wait "map_find:$path"; 2051 my $guard2 = cf::lock_acquire "map_find:$path";
2034 2052
2035 $cf::MAP{$path} || do { 2053 $cf::MAP{$path} || do {
2036 my $guard1 = cf::lock_acquire "map_find:$path";
2037 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2038
2039 my $map = new_from_path cf::map $path 2054 my $map = new_from_path cf::map $path
2040 or return; 2055 or return;
2041 2056
2042 $map->{last_save} = $cf::RUNTIME; 2057 $map->{last_save} = $cf::RUNTIME;
2043 2058
2045 or return; 2060 or return;
2046 2061
2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2062 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2048 # doing this can freeze the server in a sync job, obviously 2063 # doing this can freeze the server in a sync job, obviously
2049 #$cf::WAIT_FOR_TICK->wait; 2064 #$cf::WAIT_FOR_TICK->wait;
2065 undef $guard2;
2050 undef $guard1; 2066 undef $guard1;
2051 undef $guard2;
2052 $map->reset; 2067 $map->reset;
2053 return find $path; 2068 return find $path;
2054 } 2069 }
2055 2070
2056 $cf::MAP{$path} = $map 2071 $cf::MAP{$path} = $map
2057 } 2072 }
2058} 2073}
2059 2074
2060sub pre_load { } 2075sub pre_load { }
2061sub post_load { } 2076#sub post_load { } # XS
2062 2077
2063sub load { 2078sub load {
2064 my ($self) = @_; 2079 my ($self) = @_;
2065 2080
2066 local $self->{deny_reset} = 1; # loading can take a long time 2081 local $self->{deny_reset} = 1; # loading can take a long time
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2098 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2099 $f->skip_block;
2085 $self->_load_objects ($f) 2100 $self->_load_objects ($f)
2086 or return; 2101 or return;
2087 2102
2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2103 $self->post_load_original
2089 if delete $self->{load_original}; 2104 if delete $self->{load_original};
2090 2105
2091 if (my $uniq = $self->uniq_path) { 2106 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2107 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2108 unless (aio_stat $uniq) {
2111 unless ($self->{deny_activate}) { 2126 unless ($self->{deny_activate}) {
2112 $self->decay_objects; 2127 $self->decay_objects;
2113 $self->fix_auto_apply; 2128 $self->fix_auto_apply;
2114 $self->update_buttons; 2129 $self->update_buttons;
2115 cf::cede_to_tick; 2130 cf::cede_to_tick;
2116 $self->set_darkness_map;
2117 cf::cede_to_tick;
2118 $self->activate; 2131 $self->activate;
2119 } 2132 }
2120 2133
2121 $self->{last_save} = $cf::RUNTIME; 2134 $self->{last_save} = $cf::RUNTIME;
2122 $self->last_access ($cf::RUNTIME); 2135 $self->last_access ($cf::RUNTIME);
2125 } 2138 }
2126 2139
2127 $self->post_load; 2140 $self->post_load;
2128} 2141}
2129 2142
2143# customize the map for a given player, i.e.
2144# return the _real_ map. used by e.g. per-player
2145# maps to change the path to ~playername/mappath
2130sub customise_for { 2146sub customise_for {
2131 my ($self, $ob) = @_; 2147 my ($self, $ob) = @_;
2132 2148
2133 return find "~" . $ob->name . "/" . $self->{path} 2149 return find "~" . $ob->name . "/" . $self->{path}
2134 if $self->per_player; 2150 if $self->per_player;
2150 or next; 2166 or next;
2151 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
2152 or next; 2168 or next;
2153 $neigh->load; 2169 $neigh->load;
2154 2170
2171 # now find the diagonal neighbours
2155 push @neigh, 2172 push @neigh,
2156 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2157 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2158 } 2175 }
2159 2176
2211 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2212 2229
2213 () 2230 ()
2214} 2231}
2215 2232
2233# common code, used by both ->save and ->swapout
2216sub save { 2234sub _save {
2217 my ($self) = @_; 2235 my ($self) = @_;
2218
2219 my $lock = cf::lock_acquire "map_data:$self->{path}";
2220 2236
2221 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2222 2238
2223 return unless $self->dirty; 2239 return unless $self->dirty;
2224 2240
2244 } else { 2260 } else {
2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2261 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2246 } 2262 }
2247} 2263}
2248 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2249sub swap_out { 2273sub swap_out {
2250 my ($self) = @_; 2274 my ($self) = @_;
2251 2275
2252 # save first because save cedes
2253 $self->save;
2254
2255 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2256 2277
2257 return if $self->players;
2258 return if $self->in_memory != cf::MAP_ACTIVE; 2278 return if $self->in_memory != cf::MAP_ACTIVE;
2259 return if $self->{deny_save}; 2279 return if $self->{deny_save};
2280 return if $self->players;
2260 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2261 $self->in_memory (cf::MAP_SWAPPED); 2285 $self->in_memory (cf::MAP_SWAPPED);
2286
2287 # then atomically save
2288 $self->_save;
2289
2290 # then free the map
2291 $self->clear;
2292}
2293
2294sub reset_at {
2295 my ($self) = @_;
2296
2297 # TODO: safety, remove and allow resettable per-player maps
2298 return 1e99 if $self->{deny_reset};
2299
2300 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2301 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2302
2303 $time + $to
2304}
2305
2306sub should_reset {
2307 my ($self) = @_;
2308
2309 $self->reset_at <= $cf::RUNTIME
2310}
2311
2312sub reset {
2313 my ($self) = @_;
2314
2315 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316
2317 return if $self->players;
2318
2319 warn "resetting map ", $self->path, "\n";
2320
2321 $self->in_memory (cf::MAP_SWAPPED);
2322
2323 # need to save uniques path
2324 unless ($self->{deny_save}) {
2325 my $uniq = $self->uniq_path; utf8::encode $uniq;
2326
2327 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2328 if $uniq;
2329 }
2330
2331 delete $cf::MAP{$self->path};
2262 2332
2263 $self->deactivate; 2333 $self->deactivate;
2264 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2265 $self->clear; 2335 $self->clear;
2266}
2267
2268sub reset_at {
2269 my ($self) = @_;
2270
2271 # TODO: safety, remove and allow resettable per-player maps
2272 return 1e99 if $self->{deny_reset};
2273
2274 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2275 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2276
2277 $time + $to
2278}
2279
2280sub should_reset {
2281 my ($self) = @_;
2282
2283 $self->reset_at <= $cf::RUNTIME
2284}
2285
2286sub reset {
2287 my ($self) = @_;
2288
2289 my $lock = cf::lock_acquire "map_data:$self->{path}";
2290
2291 return if $self->players;
2292
2293 warn "resetting map ", $self->path;
2294
2295 $self->in_memory (cf::MAP_SWAPPED);
2296
2297 # need to save uniques path
2298 unless ($self->{deny_save}) {
2299 my $uniq = $self->uniq_path; utf8::encode $uniq;
2300
2301 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2302 if $uniq;
2303 }
2304
2305 delete $cf::MAP{$self->path};
2306
2307 $self->deactivate;
2308 $_->clear_links_to ($self) for values %cf::MAP;
2309 $self->clear;
2310 2336
2311 $self->unlink_save; 2337 $self->unlink_save;
2312 $self->destroy; 2338 $self->destroy;
2313} 2339}
2314 2340
2322 2348
2323 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2324 2350
2325 $self->unlink_save; 2351 $self->unlink_save;
2326 2352
2327 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2328 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2329 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2330 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2331 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2332 2358
2389 : normalise $_ 2415 : normalise $_
2390 } @{ aio_readdir $UNIQUEDIR or [] } 2416 } @{ aio_readdir $UNIQUEDIR or [] }
2391 ] 2417 ]
2392} 2418}
2393 2419
2420=item cf::map::static_maps
2421
2422Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2423file in the shared directory excluding F</styles> and F</editor>). May
2424block.
2425
2426=cut
2427
2428sub static_maps() {
2429 my @dirs = "";
2430 my @maps;
2431
2432 while (@dirs) {
2433 my $dir = shift @dirs;
2434
2435 next if $dir eq "/styles" || $dir eq "/editor";
2436
2437 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2438 or return;
2439
2440 for (@$files) {
2441 s/\.map$// or next;
2442 utf8::decode $_;
2443 push @maps, "$dir/$_";
2444 }
2445
2446 push @dirs, map "$dir/$_", @$dirs;
2447 }
2448
2449 \@maps
2450}
2451
2394=back 2452=back
2395 2453
2396=head3 cf::object 2454=head3 cf::object
2397 2455
2398=cut 2456=cut
2459can be C<undef>. Does the right thing when the player is currently in a 2517can be C<undef>. Does the right thing when the player is currently in a
2460dialogue with the given NPC character. 2518dialogue with the given NPC character.
2461 2519
2462=cut 2520=cut
2463 2521
2522our $SAY_CHANNEL = {
2523 id => "say",
2524 title => "Map",
2525 reply => "say ",
2526 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2527};
2528
2529our $CHAT_CHANNEL = {
2530 id => "chat",
2531 title => "Chat",
2532 reply => "chat ",
2533 tooltip => "Player chat and shouts, global to the server.",
2534};
2535
2464# rough implementation of a future "reply" method that works 2536# rough implementation of a future "reply" method that works
2465# with dialog boxes. 2537# with dialog boxes.
2466#TODO: the first argument must go, split into a $npc->reply_to ( method 2538#TODO: the first argument must go, split into a $npc->reply_to ( method
2467sub cf::object::player::reply($$$;$) { 2539sub cf::object::player::reply($$$;$) {
2468 my ($self, $npc, $msg, $flags) = @_; 2540 my ($self, $npc, $msg, $flags) = @_;
2479 my $dialog = $pl->{npc_dialog}; 2551 my $dialog = $pl->{npc_dialog};
2480 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2552 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2481 2553
2482 } else { 2554 } else {
2483 $msg = $npc->name . " says: $msg" if $npc; 2555 $msg = $npc->name . " says: $msg" if $npc;
2484 $self->message ($msg, $flags); 2556 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2485 } 2557 }
2486 } 2558 }
2487} 2559}
2488 2560
2489=item $object->send_msg ($channel, $msg, $color, [extra...]) 2561=item $object->send_msg ($channel, $msg, $color, [extra...])
2514 2586
2515=item $player_object->enter_link 2587=item $player_object->enter_link
2516 2588
2517Freezes the player and moves him/her to a special map (C<{link}>). 2589Freezes the player and moves him/her to a special map (C<{link}>).
2518 2590
2519The player should be reasonably safe there for short amounts of time. You 2591The player should be reasonably safe there for short amounts of time (e.g.
2520I<MUST> call C<leave_link> as soon as possible, though. 2592for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2593though, as the player cannot control the character while it is on the link
2594map.
2521 2595
2522Will never block. 2596Will never block.
2523 2597
2524=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
2525 2599
2545sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2546 my ($self) = @_; 2620 my ($self) = @_;
2547 2621
2548 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2549 2623
2624 ++$self->{_link_recursion};
2625
2550 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2551 2627
2552 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2553 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2554 2630
2555 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2556} 2632}
2557 2633
2558sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2559 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2560 2636
2577 ($x, $y) = (-1, -1) 2653 ($x, $y) = (-1, -1)
2578 unless (defined $x) && (defined $y); 2654 unless (defined $x) && (defined $y);
2579 2655
2580 # use -1 or undef as default coordinates, not 0, 0 2656 # use -1 or undef as default coordinates, not 0, 0
2581 ($x, $y) = ($map->enter_x, $map->enter_y) 2657 ($x, $y) = ($map->enter_x, $map->enter_y)
2582 if $x <=0 && $y <= 0; 2658 if $x <= 0 && $y <= 0;
2583 2659
2584 $map->load; 2660 $map->load;
2585 $map->load_neighbours; 2661 $map->load_neighbours;
2586 2662
2587 return unless $self->contr->active; 2663 return unless $self->contr->active;
2588 $self->activate_recursive;
2589 2664
2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2591 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2592} 2667 # entering was successful
2668 delete $self->{_link_recursion};
2669 # only activate afterwards, to support waiting in hooks
2670 $self->activate_recursive;
2671 }
2593 2672
2673}
2674
2594=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2675=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2595 2676
2596Moves the player to the given map-path and coordinates by first freezing 2677Moves the player to the given map-path and coordinates by first freezing
2597her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2598that has to return the map if sucecssful, and then unfreezes the player on 2679that has to return the map if sucecssful, and then unfreezes the player on
2599the new (success) or old (failed) map position. In either case, $done will 2680the new (success) or old (failed) map position. In either case, $done will
2600be called at the end of this process. 2681be called at the end of this process.
2601 2682
2683Note that $check will be called with a potentially non-loaded map, so if
2684it needs a loaded map it has to call C<< ->load >>.
2685
2602=cut 2686=cut
2603 2687
2604our $GOTOGEN; 2688our $GOTOGEN;
2605 2689
2606sub cf::object::player::goto { 2690sub cf::object::player::goto {
2607 my ($self, $path, $x, $y, $check, $done) = @_; 2691 my ($self, $path, $x, $y, $check, $done) = @_;
2692
2693 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 }
2608 2698
2609 # do generation counting so two concurrent goto's will be executed in-order 2699 # do generation counting so two concurrent goto's will be executed in-order
2610 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2611 2701
2612 $self->enter_link; 2702 $self->enter_link;
2636 my $map = eval { 2726 my $map = eval {
2637 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2638 2728
2639 if ($map) { 2729 if ($map) {
2640 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2641 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2642 } else { 2732 } else {
2643 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2733 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2644 } 2734 }
2645 2735
2646 $map 2736 $map
2654 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2655 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2656 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2657 } 2747 }
2658 2748
2659 $done->() if $done; 2749 $done->($self) if $done;
2660 })->prio (1); 2750 })->prio (1);
2661} 2751}
2662 2752
2663=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2664 2754
2684} 2774}
2685 2775
2686sub prepare_random_map { 2776sub prepare_random_map {
2687 my ($exit) = @_; 2777 my ($exit) = @_;
2688 2778
2689 my $guard = cf::lock_acquire "exit_prepare:$exit";
2690
2691 # all this does is basically replace the /! path by 2779 # all this does is basically replace the /! path by
2692 # a new random map path (?random/...) with a seed 2780 # a new random map path (?random/...) with a seed
2693 # that depends on the exit object 2781 # that depends on the exit object
2694 2782
2695 my $rmp = parse_random_map_params $exit->msg; 2783 my $rmp = parse_random_map_params $exit->msg;
2697 if ($exit->map) { 2785 if ($exit->map) {
2698 $rmp->{region} = $exit->region->name; 2786 $rmp->{region} = $exit->region->name;
2699 $rmp->{origin_map} = $exit->map->path; 2787 $rmp->{origin_map} = $exit->map->path;
2700 $rmp->{origin_x} = $exit->x; 2788 $rmp->{origin_x} = $exit->x;
2701 $rmp->{origin_y} = $exit->y; 2789 $rmp->{origin_y} = $exit->y;
2790
2791 $exit->map->touch;
2702 } 2792 }
2703 2793
2704 $rmp->{random_seed} ||= $exit->random_seed; 2794 $rmp->{random_seed} ||= $exit->random_seed;
2705 2795
2706 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2796 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2710 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2800 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2711 aio_write $fh, 0, (length $data), $data, 0; 2801 aio_write $fh, 0, (length $data), $data, 0;
2712 undef $fh; 2802 undef $fh;
2713 aio_rename "$meta~", $meta; 2803 aio_rename "$meta~", $meta;
2714 2804
2805 my $slaying = "?random/$md5";
2806
2807 if ($exit->valid) {
2715 $exit->slaying ("?random/$md5"); 2808 $exit->slaying ("?random/$md5");
2716 $exit->msg (undef); 2809 $exit->msg (undef);
2810 }
2717 } 2811 }
2718} 2812}
2719 2813
2720sub cf::object::player::enter_exit { 2814sub cf::object::player::enter_exit {
2721 my ($self, $exit) = @_; 2815 my ($self, $exit) = @_;
2722 2816
2723 return unless $self->type == cf::PLAYER; 2817 return unless $self->type == cf::PLAYER;
2724 2818
2725 if ($exit->slaying eq "/!") {
2726 #TODO: this should de-fi-ni-te-ly not be a sync-job
2727 # the problem is that $exit might not survive long enough
2728 # so it needs to be done right now, right here
2729 cf::sync_job { prepare_random_map $exit };
2730 }
2731
2732 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2733 my $hp = $exit->stats->hp;
2734 my $sp = $exit->stats->sp;
2735
2736 $self->enter_link; 2819 $self->enter_link;
2737 2820
2738 # if exit is damned, update players death & WoR home-position
2739 $self->contr->savebed ($slaying, $hp, $sp)
2740 if $exit->flag (FLAG_DAMNED);
2741
2742 (async { 2821 (async {
2743 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2822 $Coro::current->{desc} = "enter_exit";
2744 2823
2745 $self->deactivate_recursive; # just to be sure
2746 unless (eval { 2824 unless (eval {
2825 $self->deactivate_recursive; # just to be sure
2826
2827 # random map handling
2828 {
2829 my $guard = cf::lock_acquire "exit_prepare:$exit";
2830
2831 prepare_random_map $exit
2832 if $exit->slaying eq "/!";
2833 }
2834
2835 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2836 my $x = $exit->stats->hp;
2837 my $y = $exit->stats->sp;
2838
2747 $self->goto ($slaying, $hp, $sp); 2839 $self->goto ($map, $x, $y);
2748 2840
2841 # if exit is damned, update players death & WoR home-position
2842 $self->contr->savebed ($map, $x, $y)
2843 if $exit->flag (cf::FLAG_DAMNED);
2844
2749 1; 2845 1
2750 }) { 2846 }) {
2751 $self->message ("Something went wrong deep within the crossfire server. " 2847 $self->message ("Something went wrong deep within the deliantra server. "
2752 . "I'll try to bring you back to the map you were before. " 2848 . "I'll try to bring you back to the map you were before. "
2753 . "Please report this to the dungeon master!", 2849 . "Please report this to the dungeon master!",
2754 cf::NDI_UNIQUE | cf::NDI_RED); 2850 cf::NDI_UNIQUE | cf::NDI_RED);
2755 2851
2756 warn "ERROR in enter_exit: $@"; 2852 warn "ERROR in enter_exit: $@";
2773sub cf::client::send_drawinfo { 2869sub cf::client::send_drawinfo {
2774 my ($self, $text, $flags) = @_; 2870 my ($self, $text, $flags) = @_;
2775 2871
2776 utf8::encode $text; 2872 utf8::encode $text;
2777 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2873 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2874}
2875
2876=item $client->send_big_packet ($pkt)
2877
2878Like C<send_packet>, but tries to compress large packets, and fragments
2879them as required.
2880
2881=cut
2882
2883our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2884
2885sub cf::client::send_big_packet {
2886 my ($self, $pkt) = @_;
2887
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt);
2778} 2899}
2779 2900
2780=item $client->send_msg ($channel, $msg, $color, [extra...]) 2901=item $client->send_msg ($channel, $msg, $color, [extra...])
2781 2902
2782Send a drawinfo or msg packet to the client, formatting the msg for the 2903Send a drawinfo or msg packet to the client, formatting the msg for the
2786 2907
2787=cut 2908=cut
2788 2909
2789# non-persistent channels (usually the info channel) 2910# non-persistent channels (usually the info channel)
2790our %CHANNEL = ( 2911our %CHANNEL = (
2912 "c/motd" => {
2913 id => "infobox",
2914 title => "MOTD",
2915 reply => undef,
2916 tooltip => "The message of the day",
2917 },
2791 "c/identify" => { 2918 "c/identify" => {
2792 id => "infobox", 2919 id => "infobox",
2793 title => "Identify", 2920 title => "Identify",
2794 reply => undef, 2921 reply => undef,
2795 tooltip => "Items recently identified", 2922 tooltip => "Items recently identified",
2797 "c/examine" => { 2924 "c/examine" => {
2798 id => "infobox", 2925 id => "infobox",
2799 title => "Examine", 2926 title => "Examine",
2800 reply => undef, 2927 reply => undef,
2801 tooltip => "Signs and other items you examined", 2928 tooltip => "Signs and other items you examined",
2929 },
2930 "c/shopinfo" => {
2931 id => "infobox",
2932 title => "Shop Info",
2933 reply => undef,
2934 tooltip => "What your bargaining skill tells you about the shop",
2802 }, 2935 },
2803 "c/book" => { 2936 "c/book" => {
2804 id => "infobox", 2937 id => "infobox",
2805 title => "Book", 2938 title => "Book",
2806 reply => undef, 2939 reply => undef,
2822 id => "infobox", 2955 id => "infobox",
2823 title => "Body Parts", 2956 title => "Body Parts",
2824 reply => undef, 2957 reply => undef,
2825 tooltip => "Shows which body parts you posess and are available", 2958 tooltip => "Shows which body parts you posess and are available",
2826 }, 2959 },
2960 "c/statistics" => {
2961 id => "infobox",
2962 title => "Statistics",
2963 reply => undef,
2964 tooltip => "Shows your primary statistics",
2965 },
2966 "c/skills" => {
2967 id => "infobox",
2968 title => "Skills",
2969 reply => undef,
2970 tooltip => "Shows your experience per skill and item power",
2971 },
2972 "c/shopitems" => {
2973 id => "infobox",
2974 title => "Shop Items",
2975 reply => undef,
2976 tooltip => "Shows the items currently for sale in this shop",
2977 },
2978 "c/resistances" => {
2979 id => "infobox",
2980 title => "Resistances",
2981 reply => undef,
2982 tooltip => "Shows your resistances",
2983 },
2984 "c/pets" => {
2985 id => "infobox",
2986 title => "Pets",
2987 reply => undef,
2988 tooltip => "Shows information abotu your pets/a specific pet",
2989 },
2990 "c/perceiveself" => {
2991 id => "infobox",
2992 title => "Perceive Self",
2993 reply => undef,
2994 tooltip => "You gained detailed knowledge about yourself",
2995 },
2827 "c/uptime" => { 2996 "c/uptime" => {
2828 id => "infobox", 2997 id => "infobox",
2829 title => "Uptime", 2998 title => "Uptime",
2830 reply => undef, 2999 reply => undef,
2831 tooltip => "How long the server has been running since last restart", 3000 tooltip => "How long the server has been running since last restart",
2840 id => "party", 3009 id => "party",
2841 title => "Party", 3010 title => "Party",
2842 reply => "gsay ", 3011 reply => "gsay ",
2843 tooltip => "Messages and chat related to your party", 3012 tooltip => "Messages and chat related to your party",
2844 }, 3013 },
3014 "c/death" => {
3015 id => "death",
3016 title => "Death",
3017 reply => undef,
3018 tooltip => "Reason for and more info about your most recent death",
3019 },
3020 "c/say" => $SAY_CHANNEL,
3021 "c/chat" => $CHAT_CHANNEL,
2845); 3022);
2846 3023
2847sub cf::client::send_msg { 3024sub cf::client::send_msg {
2848 my ($self, $channel, $msg, $color, @extra) = @_; 3025 my ($self, $channel, $msg, $color, @extra) = @_;
2849 3026
2850 $msg = $self->pl->expand_cfpod ($msg); 3027 $msg = $self->pl->expand_cfpod ($msg)
3028 unless $color & cf::NDI_VERBATIM;
2851 3029
2852 $color &= cf::NDI_CLIENT_MASK; # just in case... 3030 $color &= cf::NDI_CLIENT_MASK; # just in case...
2853 3031
2854 # check predefined channels, for the benefit of C 3032 # check predefined channels, for the benefit of C
2855 if ($CHANNEL{$channel}) { 3033 if ($CHANNEL{$channel}) {
2856 $channel = $CHANNEL{$channel}; 3034 $channel = $CHANNEL{$channel};
2857 3035
2858 $self->ext_msg (channel_info => $channel) 3036 $self->ext_msg (channel_info => $channel);
2859 if $self->can_msg;
2860
2861 $channel = $channel->{id}; 3037 $channel = $channel->{id};
2862 3038
2863 } elsif (ref $channel) { 3039 } elsif (ref $channel) {
2864 # send meta info to client, if not yet sent 3040 # send meta info to client, if not yet sent
2865 unless (exists $self->{channel}{$channel->{id}}) { 3041 unless (exists $self->{channel}{$channel->{id}}) {
2866 $self->{channel}{$channel->{id}} = $channel; 3042 $self->{channel}{$channel->{id}} = $channel;
2867 $self->ext_msg (channel_info => $channel) 3043 $self->ext_msg (channel_info => $channel);
2868 if $self->can_msg;
2869 } 3044 }
2870 3045
2871 $channel = $channel->{id}; 3046 $channel = $channel->{id};
2872 } 3047 }
2873 3048
2874 return unless @extra || length $msg; 3049 return unless @extra || length $msg;
2875 3050
2876 if ($self->can_msg) {
2877 # default colour, mask it out 3051 # default colour, mask it out
2878 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3052 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2879 if $color & cf::NDI_DEF; 3053 if $color & cf::NDI_DEF;
2880 3054
2881 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3055 my $pkt = "msg "
3056 . $self->{json_coder}->encode (
2882 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3057 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2883 } else { 3058 );
2884 if ($color >= 0) {
2885 # replace some tags by gcfclient-compatible ones
2886 for ($msg) {
2887 1 while
2888 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2889 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2890 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2891 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2892 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2893 }
2894 3059
2895 $color &= cf::NDI_COLOR_MASK; 3060 $self->send_big_packet ($pkt);
2896
2897 utf8::encode $msg;
2898
2899 if (0 && $msg =~ /\[/) {
2900 # COMMAND/INFO
2901 $self->send_packet ("drawextinfo $color 10 8 $msg")
2902 } else {
2903 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2904 $self->send_packet ("drawinfo $color $msg")
2905 }
2906 }
2907 }
2908} 3061}
2909 3062
2910=item $client->ext_msg ($type, @msg) 3063=item $client->ext_msg ($type, @msg)
2911 3064
2912Sends an ext event to the client. 3065Sends an ext event to the client.
2915 3068
2916sub cf::client::ext_msg($$@) { 3069sub cf::client::ext_msg($$@) {
2917 my ($self, $type, @msg) = @_; 3070 my ($self, $type, @msg) = @_;
2918 3071
2919 if ($self->extcmd == 2) { 3072 if ($self->extcmd == 2) {
2920 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3073 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2921 } elsif ($self->extcmd == 1) { # TODO: remove 3074 } elsif ($self->extcmd == 1) { # TODO: remove
2922 push @msg, msgtype => "event_$type"; 3075 push @msg, msgtype => "event_$type";
2923 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3076 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2924 } 3077 }
2925} 3078}
2926 3079
2927=item $client->ext_reply ($msgid, @msg) 3080=item $client->ext_reply ($msgid, @msg)
2928 3081
2932 3085
2933sub cf::client::ext_reply($$@) { 3086sub cf::client::ext_reply($$@) {
2934 my ($self, $id, @msg) = @_; 3087 my ($self, $id, @msg) = @_;
2935 3088
2936 if ($self->extcmd == 2) { 3089 if ($self->extcmd == 2) {
2937 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3090 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2938 } elsif ($self->extcmd == 1) { 3091 } elsif ($self->extcmd == 1) {
2939 #TODO: version 1, remove 3092 #TODO: version 1, remove
2940 unshift @msg, msgtype => "reply", msgid => $id; 3093 unshift @msg, msgtype => "reply", msgid => $id;
2941 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2942 } 3095 }
2943} 3096}
2944 3097
2945=item $success = $client->query ($flags, "text", \&cb) 3098=item $success = $client->query ($flags, "text", \&cb)
2946 3099
3047 3200
3048 $coro 3201 $coro
3049} 3202}
3050 3203
3051cf::client->attach ( 3204cf::client->attach (
3052 on_destroy => sub { 3205 on_client_destroy => sub {
3053 my ($ns) = @_; 3206 my ($ns) = @_;
3054 3207
3055 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3208 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3056 }, 3209 },
3057); 3210);
3073our $safe_hole = new Safe::Hole; 3226our $safe_hole = new Safe::Hole;
3074 3227
3075$SIG{FPE} = 'IGNORE'; 3228$SIG{FPE} = 'IGNORE';
3076 3229
3077$safe->permit_only (Opcode::opset qw( 3230$safe->permit_only (Opcode::opset qw(
3078 :base_core :base_mem :base_orig :base_math 3231 :base_core :base_mem :base_orig :base_math :base_loop
3079 grepstart grepwhile mapstart mapwhile 3232 grepstart grepwhile mapstart mapwhile
3080 sort time 3233 sort time
3081)); 3234));
3082 3235
3083# here we export the classes and methods available to script code 3236# here we export the classes and methods available to script code
3087The following functions and methods are available within a safe environment: 3240The following functions and methods are available within a safe environment:
3088 3241
3089 cf::object 3242 cf::object
3090 contr pay_amount pay_player map x y force_find force_add destroy 3243 contr pay_amount pay_player map x y force_find force_add destroy
3091 insert remove name archname title slaying race decrease split 3244 insert remove name archname title slaying race decrease split
3245 value
3092 3246
3093 cf::object::player 3247 cf::object::player
3094 player 3248 player
3095 3249
3096 cf::player 3250 cf::player
3101 3255
3102=cut 3256=cut
3103 3257
3104for ( 3258for (
3105 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3259 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3106 insert remove inv name archname title slaying race 3260 insert remove inv nrof name archname title slaying race
3107 decrease split destroy)], 3261 decrease split destroy change_exp value msg lore send_msg)],
3108 ["cf::object::player" => qw(player)], 3262 ["cf::object::player" => qw(player)],
3109 ["cf::player" => qw(peaceful)], 3263 ["cf::player" => qw(peaceful send_msg)],
3110 ["cf::map" => qw(trigger)], 3264 ["cf::map" => qw(trigger)],
3111) { 3265) {
3112 no strict 'refs'; 3266 no strict 'refs';
3113 my ($pkg, @funs) = @$_; 3267 my ($pkg, @funs) = @$_;
3114 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3132 3286
3133 my $qcode = $code; 3287 my $qcode = $code;
3134 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3288 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3135 $qcode =~ s/\n/\\n/g; 3289 $qcode =~ s/\n/\\n/g;
3136 3290
3291 %vars = (_dummy => 0) unless %vars;
3292
3293 my @res;
3137 local $_; 3294 local $_;
3138 local @safe::cf::_safe_eval_args = values %vars;
3139 3295
3140 my $eval = 3296 my $eval =
3141 "do {\n" 3297 "do {\n"
3142 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3298 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3143 . "#line 0 \"{$qcode}\"\n" 3299 . "#line 0 \"{$qcode}\"\n"
3144 . $code 3300 . $code
3145 . "\n}" 3301 . "\n}"
3146 ; 3302 ;
3147 3303
3304 if ($CFG{safe_eval}) {
3148 sub_generation_inc; 3305 sub_generation_inc;
3306 local @safe::cf::_safe_eval_args = values %vars;
3149 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3307 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3150 sub_generation_inc; 3308 sub_generation_inc;
3309 } else {
3310 local @cf::_safe_eval_args = values %vars;
3311 @res = wantarray ? eval eval : scalar eval $eval;
3312 }
3151 3313
3152 if ($@) { 3314 if ($@) {
3153 warn "$@"; 3315 warn "$@";
3154 warn "while executing safe code '$code'\n"; 3316 warn "while executing safe code '$code'\n";
3155 warn "with arguments " . (join " ", %vars) . "\n"; 3317 warn "with arguments " . (join " ", %vars) . "\n";
3174=cut 3336=cut
3175 3337
3176sub register_script_function { 3338sub register_script_function {
3177 my ($fun, $cb) = @_; 3339 my ($fun, $cb) = @_;
3178 3340
3179 no strict 'refs'; 3341 $fun = "safe::$fun" if $CFG{safe_eval};
3180 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3342 *$fun = $safe_hole->wrap ($cb);
3181} 3343}
3182 3344
3183=back 3345=back
3184 3346
3185=cut 3347=cut
3206 3368
3207 $facedata->{version} == 2 3369 $facedata->{version} == 2
3208 or cf::cleanup "$path: version mismatch, cannot proceed."; 3370 or cf::cleanup "$path: version mismatch, cannot proceed.";
3209 3371
3210 # patch in the exptable 3372 # patch in the exptable
3373 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3211 $facedata->{resource}{"res/exp_table"} = { 3374 $facedata->{resource}{"res/exp_table"} = {
3212 type => FT_RSRC, 3375 type => FT_RSRC,
3213 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3376 data => $exp_table,
3377 hash => (Digest::MD5::md5 $exp_table),
3214 }; 3378 };
3215 cf::cede_to_tick; 3379 cf::cede_to_tick;
3216 3380
3217 { 3381 {
3218 my $faces = $facedata->{faceinfo}; 3382 my $faces = $facedata->{faceinfo};
3220 while (my ($face, $info) = each %$faces) { 3384 while (my ($face, $info) = each %$faces) {
3221 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3385 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3222 3386
3223 cf::face::set_visibility $idx, $info->{visibility}; 3387 cf::face::set_visibility $idx, $info->{visibility};
3224 cf::face::set_magicmap $idx, $info->{magicmap}; 3388 cf::face::set_magicmap $idx, $info->{magicmap};
3225 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3226 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3227 3391
3228 cf::cede_to_tick; 3392 cf::cede_to_tick;
3229 } 3393 }
3230 3394
3231 while (my ($face, $info) = each %$faces) { 3395 while (my ($face, $info) = each %$faces) {
3255 3419
3256 cf::anim::invalidate_all; # d'oh 3420 cf::anim::invalidate_all; # d'oh
3257 } 3421 }
3258 3422
3259 { 3423 {
3260 # TODO: for gcfclient pleasure, we should give resources
3261 # that gcfclient doesn't grok a >10000 face index.
3262 my $res = $facedata->{resource}; 3424 my $res = $facedata->{resource};
3263 3425
3264 while (my ($name, $info) = each %$res) { 3426 while (my ($name, $info) = each %$res) {
3265 if (defined $info->{type}) { 3427 if (defined $info->{type}) {
3266 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3267 my $data;
3268 3429
3269 if ($info->{type} & 1) { 3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3270 # prepend meta info
3271
3272 my $meta = $enc->encode ({
3273 name => $name,
3274 %{ $info->{meta} || {} },
3275 });
3276
3277 $data = pack "(w/a*)*", $meta, $info->{data};
3278 } else {
3279 $data = $info->{data};
3280 }
3281
3282 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3283 cf::face::set_type $idx, $info->{type}; 3431 cf::face::set_type $idx, $info->{type};
3284 } else { 3432 } else {
3285 $RESOURCE{$name} = $info; 3433 $RESOURCE{$name} = $info; # unused
3286 } 3434 }
3287 3435
3288 cf::cede_to_tick; 3436 cf::cede_to_tick;
3289 } 3437 }
3290 } 3438 }
3291 3439
3292 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3440 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3293 3441
3294 1 3442 1
3295} 3443}
3296
3297cf::global->attach (on_resource_update => sub {
3298 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3299 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3300
3301 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3302 my $sound = $soundconf->{compat}[$_]
3303 or next;
3304
3305 my $face = cf::face::find "sound/$sound->[1]";
3306 cf::sound::set $sound->[0] => $face;
3307 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3308 }
3309
3310 while (my ($k, $v) = each %{$soundconf->{event}}) {
3311 my $face = cf::face::find "sound/$v";
3312 cf::sound::set $k => $face;
3313 }
3314 }
3315});
3316 3444
3317register_exticmd fx_want => sub { 3445register_exticmd fx_want => sub {
3318 my ($ns, $want) = @_; 3446 my ($ns, $want) = @_;
3319 3447
3320 while (my ($k, $v) = each %$want) { 3448 while (my ($k, $v) = each %$want) {
3359sub reload_treasures { 3487sub reload_treasures {
3360 load_resource_file "$DATADIR/treasures" 3488 load_resource_file "$DATADIR/treasures"
3361 or die "unable to load treasurelists\n"; 3489 or die "unable to load treasurelists\n";
3362} 3490}
3363 3491
3492sub reload_sound {
3493 warn "loading sound config from $DATADIR/sound\n";
3494
3495 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3496 or die "$DATADIR/sound $!";
3497
3498 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3499
3500 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3501 my $sound = $soundconf->{compat}[$_]
3502 or next;
3503
3504 my $face = cf::face::find "sound/$sound->[1]";
3505 cf::sound::set $sound->[0] => $face;
3506 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3507 }
3508
3509 while (my ($k, $v) = each %{$soundconf->{event}}) {
3510 my $face = cf::face::find "sound/$v";
3511 cf::sound::set $k => $face;
3512 }
3513}
3514
3364sub reload_resources { 3515sub reload_resources {
3365 warn "reloading resource files...\n"; 3516 warn "reloading resource files...\n";
3366 3517
3367 reload_facedata; 3518 reload_facedata;
3519 reload_sound;
3368 reload_archetypes; 3520 reload_archetypes;
3369 reload_regions; 3521 reload_regions;
3370 reload_treasures; 3522 reload_treasures;
3371 3523
3372 warn "finished reloading resource files\n"; 3524 warn "finished reloading resource files\n";
3373} 3525}
3374 3526
3375sub init {
3376 my $guard = freeze_mainloop;
3377
3378 reload_resources;
3379}
3380
3381sub reload_config { 3527sub reload_config {
3528 warn "reloading config file...\n";
3529
3382 open my $fh, "<:utf8", "$CONFDIR/config" 3530 open my $fh, "<:utf8", "$CONFDIR/config"
3383 or return; 3531 or return;
3384 3532
3385 local $/; 3533 local $/;
3386 *CFG = YAML::Load <$fh>; 3534 *CFG = YAML::XS::Load scalar <$fh>;
3387 3535
3388 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3536 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3389 3537
3390 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3538 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3391 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3539 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3392 3540
3393 if (exists $CFG{mlockall}) { 3541 if (exists $CFG{mlockall}) {
3395 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3543 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3396 and die "WARNING: m(un)lockall failed: $!\n"; 3544 and die "WARNING: m(un)lockall failed: $!\n";
3397 }; 3545 };
3398 warn $@ if $@; 3546 warn $@ if $@;
3399 } 3547 }
3548
3549 warn "finished reloading resource files\n";
3550}
3551
3552sub pidfile() {
3553 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3554 or die "$PIDFILE: $!";
3555 flock $fh, &Fcntl::LOCK_EX
3556 or die "$PIDFILE: flock: $!";
3557 $fh
3558}
3559
3560# make sure only one server instance is running at any one time
3561sub atomic {
3562 my $fh = pidfile;
3563
3564 my $pid = <$fh>;
3565 kill 9, $pid if $pid > 0;
3566
3567 seek $fh, 0, 0;
3568 print $fh $$;
3569}
3570
3571sub main_loop {
3572 warn "EV::loop starting\n";
3573 if (1) {
3574 EV::loop;
3575 }
3576 warn "EV::loop returned\n";
3577 goto &main_loop unless $REALLY_UNLOOP;
3400} 3578}
3401 3579
3402sub main { 3580sub main {
3581 cf::init_globals; # initialise logging
3582
3583 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3584 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3585 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3586 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3587
3588 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3589
3403 # we must not ever block the main coroutine 3590 # we must not ever block the main coroutine
3404 local $Coro::idle = sub { 3591 local $Coro::idle = sub {
3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3592 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3406 (async { 3593 (async {
3407 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3594 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT; 3595 EV::loop EV::LOOP_ONESHOT;
3409 })->prio (Coro::PRIO_MAX); 3596 })->prio (Coro::PRIO_MAX);
3410 }; 3597 };
3411 3598
3412 { 3599 evthread_start IO::AIO::poll_fileno;
3413 my $guard = freeze_mainloop; 3600
3601 cf::sync_job {
3602 cf::init_experience;
3603 cf::init_anim;
3604 cf::init_attackmess;
3605 cf::init_dynamic;
3606
3607 cf::load_settings;
3608 cf::load_materials;
3609
3610 reload_resources;
3414 reload_config; 3611 reload_config;
3415 db_init; 3612 db_init;
3613
3614 cf::init_uuid;
3615 cf::init_signals;
3616 cf::init_skills;
3617
3618 cf::init_beforeplay;
3619
3620 atomic;
3621
3416 load_extensions; 3622 load_extensions;
3417 3623
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3624 utime time, time, $RUNTIMEFILE;
3419 evthread_start IO::AIO::poll_fileno; 3625
3626 # no (long-running) fork's whatsoever before this point(!)
3627 use POSIX ();
3628 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3629
3630 (pop @POST_INIT)->(0) while @POST_INIT;
3420 } 3631 };
3421 3632
3422 EV::loop; 3633 cf::object::thawer::errors_are_fatal 0;
3634 warn "parse errors in files are no longer fatal from this point on.\n";
3635
3636 main_loop;
3423} 3637}
3424 3638
3425############################################################################# 3639#############################################################################
3426# initialisation and cleanup 3640# initialisation and cleanup
3427 3641
3428# install some emergency cleanup handlers 3642# install some emergency cleanup handlers
3429BEGIN { 3643BEGIN {
3430 our %SIGWATCHER = (); 3644 our %SIGWATCHER = ();
3431 for my $signal (qw(INT HUP TERM)) { 3645 for my $signal (qw(INT HUP TERM)) {
3432 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3646 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3433 cf::cleanup "SIG$signal"; 3647 cf::cleanup "SIG$signal";
3434 }; 3648 };
3435 } 3649 }
3436} 3650}
3437 3651
3438sub write_runtime_sync { 3652sub write_runtime_sync {
3439 my $runtime = "$LOCALDIR/runtime"; 3653 my $t0 = AE::time;
3440 3654
3441 # first touch the runtime file to show we are still running: 3655 # first touch the runtime file to show we are still running:
3442 # the fsync below can take a very very long time. 3656 # the fsync below can take a very very long time.
3443 3657
3444 IO::AIO::aio_utime $runtime, undef, undef; 3658 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3445 3659
3446 my $guard = cf::lock_acquire "write_runtime"; 3660 my $guard = cf::lock_acquire "write_runtime";
3447 3661
3448 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3662 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3449 or return; 3663 or return;
3450 3664
3451 my $value = $cf::RUNTIME + 90 + 10; 3665 my $value = $cf::RUNTIME + 90 + 10;
3452 # 10 is the runtime save interval, for a monotonic clock 3666 # 10 is the runtime save interval, for a monotonic clock
3453 # 60 allows for the watchdog to kill the server. 3667 # 60 allows for the watchdog to kill the server.
3463 aio_utime $fh, undef, undef; 3677 aio_utime $fh, undef, undef;
3464 3678
3465 close $fh 3679 close $fh
3466 or return; 3680 or return;
3467 3681
3468 aio_rename "$runtime~", $runtime 3682 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3469 and return; 3683 and return;
3470 3684
3471 warn "runtime file written.\n"; 3685 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3472 3686
3473 1 3687 1
3474} 3688}
3475 3689
3476our $uuid_lock; 3690our $uuid_lock;
3485 my $uuid = "$LOCALDIR/uuid"; 3699 my $uuid = "$LOCALDIR/uuid";
3486 3700
3487 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3701 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3488 or return; 3702 or return;
3489 3703
3490 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3704 my $value = uuid_seq uuid_cur;
3705
3706 unless ($value) {
3707 warn "cowardly refusing to write zero uuid value!\n";
3708 return;
3709 }
3710
3711 my $value = uuid_str $value + $uuid_skip;
3491 $uuid_skip = 0; 3712 $uuid_skip = 0;
3492 3713
3493 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3714 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3494 and return; 3715 and return;
3495 3716
3517} 3738}
3518 3739
3519sub emergency_save() { 3740sub emergency_save() {
3520 my $freeze_guard = cf::freeze_mainloop; 3741 my $freeze_guard = cf::freeze_mainloop;
3521 3742
3522 warn "enter emergency perl save\n"; 3743 warn "emergency_perl_save: enter\n";
3523 3744
3524 cf::sync_job { 3745 cf::sync_job {
3746 # this is a trade-off: we want to be very quick here, so
3747 # save all maps without fsync, and later call a global sync
3748 # (which in turn might be very very slow)
3749 local $USE_FSYNC = 0;
3750
3525 # use a peculiar iteration method to avoid tripping on perl 3751 # use a peculiar iteration method to avoid tripping on perl
3526 # refcount bugs in for. also avoids problems with players 3752 # refcount bugs in for. also avoids problems with players
3527 # and maps saved/destroyed asynchronously. 3753 # and maps saved/destroyed asynchronously.
3528 warn "begin emergency player save\n"; 3754 warn "emergency_perl_save: begin player save\n";
3529 for my $login (keys %cf::PLAYER) { 3755 for my $login (keys %cf::PLAYER) {
3530 my $pl = $cf::PLAYER{$login} or next; 3756 my $pl = $cf::PLAYER{$login} or next;
3531 $pl->valid or next; 3757 $pl->valid or next;
3532 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3758 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3533 $pl->save; 3759 $pl->save;
3534 } 3760 }
3535 warn "end emergency player save\n"; 3761 warn "emergency_perl_save: end player save\n";
3536 3762
3537 warn "begin emergency map save\n"; 3763 warn "emergency_perl_save: begin map save\n";
3538 for my $path (keys %cf::MAP) { 3764 for my $path (keys %cf::MAP) {
3539 my $map = $cf::MAP{$path} or next; 3765 my $map = $cf::MAP{$path} or next;
3540 $map->valid or next; 3766 $map->valid or next;
3541 $map->save; 3767 $map->save;
3542 } 3768 }
3543 warn "end emergency map save\n"; 3769 warn "emergency_perl_save: end map save\n";
3544 3770
3545 warn "begin emergency database checkpoint\n"; 3771 warn "emergency_perl_save: begin database checkpoint\n";
3546 BDB::db_env_txn_checkpoint $DB_ENV; 3772 BDB::db_env_txn_checkpoint $DB_ENV;
3547 warn "end emergency database checkpoint\n"; 3773 warn "emergency_perl_save: end database checkpoint\n";
3548 3774
3549 warn "begin write uuid\n"; 3775 warn "emergency_perl_save: begin write uuid\n";
3550 write_uuid_sync 1; 3776 write_uuid_sync 1;
3551 warn "end write uuid\n"; 3777 warn "emergency_perl_save: end write uuid\n";
3552 }; 3778 };
3553 3779
3780 warn "emergency_perl_save: starting sync()\n";
3781 IO::AIO::aio_sync sub {
3782 warn "emergency_perl_save: finished sync()\n";
3783 };
3784
3554 warn "leave emergency perl save\n"; 3785 warn "emergency_perl_save: leave\n";
3555} 3786}
3556 3787
3557sub post_cleanup { 3788sub post_cleanup {
3558 my ($make_core) = @_; 3789 my ($make_core) = @_;
3559 3790
3560 warn Carp::longmess "post_cleanup backtrace" 3791 warn Carp::longmess "post_cleanup backtrace"
3561 if $make_core; 3792 if $make_core;
3793
3794 my $fh = pidfile;
3795 unlink $PIDFILE if <$fh> == $$;
3796}
3797
3798# a safer delete_package, copied from Symbol
3799sub clear_package($) {
3800 my $pkg = shift;
3801
3802 # expand to full symbol table name if needed
3803 unless ($pkg =~ /^main::.*::$/) {
3804 $pkg = "main$pkg" if $pkg =~ /^::/;
3805 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3806 $pkg .= '::' unless $pkg =~ /::$/;
3807 }
3808
3809 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3810 my $stem_symtab = *{$stem}{HASH};
3811
3812 defined $stem_symtab and exists $stem_symtab->{$leaf}
3813 or return;
3814
3815 # clear all symbols
3816 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3817 for my $name (keys %$leaf_symtab) {
3818 _gv_clear *{"$pkg$name"};
3819# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3820 }
3562} 3821}
3563 3822
3564sub do_reload_perl() { 3823sub do_reload_perl() {
3565 # can/must only be called in main 3824 # can/must only be called in main
3566 if ($Coro::current != $Coro::main) { 3825 if (in_main) {
3567 warn "can only reload from main coroutine"; 3826 warn "can only reload from main coroutine";
3568 return; 3827 return;
3569 } 3828 }
3570 3829
3830 return if $RELOAD++;
3831
3832 my $t1 = AE::time;
3833
3834 while ($RELOAD) {
3571 warn "reloading..."; 3835 warn "reloading...";
3572 3836
3573 warn "entering sync_job"; 3837 warn "entering sync_job";
3574 3838
3575 cf::sync_job { 3839 cf::sync_job {
3576 cf::write_runtime_sync; # external watchdog should not bark 3840 cf::write_runtime_sync; # external watchdog should not bark
3577 cf::emergency_save; 3841 cf::emergency_save;
3578 cf::write_runtime_sync; # external watchdog should not bark 3842 cf::write_runtime_sync; # external watchdog should not bark
3579 3843
3580 warn "syncing database to disk"; 3844 warn "syncing database to disk";
3581 BDB::db_env_txn_checkpoint $DB_ENV; 3845 BDB::db_env_txn_checkpoint $DB_ENV;
3582 3846
3583 # if anything goes wrong in here, we should simply crash as we already saved 3847 # if anything goes wrong in here, we should simply crash as we already saved
3584 3848
3585 warn "flushing outstanding aio requests"; 3849 warn "flushing outstanding aio requests";
3586 for (;;) {
3587 BDB::flush;
3588 IO::AIO::flush;
3589 Coro::cede_notself;
3590 last unless IO::AIO::nreqs || BDB::nreqs; 3850 while (IO::AIO::nreqs || BDB::nreqs) {
3591 warn "iterate..."; 3851 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3592 }
3593
3594 ++$RELOAD;
3595
3596 warn "cancelling all extension coros";
3597 $_->cancel for values %EXT_CORO;
3598 %EXT_CORO = ();
3599
3600 warn "removing commands";
3601 %COMMAND = ();
3602
3603 warn "removing ext/exti commands";
3604 %EXTCMD = ();
3605 %EXTICMD = ();
3606
3607 warn "unloading/nuking all extensions";
3608 for my $pkg (@EXTS) {
3609 warn "... unloading $pkg";
3610
3611 if (my $cb = $pkg->can ("unload")) {
3612 eval {
3613 $cb->($pkg);
3614 1
3615 } or warn "$pkg unloaded, but with errors: $@";
3616 } 3852 }
3617 3853
3618 warn "... nuking $pkg"; 3854 warn "cancelling all extension coros";
3619 Symbol::delete_package $pkg; 3855 $_->cancel for values %EXT_CORO;
3620 } 3856 %EXT_CORO = ();
3621 3857
3622 warn "unloading all perl modules loaded from $LIBDIR"; 3858 warn "removing commands";
3623 while (my ($k, $v) = each %INC) { 3859 %COMMAND = ();
3624 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3625 3860
3861 warn "removing ext/exti commands";
3862 %EXTCMD = ();
3863 %EXTICMD = ();
3864
3865 warn "unloading/nuking all extensions";
3866 for my $pkg (@EXTS) {
3626 warn "... unloading $k"; 3867 warn "... unloading $pkg";
3627 delete $INC{$k};
3628 3868
3629 $k =~ s/\.pm$//;
3630 $k =~ s/\//::/g;
3631
3632 if (my $cb = $k->can ("unload_module")) { 3869 if (my $cb = $pkg->can ("unload")) {
3870 eval {
3633 $cb->(); 3871 $cb->($pkg);
3872 1
3873 } or warn "$pkg unloaded, but with errors: $@";
3874 }
3875
3876 warn "... clearing $pkg";
3877 clear_package $pkg;
3634 } 3878 }
3635 3879
3636 Symbol::delete_package $k; 3880 warn "unloading all perl modules loaded from $LIBDIR";
3881 while (my ($k, $v) = each %INC) {
3882 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3883
3884 warn "... unloading $k";
3885 delete $INC{$k};
3886
3887 $k =~ s/\.pm$//;
3888 $k =~ s/\//::/g;
3889
3890 if (my $cb = $k->can ("unload_module")) {
3891 $cb->();
3892 }
3893
3894 clear_package $k;
3637 } 3895 }
3638 3896
3639 warn "getting rid of safe::, as good as possible"; 3897 warn "getting rid of safe::, as good as possible";
3640 Symbol::delete_package "safe::$_" 3898 clear_package "safe::$_"
3641 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3899 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3642 3900
3643 warn "unloading cf.pm \"a bit\""; 3901 warn "unloading cf.pm \"a bit\"";
3644 delete $INC{"cf.pm"}; 3902 delete $INC{"cf.pm"};
3645 delete $INC{"cf/pod.pm"}; 3903 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3646 3904
3647 # don't, removes xs symbols, too, 3905 # don't, removes xs symbols, too,
3648 # and global variables created in xs 3906 # and global variables created in xs
3649 #Symbol::delete_package __PACKAGE__; 3907 #clear_package __PACKAGE__;
3650 3908
3651 warn "unload completed, starting to reload now"; 3909 warn "unload completed, starting to reload now";
3652 3910
3653 warn "reloading cf.pm"; 3911 warn "reloading cf.pm";
3654 require cf; 3912 require cf;
3655 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3913 cf::_connect_to_perl_1;
3656 3914
3657 warn "loading config and database again"; 3915 warn "loading config and database again";
3658 cf::reload_config; 3916 cf::reload_config;
3659 3917
3660 warn "loading extensions"; 3918 warn "loading extensions";
3661 cf::load_extensions; 3919 cf::load_extensions;
3662 3920
3921 if ($REATTACH_ON_RELOAD) {
3663 warn "reattaching attachments to objects/players"; 3922 warn "reattaching attachments to objects/players";
3664 _global_reattach; # objects, sockets 3923 _global_reattach; # objects, sockets
3665 warn "reattaching attachments to maps"; 3924 warn "reattaching attachments to maps";
3666 reattach $_ for values %MAP; 3925 reattach $_ for values %MAP;
3667 warn "reattaching attachments to players"; 3926 warn "reattaching attachments to players";
3668 reattach $_ for values %PLAYER; 3927 reattach $_ for values %PLAYER;
3928 }
3669 3929
3930 warn "running post_init jobs";
3931 (pop @POST_INIT)->(1) while @POST_INIT;
3932
3670 warn "leaving sync_job"; 3933 warn "leaving sync_job";
3671 3934
3672 1 3935 1
3673 } or do { 3936 } or do {
3674 warn $@; 3937 warn $@;
3675 cf::cleanup "error while reloading, exiting."; 3938 cf::cleanup "error while reloading, exiting.";
3676 }; 3939 };
3677 3940
3678 warn "reloaded"; 3941 warn "reloaded";
3942 --$RELOAD;
3943 }
3944
3945 $t1 = AE::time - $t1;
3946 warn "reload completed in ${t1}s\n";
3679}; 3947};
3680 3948
3681our $RELOAD_WATCHER; # used only during reload 3949our $RELOAD_WATCHER; # used only during reload
3682 3950
3683sub reload_perl() { 3951sub reload_perl() {
3684 # doing reload synchronously and two reloads happen back-to-back, 3952 # doing reload synchronously and two reloads happen back-to-back,
3685 # coro crashes during coro_state_free->destroy here. 3953 # coro crashes during coro_state_free->destroy here.
3686 3954
3955 $RELOAD_WATCHER ||= cf::async {
3956 Coro::AIO::aio_wait cache_extensions;
3957
3687 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3958 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3688 do_reload_perl; 3959 do_reload_perl;
3689 undef $RELOAD_WATCHER; 3960 undef $RELOAD_WATCHER;
3961 };
3690 }; 3962 };
3691} 3963}
3692 3964
3693register_command "reload" => sub { 3965register_command "reload" => sub {
3694 my ($who, $arg) = @_; 3966 my ($who, $arg) = @_;
3708 3980
3709our @WAIT_FOR_TICK; 3981our @WAIT_FOR_TICK;
3710our @WAIT_FOR_TICK_BEGIN; 3982our @WAIT_FOR_TICK_BEGIN;
3711 3983
3712sub wait_for_tick { 3984sub wait_for_tick {
3713 return if tick_inhibit || $Coro::current == $Coro::main; 3985 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3714 3986
3715 my $signal = new Coro::Signal; 3987 my $signal = new Coro::Signal;
3716 push @WAIT_FOR_TICK, $signal; 3988 push @WAIT_FOR_TICK, $signal;
3717 $signal->wait; 3989 $signal->wait;
3718} 3990}
3719 3991
3720sub wait_for_tick_begin { 3992sub wait_for_tick_begin {
3721 return if tick_inhibit || $Coro::current == $Coro::main; 3993 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3722 3994
3723 my $signal = new Coro::Signal; 3995 my $signal = new Coro::Signal;
3724 push @WAIT_FOR_TICK_BEGIN, $signal; 3996 push @WAIT_FOR_TICK_BEGIN, $signal;
3725 $signal->wait; 3997 $signal->wait;
3726} 3998}
3731 unless ++$bug_warning > 10; 4003 unless ++$bug_warning > 10;
3732 return; 4004 return;
3733 } 4005 }
3734 4006
3735 cf::server_tick; # one server iteration 4007 cf::server_tick; # one server iteration
4008
4009 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3736 4010
3737 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4011 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3738 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4012 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3739 Coro::async_pool { 4013 Coro::async_pool {
3740 $Coro::current->{desc} = "runtime saver"; 4014 $Coro::current->{desc} = "runtime saver";
3763} 4037}
3764 4038
3765{ 4039{
3766 # configure BDB 4040 # configure BDB
3767 4041
3768 BDB::min_parallel 8; 4042 BDB::min_parallel 16;
3769 BDB::max_poll_reqs $TICK * 0.1; 4043 BDB::max_poll_reqs $TICK * 0.1;
3770 $Coro::BDB::WATCHER->priority (1); 4044 $AnyEvent::BDB::WATCHER->priority (1);
3771 4045
3772 unless ($DB_ENV) { 4046 unless ($DB_ENV) {
3773 $DB_ENV = BDB::db_env_create; 4047 $DB_ENV = BDB::db_env_create;
3774 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4048 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3775 | BDB::LOG_AUTOREMOVE, 1); 4049 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4050 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3776 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4051 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3777 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4052 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3778 4053
3779 cf::sync_job { 4054 cf::sync_job {
3780 eval { 4055 eval {
3806{ 4081{
3807 # configure IO::AIO 4082 # configure IO::AIO
3808 4083
3809 IO::AIO::min_parallel 8; 4084 IO::AIO::min_parallel 8;
3810 IO::AIO::max_poll_time $TICK * 0.1; 4085 IO::AIO::max_poll_time $TICK * 0.1;
3811 $Coro::AIO::WATCHER->priority (1); 4086 undef $AnyEvent::AIO::WATCHER;
3812} 4087}
3813 4088
3814my $_log_backtrace; 4089my $_log_backtrace;
3815 4090
3816sub _log_backtrace { 4091sub _log_backtrace {
3819 $msg =~ s/\n//; 4094 $msg =~ s/\n//;
3820 4095
3821 # limit the # of concurrent backtraces 4096 # limit the # of concurrent backtraces
3822 if ($_log_backtrace < 2) { 4097 if ($_log_backtrace < 2) {
3823 ++$_log_backtrace; 4098 ++$_log_backtrace;
4099 my $perl_bt = Carp::longmess $msg;
3824 async { 4100 async {
3825 $Coro::current->{desc} = "abt $msg"; 4101 $Coro::current->{desc} = "abt $msg";
3826 4102
3827 my @bt = fork_call { 4103 my @bt = fork_call {
3828 @addr = map { sprintf "%x", $_ } @addr; 4104 @addr = map { sprintf "%x", $_ } @addr;
3839 } 4115 }
3840 4116
3841 @funcs 4117 @funcs
3842 }; 4118 };
3843 4119
3844 LOG llevInfo, "[ABT] $msg\n"; 4120 LOG llevInfo, "[ABT] $perl_bt\n";
4121 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3845 LOG llevInfo, "[ABT] $_\n" for @bt; 4122 LOG llevInfo, "[ABT] $_\n" for @bt;
3846 --$_log_backtrace; 4123 --$_log_backtrace;
3847 }; 4124 };
3848 } else { 4125 } else {
3849 LOG llevInfo, "[ABT] $msg\n"; 4126 LOG llevInfo, "[ABT] $msg\n";
3850 LOG llevInfo, "[ABT] [suppressed]\n"; 4127 LOG llevInfo, "[ABT] [suppressed]\n";
3851 } 4128 }
3852} 4129}
3853 4130
3854# load additional modules 4131# load additional modules
3855use cf::pod; 4132require "cf/$_.pm" for @EXTRA_MODULES;
4133cf::_connect_to_perl_2;
3856 4134
3857END { cf::emergency_save } 4135END { cf::emergency_save }
3858 4136
38591 41371
3860 4138

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines