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.430 by root, Sun May 4 14:12:37 2008 UTC vs.
Revision 1.532 by root, Thu Apr 29 07:32:34 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 { 257sub error(@) { LOG llevError, join "", @_ }
205 *CORE::GLOBAL::warn = sub { 258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
263$Coro::State::WARNHOOK = sub {
206 my $msg = join "", @_; 264 my $msg = join "", @_;
207 265
208 $msg .= "\n" 266 $msg .= "\n"
209 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
210 268
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 270
213 LOG llevError, $msg; 271 LOG llevWarn, $msg;
214 }; 272};
215}
216 273
217$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
219 276
220 if ($Coro::current == $Coro::main) {#d# 277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 281 return;#d#
223 }#d# 282 }#d#
224 283
225 # kill coroutine otherwise 284 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 285 Coro::terminate
228}; 286};
229
230$SIG{__DIE__} = sub { }; #d#?
231 287
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 298for my $pkg (qw(
243 cf::global cf::attachable 299 cf::global cf::attachable
244 cf::object cf::object::player 300 cf::object cf::object::player
245 cf::client cf::player 301 cf::client cf::player
246 cf::arch cf::living 302 cf::arch cf::living
303 cf::map cf::mapspace
247 cf::map cf::party cf::region 304 cf::party cf::region
248)) { 305)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 307}
252 308
253$EV::DIED = sub { 309$EV::DIED = sub {
254 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
255}; 311};
256 312
257############################################################################# 313#############################################################################
258 314
259=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 353
298sub encode_json($) { $json_coder->encode ($_[0]) } 354sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 355sub decode_json($) { $json_coder->decode ($_[0]) }
300 356
357=item cf::post_init { BLOCK }
358
359Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again.
361
362The cdoeblock will have a single boolean argument to indicate whether this
363is a reload or not.
364
365=cut
366
367sub post_init(&) {
368 push @POST_INIT, shift;
369}
370
301=item cf::lock_wait $string 371=item cf::lock_wait $string
302 372
303Wait until the given lock is available. See cf::lock_acquire. 373Wait until the given lock is available. See cf::lock_acquire.
304 374
305=item my $lock = cf::lock_acquire $string 375=item my $lock = cf::lock_acquire $string
306 376
307Wait until the given lock is available and then acquires it and returns 377Wait 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, 378a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 379for example when the coroutine gets canceled), the lock is automatically
310returned. 380returned.
311 381
312Locks are *not* recursive, locking from the same coro twice results in a 382Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 383deadlocked coro.
319 389
320Return true if the lock is currently active, i.e. somebody has locked it. 390Return true if the lock is currently active, i.e. somebody has locked it.
321 391
322=cut 392=cut
323 393
324our %LOCK; 394our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 395
327sub lock_wait($) { 396sub lock_wait($) {
328 my ($key) = @_; 397 $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} 398}
341 399
342sub lock_acquire($) { 400sub lock_acquire($) {
343 my ($key) = @_; 401 $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} 402}
357 403
358sub lock_active($) { 404sub lock_active($) {
359 my ($key) = @_; 405 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 406}
363 407
364sub freeze_mainloop { 408sub freeze_mainloop {
365 tick_inhibit_inc; 409 tick_inhibit_inc;
366 410
367 Coro::guard \&tick_inhibit_dec; 411 &Guard::guard (\&tick_inhibit_dec);
368} 412}
369 413
370=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
371 415
372Like EV::periodic, but randomly selects a starting point so that the actions 416Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer. 417get spread over time.
374 418
375=cut 419=cut
376 420
377sub periodic($$) { 421sub periodic($$) {
378 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
395 439
396=cut 440=cut
397 441
398our @SLOT_QUEUE; 442our @SLOT_QUEUE;
399our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
400 445
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
404 449
405 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
406 452
407 while () { 453 while () {
408 next_job: 454 next_job:
455
409 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 457
411 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 462 $job->[2]->send;
415 Coro::cede; 463 Coro::cede;
416 goto next_job; 464 goto next_job;
417 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 467 }
419 } 468 }
420 469
421 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 473 $signal->wait;
425 } else { 474 } else {
475 $busy = 0;
426 Coro::schedule; 476 Coro::schedule;
427 } 477 }
428 } 478 }
429}; 479};
430 480
431sub get_slot($;$$) { 481sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main; 482 return if tick_inhibit || $Coro::current == $Coro::main;
433 483
434 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
435 485
436 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
437 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
438 489
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
468 519
469sub sync_job(&) { 520sub sync_job(&) {
470 my ($job) = @_; 521 my ($job) = @_;
471 522
472 if ($Coro::current == $Coro::main) { 523 if ($Coro::current == $Coro::main) {
473 my $time = EV::time; 524 my $time = AE::time;
474 525
475 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
476 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
477 528
478 LOG llevError, Carp::longmess "sync job";#d# 529 LOG llevError, Carp::longmess "sync job";#d#
483 my @res; 534 my @res;
484 535
485 (async { 536 (async {
486 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
487 @res = eval { $job->() }; 538 @res = eval { $job->() };
488 warn $@ if $@; 539 error $@ if $@;
489 undef $busy; 540 undef $busy;
490 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
491 542
492 while ($busy) { 543 while ($busy) {
493 if (Coro::nready) { 544 if (Coro::nready) {
495 } else { 546 } else {
496 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
497 } 548 }
498 } 549 }
499 550
500 my $time = EV::time - $time; 551 my $time = AE::time - $time;
501 552
502 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
503 554
504 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
505 } else { 556 } else {
549 reset_signals; 600 reset_signals;
550 &$cb 601 &$cb
551 }, @args; 602 }, @args;
552 603
553 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
605}
606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
554} 616}
555 617
556=item $coin = coin_from_name $name 618=item $coin = coin_from_name $name
557 619
558=cut 620=cut
693 755
694 my $t1 = Time::HiRes::time; 756 my $t1 = Time::HiRes::time;
695 my $data = $process->(\@data); 757 my $data = $process->(\@data);
696 my $t2 = Time::HiRes::time; 758 my $t2 = Time::HiRes::time;
697 759
698 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 760 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
699 761
700 db_put cache => "$id/data", $data; 762 db_put cache => "$id/data", $data;
701 db_put cache => "$id/md5" , $md5; 763 db_put cache => "$id/md5" , $md5;
702 db_put cache => "$id/meta", $meta; 764 db_put cache => "$id/meta", $meta;
703 765
713 775
714=cut 776=cut
715 777
716sub datalog($@) { 778sub datalog($@) {
717 my ($type, %kv) = @_; 779 my ($type, %kv) = @_;
718 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 780 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
719} 781}
720 782
721=back 783=back
722 784
723=cut 785=cut
724 786
725############################################################################# 787#############################################################################
726 788
727=head2 ATTACHABLE OBJECTS 789=head2 ATTACHABLE OBJECTS
728 790
729Many objects in crossfire are so-called attachable objects. That means you can 791Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 792attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 793to it. All such attachable objects support the following methods.
732 794
733In the following description, CLASS can be any of C<global>, C<object> 795In 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 796C<player>, C<client> or C<map> (i.e. the attachable objects in
784=item cf::CLASS::attachment $name, ... 846=item cf::CLASS::attachment $name, ...
785 847
786Register an attachment by C<$name> through which attachable objects of the 848Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 849given CLASS can refer to this attachment.
788 850
789Some classes such as crossfire maps and objects can specify attachments 851Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 852that are attached at load/instantiate time, thus the need for a name.
791 853
792These calls expect any number of the following handler/hook descriptions: 854These calls expect any number of the following handler/hook descriptions:
793 855
794=over 4 856=over 4
918 980
919 } elsif (exists $cb_id{$type}) { 981 } elsif (exists $cb_id{$type}) {
920 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 982 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
921 983
922 } elsif (ref $type) { 984 } elsif (ref $type) {
923 warn "attaching objects not supported, ignoring.\n"; 985 error "attaching objects not supported, ignoring.\n";
924 986
925 } else { 987 } else {
926 shift @arg; 988 shift @arg;
927 warn "attach argument '$type' not supported, ignoring.\n"; 989 error "attach argument '$type' not supported, ignoring.\n";
928 } 990 }
929 } 991 }
930} 992}
931 993
932sub _object_attach { 994sub _object_attach {
942 _attach $registry, $klass, @attach; 1004 _attach $registry, $klass, @attach;
943 } 1005 }
944 1006
945 $obj->{$name} = \%arg; 1007 $obj->{$name} = \%arg;
946 } else { 1008 } else {
947 warn "object uses attachment '$name' which is not available, postponing.\n"; 1009 info "object uses attachment '$name' which is not available, postponing.\n";
948 } 1010 }
949 1011
950 $obj->{_attachment}{$name} = undef; 1012 $obj->{_attachment}{$name} = undef;
951} 1013}
952 1014
1011 1073
1012 for (@$callbacks) { 1074 for (@$callbacks) {
1013 eval { &{$_->[1]} }; 1075 eval { &{$_->[1]} };
1014 1076
1015 if ($@) { 1077 if ($@) {
1016 warn "$@";
1017 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1078 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1018 override; 1079 override;
1019 } 1080 }
1020 1081
1021 return 1 if $override; 1082 return 1 if $override;
1022 } 1083 }
1085 1146
1086sub reattach { 1147sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1148 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1149 my ($obj) = @_;
1089 1150
1151 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1152 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1153
1092 my $registry = $obj->registry; 1154 my $registry = $obj->registry;
1093 1155
1094 @$registry = (); 1156 @$registry = ();
1095 1157
1100 for (@$attach) { 1162 for (@$attach) {
1101 my ($klass, @attach) = @$_; 1163 my ($klass, @attach) = @$_;
1102 _attach $registry, $klass, @attach; 1164 _attach $registry, $klass, @attach;
1103 } 1165 }
1104 } else { 1166 } else {
1105 warn "object uses attachment '$name' that is not available, postponing.\n"; 1167 info "object uses attachment '$name' that is not available, postponing.\n";
1106 } 1168 }
1107 } 1169 }
1108} 1170}
1109 1171
1110cf::attachable->attach ( 1172cf::attachable->attach (
1137 my ($filename, $rdata, $objs) = @_; 1199 my ($filename, $rdata, $objs) = @_;
1138 1200
1139 sync_job { 1201 sync_job {
1140 if (length $$rdata) { 1202 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1204 trace sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1205 $decname, length $$rdata, scalar @$objs
1206 if $VERBOSE_IO;
1144 1207
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1208 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 aio_chmod $fh, SAVE_MODE; 1209 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1210 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1211 if ($cf::USE_FSYNC) {
1212 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;
1213 aio_fsync $fh;
1214 }
1149 aio_close $fh; 1215 aio_close $fh;
1150 1216
1151 if (@$objs) { 1217 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1218 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1219 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1220 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1221 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1222 if ($cf::USE_FSYNC) {
1223 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1224 aio_fsync $fh;
1225 }
1157 aio_close $fh; 1226 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1227 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1228 }
1160 } else { 1229 } else {
1161 aio_unlink "$filename.pst"; 1230 aio_unlink "$filename.pst";
1162 } 1231 }
1163 1232
1164 aio_rename "$filename~", $filename; 1233 aio_rename "$filename~", $filename;
1234
1235 $filename =~ s%/[^/]+$%%;
1236 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1237 } else {
1166 warn "FATAL: $filename~: $!\n"; 1238 error "unable to save objects: $filename~: $!\n";
1167 } 1239 }
1168 } else { 1240 } else {
1169 aio_unlink $filename; 1241 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1242 aio_unlink "$filename.pst";
1171 } 1243 }
1195 my $st = eval { Coro::Storable::thaw $av }; 1267 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs}; 1268 $av = $st->{objs};
1197 } 1269 }
1198 1270
1199 utf8::decode (my $decname = $filename); 1271 utf8::decode (my $decname = $filename);
1200 warn sprintf "loading %s (%d,%d)\n", 1272 trace sprintf "loading %s (%d,%d)\n",
1201 $decname, length $data, scalar @{$av || []}; 1273 $decname, length $data, scalar @{$av || []}
1274 if $VERBOSE_IO;
1202 1275
1203 ($data, $av) 1276 ($data, $av)
1204} 1277}
1205 1278
1206=head2 COMMAND CALLBACKS 1279=head2 COMMAND CALLBACKS
1262 my ($name, $cb) = @_; 1335 my ($name, $cb) = @_;
1263 1336
1264 $EXTICMD{$name} = $cb; 1337 $EXTICMD{$name} = $cb;
1265} 1338}
1266 1339
1340use File::Glob ();
1341
1267cf::player->attach ( 1342cf::player->attach (
1268 on_command => sub { 1343 on_unknown_command => sub {
1269 my ($pl, $name, $params) = @_; 1344 my ($pl, $name, $params) = @_;
1270 1345
1271 my $cb = $COMMAND{$name} 1346 my $cb = $COMMAND{$name}
1272 or return; 1347 or return;
1273 1348
1296 1371
1297 $pl->ext_reply ($reply, @reply) 1372 $pl->ext_reply ($reply, @reply)
1298 if $reply; 1373 if $reply;
1299 1374
1300 } else { 1375 } else {
1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1302 } 1377 }
1303 1378
1304 cf::override; 1379 cf::override;
1305 }, 1380 },
1306); 1381);
1307 1382
1383# "readahead" all extensions
1384sub cache_extensions {
1385 my $grp = IO::AIO::aio_group;
1386
1387 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1388 for (grep /\.ext$/, @{$_[0]}) {
1389 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1390 }
1391 };
1392
1393 $grp
1394}
1395
1308sub load_extensions { 1396sub load_extensions {
1397 info "loading extensions...";
1398
1309 cf::sync_job { 1399 cf::sync_job {
1310 my %todo; 1400 my %todo;
1311 1401
1312 for my $path (<$LIBDIR/*.ext>) { 1402 for my $path (<$LIBDIR/*.ext>) {
1313 next unless -r $path; 1403 next unless -r $path;
1331 1421
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1422 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1423 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1424
1335 $ext{source} = 1425 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1426 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1427 . "#line 1 \"$path\"\n{\n"
1338 . $source 1428 . $source
1339 . "\n};\n1"; 1429 . "\n};\n1";
1340 1430
1341 $todo{$base} = \%ext; 1431 $todo{$base} = \%ext;
1342 } 1432 }
1343 1433
1434 my $pass = 0;
1344 my %done; 1435 my %done;
1345 while (%todo) { 1436 while (%todo) {
1346 my $progress; 1437 my $progress;
1347 1438
1439 ++$pass;
1440
1441 ext:
1348 while (my ($k, $v) = each %todo) { 1442 while (my ($k, $v) = each %todo) {
1349 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1350 goto skip 1444 next ext
1351 unless exists $done{$_}; 1445 unless exists $done{$_};
1352 } 1446 }
1353 1447
1354 warn "... loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1355 1449
1356 unless (eval $v->{source}) { 1450 my $active = eval $v->{source};
1451
1452 if (length $@) {
1357 my $msg = $@ ? "$v->{path}: $@\n" 1453 error "$v->{path}: $@\n";
1358 : "$v->{base}: extension inactive.\n";
1359 1454
1360 if (exists $v->{meta}{mandatory}) {
1361 warn $msg;
1362 cf::cleanup "mandatory extension failed to load, exiting."; 1455 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1363 } 1456 if exists $v->{meta}{mandatory};
1364 1457
1365 warn $msg; 1458 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1459 delete $todo{$k};
1460 } else {
1461 $done{$k} = delete $todo{$k};
1462 push @EXTS, $v->{pkg};
1463 $progress = 1;
1464
1465 info "$v->{base}: extension inactive.\n"
1466 unless $active;
1366 } 1467 }
1367
1368 $done{$k} = delete $todo{$k};
1369 push @EXTS, $v->{pkg};
1370 $progress = 1;
1371 } 1468 }
1372 1469
1373 skip: 1470 unless ($progress) {
1374 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1471 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1375 unless $progress; 1472
1473 while (my ($k, $v) = each %todo) {
1474 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1475 if exists $v->{meta}{mandatory};
1476 }
1477 }
1376 } 1478 }
1377 }; 1479 };
1378} 1480}
1379 1481
1380############################################################################# 1482#############################################################################
1381 1483
1382=back 1484=back
1383 1485
1384=head2 CORE EXTENSIONS 1486=head2 CORE EXTENSIONS
1385 1487
1386Functions and methods that extend core crossfire objects. 1488Functions and methods that extend core deliantra objects.
1387 1489
1388=cut 1490=cut
1389 1491
1390package cf::player; 1492package cf::player;
1391 1493
1434 1536
1435sub exists($) { 1537sub exists($) {
1436 my ($login) = @_; 1538 my ($login) = @_;
1437 1539
1438 $cf::PLAYER{$login} 1540 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1541 or !aio_stat path $login
1440} 1542}
1441 1543
1442sub find($) { 1544sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1545 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1546 my $login = $_[0];
1464 $cf::PLAYER{$login} = $pl 1566 $cf::PLAYER{$login} = $pl
1465 } 1567 }
1466 } 1568 }
1467} 1569}
1468 1570
1571cf::player->attach (
1572 on_load => sub {
1573 my ($pl, $path) = @_;
1574
1575 # restore slots saved in save, below
1576 my $slots = delete $pl->{_slots};
1577
1578 $pl->ob->current_weapon ($slots->[0]);
1579 $pl->combat_ob ($slots->[1]);
1580 $pl->ranged_ob ($slots->[2]);
1581 },
1582);
1583
1469sub save($) { 1584sub save($) {
1470 my ($pl) = @_; 1585 my ($pl) = @_;
1471 1586
1472 return if $pl->{deny_save}; 1587 return if $pl->{deny_save};
1473 1588
1478 1593
1479 aio_mkdir playerdir $pl, 0770; 1594 aio_mkdir playerdir $pl, 0770;
1480 $pl->{last_save} = $cf::RUNTIME; 1595 $pl->{last_save} = $cf::RUNTIME;
1481 1596
1482 cf::get_slot 0.01; 1597 cf::get_slot 0.01;
1598
1599 # save slots, to be restored later
1600 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1483 1601
1484 $pl->save_pl ($path); 1602 $pl->save_pl ($path);
1485 cf::cede_to_tick; 1603 cf::cede_to_tick;
1486} 1604}
1487 1605
1519 my ($pl) = @_; 1637 my ($pl) = @_;
1520 1638
1521 my $name = $pl->ob->name; 1639 my $name = $pl->ob->name;
1522 1640
1523 $pl->{deny_save} = 1; 1641 $pl->{deny_save} = 1;
1524 $pl->password ("*"); # this should lock out the player until we nuked the dir 1642 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1525 1643
1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1644 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1527 $pl->deactivate; 1645 $pl->deactivate;
1646 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1528 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1647 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1529 $pl->ns->destroy if $pl->ns; 1648 $pl->ns->destroy if $pl->ns;
1530 1649
1531 my $path = playerdir $pl; 1650 my $path = playerdir $pl;
1532 my $temp = "$path~$cf::RUNTIME~deleting~"; 1651 my $temp = "$path~$cf::RUNTIME~deleting~";
1587 \@logins 1706 \@logins
1588} 1707}
1589 1708
1590=item $player->maps 1709=item $player->maps
1591 1710
1711=item cf::player::maps $login
1712
1592Returns an arrayref of map paths that are private for this 1713Returns an arrayref of map paths that are private for this
1593player. May block. 1714player. May block.
1594 1715
1595=cut 1716=cut
1596 1717
1613 } 1734 }
1614 1735
1615 \@paths 1736 \@paths
1616} 1737}
1617 1738
1618=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1739=item $protocol_xml = $player->expand_cfpod ($cfpod)
1619 1740
1620Expand crossfire pod fragments into protocol xml. 1741Expand 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 1742
1711=item $player->ext_reply ($msgid, @msg) 1743=item $player->ext_reply ($msgid, @msg)
1712 1744
1713Sends an ext reply to the player. 1745Sends an ext reply to the player.
1714 1746
1746 1778
1747=cut 1779=cut
1748 1780
1749sub find_by_path($) { 1781sub find_by_path($) {
1750 my ($path) = @_; 1782 my ($path) = @_;
1783
1784 $path =~ s/^~[^\/]*//; # skip ~login
1751 1785
1752 my ($match, $specificity); 1786 my ($match, $specificity);
1753 1787
1754 for my $region (list) { 1788 for my $region (list) {
1755 if ($region->{match} && $path =~ $region->{match}) { 1789 if ($region->{match} && $path =~ $region->{match}) {
1787 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1821 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1788 1822
1789 # mit "rum" bekleckern, nicht 1823 # mit "rum" bekleckern, nicht
1790 $self->_create_random_map ( 1824 $self->_create_random_map (
1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1825 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1826 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1827 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1794 $rmp->{exit_on_final_map}, 1828 $rmp->{exit_on_final_map},
1795 $rmp->{xsize}, $rmp->{ysize}, 1829 $rmp->{xsize}, $rmp->{ysize},
1796 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1830 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1797 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1831 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1819 1853
1820 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1821} 1855}
1822 1856
1823# also paths starting with '/' 1857# also paths starting with '/'
1824$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1825 1859
1826sub thawer_merge { 1860sub thawer_merge {
1827 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1828 1862
1829 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
1927 1961
1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1962 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1929 "$UNIQUEDIR/$path" 1963 "$UNIQUEDIR/$path"
1930} 1964}
1931 1965
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 { 1966sub decay_objects {
1942 my ($self) = @_; 1967 my ($self) = @_;
1943 1968
1944 return if $self->{deny_reset}; 1969 return if $self->{deny_reset};
1945 1970
2027sub find { 2052sub find {
2028 my ($path, $origin) = @_; 2053 my ($path, $origin) = @_;
2029 2054
2030 $path = normalise $path, $origin && $origin->path; 2055 $path = normalise $path, $origin && $origin->path;
2031 2056
2032 cf::lock_wait "map_data:$path";#d#remove 2057 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2033 cf::lock_wait "map_find:$path"; 2058 my $guard2 = cf::lock_acquire "map_find:$path";
2034 2059
2035 $cf::MAP{$path} || do { 2060 $cf::MAP{$path} || do {
2036 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2037 my $guard2 = cf::lock_acquire "map_find:$path";
2038
2039 my $map = new_from_path cf::map $path 2061 my $map = new_from_path cf::map $path
2040 or return; 2062 or return;
2041 2063
2042 $map->{last_save} = $cf::RUNTIME; 2064 $map->{last_save} = $cf::RUNTIME;
2043 2065
2055 2077
2056 $cf::MAP{$path} = $map 2078 $cf::MAP{$path} = $map
2057 } 2079 }
2058} 2080}
2059 2081
2060sub pre_load { } 2082sub pre_load { }
2061sub post_load { } 2083#sub post_load { } # XS
2062 2084
2063sub load { 2085sub load {
2064 my ($self) = @_; 2086 my ($self) = @_;
2065 2087
2066 local $self->{deny_reset} = 1; # loading can take a long time 2088 local $self->{deny_reset} = 1; # loading can take a long time
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2105 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2106 $f->skip_block;
2085 $self->_load_objects ($f) 2107 $self->_load_objects ($f)
2086 or return; 2108 or return;
2087 2109
2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2110 $self->post_load_original
2089 if delete $self->{load_original}; 2111 if delete $self->{load_original};
2090 2112
2091 if (my $uniq = $self->uniq_path) { 2113 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2114 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2115 unless (aio_stat $uniq) {
2111 unless ($self->{deny_activate}) { 2133 unless ($self->{deny_activate}) {
2112 $self->decay_objects; 2134 $self->decay_objects;
2113 $self->fix_auto_apply; 2135 $self->fix_auto_apply;
2114 $self->update_buttons; 2136 $self->update_buttons;
2115 cf::cede_to_tick; 2137 cf::cede_to_tick;
2116 $self->set_darkness_map;
2117 cf::cede_to_tick;
2118 $self->activate; 2138 $self->activate;
2119 } 2139 }
2120 2140
2121 $self->{last_save} = $cf::RUNTIME; 2141 $self->{last_save} = $cf::RUNTIME;
2122 $self->last_access ($cf::RUNTIME); 2142 $self->last_access ($cf::RUNTIME);
2125 } 2145 }
2126 2146
2127 $self->post_load; 2147 $self->post_load;
2128} 2148}
2129 2149
2150# customize the map for a given player, i.e.
2151# return the _real_ map. used by e.g. per-player
2152# maps to change the path to ~playername/mappath
2130sub customise_for { 2153sub customise_for {
2131 my ($self, $ob) = @_; 2154 my ($self, $ob) = @_;
2132 2155
2133 return find "~" . $ob->name . "/" . $self->{path} 2156 return find "~" . $ob->name . "/" . $self->{path}
2134 if $self->per_player; 2157 if $self->per_player;
2150 or next; 2173 or next;
2151 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
2152 or next; 2175 or next;
2153 $neigh->load; 2176 $neigh->load;
2154 2177
2178 # now find the diagonal neighbours
2155 push @neigh, 2179 push @neigh,
2156 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2157 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2158 } 2182 }
2159 2183
2211 $MAP_PREFETCHER->prio (6); 2235 $MAP_PREFETCHER->prio (6);
2212 2236
2213 () 2237 ()
2214} 2238}
2215 2239
2240# common code, used by both ->save and ->swapout
2216sub save { 2241sub _save {
2217 my ($self) = @_; 2242 my ($self) = @_;
2218
2219 my $lock = cf::lock_acquire "map_data:$self->{path}";
2220 2243
2221 $self->{last_save} = $cf::RUNTIME; 2244 $self->{last_save} = $cf::RUNTIME;
2222 2245
2223 return unless $self->dirty; 2246 return unless $self->dirty;
2224 2247
2244 } else { 2267 } else {
2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2268 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2246 } 2269 }
2247} 2270}
2248 2271
2272sub save {
2273 my ($self) = @_;
2274
2275 my $lock = cf::lock_acquire "map_data:$self->{path}";
2276
2277 $self->_save;
2278}
2279
2249sub swap_out { 2280sub swap_out {
2250 my ($self) = @_; 2281 my ($self) = @_;
2251 2282
2252 # save first because save cedes
2253 $self->save;
2254
2255 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2283 my $lock = cf::lock_acquire "map_data:$self->{path}";
2256 2284
2257 return if $self->players;
2258 return if $self->in_memory != cf::MAP_ACTIVE; 2285 return if $self->in_memory != cf::MAP_ACTIVE;
2259 return if $self->{deny_save}; 2286 return if $self->{deny_save};
2287 return if $self->players;
2260 2288
2289 # first deactivate the map and "unlink" it from the core
2290 $self->deactivate;
2291 $_->clear_links_to ($self) for values %cf::MAP;
2261 $self->in_memory (cf::MAP_SWAPPED); 2292 $self->in_memory (cf::MAP_SWAPPED);
2293
2294 # then atomically save
2295 $self->_save;
2296
2297 # then free the map
2298 $self->clear;
2299}
2300
2301sub reset_at {
2302 my ($self) = @_;
2303
2304 # TODO: safety, remove and allow resettable per-player maps
2305 return 1e99 if $self->{deny_reset};
2306
2307 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2308 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2309
2310 $time + $to
2311}
2312
2313sub should_reset {
2314 my ($self) = @_;
2315
2316 $self->reset_at <= $cf::RUNTIME
2317}
2318
2319sub reset {
2320 my ($self) = @_;
2321
2322 my $lock = cf::lock_acquire "map_data:$self->{path}";
2323
2324 return if $self->players;
2325
2326 cf::trace "resetting map ", $self->path, "\n";
2327
2328 $self->in_memory (cf::MAP_SWAPPED);
2329
2330 # need to save uniques path
2331 unless ($self->{deny_save}) {
2332 my $uniq = $self->uniq_path; utf8::encode $uniq;
2333
2334 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2335 if $uniq;
2336 }
2337
2338 delete $cf::MAP{$self->path};
2262 2339
2263 $self->deactivate; 2340 $self->deactivate;
2264 $_->clear_links_to ($self) for values %cf::MAP; 2341 $_->clear_links_to ($self) for values %cf::MAP;
2265 $self->clear; 2342 $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 2343
2311 $self->unlink_save; 2344 $self->unlink_save;
2312 $self->destroy; 2345 $self->destroy;
2313} 2346}
2314 2347
2322 2355
2323 delete $cf::MAP{$self->path}; 2356 delete $cf::MAP{$self->path};
2324 2357
2325 $self->unlink_save; 2358 $self->unlink_save;
2326 2359
2327 bless $self, "cf::map"; 2360 bless $self, "cf::map::wrap";
2328 delete $self->{deny_reset}; 2361 delete $self->{deny_reset};
2329 $self->{deny_save} = 1; 2362 $self->{deny_save} = 1;
2330 $self->reset_timeout (1); 2363 $self->reset_timeout (1);
2331 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2364 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2332 2365
2389 : normalise $_ 2422 : normalise $_
2390 } @{ aio_readdir $UNIQUEDIR or [] } 2423 } @{ aio_readdir $UNIQUEDIR or [] }
2391 ] 2424 ]
2392} 2425}
2393 2426
2427=item cf::map::static_maps
2428
2429Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2430file in the shared directory excluding F</styles> and F</editor>). May
2431block.
2432
2433=cut
2434
2435sub static_maps() {
2436 my @dirs = "";
2437 my @maps;
2438
2439 while (@dirs) {
2440 my $dir = shift @dirs;
2441
2442 next if $dir eq "/styles" || $dir eq "/editor";
2443
2444 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2445 or return;
2446
2447 for (@$files) {
2448 s/\.map$// or next;
2449 utf8::decode $_;
2450 push @maps, "$dir/$_";
2451 }
2452
2453 push @dirs, map "$dir/$_", @$dirs;
2454 }
2455
2456 \@maps
2457}
2458
2394=back 2459=back
2395 2460
2396=head3 cf::object 2461=head3 cf::object
2397 2462
2398=cut 2463=cut
2463 2528
2464our $SAY_CHANNEL = { 2529our $SAY_CHANNEL = {
2465 id => "say", 2530 id => "say",
2466 title => "Map", 2531 title => "Map",
2467 reply => "say ", 2532 reply => "say ",
2468 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2533 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2469}; 2534};
2470 2535
2471our $CHAT_CHANNEL = { 2536our $CHAT_CHANNEL = {
2472 id => "chat", 2537 id => "chat",
2473 title => "Chat", 2538 title => "Chat",
2528 2593
2529=item $player_object->enter_link 2594=item $player_object->enter_link
2530 2595
2531Freezes the player and moves him/her to a special map (C<{link}>). 2596Freezes the player and moves him/her to a special map (C<{link}>).
2532 2597
2533The player should be reasonably safe there for short amounts of time. You 2598The player should be reasonably safe there for short amounts of time (e.g.
2534I<MUST> call C<leave_link> as soon as possible, though. 2599for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2600though, as the player cannot control the character while it is on the link
2601map.
2535 2602
2536Will never block. 2603Will never block.
2537 2604
2538=item $player_object->leave_link ($map, $x, $y) 2605=item $player_object->leave_link ($map, $x, $y)
2539 2606
2559sub cf::object::player::enter_link { 2626sub cf::object::player::enter_link {
2560 my ($self) = @_; 2627 my ($self) = @_;
2561 2628
2562 $self->deactivate_recursive; 2629 $self->deactivate_recursive;
2563 2630
2631 ++$self->{_link_recursion};
2632
2564 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2633 return if UNIVERSAL::isa $self->map, "ext::map_link";
2565 2634
2566 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2635 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2567 if $self->map && $self->map->{path} ne "{link}"; 2636 if $self->map && $self->map->{path} ne "{link}";
2568 2637
2569 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2638 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2570} 2639}
2571 2640
2572sub cf::object::player::leave_link { 2641sub cf::object::player::leave_link {
2573 my ($self, $map, $x, $y) = @_; 2642 my ($self, $map, $x, $y) = @_;
2574 2643
2591 ($x, $y) = (-1, -1) 2660 ($x, $y) = (-1, -1)
2592 unless (defined $x) && (defined $y); 2661 unless (defined $x) && (defined $y);
2593 2662
2594 # use -1 or undef as default coordinates, not 0, 0 2663 # use -1 or undef as default coordinates, not 0, 0
2595 ($x, $y) = ($map->enter_x, $map->enter_y) 2664 ($x, $y) = ($map->enter_x, $map->enter_y)
2596 if $x <=0 && $y <= 0; 2665 if $x <= 0 && $y <= 0;
2597 2666
2598 $map->load; 2667 $map->load;
2599 $map->load_neighbours; 2668 $map->load_neighbours;
2600 2669
2601 return unless $self->contr->active; 2670 return unless $self->contr->active;
2602 $self->activate_recursive;
2603 2671
2604 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2672 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2605 $self->enter_map ($map, $x, $y); 2673 if ($self->enter_map ($map, $x, $y)) {
2606} 2674 # entering was successful
2675 delete $self->{_link_recursion};
2676 # only activate afterwards, to support waiting in hooks
2677 $self->activate_recursive;
2678 }
2607 2679
2680}
2681
2608=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2682=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2609 2683
2610Moves the player to the given map-path and coordinates by first freezing 2684Moves the player to the given map-path and coordinates by first freezing
2611her, loading and preparing them map, calling the provided $check callback 2685her, loading and preparing them map, calling the provided $check callback
2612that has to return the map if sucecssful, and then unfreezes the player on 2686that has to return the map if sucecssful, and then unfreezes the player on
2613the new (success) or old (failed) map position. In either case, $done will 2687the new (success) or old (failed) map position. In either case, $done will
2614be called at the end of this process. 2688be called at the end of this process.
2615 2689
2690Note that $check will be called with a potentially non-loaded map, so if
2691it needs a loaded map it has to call C<< ->load >>.
2692
2616=cut 2693=cut
2617 2694
2618our $GOTOGEN; 2695our $GOTOGEN;
2619 2696
2620sub cf::object::player::goto { 2697sub cf::object::player::goto {
2621 my ($self, $path, $x, $y, $check, $done) = @_; 2698 my ($self, $path, $x, $y, $check, $done) = @_;
2699
2700 if ($self->{_link_recursion} >= $MAX_LINKS) {
2701 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2702 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2703 ($path, $x, $y) = @$EMERGENCY_POSITION;
2704 }
2622 2705
2623 # do generation counting so two concurrent goto's will be executed in-order 2706 # do generation counting so two concurrent goto's will be executed in-order
2624 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2707 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2625 2708
2626 $self->enter_link; 2709 $self->enter_link;
2650 my $map = eval { 2733 my $map = eval {
2651 my $map = defined $path ? cf::map::find $path : undef; 2734 my $map = defined $path ? cf::map::find $path : undef;
2652 2735
2653 if ($map) { 2736 if ($map) {
2654 $map = $map->customise_for ($self); 2737 $map = $map->customise_for ($self);
2655 $map = $check->($map) if $check && $map; 2738 $map = $check->($map, $x, $y, $self) if $check && $map;
2656 } else { 2739 } else {
2657 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2740 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2658 } 2741 }
2659 2742
2660 $map 2743 $map
2668 if ($gen == $self->{_goto_generation}) { 2751 if ($gen == $self->{_goto_generation}) {
2669 delete $self->{_goto_generation}; 2752 delete $self->{_goto_generation};
2670 $self->leave_link ($map, $x, $y); 2753 $self->leave_link ($map, $x, $y);
2671 } 2754 }
2672 2755
2673 $done->() if $done; 2756 $done->($self) if $done;
2674 })->prio (1); 2757 })->prio (1);
2675} 2758}
2676 2759
2677=item $player_object->enter_exit ($exit_object) 2760=item $player_object->enter_exit ($exit_object)
2678 2761
2766 $self->contr->savebed ($map, $x, $y) 2849 $self->contr->savebed ($map, $x, $y)
2767 if $exit->flag (cf::FLAG_DAMNED); 2850 if $exit->flag (cf::FLAG_DAMNED);
2768 2851
2769 1 2852 1
2770 }) { 2853 }) {
2771 $self->message ("Something went wrong deep within the crossfire server. " 2854 $self->message ("Something went wrong deep within the deliantra server. "
2772 . "I'll try to bring you back to the map you were before. " 2855 . "I'll try to bring you back to the map you were before. "
2773 . "Please report this to the dungeon master!", 2856 . "Please report this to the dungeon master!",
2774 cf::NDI_UNIQUE | cf::NDI_RED); 2857 cf::NDI_UNIQUE | cf::NDI_RED);
2775 2858
2776 warn "ERROR in enter_exit: $@"; 2859 error "ERROR in enter_exit: $@";
2777 $self->leave_link; 2860 $self->leave_link;
2778 } 2861 }
2779 })->prio (1); 2862 })->prio (1);
2780} 2863}
2781 2864
2793sub cf::client::send_drawinfo { 2876sub cf::client::send_drawinfo {
2794 my ($self, $text, $flags) = @_; 2877 my ($self, $text, $flags) = @_;
2795 2878
2796 utf8::encode $text; 2879 utf8::encode $text;
2797 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2880 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2881}
2882
2883=item $client->send_big_packet ($pkt)
2884
2885Like C<send_packet>, but tries to compress large packets, and fragments
2886them as required.
2887
2888=cut
2889
2890our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2891
2892sub cf::client::send_big_packet {
2893 my ($self, $pkt) = @_;
2894
2895 # try lzf for large packets
2896 $pkt = "lzf " . Compress::LZF::compress $pkt
2897 if 1024 <= length $pkt and $self->{can_lzf};
2898
2899 # split very large packets
2900 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2901 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2902 $pkt = "frag";
2903 }
2904
2905 $self->send_packet ($pkt);
2798} 2906}
2799 2907
2800=item $client->send_msg ($channel, $msg, $color, [extra...]) 2908=item $client->send_msg ($channel, $msg, $color, [extra...])
2801 2909
2802Send a drawinfo or msg packet to the client, formatting the msg for the 2910Send a drawinfo or msg packet to the client, formatting the msg for the
2806 2914
2807=cut 2915=cut
2808 2916
2809# non-persistent channels (usually the info channel) 2917# non-persistent channels (usually the info channel)
2810our %CHANNEL = ( 2918our %CHANNEL = (
2919 "c/motd" => {
2920 id => "infobox",
2921 title => "MOTD",
2922 reply => undef,
2923 tooltip => "The message of the day",
2924 },
2811 "c/identify" => { 2925 "c/identify" => {
2812 id => "infobox", 2926 id => "infobox",
2813 title => "Identify", 2927 title => "Identify",
2814 reply => undef, 2928 reply => undef,
2815 tooltip => "Items recently identified", 2929 tooltip => "Items recently identified",
2817 "c/examine" => { 2931 "c/examine" => {
2818 id => "infobox", 2932 id => "infobox",
2819 title => "Examine", 2933 title => "Examine",
2820 reply => undef, 2934 reply => undef,
2821 tooltip => "Signs and other items you examined", 2935 tooltip => "Signs and other items you examined",
2936 },
2937 "c/shopinfo" => {
2938 id => "infobox",
2939 title => "Shop Info",
2940 reply => undef,
2941 tooltip => "What your bargaining skill tells you about the shop",
2822 }, 2942 },
2823 "c/book" => { 2943 "c/book" => {
2824 id => "infobox", 2944 id => "infobox",
2825 title => "Book", 2945 title => "Book",
2826 reply => undef, 2946 reply => undef,
2842 id => "infobox", 2962 id => "infobox",
2843 title => "Body Parts", 2963 title => "Body Parts",
2844 reply => undef, 2964 reply => undef,
2845 tooltip => "Shows which body parts you posess and are available", 2965 tooltip => "Shows which body parts you posess and are available",
2846 }, 2966 },
2967 "c/statistics" => {
2968 id => "infobox",
2969 title => "Statistics",
2970 reply => undef,
2971 tooltip => "Shows your primary statistics",
2972 },
2973 "c/skills" => {
2974 id => "infobox",
2975 title => "Skills",
2976 reply => undef,
2977 tooltip => "Shows your experience per skill and item power",
2978 },
2979 "c/shopitems" => {
2980 id => "infobox",
2981 title => "Shop Items",
2982 reply => undef,
2983 tooltip => "Shows the items currently for sale in this shop",
2984 },
2985 "c/resistances" => {
2986 id => "infobox",
2987 title => "Resistances",
2988 reply => undef,
2989 tooltip => "Shows your resistances",
2990 },
2991 "c/pets" => {
2992 id => "infobox",
2993 title => "Pets",
2994 reply => undef,
2995 tooltip => "Shows information abotu your pets/a specific pet",
2996 },
2997 "c/perceiveself" => {
2998 id => "infobox",
2999 title => "Perceive Self",
3000 reply => undef,
3001 tooltip => "You gained detailed knowledge about yourself",
3002 },
2847 "c/uptime" => { 3003 "c/uptime" => {
2848 id => "infobox", 3004 id => "infobox",
2849 title => "Uptime", 3005 title => "Uptime",
2850 reply => undef, 3006 reply => undef,
2851 tooltip => "How long the server has been running since last restart", 3007 tooltip => "How long the server has been running since last restart",
2860 id => "party", 3016 id => "party",
2861 title => "Party", 3017 title => "Party",
2862 reply => "gsay ", 3018 reply => "gsay ",
2863 tooltip => "Messages and chat related to your party", 3019 tooltip => "Messages and chat related to your party",
2864 }, 3020 },
3021 "c/death" => {
3022 id => "death",
3023 title => "Death",
3024 reply => undef,
3025 tooltip => "Reason for and more info about your most recent death",
3026 },
3027 "c/say" => $SAY_CHANNEL,
3028 "c/chat" => $CHAT_CHANNEL,
2865); 3029);
2866 3030
2867sub cf::client::send_msg { 3031sub cf::client::send_msg {
2868 my ($self, $channel, $msg, $color, @extra) = @_; 3032 my ($self, $channel, $msg, $color, @extra) = @_;
2869 3033
2870 $msg = $self->pl->expand_cfpod ($msg); 3034 $msg = $self->pl->expand_cfpod ($msg)
3035 unless $color & cf::NDI_VERBATIM;
2871 3036
2872 $color &= cf::NDI_CLIENT_MASK; # just in case... 3037 $color &= cf::NDI_CLIENT_MASK; # just in case...
2873 3038
2874 # check predefined channels, for the benefit of C 3039 # check predefined channels, for the benefit of C
2875 if ($CHANNEL{$channel}) { 3040 if ($CHANNEL{$channel}) {
2876 $channel = $CHANNEL{$channel}; 3041 $channel = $CHANNEL{$channel};
2877 3042
2878 $self->ext_msg (channel_info => $channel) 3043 $self->ext_msg (channel_info => $channel);
2879 if $self->can_msg;
2880
2881 $channel = $channel->{id}; 3044 $channel = $channel->{id};
2882 3045
2883 } elsif (ref $channel) { 3046 } elsif (ref $channel) {
2884 # send meta info to client, if not yet sent 3047 # send meta info to client, if not yet sent
2885 unless (exists $self->{channel}{$channel->{id}}) { 3048 unless (exists $self->{channel}{$channel->{id}}) {
2886 $self->{channel}{$channel->{id}} = $channel; 3049 $self->{channel}{$channel->{id}} = $channel;
2887 $self->ext_msg (channel_info => $channel) 3050 $self->ext_msg (channel_info => $channel);
2888 if $self->can_msg;
2889 } 3051 }
2890 3052
2891 $channel = $channel->{id}; 3053 $channel = $channel->{id};
2892 } 3054 }
2893 3055
2894 return unless @extra || length $msg; 3056 return unless @extra || length $msg;
2895 3057
2896 if ($self->can_msg) {
2897 # default colour, mask it out 3058 # default colour, mask it out
2898 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3059 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2899 if $color & cf::NDI_DEF; 3060 if $color & cf::NDI_DEF;
2900 3061
2901 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3062 my $pkt = "msg "
3063 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3064 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 } else { 3065 );
2904 if ($color >= 0) {
2905 # replace some tags by gcfclient-compatible ones
2906 for ($msg) {
2907 1 while
2908 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2909 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2910 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2911 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2912 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2913 }
2914 3066
2915 $color &= cf::NDI_COLOR_MASK; 3067 $self->send_big_packet ($pkt);
2916
2917 utf8::encode $msg;
2918
2919 if (0 && $msg =~ /\[/) {
2920 # COMMAND/INFO
2921 $self->send_packet ("drawextinfo $color 10 8 $msg")
2922 } else {
2923 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2924 $self->send_packet ("drawinfo $color $msg")
2925 }
2926 }
2927 }
2928} 3068}
2929 3069
2930=item $client->ext_msg ($type, @msg) 3070=item $client->ext_msg ($type, @msg)
2931 3071
2932Sends an ext event to the client. 3072Sends an ext event to the client.
2935 3075
2936sub cf::client::ext_msg($$@) { 3076sub cf::client::ext_msg($$@) {
2937 my ($self, $type, @msg) = @_; 3077 my ($self, $type, @msg) = @_;
2938 3078
2939 if ($self->extcmd == 2) { 3079 if ($self->extcmd == 2) {
2940 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3080 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2941 } elsif ($self->extcmd == 1) { # TODO: remove 3081 } elsif ($self->extcmd == 1) { # TODO: remove
2942 push @msg, msgtype => "event_$type"; 3082 push @msg, msgtype => "event_$type";
2943 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3083 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2944 } 3084 }
2945} 3085}
2946 3086
2947=item $client->ext_reply ($msgid, @msg) 3087=item $client->ext_reply ($msgid, @msg)
2948 3088
2952 3092
2953sub cf::client::ext_reply($$@) { 3093sub cf::client::ext_reply($$@) {
2954 my ($self, $id, @msg) = @_; 3094 my ($self, $id, @msg) = @_;
2955 3095
2956 if ($self->extcmd == 2) { 3096 if ($self->extcmd == 2) {
2957 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3097 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2958 } elsif ($self->extcmd == 1) { 3098 } elsif ($self->extcmd == 1) {
2959 #TODO: version 1, remove 3099 #TODO: version 1, remove
2960 unshift @msg, msgtype => "reply", msgid => $id; 3100 unshift @msg, msgtype => "reply", msgid => $id;
2961 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2962 } 3102 }
2963} 3103}
2964 3104
2965=item $success = $client->query ($flags, "text", \&cb) 3105=item $success = $client->query ($flags, "text", \&cb)
2966 3106
3037 3177
3038 $ns->ext_reply ($reply, @reply) 3178 $ns->ext_reply ($reply, @reply)
3039 if $reply; 3179 if $reply;
3040 3180
3041 } else { 3181 } else {
3042 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3182 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3043 } 3183 }
3044 3184
3045 cf::override; 3185 cf::override;
3046 }, 3186 },
3047); 3187);
3067 3207
3068 $coro 3208 $coro
3069} 3209}
3070 3210
3071cf::client->attach ( 3211cf::client->attach (
3072 on_destroy => sub { 3212 on_client_destroy => sub {
3073 my ($ns) = @_; 3213 my ($ns) = @_;
3074 3214
3075 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3215 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3076 }, 3216 },
3077); 3217);
3093our $safe_hole = new Safe::Hole; 3233our $safe_hole = new Safe::Hole;
3094 3234
3095$SIG{FPE} = 'IGNORE'; 3235$SIG{FPE} = 'IGNORE';
3096 3236
3097$safe->permit_only (Opcode::opset qw( 3237$safe->permit_only (Opcode::opset qw(
3098 :base_core :base_mem :base_orig :base_math 3238 :base_core :base_mem :base_orig :base_math :base_loop
3099 grepstart grepwhile mapstart mapwhile 3239 grepstart grepwhile mapstart mapwhile
3100 sort time 3240 sort time
3101)); 3241));
3102 3242
3103# here we export the classes and methods available to script code 3243# here we export the classes and methods available to script code
3107The following functions and methods are available within a safe environment: 3247The following functions and methods are available within a safe environment:
3108 3248
3109 cf::object 3249 cf::object
3110 contr pay_amount pay_player map x y force_find force_add destroy 3250 contr pay_amount pay_player map x y force_find force_add destroy
3111 insert remove name archname title slaying race decrease split 3251 insert remove name archname title slaying race decrease split
3252 value
3112 3253
3113 cf::object::player 3254 cf::object::player
3114 player 3255 player
3115 3256
3116 cf::player 3257 cf::player
3121 3262
3122=cut 3263=cut
3123 3264
3124for ( 3265for (
3125 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3266 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3126 insert remove inv name archname title slaying race 3267 insert remove inv nrof name archname title slaying race
3127 decrease split destroy)], 3268 decrease split destroy change_exp value msg lore send_msg)],
3128 ["cf::object::player" => qw(player)], 3269 ["cf::object::player" => qw(player)],
3129 ["cf::player" => qw(peaceful)], 3270 ["cf::player" => qw(peaceful send_msg)],
3130 ["cf::map" => qw(trigger)], 3271 ["cf::map" => qw(trigger)],
3131) { 3272) {
3132 no strict 'refs'; 3273 no strict 'refs';
3133 my ($pkg, @funs) = @$_; 3274 my ($pkg, @funs) = @$_;
3134 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3275 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3152 3293
3153 my $qcode = $code; 3294 my $qcode = $code;
3154 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3295 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3155 $qcode =~ s/\n/\\n/g; 3296 $qcode =~ s/\n/\\n/g;
3156 3297
3298 %vars = (_dummy => 0) unless %vars;
3299
3300 my @res;
3157 local $_; 3301 local $_;
3158 local @safe::cf::_safe_eval_args = values %vars;
3159 3302
3160 my $eval = 3303 my $eval =
3161 "do {\n" 3304 "do {\n"
3162 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3305 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3163 . "#line 0 \"{$qcode}\"\n" 3306 . "#line 0 \"{$qcode}\"\n"
3164 . $code 3307 . $code
3165 . "\n}" 3308 . "\n}"
3166 ; 3309 ;
3167 3310
3311 if ($CFG{safe_eval}) {
3168 sub_generation_inc; 3312 sub_generation_inc;
3313 local @safe::cf::_safe_eval_args = values %vars;
3169 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3314 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3170 sub_generation_inc; 3315 sub_generation_inc;
3316 } else {
3317 local @cf::_safe_eval_args = values %vars;
3318 @res = wantarray ? eval eval : scalar eval $eval;
3319 }
3171 3320
3172 if ($@) { 3321 if ($@) {
3173 warn "$@"; 3322 warn "$@",
3174 warn "while executing safe code '$code'\n"; 3323 "while executing safe code '$code'\n",
3175 warn "with arguments " . (join " ", %vars) . "\n"; 3324 "with arguments " . (join " ", %vars) . "\n";
3176 } 3325 }
3177 3326
3178 wantarray ? @res : $res[0] 3327 wantarray ? @res : $res[0]
3179} 3328}
3180 3329
3194=cut 3343=cut
3195 3344
3196sub register_script_function { 3345sub register_script_function {
3197 my ($fun, $cb) = @_; 3346 my ($fun, $cb) = @_;
3198 3347
3199 no strict 'refs'; 3348 $fun = "safe::$fun" if $CFG{safe_eval};
3200 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3349 *$fun = $safe_hole->wrap ($cb);
3201} 3350}
3202 3351
3203=back 3352=back
3204 3353
3205=cut 3354=cut
3214 # for this (global event?) 3363 # for this (global event?)
3215 %ext::player_env::MUSIC_FACE_CACHE = (); 3364 %ext::player_env::MUSIC_FACE_CACHE = ();
3216 3365
3217 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3366 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3218 3367
3219 warn "loading facedata from $path\n"; 3368 trace "loading facedata from $path\n";
3220 3369
3221 my $facedata; 3370 my $facedata;
3222 0 < aio_load $path, $facedata 3371 0 < aio_load $path, $facedata
3223 or die "$path: $!"; 3372 or die "$path: $!";
3224 3373
3226 3375
3227 $facedata->{version} == 2 3376 $facedata->{version} == 2
3228 or cf::cleanup "$path: version mismatch, cannot proceed."; 3377 or cf::cleanup "$path: version mismatch, cannot proceed.";
3229 3378
3230 # patch in the exptable 3379 # patch in the exptable
3380 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3231 $facedata->{resource}{"res/exp_table"} = { 3381 $facedata->{resource}{"res/exp_table"} = {
3232 type => FT_RSRC, 3382 type => FT_RSRC,
3233 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3383 data => $exp_table,
3384 hash => (Digest::MD5::md5 $exp_table),
3234 }; 3385 };
3235 cf::cede_to_tick; 3386 cf::cede_to_tick;
3236 3387
3237 { 3388 {
3238 my $faces = $facedata->{faceinfo}; 3389 my $faces = $facedata->{faceinfo};
3240 while (my ($face, $info) = each %$faces) { 3391 while (my ($face, $info) = each %$faces) {
3241 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3392 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3242 3393
3243 cf::face::set_visibility $idx, $info->{visibility}; 3394 cf::face::set_visibility $idx, $info->{visibility};
3244 cf::face::set_magicmap $idx, $info->{magicmap}; 3395 cf::face::set_magicmap $idx, $info->{magicmap};
3245 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3396 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3246 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3397 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3247 3398
3248 cf::cede_to_tick; 3399 cf::cede_to_tick;
3249 } 3400 }
3250 3401
3251 while (my ($face, $info) = each %$faces) { 3402 while (my ($face, $info) = each %$faces) {
3256 3407
3257 if (my $smooth = cf::face::find $info->{smooth}) { 3408 if (my $smooth = cf::face::find $info->{smooth}) {
3258 cf::face::set_smooth $idx, $smooth; 3409 cf::face::set_smooth $idx, $smooth;
3259 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3410 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3260 } else { 3411 } else {
3261 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3412 error "smooth face '$info->{smooth}' not found for face '$face'";
3262 } 3413 }
3263 3414
3264 cf::cede_to_tick; 3415 cf::cede_to_tick;
3265 } 3416 }
3266 } 3417 }
3275 3426
3276 cf::anim::invalidate_all; # d'oh 3427 cf::anim::invalidate_all; # d'oh
3277 } 3428 }
3278 3429
3279 { 3430 {
3280 # TODO: for gcfclient pleasure, we should give resources
3281 # that gcfclient doesn't grok a >10000 face index.
3282 my $res = $facedata->{resource}; 3431 my $res = $facedata->{resource};
3283 3432
3284 while (my ($name, $info) = each %$res) { 3433 while (my ($name, $info) = each %$res) {
3285 if (defined $info->{type}) { 3434 if (defined $info->{type}) {
3286 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3435 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3287 my $data;
3288 3436
3289 if ($info->{type} & 1) { 3437 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3290 # prepend meta info
3291
3292 my $meta = $enc->encode ({
3293 name => $name,
3294 %{ $info->{meta} || {} },
3295 });
3296
3297 $data = pack "(w/a*)*", $meta, $info->{data};
3298 } else {
3299 $data = $info->{data};
3300 }
3301
3302 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3303 cf::face::set_type $idx, $info->{type}; 3438 cf::face::set_type $idx, $info->{type};
3304 } else { 3439 } else {
3305 $RESOURCE{$name} = $info; 3440 $RESOURCE{$name} = $info; # unused
3306 } 3441 }
3307 3442
3308 cf::cede_to_tick; 3443 cf::cede_to_tick;
3309 } 3444 }
3310 } 3445 }
3311 3446
3312 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3447 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3313 3448
3314 1 3449 1
3315} 3450}
3316
3317cf::global->attach (on_resource_update => sub {
3318 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3319 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3320
3321 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3322 my $sound = $soundconf->{compat}[$_]
3323 or next;
3324
3325 my $face = cf::face::find "sound/$sound->[1]";
3326 cf::sound::set $sound->[0] => $face;
3327 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3328 }
3329
3330 while (my ($k, $v) = each %{$soundconf->{event}}) {
3331 my $face = cf::face::find "sound/$v";
3332 cf::sound::set $k => $face;
3333 }
3334 }
3335});
3336 3451
3337register_exticmd fx_want => sub { 3452register_exticmd fx_want => sub {
3338 my ($ns, $want) = @_; 3453 my ($ns, $want) = @_;
3339 3454
3340 while (my ($k, $v) = each %$want) { 3455 while (my ($k, $v) = each %$want) {
3379sub reload_treasures { 3494sub reload_treasures {
3380 load_resource_file "$DATADIR/treasures" 3495 load_resource_file "$DATADIR/treasures"
3381 or die "unable to load treasurelists\n"; 3496 or die "unable to load treasurelists\n";
3382} 3497}
3383 3498
3499sub reload_sound {
3500 trace "loading sound config from $DATADIR/sound\n";
3501
3502 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3503 or die "$DATADIR/sound $!";
3504
3505 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3506
3507 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3508 my $sound = $soundconf->{compat}[$_]
3509 or next;
3510
3511 my $face = cf::face::find "sound/$sound->[1]";
3512 cf::sound::set $sound->[0] => $face;
3513 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3514 }
3515
3516 while (my ($k, $v) = each %{$soundconf->{event}}) {
3517 my $face = cf::face::find "sound/$v";
3518 cf::sound::set $k => $face;
3519 }
3520}
3521
3384sub reload_resources { 3522sub reload_resources {
3385 warn "reloading resource files...\n"; 3523 trace "reloading resource files...\n";
3386 3524
3387 reload_facedata; 3525 reload_facedata;
3526 reload_sound;
3388 reload_archetypes; 3527 reload_archetypes;
3389 reload_regions; 3528 reload_regions;
3390 reload_treasures; 3529 reload_treasures;
3391 3530
3392 warn "finished reloading resource files\n"; 3531 trace "finished reloading resource files\n";
3393}
3394
3395sub init {
3396 my $guard = freeze_mainloop;
3397
3398 reload_resources;
3399} 3532}
3400 3533
3401sub reload_config { 3534sub reload_config {
3535 trace "reloading config file...\n";
3536
3402 open my $fh, "<:utf8", "$CONFDIR/config" 3537 open my $fh, "<:utf8", "$CONFDIR/config"
3403 or return; 3538 or return;
3404 3539
3405 local $/; 3540 local $/;
3406 *CFG = YAML::Load <$fh>; 3541 *CFG = YAML::XS::Load scalar <$fh>;
3407 3542
3408 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3543 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3409 3544
3410 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3545 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3411 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3546 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3412 3547
3413 if (exists $CFG{mlockall}) { 3548 if (exists $CFG{mlockall}) {
3415 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3550 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3416 and die "WARNING: m(un)lockall failed: $!\n"; 3551 and die "WARNING: m(un)lockall failed: $!\n";
3417 }; 3552 };
3418 warn $@ if $@; 3553 warn $@ if $@;
3419 } 3554 }
3555
3556 trace "finished reloading resource files\n";
3557}
3558
3559sub pidfile() {
3560 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3561 or die "$PIDFILE: $!";
3562 flock $fh, &Fcntl::LOCK_EX
3563 or die "$PIDFILE: flock: $!";
3564 $fh
3565}
3566
3567# make sure only one server instance is running at any one time
3568sub atomic {
3569 my $fh = pidfile;
3570
3571 my $pid = <$fh>;
3572 kill 9, $pid if $pid > 0;
3573
3574 seek $fh, 0, 0;
3575 print $fh $$;
3576}
3577
3578sub main_loop {
3579 trace "EV::loop starting\n";
3580 if (1) {
3581 EV::loop;
3582 }
3583 trace "EV::loop returned\n";
3584 goto &main_loop unless $REALLY_UNLOOP;
3420} 3585}
3421 3586
3422sub main { 3587sub main {
3588 cf::init_globals; # initialise logging
3589
3590 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3591 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3592 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3593 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3594
3595 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3596
3423 # we must not ever block the main coroutine 3597 # we must not ever block the main coroutine
3424 local $Coro::idle = sub { 3598 local $Coro::idle = sub {
3425 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3599 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3426 (async { 3600 (async {
3427 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3601 $Coro::current->{desc} = "IDLE BUG HANDLER";
3428 EV::loop EV::LOOP_ONESHOT; 3602 EV::loop EV::LOOP_ONESHOT;
3429 })->prio (Coro::PRIO_MAX); 3603 })->prio (Coro::PRIO_MAX);
3430 }; 3604 };
3431 3605
3432 { 3606 evthread_start IO::AIO::poll_fileno;
3433 my $guard = freeze_mainloop; 3607
3608 cf::sync_job {
3609 cf::init_experience;
3610 cf::init_anim;
3611 cf::init_attackmess;
3612 cf::init_dynamic;
3613
3614 cf::load_settings;
3615 cf::load_materials;
3616
3617 reload_resources;
3434 reload_config; 3618 reload_config;
3435 db_init; 3619 db_init;
3620
3621 cf::init_uuid;
3622 cf::init_signals;
3623 cf::init_skills;
3624
3625 cf::init_beforeplay;
3626
3627 atomic;
3628
3436 load_extensions; 3629 load_extensions;
3437 3630
3438 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3631 utime time, time, $RUNTIMEFILE;
3439 evthread_start IO::AIO::poll_fileno; 3632
3633 # no (long-running) fork's whatsoever before this point(!)
3634 use POSIX ();
3635 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3636
3637 (pop @POST_INIT)->(0) while @POST_INIT;
3440 } 3638 };
3441 3639
3442 EV::loop; 3640 cf::object::thawer::errors_are_fatal 0;
3641 info "parse errors in files are no longer fatal from this point on.\n";
3642
3643 main_loop;
3443} 3644}
3444 3645
3445############################################################################# 3646#############################################################################
3446# initialisation and cleanup 3647# initialisation and cleanup
3447 3648
3448# install some emergency cleanup handlers 3649# install some emergency cleanup handlers
3449BEGIN { 3650BEGIN {
3450 our %SIGWATCHER = (); 3651 our %SIGWATCHER = ();
3451 for my $signal (qw(INT HUP TERM)) { 3652 for my $signal (qw(INT HUP TERM)) {
3452 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3653 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3453 cf::cleanup "SIG$signal"; 3654 cf::cleanup "SIG$signal";
3454 }; 3655 };
3455 } 3656 }
3456} 3657}
3457 3658
3458sub write_runtime_sync { 3659sub write_runtime_sync {
3459 my $runtime = "$LOCALDIR/runtime"; 3660 my $t0 = AE::time;
3460 3661
3461 # first touch the runtime file to show we are still running: 3662 # first touch the runtime file to show we are still running:
3462 # the fsync below can take a very very long time. 3663 # the fsync below can take a very very long time.
3463 3664
3464 IO::AIO::aio_utime $runtime, undef, undef; 3665 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3465 3666
3466 my $guard = cf::lock_acquire "write_runtime"; 3667 my $guard = cf::lock_acquire "write_runtime";
3467 3668
3468 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3669 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3469 or return; 3670 or return;
3470 3671
3471 my $value = $cf::RUNTIME + 90 + 10; 3672 my $value = $cf::RUNTIME + 90 + 10;
3472 # 10 is the runtime save interval, for a monotonic clock 3673 # 10 is the runtime save interval, for a monotonic clock
3473 # 60 allows for the watchdog to kill the server. 3674 # 60 allows for the watchdog to kill the server.
3483 aio_utime $fh, undef, undef; 3684 aio_utime $fh, undef, undef;
3484 3685
3485 close $fh 3686 close $fh
3486 or return; 3687 or return;
3487 3688
3488 aio_rename "$runtime~", $runtime 3689 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3489 and return; 3690 and return;
3490 3691
3491 warn "runtime file written.\n"; 3692 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3492 3693
3493 1 3694 1
3494} 3695}
3495 3696
3496our $uuid_lock; 3697our $uuid_lock;
3505 my $uuid = "$LOCALDIR/uuid"; 3706 my $uuid = "$LOCALDIR/uuid";
3506 3707
3507 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3708 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3508 or return; 3709 or return;
3509 3710
3510 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3711 my $value = uuid_seq uuid_cur;
3712
3713 unless ($value) {
3714 info "cowardly refusing to write zero uuid value!\n";
3715 return;
3716 }
3717
3718 my $value = uuid_str $value + $uuid_skip;
3511 $uuid_skip = 0; 3719 $uuid_skip = 0;
3512 3720
3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3721 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3514 and return; 3722 and return;
3515 3723
3521 or return; 3729 or return;
3522 3730
3523 aio_rename "$uuid~", $uuid 3731 aio_rename "$uuid~", $uuid
3524 and return; 3732 and return;
3525 3733
3526 warn "uuid file written ($value).\n"; 3734 trace "uuid file written ($value).\n";
3527 3735
3528 1 3736 1
3529 3737
3530} 3738}
3531 3739
3537} 3745}
3538 3746
3539sub emergency_save() { 3747sub emergency_save() {
3540 my $freeze_guard = cf::freeze_mainloop; 3748 my $freeze_guard = cf::freeze_mainloop;
3541 3749
3542 warn "enter emergency perl save\n"; 3750 info "emergency_perl_save: enter\n";
3543 3751
3544 cf::sync_job { 3752 cf::sync_job {
3753 # this is a trade-off: we want to be very quick here, so
3754 # save all maps without fsync, and later call a global sync
3755 # (which in turn might be very very slow)
3756 local $USE_FSYNC = 0;
3757
3545 # use a peculiar iteration method to avoid tripping on perl 3758 # use a peculiar iteration method to avoid tripping on perl
3546 # refcount bugs in for. also avoids problems with players 3759 # refcount bugs in for. also avoids problems with players
3547 # and maps saved/destroyed asynchronously. 3760 # and maps saved/destroyed asynchronously.
3548 warn "begin emergency player save\n"; 3761 info "emergency_perl_save: begin player save\n";
3549 for my $login (keys %cf::PLAYER) { 3762 for my $login (keys %cf::PLAYER) {
3550 my $pl = $cf::PLAYER{$login} or next; 3763 my $pl = $cf::PLAYER{$login} or next;
3551 $pl->valid or next; 3764 $pl->valid or next;
3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3765 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3553 $pl->save; 3766 $pl->save;
3554 } 3767 }
3555 warn "end emergency player save\n"; 3768 info "emergency_perl_save: end player save\n";
3556 3769
3557 warn "begin emergency map save\n"; 3770 info "emergency_perl_save: begin map save\n";
3558 for my $path (keys %cf::MAP) { 3771 for my $path (keys %cf::MAP) {
3559 my $map = $cf::MAP{$path} or next; 3772 my $map = $cf::MAP{$path} or next;
3560 $map->valid or next; 3773 $map->valid or next;
3561 $map->save; 3774 $map->save;
3562 } 3775 }
3563 warn "end emergency map save\n"; 3776 info "emergency_perl_save: end map save\n";
3564 3777
3565 warn "begin emergency database checkpoint\n"; 3778 info "emergency_perl_save: begin database checkpoint\n";
3566 BDB::db_env_txn_checkpoint $DB_ENV; 3779 BDB::db_env_txn_checkpoint $DB_ENV;
3567 warn "end emergency database checkpoint\n"; 3780 info "emergency_perl_save: end database checkpoint\n";
3568 3781
3569 warn "begin write uuid\n"; 3782 info "emergency_perl_save: begin write uuid\n";
3570 write_uuid_sync 1; 3783 write_uuid_sync 1;
3571 warn "end write uuid\n"; 3784 info "emergency_perl_save: end write uuid\n";
3572 }; 3785 };
3573 3786
3574 warn "leave emergency perl save\n"; 3787 info "emergency_perl_save: starting sync()\n";
3788 IO::AIO::aio_sync sub {
3789 info "emergency_perl_save: finished sync()\n";
3790 };
3791
3792 info "emergency_perl_save: leave\n";
3575} 3793}
3576 3794
3577sub post_cleanup { 3795sub post_cleanup {
3578 my ($make_core) = @_; 3796 my ($make_core) = @_;
3579 3797
3580 warn Carp::longmess "post_cleanup backtrace" 3798 error Carp::longmess "post_cleanup backtrace"
3581 if $make_core; 3799 if $make_core;
3800
3801 my $fh = pidfile;
3802 unlink $PIDFILE if <$fh> == $$;
3803}
3804
3805# a safer delete_package, copied from Symbol
3806sub clear_package($) {
3807 my $pkg = shift;
3808
3809 # expand to full symbol table name if needed
3810 unless ($pkg =~ /^main::.*::$/) {
3811 $pkg = "main$pkg" if $pkg =~ /^::/;
3812 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3813 $pkg .= '::' unless $pkg =~ /::$/;
3814 }
3815
3816 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3817 my $stem_symtab = *{$stem}{HASH};
3818
3819 defined $stem_symtab and exists $stem_symtab->{$leaf}
3820 or return;
3821
3822 # clear all symbols
3823 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3824 for my $name (keys %$leaf_symtab) {
3825 _gv_clear *{"$pkg$name"};
3826# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3827 }
3582} 3828}
3583 3829
3584sub do_reload_perl() { 3830sub do_reload_perl() {
3585 # can/must only be called in main 3831 # can/must only be called in main
3586 if ($Coro::current != $Coro::main) { 3832 if (in_main) {
3587 warn "can only reload from main coroutine"; 3833 error "can only reload from main coroutine";
3588 return; 3834 return;
3589 } 3835 }
3590 3836
3837 return if $RELOAD++;
3838
3839 my $t1 = AE::time;
3840
3841 while ($RELOAD) {
3591 warn "reloading..."; 3842 info "reloading...";
3592 3843
3593 warn "entering sync_job"; 3844 trace "entering sync_job";
3594 3845
3595 cf::sync_job { 3846 cf::sync_job {
3596 cf::write_runtime_sync; # external watchdog should not bark 3847 cf::write_runtime_sync; # external watchdog should not bark
3597 cf::emergency_save; 3848 cf::emergency_save;
3598 cf::write_runtime_sync; # external watchdog should not bark 3849 cf::write_runtime_sync; # external watchdog should not bark
3599 3850
3600 warn "syncing database to disk"; 3851 trace "syncing database to disk";
3601 BDB::db_env_txn_checkpoint $DB_ENV; 3852 BDB::db_env_txn_checkpoint $DB_ENV;
3602 3853
3603 # if anything goes wrong in here, we should simply crash as we already saved 3854 # if anything goes wrong in here, we should simply crash as we already saved
3604 3855
3605 warn "flushing outstanding aio requests"; 3856 trace "flushing outstanding aio requests";
3606 for (;;) {
3607 BDB::flush;
3608 IO::AIO::flush;
3609 Coro::cede_notself;
3610 last unless IO::AIO::nreqs || BDB::nreqs; 3857 while (IO::AIO::nreqs || BDB::nreqs) {
3611 warn "iterate..."; 3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3612 }
3613
3614 ++$RELOAD;
3615
3616 warn "cancelling all extension coros";
3617 $_->cancel for values %EXT_CORO;
3618 %EXT_CORO = ();
3619
3620 warn "removing commands";
3621 %COMMAND = ();
3622
3623 warn "removing ext/exti commands";
3624 %EXTCMD = ();
3625 %EXTICMD = ();
3626
3627 warn "unloading/nuking all extensions";
3628 for my $pkg (@EXTS) {
3629 warn "... unloading $pkg";
3630
3631 if (my $cb = $pkg->can ("unload")) {
3632 eval {
3633 $cb->($pkg);
3634 1
3635 } or warn "$pkg unloaded, but with errors: $@";
3636 } 3859 }
3637 3860
3638 warn "... nuking $pkg"; 3861 trace "cancelling all extension coros";
3639 Symbol::delete_package $pkg; 3862 $_->cancel for values %EXT_CORO;
3640 } 3863 %EXT_CORO = ();
3641 3864
3642 warn "unloading all perl modules loaded from $LIBDIR"; 3865 trace "removing commands";
3643 while (my ($k, $v) = each %INC) { 3866 %COMMAND = ();
3644 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3645 3867
3868 trace "removing ext/exti commands";
3869 %EXTCMD = ();
3870 %EXTICMD = ();
3871
3872 trace "unloading/nuking all extensions";
3873 for my $pkg (@EXTS) {
3646 warn "... unloading $k"; 3874 trace "... unloading $pkg";
3647 delete $INC{$k};
3648 3875
3649 $k =~ s/\.pm$//;
3650 $k =~ s/\//::/g;
3651
3652 if (my $cb = $k->can ("unload_module")) { 3876 if (my $cb = $pkg->can ("unload")) {
3877 eval {
3653 $cb->(); 3878 $cb->($pkg);
3879 1
3880 } or error "$pkg unloaded, but with errors: $@";
3881 }
3882
3883 trace "... clearing $pkg";
3884 clear_package $pkg;
3654 } 3885 }
3655 3886
3656 Symbol::delete_package $k; 3887 trace "unloading all perl modules loaded from $LIBDIR";
3888 while (my ($k, $v) = each %INC) {
3889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3890
3891 trace "... unloading $k";
3892 delete $INC{$k};
3893
3894 $k =~ s/\.pm$//;
3895 $k =~ s/\//::/g;
3896
3897 if (my $cb = $k->can ("unload_module")) {
3898 $cb->();
3899 }
3900
3901 clear_package $k;
3657 } 3902 }
3658 3903
3659 warn "getting rid of safe::, as good as possible"; 3904 trace "getting rid of safe::, as good as possible";
3660 Symbol::delete_package "safe::$_" 3905 clear_package "safe::$_"
3661 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3906 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3662 3907
3663 warn "unloading cf.pm \"a bit\""; 3908 trace "unloading cf.pm \"a bit\"";
3664 delete $INC{"cf.pm"}; 3909 delete $INC{"cf.pm"};
3665 delete $INC{"cf/pod.pm"}; 3910 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3666 3911
3667 # don't, removes xs symbols, too, 3912 # don't, removes xs symbols, too,
3668 # and global variables created in xs 3913 # and global variables created in xs
3669 #Symbol::delete_package __PACKAGE__; 3914 #clear_package __PACKAGE__;
3670 3915
3671 warn "unload completed, starting to reload now"; 3916 info "unload completed, starting to reload now";
3672 3917
3673 warn "reloading cf.pm"; 3918 trace "reloading cf.pm";
3674 require cf; 3919 require cf;
3675 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3920 cf::_connect_to_perl_1;
3676 3921
3677 warn "loading config and database again"; 3922 trace "loading config and database again";
3678 cf::reload_config; 3923 cf::reload_config;
3679 3924
3680 warn "loading extensions"; 3925 trace "loading extensions";
3681 cf::load_extensions; 3926 cf::load_extensions;
3682 3927
3928 if ($REATTACH_ON_RELOAD) {
3683 warn "reattaching attachments to objects/players"; 3929 trace "reattaching attachments to objects/players";
3684 _global_reattach; # objects, sockets 3930 _global_reattach; # objects, sockets
3685 warn "reattaching attachments to maps"; 3931 trace "reattaching attachments to maps";
3686 reattach $_ for values %MAP; 3932 reattach $_ for values %MAP;
3687 warn "reattaching attachments to players"; 3933 trace "reattaching attachments to players";
3688 reattach $_ for values %PLAYER; 3934 reattach $_ for values %PLAYER;
3935 }
3689 3936
3937 trace "running post_init jobs";
3938 (pop @POST_INIT)->(1) while @POST_INIT;
3939
3690 warn "leaving sync_job"; 3940 trace "leaving sync_job";
3691 3941
3692 1 3942 1
3693 } or do { 3943 } or do {
3694 warn $@; 3944 error $@;
3695 cf::cleanup "error while reloading, exiting."; 3945 cf::cleanup "error while reloading, exiting.";
3946 };
3947
3948 info "reloaded";
3949 --$RELOAD;
3696 }; 3950 }
3697 3951
3698 warn "reloaded"; 3952 $t1 = AE::time - $t1;
3953 info "reload completed in ${t1}s\n";
3699}; 3954};
3700 3955
3701our $RELOAD_WATCHER; # used only during reload 3956our $RELOAD_WATCHER; # used only during reload
3702 3957
3703sub reload_perl() { 3958sub reload_perl() {
3704 # doing reload synchronously and two reloads happen back-to-back, 3959 # doing reload synchronously and two reloads happen back-to-back,
3705 # coro crashes during coro_state_free->destroy here. 3960 # coro crashes during coro_state_free->destroy here.
3706 3961
3962 $RELOAD_WATCHER ||= cf::async {
3963 Coro::AIO::aio_wait cache_extensions;
3964
3707 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3965 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3708 do_reload_perl; 3966 do_reload_perl;
3709 undef $RELOAD_WATCHER; 3967 undef $RELOAD_WATCHER;
3968 };
3710 }; 3969 };
3711} 3970}
3712 3971
3713register_command "reload" => sub { 3972register_command "reload" => sub {
3714 my ($who, $arg) = @_; 3973 my ($who, $arg) = @_;
3728 3987
3729our @WAIT_FOR_TICK; 3988our @WAIT_FOR_TICK;
3730our @WAIT_FOR_TICK_BEGIN; 3989our @WAIT_FOR_TICK_BEGIN;
3731 3990
3732sub wait_for_tick { 3991sub wait_for_tick {
3733 return if tick_inhibit || $Coro::current == $Coro::main; 3992 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3734 3993
3735 my $signal = new Coro::Signal; 3994 my $signal = new Coro::Signal;
3736 push @WAIT_FOR_TICK, $signal; 3995 push @WAIT_FOR_TICK, $signal;
3737 $signal->wait; 3996 $signal->wait;
3738} 3997}
3739 3998
3740sub wait_for_tick_begin { 3999sub wait_for_tick_begin {
3741 return if tick_inhibit || $Coro::current == $Coro::main; 4000 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3742 4001
3743 my $signal = new Coro::Signal; 4002 my $signal = new Coro::Signal;
3744 push @WAIT_FOR_TICK_BEGIN, $signal; 4003 push @WAIT_FOR_TICK_BEGIN, $signal;
3745 $signal->wait; 4004 $signal->wait;
3746} 4005}
3752 return; 4011 return;
3753 } 4012 }
3754 4013
3755 cf::server_tick; # one server iteration 4014 cf::server_tick; # one server iteration
3756 4015
4016 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4017
3757 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4018 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3758 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4019 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3759 Coro::async_pool { 4020 Coro::async_pool {
3760 $Coro::current->{desc} = "runtime saver"; 4021 $Coro::current->{desc} = "runtime saver";
3761 write_runtime_sync 4022 write_runtime_sync
3762 or warn "ERROR: unable to write runtime file: $!"; 4023 or error "ERROR: unable to write runtime file: $!";
3763 }; 4024 };
3764 } 4025 }
3765 4026
3766 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4027 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3767 $sig->send; 4028 $sig->send;
3775 4036
3776 if (0) { 4037 if (0) {
3777 if ($NEXT_TICK) { 4038 if ($NEXT_TICK) {
3778 my $jitter = $TICK_START - $NEXT_TICK; 4039 my $jitter = $TICK_START - $NEXT_TICK;
3779 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4040 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3780 warn "jitter $JITTER\n";#d# 4041 debug "jitter $JITTER\n";#d#
3781 } 4042 }
3782 } 4043 }
3783} 4044}
3784 4045
3785{ 4046{
3786 # configure BDB 4047 # configure BDB
3787 4048
3788 BDB::min_parallel 8; 4049 BDB::min_parallel 16;
3789 BDB::max_poll_reqs $TICK * 0.1; 4050 BDB::max_poll_reqs $TICK * 0.1;
3790 $Coro::BDB::WATCHER->priority (1); 4051 $AnyEvent::BDB::WATCHER->priority (1);
3791 4052
3792 unless ($DB_ENV) { 4053 unless ($DB_ENV) {
3793 $DB_ENV = BDB::db_env_create; 4054 $DB_ENV = BDB::db_env_create;
3794 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4055 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3795 | BDB::LOG_AUTOREMOVE, 1); 4056 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4057 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3796 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4058 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3797 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4059 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3798 4060
3799 cf::sync_job { 4061 cf::sync_job {
3800 eval { 4062 eval {
3826{ 4088{
3827 # configure IO::AIO 4089 # configure IO::AIO
3828 4090
3829 IO::AIO::min_parallel 8; 4091 IO::AIO::min_parallel 8;
3830 IO::AIO::max_poll_time $TICK * 0.1; 4092 IO::AIO::max_poll_time $TICK * 0.1;
3831 $Coro::AIO::WATCHER->priority (1); 4093 undef $AnyEvent::AIO::WATCHER;
3832} 4094}
3833 4095
3834my $_log_backtrace; 4096my $_log_backtrace;
3835 4097
3836sub _log_backtrace { 4098sub _log_backtrace {
3839 $msg =~ s/\n//; 4101 $msg =~ s/\n//;
3840 4102
3841 # limit the # of concurrent backtraces 4103 # limit the # of concurrent backtraces
3842 if ($_log_backtrace < 2) { 4104 if ($_log_backtrace < 2) {
3843 ++$_log_backtrace; 4105 ++$_log_backtrace;
4106 my $perl_bt = Carp::longmess $msg;
3844 async { 4107 async {
3845 $Coro::current->{desc} = "abt $msg"; 4108 $Coro::current->{desc} = "abt $msg";
3846 4109
3847 my @bt = fork_call { 4110 my @bt = fork_call {
3848 @addr = map { sprintf "%x", $_ } @addr; 4111 @addr = map { sprintf "%x", $_ } @addr;
3859 } 4122 }
3860 4123
3861 @funcs 4124 @funcs
3862 }; 4125 };
3863 4126
3864 LOG llevInfo, "[ABT] $msg\n"; 4127 LOG llevInfo, "[ABT] $perl_bt\n";
4128 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3865 LOG llevInfo, "[ABT] $_\n" for @bt; 4129 LOG llevInfo, "[ABT] $_\n" for @bt;
3866 --$_log_backtrace; 4130 --$_log_backtrace;
3867 }; 4131 };
3868 } else { 4132 } else {
3869 LOG llevInfo, "[ABT] $msg\n"; 4133 LOG llevInfo, "[ABT] $msg\n";
3870 LOG llevInfo, "[ABT] [suppressed]\n"; 4134 LOG llevInfo, "[ABT] [suppressed]\n";
3871 } 4135 }
3872} 4136}
3873 4137
3874# load additional modules 4138# load additional modules
3875use cf::pod; 4139require "cf/$_.pm" for @EXTRA_MODULES;
4140cf::_connect_to_perl_2;
3876 4141
3877END { cf::emergency_save } 4142END { cf::emergency_save }
3878 4143
38791 41441
3880 4145

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines