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.470 by root, Sun Apr 26 19:42:45 2009 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 qw(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 on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
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
117our @EXTRA_MODULES = qw(pod mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
118 132
119our %CFG; 133our %CFG;
120 134
121our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 136our $RUNTIME;
134our $JITTER; # average jitter 148our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
136 150
137our @POST_INIT; 151our @POST_INIT;
138 152
139our $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 :)
140 155
141binmode STDOUT; 156binmode STDOUT;
142binmode STDERR; 157binmode STDERR;
143 158
144# read virtual server time, if available 159# read virtual server time, if available
155 170
156our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
157 172
158sub cf::map::normalise; 173sub cf::map::normalise;
159 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::"} };
189
160############################################################################# 190#############################################################################
161 191
162=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
163 193
164=over 4 194=over 4
205from wherever your confdir points to. 235from wherever your confdir points to.
206 236
207=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
208 238
209These 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
210returns 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
211per 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.
212 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
213=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
214 249
215This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
216C<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
217that call. 252that call.
218 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
219=back 260=back
220 261
221=cut 262=cut
222 263
223BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
224 *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 {
225 my $msg = join "", @_; 271 my $msg = join "", @_;
226 272
227 $msg .= "\n" 273 $msg .= "\n"
228 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
229 275
230 $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;
231 277
232 LOG llevError, $msg; 278 LOG llevWarn, $msg;
233 }; 279};
234}
235 280
236$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
238 283
239 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 288 return;#d#
242 }#d# 289 }#d#
243 290
244 # kill coroutine otherwise 291 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 292 Coro::terminate
247}; 293};
248
249$SIG{__DIE__} = sub { }; #d#?
250 294
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
268)) { 312)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 314}
271 315
272$EV::DIED = sub { 316$EV::DIED = sub {
273 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
274}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
275 324
276############################################################################# 325#############################################################################
277 326
278=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
279 328
300 $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;
301 $d 350 $d
302 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
303} 352}
304 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
305=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
306 369
307Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
308 371
309=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
315our $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
316 379
317sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
318sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
319 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
320=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
321 415
322Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
324 418
325The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
326is a reload or not. 420is a reload or not.
327 421
328=cut 422=cut
329 423
330sub post_init(&) { 424sub post_init(&) {
331 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 }
332} 443}
333 444
334=item cf::lock_wait $string 445=item cf::lock_wait $string
335 446
336Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
375} 486}
376 487
377=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
378 489
379Like 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
380get spread over timer. 491get spread over time.
381 492
382=cut 493=cut
383 494
384sub periodic($$) { 495sub periodic($$) {
385 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
389 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
390} 501}
391 502
392=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
393 504
394Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
395This 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
396of 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.
397 512
398The 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
399used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
400 515
401Useful for short background jobs. 516Useful for short background jobs.
402 517
403=cut 518=cut
404 519
405our @SLOT_QUEUE; 520our @SLOT_QUEUE;
406our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
407 523
408$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
411 527
412 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
413 530
414 while () { 531 while () {
415 next_job: 532 next_job:
533
416 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
417 if ($avail > 0.01) { 535
418 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
420 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send; 540 $job->[2]->send;
422 Coro::cede; 541 Coro::cede;
423 goto next_job; 542 goto next_job;
424 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425 } 545 }
426 } 546 }
427 547
428 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
429 # 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
430 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
431 $signal->wait; 551 $signal->wait;
432 } else { 552 } else {
553 $busy = 0;
433 Coro::schedule; 554 Coro::schedule;
434 } 555 }
435 } 556 }
436}; 557};
437 558
438sub get_slot($;$$) { 559sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main; 560 return if tick_inhibit || $Coro::current == $Coro::main;
440 561
441 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
442 563
443 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
444 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
445 567
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
474=cut 596=cut
475 597
476sub sync_job(&) { 598sub sync_job(&) {
477 my ($job) = @_; 599 my ($job) = @_;
478 600
479 if ($Coro::current == $Coro::main) { 601 if (in_main) {
480 my $time = EV::time; 602 my $time = AE::time;
481 603
482 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
483 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
484 606
485 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
486 608
487 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
488 610
489 my $busy = 1; 611 my $busy = 1;
490 my @res; 612 my @res;
491 613
492 (async { 614 (async {
493 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
494 @res = eval { $job->() }; 616 @res = eval { $job->() };
495 warn $@ if $@; 617 error $@ if $@;
496 undef $busy; 618 undef $busy;
497 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
498 620
499 while ($busy) { 621 while ($busy) {
500 if (Coro::nready) { 622 if (Coro::nready) {
502 } else { 624 } else {
503 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
504 } 626 }
505 } 627 }
506 628
507 my $time = EV::time - $time; 629 my $time = AE::time - $time;
508 630
509 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
510 632
511 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
512 } else { 634 } else {
534 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
535 657
536 $coro 658 $coro
537} 659}
538 660
539=item fork_call { }, $args 661=item fork_call { }, @args
540 662
541Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
542process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
543Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
544never block itself or use any form of event handling. 666never block itself or use any form of event handling.
545 667
546=cut 668=cut
547 669
670sub post_fork {
671 reset_signals;
672}
673
548sub fork_call(&@) { 674sub fork_call(&@) {
549 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
550 676
551 # 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,
552 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
553 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
554 680
555 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
556 reset_signals; 682 cf::post_fork;
557 &$cb 683 &$cb
558 }, @args; 684 } @args;
559 685
560 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 )
561} 698}
562 699
563=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
564 701
565=cut 702=cut
602within each server. 739within each server.
603 740
604=cut 741=cut
605 742
606sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
607 my ($name) = @_; 747 my ($name) = @_;
608 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
609 749
610 eval { 750 eval {
611 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
621} 761}
622 762
623our $DB; 763our $DB;
624 764
625sub db_init { 765sub db_init {
626 cf::sync_job {
627 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
628 };
629} 767}
630 768
631sub db_get($$) { 769sub db_get($$) {
632 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
633 771
634 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
635 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
636 776
637 $! ? () 777 $! ? ()
638 : $data 778 : $data
639 }
640} 779}
641 780
642sub db_put($$$) { 781sub db_put($$$) {
643 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
644 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
672 811
673 my @data; 812 my @data;
674 my $md5; 813 my $md5;
675 814
676 for (0 .. $#$src) { 815 for (0 .. $#$src) {
677 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
678 or Carp::croak "$src->[$_]: $!";
679 } 817 }
680 818
681 # if processing is expensive, check 819 # if processing is expensive, check
682 # checksum first 820 # checksum first
683 if (1) { 821 if (1) {
700 838
701 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
702 my $data = $process->(\@data); 840 my $data = $process->(\@data);
703 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
704 842
705 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
706 844
707 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
708 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
709 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
710 848
720 858
721=cut 859=cut
722 860
723sub datalog($@) { 861sub datalog($@) {
724 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
725 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
726} 864}
727 865
728=back 866=back
729 867
730=cut 868=cut
925 1063
926 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
927 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
928 1066
929 } elsif (ref $type) { 1067 } elsif (ref $type) {
930 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
931 1069
932 } else { 1070 } else {
933 shift @arg; 1071 shift @arg;
934 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
935 } 1073 }
936 } 1074 }
937} 1075}
938 1076
939sub _object_attach { 1077sub _object_attach {
949 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
950 } 1088 }
951 1089
952 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
953 } else { 1091 } else {
954 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
955 } 1093 }
956 1094
957 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
958} 1096}
959 1097
1018 1156
1019 for (@$callbacks) { 1157 for (@$callbacks) {
1020 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1021 1159
1022 if ($@) { 1160 if ($@) {
1023 warn "$@";
1024 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1025 override; 1162 override;
1026 } 1163 }
1027 1164
1028 return 1 if $override; 1165 return 1 if $override;
1029 } 1166 }
1108 for (@$attach) { 1245 for (@$attach) {
1109 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1110 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1111 } 1248 }
1112 } else { 1249 } else {
1113 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1114 } 1251 }
1115 } 1252 }
1116} 1253}
1117 1254
1118cf::attachable->attach ( 1255cf::attachable->attach (
1145 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1146 1283
1147 sync_job { 1284 sync_job {
1148 if (length $$rdata) { 1285 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1150 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1151 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1152 1290
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 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 }
1157 aio_close $fh; 1298 aio_close $fh;
1158 1299
1159 if (@$objs) { 1300 if (@$objs) {
1160 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) {
1161 aio_chmod $fh, SAVE_MODE; 1302 aio_chmod $fh, SAVE_MODE;
1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1163 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1164 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 }
1165 aio_close $fh; 1309 aio_close $fh;
1166 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1167 } 1311 }
1168 } else { 1312 } else {
1169 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1172 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1173 1317
1174 $filename =~ s%/[^/]+$%%; 1318 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC; 1319 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1320 } else {
1177 warn "unable to save objects: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1178 } 1322 }
1179 } else { 1323 } else {
1180 aio_unlink $filename; 1324 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1182 } 1326 }
1206 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs}; 1351 $av = $st->{objs};
1208 } 1352 }
1209 1353
1210 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1211 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1212 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1213 1358
1214 ($data, $av) 1359 ($data, $av)
1215} 1360}
1216 1361
1217=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1276} 1421}
1277 1422
1278use File::Glob (); 1423use File::Glob ();
1279 1424
1280cf::player->attach ( 1425cf::player->attach (
1281 on_command => sub { 1426 on_unknown_command => sub {
1282 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1283 1428
1284 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1285 or return; 1430 or return;
1286 1431
1309 1454
1310 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1311 if $reply; 1456 if $reply;
1312 1457
1313 } else { 1458 } else {
1314 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1315 } 1460 }
1316 1461
1317 cf::override; 1462 cf::override;
1318 }, 1463 },
1319); 1464);
1320 1465
1321# "readahead" all extensions 1466# "readahead" all extensions
1322sub cache_extensions { 1467sub cache_extensions {
1323 my $grp = IO::AIO::aio_group; 1468 my $grp = IO::AIO::aio_group;
1324 1469
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1470 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326 for (grep /\.ext$/, @{$_[0]}) { 1471 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1472 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 } 1473 }
1329 }; 1474 };
1330 1475
1331 $grp 1476 $grp
1332} 1477}
1333 1478
1334sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1335 cf::sync_job { 1482 cf::sync_job {
1336 my %todo; 1483 my %todo;
1337 1484
1338 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1339 next unless -r $path; 1486 next unless -r $path;
1357 1504
1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1360 1507
1361 $ext{source} = 1508 $ext{source} =
1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1363 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1364 . $source 1511 . $source
1365 . "\n};\n1"; 1512 . "\n};\n1";
1366 1513
1367 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1368 } 1515 }
1369 1516
1517 my $pass = 0;
1370 my %done; 1518 my %done;
1371 while (%todo) { 1519 while (%todo) {
1372 my $progress; 1520 my $progress;
1373 1521
1522 ++$pass;
1523
1524 ext:
1374 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1375 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1376 goto skip 1527 next ext
1377 unless exists $done{$_}; 1528 unless exists $done{$_};
1378 } 1529 }
1379 1530
1380 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1381 1532
1382 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1383 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1384 : "$v->{base}: extension inactive.\n";
1385 1537
1386 if (exists $v->{meta}{mandatory}) {
1387 warn $msg;
1388 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1389 } 1539 if exists $v->{meta}{mandatory};
1390 1540
1391 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;
1392 } 1550 }
1393
1394 $done{$k} = delete $todo{$k};
1395 push @EXTS, $v->{pkg};
1396 $progress = 1;
1397 } 1551 }
1398 1552
1399 skip: 1553 unless ($progress) {
1400 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1401 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 }
1402 } 1561 }
1403 }; 1562 };
1404} 1563}
1405 1564
1406############################################################################# 1565#############################################################################
1490 $cf::PLAYER{$login} = $pl 1649 $cf::PLAYER{$login} = $pl
1491 } 1650 }
1492 } 1651 }
1493} 1652}
1494 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
1495sub save($) { 1667sub save($) {
1496 my ($pl) = @_; 1668 my ($pl) = @_;
1497 1669
1498 return if $pl->{deny_save}; 1670 return if $pl->{deny_save};
1499 1671
1504 1676
1505 aio_mkdir playerdir $pl, 0770; 1677 aio_mkdir playerdir $pl, 0770;
1506 $pl->{last_save} = $cf::RUNTIME; 1678 $pl->{last_save} = $cf::RUNTIME;
1507 1679
1508 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];
1509 1684
1510 $pl->save_pl ($path); 1685 $pl->save_pl ($path);
1511 cf::cede_to_tick; 1686 cf::cede_to_tick;
1512} 1687}
1513 1688
1547 my $name = $pl->ob->name; 1722 my $name = $pl->ob->name;
1548 1723
1549 $pl->{deny_save} = 1; 1724 $pl->{deny_save} = 1;
1550 $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
1551 1726
1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1727 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1553 $pl->deactivate; 1728 $pl->deactivate;
1729
1554 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;
1555 $pl->ob->check_score;
1556 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1731 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1732 ext::highscore::check ($pl->ob);
1733
1557 $pl->ns->destroy if $pl->ns; 1734 $pl->ns->destroy if $pl->ns;
1558 1735
1559 my $path = playerdir $pl; 1736 my $path = playerdir $pl;
1560 my $temp = "$path~$cf::RUNTIME~deleting~"; 1737 my $temp = "$path~$cf::RUNTIME~deleting~";
1561 aio_rename $path, $temp; 1738 aio_rename $path, $temp;
1615 \@logins 1792 \@logins
1616} 1793}
1617 1794
1618=item $player->maps 1795=item $player->maps
1619 1796
1797=item cf::player::maps $login
1798
1620Returns an arrayref of map paths that are private for this 1799Returns an arrayref of map paths that are private for this
1621player. May block. 1800player. May block.
1622 1801
1623=cut 1802=cut
1624 1803
1686=cut 1865=cut
1687 1866
1688sub find_by_path($) { 1867sub find_by_path($) {
1689 my ($path) = @_; 1868 my ($path) = @_;
1690 1869
1870 $path =~ s/^~[^\/]*//; # skip ~login
1871
1691 my ($match, $specificity); 1872 my ($match, $specificity);
1692 1873
1693 for my $region (list) { 1874 for my $region (list) {
1694 if ($region->{match} && $path =~ $region->{match}) { 1875 if ($region->{match} && $path =~ $region->{match}) {
1695 ($match, $specificity) = ($region, $region->specificity) 1876 ($match, $specificity) = ($region, $region->specificity)
1723sub generate_random_map { 1904sub generate_random_map {
1724 my ($self, $rmp) = @_; 1905 my ($self, $rmp) = @_;
1725 1906
1726 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
1727 1908
1728 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1909 $self->_create_random_map ($rmp);
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1737 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1738 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1739 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1740 (cf::region::find $rmp->{region}), $rmp->{custom}
1741 )
1742} 1910}
1743 1911
1744=item cf::map->register ($regex, $prio) 1912=item cf::map->register ($regex, $prio)
1745 1913
1746Register 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
1751 1919
1752sub register { 1920sub register {
1753 my (undef, $regex, $prio) = @_; 1921 my (undef, $regex, $prio) = @_;
1754 my $pkg = caller; 1922 my $pkg = caller;
1755 1923
1756 no strict;
1757 push @{"$pkg\::ISA"}, __PACKAGE__; 1924 push @{"$pkg\::ISA"}, __PACKAGE__;
1758 1925
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1926 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1927}
1761 1928
1762# also paths starting with '/' 1929# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1930$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1931
1765sub thawer_merge { 1932sub thawer_merge {
1766 my ($self, $merge) = @_; 1933 my ($self, $merge) = @_;
1767 1934
1768 # we have to keep some variables in memory intact 1935 # we have to keep some variables in memory intact
1773} 1940}
1774 1941
1775sub normalise { 1942sub normalise {
1776 my ($path, $base) = @_; 1943 my ($path, $base) = @_;
1777 1944
1778 $path = "$path"; # make sure its a string 1945 $path = "$path"; # make sure it's a string
1779 1946
1780 $path =~ s/\.map$//; 1947 $path =~ s/\.map$//;
1781 1948
1782 # map plan: 1949 # map plan:
1783 # 1950 #
1798 $base =~ s{[^/]+/?$}{}; 1965 $base =~ s{[^/]+/?$}{};
1799 $path = "$base/$path"; 1966 $path = "$base/$path";
1800 } 1967 }
1801 1968
1802 for ($path) { 1969 for ($path) {
1803 redo if s{//}{/};
1804 redo if s{/\.?/}{/}; 1970 redo if s{/\.?/}{/};
1805 redo if s{/[^/]+/\.\./}{/}; 1971 redo if s{/[^/]+/\.\./}{/};
1806 } 1972 }
1807 1973
1808 $path 1974 $path
1822 $self->init; # pass $1 etc. 1988 $self->init; # pass $1 etc.
1823 return $self; 1989 return $self;
1824 } 1990 }
1825 } 1991 }
1826 1992
1827 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1993 Carp::cluck "unable to resolve path '$path' (base '$base')";
1828 () 1994 ()
1829} 1995}
1830 1996
1831sub init { 1997sub init {
1832 my ($self) = @_; 1998 my ($self) = @_;
1954} 2120}
1955 2121
1956sub find; 2122sub find;
1957sub find { 2123sub find {
1958 my ($path, $origin) = @_; 2124 my ($path, $origin) = @_;
2125
2126 cf::cede_to_tick;
1959 2127
1960 $path = normalise $path, $origin && $origin->path; 2128 $path = normalise $path, $origin && $origin->path;
1961 2129
1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2130 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1963 my $guard2 = cf::lock_acquire "map_find:$path"; 2131 my $guard2 = cf::lock_acquire "map_find:$path";
1982 2150
1983 $cf::MAP{$path} = $map 2151 $cf::MAP{$path} = $map
1984 } 2152 }
1985} 2153}
1986 2154
1987sub pre_load { } 2155sub pre_load { }
1988sub post_load { } 2156#sub post_load { } # XS
1989 2157
1990sub load { 2158sub load {
1991 my ($self) = @_; 2159 my ($self) = @_;
1992 2160
1993 local $self->{deny_reset} = 1; # loading can take a long time 2161 local $self->{deny_reset} = 1; # loading can take a long time
2048 2216
2049 $self->in_memory (cf::MAP_ACTIVE); 2217 $self->in_memory (cf::MAP_ACTIVE);
2050 } 2218 }
2051 2219
2052 $self->post_load; 2220 $self->post_load;
2053}
2054 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
2055sub customise_for { 2228sub customise_for {
2056 my ($self, $ob) = @_; 2229 my ($self, $ob) = @_;
2057 2230
2058 return find "~" . $ob->name . "/" . $self->{path} 2231 return find "~" . $ob->name . "/" . $self->{path}
2059 if $self->per_player; 2232 if $self->per_player;
2075 or next; 2248 or next;
2076 $neigh = find $neigh, $map 2249 $neigh = find $neigh, $map
2077 or next; 2250 or next;
2078 $neigh->load; 2251 $neigh->load;
2079 2252
2253 # now find the diagonal neighbours
2080 push @neigh, 2254 push @neigh,
2081 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2255 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2082 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2256 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2083 } 2257 }
2084 2258
2091} 2265}
2092 2266
2093sub find_sync { 2267sub find_sync {
2094 my ($path, $origin) = @_; 2268 my ($path, $origin) = @_;
2095 2269
2096 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
2097} 2274}
2098 2275
2099sub do_load_sync { 2276sub do_load_sync {
2100 my ($map) = @_; 2277 my ($map) = @_;
2101 2278
2102 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2279 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2103 if $Coro::current == $Coro::main; 2280 if $Coro::current == $Coro::main;
2104 2281
2105 cf::sync_job { $map->load }; 2282 $map->load;
2106} 2283}
2107 2284
2108our %MAP_PREFETCH; 2285our %MAP_PREFETCH;
2109our $MAP_PREFETCHER = undef; 2286our $MAP_PREFETCHER = undef;
2110 2287
2136 $MAP_PREFETCHER->prio (6); 2313 $MAP_PREFETCHER->prio (6);
2137 2314
2138 () 2315 ()
2139} 2316}
2140 2317
2318# common code, used by both ->save and ->swapout
2141sub save { 2319sub _save {
2142 my ($self) = @_; 2320 my ($self) = @_;
2143
2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
2145 2321
2146 $self->{last_save} = $cf::RUNTIME; 2322 $self->{last_save} = $cf::RUNTIME;
2147 2323
2148 return unless $self->dirty; 2324 return unless $self->dirty;
2149 2325
2169 } else { 2345 } else {
2170 $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);
2171 } 2347 }
2172} 2348}
2173 2349
2350sub save {
2351 my ($self) = @_;
2352
2353 my $lock = cf::lock_acquire "map_data:$self->{path}";
2354
2355 $self->_save;
2356}
2357
2174sub swap_out { 2358sub swap_out {
2175 my ($self) = @_; 2359 my ($self) = @_;
2176 2360
2177 # save first because save cedes
2178 $self->save;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2361 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2362
2182 return if $self->players;
2183 return if $self->in_memory != cf::MAP_ACTIVE; 2363 return if $self->in_memory != cf::MAP_ACTIVE;
2184 return if $self->{deny_save}; 2364 return if $self->{deny_save};
2365 return if $self->players;
2185 2366
2367 # first deactivate the map and "unlink" it from the core
2368 $self->deactivate;
2369 $_->clear_links_to ($self) for values %cf::MAP;
2186 $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};
2187 2417
2188 $self->deactivate; 2418 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP; 2419 $_->clear_links_to ($self) for values %cf::MAP;
2190 $self->clear; 2420 $self->clear;
2191}
2192
2193sub reset_at {
2194 my ($self) = @_;
2195
2196 # TODO: safety, remove and allow resettable per-player maps
2197 return 1e99 if $self->{deny_reset};
2198
2199 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2200 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2201
2202 $time + $to
2203}
2204
2205sub should_reset {
2206 my ($self) = @_;
2207
2208 $self->reset_at <= $cf::RUNTIME
2209}
2210
2211sub reset {
2212 my ($self) = @_;
2213
2214 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215
2216 return if $self->players;
2217
2218 warn "resetting map ", $self->path;
2219
2220 $self->in_memory (cf::MAP_SWAPPED);
2221
2222 # need to save uniques path
2223 unless ($self->{deny_save}) {
2224 my $uniq = $self->uniq_path; utf8::encode $uniq;
2225
2226 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2227 if $uniq;
2228 }
2229
2230 delete $cf::MAP{$self->path};
2231
2232 $self->deactivate;
2233 $_->clear_links_to ($self) for values %cf::MAP;
2234 $self->clear;
2235 2421
2236 $self->unlink_save; 2422 $self->unlink_save;
2237 $self->destroy; 2423 $self->destroy;
2238} 2424}
2239 2425
2247 2433
2248 delete $cf::MAP{$self->path}; 2434 delete $cf::MAP{$self->path};
2249 2435
2250 $self->unlink_save; 2436 $self->unlink_save;
2251 2437
2252 bless $self, "cf::map"; 2438 bless $self, "cf::map::wrap";
2253 delete $self->{deny_reset}; 2439 delete $self->{deny_reset};
2254 $self->{deny_save} = 1; 2440 $self->{deny_save} = 1;
2255 $self->reset_timeout (1); 2441 $self->reset_timeout (1);
2256 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2442 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2257 2443
2314 : normalise $_ 2500 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2501 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2502 ]
2317} 2503}
2318 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
2319=back 2537=back
2320 2538
2321=head3 cf::object 2539=head3 cf::object
2322 2540
2323=cut 2541=cut
2455 2673
2456Freezes 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}>).
2457 2675
2458The 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.
2459for 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,
2460though, 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
2461map. 2679map.
2462 2680
2463Will never block. 2681Will never block.
2464 2682
2465=item $player_object->leave_link ($map, $x, $y) 2683=item $player_object->leave_link ($map, $x, $y)
2486sub cf::object::player::enter_link { 2704sub cf::object::player::enter_link {
2487 my ($self) = @_; 2705 my ($self) = @_;
2488 2706
2489 $self->deactivate_recursive; 2707 $self->deactivate_recursive;
2490 2708
2709 ++$self->{_link_recursion};
2710
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2711 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2712
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2713 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2714 if $self->map && $self->map->{path} ne "{link}";
2495 2715
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2716 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2717}
2498 2718
2499sub cf::object::player::leave_link { 2719sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2720 my ($self, $map, $x, $y) = @_;
2501 2721
2518 ($x, $y) = (-1, -1) 2738 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2739 unless (defined $x) && (defined $y);
2520 2740
2521 # use -1 or undef as default coordinates, not 0, 0 2741 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2742 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2743 if $x <= 0 && $y <= 0;
2524 2744
2525 $map->load; 2745 $map->load;
2526 $map->load_neighbours; 2746 $map->load_neighbours;
2527 2747
2528 return unless $self->contr->active; 2748 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2749
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2750 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $self->enter_map ($map, $x, $y); 2751 if ($self->enter_map ($map, $x, $y)) {
2534} 2752 # entering was successful
2753 delete $self->{_link_recursion};
2754 # only activate afterwards, to support waiting in hooks
2755 $self->activate_recursive;
2756 }
2535 2757
2758}
2759
2536=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)]])
2537 2761
2538Moves 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
2539her, loading and preparing them map, calling the provided $check callback 2763her, loading and preparing them map, calling the provided $check callback
2540that 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
2541the 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
2548 2772
2549our $GOTOGEN; 2773our $GOTOGEN;
2550 2774
2551sub cf::object::player::goto { 2775sub cf::object::player::goto {
2552 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 }
2553 2783
2554 # 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
2555 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2785 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2556 2786
2557 $self->enter_link; 2787 $self->enter_link;
2581 my $map = eval { 2811 my $map = eval {
2582 my $map = defined $path ? cf::map::find $path : undef; 2812 my $map = defined $path ? cf::map::find $path : undef;
2583 2813
2584 if ($map) { 2814 if ($map) {
2585 $map = $map->customise_for ($self); 2815 $map = $map->customise_for ($self);
2586 $map = $check->($map) if $check && $map; 2816 $map = $check->($map, $x, $y, $self) if $check && $map;
2587 } else { 2817 } else {
2588 $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);
2589 } 2819 }
2590 2820
2591 $map 2821 $map
2599 if ($gen == $self->{_goto_generation}) { 2829 if ($gen == $self->{_goto_generation}) {
2600 delete $self->{_goto_generation}; 2830 delete $self->{_goto_generation};
2601 $self->leave_link ($map, $x, $y); 2831 $self->leave_link ($map, $x, $y);
2602 } 2832 }
2603 2833
2604 $done->() if $done; 2834 $done->($self) if $done;
2605 })->prio (1); 2835 })->prio (1);
2606} 2836}
2607 2837
2608=item $player_object->enter_exit ($exit_object) 2838=item $player_object->enter_exit ($exit_object)
2609 2839
2702 $self->message ("Something went wrong deep within the deliantra server. " 2932 $self->message ("Something went wrong deep within the deliantra server. "
2703 . "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. "
2704 . "Please report this to the dungeon master!", 2934 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2935 cf::NDI_UNIQUE | cf::NDI_RED);
2706 2936
2707 warn "ERROR in enter_exit: $@"; 2937 error "ERROR in enter_exit: $@";
2708 $self->leave_link; 2938 $self->leave_link;
2709 } 2939 }
2710 })->prio (1); 2940 })->prio (1);
2711} 2941}
2712 2942
2724sub cf::client::send_drawinfo { 2954sub cf::client::send_drawinfo {
2725 my ($self, $text, $flags) = @_; 2955 my ($self, $text, $flags) = @_;
2726 2956
2727 utf8::encode $text; 2957 utf8::encode $text;
2728 $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);
2729} 2984}
2730 2985
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 2986=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 2987
2733Send 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
2737 2992
2738=cut 2993=cut
2739 2994
2740# non-persistent channels (usually the info channel) 2995# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 2996our %CHANNEL = (
2997 "c/motd" => {
2998 id => "infobox",
2999 title => "MOTD",
3000 reply => undef,
3001 tooltip => "The message of the day",
3002 },
2742 "c/identify" => { 3003 "c/identify" => {
2743 id => "infobox", 3004 id => "infobox",
2744 title => "Identify", 3005 title => "Identify",
2745 reply => undef, 3006 reply => undef,
2746 tooltip => "Items recently identified", 3007 tooltip => "Items recently identified",
2748 "c/examine" => { 3009 "c/examine" => {
2749 id => "infobox", 3010 id => "infobox",
2750 title => "Examine", 3011 title => "Examine",
2751 reply => undef, 3012 reply => undef,
2752 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",
2753 }, 3020 },
2754 "c/book" => { 3021 "c/book" => {
2755 id => "infobox", 3022 id => "infobox",
2756 title => "Book", 3023 title => "Book",
2757 reply => undef, 3024 reply => undef,
2803 id => "infobox", 3070 id => "infobox",
2804 title => "Pets", 3071 title => "Pets",
2805 reply => undef, 3072 reply => undef,
2806 tooltip => "Shows information abotu your pets/a specific pet", 3073 tooltip => "Shows information abotu your pets/a specific pet",
2807 }, 3074 },
3075 "c/perceiveself" => {
3076 id => "infobox",
3077 title => "Perceive Self",
3078 reply => undef,
3079 tooltip => "You gained detailed knowledge about yourself",
3080 },
2808 "c/uptime" => { 3081 "c/uptime" => {
2809 id => "infobox", 3082 id => "infobox",
2810 title => "Uptime", 3083 title => "Uptime",
2811 reply => undef, 3084 reply => undef,
2812 tooltip => "How long the server has been running since last restart", 3085 tooltip => "How long the server has been running since last restart",
2867 my $pkt = "msg " 3140 my $pkt = "msg "
2868 . $self->{json_coder}->encode ( 3141 . $self->{json_coder}->encode (
2869 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3142 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2870 ); 3143 );
2871 3144
2872 # try lzf for large packets
2873 $pkt = "lzf " . Compress::LZF::compress $pkt
2874 if 1024 <= length $pkt and $self->{can_lzf};
2875
2876 # split very large packets
2877 if (8192 < length $pkt and $self->{can_lzf}) {
2878 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2879 $pkt = "frag";
2880 }
2881
2882 $self->send_packet ($pkt); 3145 $self->send_big_packet ($pkt);
2883} 3146}
2884 3147
2885=item $client->ext_msg ($type, @msg) 3148=item $client->ext_msg ($type, @msg)
2886 3149
2887Sends an ext event to the client. 3150Sends an ext event to the client.
2890 3153
2891sub cf::client::ext_msg($$@) { 3154sub cf::client::ext_msg($$@) {
2892 my ($self, $type, @msg) = @_; 3155 my ($self, $type, @msg) = @_;
2893 3156
2894 if ($self->extcmd == 2) { 3157 if ($self->extcmd == 2) {
2895 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3158 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2896 } elsif ($self->extcmd == 1) { # TODO: remove 3159 } elsif ($self->extcmd == 1) { # TODO: remove
2897 push @msg, msgtype => "event_$type"; 3160 push @msg, msgtype => "event_$type";
2898 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3161 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2899 } 3162 }
2900} 3163}
2901 3164
2902=item $client->ext_reply ($msgid, @msg) 3165=item $client->ext_reply ($msgid, @msg)
2903 3166
2907 3170
2908sub cf::client::ext_reply($$@) { 3171sub cf::client::ext_reply($$@) {
2909 my ($self, $id, @msg) = @_; 3172 my ($self, $id, @msg) = @_;
2910 3173
2911 if ($self->extcmd == 2) { 3174 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3175 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2913 } elsif ($self->extcmd == 1) { 3176 } elsif ($self->extcmd == 1) {
2914 #TODO: version 1, remove 3177 #TODO: version 1, remove
2915 unshift @msg, msgtype => "reply", msgid => $id; 3178 unshift @msg, msgtype => "reply", msgid => $id;
2916 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2917 } 3180 }
2918} 3181}
2919 3182
2920=item $success = $client->query ($flags, "text", \&cb) 3183=item $success = $client->query ($flags, "text", \&cb)
2921 3184
2992 3255
2993 $ns->ext_reply ($reply, @reply) 3256 $ns->ext_reply ($reply, @reply)
2994 if $reply; 3257 if $reply;
2995 3258
2996 } else { 3259 } else {
2997 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";
2998 } 3261 }
2999 3262
3000 cf::override; 3263 cf::override;
3001 }, 3264 },
3002); 3265);
3022 3285
3023 $coro 3286 $coro
3024} 3287}
3025 3288
3026cf::client->attach ( 3289cf::client->attach (
3027 on_destroy => sub { 3290 on_client_destroy => sub {
3028 my ($ns) = @_; 3291 my ($ns) = @_;
3029 3292
3030 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3293 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3031 }, 3294 },
3032); 3295);
3048our $safe_hole = new Safe::Hole; 3311our $safe_hole = new Safe::Hole;
3049 3312
3050$SIG{FPE} = 'IGNORE'; 3313$SIG{FPE} = 'IGNORE';
3051 3314
3052$safe->permit_only (Opcode::opset qw( 3315$safe->permit_only (Opcode::opset qw(
3053 :base_core :base_mem :base_orig :base_math 3316 :base_core :base_mem :base_orig :base_math :base_loop
3054 grepstart grepwhile mapstart mapwhile 3317 grepstart grepwhile mapstart mapwhile
3055 sort time 3318 sort time
3056)); 3319));
3057 3320
3058# here we export the classes and methods available to script code 3321# here we export the classes and methods available to script code
3083 decrease split destroy change_exp value msg lore send_msg)], 3346 decrease split destroy change_exp value msg lore send_msg)],
3084 ["cf::object::player" => qw(player)], 3347 ["cf::object::player" => qw(player)],
3085 ["cf::player" => qw(peaceful send_msg)], 3348 ["cf::player" => qw(peaceful send_msg)],
3086 ["cf::map" => qw(trigger)], 3349 ["cf::map" => qw(trigger)],
3087) { 3350) {
3088 no strict 'refs';
3089 my ($pkg, @funs) = @$_; 3351 my ($pkg, @funs) = @$_;
3090 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3352 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3091 for @funs; 3353 for @funs;
3092} 3354}
3093 3355
3110 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3372 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3111 $qcode =~ s/\n/\\n/g; 3373 $qcode =~ s/\n/\\n/g;
3112 3374
3113 %vars = (_dummy => 0) unless %vars; 3375 %vars = (_dummy => 0) unless %vars;
3114 3376
3377 my @res;
3115 local $_; 3378 local $_;
3116 local @safe::cf::_safe_eval_args = values %vars;
3117 3379
3118 my $eval = 3380 my $eval =
3119 "do {\n" 3381 "do {\n"
3120 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3382 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3121 . "#line 0 \"{$qcode}\"\n" 3383 . "#line 0 \"{$qcode}\"\n"
3122 . $code 3384 . $code
3123 . "\n}" 3385 . "\n}"
3124 ; 3386 ;
3125 3387
3388 if ($CFG{safe_eval}) {
3126 sub_generation_inc; 3389 sub_generation_inc;
3390 local @safe::cf::_safe_eval_args = values %vars;
3127 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3391 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3128 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 }
3129 3397
3130 if ($@) { 3398 if ($@) {
3131 warn "$@"; 3399 warn "$@",
3132 warn "while executing safe code '$code'\n"; 3400 "while executing safe code '$code'\n",
3133 warn "with arguments " . (join " ", %vars) . "\n"; 3401 "with arguments " . (join " ", %vars) . "\n";
3134 } 3402 }
3135 3403
3136 wantarray ? @res : $res[0] 3404 wantarray ? @res : $res[0]
3137} 3405}
3138 3406
3152=cut 3420=cut
3153 3421
3154sub register_script_function { 3422sub register_script_function {
3155 my ($fun, $cb) = @_; 3423 my ($fun, $cb) = @_;
3156 3424
3157 no strict 'refs'; 3425 $fun = "safe::$fun" if $CFG{safe_eval};
3158 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3426 *$fun = $safe_hole->wrap ($cb);
3159} 3427}
3160 3428
3161=back 3429=back
3162 3430
3163=cut 3431=cut
3172 # for this (global event?) 3440 # for this (global event?)
3173 %ext::player_env::MUSIC_FACE_CACHE = (); 3441 %ext::player_env::MUSIC_FACE_CACHE = ();
3174 3442
3175 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3443 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3176 3444
3177 warn "loading facedata from $path\n"; 3445 trace "loading facedata from $path\n";
3178 3446
3179 my $facedata; 3447 my $facedata = decode_storable load_file $path;
3180 0 < aio_load $path, $facedata
3181 or die "$path: $!";
3182
3183 $facedata = Coro::Storable::thaw $facedata;
3184 3448
3185 $facedata->{version} == 2 3449 $facedata->{version} == 2
3186 or cf::cleanup "$path: version mismatch, cannot proceed."; 3450 or cf::cleanup "$path: version mismatch, cannot proceed.";
3187 3451
3188 # 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]);
3189 $facedata->{resource}{"res/exp_table"} = { 3454 $facedata->{resource}{"res/exp_table"} = {
3190 type => FT_RSRC, 3455 type => FT_RSRC,
3191 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),
3192 }; 3458 };
3193 cf::cede_to_tick; 3459 cf::cede_to_tick;
3194 3460
3195 { 3461 {
3196 my $faces = $facedata->{faceinfo}; 3462 my $faces = $facedata->{faceinfo};
3198 while (my ($face, $info) = each %$faces) { 3464 while (my ($face, $info) = each %$faces) {
3199 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3465 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3200 3466
3201 cf::face::set_visibility $idx, $info->{visibility}; 3467 cf::face::set_visibility $idx, $info->{visibility};
3202 cf::face::set_magicmap $idx, $info->{magicmap}; 3468 cf::face::set_magicmap $idx, $info->{magicmap};
3203 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3469 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3204 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} ;
3205 3472
3206 cf::cede_to_tick; 3473 cf::cede_to_tick;
3207 } 3474 }
3208 3475
3209 while (my ($face, $info) = each %$faces) { 3476 while (my ($face, $info) = each %$faces) {
3214 3481
3215 if (my $smooth = cf::face::find $info->{smooth}) { 3482 if (my $smooth = cf::face::find $info->{smooth}) {
3216 cf::face::set_smooth $idx, $smooth; 3483 cf::face::set_smooth $idx, $smooth;
3217 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3484 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3218 } else { 3485 } else {
3219 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3486 error "smooth face '$info->{smooth}' not found for face '$face'";
3220 } 3487 }
3221 3488
3222 cf::cede_to_tick; 3489 cf::cede_to_tick;
3223 } 3490 }
3224 } 3491 }
3233 3500
3234 cf::anim::invalidate_all; # d'oh 3501 cf::anim::invalidate_all; # d'oh
3235 } 3502 }
3236 3503
3237 { 3504 {
3238 # TODO: for gcfclient pleasure, we should give resources
3239 # that gcfclient doesn't grok a >10000 face index.
3240 my $res = $facedata->{resource}; 3505 my $res = $facedata->{resource};
3241 3506
3242 while (my ($name, $info) = each %$res) { 3507 while (my ($name, $info) = each %$res) {
3243 if (defined $info->{type}) { 3508 if (defined $info->{type}) {
3244 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3509 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3245 my $data;
3246 3510
3247 if ($info->{type} & 1) { 3511 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3248 # prepend meta info
3249
3250 my $meta = $enc->encode ({
3251 name => $name,
3252 %{ $info->{meta} || {} },
3253 });
3254
3255 $data = pack "(w/a*)*", $meta, $info->{data};
3256 } else {
3257 $data = $info->{data};
3258 }
3259
3260 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3261 cf::face::set_type $idx, $info->{type}; 3512 cf::face::set_type $idx, $info->{type};
3262 } else { 3513 } else {
3263 $RESOURCE{$name} = $info; 3514 $RESOURCE{$name} = $info; # unused
3264 } 3515 }
3265 3516
3266 cf::cede_to_tick; 3517 cf::cede_to_tick;
3267 } 3518 }
3268 } 3519 }
3269 3520
3270 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3521 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3271 3522
3272 1 3523 1
3273} 3524}
3274
3275cf::global->attach (on_resource_update => sub {
3276 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3277 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3278
3279 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3280 my $sound = $soundconf->{compat}[$_]
3281 or next;
3282
3283 my $face = cf::face::find "sound/$sound->[1]";
3284 cf::sound::set $sound->[0] => $face;
3285 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3286 }
3287
3288 while (my ($k, $v) = each %{$soundconf->{event}}) {
3289 my $face = cf::face::find "sound/$v";
3290 cf::sound::set $k => $face;
3291 }
3292 }
3293});
3294 3525
3295register_exticmd fx_want => sub { 3526register_exticmd fx_want => sub {
3296 my ($ns, $want) = @_; 3527 my ($ns, $want) = @_;
3297 3528
3298 while (my ($k, $v) = each %$want) { 3529 while (my ($k, $v) = each %$want) {
3337sub reload_treasures { 3568sub reload_treasures {
3338 load_resource_file "$DATADIR/treasures" 3569 load_resource_file "$DATADIR/treasures"
3339 or die "unable to load treasurelists\n"; 3570 or die "unable to load treasurelists\n";
3340} 3571}
3341 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
3342sub reload_resources { 3593sub reload_resources {
3343 warn "reloading resource files...\n"; 3594 trace "reloading resource files...\n";
3344 3595
3596 reload_exp_table;
3597 reload_materials;
3345 reload_facedata; 3598 reload_facedata;
3599 reload_sound;
3346 reload_archetypes; 3600 reload_archetypes;
3347 reload_regions; 3601 reload_regions;
3348 reload_treasures; 3602 reload_treasures;
3349 3603
3350 warn "finished reloading resource files\n"; 3604 trace "finished reloading resource files\n";
3351} 3605}
3352 3606
3353sub reload_config { 3607sub reload_config {
3354 open my $fh, "<:utf8", "$CONFDIR/config" 3608 trace "reloading config file...\n";
3355 or return;
3356 3609
3357 local $/; 3610 my $config = load_file "$CONFDIR/config";
3358 *CFG = YAML::Load <$fh>; 3611 utf8::decode $config;
3612 *CFG = decode_yaml $config;
3359 3613
3360 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3614 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3361 3615
3362 $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};
3363 $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};
3364 3618
3365 if (exists $CFG{mlockall}) { 3619 if (exists $CFG{mlockall}) {
3388 3642
3389 seek $fh, 0, 0; 3643 seek $fh, 0, 0;
3390 print $fh $$; 3644 print $fh $$;
3391} 3645}
3392 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
3393sub main { 3656sub main {
3394 cf::init_globals; # initialise logging 3657 cf::init_globals; # initialise logging
3395 3658
3396 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3659 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3397 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.";
3398 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3661 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3399 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3662 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3400
3401 cf::init_experience;
3402 cf::init_anim;
3403 cf::init_attackmess;
3404 cf::init_dynamic;
3405 3663
3406 $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
3407 3665
3408 # we must not ever block the main coroutine 3666 # we must not ever block the main coroutine
3409 local $Coro::idle = sub { 3667 local $Coro::idle = sub {
3415 }; 3673 };
3416 3674
3417 evthread_start IO::AIO::poll_fileno; 3675 evthread_start IO::AIO::poll_fileno;
3418 3676
3419 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
3420 reload_resources; 3686 reload_resources;
3421 reload_config; 3687 reload_config;
3422 db_init; 3688 db_init;
3423 3689
3424 cf::load_settings;
3425 cf::load_materials;
3426 cf::init_uuid; 3690 cf::init_uuid;
3427 cf::init_signals; 3691 cf::init_signals;
3428 cf::init_commands;
3429 cf::init_skills; 3692 cf::init_skills;
3430 3693
3431 cf::init_beforeplay; 3694 cf::init_beforeplay;
3432 3695
3433 atomic; 3696 atomic;
3435 load_extensions; 3698 load_extensions;
3436 3699
3437 utime time, time, $RUNTIMEFILE; 3700 utime time, time, $RUNTIMEFILE;
3438 3701
3439 # no (long-running) fork's whatsoever before this point(!) 3702 # no (long-running) fork's whatsoever before this point(!)
3703 use POSIX ();
3440 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};
3441 3705
3442 (pop @POST_INIT)->(0) while @POST_INIT; 3706 cf::_post_init 0;
3443 }; 3707 };
3444 3708
3445 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;
3446} 3718}
3447 3719
3448############################################################################# 3720#############################################################################
3449# initialisation and cleanup 3721# initialisation and cleanup
3450 3722
3451# install some emergency cleanup handlers 3723# install some emergency cleanup handlers
3452BEGIN { 3724BEGIN {
3453 our %SIGWATCHER = (); 3725 our %SIGWATCHER = ();
3454 for my $signal (qw(INT HUP TERM)) { 3726 for my $signal (qw(INT HUP TERM)) {
3455 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3727 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3456 cf::cleanup "SIG$signal"; 3728 cf::cleanup "SIG$signal";
3457 }; 3729 };
3458 } 3730 }
3459} 3731}
3460 3732
3461sub write_runtime_sync { 3733sub write_runtime_sync {
3734 my $t0 = AE::time;
3735
3462 # first touch the runtime file to show we are still running: 3736 # first touch the runtime file to show we are still running:
3463 # the fsync below can take a very very long time. 3737 # the fsync below can take a very very long time.
3464 3738
3465 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3739 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3466 3740
3467 my $guard = cf::lock_acquire "write_runtime"; 3741 my $guard = cf::lock_acquire "write_runtime";
3468 3742
3469 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3743 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3470 or return; 3744 or return;
3471 3745
3472 my $value = $cf::RUNTIME + 90 + 10; 3746 my $value = $cf::RUNTIME + 90 + 10;
3473 # 10 is the runtime save interval, for a monotonic clock 3747 # 10 is the runtime save interval, for a monotonic clock
3474 # 60 allows for the watchdog to kill the server. 3748 # 60 allows for the watchdog to kill the server.
3487 or return; 3761 or return;
3488 3762
3489 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3763 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3490 and return; 3764 and return;
3491 3765
3492 warn "runtime file written.\n"; 3766 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3493 3767
3494 1 3768 1
3495} 3769}
3496 3770
3497our $uuid_lock; 3771our $uuid_lock;
3509 or return; 3783 or return;
3510 3784
3511 my $value = uuid_seq uuid_cur; 3785 my $value = uuid_seq uuid_cur;
3512 3786
3513 unless ($value) { 3787 unless ($value) {
3514 warn "cowardly refusing to write zero uuid value!\n"; 3788 info "cowardly refusing to write zero uuid value!\n";
3515 return; 3789 return;
3516 } 3790 }
3517 3791
3518 my $value = uuid_str $value + $uuid_skip; 3792 my $value = uuid_str $value + $uuid_skip;
3519 $uuid_skip = 0; 3793 $uuid_skip = 0;
3529 or return; 3803 or return;
3530 3804
3531 aio_rename "$uuid~", $uuid 3805 aio_rename "$uuid~", $uuid
3532 and return; 3806 and return;
3533 3807
3534 warn "uuid file written ($value).\n"; 3808 trace "uuid file written ($value).\n";
3535 3809
3536 1 3810 1
3537 3811
3538} 3812}
3539 3813
3545} 3819}
3546 3820
3547sub emergency_save() { 3821sub emergency_save() {
3548 my $freeze_guard = cf::freeze_mainloop; 3822 my $freeze_guard = cf::freeze_mainloop;
3549 3823
3550 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;
3551 3830
3552 cf::sync_job { 3831 cf::sync_job {
3553 # this is a trade-off: we want to be very quick here, so 3832 cf::write_runtime_sync; # external watchdog should not bark
3554 # save all maps without fsync, and later call a global sync
3555 # (which in turn might be very very slow)
3556 local $USE_FSYNC = 0;
3557 3833
3558 # use a peculiar iteration method to avoid tripping on perl 3834 # use a peculiar iteration method to avoid tripping on perl
3559 # refcount bugs in for. also avoids problems with players 3835 # refcount bugs in for. also avoids problems with players
3560 # and maps saved/destroyed asynchronously. 3836 # and maps saved/destroyed asynchronously.
3561 warn "emergency_perl_save: begin player save\n"; 3837 info "emergency_perl_save: begin player save\n";
3562 for my $login (keys %cf::PLAYER) { 3838 for my $login (keys %cf::PLAYER) {
3563 my $pl = $cf::PLAYER{$login} or next; 3839 my $pl = $cf::PLAYER{$login} or next;
3564 $pl->valid or next; 3840 $pl->valid or next;
3565 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3841 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3566 $pl->save; 3842 $pl->save;
3567 } 3843 }
3568 warn "emergency_perl_save: end player save\n"; 3844 info "emergency_perl_save: end player save\n";
3569 3845
3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3570 warn "emergency_perl_save: begin map save\n"; 3848 info "emergency_perl_save: begin map save\n";
3571 for my $path (keys %cf::MAP) { 3849 for my $path (keys %cf::MAP) {
3572 my $map = $cf::MAP{$path} or next; 3850 my $map = $cf::MAP{$path} or next;
3573 $map->valid or next; 3851 $map->valid or next;
3574 $map->save; 3852 $map->save;
3575 } 3853 }
3576 warn "emergency_perl_save: end map save\n"; 3854 info "emergency_perl_save: end map save\n";
3577 3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3578 warn "emergency_perl_save: begin database checkpoint\n"; 3858 info "emergency_perl_save: begin database checkpoint\n";
3579 BDB::db_env_txn_checkpoint $DB_ENV; 3859 BDB::db_env_txn_checkpoint $DB_ENV;
3580 warn "emergency_perl_save: end database checkpoint\n"; 3860 info "emergency_perl_save: end database checkpoint\n";
3581 3861
3582 warn "emergency_perl_save: begin write uuid\n"; 3862 info "emergency_perl_save: begin write uuid\n";
3583 write_uuid_sync 1; 3863 write_uuid_sync 1;
3584 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
3585 }; 3884 };
3586 3885
3587 warn "emergency_perl_save: starting sync()\n";
3588 IO::AIO::aio_sync sub {
3589 warn "emergency_perl_save: finished sync()\n";
3590 };
3591
3592 warn "emergency_perl_save: leave\n"; 3886 info "emergency_perl_save: leave\n";
3593} 3887}
3594 3888
3595sub post_cleanup { 3889sub post_cleanup {
3596 my ($make_core) = @_; 3890 my ($make_core) = @_;
3597 3891
3892 IO::AIO::flush;
3893
3598 warn Carp::longmess "post_cleanup backtrace" 3894 error Carp::longmess "post_cleanup backtrace"
3599 if $make_core; 3895 if $make_core;
3600 3896
3601 my $fh = pidfile; 3897 my $fh = pidfile;
3602 unlink $PIDFILE if <$fh> == $$; 3898 unlink $PIDFILE if <$fh> == $$;
3603} 3899}
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3919 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) { 3920 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"}; 3921 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3922# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 } 3923 }
3628 warn "cleared package $pkg\n";#d#
3629} 3924}
3630 3925
3631sub do_reload_perl() { 3926sub do_reload_perl() {
3632 # can/must only be called in main 3927 # can/must only be called in main
3633 if ($Coro::current != $Coro::main) { 3928 unless (in_main) {
3634 warn "can only reload from main coroutine"; 3929 error "can only reload from main coroutine";
3635 return; 3930 return;
3636 } 3931 }
3637 3932
3638 return if $RELOAD++; 3933 return if $RELOAD++;
3639 3934
3640 my $t1 = EV::time; 3935 my $t1 = AE::time;
3641 3936
3642 while ($RELOAD) { 3937 while ($RELOAD) {
3643 warn "reloading..."; 3938 cf::get_slot 0.1, -1, "reload_perl";
3939 info "perl_reload: reloading...";
3644 3940
3645 warn "entering sync_job"; 3941 trace "perl_reload: entering sync_job";
3646 3942
3647 cf::sync_job { 3943 cf::sync_job {
3648 cf::write_runtime_sync; # external watchdog should not bark
3649 cf::emergency_save; 3944 #cf::emergency_save;
3650 cf::write_runtime_sync; # external watchdog should not bark
3651 3945
3652 warn "syncing database to disk";
3653 BDB::db_env_txn_checkpoint $DB_ENV;
3654
3655 # if anything goes wrong in here, we should simply crash as we already saved
3656
3657 warn "flushing outstanding aio requests";
3658 while (IO::AIO::nreqs || BDB::nreqs) {
3659 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3660 }
3661
3662 warn "cancelling all extension coros"; 3946 trace "perl_reload: cancelling all extension coros";
3663 $_->cancel for values %EXT_CORO; 3947 $_->cancel for values %EXT_CORO;
3664 %EXT_CORO = (); 3948 %EXT_CORO = ();
3665 3949
3666 warn "removing commands"; 3950 trace "perl_reload: removing commands";
3667 %COMMAND = (); 3951 %COMMAND = ();
3668 3952
3669 warn "removing ext/exti commands"; 3953 trace "perl_reload: removing ext/exti commands";
3670 %EXTCMD = (); 3954 %EXTCMD = ();
3671 %EXTICMD = (); 3955 %EXTICMD = ();
3672 3956
3673 warn "unloading/nuking all extensions"; 3957 trace "perl_reload: unloading/nuking all extensions";
3674 for my $pkg (@EXTS) { 3958 for my $pkg (@EXTS) {
3675 warn "... unloading $pkg"; 3959 trace "... unloading $pkg";
3676 3960
3677 if (my $cb = $pkg->can ("unload")) { 3961 if (my $cb = $pkg->can ("unload")) {
3678 eval { 3962 eval {
3679 $cb->($pkg); 3963 $cb->($pkg);
3680 1 3964 1
3681 } or warn "$pkg unloaded, but with errors: $@"; 3965 } or error "$pkg unloaded, but with errors: $@";
3682 } 3966 }
3683 3967
3684 warn "... clearing $pkg"; 3968 trace "... clearing $pkg";
3685 clear_package $pkg; 3969 clear_package $pkg;
3686 } 3970 }
3687 3971
3688 warn "unloading all perl modules loaded from $LIBDIR"; 3972 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3689 while (my ($k, $v) = each %INC) { 3973 while (my ($k, $v) = each %INC) {
3690 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3974 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3691 3975
3692 warn "... unloading $k"; 3976 trace "... unloading $k";
3693 delete $INC{$k}; 3977 delete $INC{$k};
3694 3978
3695 $k =~ s/\.pm$//; 3979 $k =~ s/\.pm$//;
3696 $k =~ s/\//::/g; 3980 $k =~ s/\//::/g;
3697 3981
3700 } 3984 }
3701 3985
3702 clear_package $k; 3986 clear_package $k;
3703 } 3987 }
3704 3988
3705 warn "getting rid of safe::, as good as possible"; 3989 trace "perl_reload: getting rid of safe::, as good as possible";
3706 clear_package "safe::$_" 3990 clear_package "safe::$_"
3707 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);
3708 3992
3709 warn "unloading cf.pm \"a bit\""; 3993 trace "perl_reload: unloading cf.pm \"a bit\"";
3710 delete $INC{"cf.pm"}; 3994 delete $INC{"cf.pm"};
3711 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3995 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3712 3996
3713 # don't, removes xs symbols, too, 3997 # don't, removes xs symbols, too,
3714 # and global variables created in xs 3998 # and global variables created in xs
3715 #clear_package __PACKAGE__; 3999 #clear_package __PACKAGE__;
3716 4000
3717 warn "unload completed, starting to reload now"; 4001 info "perl_reload: unload completed, starting to reload now";
3718 4002
3719 warn "reloading cf.pm"; 4003 trace "perl_reload: reloading cf.pm";
3720 require cf; 4004 require cf;
3721 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4005 cf::_connect_to_perl_1;
3722 4006
3723 warn "loading config and database again"; 4007 trace "perl_reload: loading config and database again";
3724 cf::reload_config; 4008 cf::reload_config;
3725 4009
3726 warn "loading extensions"; 4010 trace "perl_reload: loading extensions";
3727 cf::load_extensions; 4011 cf::load_extensions;
3728 4012
3729 if ($REATTACH_ON_RELOAD) { 4013 if ($REATTACH_ON_RELOAD) {
3730 warn "reattaching attachments to objects/players"; 4014 trace "perl_reload: reattaching attachments to objects/players";
3731 _global_reattach; # objects, sockets 4015 _global_reattach; # objects, sockets
3732 warn "reattaching attachments to maps"; 4016 trace "perl_reload: reattaching attachments to maps";
3733 reattach $_ for values %MAP; 4017 reattach $_ for values %MAP;
3734 warn "reattaching attachments to players"; 4018 trace "perl_reload: reattaching attachments to players";
3735 reattach $_ for values %PLAYER; 4019 reattach $_ for values %PLAYER;
3736 } 4020 }
3737 4021
3738 warn "running post_init jobs"; 4022 cf::_post_init 1;
3739 (pop @POST_INIT)->(1) while @POST_INIT;
3740 4023
3741 warn "leaving sync_job"; 4024 trace "perl_reload: leaving sync_job";
3742 4025
3743 1 4026 1
3744 } or do { 4027 } or do {
3745 warn $@; 4028 error $@;
3746 cf::cleanup "error while reloading, exiting."; 4029 cf::cleanup "perl_reload: error, exiting.";
3747 }; 4030 };
3748 4031
3749 warn "reloaded";
3750 --$RELOAD; 4032 --$RELOAD;
3751 } 4033 }
3752 4034
3753 $t1 = EV::time - $t1; 4035 $t1 = AE::time - $t1;
3754 warn "reload completed in ${t1}s\n"; 4036 info "perl_reload: completed in ${t1}s\n";
3755}; 4037};
3756 4038
3757our $RELOAD_WATCHER; # used only during reload 4039our $RELOAD_WATCHER; # used only during reload
3758 4040
3759sub reload_perl() { 4041sub reload_perl() {
3761 # coro crashes during coro_state_free->destroy here. 4043 # coro crashes during coro_state_free->destroy here.
3762 4044
3763 $RELOAD_WATCHER ||= cf::async { 4045 $RELOAD_WATCHER ||= cf::async {
3764 Coro::AIO::aio_wait cache_extensions; 4046 Coro::AIO::aio_wait cache_extensions;
3765 4047
3766 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4048 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3767 do_reload_perl; 4049 do_reload_perl;
3768 undef $RELOAD_WATCHER; 4050 undef $RELOAD_WATCHER;
3769 }; 4051 };
3770 }; 4052 };
3771} 4053}
3780 reload_perl; 4062 reload_perl;
3781 }; 4063 };
3782 } 4064 }
3783}; 4065};
3784 4066
3785unshift @INC, $LIBDIR; 4067#############################################################################
3786 4068
3787my $bug_warning = 0; 4069my $bug_warning = 0;
3788 4070
3789our @WAIT_FOR_TICK; 4071our @WAIT_FOR_TICK;
3790our @WAIT_FOR_TICK_BEGIN; 4072our @WAIT_FOR_TICK_BEGIN;
3791 4073
3792sub wait_for_tick { 4074sub wait_for_tick() {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 4075 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3794 4076
3795 my $signal = new Coro::Signal; 4077 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK, $signal; 4078 push @WAIT_FOR_TICK, $signal;
3797 $signal->wait; 4079 $signal->wait;
3798} 4080}
3799 4081
3800sub wait_for_tick_begin { 4082sub wait_for_tick_begin() {
3801 return if tick_inhibit || $Coro::current == $Coro::main; 4083 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3802 4084
3803 my $signal = new Coro::Signal; 4085 my $signal = new Coro::Signal;
3804 push @WAIT_FOR_TICK_BEGIN, $signal; 4086 push @WAIT_FOR_TICK_BEGIN, $signal;
3805 $signal->wait; 4087 $signal->wait;
3806} 4088}
3812 return; 4094 return;
3813 } 4095 }
3814 4096
3815 cf::server_tick; # one server iteration 4097 cf::server_tick; # one server iteration
3816 4098
4099 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4100
3817 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4101 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3818 $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.;
3819 Coro::async_pool { 4103 Coro::async_pool {
3820 $Coro::current->{desc} = "runtime saver"; 4104 $Coro::current->{desc} = "runtime saver";
3821 write_runtime_sync 4105 write_runtime_sync
3822 or warn "ERROR: unable to write runtime file: $!"; 4106 or error "ERROR: unable to write runtime file: $!";
3823 }; 4107 };
3824 } 4108 }
3825 4109
3826 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4110 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3827 $sig->send; 4111 $sig->send;
3835 4119
3836 if (0) { 4120 if (0) {
3837 if ($NEXT_TICK) { 4121 if ($NEXT_TICK) {
3838 my $jitter = $TICK_START - $NEXT_TICK; 4122 my $jitter = $TICK_START - $NEXT_TICK;
3839 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4123 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3840 warn "jitter $JITTER\n";#d# 4124 debug "jitter $JITTER\n";#d#
3841 } 4125 }
3842 } 4126 }
3843} 4127}
3844 4128
3845{ 4129{
3846 # configure BDB 4130 # configure BDB
3847 4131
3848 BDB::min_parallel 8; 4132 BDB::min_parallel 16;
3849 BDB::max_poll_reqs $TICK * 0.1; 4133 BDB::max_poll_reqs $TICK * 0.1;
3850 $AnyEvent::BDB::WATCHER->priority (1); 4134 $AnyEvent::BDB::WATCHER->priority (1);
3851 4135
3852 unless ($DB_ENV) { 4136 unless ($DB_ENV) {
3853 $DB_ENV = BDB::db_env_create; 4137 $DB_ENV = BDB::db_env_create;
3890 IO::AIO::min_parallel 8; 4174 IO::AIO::min_parallel 8;
3891 IO::AIO::max_poll_time $TICK * 0.1; 4175 IO::AIO::max_poll_time $TICK * 0.1;
3892 undef $AnyEvent::AIO::WATCHER; 4176 undef $AnyEvent::AIO::WATCHER;
3893} 4177}
3894 4178
3895my $_log_backtrace; 4179our $_log_backtrace;
4180our $_log_backtrace_last;
3896 4181
3897sub _log_backtrace { 4182sub _log_backtrace {
3898 my ($msg, @addr) = @_; 4183 my ($msg, @addr) = @_;
3899 4184
3900 $msg =~ s/\n//; 4185 $msg =~ s/\n$//;
3901 4186
4187 if ($_log_backtrace_last eq $msg) {
4188 LOG llevInfo, "[ABT] $msg\n";
4189 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3902 # limit the # of concurrent backtraces 4190 # limit the # of concurrent backtraces
3903 if ($_log_backtrace < 2) { 4191 } elsif ($_log_backtrace < 2) {
4192 $_log_backtrace_last = $msg;
3904 ++$_log_backtrace; 4193 ++$_log_backtrace;
3905 my $perl_bt = Carp::longmess $msg; 4194 my $perl_bt = Carp::longmess $msg;
3906 async { 4195 async {
3907 $Coro::current->{desc} = "abt $msg"; 4196 $Coro::current->{desc} = "abt $msg";
3908 4197
3928 LOG llevInfo, "[ABT] $_\n" for @bt; 4217 LOG llevInfo, "[ABT] $_\n" for @bt;
3929 --$_log_backtrace; 4218 --$_log_backtrace;
3930 }; 4219 };
3931 } else { 4220 } else {
3932 LOG llevInfo, "[ABT] $msg\n"; 4221 LOG llevInfo, "[ABT] $msg\n";
3933 LOG llevInfo, "[ABT] [suppressed]\n"; 4222 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3934 } 4223 }
3935} 4224}
3936 4225
3937# load additional modules 4226# load additional modules
3938require "cf/$_.pm" for @EXTRA_MODULES; 4227require "cf/$_.pm" for @EXTRA_MODULES;
4228cf::_connect_to_perl_2;
3939 4229
3940END { cf::emergency_save } 4230END { cf::emergency_save }
3941 4231
39421 42321
3943 4233

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines