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.494 by root, Mon Oct 26 05:18:00 2009 UTC vs.
Revision 1.573 by root, Sun May 8 12:40:42 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,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
… …
20# 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>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
53use Coro::Util (); 51use Coro::Util ();
54 52
55use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
56use BDB (); 54use BDB ();
57use Data::Dumper; 55use Data::Dumper;
58use Digest::MD5;
59use Fcntl; 56use Fcntl;
60use YAML::XS (); 57use YAML::XS ();
61use IO::AIO (); 58use IO::AIO ();
62use Time::HiRes; 59use Time::HiRes;
63use Compress::LZF; 60use Compress::LZF;
… …
79# strictly for debugging 76# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
81 78
82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
83 80
81our @ORIG_INC;
82
84our %COMMAND = (); 83our %COMMAND = ();
85our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
86 85
87our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
88our %EXTCMD = (); 87our %EXTCMD = ();
… …
94our @EVENT; 93our @EVENT;
95our @REFLECT; # set by XS 94our @REFLECT; # set by XS
96our %REFLECT; # set by us 95our %REFLECT; # set by us
97 96
98our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
99our $DATADIR = datadir; 99our $DATADIR = datadir;
100our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
101our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
102our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
103our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
104our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
105our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
106our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
107our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
108our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
109our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
111 112
112our %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;
113 120
114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
116our $NEXT_TICK; 123our $NEXT_TICK;
117our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
119our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
120our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
121our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
122our $DB_ENV; 129our $DB_ENV;
123 130
124our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
125 132
126our %CFG; 133our %CFG;
127 134
128our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
129our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
130our $NOW; 138our $NOW;
131 139
132our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
133our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
134our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
… …
143 151
144our @POST_INIT; 152our @POST_INIT;
145 153
146our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
147our $REALLY_UNLOOP; # never set to true, please :) 155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
148 159
149binmode STDOUT; 160binmode STDOUT;
150binmode STDERR; 161binmode STDERR;
151 162
152# read virtual server time, if available 163# read virtual server time, if available
… …
163 174
164our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
165 176
166sub cf::map::normalise; 177sub cf::map::normalise;
167 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
168############################################################################# 183#############################################################################
169 184
170%REFLECT = (); 185%REFLECT = ();
171for (@REFLECT) { 186for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_; 187 my $reflect = JSON::XS::decode_json $_;
… …
182 197
183=over 4 198=over 4
184 199
185=item $cf::UPTIME 200=item $cf::UPTIME
186 201
187The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
188 218
189=item $cf::RUNTIME 219=item $cf::RUNTIME
190 220
191The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
192every server tick. 222every server tick.
… …
198Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
199directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
200unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
201database environment. 231database environment.
202 232
203=item $cf::NOW
204
205The time of the last (current) server tick.
206
207=item $cf::TICK
208
209The interval between server ticks, in seconds.
210
211=item $cf::LOADAVG 233=item $cf::LOADAVG
212 234
213The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
214(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
215objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
… …
224from wherever your confdir points to. 246from wherever your confdir points to.
225 247
226=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
227 249
228These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
229returns directly I<after> the tick processing (and consequently, can only wake one process 251returns directly I<after> the tick processing (and consequently, can only wake one thread
230per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
265
266=cut
267
268sub wait_for_tick();
269sub wait_for_tick_begin();
231 270
232=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
233 272
234This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
235C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 274C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
243 282
244=back 283=back
245 284
246=cut 285=cut
247 286
287sub error(@) { LOG llevError, join "", @_ }
288sub warn (@) { LOG llevWarn , join "", @_ }
289sub info (@) { LOG llevInfo , join "", @_ }
290sub debug(@) { LOG llevDebug, join "", @_ }
291sub trace(@) { LOG llevTrace, join "", @_ }
292
248$Coro::State::WARNHOOK = sub { 293$Coro::State::WARNHOOK = sub {
249 my $msg = join "", @_; 294 my $msg = join "", @_;
250 295
251 $msg .= "\n" 296 $msg .= "\n"
252 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
253 298
254 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 299 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
255 300
256 LOG llevError, $msg; 301 LOG llevWarn, $msg;
257}; 302};
258 303
259$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
260 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
261 306
262 warn Carp::longmess $_[0]; 307 error Carp::longmess $_[0];
263 308
264 if ($Coro::current == $Coro::main) {#d# 309 if (in_main) {#d#
265 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
266 return;#d# 311 return;#d#
267 }#d# 312 }#d#
268 313
269 # kill coroutine otherwise 314 # kill coroutine otherwise
270 Coro::terminate 315 Coro::terminate
… …
292} 337}
293 338
294$EV::DIED = sub { 339$EV::DIED = sub {
295 Carp::cluck "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
296}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
297 347
298############################################################################# 348#############################################################################
299 349
300=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
301 351
… …
322 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
323 $d 373 $d
324 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
325} 375}
326 376
377=item $scalar = load_file $path
378
379Loads the given file from path and returns its contents. Croaks on error
380and can block.
381
382=cut
383
384sub load_file($) {
385 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!";
387
388 $data
389}
390
327=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
328 392
329Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
330 394
331=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
… …
337our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 401our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
338 402
339sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
340sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
341 405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
414=item $ref = cf::decode_yaml $scalar
415
416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
417
418=cut
419
420sub decode_yaml($) {
421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
435}
436
342=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
343 438
344Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
345but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
346 441
347The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
348is a reload or not. 443is a reload or not.
349 444
350=cut 445=cut
351 446
352sub post_init(&) { 447sub post_init(&) {
353 push @POST_INIT, shift; 448 push @POST_INIT, shift;
449}
450
451sub _post_init {
452 trace "running post_init jobs";
453
454 # run them in parallel...
455
456 my @join;
457
458 while () {
459 push @join, map &Coro::async ($_, 0), @POST_INIT;
460 @POST_INIT = ();
461
462 @join or last;
463
464 (pop @join)->join;
465 }
354} 466}
355 467
356=item cf::lock_wait $string 468=item cf::lock_wait $string
357 469
358Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
… …
397} 509}
398 510
399=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
400 512
401Like EV::periodic, but randomly selects a starting point so that the actions 513Like EV::periodic, but randomly selects a starting point so that the actions
402get spread over timer. 514get spread over time.
403 515
404=cut 516=cut
405 517
406sub periodic($$) { 518sub periodic($$) {
407 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
… …
411 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
412} 524}
413 525
414=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
415 527
416Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
417This call blocks and returns only when you have at least C<$time> seconds 529(default: 0): This call blocks and returns only when you have at least
418of cpu time till the next tick. The slot is only valid till the next cede. 530C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede.
532
533Background jobs should use a priority les than zero, interactive jobs
534should use 100 or more.
419 535
420The optional C<$name> can be used to identify the job to run. It might be 536The optional C<$name> can be used to identify the job to run. It might be
421used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
422 538
423Useful for short background jobs. 539Useful for short background jobs.
424 540
425=cut 541=cut
426 542
427our @SLOT_QUEUE; 543our @SLOT_QUEUE;
428our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
429 546
430$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
431$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
433 550
434 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
435 553
436 while () { 554 while () {
437 next_job: 555 next_job:
556
438 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
439 if ($avail > 0.01) { 558
440 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
441 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
442 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
443 $job->[2]->send; 563 $job->[2]->send;
444 Coro::cede; 564 Coro::cede;
445 goto next_job; 565 goto next_job;
446 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
447 } 568 }
448 } 569 }
449 570
450 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
451 # we do not use wait_for_tick() as it returns immediately when tick is inactive 572 # we do not use wait_for_tick() as it returns immediately when tick is inactive
452 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
453 $signal->wait;
454 } else { 574 } else {
575 $busy = 0;
455 Coro::schedule; 576 Coro::schedule;
456 } 577 }
457 } 578 }
458}; 579};
459 580
460sub get_slot($;$$) { 581sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main; 582 return if tick_inhibit || $Coro::current == $Coro::main;
462 583
463 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
464 585
465 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
466 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
467 589
468 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
469 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
470 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
… …
496=cut 618=cut
497 619
498sub sync_job(&) { 620sub sync_job(&) {
499 my ($job) = @_; 621 my ($job) = @_;
500 622
501 if ($Coro::current == $Coro::main) { 623 if (in_main) {
502 my $time = EV::time; 624 my $time = AE::time;
503 625
504 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
505 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
506 628
507 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
508 630
509 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
510 632
511 my $busy = 1; 633 my $busy = 1;
512 my @res; 634 my @res;
513 635
514 (async { 636 (async {
515 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
516 @res = eval { $job->() }; 638 @res = eval { $job->() };
517 warn $@ if $@; 639 error $@ if $@;
518 undef $busy; 640 undef $busy;
519 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
520 642
521 while ($busy) { 643 while ($busy) {
522 if (Coro::nready) { 644 if (Coro::nready) {
… …
524 } else { 646 } else {
525 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
526 } 648 }
527 } 649 }
528 650
529 my $time = EV::time - $time; 651 my $time = AE::time - $time;
530 652
531 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
532 654
533 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
534 } else { 656 } else {
… …
556 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
557 679
558 $coro 680 $coro
559} 681}
560 682
561=item fork_call { }, $args 683=item fork_call { }, @args
562 684
563Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
564process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
565Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
566never block itself or use any form of event handling. 688never block itself or use any form of event handling.
567 689
568=cut 690=cut
569 691
692sub post_fork {
693 reset_signals;
694}
695
570sub fork_call(&@) { 696sub fork_call(&@) {
571 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
572 698
573 # we seemingly have to make a local copy of the whole thing, 699 # we seemingly have to make a local copy of the whole thing,
574 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
575 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
576 702
577 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
578 reset_signals; 704 cf::post_fork;
579 &$cb 705 &$cb
580 }, @args; 706 } @args;
581 707
582 wantarray ? @res : $res[-1] 708 wantarray ? @res : $res[-1]
709}
710
711sub objinfo {
712 (
713 "counter value" => cf::object::object_count,
714 "objects created" => cf::object::create_count,
715 "objects destroyed" => cf::object::destroy_count,
716 "freelist size" => cf::object::free_count,
717 "allocated objects" => cf::object::objects_size,
718 "active objects" => cf::object::actives_size,
719 )
583} 720}
584 721
585=item $coin = coin_from_name $name 722=item $coin = coin_from_name $name
586 723
587=cut 724=cut
… …
624within each server. 761within each server.
625 762
626=cut 763=cut
627 764
628sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
629 my ($name) = @_; 769 my ($name) = @_;
630 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
631 771
632 eval { 772 eval {
633 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
… …
643} 783}
644 784
645our $DB; 785our $DB;
646 786
647sub db_init { 787sub db_init {
648 cf::sync_job {
649 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
650 };
651} 789}
652 790
653sub db_get($$) { 791sub db_get($$) {
654 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
655 793
656 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
657 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
658 798
659 $! ? () 799 $! ? ()
660 : $data 800 : $data
661 }
662} 801}
663 802
664sub db_put($$$) { 803sub db_put($$$) {
665 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
666 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
694 833
695 my @data; 834 my @data;
696 my $md5; 835 my $md5;
697 836
698 for (0 .. $#$src) { 837 for (0 .. $#$src) {
699 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
700 or Carp::croak "$src->[$_]: $!";
701 } 839 }
702 840
703 # if processing is expensive, check 841 # if processing is expensive, check
704 # checksum first 842 # checksum first
705 if (1) { 843 if (1) {
… …
722 860
723 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
724 my $data = $process->(\@data); 862 my $data = $process->(\@data);
725 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
726 864
727 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
728 866
729 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
730 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
731 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
732 870
… …
742 880
743=cut 881=cut
744 882
745sub datalog($@) { 883sub datalog($@) {
746 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
747 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
748} 886}
749 887
750=back 888=back
751 889
752=cut 890=cut
… …
947 1085
948 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
949 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
950 1088
951 } elsif (ref $type) { 1089 } elsif (ref $type) {
952 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
953 1091
954 } else { 1092 } else {
955 shift @arg; 1093 shift @arg;
956 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
957 } 1095 }
958 } 1096 }
959} 1097}
960 1098
961sub _object_attach { 1099sub _object_attach {
… …
971 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
972 } 1110 }
973 1111
974 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
975 } else { 1113 } else {
976 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
977 } 1115 }
978 1116
979 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
980} 1118}
981 1119
… …
1040 1178
1041 for (@$callbacks) { 1179 for (@$callbacks) {
1042 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1043 1181
1044 if ($@) { 1182 if ($@) {
1045 warn "$@";
1046 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1047 override; 1184 override;
1048 } 1185 }
1049 1186
1050 return 1 if $override; 1187 return 1 if $override;
1051 } 1188 }
… …
1130 for (@$attach) { 1267 for (@$attach) {
1131 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1132 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1133 } 1270 }
1134 } else { 1271 } else {
1135 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1136 } 1273 }
1137 } 1274 }
1138} 1275}
1139 1276
1140cf::attachable->attach ( 1277cf::attachable->attach (
… …
1167 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1168 1305
1169 sync_job { 1306 sync_job {
1170 if (length $$rdata) { 1307 if (length $$rdata) {
1171 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1172 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1173 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1174 1312
1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1178 if ($cf::USE_FSYNC) { 1316 if ($cf::USE_FSYNC) {
… …
1200 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1201 1339
1202 $filename =~ s%/[^/]+$%%; 1340 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC; 1341 aio_pathsync $filename if $cf::USE_FSYNC;
1204 } else { 1342 } else {
1205 warn "unable to save objects: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1206 } 1344 }
1207 } else { 1345 } else {
1208 aio_unlink $filename; 1346 aio_unlink $filename;
1209 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1210 } 1348 }
… …
1234 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1235 $av = $st->{objs}; 1373 $av = $st->{objs};
1236 } 1374 }
1237 1375
1238 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1239 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1240 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1241 1380
1242 ($data, $av) 1381 ($data, $av)
1243} 1382}
1244 1383
1245=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
… …
1304} 1443}
1305 1444
1306use File::Glob (); 1445use File::Glob ();
1307 1446
1308cf::player->attach ( 1447cf::player->attach (
1309 on_command => sub { 1448 on_unknown_command => sub {
1310 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1311 1450
1312 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1313 or return; 1452 or return;
1314 1453
… …
1337 1476
1338 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1339 if $reply; 1478 if $reply;
1340 1479
1341 } else { 1480 } else {
1342 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1343 } 1482 }
1344 1483
1345 cf::override; 1484 cf::override;
1346 }, 1485 },
1347); 1486);
… …
1358 1497
1359 $grp 1498 $grp
1360} 1499}
1361 1500
1362sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1363 cf::sync_job { 1504 cf::sync_job {
1364 my %todo; 1505 my %todo;
1365 1506
1366 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1367 next unless -r $path; 1508 next unless -r $path;
… …
1385 1526
1386 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1387 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1388 1529
1389 $ext{source} = 1530 $ext{source} =
1390 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1391 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1392 . $source 1533 . $source
1393 . "\n};\n1"; 1534 . "\n};\n1";
1394 1535
1395 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
1396 } 1537 }
1397 1538
1539 my $pass = 0;
1398 my %done; 1540 my %done;
1399 while (%todo) { 1541 while (%todo) {
1400 my $progress; 1542 my $progress;
1401 1543
1544 ++$pass;
1545
1546 ext:
1402 while (my ($k, $v) = each %todo) { 1547 while (my ($k, $v) = each %todo) {
1403 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1404 goto skip 1549 next ext
1405 unless exists $done{$_}; 1550 unless exists $done{$_};
1406 } 1551 }
1407 1552
1408 warn "... loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1409 1554
1410 unless (eval $v->{source}) { 1555 my $active = eval $v->{source};
1556
1557 if (length $@) {
1411 my $msg = $@ ? "$v->{path}: $@\n" 1558 error "$v->{path}: $@\n";
1412 : "$v->{base}: extension inactive.\n";
1413 1559
1414 if (exists $v->{meta}{mandatory}) {
1415 warn $msg;
1416 cf::cleanup "mandatory extension failed to load, exiting."; 1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1417 } 1561 if exists $v->{meta}{mandatory};
1418 1562
1419 warn $msg; 1563 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1564 delete $todo{$k};
1565 } else {
1566 $done{$k} = delete $todo{$k};
1567 push @EXTS, $v->{pkg};
1568 $progress = 1;
1569
1570 info "$v->{base}: extension inactive.\n"
1571 unless $active;
1420 } 1572 }
1421
1422 $done{$k} = delete $todo{$k};
1423 push @EXTS, $v->{pkg};
1424 $progress = 1;
1425 } 1573 }
1426 1574
1427 skip: 1575 unless ($progress) {
1428 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1576 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1429 unless $progress; 1577
1578 while (my ($k, $v) = each %todo) {
1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1580 if exists $v->{meta}{mandatory};
1581 }
1582
1583 last;
1584 }
1430 } 1585 }
1431 }; 1586 };
1432} 1587}
1433 1588
1434############################################################################# 1589#############################################################################
… …
1518 $cf::PLAYER{$login} = $pl 1673 $cf::PLAYER{$login} = $pl
1519 } 1674 }
1520 } 1675 }
1521} 1676}
1522 1677
1678cf::player->attach (
1679 on_load => sub {
1680 my ($pl, $path) = @_;
1681
1682 # restore slots saved in save, below
1683 my $slots = delete $pl->{_slots};
1684
1685 $pl->ob->current_weapon ($slots->[0]);
1686 $pl->combat_ob ($slots->[1]);
1687 $pl->ranged_ob ($slots->[2]);
1688 },
1689);
1690
1523sub save($) { 1691sub save($) {
1524 my ($pl) = @_; 1692 my ($pl) = @_;
1525 1693
1526 return if $pl->{deny_save}; 1694 return if $pl->{deny_save};
1527 1695
… …
1532 1700
1533 aio_mkdir playerdir $pl, 0770; 1701 aio_mkdir playerdir $pl, 0770;
1534 $pl->{last_save} = $cf::RUNTIME; 1702 $pl->{last_save} = $cf::RUNTIME;
1535 1703
1536 cf::get_slot 0.01; 1704 cf::get_slot 0.01;
1705
1706 # save slots, to be restored later
1707 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1537 1708
1538 $pl->save_pl ($path); 1709 $pl->save_pl ($path);
1539 cf::cede_to_tick; 1710 cf::cede_to_tick;
1540} 1711}
1541 1712
… …
1575 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1576 1747
1577 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1578 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1749 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1579 1750
1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1581 $pl->deactivate; 1752 $pl->deactivate;
1753
1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1754 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583 $pl->ob->check_score;
1584 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1585 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1586 1759
1587 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1588 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1589 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
… …
1643 \@logins 1816 \@logins
1644} 1817}
1645 1818
1646=item $player->maps 1819=item $player->maps
1647 1820
1821=item cf::player::maps $login
1822
1648Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1649player. May block. 1824player. May block.
1650 1825
1651=cut 1826=cut
1652 1827
… …
1714=cut 1889=cut
1715 1890
1716sub find_by_path($) { 1891sub find_by_path($) {
1717 my ($path) = @_; 1892 my ($path) = @_;
1718 1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1895
1719 my ($match, $specificity); 1896 my ($match, $specificity);
1720 1897
1721 for my $region (list) { 1898 for my $region (list) {
1722 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1723 ($match, $specificity) = ($region, $region->specificity) 1900 ($match, $specificity) = ($region, $region->specificity)
… …
1751sub generate_random_map { 1928sub generate_random_map {
1752 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1753 1930
1754 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1755 1932
1756 # mit "rum" bekleckern, nicht
1757 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1761 $rmp->{exit_on_final_map},
1762 $rmp->{xsize}, $rmp->{ysize},
1763 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1764 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1765 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1766 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1767 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1768 (cf::region::find $rmp->{region}), $rmp->{custom}
1769 )
1770} 1934}
1771 1935
1772=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1773 1937
1774Register a handler for the map path matching the given regex at the 1938Register a handler for the map path matching the given regex at the
… …
1779 1943
1780sub register { 1944sub register {
1781 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1782 my $pkg = caller; 1946 my $pkg = caller;
1783 1947
1784 no strict;
1785 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1786 1949
1787 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1788} 1951}
1789 1952
1790# also paths starting with '/' 1953# also paths starting with '/'
1791$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1792 1955
1793sub thawer_merge { 1956sub thawer_merge {
1794 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1795 1958
1796 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
… …
1801} 1964}
1802 1965
1803sub normalise { 1966sub normalise {
1804 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1805 1968
1806 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1807 1970
1808 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1809 1972
1810 # map plan: 1973 # map plan:
1811 # 1974 #
… …
1826 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1827 $path = "$base/$path"; 1990 $path = "$base/$path";
1828 } 1991 }
1829 1992
1830 for ($path) { 1993 for ($path) {
1831 redo if s{//}{/};
1832 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1833 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1834 } 1996 }
1835 1997
1836 $path 1998 $path
… …
1850 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1851 return $self; 2013 return $self;
1852 } 2014 }
1853 } 2015 }
1854 2016
1855 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1856 () 2018 ()
1857} 2019}
1858 2020
2021# may re-bless or do other evil things
1859sub init { 2022sub init {
1860 my ($self) = @_; 2023 my ($self) = @_;
1861 2024
1862 $self 2025 $self
1863} 2026}
… …
1928 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1929 2092
1930 1 2093 1
1931} 2094}
1932 2095
2096# used to laod the header of an original map
1933sub load_header_orig { 2097sub load_header_orig {
1934 my ($self) = @_; 2098 my ($self) = @_;
1935 2099
1936 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1937} 2101}
1938 2102
2103# used to laod the header of an instantiated map
1939sub load_header_temp { 2104sub load_header_temp {
1940 my ($self) = @_; 2105 my ($self) = @_;
1941 2106
1942 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1943} 2108}
1944 2109
2110# called after loading the header from an instantiated map
1945sub prepare_temp { 2111sub prepare_temp {
1946 my ($self) = @_; 2112 my ($self) = @_;
1947 2113
1948 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1949 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1950 # safety 2116 # safety
1951 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1952 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1953} 2119}
1954 2120
2121# called after loading the header from an original map
1955sub prepare_orig { 2122sub prepare_orig {
1956 my ($self) = @_; 2123 my ($self) = @_;
1957 2124
1958 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1959 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
… …
1983 2150
1984sub find; 2151sub find;
1985sub find { 2152sub find {
1986 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
1987 2154
2155 cf::cede_to_tick;
2156
1988 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
1989 2158
1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1991 my $guard2 = cf::lock_acquire "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
1992 2161
1993 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
… …
2010 2179
2011 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
2012 } 2181 }
2013} 2182}
2014 2183
2015sub pre_load { } 2184sub pre_load { }
2016sub post_load { } 2185#sub post_load { } # XS
2017 2186
2018sub load { 2187sub load {
2019 my ($self) = @_; 2188 my ($self) = @_;
2020 2189
2021 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
… …
2024 2193
2025 { 2194 {
2026 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2027 2196
2028 return unless $self->valid; 2197 return unless $self->valid;
2029 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2030
2031 $self->in_memory (cf::MAP_LOADING);
2032 2199
2033 $self->alloc; 2200 $self->alloc;
2034 2201
2035 $self->pre_load; 2202 $self->pre_load;
2036 cf::cede_to_tick; 2203 cf::cede_to_tick;
2037 2204
2205 if (exists $self->{load_path}) {
2038 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2039 $f->skip_block; 2207 $f->skip_block;
2040 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2041 or return; 2209 or return;
2042 2210
2043 $self->post_load_original 2211 $self->post_load_original
2044 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2045 2213
2046 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2047 utf8::encode $uniq; 2215 utf8::encode $uniq;
2048 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2049 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2050 $self->clear_unique_items; 2218 $self->clear_unique_items;
2051 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2052 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2053 } 2222 }
2054 } 2223 }
2055 }
2056 2224
2057 $f->resolve_delayed_derefs; 2225 $f->resolve_delayed_derefs;
2226 } else {
2227 $self->post_load_original
2228 if delete $self->{load_original};
2229 }
2230
2231 $self->state (cf::MAP_INACTIVE);
2058 2232
2059 cf::cede_to_tick; 2233 cf::cede_to_tick;
2060 # now do the right thing for maps 2234 # now do the right thing for maps
2061 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2062 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
… …
2066 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2067 $self->decay_objects; 2241 $self->decay_objects;
2068 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2069 $self->update_buttons; 2243 $self->update_buttons;
2070 cf::cede_to_tick; 2244 cf::cede_to_tick;
2071 $self->activate; 2245 #$self->activate; # no longer activate maps automatically
2072 } 2246 }
2073 2247
2074 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2075 $self->last_access ($cf::RUNTIME); 2249 $self->last_access ($cf::RUNTIME);
2076
2077 $self->in_memory (cf::MAP_ACTIVE);
2078 } 2250 }
2079 2251
2080 $self->post_load; 2252 $self->post_load;
2081}
2082 2253
2254 1
2255}
2256
2257# customize the map for a given player, i.e.
2258# return the _real_ map. used by e.g. per-player
2259# maps to change the path to ~playername/mappath
2083sub customise_for { 2260sub customise_for {
2084 my ($self, $ob) = @_; 2261 my ($self, $ob) = @_;
2085 2262
2086 return find "~" . $ob->name . "/" . $self->{path} 2263 return find "~" . $ob->name . "/" . $self->{path}
2087 if $self->per_player; 2264 if $self->per_player;
… …
2103 or next; 2280 or next;
2104 $neigh = find $neigh, $map 2281 $neigh = find $neigh, $map
2105 or next; 2282 or next;
2106 $neigh->load; 2283 $neigh->load;
2107 2284
2285 # now find the diagonal neighbours
2108 push @neigh, 2286 push @neigh,
2109 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2287 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2110 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2288 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2111 } 2289 }
2112 2290
… …
2119} 2297}
2120 2298
2121sub find_sync { 2299sub find_sync {
2122 my ($path, $origin) = @_; 2300 my ($path, $origin) = @_;
2123 2301
2124 cf::sync_job { find $path, $origin } 2302 # it's a bug to call this from the main context
2303 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2304 if $Coro::current == $Coro::main;
2305
2306 find $path, $origin
2125} 2307}
2126 2308
2127sub do_load_sync { 2309sub do_load_sync {
2128 my ($map) = @_; 2310 my ($map) = @_;
2129 2311
2312 # it's a bug to call this from the main context
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2313 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main; 2314 if $Coro::current == $Coro::main;
2132 2315
2133 cf::sync_job { $map->load }; 2316 $map->load;
2134} 2317}
2135 2318
2136our %MAP_PREFETCH; 2319our %MAP_PREFETCH;
2137our $MAP_PREFETCHER = undef; 2320our $MAP_PREFETCHER = undef;
2138 2321
2139sub find_async { 2322sub find_async {
2140 my ($path, $origin, $load) = @_; 2323 my ($path, $origin, $load) = @_;
2141 2324
2142 $path = normalise $path, $origin && $origin->{path}; 2325 $path = normalise $path, $origin;
2143 2326
2144 if (my $map = $cf::MAP{$path}) { 2327 if (my $map = $cf::MAP{$path}) {
2145 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2328 return $map if !$load || $map->linkable;
2146 } 2329 }
2147 2330
2148 $MAP_PREFETCH{$path} |= $load; 2331 $MAP_PREFETCH{$path} |= $load;
2149 2332
2150 $MAP_PREFETCHER ||= cf::async { 2333 $MAP_PREFETCHER ||= cf::async {
… …
2164 $MAP_PREFETCHER->prio (6); 2347 $MAP_PREFETCHER->prio (6);
2165 2348
2166 () 2349 ()
2167} 2350}
2168 2351
2352# common code, used by both ->save and ->swapout
2169sub save { 2353sub _save {
2170 my ($self) = @_; 2354 my ($self) = @_;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2355
2174 $self->{last_save} = $cf::RUNTIME; 2356 $self->{last_save} = $cf::RUNTIME;
2175 2357
2176 return unless $self->dirty; 2358 return unless $self->dirty;
2177 2359
… …
2197 } else { 2379 } else {
2198 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2380 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2199 } 2381 }
2200} 2382}
2201 2383
2384sub save {
2385 my ($self) = @_;
2386
2387 my $lock = cf::lock_acquire "map_data:$self->{path}";
2388
2389 $self->_save;
2390}
2391
2202sub swap_out { 2392sub swap_out {
2203 my ($self) = @_; 2393 my ($self) = @_;
2204 2394
2205 # save first because save cedes
2206 $self->save;
2207
2208 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2395 my $lock = cf::lock_acquire "map_data:$self->{path}";
2209 2396
2397 return if !$self->linkable;
2398 return if $self->{deny_save};
2210 return if $self->players; 2399 return if $self->players;
2211 return if $self->in_memory != cf::MAP_ACTIVE; 2400
2401 # first deactivate the map and "unlink" it from the core
2402 $self->deactivate;
2403 $_->clear_links_to ($self) for values %cf::MAP;
2404 $self->state (cf::MAP_SWAPPED);
2405
2406 # then atomically save
2407 $self->_save;
2408
2409 # then free the map
2410 $self->clear;
2411}
2412
2413sub reset_at {
2414 my ($self) = @_;
2415
2416 # TODO: safety, remove and allow resettable per-player maps
2212 return if $self->{deny_save}; 2417 return 1e99 if $self->{deny_reset};
2213 2418
2419 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2420 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2421
2422 $time + $to
2423}
2424
2425sub should_reset {
2426 my ($self) = @_;
2427
2428 $self->reset_at <= $cf::RUNTIME
2429}
2430
2431sub reset {
2432 my ($self) = @_;
2433
2434 my $lock = cf::lock_acquire "map_data:$self->{path}";
2435
2436 return if $self->players;
2437
2438 cf::trace "resetting map ", $self->path, "\n";
2439
2214 $self->in_memory (cf::MAP_SWAPPED); 2440 $self->state (cf::MAP_SWAPPED);
2441
2442 # need to save uniques path
2443 unless ($self->{deny_save}) {
2444 my $uniq = $self->uniq_path; utf8::encode $uniq;
2445
2446 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2447 if $uniq;
2448 }
2449
2450 delete $cf::MAP{$self->path};
2215 2451
2216 $self->deactivate; 2452 $self->deactivate;
2217 $_->clear_links_to ($self) for values %cf::MAP; 2453 $_->clear_links_to ($self) for values %cf::MAP;
2218 $self->clear; 2454 $self->clear;
2219}
2220
2221sub reset_at {
2222 my ($self) = @_;
2223
2224 # TODO: safety, remove and allow resettable per-player maps
2225 return 1e99 if $self->{deny_reset};
2226
2227 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2228 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2229
2230 $time + $to
2231}
2232
2233sub should_reset {
2234 my ($self) = @_;
2235
2236 $self->reset_at <= $cf::RUNTIME
2237}
2238
2239sub reset {
2240 my ($self) = @_;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243
2244 return if $self->players;
2245
2246 warn "resetting map ", $self->path, "\n";
2247
2248 $self->in_memory (cf::MAP_SWAPPED);
2249
2250 # need to save uniques path
2251 unless ($self->{deny_save}) {
2252 my $uniq = $self->uniq_path; utf8::encode $uniq;
2253
2254 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2255 if $uniq;
2256 }
2257
2258 delete $cf::MAP{$self->path};
2259
2260 $self->deactivate;
2261 $_->clear_links_to ($self) for values %cf::MAP;
2262 $self->clear;
2263 2455
2264 $self->unlink_save; 2456 $self->unlink_save;
2265 $self->destroy; 2457 $self->destroy;
2266} 2458}
2267 2459
… …
2275 2467
2276 delete $cf::MAP{$self->path}; 2468 delete $cf::MAP{$self->path};
2277 2469
2278 $self->unlink_save; 2470 $self->unlink_save;
2279 2471
2280 bless $self, "cf::map"; 2472 bless $self, "cf::map::wrap";
2281 delete $self->{deny_reset}; 2473 delete $self->{deny_reset};
2282 $self->{deny_save} = 1; 2474 $self->{deny_save} = 1;
2283 $self->reset_timeout (1); 2475 $self->reset_timeout (1);
2284 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2476 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2285 2477
… …
2515 2707
2516Freezes the player and moves him/her to a special map (C<{link}>). 2708Freezes the player and moves him/her to a special map (C<{link}>).
2517 2709
2518The player should be reasonably safe there for short amounts of time (e.g. 2710The player should be reasonably safe there for short amounts of time (e.g.
2519for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2711for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2520though, as the palyer cannot control the character while it is on the link 2712though, as the player cannot control the character while it is on the link
2521map. 2713map.
2522 2714
2523Will never block. 2715Will never block.
2524 2716
2525=item $player_object->leave_link ($map, $x, $y) 2717=item $player_object->leave_link ($map, $x, $y)
… …
2546sub cf::object::player::enter_link { 2738sub cf::object::player::enter_link {
2547 my ($self) = @_; 2739 my ($self) = @_;
2548 2740
2549 $self->deactivate_recursive; 2741 $self->deactivate_recursive;
2550 2742
2743 ++$self->{_link_recursion};
2744
2551 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2745 return if UNIVERSAL::isa $self->map, "ext::map_link";
2552 2746
2553 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2747 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2554 if $self->map && $self->map->{path} ne "{link}"; 2748 if $self->map && $self->map->{path} ne "{link}";
2555 2749
2556 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2750 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2557} 2751}
2558 2752
2559sub cf::object::player::leave_link { 2753sub cf::object::player::leave_link {
2560 my ($self, $map, $x, $y) = @_; 2754 my ($self, $map, $x, $y) = @_;
2561 2755
… …
2586 $map->load_neighbours; 2780 $map->load_neighbours;
2587 2781
2588 return unless $self->contr->active; 2782 return unless $self->contr->active;
2589 2783
2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2784 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2591 $self->enter_map ($map, $x, $y); 2785 if ($self->enter_map ($map, $x, $y)) {
2592 2786 # entering was successful
2787 delete $self->{_link_recursion};
2593 # only activate afterwards, to support waiting in hooks 2788 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive; 2789 $self->activate_recursive;
2595} 2790 }
2596 2791
2792}
2793
2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2794=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2598 2795
2599Moves the player to the given map-path and coordinates by first freezing 2796Moves the player to the given map-path and coordinates by first freezing
2600her, loading and preparing them map, calling the provided $check callback 2797her, loading and preparing them map, calling the provided $check callback
2601that has to return the map if sucecssful, and then unfreezes the player on 2798that has to return the map if sucecssful, and then unfreezes the player on
2602the new (success) or old (failed) map position. In either case, $done will 2799the new (success) or old (failed) map position. In either case, $done will
… …
2609 2806
2610our $GOTOGEN; 2807our $GOTOGEN;
2611 2808
2612sub cf::object::player::goto { 2809sub cf::object::player::goto {
2613 my ($self, $path, $x, $y, $check, $done) = @_; 2810 my ($self, $path, $x, $y, $check, $done) = @_;
2811
2812 if ($self->{_link_recursion} >= $MAX_LINKS) {
2813 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2814 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2815 ($path, $x, $y) = @$EMERGENCY_POSITION;
2816 }
2614 2817
2615 # do generation counting so two concurrent goto's will be executed in-order 2818 # do generation counting so two concurrent goto's will be executed in-order
2616 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2819 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2617 2820
2618 $self->enter_link; 2821 $self->enter_link;
… …
2638 ($path, $x, $y) = (undef, undef, undef); 2841 ($path, $x, $y) = (undef, undef, undef);
2639 } 2842 }
2640 } 2843 }
2641 2844
2642 my $map = eval { 2845 my $map = eval {
2643 my $map = defined $path ? cf::map::find $path : undef; 2846 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2644 2847
2645 if ($map) { 2848 if ($map) {
2646 $map = $map->customise_for ($self); 2849 $map = $map->customise_for ($self);
2647 $map = $check->($map) if $check && $map; 2850 $map = $check->($map, $x, $y, $self) if $check && $map;
2648 } else { 2851 } else {
2649 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2852 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2650 } 2853 }
2651 2854
2652 $map 2855 $map
… …
2660 if ($gen == $self->{_goto_generation}) { 2863 if ($gen == $self->{_goto_generation}) {
2661 delete $self->{_goto_generation}; 2864 delete $self->{_goto_generation};
2662 $self->leave_link ($map, $x, $y); 2865 $self->leave_link ($map, $x, $y);
2663 } 2866 }
2664 2867
2665 $done->() if $done; 2868 $done->($self) if $done;
2666 })->prio (1); 2869 })->prio (1);
2667} 2870}
2668 2871
2669=item $player_object->enter_exit ($exit_object) 2872=item $player_object->enter_exit ($exit_object)
2670 2873
… …
2738 $Coro::current->{desc} = "enter_exit"; 2941 $Coro::current->{desc} = "enter_exit";
2739 2942
2740 unless (eval { 2943 unless (eval {
2741 $self->deactivate_recursive; # just to be sure 2944 $self->deactivate_recursive; # just to be sure
2742 2945
2743 # random map handling
2744 {
2745 my $guard = cf::lock_acquire "exit_prepare:$exit";
2746
2747 prepare_random_map $exit
2748 if $exit->slaying eq "/!";
2749 }
2750
2751 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2946 my $map = cf::map::normalise $exit->slaying, $exit->map;
2752 my $x = $exit->stats->hp; 2947 my $x = $exit->stats->hp;
2753 my $y = $exit->stats->sp; 2948 my $y = $exit->stats->sp;
2949
2950 # special map handling
2951 my $slaying = $exit->slaying;
2952
2953 # special map handling
2954 if ($slaying eq "/!") {
2955 my $guard = cf::lock_acquire "exit_prepare:$exit";
2956
2957 prepare_random_map $exit
2958 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2959
2960 $map = $exit->slaying;
2961
2962 } elsif ($slaying eq '!up') {
2963 $map = $exit->map->tile_path (cf::TILE_UP);
2964 $x = $exit->x;
2965 $y = $exit->y;
2966
2967 } elsif ($slaying eq '!down') {
2968 $map = $exit->map->tile_path (cf::TILE_DOWN);
2969 $x = $exit->x;
2970 $y = $exit->y;
2971 }
2754 2972
2755 $self->goto ($map, $x, $y); 2973 $self->goto ($map, $x, $y);
2756 2974
2757 # if exit is damned, update players death & WoR home-position 2975 # if exit is damned, update players death & WoR home-position
2758 $self->contr->savebed ($map, $x, $y) 2976 $self->contr->savebed ($map, $x, $y)
… …
2763 $self->message ("Something went wrong deep within the deliantra server. " 2981 $self->message ("Something went wrong deep within the deliantra server. "
2764 . "I'll try to bring you back to the map you were before. " 2982 . "I'll try to bring you back to the map you were before. "
2765 . "Please report this to the dungeon master!", 2983 . "Please report this to the dungeon master!",
2766 cf::NDI_UNIQUE | cf::NDI_RED); 2984 cf::NDI_UNIQUE | cf::NDI_RED);
2767 2985
2768 warn "ERROR in enter_exit: $@"; 2986 error "ERROR in enter_exit: $@";
2769 $self->leave_link; 2987 $self->leave_link;
2770 } 2988 }
2771 })->prio (1); 2989 })->prio (1);
2772} 2990}
2773 2991
… …
3086 3304
3087 $ns->ext_reply ($reply, @reply) 3305 $ns->ext_reply ($reply, @reply)
3088 if $reply; 3306 if $reply;
3089 3307
3090 } else { 3308 } else {
3091 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3309 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3092 } 3310 }
3093 3311
3094 cf::override; 3312 cf::override;
3095 }, 3313 },
3096); 3314);
… …
3116 3334
3117 $coro 3335 $coro
3118} 3336}
3119 3337
3120cf::client->attach ( 3338cf::client->attach (
3121 on_destroy => sub { 3339 on_client_destroy => sub {
3122 my ($ns) = @_; 3340 my ($ns) = @_;
3123 3341
3124 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3342 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3125 }, 3343 },
3126); 3344);
… …
3142our $safe_hole = new Safe::Hole; 3360our $safe_hole = new Safe::Hole;
3143 3361
3144$SIG{FPE} = 'IGNORE'; 3362$SIG{FPE} = 'IGNORE';
3145 3363
3146$safe->permit_only (Opcode::opset qw( 3364$safe->permit_only (Opcode::opset qw(
3147 :base_core :base_mem :base_orig :base_math 3365 :base_core :base_mem :base_orig :base_math :base_loop
3148 grepstart grepwhile mapstart mapwhile 3366 grepstart grepwhile mapstart mapwhile
3149 sort time 3367 sort time
3150)); 3368));
3151 3369
3152# here we export the classes and methods available to script code 3370# here we export the classes and methods available to script code
… …
3177 decrease split destroy change_exp value msg lore send_msg)], 3395 decrease split destroy change_exp value msg lore send_msg)],
3178 ["cf::object::player" => qw(player)], 3396 ["cf::object::player" => qw(player)],
3179 ["cf::player" => qw(peaceful send_msg)], 3397 ["cf::player" => qw(peaceful send_msg)],
3180 ["cf::map" => qw(trigger)], 3398 ["cf::map" => qw(trigger)],
3181) { 3399) {
3182 no strict 'refs';
3183 my ($pkg, @funs) = @$_; 3400 my ($pkg, @funs) = @$_;
3184 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3401 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3185 for @funs; 3402 for @funs;
3186} 3403}
3187 3404
… …
3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3421 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3205 $qcode =~ s/\n/\\n/g; 3422 $qcode =~ s/\n/\\n/g;
3206 3423
3207 %vars = (_dummy => 0) unless %vars; 3424 %vars = (_dummy => 0) unless %vars;
3208 3425
3426 my @res;
3209 local $_; 3427 local $_;
3210 local @safe::cf::_safe_eval_args = values %vars;
3211 3428
3212 my $eval = 3429 my $eval =
3213 "do {\n" 3430 "do {\n"
3214 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3431 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3215 . "#line 0 \"{$qcode}\"\n" 3432 . "#line 0 \"{$qcode}\"\n"
3216 . $code 3433 . $code
3217 . "\n}" 3434 . "\n}"
3218 ; 3435 ;
3219 3436
3437 if ($CFG{safe_eval}) {
3220 sub_generation_inc; 3438 sub_generation_inc;
3439 local @safe::cf::_safe_eval_args = values %vars;
3221 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3440 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3222 sub_generation_inc; 3441 sub_generation_inc;
3442 } else {
3443 local @cf::_safe_eval_args = values %vars;
3444 @res = wantarray ? eval eval : scalar eval $eval;
3445 }
3223 3446
3224 if ($@) { 3447 if ($@) {
3225 warn "$@"; 3448 warn "$@",
3226 warn "while executing safe code '$code'\n"; 3449 "while executing safe code '$code'\n",
3227 warn "with arguments " . (join " ", %vars) . "\n"; 3450 "with arguments " . (join " ", %vars) . "\n";
3228 } 3451 }
3229 3452
3230 wantarray ? @res : $res[0] 3453 wantarray ? @res : $res[0]
3231} 3454}
3232 3455
… …
3246=cut 3469=cut
3247 3470
3248sub register_script_function { 3471sub register_script_function {
3249 my ($fun, $cb) = @_; 3472 my ($fun, $cb) = @_;
3250 3473
3251 no strict 'refs'; 3474 $fun = "safe::$fun" if $CFG{safe_eval};
3252 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3475 *$fun = $safe_hole->wrap ($cb);
3253} 3476}
3254 3477
3255=back 3478=back
3256 3479
3257=cut 3480=cut
… …
3266 # for this (global event?) 3489 # for this (global event?)
3267 %ext::player_env::MUSIC_FACE_CACHE = (); 3490 %ext::player_env::MUSIC_FACE_CACHE = ();
3268 3491
3269 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3492 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3270 3493
3271 warn "loading facedata from $path\n"; 3494 trace "loading facedata from $path\n";
3272 3495
3273 my $facedata; 3496 my $facedata = decode_storable load_file $path;
3274 0 < aio_load $path, $facedata
3275 or die "$path: $!";
3276
3277 $facedata = Coro::Storable::thaw $facedata;
3278 3497
3279 $facedata->{version} == 2 3498 $facedata->{version} == 2
3280 or cf::cleanup "$path: version mismatch, cannot proceed."; 3499 or cf::cleanup "$path: version mismatch, cannot proceed.";
3281 3500
3282 # patch in the exptable 3501 # patch in the exptable
3502 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3283 $facedata->{resource}{"res/exp_table"} = { 3503 $facedata->{resource}{"res/exp_table"} = {
3284 type => FT_RSRC, 3504 type => FT_RSRC,
3285 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3505 data => $exp_table,
3506 hash => (Digest::MD5::md5 $exp_table),
3286 }; 3507 };
3287 cf::cede_to_tick; 3508 cf::cede_to_tick;
3288 3509
3289 { 3510 {
3290 my $faces = $facedata->{faceinfo}; 3511 my $faces = $facedata->{faceinfo};
… …
3292 while (my ($face, $info) = each %$faces) { 3513 while (my ($face, $info) = each %$faces) {
3293 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3514 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3294 3515
3295 cf::face::set_visibility $idx, $info->{visibility}; 3516 cf::face::set_visibility $idx, $info->{visibility};
3296 cf::face::set_magicmap $idx, $info->{magicmap}; 3517 cf::face::set_magicmap $idx, $info->{magicmap};
3297 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3518 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3298 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3519 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3520 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3299 3521
3300 cf::cede_to_tick; 3522 cf::cede_to_tick;
3301 } 3523 }
3302 3524
3303 while (my ($face, $info) = each %$faces) { 3525 while (my ($face, $info) = each %$faces) {
… …
3308 3530
3309 if (my $smooth = cf::face::find $info->{smooth}) { 3531 if (my $smooth = cf::face::find $info->{smooth}) {
3310 cf::face::set_smooth $idx, $smooth; 3532 cf::face::set_smooth $idx, $smooth;
3311 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3533 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3312 } else { 3534 } else {
3313 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3535 error "smooth face '$info->{smooth}' not found for face '$face'";
3314 } 3536 }
3315 3537
3316 cf::cede_to_tick; 3538 cf::cede_to_tick;
3317 } 3539 }
3318 } 3540 }
… …
3327 3549
3328 cf::anim::invalidate_all; # d'oh 3550 cf::anim::invalidate_all; # d'oh
3329 } 3551 }
3330 3552
3331 { 3553 {
3332 # TODO: for gcfclient pleasure, we should give resources
3333 # that gcfclient doesn't grok a >10000 face index.
3334 my $res = $facedata->{resource}; 3554 my $res = $facedata->{resource};
3335 3555
3336 while (my ($name, $info) = each %$res) { 3556 while (my ($name, $info) = each %$res) {
3337 if (defined $info->{type}) { 3557 if (defined $info->{type}) {
3338 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3558 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3339 my $data;
3340 3559
3341 if ($info->{type} & 1) { 3560 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3342 # prepend meta info
3343
3344 my $meta = $enc->encode ({
3345 name => $name,
3346 %{ $info->{meta} || {} },
3347 });
3348
3349 $data = pack "(w/a*)*", $meta, $info->{data};
3350 } else {
3351 $data = $info->{data};
3352 }
3353
3354 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3355 cf::face::set_type $idx, $info->{type}; 3561 cf::face::set_type $idx, $info->{type};
3356 } else { 3562 } else {
3357 $RESOURCE{$name} = $info; 3563 $RESOURCE{$name} = $info; # unused
3358 } 3564 }
3359 3565
3360 cf::cede_to_tick; 3566 cf::cede_to_tick;
3361 } 3567 }
3362 } 3568 }
3363 3569
3364 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3570 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3365 3571
3366 1 3572 1
3367} 3573}
3368
3369cf::global->attach (on_resource_update => sub {
3370 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3371 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3372
3373 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3374 my $sound = $soundconf->{compat}[$_]
3375 or next;
3376
3377 my $face = cf::face::find "sound/$sound->[1]";
3378 cf::sound::set $sound->[0] => $face;
3379 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3380 }
3381
3382 while (my ($k, $v) = each %{$soundconf->{event}}) {
3383 my $face = cf::face::find "sound/$v";
3384 cf::sound::set $k => $face;
3385 }
3386 }
3387});
3388 3574
3389register_exticmd fx_want => sub { 3575register_exticmd fx_want => sub {
3390 my ($ns, $want) = @_; 3576 my ($ns, $want) = @_;
3391 3577
3392 while (my ($k, $v) = each %$want) { 3578 while (my ($k, $v) = each %$want) {
… …
3431sub reload_treasures { 3617sub reload_treasures {
3432 load_resource_file "$DATADIR/treasures" 3618 load_resource_file "$DATADIR/treasures"
3433 or die "unable to load treasurelists\n"; 3619 or die "unable to load treasurelists\n";
3434} 3620}
3435 3621
3622sub reload_sound {
3623 trace "loading sound config from $DATADIR/sound\n";
3624
3625 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3626
3627 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3628 my $sound = $soundconf->{compat}[$_]
3629 or next;
3630
3631 my $face = cf::face::find "sound/$sound->[1]";
3632 cf::sound::set $sound->[0] => $face;
3633 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3634 }
3635
3636 while (my ($k, $v) = each %{$soundconf->{event}}) {
3637 my $face = cf::face::find "sound/$v";
3638 cf::sound::set $k => $face;
3639 }
3640}
3641
3436sub reload_resources { 3642sub reload_resources {
3437 warn "reloading resource files...\n"; 3643 trace "reloading resource files...\n";
3438 3644
3645 reload_exp_table;
3646 reload_materials;
3439 reload_facedata; 3647 reload_facedata;
3648 reload_sound;
3440 reload_archetypes; 3649 reload_archetypes;
3441 reload_regions; 3650 reload_regions;
3442 reload_treasures; 3651 reload_treasures;
3443 3652
3444 warn "finished reloading resource files\n"; 3653 trace "finished reloading resource files\n";
3445} 3654}
3446 3655
3447sub reload_config { 3656sub reload_config {
3448 warn "reloading config file...\n"; 3657 trace "reloading config file...\n";
3449 3658
3450 open my $fh, "<:utf8", "$CONFDIR/config" 3659 my $config = load_file "$CONFDIR/config";
3451 or return; 3660 utf8::decode $config;
3661 *CFG = decode_yaml $config;
3452 3662
3453 local $/;
3454 *CFG = YAML::XS::Load scalar <$fh>;
3455
3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3663 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3457 3664
3458 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3665 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3459 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3666 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3460 3667
3461 if (exists $CFG{mlockall}) { 3668 if (exists $CFG{mlockall}) {
… …
3463 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3670 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3464 and die "WARNING: m(un)lockall failed: $!\n"; 3671 and die "WARNING: m(un)lockall failed: $!\n";
3465 }; 3672 };
3466 warn $@ if $@; 3673 warn $@ if $@;
3467 } 3674 }
3468
3469 warn "finished reloading resource files\n";
3470} 3675}
3471 3676
3472sub pidfile() { 3677sub pidfile() {
3473 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3678 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3474 or die "$PIDFILE: $!"; 3679 or die "$PIDFILE: $!";
… …
3487 seek $fh, 0, 0; 3692 seek $fh, 0, 0;
3488 print $fh $$; 3693 print $fh $$;
3489} 3694}
3490 3695
3491sub main_loop { 3696sub main_loop {
3492 warn "EV::loop starting\n"; 3697 trace "EV::loop starting\n";
3493 if (1) { 3698 if (1) {
3494 EV::loop; 3699 EV::loop;
3495 } 3700 }
3496 warn "EV::loop returned\n"; 3701 trace "EV::loop returned\n";
3497 goto &main_loop unless $REALLY_UNLOOP; 3702 goto &main_loop unless $REALLY_UNLOOP;
3498} 3703}
3499 3704
3500sub main { 3705sub main {
3501 cf::init_globals; # initialise logging 3706 cf::init_globals; # initialise logging
3502 3707
3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3708 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3504 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3709 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3505 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3710 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3506 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3711 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3507
3508 cf::init_experience;
3509 cf::init_anim;
3510 cf::init_attackmess;
3511 cf::init_dynamic;
3512 3712
3513 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3713 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3514 3714
3515 # we must not ever block the main coroutine 3715 # we must not ever block the main coroutine
3516 local $Coro::idle = sub { 3716 local $Coro::idle = sub {
… …
3522 }; 3722 };
3523 3723
3524 evthread_start IO::AIO::poll_fileno; 3724 evthread_start IO::AIO::poll_fileno;
3525 3725
3526 cf::sync_job { 3726 cf::sync_job {
3727 cf::incloader::init ();
3728
3729 cf::init_anim;
3730 cf::init_attackmess;
3731 cf::init_dynamic;
3732
3733 cf::load_settings;
3734
3527 reload_resources; 3735 reload_resources;
3528 reload_config; 3736 reload_config;
3529 db_init; 3737 db_init;
3530 3738
3531 cf::load_settings;
3532 cf::load_materials;
3533 cf::init_uuid; 3739 cf::init_uuid;
3534 cf::init_signals; 3740 cf::init_signals;
3535 cf::init_commands;
3536 cf::init_skills; 3741 cf::init_skills;
3537 3742
3538 cf::init_beforeplay; 3743 cf::init_beforeplay;
3539 3744
3540 atomic; 3745 atomic;
… …
3545 3750
3546 # no (long-running) fork's whatsoever before this point(!) 3751 # no (long-running) fork's whatsoever before this point(!)
3547 use POSIX (); 3752 use POSIX ();
3548 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3753 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3549 3754
3550 (pop @POST_INIT)->(0) while @POST_INIT; 3755 cf::_post_init 0;
3551 }; 3756 };
3552 3757
3758 cf::object::thawer::errors_are_fatal 0;
3759 info "parse errors in files are no longer fatal from this point on.\n";
3760
3761 my $free_main; $free_main = EV::idle sub {
3762 undef $free_main;
3763 undef &main; # free gobs of memory :)
3764 };
3765
3553 main_loop; 3766 goto &main_loop;
3554} 3767}
3555 3768
3556############################################################################# 3769#############################################################################
3557# initialisation and cleanup 3770# initialisation and cleanup
3558 3771
3559# install some emergency cleanup handlers 3772# install some emergency cleanup handlers
3560BEGIN { 3773BEGIN {
3561 our %SIGWATCHER = (); 3774 our %SIGWATCHER = ();
3562 for my $signal (qw(INT HUP TERM)) { 3775 for my $signal (qw(INT HUP TERM)) {
3563 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3776 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3564 cf::cleanup "SIG$signal"; 3777 cf::cleanup "SIG$signal";
3565 }; 3778 };
3566 } 3779 }
3567} 3780}
3568 3781
3569sub write_runtime_sync { 3782sub write_runtime_sync {
3783 my $t0 = AE::time;
3784
3570 # first touch the runtime file to show we are still running: 3785 # first touch the runtime file to show we are still running:
3571 # the fsync below can take a very very long time. 3786 # the fsync below can take a very very long time.
3572 3787
3573 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3788 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3574 3789
3575 my $guard = cf::lock_acquire "write_runtime"; 3790 my $guard = cf::lock_acquire "write_runtime";
3576 3791
3577 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3792 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3578 or return; 3793 or return;
3579 3794
3580 my $value = $cf::RUNTIME + 90 + 10; 3795 my $value = $cf::RUNTIME + 90 + 10;
3581 # 10 is the runtime save interval, for a monotonic clock 3796 # 10 is the runtime save interval, for a monotonic clock
3582 # 60 allows for the watchdog to kill the server. 3797 # 60 allows for the watchdog to kill the server.
… …
3595 or return; 3810 or return;
3596 3811
3597 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3812 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3598 and return; 3813 and return;
3599 3814
3600 warn "runtime file written.\n"; 3815 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3601 3816
3602 1 3817 1
3603} 3818}
3604 3819
3605our $uuid_lock; 3820our $uuid_lock;
… …
3617 or return; 3832 or return;
3618 3833
3619 my $value = uuid_seq uuid_cur; 3834 my $value = uuid_seq uuid_cur;
3620 3835
3621 unless ($value) { 3836 unless ($value) {
3622 warn "cowardly refusing to write zero uuid value!\n"; 3837 info "cowardly refusing to write zero uuid value!\n";
3623 return; 3838 return;
3624 } 3839 }
3625 3840
3626 my $value = uuid_str $value + $uuid_skip; 3841 my $value = uuid_str $value + $uuid_skip;
3627 $uuid_skip = 0; 3842 $uuid_skip = 0;
… …
3637 or return; 3852 or return;
3638 3853
3639 aio_rename "$uuid~", $uuid 3854 aio_rename "$uuid~", $uuid
3640 and return; 3855 and return;
3641 3856
3642 warn "uuid file written ($value).\n"; 3857 trace "uuid file written ($value).\n";
3643 3858
3644 1 3859 1
3645 3860
3646} 3861}
3647 3862
… …
3653} 3868}
3654 3869
3655sub emergency_save() { 3870sub emergency_save() {
3656 my $freeze_guard = cf::freeze_mainloop; 3871 my $freeze_guard = cf::freeze_mainloop;
3657 3872
3658 warn "emergency_perl_save: enter\n"; 3873 info "emergency_perl_save: enter\n";
3874
3875 # this is a trade-off: we want to be very quick here, so
3876 # save all maps without fsync, and later call a global sync
3877 # (which in turn might be very very slow)
3878 local $USE_FSYNC = 0;
3659 3879
3660 cf::sync_job { 3880 cf::sync_job {
3661 # this is a trade-off: we want to be very quick here, so 3881 cf::write_runtime_sync; # external watchdog should not bark
3662 # save all maps without fsync, and later call a global sync
3663 # (which in turn might be very very slow)
3664 local $USE_FSYNC = 0;
3665 3882
3666 # use a peculiar iteration method to avoid tripping on perl 3883 # use a peculiar iteration method to avoid tripping on perl
3667 # refcount bugs in for. also avoids problems with players 3884 # refcount bugs in for. also avoids problems with players
3668 # and maps saved/destroyed asynchronously. 3885 # and maps saved/destroyed asynchronously.
3669 warn "emergency_perl_save: begin player save\n"; 3886 info "emergency_perl_save: begin player save\n";
3670 for my $login (keys %cf::PLAYER) { 3887 for my $login (keys %cf::PLAYER) {
3671 my $pl = $cf::PLAYER{$login} or next; 3888 my $pl = $cf::PLAYER{$login} or next;
3672 $pl->valid or next; 3889 $pl->valid or next;
3673 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3890 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3674 $pl->save; 3891 $pl->save;
3675 } 3892 }
3676 warn "emergency_perl_save: end player save\n"; 3893 info "emergency_perl_save: end player save\n";
3677 3894
3895 cf::write_runtime_sync; # external watchdog should not bark
3896
3678 warn "emergency_perl_save: begin map save\n"; 3897 info "emergency_perl_save: begin map save\n";
3679 for my $path (keys %cf::MAP) { 3898 for my $path (keys %cf::MAP) {
3680 my $map = $cf::MAP{$path} or next; 3899 my $map = $cf::MAP{$path} or next;
3681 $map->valid or next; 3900 $map->valid or next;
3682 $map->save; 3901 $map->save;
3683 } 3902 }
3684 warn "emergency_perl_save: end map save\n"; 3903 info "emergency_perl_save: end map save\n";
3685 3904
3905 cf::write_runtime_sync; # external watchdog should not bark
3906
3686 warn "emergency_perl_save: begin database checkpoint\n"; 3907 info "emergency_perl_save: begin database checkpoint\n";
3687 BDB::db_env_txn_checkpoint $DB_ENV; 3908 BDB::db_env_txn_checkpoint $DB_ENV;
3688 warn "emergency_perl_save: end database checkpoint\n"; 3909 info "emergency_perl_save: end database checkpoint\n";
3689 3910
3690 warn "emergency_perl_save: begin write uuid\n"; 3911 info "emergency_perl_save: begin write uuid\n";
3691 write_uuid_sync 1; 3912 write_uuid_sync 1;
3692 warn "emergency_perl_save: end write uuid\n"; 3913 info "emergency_perl_save: end write uuid\n";
3914
3915 cf::write_runtime_sync; # external watchdog should not bark
3916
3917 trace "emergency_perl_save: syncing database to disk";
3918 BDB::db_env_txn_checkpoint $DB_ENV;
3919
3920 info "emergency_perl_save: starting sync\n";
3921 IO::AIO::aio_sync sub {
3922 info "emergency_perl_save: finished sync\n";
3923 };
3924
3925 cf::write_runtime_sync; # external watchdog should not bark
3926
3927 trace "emergency_perl_save: flushing outstanding aio requests";
3928 while (IO::AIO::nreqs || BDB::nreqs) {
3929 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3930 }
3931
3932 cf::write_runtime_sync; # external watchdog should not bark
3693 }; 3933 };
3694 3934
3695 warn "emergency_perl_save: starting sync()\n";
3696 IO::AIO::aio_sync sub {
3697 warn "emergency_perl_save: finished sync()\n";
3698 };
3699
3700 warn "emergency_perl_save: leave\n"; 3935 info "emergency_perl_save: leave\n";
3701} 3936}
3702 3937
3703sub post_cleanup { 3938sub post_cleanup {
3704 my ($make_core) = @_; 3939 my ($make_core) = @_;
3705 3940
3941 IO::AIO::flush;
3942
3706 warn Carp::longmess "post_cleanup backtrace" 3943 error Carp::longmess "post_cleanup backtrace"
3707 if $make_core; 3944 if $make_core;
3708 3945
3709 my $fh = pidfile; 3946 my $fh = pidfile;
3710 unlink $PIDFILE if <$fh> == $$; 3947 unlink $PIDFILE if <$fh> == $$;
3711} 3948}
… …
3731 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3968 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3732 for my $name (keys %$leaf_symtab) { 3969 for my $name (keys %$leaf_symtab) {
3733 _gv_clear *{"$pkg$name"}; 3970 _gv_clear *{"$pkg$name"};
3734# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3971# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3735 } 3972 }
3736 warn "cleared package $pkg\n";#d#
3737} 3973}
3738 3974
3739sub do_reload_perl() { 3975sub do_reload_perl() {
3740 # can/must only be called in main 3976 # can/must only be called in main
3741 if ($Coro::current != $Coro::main) { 3977 unless (in_main) {
3742 warn "can only reload from main coroutine"; 3978 error "can only reload from main coroutine";
3743 return; 3979 return;
3744 } 3980 }
3745 3981
3746 return if $RELOAD++; 3982 return if $RELOAD++;
3747 3983
3748 my $t1 = EV::time; 3984 my $t1 = AE::time;
3749 3985
3750 while ($RELOAD) { 3986 while ($RELOAD) {
3751 warn "reloading..."; 3987 cf::get_slot 0.1, -1, "reload_perl";
3988 info "perl_reload: reloading...";
3752 3989
3753 warn "entering sync_job"; 3990 trace "perl_reload: entering sync_job";
3754 3991
3755 cf::sync_job { 3992 cf::sync_job {
3756 cf::write_runtime_sync; # external watchdog should not bark
3757 cf::emergency_save; 3993 #cf::emergency_save;
3758 cf::write_runtime_sync; # external watchdog should not bark
3759 3994
3760 warn "syncing database to disk";
3761 BDB::db_env_txn_checkpoint $DB_ENV;
3762
3763 # if anything goes wrong in here, we should simply crash as we already saved
3764
3765 warn "flushing outstanding aio requests";
3766 while (IO::AIO::nreqs || BDB::nreqs) {
3767 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3768 }
3769
3770 warn "cancelling all extension coros"; 3995 trace "perl_reload: cancelling all extension coros";
3771 $_->cancel for values %EXT_CORO; 3996 $_->cancel for values %EXT_CORO;
3772 %EXT_CORO = (); 3997 %EXT_CORO = ();
3773 3998
3774 warn "removing commands"; 3999 trace "perl_reload: removing commands";
3775 %COMMAND = (); 4000 %COMMAND = ();
3776 4001
3777 warn "removing ext/exti commands"; 4002 trace "perl_reload: removing ext/exti commands";
3778 %EXTCMD = (); 4003 %EXTCMD = ();
3779 %EXTICMD = (); 4004 %EXTICMD = ();
3780 4005
3781 warn "unloading/nuking all extensions"; 4006 trace "perl_reload: unloading/nuking all extensions";
3782 for my $pkg (@EXTS) { 4007 for my $pkg (@EXTS) {
3783 warn "... unloading $pkg"; 4008 trace "... unloading $pkg";
3784 4009
3785 if (my $cb = $pkg->can ("unload")) { 4010 if (my $cb = $pkg->can ("unload")) {
3786 eval { 4011 eval {
3787 $cb->($pkg); 4012 $cb->($pkg);
3788 1 4013 1
3789 } or warn "$pkg unloaded, but with errors: $@"; 4014 } or error "$pkg unloaded, but with errors: $@";
3790 } 4015 }
3791 4016
3792 warn "... clearing $pkg"; 4017 trace "... clearing $pkg";
3793 clear_package $pkg; 4018 clear_package $pkg;
3794 } 4019 }
3795 4020
3796 warn "unloading all perl modules loaded from $LIBDIR"; 4021 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3797 while (my ($k, $v) = each %INC) { 4022 while (my ($k, $v) = each %INC) {
3798 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4023 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3799 4024
3800 warn "... unloading $k"; 4025 trace "... unloading $k";
3801 delete $INC{$k}; 4026 delete $INC{$k};
3802 4027
3803 $k =~ s/\.pm$//; 4028 $k =~ s/\.pm$//;
3804 $k =~ s/\//::/g; 4029 $k =~ s/\//::/g;
3805 4030
… …
3808 } 4033 }
3809 4034
3810 clear_package $k; 4035 clear_package $k;
3811 } 4036 }
3812 4037
3813 warn "getting rid of safe::, as good as possible"; 4038 trace "perl_reload: getting rid of safe::, as good as possible";
3814 clear_package "safe::$_" 4039 clear_package "safe::$_"
3815 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4040 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3816 4041
3817 warn "unloading cf.pm \"a bit\""; 4042 trace "perl_reload: unloading cf.pm \"a bit\"";
3818 delete $INC{"cf.pm"}; 4043 delete $INC{"cf.pm"};
3819 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4044 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3820 4045
3821 # don't, removes xs symbols, too, 4046 # don't, removes xs symbols, too,
3822 # and global variables created in xs 4047 # and global variables created in xs
3823 #clear_package __PACKAGE__; 4048 #clear_package __PACKAGE__;
3824 4049
3825 warn "unload completed, starting to reload now"; 4050 info "perl_reload: unload completed, starting to reload now";
3826 4051
3827 warn "reloading cf.pm"; 4052 trace "perl_reload: reloading cf.pm";
3828 require cf; 4053 require cf;
3829 cf::_connect_to_perl_1; 4054 cf::_connect_to_perl_1;
3830 4055
3831 warn "loading config and database again"; 4056 trace "perl_reload: loading config and database again";
3832 cf::reload_config; 4057 cf::reload_config;
3833 4058
3834 warn "loading extensions"; 4059 trace "perl_reload: loading extensions";
3835 cf::load_extensions; 4060 cf::load_extensions;
3836 4061
3837 if ($REATTACH_ON_RELOAD) { 4062 if ($REATTACH_ON_RELOAD) {
3838 warn "reattaching attachments to objects/players"; 4063 trace "perl_reload: reattaching attachments to objects/players";
3839 _global_reattach; # objects, sockets 4064 _global_reattach; # objects, sockets
3840 warn "reattaching attachments to maps"; 4065 trace "perl_reload: reattaching attachments to maps";
3841 reattach $_ for values %MAP; 4066 reattach $_ for values %MAP;
3842 warn "reattaching attachments to players"; 4067 trace "perl_reload: reattaching attachments to players";
3843 reattach $_ for values %PLAYER; 4068 reattach $_ for values %PLAYER;
3844 } 4069 }
3845 4070
3846 warn "running post_init jobs"; 4071 cf::_post_init 1;
3847 (pop @POST_INIT)->(1) while @POST_INIT;
3848 4072
3849 warn "leaving sync_job"; 4073 trace "perl_reload: leaving sync_job";
3850 4074
3851 1 4075 1
3852 } or do { 4076 } or do {
3853 warn $@; 4077 error $@;
3854 cf::cleanup "error while reloading, exiting."; 4078 cf::cleanup "perl_reload: error, exiting.";
3855 }; 4079 };
3856 4080
3857 warn "reloaded";
3858 --$RELOAD; 4081 --$RELOAD;
3859 } 4082 }
3860 4083
3861 $t1 = EV::time - $t1; 4084 $t1 = AE::time - $t1;
3862 warn "reload completed in ${t1}s\n"; 4085 info "perl_reload: completed in ${t1}s\n";
3863}; 4086};
3864 4087
3865our $RELOAD_WATCHER; # used only during reload 4088our $RELOAD_WATCHER; # used only during reload
3866 4089
3867sub reload_perl() { 4090sub reload_perl() {
… …
3869 # coro crashes during coro_state_free->destroy here. 4092 # coro crashes during coro_state_free->destroy here.
3870 4093
3871 $RELOAD_WATCHER ||= cf::async { 4094 $RELOAD_WATCHER ||= cf::async {
3872 Coro::AIO::aio_wait cache_extensions; 4095 Coro::AIO::aio_wait cache_extensions;
3873 4096
3874 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4097 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3875 do_reload_perl; 4098 do_reload_perl;
3876 undef $RELOAD_WATCHER; 4099 undef $RELOAD_WATCHER;
3877 }; 4100 };
3878 }; 4101 };
3879} 4102}
… …
3888 reload_perl; 4111 reload_perl;
3889 }; 4112 };
3890 } 4113 }
3891}; 4114};
3892 4115
3893unshift @INC, $LIBDIR; 4116#############################################################################
3894 4117
3895my $bug_warning = 0; 4118my $bug_warning = 0;
3896 4119
3897our @WAIT_FOR_TICK;
3898our @WAIT_FOR_TICK_BEGIN;
3899
3900sub wait_for_tick { 4120sub wait_for_tick() {
3901 return if tick_inhibit || $Coro::current == $Coro::main; 4121 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3902 4122
3903 my $signal = new Coro::Signal; 4123 $WAIT_FOR_TICK->wait;
3904 push @WAIT_FOR_TICK, $signal;
3905 $signal->wait;
3906} 4124}
3907 4125
3908sub wait_for_tick_begin { 4126sub wait_for_tick_begin() {
3909 return if tick_inhibit || $Coro::current == $Coro::main; 4127 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3910 4128
3911 my $signal = new Coro::Signal; 4129 my $signal = new Coro::Signal;
3912 push @WAIT_FOR_TICK_BEGIN, $signal; 4130 push @WAIT_FOR_TICK_BEGIN, $signal;
3913 $signal->wait; 4131 $signal->wait;
3914} 4132}
… …
3918 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4136 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3919 unless ++$bug_warning > 10; 4137 unless ++$bug_warning > 10;
3920 return; 4138 return;
3921 } 4139 }
3922 4140
3923 cf::server_tick; # one server iteration 4141 cf::one_tick; # one server iteration
4142
4143 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3924 4144
3925 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4145 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3926 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4146 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3927 Coro::async_pool { 4147 Coro::async_pool {
3928 $Coro::current->{desc} = "runtime saver"; 4148 $Coro::current->{desc} = "runtime saver";
3929 write_runtime_sync 4149 write_runtime_sync
3930 or warn "ERROR: unable to write runtime file: $!"; 4150 or error "ERROR: unable to write runtime file: $!";
3931 }; 4151 };
3932 } 4152 }
3933 4153
3934 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4154 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3935 $sig->send; 4155 $sig->send;
3936 } 4156 }
3937 while (my $sig = shift @WAIT_FOR_TICK) { 4157 $WAIT_FOR_TICK->broadcast;
3938 $sig->send;
3939 }
3940 4158
3941 $LOAD = ($NOW - $TICK_START) / $TICK; 4159 $LOAD = ($NOW - $TICK_START) / $TICK;
3942 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4160 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3943 4161
3944 if (0) { 4162 if (0) {
3945 if ($NEXT_TICK) { 4163 if ($NEXT_TICK) {
3946 my $jitter = $TICK_START - $NEXT_TICK; 4164 my $jitter = $TICK_START - $NEXT_TICK;
3947 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4165 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3948 warn "jitter $JITTER\n";#d# 4166 debug "jitter $JITTER\n";#d#
3949 } 4167 }
3950 } 4168 }
3951} 4169}
3952 4170
3953{ 4171{
3954 # configure BDB 4172 # configure BDB
3955 4173
3956 BDB::min_parallel 8; 4174 BDB::min_parallel 16;
3957 BDB::max_poll_reqs $TICK * 0.1; 4175 BDB::max_poll_reqs $TICK * 0.1;
3958 $AnyEvent::BDB::WATCHER->priority (1); 4176 $AnyEvent::BDB::WATCHER->priority (1);
3959 4177
3960 unless ($DB_ENV) { 4178 unless ($DB_ENV) {
3961 $DB_ENV = BDB::db_env_create; 4179 $DB_ENV = BDB::db_env_create;
… …
3998 IO::AIO::min_parallel 8; 4216 IO::AIO::min_parallel 8;
3999 IO::AIO::max_poll_time $TICK * 0.1; 4217 IO::AIO::max_poll_time $TICK * 0.1;
4000 undef $AnyEvent::AIO::WATCHER; 4218 undef $AnyEvent::AIO::WATCHER;
4001} 4219}
4002 4220
4003my $_log_backtrace; 4221our $_log_backtrace;
4222our $_log_backtrace_last;
4004 4223
4005sub _log_backtrace { 4224sub _log_backtrace {
4006 my ($msg, @addr) = @_; 4225 my ($msg, @addr) = @_;
4007 4226
4008 $msg =~ s/\n//; 4227 $msg =~ s/\n$//;
4009 4228
4229 if ($_log_backtrace_last eq $msg) {
4230 LOG llevInfo, "[ABT] $msg\n";
4231 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4010 # limit the # of concurrent backtraces 4232 # limit the # of concurrent backtraces
4011 if ($_log_backtrace < 2) { 4233 } elsif ($_log_backtrace < 2) {
4234 $_log_backtrace_last = $msg;
4012 ++$_log_backtrace; 4235 ++$_log_backtrace;
4013 my $perl_bt = Carp::longmess $msg; 4236 my $perl_bt = Carp::longmess $msg;
4014 async { 4237 async {
4015 $Coro::current->{desc} = "abt $msg"; 4238 $Coro::current->{desc} = "abt $msg";
4016 4239
… …
4036 LOG llevInfo, "[ABT] $_\n" for @bt; 4259 LOG llevInfo, "[ABT] $_\n" for @bt;
4037 --$_log_backtrace; 4260 --$_log_backtrace;
4038 }; 4261 };
4039 } else { 4262 } else {
4040 LOG llevInfo, "[ABT] $msg\n"; 4263 LOG llevInfo, "[ABT] $msg\n";
4041 LOG llevInfo, "[ABT] [suppressed]\n"; 4264 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4042 } 4265 }
4043} 4266}
4044 4267
4045# load additional modules 4268# load additional modules
4046require "cf/$_.pm" for @EXTRA_MODULES; 4269require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines