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.460 by root, Mon Dec 15 17:04:53 2008 UTC vs.
Revision 1.560 by root, Fri Apr 22 02:03:12 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard (); 37use Guard ();
38use Coro (); 38use Coro ();
39use Coro::State; 39use Coro::State;
40use Coro::Handle; 40use Coro::Handle;
51use Coro::Util (); 51use Coro::Util ();
52 52
53use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
54use BDB (); 54use BDB ();
55use Data::Dumper; 55use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 56use Fcntl;
58use YAML (); 57use YAML::XS ();
59use IO::AIO (); 58use IO::AIO ();
60use Time::HiRes; 59use Time::HiRes;
61use Compress::LZF; 60use Compress::LZF;
62use Digest::MD5 (); 61use Digest::MD5 ();
63 62
72 71
73# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
81 85
82our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
92our $DATADIR = datadir; 99our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
95our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
96our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
97our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
99our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
100our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 112
105our %RESOURCE; 113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
106 120
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 123our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
111 125
112our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 129our $DB_ENV;
116 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
117our %CFG; 133our %CFG;
118 134
119our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 136our $RUNTIME;
121our $NOW; 137our $NOW;
132our $JITTER; # average jitter 148our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
134 150
135our @POST_INIT; 151our @POST_INIT;
136 152
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :)
138 155
139binmode STDOUT; 156binmode STDOUT;
140binmode STDERR; 157binmode STDERR;
141 158
142# read virtual server time, if available 159# read virtual server time, if available
144 open my $fh, "<", $RUNTIMEFILE 161 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
147} 164}
148 165
166eval "sub TICK() { $TICK } 1" or die;
167
149mkdir $_ 168mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 170
152our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
153 172
154sub cf::map::normalise; 173sub cf::map::normalise;
174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
179#############################################################################
180
181%REFLECT = ();
182for (@REFLECT) {
183 my $reflect = JSON::XS::decode_json $_;
184 $REFLECT{$reflect->{class}} = $reflect;
185}
186
187# this is decidedly evil
188$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
155 189
156############################################################################# 190#############################################################################
157 191
158=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
159 193
201from wherever your confdir points to. 235from wherever your confdir points to.
202 236
203=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
204 238
205These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
206returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
207per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
208 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
209=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
210 249
211This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
212C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
213that call. 252that call.
214 253
254=item %cf::REFLECT
255
256Contains, for each (C++) class name, a hash reference with information
257about object members (methods, scalars, arrays and flags) and other
258metadata, which is useful for introspection.
259
215=back 260=back
216 261
217=cut 262=cut
218 263
219BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
220 *CORE::GLOBAL::warn = sub { 265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
270$Coro::State::WARNHOOK = sub {
221 my $msg = join "", @_; 271 my $msg = join "", @_;
222 272
223 $msg .= "\n" 273 $msg .= "\n"
224 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
225 275
226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
227 277
228 LOG llevError, $msg; 278 LOG llevWarn, $msg;
229 }; 279};
230}
231 280
232$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
234 283
235 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 288 return;#d#
238 }#d# 289 }#d#
239 290
240 # kill coroutine otherwise 291 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 292 Coro::terminate
243}; 293};
244
245$SIG{__DIE__} = sub { }; #d#?
246 294
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
264)) { 312)) {
265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
266} 314}
267 315
268$EV::DIED = sub { 316$EV::DIED = sub {
269 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
270}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
271 324
272############################################################################# 325#############################################################################
273 326
274=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
275 328
296 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
297 $d 350 $d
298 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
299} 352}
300 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
301=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
302 369
303Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
304 371
305=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
311our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
312 379
313sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
314sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
315 382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
316=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
317 415
318Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
320 418
321The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
322is a reload or not. 420is a reload or not.
323 421
324=cut 422=cut
325 423
326sub post_init(&) { 424sub post_init(&) {
327 push @POST_INIT, shift; 425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
328} 443}
329 444
330=item cf::lock_wait $string 445=item cf::lock_wait $string
331 446
332Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
371} 486}
372 487
373=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
374 489
375Like EV::periodic, but randomly selects a starting point so that the actions 490Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer. 491get spread over time.
377 492
378=cut 493=cut
379 494
380sub periodic($$) { 495sub periodic($$) {
381 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
385 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
386} 501}
387 502
388=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
389 504
390Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
391This call blocks and returns only when you have at least C<$time> seconds 506(default: 0): This call blocks and returns only when you have at least
392of cpu time till the next tick. The slot is only valid till the next cede. 507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
393 512
394The optional C<$name> can be used to identify the job to run. It might be 513The optional C<$name> can be used to identify the job to run. It might be
395used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
396 515
397Useful for short background jobs. 516Useful for short background jobs.
398 517
399=cut 518=cut
400 519
401our @SLOT_QUEUE; 520our @SLOT_QUEUE;
402our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
403 523
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
407 527
408 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
409 530
410 while () { 531 while () {
411 next_job: 532 next_job:
533
412 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 535
414 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 540 $job->[2]->send;
418 Coro::cede; 541 Coro::cede;
419 goto next_job; 542 goto next_job;
420 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 545 }
422 } 546 }
423 547
424 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 549 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 551 $signal->wait;
428 } else { 552 } else {
553 $busy = 0;
429 Coro::schedule; 554 Coro::schedule;
430 } 555 }
431 } 556 }
432}; 557};
433 558
434sub get_slot($;$$) { 559sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 560 return if tick_inhibit || $Coro::current == $Coro::main;
436 561
437 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
438 563
439 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
440 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
441 567
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
470=cut 596=cut
471 597
472sub sync_job(&) { 598sub sync_job(&) {
473 my ($job) = @_; 599 my ($job) = @_;
474 600
475 if ($Coro::current == $Coro::main) { 601 if (in_main) {
476 my $time = EV::time; 602 my $time = AE::time;
477 603
478 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
480 606
481 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
482 608
483 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
484 610
485 my $busy = 1; 611 my $busy = 1;
486 my @res; 612 my @res;
487 613
488 (async { 614 (async {
489 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 616 @res = eval { $job->() };
491 warn $@ if $@; 617 error $@ if $@;
492 undef $busy; 618 undef $busy;
493 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
494 620
495 while ($busy) { 621 while ($busy) {
496 if (Coro::nready) { 622 if (Coro::nready) {
498 } else { 624 } else {
499 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
500 } 626 }
501 } 627 }
502 628
503 my $time = EV::time - $time; 629 my $time = AE::time - $time;
504 630
505 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
506 632
507 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
508 } else { 634 } else {
530 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
531 657
532 $coro 658 $coro
533} 659}
534 660
535=item fork_call { }, $args 661=item fork_call { }, @args
536 662
537Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
538process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
539Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
540never block itself or use any form of event handling. 666never block itself or use any form of event handling.
541 667
542=cut 668=cut
543 669
670sub post_fork {
671 reset_signals;
672}
673
544sub fork_call(&@) { 674sub fork_call(&@) {
545 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
546 676
547 # we seemingly have to make a local copy of the whole thing, 677 # we seemingly have to make a local copy of the whole thing,
548 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
550 680
551 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
552 reset_signals; 682 cf::post_fork;
553 &$cb 683 &$cb
554 }, @args; 684 } @args;
555 685
556 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
687}
688
689sub objinfo {
690 (
691 "counter value" => cf::object::object_count,
692 "objects created" => cf::object::create_count,
693 "objects destroyed" => cf::object::destroy_count,
694 "freelist size" => cf::object::free_count,
695 "allocated objects" => cf::object::objects_size,
696 "active objects" => cf::object::actives_size,
697 )
557} 698}
558 699
559=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
560 701
561=cut 702=cut
598within each server. 739within each server.
599 740
600=cut 741=cut
601 742
602sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
603 my ($name) = @_; 747 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
605 749
606 eval { 750 eval {
607 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
617} 761}
618 762
619our $DB; 763our $DB;
620 764
621sub db_init { 765sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
624 };
625} 767}
626 768
627sub db_get($$) { 769sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
629 771
630 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
631 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
632 776
633 $! ? () 777 $! ? ()
634 : $data 778 : $data
635 }
636} 779}
637 780
638sub db_put($$$) { 781sub db_put($$$) {
639 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
668 811
669 my @data; 812 my @data;
670 my $md5; 813 my $md5;
671 814
672 for (0 .. $#$src) { 815 for (0 .. $#$src) {
673 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
674 or Carp::croak "$src->[$_]: $!";
675 } 817 }
676 818
677 # if processing is expensive, check 819 # if processing is expensive, check
678 # checksum first 820 # checksum first
679 if (1) { 821 if (1) {
696 838
697 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data); 840 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
700 842
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 844
703 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
706 848
716 858
717=cut 859=cut
718 860
719sub datalog($@) { 861sub datalog($@) {
720 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 864}
723 865
724=back 866=back
725 867
726=cut 868=cut
921 1063
922 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 1066
925 } elsif (ref $type) { 1067 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
927 1069
928 } else { 1070 } else {
929 shift @arg; 1071 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
931 } 1073 }
932 } 1074 }
933} 1075}
934 1076
935sub _object_attach { 1077sub _object_attach {
945 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
946 } 1088 }
947 1089
948 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
949 } else { 1091 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1093 }
952 1094
953 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
954} 1096}
955 1097
1014 1156
1015 for (@$callbacks) { 1157 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1017 1159
1018 if ($@) { 1160 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1162 override;
1022 } 1163 }
1023 1164
1024 return 1 if $override; 1165 return 1 if $override;
1025 } 1166 }
1104 for (@$attach) { 1245 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1107 } 1248 }
1108 } else { 1249 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1251 }
1111 } 1252 }
1112} 1253}
1113 1254
1114cf::attachable->attach ( 1255cf::attachable->attach (
1141 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1142 1283
1143 sync_job { 1284 sync_job {
1144 if (length $$rdata) { 1285 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1148 1290
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1294 if ($cf::USE_FSYNC) {
1295 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;
1296 aio_fsync $fh;
1297 }
1153 aio_close $fh; 1298 aio_close $fh;
1154 1299
1155 if (@$objs) { 1300 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1301 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1302 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1305 if ($cf::USE_FSYNC) {
1306 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;
1307 aio_fsync $fh;
1308 }
1161 aio_close $fh; 1309 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1311 }
1164 } else { 1312 } else {
1165 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1168 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1169 1317
1170 $filename =~ s%/[^/]+$%%; 1318 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC; 1319 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1320 } else {
1173 warn "unable to save objects: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1174 } 1322 }
1175 } else { 1323 } else {
1176 aio_unlink $filename; 1324 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1178 } 1326 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1351 $av = $st->{objs};
1204 } 1352 }
1205 1353
1206 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1209 1358
1210 ($data, $av) 1359 ($data, $av)
1211} 1360}
1212 1361
1213=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1272} 1421}
1273 1422
1274use File::Glob (); 1423use File::Glob ();
1275 1424
1276cf::player->attach ( 1425cf::player->attach (
1277 on_command => sub { 1426 on_unknown_command => sub {
1278 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1279 1428
1280 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1281 or return; 1430 or return;
1282 1431
1305 1454
1306 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1307 if $reply; 1456 if $reply;
1308 1457
1309 } else { 1458 } else {
1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1311 } 1460 }
1312 1461
1313 cf::override; 1462 cf::override;
1314 }, 1463 },
1315); 1464);
1316 1465
1317# "readahead" all extensions 1466# "readahead" all extensions
1318sub cache_extensions { 1467sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1468 my $grp = IO::AIO::aio_group;
1320 1469
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1470 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1471 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1472 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1473 }
1325 }; 1474 };
1326 1475
1327 $grp 1476 $grp
1328} 1477}
1329 1478
1330sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1331 cf::sync_job { 1482 cf::sync_job {
1332 my %todo; 1483 my %todo;
1333 1484
1334 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1335 next unless -r $path; 1486 next unless -r $path;
1353 1504
1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1356 1507
1357 $ext{source} = 1508 $ext{source} =
1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1359 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1360 . $source 1511 . $source
1361 . "\n};\n1"; 1512 . "\n};\n1";
1362 1513
1363 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1364 } 1515 }
1365 1516
1517 my $pass = 0;
1366 my %done; 1518 my %done;
1367 while (%todo) { 1519 while (%todo) {
1368 my $progress; 1520 my $progress;
1369 1521
1522 ++$pass;
1523
1524 ext:
1370 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1371 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1372 goto skip 1527 next ext
1373 unless exists $done{$_}; 1528 unless exists $done{$_};
1374 } 1529 }
1375 1530
1376 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377 1532
1378 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1379 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1380 : "$v->{base}: extension inactive.\n";
1381 1537
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1539 if exists $v->{meta}{mandatory};
1386 1540
1387 warn $msg; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1542 delete $todo{$k};
1543 } else {
1544 $done{$k} = delete $todo{$k};
1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1388 } 1550 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1551 }
1394 1552
1395 skip: 1553 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 unless $progress; 1555
1556 while (my ($k, $v) = each %todo) {
1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558 if exists $v->{meta}{mandatory};
1559 }
1560 }
1398 } 1561 }
1399 }; 1562 };
1400} 1563}
1401 1564
1402############################################################################# 1565#############################################################################
1486 $cf::PLAYER{$login} = $pl 1649 $cf::PLAYER{$login} = $pl
1487 } 1650 }
1488 } 1651 }
1489} 1652}
1490 1653
1654cf::player->attach (
1655 on_load => sub {
1656 my ($pl, $path) = @_;
1657
1658 # restore slots saved in save, below
1659 my $slots = delete $pl->{_slots};
1660
1661 $pl->ob->current_weapon ($slots->[0]);
1662 $pl->combat_ob ($slots->[1]);
1663 $pl->ranged_ob ($slots->[2]);
1664 },
1665);
1666
1491sub save($) { 1667sub save($) {
1492 my ($pl) = @_; 1668 my ($pl) = @_;
1493 1669
1494 return if $pl->{deny_save}; 1670 return if $pl->{deny_save};
1495 1671
1500 1676
1501 aio_mkdir playerdir $pl, 0770; 1677 aio_mkdir playerdir $pl, 0770;
1502 $pl->{last_save} = $cf::RUNTIME; 1678 $pl->{last_save} = $cf::RUNTIME;
1503 1679
1504 cf::get_slot 0.01; 1680 cf::get_slot 0.01;
1681
1682 # save slots, to be restored later
1683 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1505 1684
1506 $pl->save_pl ($path); 1685 $pl->save_pl ($path);
1507 cf::cede_to_tick; 1686 cf::cede_to_tick;
1508} 1687}
1509 1688
1543 my $name = $pl->ob->name; 1722 my $name = $pl->ob->name;
1544 1723
1545 $pl->{deny_save} = 1; 1724 $pl->{deny_save} = 1;
1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1725 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1547 1726
1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1727 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1549 $pl->deactivate; 1728 $pl->deactivate;
1729
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1730 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1552 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1731 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1732 ext::highscore::check ($pl->ob);
1733
1553 $pl->ns->destroy if $pl->ns; 1734 $pl->ns->destroy if $pl->ns;
1554 1735
1555 my $path = playerdir $pl; 1736 my $path = playerdir $pl;
1556 my $temp = "$path~$cf::RUNTIME~deleting~"; 1737 my $temp = "$path~$cf::RUNTIME~deleting~";
1557 aio_rename $path, $temp; 1738 aio_rename $path, $temp;
1611 \@logins 1792 \@logins
1612} 1793}
1613 1794
1614=item $player->maps 1795=item $player->maps
1615 1796
1797=item cf::player::maps $login
1798
1616Returns an arrayref of map paths that are private for this 1799Returns an arrayref of map paths that are private for this
1617player. May block. 1800player. May block.
1618 1801
1619=cut 1802=cut
1620 1803
1682=cut 1865=cut
1683 1866
1684sub find_by_path($) { 1867sub find_by_path($) {
1685 my ($path) = @_; 1868 my ($path) = @_;
1686 1869
1870 $path =~ s/^~[^\/]*//; # skip ~login
1871
1687 my ($match, $specificity); 1872 my ($match, $specificity);
1688 1873
1689 for my $region (list) { 1874 for my $region (list) {
1690 if ($region->{match} && $path =~ $region->{match}) { 1875 if ($region->{match} && $path =~ $region->{match}) {
1691 ($match, $specificity) = ($region, $region->specificity) 1876 ($match, $specificity) = ($region, $region->specificity)
1719sub generate_random_map { 1904sub generate_random_map {
1720 my ($self, $rmp) = @_; 1905 my ($self, $rmp) = @_;
1721 1906
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1907 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723 1908
1724 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 1909 $self->_create_random_map ($rmp);
1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729 $rmp->{exit_on_final_map},
1730 $rmp->{xsize}, $rmp->{ysize},
1731 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1732 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1733 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1734 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1735 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1736 (cf::region::find $rmp->{region}), $rmp->{custom}
1737 )
1738} 1910}
1739 1911
1740=item cf::map->register ($regex, $prio) 1912=item cf::map->register ($regex, $prio)
1741 1913
1742Register a handler for the map path matching the given regex at the 1914Register a handler for the map path matching the given regex at the
1747 1919
1748sub register { 1920sub register {
1749 my (undef, $regex, $prio) = @_; 1921 my (undef, $regex, $prio) = @_;
1750 my $pkg = caller; 1922 my $pkg = caller;
1751 1923
1752 no strict;
1753 push @{"$pkg\::ISA"}, __PACKAGE__; 1924 push @{"$pkg\::ISA"}, __PACKAGE__;
1754 1925
1755 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1926 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1756} 1927}
1757 1928
1758# also paths starting with '/' 1929# also paths starting with '/'
1759$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1930$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1760 1931
1761sub thawer_merge { 1932sub thawer_merge {
1762 my ($self, $merge) = @_; 1933 my ($self, $merge) = @_;
1763 1934
1764 # we have to keep some variables in memory intact 1935 # we have to keep some variables in memory intact
1769} 1940}
1770 1941
1771sub normalise { 1942sub normalise {
1772 my ($path, $base) = @_; 1943 my ($path, $base) = @_;
1773 1944
1774 $path = "$path"; # make sure its a string 1945 $path = "$path"; # make sure it's a string
1775 1946
1776 $path =~ s/\.map$//; 1947 $path =~ s/\.map$//;
1777 1948
1778 # map plan: 1949 # map plan:
1779 # 1950 #
1794 $base =~ s{[^/]+/?$}{}; 1965 $base =~ s{[^/]+/?$}{};
1795 $path = "$base/$path"; 1966 $path = "$base/$path";
1796 } 1967 }
1797 1968
1798 for ($path) { 1969 for ($path) {
1799 redo if s{//}{/};
1800 redo if s{/\.?/}{/}; 1970 redo if s{/\.?/}{/};
1801 redo if s{/[^/]+/\.\./}{/}; 1971 redo if s{/[^/]+/\.\./}{/};
1802 } 1972 }
1803 1973
1804 $path 1974 $path
1818 $self->init; # pass $1 etc. 1988 $self->init; # pass $1 etc.
1819 return $self; 1989 return $self;
1820 } 1990 }
1821 } 1991 }
1822 1992
1823 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1993 Carp::cluck "unable to resolve path '$path' (base '$base')";
1824 () 1994 ()
1825} 1995}
1826 1996
1827sub init { 1997sub init {
1828 my ($self) = @_; 1998 my ($self) = @_;
1860sub uniq_path { 2030sub uniq_path {
1861 my ($self) = @_; 2031 my ($self) = @_;
1862 2032
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2033 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$UNIQUEDIR/$path" 2034 "$UNIQUEDIR/$path"
1865}
1866
1867# and all this just because we cannot iterate over
1868# all maps in C++...
1869sub change_all_map_light {
1870 my ($change) = @_;
1871
1872 $_->change_map_light ($change)
1873 for grep $_->outdoor, values %cf::MAP;
1874} 2035}
1875 2036
1876sub decay_objects { 2037sub decay_objects {
1877 my ($self) = @_; 2038 my ($self) = @_;
1878 2039
1959} 2120}
1960 2121
1961sub find; 2122sub find;
1962sub find { 2123sub find {
1963 my ($path, $origin) = @_; 2124 my ($path, $origin) = @_;
2125
2126 cf::cede_to_tick;
1964 2127
1965 $path = normalise $path, $origin && $origin->path; 2128 $path = normalise $path, $origin && $origin->path;
1966 2129
1967 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2130 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1968 my $guard2 = cf::lock_acquire "map_find:$path"; 2131 my $guard2 = cf::lock_acquire "map_find:$path";
1987 2150
1988 $cf::MAP{$path} = $map 2151 $cf::MAP{$path} = $map
1989 } 2152 }
1990} 2153}
1991 2154
1992sub pre_load { } 2155sub pre_load { }
1993sub post_load { } 2156#sub post_load { } # XS
1994 2157
1995sub load { 2158sub load {
1996 my ($self) = @_; 2159 my ($self) = @_;
1997 2160
1998 local $self->{deny_reset} = 1; # loading can take a long time 2161 local $self->{deny_reset} = 1; # loading can take a long time
2043 unless ($self->{deny_activate}) { 2206 unless ($self->{deny_activate}) {
2044 $self->decay_objects; 2207 $self->decay_objects;
2045 $self->fix_auto_apply; 2208 $self->fix_auto_apply;
2046 $self->update_buttons; 2209 $self->update_buttons;
2047 cf::cede_to_tick; 2210 cf::cede_to_tick;
2048 $self->set_darkness_map;
2049 cf::cede_to_tick;
2050 $self->activate; 2211 $self->activate;
2051 } 2212 }
2052 2213
2053 $self->{last_save} = $cf::RUNTIME; 2214 $self->{last_save} = $cf::RUNTIME;
2054 $self->last_access ($cf::RUNTIME); 2215 $self->last_access ($cf::RUNTIME);
2055 2216
2056 $self->in_memory (cf::MAP_ACTIVE); 2217 $self->in_memory (cf::MAP_ACTIVE);
2057 } 2218 }
2058 2219
2059 $self->post_load; 2220 $self->post_load;
2060}
2061 2221
2222 1
2223}
2224
2225# customize the map for a given player, i.e.
2226# return the _real_ map. used by e.g. per-player
2227# maps to change the path to ~playername/mappath
2062sub customise_for { 2228sub customise_for {
2063 my ($self, $ob) = @_; 2229 my ($self, $ob) = @_;
2064 2230
2065 return find "~" . $ob->name . "/" . $self->{path} 2231 return find "~" . $ob->name . "/" . $self->{path}
2066 if $self->per_player; 2232 if $self->per_player;
2082 or next; 2248 or next;
2083 $neigh = find $neigh, $map 2249 $neigh = find $neigh, $map
2084 or next; 2250 or next;
2085 $neigh->load; 2251 $neigh->load;
2086 2252
2253 # now find the diagonal neighbours
2087 push @neigh, 2254 push @neigh,
2088 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2255 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2089 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2256 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2090 } 2257 }
2091 2258
2098} 2265}
2099 2266
2100sub find_sync { 2267sub find_sync {
2101 my ($path, $origin) = @_; 2268 my ($path, $origin) = @_;
2102 2269
2103 cf::sync_job { find $path, $origin } 2270 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2271 if $Coro::current == $Coro::main;
2272
2273 find $path, $origin
2104} 2274}
2105 2275
2106sub do_load_sync { 2276sub do_load_sync {
2107 my ($map) = @_; 2277 my ($map) = @_;
2108 2278
2109 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2279 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2110 if $Coro::current == $Coro::main; 2280 if $Coro::current == $Coro::main;
2111 2281
2112 cf::sync_job { $map->load }; 2282 $map->load;
2113} 2283}
2114 2284
2115our %MAP_PREFETCH; 2285our %MAP_PREFETCH;
2116our $MAP_PREFETCHER = undef; 2286our $MAP_PREFETCHER = undef;
2117 2287
2143 $MAP_PREFETCHER->prio (6); 2313 $MAP_PREFETCHER->prio (6);
2144 2314
2145 () 2315 ()
2146} 2316}
2147 2317
2318# common code, used by both ->save and ->swapout
2148sub save { 2319sub _save {
2149 my ($self) = @_; 2320 my ($self) = @_;
2150
2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
2152 2321
2153 $self->{last_save} = $cf::RUNTIME; 2322 $self->{last_save} = $cf::RUNTIME;
2154 2323
2155 return unless $self->dirty; 2324 return unless $self->dirty;
2156 2325
2176 } else { 2345 } else {
2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2346 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2178 } 2347 }
2179} 2348}
2180 2349
2350sub save {
2351 my ($self) = @_;
2352
2353 my $lock = cf::lock_acquire "map_data:$self->{path}";
2354
2355 $self->_save;
2356}
2357
2181sub swap_out { 2358sub swap_out {
2182 my ($self) = @_; 2359 my ($self) = @_;
2183 2360
2184 # save first because save cedes
2185 $self->save;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2361 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2362
2189 return if $self->players;
2190 return if $self->in_memory != cf::MAP_ACTIVE; 2363 return if $self->in_memory != cf::MAP_ACTIVE;
2191 return if $self->{deny_save}; 2364 return if $self->{deny_save};
2365 return if $self->players;
2192 2366
2367 # first deactivate the map and "unlink" it from the core
2368 $self->deactivate;
2369 $_->clear_links_to ($self) for values %cf::MAP;
2193 $self->in_memory (cf::MAP_SWAPPED); 2370 $self->in_memory (cf::MAP_SWAPPED);
2371
2372 # then atomically save
2373 $self->_save;
2374
2375 # then free the map
2376 $self->clear;
2377}
2378
2379sub reset_at {
2380 my ($self) = @_;
2381
2382 # TODO: safety, remove and allow resettable per-player maps
2383 return 1e99 if $self->{deny_reset};
2384
2385 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2386 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2387
2388 $time + $to
2389}
2390
2391sub should_reset {
2392 my ($self) = @_;
2393
2394 $self->reset_at <= $cf::RUNTIME
2395}
2396
2397sub reset {
2398 my ($self) = @_;
2399
2400 my $lock = cf::lock_acquire "map_data:$self->{path}";
2401
2402 return if $self->players;
2403
2404 cf::trace "resetting map ", $self->path, "\n";
2405
2406 $self->in_memory (cf::MAP_SWAPPED);
2407
2408 # need to save uniques path
2409 unless ($self->{deny_save}) {
2410 my $uniq = $self->uniq_path; utf8::encode $uniq;
2411
2412 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2413 if $uniq;
2414 }
2415
2416 delete $cf::MAP{$self->path};
2194 2417
2195 $self->deactivate; 2418 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP; 2419 $_->clear_links_to ($self) for values %cf::MAP;
2197 $self->clear; 2420 $self->clear;
2198}
2199
2200sub reset_at {
2201 my ($self) = @_;
2202
2203 # TODO: safety, remove and allow resettable per-player maps
2204 return 1e99 if $self->{deny_reset};
2205
2206 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2207 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2208
2209 $time + $to
2210}
2211
2212sub should_reset {
2213 my ($self) = @_;
2214
2215 $self->reset_at <= $cf::RUNTIME
2216}
2217
2218sub reset {
2219 my ($self) = @_;
2220
2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222
2223 return if $self->players;
2224
2225 warn "resetting map ", $self->path;
2226
2227 $self->in_memory (cf::MAP_SWAPPED);
2228
2229 # need to save uniques path
2230 unless ($self->{deny_save}) {
2231 my $uniq = $self->uniq_path; utf8::encode $uniq;
2232
2233 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2234 if $uniq;
2235 }
2236
2237 delete $cf::MAP{$self->path};
2238
2239 $self->deactivate;
2240 $_->clear_links_to ($self) for values %cf::MAP;
2241 $self->clear;
2242 2421
2243 $self->unlink_save; 2422 $self->unlink_save;
2244 $self->destroy; 2423 $self->destroy;
2245} 2424}
2246 2425
2254 2433
2255 delete $cf::MAP{$self->path}; 2434 delete $cf::MAP{$self->path};
2256 2435
2257 $self->unlink_save; 2436 $self->unlink_save;
2258 2437
2259 bless $self, "cf::map"; 2438 bless $self, "cf::map::wrap";
2260 delete $self->{deny_reset}; 2439 delete $self->{deny_reset};
2261 $self->{deny_save} = 1; 2440 $self->{deny_save} = 1;
2262 $self->reset_timeout (1); 2441 $self->reset_timeout (1);
2263 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2442 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2264 2443
2321 : normalise $_ 2500 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2501 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2502 ]
2324} 2503}
2325 2504
2505=item cf::map::static_maps
2506
2507Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2508file in the shared directory excluding F</styles> and F</editor>). May
2509block.
2510
2511=cut
2512
2513sub static_maps() {
2514 my @dirs = "";
2515 my @maps;
2516
2517 while (@dirs) {
2518 my $dir = shift @dirs;
2519
2520 next if $dir eq "/styles" || $dir eq "/editor";
2521
2522 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2523 or return;
2524
2525 for (@$files) {
2526 s/\.map$// or next;
2527 utf8::decode $_;
2528 push @maps, "$dir/$_";
2529 }
2530
2531 push @dirs, map "$dir/$_", @$dirs;
2532 }
2533
2534 \@maps
2535}
2536
2326=back 2537=back
2327 2538
2328=head3 cf::object 2539=head3 cf::object
2329 2540
2330=cut 2541=cut
2395 2606
2396our $SAY_CHANNEL = { 2607our $SAY_CHANNEL = {
2397 id => "say", 2608 id => "say",
2398 title => "Map", 2609 title => "Map",
2399 reply => "say ", 2610 reply => "say ",
2400 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2611 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2401}; 2612};
2402 2613
2403our $CHAT_CHANNEL = { 2614our $CHAT_CHANNEL = {
2404 id => "chat", 2615 id => "chat",
2405 title => "Chat", 2616 title => "Chat",
2462 2673
2463Freezes the player and moves him/her to a special map (C<{link}>). 2674Freezes the player and moves him/her to a special map (C<{link}>).
2464 2675
2465The player should be reasonably safe there for short amounts of time (e.g. 2676The player should be reasonably safe there for short amounts of time (e.g.
2466for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2677for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2467though, as the palyer cannot control the character while it is on the link 2678though, as the player cannot control the character while it is on the link
2468map. 2679map.
2469 2680
2470Will never block. 2681Will never block.
2471 2682
2472=item $player_object->leave_link ($map, $x, $y) 2683=item $player_object->leave_link ($map, $x, $y)
2493sub cf::object::player::enter_link { 2704sub cf::object::player::enter_link {
2494 my ($self) = @_; 2705 my ($self) = @_;
2495 2706
2496 $self->deactivate_recursive; 2707 $self->deactivate_recursive;
2497 2708
2709 ++$self->{_link_recursion};
2710
2498 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2711 return if UNIVERSAL::isa $self->map, "ext::map_link";
2499 2712
2500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2713 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501 if $self->map && $self->map->{path} ne "{link}"; 2714 if $self->map && $self->map->{path} ne "{link}";
2502 2715
2503 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2716 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2504} 2717}
2505 2718
2506sub cf::object::player::leave_link { 2719sub cf::object::player::leave_link {
2507 my ($self, $map, $x, $y) = @_; 2720 my ($self, $map, $x, $y) = @_;
2508 2721
2525 ($x, $y) = (-1, -1) 2738 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2739 unless (defined $x) && (defined $y);
2527 2740
2528 # use -1 or undef as default coordinates, not 0, 0 2741 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2742 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2743 if $x <= 0 && $y <= 0;
2531 2744
2532 $map->load; 2745 $map->load;
2533 $map->load_neighbours; 2746 $map->load_neighbours;
2534 2747
2535 return unless $self->contr->active; 2748 return unless $self->contr->active;
2536 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2537 $self->activate_recursive;
2538 2749
2539 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2750 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2540 $self->enter_map ($map, $x, $y); 2751 if ($self->enter_map ($map, $x, $y)) {
2541} 2752 # entering was successful
2753 delete $self->{_link_recursion};
2754 # only activate afterwards, to support waiting in hooks
2755 $self->activate_recursive;
2756 }
2542 2757
2758}
2759
2543=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2760=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2544 2761
2545Moves the player to the given map-path and coordinates by first freezing 2762Moves the player to the given map-path and coordinates by first freezing
2546her, loading and preparing them map, calling the provided $check callback 2763her, loading and preparing them map, calling the provided $check callback
2547that has to return the map if sucecssful, and then unfreezes the player on 2764that has to return the map if sucecssful, and then unfreezes the player on
2548the new (success) or old (failed) map position. In either case, $done will 2765the new (success) or old (failed) map position. In either case, $done will
2555 2772
2556our $GOTOGEN; 2773our $GOTOGEN;
2557 2774
2558sub cf::object::player::goto { 2775sub cf::object::player::goto {
2559 my ($self, $path, $x, $y, $check, $done) = @_; 2776 my ($self, $path, $x, $y, $check, $done) = @_;
2777
2778 if ($self->{_link_recursion} >= $MAX_LINKS) {
2779 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2780 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2781 ($path, $x, $y) = @$EMERGENCY_POSITION;
2782 }
2560 2783
2561 # do generation counting so two concurrent goto's will be executed in-order 2784 # do generation counting so two concurrent goto's will be executed in-order
2562 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2785 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2563 2786
2564 $self->enter_link; 2787 $self->enter_link;
2588 my $map = eval { 2811 my $map = eval {
2589 my $map = defined $path ? cf::map::find $path : undef; 2812 my $map = defined $path ? cf::map::find $path : undef;
2590 2813
2591 if ($map) { 2814 if ($map) {
2592 $map = $map->customise_for ($self); 2815 $map = $map->customise_for ($self);
2593 $map = $check->($map) if $check && $map; 2816 $map = $check->($map, $x, $y, $self) if $check && $map;
2594 } else { 2817 } else {
2595 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2818 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2596 } 2819 }
2597 2820
2598 $map 2821 $map
2606 if ($gen == $self->{_goto_generation}) { 2829 if ($gen == $self->{_goto_generation}) {
2607 delete $self->{_goto_generation}; 2830 delete $self->{_goto_generation};
2608 $self->leave_link ($map, $x, $y); 2831 $self->leave_link ($map, $x, $y);
2609 } 2832 }
2610 2833
2611 $done->() if $done; 2834 $done->($self) if $done;
2612 })->prio (1); 2835 })->prio (1);
2613} 2836}
2614 2837
2615=item $player_object->enter_exit ($exit_object) 2838=item $player_object->enter_exit ($exit_object)
2616 2839
2709 $self->message ("Something went wrong deep within the deliantra server. " 2932 $self->message ("Something went wrong deep within the deliantra server. "
2710 . "I'll try to bring you back to the map you were before. " 2933 . "I'll try to bring you back to the map you were before. "
2711 . "Please report this to the dungeon master!", 2934 . "Please report this to the dungeon master!",
2712 cf::NDI_UNIQUE | cf::NDI_RED); 2935 cf::NDI_UNIQUE | cf::NDI_RED);
2713 2936
2714 warn "ERROR in enter_exit: $@"; 2937 error "ERROR in enter_exit: $@";
2715 $self->leave_link; 2938 $self->leave_link;
2716 } 2939 }
2717 })->prio (1); 2940 })->prio (1);
2718} 2941}
2719 2942
2731sub cf::client::send_drawinfo { 2954sub cf::client::send_drawinfo {
2732 my ($self, $text, $flags) = @_; 2955 my ($self, $text, $flags) = @_;
2733 2956
2734 utf8::encode $text; 2957 utf8::encode $text;
2735 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2958 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2959}
2960
2961=item $client->send_big_packet ($pkt)
2962
2963Like C<send_packet>, but tries to compress large packets, and fragments
2964them as required.
2965
2966=cut
2967
2968our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2969
2970sub cf::client::send_big_packet {
2971 my ($self, $pkt) = @_;
2972
2973 # try lzf for large packets
2974 $pkt = "lzf " . Compress::LZF::compress $pkt
2975 if 1024 <= length $pkt and $self->{can_lzf};
2976
2977 # split very large packets
2978 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2979 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2980 $pkt = "frag";
2981 }
2982
2983 $self->send_packet ($pkt);
2736} 2984}
2737 2985
2738=item $client->send_msg ($channel, $msg, $color, [extra...]) 2986=item $client->send_msg ($channel, $msg, $color, [extra...])
2739 2987
2740Send a drawinfo or msg packet to the client, formatting the msg for the 2988Send a drawinfo or msg packet to the client, formatting the msg for the
2744 2992
2745=cut 2993=cut
2746 2994
2747# non-persistent channels (usually the info channel) 2995# non-persistent channels (usually the info channel)
2748our %CHANNEL = ( 2996our %CHANNEL = (
2997 "c/motd" => {
2998 id => "infobox",
2999 title => "MOTD",
3000 reply => undef,
3001 tooltip => "The message of the day",
3002 },
2749 "c/identify" => { 3003 "c/identify" => {
2750 id => "infobox", 3004 id => "infobox",
2751 title => "Identify", 3005 title => "Identify",
2752 reply => undef, 3006 reply => undef,
2753 tooltip => "Items recently identified", 3007 tooltip => "Items recently identified",
2755 "c/examine" => { 3009 "c/examine" => {
2756 id => "infobox", 3010 id => "infobox",
2757 title => "Examine", 3011 title => "Examine",
2758 reply => undef, 3012 reply => undef,
2759 tooltip => "Signs and other items you examined", 3013 tooltip => "Signs and other items you examined",
3014 },
3015 "c/shopinfo" => {
3016 id => "infobox",
3017 title => "Shop Info",
3018 reply => undef,
3019 tooltip => "What your bargaining skill tells you about the shop",
2760 }, 3020 },
2761 "c/book" => { 3021 "c/book" => {
2762 id => "infobox", 3022 id => "infobox",
2763 title => "Book", 3023 title => "Book",
2764 reply => undef, 3024 reply => undef,
2780 id => "infobox", 3040 id => "infobox",
2781 title => "Body Parts", 3041 title => "Body Parts",
2782 reply => undef, 3042 reply => undef,
2783 tooltip => "Shows which body parts you posess and are available", 3043 tooltip => "Shows which body parts you posess and are available",
2784 }, 3044 },
3045 "c/statistics" => {
3046 id => "infobox",
3047 title => "Statistics",
3048 reply => undef,
3049 tooltip => "Shows your primary statistics",
3050 },
2785 "c/skills" => { 3051 "c/skills" => {
2786 id => "infobox", 3052 id => "infobox",
2787 title => "Skills", 3053 title => "Skills",
2788 reply => undef, 3054 reply => undef,
2789 tooltip => "Shows your experience per skill and item power", 3055 tooltip => "Shows your experience per skill and item power",
3056 },
3057 "c/shopitems" => {
3058 id => "infobox",
3059 title => "Shop Items",
3060 reply => undef,
3061 tooltip => "Shows the items currently for sale in this shop",
3062 },
3063 "c/resistances" => {
3064 id => "infobox",
3065 title => "Resistances",
3066 reply => undef,
3067 tooltip => "Shows your resistances",
3068 },
3069 "c/pets" => {
3070 id => "infobox",
3071 title => "Pets",
3072 reply => undef,
3073 tooltip => "Shows information abotu your pets/a specific pet",
3074 },
3075 "c/perceiveself" => {
3076 id => "infobox",
3077 title => "Perceive Self",
3078 reply => undef,
3079 tooltip => "You gained detailed knowledge about yourself",
2790 }, 3080 },
2791 "c/uptime" => { 3081 "c/uptime" => {
2792 id => "infobox", 3082 id => "infobox",
2793 title => "Uptime", 3083 title => "Uptime",
2794 reply => undef, 3084 reply => undef,
2804 id => "party", 3094 id => "party",
2805 title => "Party", 3095 title => "Party",
2806 reply => "gsay ", 3096 reply => "gsay ",
2807 tooltip => "Messages and chat related to your party", 3097 tooltip => "Messages and chat related to your party",
2808 }, 3098 },
3099 "c/death" => {
3100 id => "death",
3101 title => "Death",
3102 reply => undef,
3103 tooltip => "Reason for and more info about your most recent death",
3104 },
3105 "c/say" => $SAY_CHANNEL,
3106 "c/chat" => $CHAT_CHANNEL,
2809); 3107);
2810 3108
2811sub cf::client::send_msg { 3109sub cf::client::send_msg {
2812 my ($self, $channel, $msg, $color, @extra) = @_; 3110 my ($self, $channel, $msg, $color, @extra) = @_;
2813 3111
2818 3116
2819 # check predefined channels, for the benefit of C 3117 # check predefined channels, for the benefit of C
2820 if ($CHANNEL{$channel}) { 3118 if ($CHANNEL{$channel}) {
2821 $channel = $CHANNEL{$channel}; 3119 $channel = $CHANNEL{$channel};
2822 3120
2823 $self->ext_msg (channel_info => $channel) 3121 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825
2826 $channel = $channel->{id}; 3122 $channel = $channel->{id};
2827 3123
2828 } elsif (ref $channel) { 3124 } elsif (ref $channel) {
2829 # send meta info to client, if not yet sent 3125 # send meta info to client, if not yet sent
2830 unless (exists $self->{channel}{$channel->{id}}) { 3126 unless (exists $self->{channel}{$channel->{id}}) {
2831 $self->{channel}{$channel->{id}} = $channel; 3127 $self->{channel}{$channel->{id}} = $channel;
2832 $self->ext_msg (channel_info => $channel) 3128 $self->ext_msg (channel_info => $channel);
2833 if $self->can_msg;
2834 } 3129 }
2835 3130
2836 $channel = $channel->{id}; 3131 $channel = $channel->{id};
2837 } 3132 }
2838 3133
2839 return unless @extra || length $msg; 3134 return unless @extra || length $msg;
2840 3135
2841 if ($self->can_msg) {
2842 # default colour, mask it out 3136 # default colour, mask it out
2843 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3137 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2844 if $color & cf::NDI_DEF; 3138 if $color & cf::NDI_DEF;
2845 3139
2846 my $pkt = "msg " 3140 my $pkt = "msg "
2847 . $self->{json_coder}->encode ( 3141 . $self->{json_coder}->encode (
2848 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3142 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2849 ); 3143 );
2850 3144
2851 # try lzf for large packets
2852 $pkt = "lzf " . Compress::LZF::compress $pkt
2853 if 1024 <= length $pkt and $self->{can_lzf};
2854
2855 # split very large packets
2856 if (8192 < length $pkt and $self->{can_lzf}) {
2857 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2858 $pkt = "frag";
2859 }
2860
2861 $self->send_packet ($pkt); 3145 $self->send_big_packet ($pkt);
2862 } else {
2863 if ($color >= 0) {
2864 # replace some tags by gcfclient-compatible ones
2865 for ($msg) {
2866 1 while
2867 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2868 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2869 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2870 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2871 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2872 }
2873
2874 $color &= cf::NDI_COLOR_MASK;
2875
2876 utf8::encode $msg;
2877
2878 if (0 && $msg =~ /\[/) {
2879 # COMMAND/INFO
2880 $self->send_packet ("drawextinfo $color 10 8 $msg")
2881 } else {
2882 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2883 $self->send_packet ("drawinfo $color $msg")
2884 }
2885 }
2886 }
2887} 3146}
2888 3147
2889=item $client->ext_msg ($type, @msg) 3148=item $client->ext_msg ($type, @msg)
2890 3149
2891Sends an ext event to the client. 3150Sends an ext event to the client.
2894 3153
2895sub cf::client::ext_msg($$@) { 3154sub cf::client::ext_msg($$@) {
2896 my ($self, $type, @msg) = @_; 3155 my ($self, $type, @msg) = @_;
2897 3156
2898 if ($self->extcmd == 2) { 3157 if ($self->extcmd == 2) {
2899 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3158 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2900 } elsif ($self->extcmd == 1) { # TODO: remove 3159 } elsif ($self->extcmd == 1) { # TODO: remove
2901 push @msg, msgtype => "event_$type"; 3160 push @msg, msgtype => "event_$type";
2902 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3161 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903 } 3162 }
2904} 3163}
2905 3164
2906=item $client->ext_reply ($msgid, @msg) 3165=item $client->ext_reply ($msgid, @msg)
2907 3166
2911 3170
2912sub cf::client::ext_reply($$@) { 3171sub cf::client::ext_reply($$@) {
2913 my ($self, $id, @msg) = @_; 3172 my ($self, $id, @msg) = @_;
2914 3173
2915 if ($self->extcmd == 2) { 3174 if ($self->extcmd == 2) {
2916 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3175 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2917 } elsif ($self->extcmd == 1) { 3176 } elsif ($self->extcmd == 1) {
2918 #TODO: version 1, remove 3177 #TODO: version 1, remove
2919 unshift @msg, msgtype => "reply", msgid => $id; 3178 unshift @msg, msgtype => "reply", msgid => $id;
2920 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2921 } 3180 }
2922} 3181}
2923 3182
2924=item $success = $client->query ($flags, "text", \&cb) 3183=item $success = $client->query ($flags, "text", \&cb)
2925 3184
2996 3255
2997 $ns->ext_reply ($reply, @reply) 3256 $ns->ext_reply ($reply, @reply)
2998 if $reply; 3257 if $reply;
2999 3258
3000 } else { 3259 } else {
3001 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3260 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3002 } 3261 }
3003 3262
3004 cf::override; 3263 cf::override;
3005 }, 3264 },
3006); 3265);
3026 3285
3027 $coro 3286 $coro
3028} 3287}
3029 3288
3030cf::client->attach ( 3289cf::client->attach (
3031 on_destroy => sub { 3290 on_client_destroy => sub {
3032 my ($ns) = @_; 3291 my ($ns) = @_;
3033 3292
3034 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3293 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3035 }, 3294 },
3036); 3295);
3052our $safe_hole = new Safe::Hole; 3311our $safe_hole = new Safe::Hole;
3053 3312
3054$SIG{FPE} = 'IGNORE'; 3313$SIG{FPE} = 'IGNORE';
3055 3314
3056$safe->permit_only (Opcode::opset qw( 3315$safe->permit_only (Opcode::opset qw(
3057 :base_core :base_mem :base_orig :base_math 3316 :base_core :base_mem :base_orig :base_math :base_loop
3058 grepstart grepwhile mapstart mapwhile 3317 grepstart grepwhile mapstart mapwhile
3059 sort time 3318 sort time
3060)); 3319));
3061 3320
3062# here we export the classes and methods available to script code 3321# here we export the classes and methods available to script code
3066The following functions and methods are available within a safe environment: 3325The following functions and methods are available within a safe environment:
3067 3326
3068 cf::object 3327 cf::object
3069 contr pay_amount pay_player map x y force_find force_add destroy 3328 contr pay_amount pay_player map x y force_find force_add destroy
3070 insert remove name archname title slaying race decrease split 3329 insert remove name archname title slaying race decrease split
3330 value
3071 3331
3072 cf::object::player 3332 cf::object::player
3073 player 3333 player
3074 3334
3075 cf::player 3335 cf::player
3081=cut 3341=cut
3082 3342
3083for ( 3343for (
3084 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3344 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3085 insert remove inv nrof name archname title slaying race 3345 insert remove inv nrof name archname title slaying race
3086 decrease split destroy change_exp)], 3346 decrease split destroy change_exp value msg lore send_msg)],
3087 ["cf::object::player" => qw(player)], 3347 ["cf::object::player" => qw(player)],
3088 ["cf::player" => qw(peaceful)], 3348 ["cf::player" => qw(peaceful send_msg)],
3089 ["cf::map" => qw(trigger)], 3349 ["cf::map" => qw(trigger)],
3090) { 3350) {
3091 no strict 'refs';
3092 my ($pkg, @funs) = @$_; 3351 my ($pkg, @funs) = @$_;
3093 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3352 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3094 for @funs; 3353 for @funs;
3095} 3354}
3096 3355
3111 3370
3112 my $qcode = $code; 3371 my $qcode = $code;
3113 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3372 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3114 $qcode =~ s/\n/\\n/g; 3373 $qcode =~ s/\n/\\n/g;
3115 3374
3375 %vars = (_dummy => 0) unless %vars;
3376
3377 my @res;
3116 local $_; 3378 local $_;
3117 local @safe::cf::_safe_eval_args = values %vars;
3118 3379
3119 my $eval = 3380 my $eval =
3120 "do {\n" 3381 "do {\n"
3121 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3382 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3122 . "#line 0 \"{$qcode}\"\n" 3383 . "#line 0 \"{$qcode}\"\n"
3123 . $code 3384 . $code
3124 . "\n}" 3385 . "\n}"
3125 ; 3386 ;
3126 3387
3388 if ($CFG{safe_eval}) {
3127 sub_generation_inc; 3389 sub_generation_inc;
3390 local @safe::cf::_safe_eval_args = values %vars;
3128 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3391 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3129 sub_generation_inc; 3392 sub_generation_inc;
3393 } else {
3394 local @cf::_safe_eval_args = values %vars;
3395 @res = wantarray ? eval eval : scalar eval $eval;
3396 }
3130 3397
3131 if ($@) { 3398 if ($@) {
3132 warn "$@"; 3399 warn "$@",
3133 warn "while executing safe code '$code'\n"; 3400 "while executing safe code '$code'\n",
3134 warn "with arguments " . (join " ", %vars) . "\n"; 3401 "with arguments " . (join " ", %vars) . "\n";
3135 } 3402 }
3136 3403
3137 wantarray ? @res : $res[0] 3404 wantarray ? @res : $res[0]
3138} 3405}
3139 3406
3153=cut 3420=cut
3154 3421
3155sub register_script_function { 3422sub register_script_function {
3156 my ($fun, $cb) = @_; 3423 my ($fun, $cb) = @_;
3157 3424
3158 no strict 'refs'; 3425 $fun = "safe::$fun" if $CFG{safe_eval};
3159 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3426 *$fun = $safe_hole->wrap ($cb);
3160} 3427}
3161 3428
3162=back 3429=back
3163 3430
3164=cut 3431=cut
3173 # for this (global event?) 3440 # for this (global event?)
3174 %ext::player_env::MUSIC_FACE_CACHE = (); 3441 %ext::player_env::MUSIC_FACE_CACHE = ();
3175 3442
3176 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3443 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3177 3444
3178 warn "loading facedata from $path\n"; 3445 trace "loading facedata from $path\n";
3179 3446
3180 my $facedata; 3447 my $facedata = decode_storable load_file $path;
3181 0 < aio_load $path, $facedata
3182 or die "$path: $!";
3183
3184 $facedata = Coro::Storable::thaw $facedata;
3185 3448
3186 $facedata->{version} == 2 3449 $facedata->{version} == 2
3187 or cf::cleanup "$path: version mismatch, cannot proceed."; 3450 or cf::cleanup "$path: version mismatch, cannot proceed.";
3188 3451
3189 # patch in the exptable 3452 # patch in the exptable
3453 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3190 $facedata->{resource}{"res/exp_table"} = { 3454 $facedata->{resource}{"res/exp_table"} = {
3191 type => FT_RSRC, 3455 type => FT_RSRC,
3192 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3456 data => $exp_table,
3457 hash => (Digest::MD5::md5 $exp_table),
3193 }; 3458 };
3194 cf::cede_to_tick; 3459 cf::cede_to_tick;
3195 3460
3196 { 3461 {
3197 my $faces = $facedata->{faceinfo}; 3462 my $faces = $facedata->{faceinfo};
3199 while (my ($face, $info) = each %$faces) { 3464 while (my ($face, $info) = each %$faces) {
3200 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3465 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3201 3466
3202 cf::face::set_visibility $idx, $info->{visibility}; 3467 cf::face::set_visibility $idx, $info->{visibility};
3203 cf::face::set_magicmap $idx, $info->{magicmap}; 3468 cf::face::set_magicmap $idx, $info->{magicmap};
3204 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3469 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3205 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3470 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3471 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3206 3472
3207 cf::cede_to_tick; 3473 cf::cede_to_tick;
3208 } 3474 }
3209 3475
3210 while (my ($face, $info) = each %$faces) { 3476 while (my ($face, $info) = each %$faces) {
3215 3481
3216 if (my $smooth = cf::face::find $info->{smooth}) { 3482 if (my $smooth = cf::face::find $info->{smooth}) {
3217 cf::face::set_smooth $idx, $smooth; 3483 cf::face::set_smooth $idx, $smooth;
3218 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3484 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3219 } else { 3485 } else {
3220 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3486 error "smooth face '$info->{smooth}' not found for face '$face'";
3221 } 3487 }
3222 3488
3223 cf::cede_to_tick; 3489 cf::cede_to_tick;
3224 } 3490 }
3225 } 3491 }
3234 3500
3235 cf::anim::invalidate_all; # d'oh 3501 cf::anim::invalidate_all; # d'oh
3236 } 3502 }
3237 3503
3238 { 3504 {
3239 # TODO: for gcfclient pleasure, we should give resources
3240 # that gcfclient doesn't grok a >10000 face index.
3241 my $res = $facedata->{resource}; 3505 my $res = $facedata->{resource};
3242 3506
3243 while (my ($name, $info) = each %$res) { 3507 while (my ($name, $info) = each %$res) {
3244 if (defined $info->{type}) { 3508 if (defined $info->{type}) {
3245 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3509 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3246 my $data;
3247 3510
3248 if ($info->{type} & 1) { 3511 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3249 # prepend meta info
3250
3251 my $meta = $enc->encode ({
3252 name => $name,
3253 %{ $info->{meta} || {} },
3254 });
3255
3256 $data = pack "(w/a*)*", $meta, $info->{data};
3257 } else {
3258 $data = $info->{data};
3259 }
3260
3261 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3262 cf::face::set_type $idx, $info->{type}; 3512 cf::face::set_type $idx, $info->{type};
3263 } else { 3513 } else {
3264 $RESOURCE{$name} = $info; 3514 $RESOURCE{$name} = $info; # unused
3265 } 3515 }
3266 3516
3267 cf::cede_to_tick; 3517 cf::cede_to_tick;
3268 } 3518 }
3269 } 3519 }
3270 3520
3271 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3521 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3272 3522
3273 1 3523 1
3274} 3524}
3275
3276cf::global->attach (on_resource_update => sub {
3277 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3278 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3279
3280 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3281 my $sound = $soundconf->{compat}[$_]
3282 or next;
3283
3284 my $face = cf::face::find "sound/$sound->[1]";
3285 cf::sound::set $sound->[0] => $face;
3286 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3287 }
3288
3289 while (my ($k, $v) = each %{$soundconf->{event}}) {
3290 my $face = cf::face::find "sound/$v";
3291 cf::sound::set $k => $face;
3292 }
3293 }
3294});
3295 3525
3296register_exticmd fx_want => sub { 3526register_exticmd fx_want => sub {
3297 my ($ns, $want) = @_; 3527 my ($ns, $want) = @_;
3298 3528
3299 while (my ($k, $v) = each %$want) { 3529 while (my ($k, $v) = each %$want) {
3338sub reload_treasures { 3568sub reload_treasures {
3339 load_resource_file "$DATADIR/treasures" 3569 load_resource_file "$DATADIR/treasures"
3340 or die "unable to load treasurelists\n"; 3570 or die "unable to load treasurelists\n";
3341} 3571}
3342 3572
3573sub reload_sound {
3574 trace "loading sound config from $DATADIR/sound\n";
3575
3576 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3577
3578 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3579 my $sound = $soundconf->{compat}[$_]
3580 or next;
3581
3582 my $face = cf::face::find "sound/$sound->[1]";
3583 cf::sound::set $sound->[0] => $face;
3584 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3585 }
3586
3587 while (my ($k, $v) = each %{$soundconf->{event}}) {
3588 my $face = cf::face::find "sound/$v";
3589 cf::sound::set $k => $face;
3590 }
3591}
3592
3343sub reload_resources { 3593sub reload_resources {
3344 warn "reloading resource files...\n"; 3594 trace "reloading resource files...\n";
3345 3595
3596 reload_exp_table;
3597 reload_materials;
3346 reload_facedata; 3598 reload_facedata;
3599 reload_sound;
3347 reload_archetypes; 3600 reload_archetypes;
3348 reload_regions; 3601 reload_regions;
3349 reload_treasures; 3602 reload_treasures;
3350 3603
3351 warn "finished reloading resource files\n"; 3604 trace "finished reloading resource files\n";
3352} 3605}
3353 3606
3354sub reload_config { 3607sub reload_config {
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3608 trace "reloading config file...\n";
3356 or return;
3357 3609
3358 local $/; 3610 my $config = load_file "$CONFDIR/config";
3359 *CFG = YAML::Load <$fh>; 3611 utf8::decode $config;
3612 *CFG = decode_yaml $config;
3360 3613
3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3614 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3362 3615
3363 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3616 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3364 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3617 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3365 3618
3366 if (exists $CFG{mlockall}) { 3619 if (exists $CFG{mlockall}) {
3389 3642
3390 seek $fh, 0, 0; 3643 seek $fh, 0, 0;
3391 print $fh $$; 3644 print $fh $$;
3392} 3645}
3393 3646
3647sub main_loop {
3648 trace "EV::loop starting\n";
3649 if (1) {
3650 EV::loop;
3651 }
3652 trace "EV::loop returned\n";
3653 goto &main_loop unless $REALLY_UNLOOP;
3654}
3655
3394sub main { 3656sub main {
3395 cf::init_globals; # initialise logging 3657 cf::init_globals; # initialise logging
3396 3658
3397 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3659 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3398 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3660 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3399 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3661 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3400 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3662 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3401
3402 cf::init_experience;
3403 cf::init_anim;
3404 cf::init_attackmess;
3405 cf::init_dynamic;
3406 cf::init_block;
3407 3663
3408 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3664 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3409 3665
3410 # we must not ever block the main coroutine 3666 # we must not ever block the main coroutine
3411 local $Coro::idle = sub { 3667 local $Coro::idle = sub {
3417 }; 3673 };
3418 3674
3419 evthread_start IO::AIO::poll_fileno; 3675 evthread_start IO::AIO::poll_fileno;
3420 3676
3421 cf::sync_job { 3677 cf::sync_job {
3678 cf::incloader::init ();
3679
3680 cf::init_anim;
3681 cf::init_attackmess;
3682 cf::init_dynamic;
3683
3684 cf::load_settings;
3685
3422 reload_resources; 3686 reload_resources;
3423 reload_config; 3687 reload_config;
3424 db_init; 3688 db_init;
3425 3689
3426 cf::load_settings;
3427 cf::load_materials;
3428 cf::init_uuid; 3690 cf::init_uuid;
3429 cf::init_signals; 3691 cf::init_signals;
3430 cf::init_commands;
3431 cf::init_skills; 3692 cf::init_skills;
3432 3693
3433 cf::init_beforeplay; 3694 cf::init_beforeplay;
3434 3695
3435 atomic; 3696 atomic;
3437 load_extensions; 3698 load_extensions;
3438 3699
3439 utime time, time, $RUNTIMEFILE; 3700 utime time, time, $RUNTIMEFILE;
3440 3701
3441 # no (long-running) fork's whatsoever before this point(!) 3702 # no (long-running) fork's whatsoever before this point(!)
3703 use POSIX ();
3442 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3704 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3443 3705
3444 (pop @POST_INIT)->(0) while @POST_INIT; 3706 cf::_post_init 0;
3445 }; 3707 };
3446 3708
3447 EV::loop; 3709 cf::object::thawer::errors_are_fatal 0;
3710 info "parse errors in files are no longer fatal from this point on.\n";
3711
3712 my $free_main; $free_main = EV::idle sub {
3713 undef $free_main;
3714 undef &main; # free gobs of memory :)
3715 };
3716
3717 goto &main_loop;
3448} 3718}
3449 3719
3450############################################################################# 3720#############################################################################
3451# initialisation and cleanup 3721# initialisation and cleanup
3452 3722
3453# install some emergency cleanup handlers 3723# install some emergency cleanup handlers
3454BEGIN { 3724BEGIN {
3455 our %SIGWATCHER = (); 3725 our %SIGWATCHER = ();
3456 for my $signal (qw(INT HUP TERM)) { 3726 for my $signal (qw(INT HUP TERM)) {
3457 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3727 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3458 cf::cleanup "SIG$signal"; 3728 cf::cleanup "SIG$signal";
3459 }; 3729 };
3460 } 3730 }
3461} 3731}
3462 3732
3463sub write_runtime_sync { 3733sub write_runtime_sync {
3734 my $t0 = AE::time;
3735
3464 # first touch the runtime file to show we are still running: 3736 # first touch the runtime file to show we are still running:
3465 # the fsync below can take a very very long time. 3737 # the fsync below can take a very very long time.
3466 3738
3467 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3739 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3468 3740
3469 my $guard = cf::lock_acquire "write_runtime"; 3741 my $guard = cf::lock_acquire "write_runtime";
3470 3742
3471 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3743 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3472 or return; 3744 or return;
3473 3745
3474 my $value = $cf::RUNTIME + 90 + 10; 3746 my $value = $cf::RUNTIME + 90 + 10;
3475 # 10 is the runtime save interval, for a monotonic clock 3747 # 10 is the runtime save interval, for a monotonic clock
3476 # 60 allows for the watchdog to kill the server. 3748 # 60 allows for the watchdog to kill the server.
3489 or return; 3761 or return;
3490 3762
3491 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3763 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3492 and return; 3764 and return;
3493 3765
3494 warn "runtime file written.\n"; 3766 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3495 3767
3496 1 3768 1
3497} 3769}
3498 3770
3499our $uuid_lock; 3771our $uuid_lock;
3511 or return; 3783 or return;
3512 3784
3513 my $value = uuid_seq uuid_cur; 3785 my $value = uuid_seq uuid_cur;
3514 3786
3515 unless ($value) { 3787 unless ($value) {
3516 warn "cowardly refusing to write zero uuid value!\n"; 3788 info "cowardly refusing to write zero uuid value!\n";
3517 return; 3789 return;
3518 } 3790 }
3519 3791
3520 my $value = uuid_str $value + $uuid_skip; 3792 my $value = uuid_str $value + $uuid_skip;
3521 $uuid_skip = 0; 3793 $uuid_skip = 0;
3531 or return; 3803 or return;
3532 3804
3533 aio_rename "$uuid~", $uuid 3805 aio_rename "$uuid~", $uuid
3534 and return; 3806 and return;
3535 3807
3536 warn "uuid file written ($value).\n"; 3808 trace "uuid file written ($value).\n";
3537 3809
3538 1 3810 1
3539 3811
3540} 3812}
3541 3813
3547} 3819}
3548 3820
3549sub emergency_save() { 3821sub emergency_save() {
3550 my $freeze_guard = cf::freeze_mainloop; 3822 my $freeze_guard = cf::freeze_mainloop;
3551 3823
3552 warn "emergency_perl_save: enter\n"; 3824 info "emergency_perl_save: enter\n";
3825
3826 # this is a trade-off: we want to be very quick here, so
3827 # save all maps without fsync, and later call a global sync
3828 # (which in turn might be very very slow)
3829 local $USE_FSYNC = 0;
3553 3830
3554 cf::sync_job { 3831 cf::sync_job {
3555 # this is a trade-off: we want to be very quick here, so 3832 cf::write_runtime_sync; # external watchdog should not bark
3556 # save all maps without fsync, and later call a global sync
3557 # (which in turn might be very very slow)
3558 local $USE_FSYNC = 0;
3559 3833
3560 # use a peculiar iteration method to avoid tripping on perl 3834 # use a peculiar iteration method to avoid tripping on perl
3561 # refcount bugs in for. also avoids problems with players 3835 # refcount bugs in for. also avoids problems with players
3562 # and maps saved/destroyed asynchronously. 3836 # and maps saved/destroyed asynchronously.
3563 warn "emergency_perl_save: begin player save\n"; 3837 info "emergency_perl_save: begin player save\n";
3564 for my $login (keys %cf::PLAYER) { 3838 for my $login (keys %cf::PLAYER) {
3565 my $pl = $cf::PLAYER{$login} or next; 3839 my $pl = $cf::PLAYER{$login} or next;
3566 $pl->valid or next; 3840 $pl->valid or next;
3567 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3841 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3568 $pl->save; 3842 $pl->save;
3569 } 3843 }
3570 warn "emergency_perl_save: end player save\n"; 3844 info "emergency_perl_save: end player save\n";
3571 3845
3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3572 warn "emergency_perl_save: begin map save\n"; 3848 info "emergency_perl_save: begin map save\n";
3573 for my $path (keys %cf::MAP) { 3849 for my $path (keys %cf::MAP) {
3574 my $map = $cf::MAP{$path} or next; 3850 my $map = $cf::MAP{$path} or next;
3575 $map->valid or next; 3851 $map->valid or next;
3576 $map->save; 3852 $map->save;
3577 } 3853 }
3578 warn "emergency_perl_save: end map save\n"; 3854 info "emergency_perl_save: end map save\n";
3579 3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3580 warn "emergency_perl_save: begin database checkpoint\n"; 3858 info "emergency_perl_save: begin database checkpoint\n";
3581 BDB::db_env_txn_checkpoint $DB_ENV; 3859 BDB::db_env_txn_checkpoint $DB_ENV;
3582 warn "emergency_perl_save: end database checkpoint\n"; 3860 info "emergency_perl_save: end database checkpoint\n";
3583 3861
3584 warn "emergency_perl_save: begin write uuid\n"; 3862 info "emergency_perl_save: begin write uuid\n";
3585 write_uuid_sync 1; 3863 write_uuid_sync 1;
3586 warn "emergency_perl_save: end write uuid\n"; 3864 info "emergency_perl_save: end write uuid\n";
3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 trace "emergency_perl_save: syncing database to disk";
3869 BDB::db_env_txn_checkpoint $DB_ENV;
3870
3871 info "emergency_perl_save: starting sync\n";
3872 IO::AIO::aio_sync sub {
3873 info "emergency_perl_save: finished sync\n";
3874 };
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: flushing outstanding aio requests";
3879 while (IO::AIO::nreqs || BDB::nreqs) {
3880 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3881 }
3882
3883 cf::write_runtime_sync; # external watchdog should not bark
3587 }; 3884 };
3588 3885
3589 warn "emergency_perl_save: starting sync()\n";
3590 IO::AIO::aio_sync sub {
3591 warn "emergency_perl_save: finished sync()\n";
3592 };
3593
3594 warn "emergency_perl_save: leave\n"; 3886 info "emergency_perl_save: leave\n";
3595} 3887}
3596 3888
3597sub post_cleanup { 3889sub post_cleanup {
3598 my ($make_core) = @_; 3890 my ($make_core) = @_;
3599 3891
3892 IO::AIO::flush;
3893
3600 warn Carp::longmess "post_cleanup backtrace" 3894 error Carp::longmess "post_cleanup backtrace"
3601 if $make_core; 3895 if $make_core;
3602 3896
3603 my $fh = pidfile; 3897 my $fh = pidfile;
3604 unlink $PIDFILE if <$fh> == $$; 3898 unlink $PIDFILE if <$fh> == $$;
3605} 3899}
3625 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3919 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3626 for my $name (keys %$leaf_symtab) { 3920 for my $name (keys %$leaf_symtab) {
3627 _gv_clear *{"$pkg$name"}; 3921 _gv_clear *{"$pkg$name"};
3628# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3922# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3629 } 3923 }
3630 warn "cleared package $pkg\n";#d#
3631} 3924}
3632 3925
3633sub do_reload_perl() { 3926sub do_reload_perl() {
3634 # can/must only be called in main 3927 # can/must only be called in main
3635 if ($Coro::current != $Coro::main) { 3928 unless (in_main) {
3636 warn "can only reload from main coroutine"; 3929 error "can only reload from main coroutine";
3637 return; 3930 return;
3638 } 3931 }
3639 3932
3640 return if $RELOAD++; 3933 return if $RELOAD++;
3641 3934
3642 my $t1 = EV::time; 3935 my $t1 = AE::time;
3643 3936
3644 while ($RELOAD) { 3937 while ($RELOAD) {
3645 warn "reloading..."; 3938 cf::get_slot 0.1, -1, "reload_perl";
3939 info "perl_reload: reloading...";
3646 3940
3647 warn "entering sync_job"; 3941 trace "perl_reload: entering sync_job";
3648 3942
3649 cf::sync_job { 3943 cf::sync_job {
3650 cf::write_runtime_sync; # external watchdog should not bark
3651 cf::emergency_save; 3944 #cf::emergency_save;
3652 cf::write_runtime_sync; # external watchdog should not bark
3653 3945
3654 warn "syncing database to disk";
3655 BDB::db_env_txn_checkpoint $DB_ENV;
3656
3657 # if anything goes wrong in here, we should simply crash as we already saved
3658
3659 warn "flushing outstanding aio requests";
3660 while (IO::AIO::nreqs || BDB::nreqs) {
3661 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3662 }
3663
3664 warn "cancelling all extension coros"; 3946 trace "perl_reload: cancelling all extension coros";
3665 $_->cancel for values %EXT_CORO; 3947 $_->cancel for values %EXT_CORO;
3666 %EXT_CORO = (); 3948 %EXT_CORO = ();
3667 3949
3668 warn "removing commands"; 3950 trace "perl_reload: removing commands";
3669 %COMMAND = (); 3951 %COMMAND = ();
3670 3952
3671 warn "removing ext/exti commands"; 3953 trace "perl_reload: removing ext/exti commands";
3672 %EXTCMD = (); 3954 %EXTCMD = ();
3673 %EXTICMD = (); 3955 %EXTICMD = ();
3674 3956
3675 warn "unloading/nuking all extensions"; 3957 trace "perl_reload: unloading/nuking all extensions";
3676 for my $pkg (@EXTS) { 3958 for my $pkg (@EXTS) {
3677 warn "... unloading $pkg"; 3959 trace "... unloading $pkg";
3678 3960
3679 if (my $cb = $pkg->can ("unload")) { 3961 if (my $cb = $pkg->can ("unload")) {
3680 eval { 3962 eval {
3681 $cb->($pkg); 3963 $cb->($pkg);
3682 1 3964 1
3683 } or warn "$pkg unloaded, but with errors: $@"; 3965 } or error "$pkg unloaded, but with errors: $@";
3684 } 3966 }
3685 3967
3686 warn "... clearing $pkg"; 3968 trace "... clearing $pkg";
3687 clear_package $pkg; 3969 clear_package $pkg;
3688 } 3970 }
3689 3971
3690 warn "unloading all perl modules loaded from $LIBDIR"; 3972 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3691 while (my ($k, $v) = each %INC) { 3973 while (my ($k, $v) = each %INC) {
3692 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3974 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3693 3975
3694 warn "... unloading $k"; 3976 trace "... unloading $k";
3695 delete $INC{$k}; 3977 delete $INC{$k};
3696 3978
3697 $k =~ s/\.pm$//; 3979 $k =~ s/\.pm$//;
3698 $k =~ s/\//::/g; 3980 $k =~ s/\//::/g;
3699 3981
3702 } 3984 }
3703 3985
3704 clear_package $k; 3986 clear_package $k;
3705 } 3987 }
3706 3988
3707 warn "getting rid of safe::, as good as possible"; 3989 trace "perl_reload: getting rid of safe::, as good as possible";
3708 clear_package "safe::$_" 3990 clear_package "safe::$_"
3709 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3991 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3710 3992
3711 warn "unloading cf.pm \"a bit\""; 3993 trace "perl_reload: unloading cf.pm \"a bit\"";
3712 delete $INC{"cf.pm"}; 3994 delete $INC{"cf.pm"};
3713 delete $INC{"cf/pod.pm"}; 3995 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3714 3996
3715 # don't, removes xs symbols, too, 3997 # don't, removes xs symbols, too,
3716 # and global variables created in xs 3998 # and global variables created in xs
3717 #clear_package __PACKAGE__; 3999 #clear_package __PACKAGE__;
3718 4000
3719 warn "unload completed, starting to reload now"; 4001 info "perl_reload: unload completed, starting to reload now";
3720 4002
3721 warn "reloading cf.pm"; 4003 trace "perl_reload: reloading cf.pm";
3722 require cf; 4004 require cf;
3723 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4005 cf::_connect_to_perl_1;
3724 4006
3725 warn "loading config and database again"; 4007 trace "perl_reload: loading config and database again";
3726 cf::reload_config; 4008 cf::reload_config;
3727 4009
3728 warn "loading extensions"; 4010 trace "perl_reload: loading extensions";
3729 cf::load_extensions; 4011 cf::load_extensions;
3730 4012
3731 if ($REATTACH_ON_RELOAD) { 4013 if ($REATTACH_ON_RELOAD) {
3732 warn "reattaching attachments to objects/players"; 4014 trace "perl_reload: reattaching attachments to objects/players";
3733 _global_reattach; # objects, sockets 4015 _global_reattach; # objects, sockets
3734 warn "reattaching attachments to maps"; 4016 trace "perl_reload: reattaching attachments to maps";
3735 reattach $_ for values %MAP; 4017 reattach $_ for values %MAP;
3736 warn "reattaching attachments to players"; 4018 trace "perl_reload: reattaching attachments to players";
3737 reattach $_ for values %PLAYER; 4019 reattach $_ for values %PLAYER;
3738 } 4020 }
3739 4021
3740 warn "running post_init jobs"; 4022 cf::_post_init 1;
3741 (pop @POST_INIT)->(1) while @POST_INIT;
3742 4023
3743 warn "leaving sync_job"; 4024 trace "perl_reload: leaving sync_job";
3744 4025
3745 1 4026 1
3746 } or do { 4027 } or do {
3747 warn $@; 4028 error $@;
3748 cf::cleanup "error while reloading, exiting."; 4029 cf::cleanup "perl_reload: error, exiting.";
3749 }; 4030 };
3750 4031
3751 warn "reloaded";
3752 --$RELOAD; 4032 --$RELOAD;
3753 } 4033 }
3754 4034
3755 $t1 = EV::time - $t1; 4035 $t1 = AE::time - $t1;
3756 warn "reload completed in ${t1}s\n"; 4036 info "perl_reload: completed in ${t1}s\n";
3757}; 4037};
3758 4038
3759our $RELOAD_WATCHER; # used only during reload 4039our $RELOAD_WATCHER; # used only during reload
3760 4040
3761sub reload_perl() { 4041sub reload_perl() {
3763 # coro crashes during coro_state_free->destroy here. 4043 # coro crashes during coro_state_free->destroy here.
3764 4044
3765 $RELOAD_WATCHER ||= cf::async { 4045 $RELOAD_WATCHER ||= cf::async {
3766 Coro::AIO::aio_wait cache_extensions; 4046 Coro::AIO::aio_wait cache_extensions;
3767 4047
3768 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4048 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3769 do_reload_perl; 4049 do_reload_perl;
3770 undef $RELOAD_WATCHER; 4050 undef $RELOAD_WATCHER;
3771 }; 4051 };
3772 }; 4052 };
3773} 4053}
3782 reload_perl; 4062 reload_perl;
3783 }; 4063 };
3784 } 4064 }
3785}; 4065};
3786 4066
3787unshift @INC, $LIBDIR; 4067#############################################################################
3788 4068
3789my $bug_warning = 0; 4069my $bug_warning = 0;
3790 4070
3791our @WAIT_FOR_TICK; 4071our @WAIT_FOR_TICK;
3792our @WAIT_FOR_TICK_BEGIN; 4072our @WAIT_FOR_TICK_BEGIN;
3793 4073
3794sub wait_for_tick { 4074sub wait_for_tick() {
3795 return if tick_inhibit || $Coro::current == $Coro::main; 4075 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3796 4076
3797 my $signal = new Coro::Signal; 4077 my $signal = new Coro::Signal;
3798 push @WAIT_FOR_TICK, $signal; 4078 push @WAIT_FOR_TICK, $signal;
3799 $signal->wait; 4079 $signal->wait;
3800} 4080}
3801 4081
3802sub wait_for_tick_begin { 4082sub wait_for_tick_begin() {
3803 return if tick_inhibit || $Coro::current == $Coro::main; 4083 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3804 4084
3805 my $signal = new Coro::Signal; 4085 my $signal = new Coro::Signal;
3806 push @WAIT_FOR_TICK_BEGIN, $signal; 4086 push @WAIT_FOR_TICK_BEGIN, $signal;
3807 $signal->wait; 4087 $signal->wait;
3808} 4088}
3814 return; 4094 return;
3815 } 4095 }
3816 4096
3817 cf::server_tick; # one server iteration 4097 cf::server_tick; # one server iteration
3818 4098
4099 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4100
3819 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4101 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3820 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4102 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3821 Coro::async_pool { 4103 Coro::async_pool {
3822 $Coro::current->{desc} = "runtime saver"; 4104 $Coro::current->{desc} = "runtime saver";
3823 write_runtime_sync 4105 write_runtime_sync
3824 or warn "ERROR: unable to write runtime file: $!"; 4106 or error "ERROR: unable to write runtime file: $!";
3825 }; 4107 };
3826 } 4108 }
3827 4109
3828 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4110 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3829 $sig->send; 4111 $sig->send;
3837 4119
3838 if (0) { 4120 if (0) {
3839 if ($NEXT_TICK) { 4121 if ($NEXT_TICK) {
3840 my $jitter = $TICK_START - $NEXT_TICK; 4122 my $jitter = $TICK_START - $NEXT_TICK;
3841 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4123 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3842 warn "jitter $JITTER\n";#d# 4124 debug "jitter $JITTER\n";#d#
3843 } 4125 }
3844 } 4126 }
3845} 4127}
3846 4128
3847{ 4129{
3848 # configure BDB 4130 # configure BDB
3849 4131
3850 BDB::min_parallel 8; 4132 BDB::min_parallel 16;
3851 BDB::max_poll_reqs $TICK * 0.1; 4133 BDB::max_poll_reqs $TICK * 0.1;
3852 $AnyEvent::BDB::WATCHER->priority (1); 4134 $AnyEvent::BDB::WATCHER->priority (1);
3853 4135
3854 unless ($DB_ENV) { 4136 unless ($DB_ENV) {
3855 $DB_ENV = BDB::db_env_create; 4137 $DB_ENV = BDB::db_env_create;
3892 IO::AIO::min_parallel 8; 4174 IO::AIO::min_parallel 8;
3893 IO::AIO::max_poll_time $TICK * 0.1; 4175 IO::AIO::max_poll_time $TICK * 0.1;
3894 undef $AnyEvent::AIO::WATCHER; 4176 undef $AnyEvent::AIO::WATCHER;
3895} 4177}
3896 4178
3897my $_log_backtrace; 4179our $_log_backtrace;
4180our $_log_backtrace_last;
3898 4181
3899sub _log_backtrace { 4182sub _log_backtrace {
3900 my ($msg, @addr) = @_; 4183 my ($msg, @addr) = @_;
3901 4184
3902 $msg =~ s/\n//; 4185 $msg =~ s/\n$//;
3903 4186
4187 if ($_log_backtrace_last eq $msg) {
4188 LOG llevInfo, "[ABT] $msg\n";
4189 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3904 # limit the # of concurrent backtraces 4190 # limit the # of concurrent backtraces
3905 if ($_log_backtrace < 2) { 4191 } elsif ($_log_backtrace < 2) {
4192 $_log_backtrace_last = $msg;
3906 ++$_log_backtrace; 4193 ++$_log_backtrace;
3907 my $perl_bt = Carp::longmess $msg; 4194 my $perl_bt = Carp::longmess $msg;
3908 async { 4195 async {
3909 $Coro::current->{desc} = "abt $msg"; 4196 $Coro::current->{desc} = "abt $msg";
3910 4197
3930 LOG llevInfo, "[ABT] $_\n" for @bt; 4217 LOG llevInfo, "[ABT] $_\n" for @bt;
3931 --$_log_backtrace; 4218 --$_log_backtrace;
3932 }; 4219 };
3933 } else { 4220 } else {
3934 LOG llevInfo, "[ABT] $msg\n"; 4221 LOG llevInfo, "[ABT] $msg\n";
3935 LOG llevInfo, "[ABT] [suppressed]\n"; 4222 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3936 } 4223 }
3937} 4224}
3938 4225
3939# load additional modules 4226# load additional modules
3940use cf::pod; 4227require "cf/$_.pm" for @EXTRA_MODULES;
4228cf::_connect_to_perl_2;
3941 4229
3942END { cf::emergency_save } 4230END { cf::emergency_save }
3943 4231
39441 42321
3945 4233

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines