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.523 by root, Sat Apr 17 02:39:46 2010 UTC vs.
Revision 1.574 by root, Sun May 8 21:51:27 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,2009,2010 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;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 112
111our %RESOURCE; 113our %RESOURCE; # unused
112 114
113our $OUTPUT_RATE_MIN = 4000; 115our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 100000; 116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
115 120
116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118our $NEXT_TICK; 123our $NEXT_TICK;
119our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
121our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
122our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
123our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
124our $DB_ENV; 129our $DB_ENV;
125 130
126our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
127 132
128our %CFG; 133our %CFG;
129 134
130our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
132our $NOW; 138our $NOW;
133 139
134our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
135our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
136our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
… …
145 151
146our @POST_INIT; 152our @POST_INIT;
147 153
148our $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)
149our $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;
150 159
151binmode STDOUT; 160binmode STDOUT;
152binmode STDERR; 161binmode STDERR;
153 162
154# read virtual server time, if available 163# read virtual server time, if available
… …
188 197
189=over 4 198=over 4
190 199
191=item $cf::UPTIME 200=item $cf::UPTIME
192 201
193The 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.
194 218
195=item $cf::RUNTIME 219=item $cf::RUNTIME
196 220
197The 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
198every server tick. 222every server tick.
… …
204Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
205directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
206unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
207database environment. 231database environment.
208 232
209=item $cf::NOW
210
211The time of the last (current) server tick.
212
213=item $cf::TICK
214
215The interval between server ticks, in seconds.
216
217=item $cf::LOADAVG 233=item $cf::LOADAVG
218 234
219The 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
220(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
221objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
… …
230from wherever your confdir points to. 246from wherever your confdir points to.
231 247
232=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
233 249
234These 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
235returns 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
236per 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();
237 270
238=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
239 272
240This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
241C<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
… …
249 282
250=back 283=back
251 284
252=cut 285=cut
253 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
254$Coro::State::WARNHOOK = sub { 293$Coro::State::WARNHOOK = sub {
255 my $msg = join "", @_; 294 my $msg = join "", @_;
256 295
257 $msg .= "\n" 296 $msg .= "\n"
258 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
259 298
260 $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;
261 300
262 LOG llevError, $msg; 301 LOG llevWarn, $msg;
263}; 302};
264 303
265$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
266 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
267 306
268 warn Carp::longmess $_[0]; 307 error Carp::longmess $_[0];
269 308
270 if (in_main) {#d# 309 if (in_main) {#d#
271 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
272 return;#d# 311 return;#d#
273 }#d# 312 }#d#
274 313
275 # kill coroutine otherwise 314 # kill coroutine otherwise
276 Coro::terminate 315 Coro::terminate
… …
298} 337}
299 338
300$EV::DIED = sub { 339$EV::DIED = sub {
301 Carp::cluck "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
302}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
303 347
304############################################################################# 348#############################################################################
305 349
306=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
307 351
… …
328 $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;
329 $d 373 $d
330 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
331} 375}
332 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
333=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
334 392
335Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
336 394
337=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
… …
343our $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
344 402
345sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
346sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
347 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
348=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
349 438
350Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
352 441
353The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
354is a reload or not. 443is a reload or not.
355 444
356=cut 445=cut
357 446
358sub post_init(&) { 447sub post_init(&) {
359 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 }
360} 466}
361 467
362=item cf::lock_wait $string 468=item cf::lock_wait $string
363 469
364Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
… …
417 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
418} 524}
419 525
420=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
421 527
422Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
423This 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
424of 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.
425 535
426The 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
427used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
428 538
429Useful for short background jobs. 539Useful for short background jobs.
… …
458 } 568 }
459 } 569 }
460 570
461 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
462 # 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
463 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
464 $signal->wait;
465 } else { 574 } else {
466 $busy = 0; 575 $busy = 0;
467 Coro::schedule; 576 Coro::schedule;
468 } 577 }
469 } 578 }
… …
509=cut 618=cut
510 619
511sub sync_job(&) { 620sub sync_job(&) {
512 my ($job) = @_; 621 my ($job) = @_;
513 622
514 if ($Coro::current == $Coro::main) { 623 if (in_main) {
515 my $time = AE::time; 624 my $time = AE::time;
516 625
517 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
518 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
519 628
520 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
521 630
522 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
523 632
524 my $busy = 1; 633 my $busy = 1;
525 my @res; 634 my @res;
526 635
527 (async { 636 (async {
528 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
529 @res = eval { $job->() }; 638 @res = eval { $job->() };
530 warn $@ if $@; 639 error $@ if $@;
531 undef $busy; 640 undef $busy;
532 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
533 642
534 while ($busy) { 643 while ($busy) {
535 if (Coro::nready) { 644 if (Coro::nready) {
… …
569 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
570 679
571 $coro 680 $coro
572} 681}
573 682
574=item fork_call { }, $args 683=item fork_call { }, @args
575 684
576Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
577process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
578Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
579never block itself or use any form of event handling. 688never block itself or use any form of event handling.
580 689
581=cut 690=cut
582 691
692sub post_fork {
693 reset_signals;
694}
695
583sub fork_call(&@) { 696sub fork_call(&@) {
584 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
585 698
586 # 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,
587 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
588 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
589 702
590 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
591 reset_signals; 704 cf::post_fork;
592 &$cb 705 &$cb
593 }, @args; 706 } @args;
594 707
595 wantarray ? @res : $res[-1] 708 wantarray ? @res : $res[-1]
596} 709}
597 710
598sub objinfo { 711sub objinfo {
… …
648within each server. 761within each server.
649 762
650=cut 763=cut
651 764
652sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
653 my ($name) = @_; 769 my ($name) = @_;
654 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
655 771
656 eval { 772 eval {
657 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
… …
667} 783}
668 784
669our $DB; 785our $DB;
670 786
671sub db_init { 787sub db_init {
672 cf::sync_job {
673 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
674 };
675} 789}
676 790
677sub db_get($$) { 791sub db_get($$) {
678 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
679 793
680 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
681 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
682 798
683 $! ? () 799 $! ? ()
684 : $data 800 : $data
685 }
686} 801}
687 802
688sub db_put($$$) { 803sub db_put($$$) {
689 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
690 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
718 833
719 my @data; 834 my @data;
720 my $md5; 835 my $md5;
721 836
722 for (0 .. $#$src) { 837 for (0 .. $#$src) {
723 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
724 or Carp::croak "$src->[$_]: $!";
725 } 839 }
726 840
727 # if processing is expensive, check 841 # if processing is expensive, check
728 # checksum first 842 # checksum first
729 if (1) { 843 if (1) {
… …
746 860
747 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
748 my $data = $process->(\@data); 862 my $data = $process->(\@data);
749 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
750 864
751 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
752 866
753 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
754 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
755 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
756 870
… …
766 880
767=cut 881=cut
768 882
769sub datalog($@) { 883sub datalog($@) {
770 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
771 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
772} 886}
773 887
774=back 888=back
775 889
776=cut 890=cut
… …
971 1085
972 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
973 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
974 1088
975 } elsif (ref $type) { 1089 } elsif (ref $type) {
976 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
977 1091
978 } else { 1092 } else {
979 shift @arg; 1093 shift @arg;
980 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
981 } 1095 }
982 } 1096 }
983} 1097}
984 1098
985sub _object_attach { 1099sub _object_attach {
… …
995 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
996 } 1110 }
997 1111
998 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
999 } else { 1113 } else {
1000 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
1001 } 1115 }
1002 1116
1003 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
1004} 1118}
1005 1119
… …
1064 1178
1065 for (@$callbacks) { 1179 for (@$callbacks) {
1066 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1067 1181
1068 if ($@) { 1182 if ($@) {
1069 warn "$@";
1070 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1071 override; 1184 override;
1072 } 1185 }
1073 1186
1074 return 1 if $override; 1187 return 1 if $override;
1075 } 1188 }
… …
1154 for (@$attach) { 1267 for (@$attach) {
1155 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1156 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1157 } 1270 }
1158 } else { 1271 } else {
1159 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1160 } 1273 }
1161 } 1274 }
1162} 1275}
1163 1276
1164cf::attachable->attach ( 1277cf::attachable->attach (
… …
1191 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1192 1305
1193 sync_job { 1306 sync_job {
1194 if (length $$rdata) { 1307 if (length $$rdata) {
1195 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1196 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1197 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1198 1312
1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202 if ($cf::USE_FSYNC) { 1316 if ($cf::USE_FSYNC) {
… …
1224 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1225 1339
1226 $filename =~ s%/[^/]+$%%; 1340 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC; 1341 aio_pathsync $filename if $cf::USE_FSYNC;
1228 } else { 1342 } else {
1229 warn "unable to save objects: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1230 } 1344 }
1231 } else { 1345 } else {
1232 aio_unlink $filename; 1346 aio_unlink $filename;
1233 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1234 } 1348 }
… …
1258 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1259 $av = $st->{objs}; 1373 $av = $st->{objs};
1260 } 1374 }
1261 1375
1262 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1263 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1264 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1265 1380
1266 ($data, $av) 1381 ($data, $av)
1267} 1382}
1268 1383
1269=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
… …
1361 1476
1362 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1363 if $reply; 1478 if $reply;
1364 1479
1365 } else { 1480 } else {
1366 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367 } 1482 }
1368 1483
1369 cf::override; 1484 cf::override;
1370 }, 1485 },
1371); 1486);
… …
1382 1497
1383 $grp 1498 $grp
1384} 1499}
1385 1500
1386sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1387 cf::sync_job { 1504 cf::sync_job {
1388 my %todo; 1505 my %todo;
1389 1506
1390 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1391 next unless -r $path; 1508 next unless -r $path;
… …
1409 1526
1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1412 1529
1413 $ext{source} = 1530 $ext{source} =
1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1415 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1416 . $source 1533 . $source
1417 . "\n};\n1"; 1534 . "\n};\n1";
1418 1535
1419 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
… …
1431 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1432 next ext 1549 next ext
1433 unless exists $done{$_}; 1550 unless exists $done{$_};
1434 } 1551 }
1435 1552
1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437 1554
1438 my $active = eval $v->{source}; 1555 my $active = eval $v->{source};
1439 1556
1440 if (length $@) { 1557 if (length $@) {
1441 warn "$v->{path}: $@\n"; 1558 error "$v->{path}: $@\n";
1442 1559
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444 if exists $v->{meta}{mandatory}; 1561 if exists $v->{meta}{mandatory};
1445 1562
1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1563 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1448 } else { 1565 } else {
1449 $done{$k} = delete $todo{$k}; 1566 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg}; 1567 push @EXTS, $v->{pkg};
1451 $progress = 1; 1568 $progress = 1;
1452 1569
1453 warn "$v->{base}: extension inactive.\n" 1570 info "$v->{base}: extension inactive.\n"
1454 unless $active; 1571 unless $active;
1455 } 1572 }
1456 } 1573 }
1457 1574
1458 unless ($progress) { 1575 unless ($progress) {
… …
1460 1577
1461 while (my ($k, $v) = each %todo) { 1578 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory}; 1580 if exists $v->{meta}{mandatory};
1464 } 1581 }
1582
1583 last;
1465 } 1584 }
1466 } 1585 }
1467 }; 1586 };
1468} 1587}
1469 1588
… …
1627 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1628 1747
1629 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1630 $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
1631 1750
1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1633 $pl->deactivate; 1752 $pl->deactivate;
1753
1634 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;
1635 $pl->ob->check_score;
1636 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1637 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1638 1759
1639 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1640 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1641 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
… …
1807sub generate_random_map { 1928sub generate_random_map {
1808 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1809 1930
1810 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
1811 1932
1812 # mit "rum" bekleckern, nicht
1813 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1817 $rmp->{exit_on_final_map},
1818 $rmp->{xsize}, $rmp->{ysize},
1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1821 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1822 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1823 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1824 (cf::region::find $rmp->{region}), $rmp->{custom}
1825 )
1826} 1934}
1827 1935
1828=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1829 1937
1830Register 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
… …
1835 1943
1836sub register { 1944sub register {
1837 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1838 my $pkg = caller; 1946 my $pkg = caller;
1839 1947
1840 no strict;
1841 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1842 1949
1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1844} 1951}
1845 1952
1846# also paths starting with '/' 1953# also paths starting with '/'
1847$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1848 1955
1849sub thawer_merge { 1956sub thawer_merge {
1850 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1851 1958
1852 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
… …
1857} 1964}
1858 1965
1859sub normalise { 1966sub normalise {
1860 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1861 1968
1862 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1863 1970
1864 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1865 1972
1866 # map plan: 1973 # map plan:
1867 # 1974 #
… …
1882 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1883 $path = "$base/$path"; 1990 $path = "$base/$path";
1884 } 1991 }
1885 1992
1886 for ($path) { 1993 for ($path) {
1887 redo if s{//}{/};
1888 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1889 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1890 } 1996 }
1891 1997
1892 $path 1998 $path
… …
1906 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1907 return $self; 2013 return $self;
1908 } 2014 }
1909 } 2015 }
1910 2016
1911 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1912 () 2018 ()
1913} 2019}
1914 2020
2021# may re-bless or do other evil things
1915sub init { 2022sub init {
1916 my ($self) = @_; 2023 my ($self) = @_;
1917 2024
1918 $self 2025 $self
1919} 2026}
… …
1984 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1985 2092
1986 1 2093 1
1987} 2094}
1988 2095
2096# used to laod the header of an original map
1989sub load_header_orig { 2097sub load_header_orig {
1990 my ($self) = @_; 2098 my ($self) = @_;
1991 2099
1992 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1993} 2101}
1994 2102
2103# used to laod the header of an instantiated map
1995sub load_header_temp { 2104sub load_header_temp {
1996 my ($self) = @_; 2105 my ($self) = @_;
1997 2106
1998 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1999} 2108}
2000 2109
2110# called after loading the header from an instantiated map
2001sub prepare_temp { 2111sub prepare_temp {
2002 my ($self) = @_; 2112 my ($self) = @_;
2003 2113
2004 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
2005 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
2006 # safety 2116 # safety
2007 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
2008 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
2009} 2119}
2010 2120
2121# called after loading the header from an original map
2011sub prepare_orig { 2122sub prepare_orig {
2012 my ($self) = @_; 2123 my ($self) = @_;
2013 2124
2014 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
2015 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
… …
2039 2150
2040sub find; 2151sub find;
2041sub find { 2152sub find {
2042 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
2043 2154
2155 cf::cede_to_tick;
2156
2044 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
2045 2158
2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2047 my $guard2 = cf::lock_acquire "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
2048 2161
2049 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
… …
2080 2193
2081 { 2194 {
2082 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2083 2196
2084 return unless $self->valid; 2197 return unless $self->valid;
2085 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2086
2087 $self->in_memory (cf::MAP_LOADING);
2088 2199
2089 $self->alloc; 2200 $self->alloc;
2090 2201
2091 $self->pre_load; 2202 $self->pre_load;
2092 cf::cede_to_tick; 2203 cf::cede_to_tick;
2093 2204
2205 if (exists $self->{load_path}) {
2094 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2095 $f->skip_block; 2207 $f->skip_block;
2096 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2097 or return; 2209 or return;
2098 2210
2099 $self->post_load_original 2211 $self->post_load_original
2100 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2101 2213
2102 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2103 utf8::encode $uniq; 2215 utf8::encode $uniq;
2104 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2105 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2106 $self->clear_unique_items; 2218 $self->clear_unique_items;
2107 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2108 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2109 } 2222 }
2110 } 2223 }
2111 }
2112 2224
2113 $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);
2114 2232
2115 cf::cede_to_tick; 2233 cf::cede_to_tick;
2116 # now do the right thing for maps 2234 # now do the right thing for maps
2117 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2118 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
… …
2122 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2123 $self->decay_objects; 2241 $self->decay_objects;
2124 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2125 $self->update_buttons; 2243 $self->update_buttons;
2126 cf::cede_to_tick; 2244 cf::cede_to_tick;
2127 $self->activate; 2245 #$self->activate; # no longer activate maps automatically
2128 } 2246 }
2129 2247
2130 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2131 $self->last_access ($cf::RUNTIME); 2249 $self->last_access ($cf::RUNTIME);
2132
2133 $self->in_memory (cf::MAP_ACTIVE);
2134 } 2250 }
2135 2251
2136 $self->post_load; 2252 $self->post_load;
2253
2254 1
2137} 2255}
2138 2256
2139# customize the map for a given player, i.e. 2257# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player 2258# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath 2259# maps to change the path to ~playername/mappath
… …
2149# if $self->per_party; 2267# if $self->per_party;
2150 2268
2151 $self 2269 $self
2152} 2270}
2153 2271
2154# find and load all maps in the 3x3 area around a map
2155sub load_neighbours {
2156 my ($map) = @_;
2157
2158 my @neigh; # diagonal neighbours
2159
2160 for (0 .. 3) {
2161 my $neigh = $map->tile_path ($_)
2162 or next;
2163 $neigh = find $neigh, $map
2164 or next;
2165 $neigh->load;
2166
2167 push @neigh,
2168 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2169 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2170 }
2171
2172 for (grep defined $_->[0], @neigh) {
2173 my ($path, $origin) = @$_;
2174 my $neigh = find $path, $origin
2175 or next;
2176 $neigh->load;
2177 }
2178}
2179
2180sub find_sync { 2272sub find_sync {
2181 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
2182 2274
2183 cf::sync_job { find $path, $origin } 2275 # it's a bug to call this from the main context
2276 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2277 if $Coro::current == $Coro::main;
2278
2279 find $path, $origin
2184} 2280}
2185 2281
2186sub do_load_sync { 2282sub do_load_sync {
2187 my ($map) = @_; 2283 my ($map) = @_;
2188 2284
2285 # it's a bug to call this from the main context
2189 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2286 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2190 if $Coro::current == $Coro::main; 2287 if $Coro::current == $Coro::main;
2191 2288
2192 cf::sync_job { $map->load }; 2289 $map->load;
2193} 2290}
2194 2291
2195our %MAP_PREFETCH; 2292our %MAP_PREFETCH;
2196our $MAP_PREFETCHER = undef; 2293our $MAP_PREFETCHER = undef;
2197 2294
2198sub find_async { 2295sub find_async {
2199 my ($path, $origin, $load) = @_; 2296 my ($path, $origin, $load) = @_;
2200 2297
2201 $path = normalise $path, $origin && $origin->{path}; 2298 $path = normalise $path, $origin;
2202 2299
2203 if (my $map = $cf::MAP{$path}) { 2300 if (my $map = $cf::MAP{$path}) {
2204 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2301 return $map if !$load || $map->linkable;
2205 } 2302 }
2206 2303
2207 $MAP_PREFETCH{$path} |= $load; 2304 $MAP_PREFETCH{$path} |= $load;
2208 2305
2209 $MAP_PREFETCHER ||= cf::async { 2306 $MAP_PREFETCHER ||= cf::async {
… …
2268sub swap_out { 2365sub swap_out {
2269 my ($self) = @_; 2366 my ($self) = @_;
2270 2367
2271 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2272 2369
2273 return if $self->in_memory != cf::MAP_ACTIVE; 2370 return if !$self->linkable;
2274 return if $self->{deny_save}; 2371 return if $self->{deny_save};
2275 return if $self->players; 2372 return if $self->players;
2276 2373
2277 # first deactivate the map and "unlink" it from the core 2374 # first deactivate the map and "unlink" it from the core
2278 $self->deactivate; 2375 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP; 2376 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->in_memory (cf::MAP_SWAPPED); 2377 $self->state (cf::MAP_SWAPPED);
2281 2378
2282 # then atomically save 2379 # then atomically save
2283 $self->_save; 2380 $self->_save;
2284 2381
2285 # then free the map 2382 # then free the map
… …
2309 2406
2310 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2407 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311 2408
2312 return if $self->players; 2409 return if $self->players;
2313 2410
2314 warn "resetting map ", $self->path, "\n"; 2411 cf::trace "resetting map ", $self->path, "\n";
2315 2412
2316 $self->in_memory (cf::MAP_SWAPPED); 2413 $self->state (cf::MAP_SWAPPED);
2317 2414
2318 # need to save uniques path 2415 # need to save uniques path
2319 unless ($self->{deny_save}) { 2416 unless ($self->{deny_save}) {
2320 my $uniq = $self->uniq_path; utf8::encode $uniq; 2417 my $uniq = $self->uniq_path; utf8::encode $uniq;
2321 2418
… …
2343 2440
2344 delete $cf::MAP{$self->path}; 2441 delete $cf::MAP{$self->path};
2345 2442
2346 $self->unlink_save; 2443 $self->unlink_save;
2347 2444
2348 bless $self, "cf::map"; 2445 bless $self, "cf::map::wrap";
2349 delete $self->{deny_reset}; 2446 delete $self->{deny_reset};
2350 $self->{deny_save} = 1; 2447 $self->{deny_save} = 1;
2351 $self->reset_timeout (1); 2448 $self->reset_timeout (1);
2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2449 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2353 2450
… …
2583 2680
2584Freezes the player and moves him/her to a special map (C<{link}>). 2681Freezes the player and moves him/her to a special map (C<{link}>).
2585 2682
2586The player should be reasonably safe there for short amounts of time (e.g. 2683The player should be reasonably safe there for short amounts of time (e.g.
2587for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2684for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link 2685though, as the player cannot control the character while it is on the link
2589map. 2686map.
2590 2687
2591Will never block. 2688Will never block.
2592 2689
2593=item $player_object->leave_link ($map, $x, $y) 2690=item $player_object->leave_link ($map, $x, $y)
… …
2614sub cf::object::player::enter_link { 2711sub cf::object::player::enter_link {
2615 my ($self) = @_; 2712 my ($self) = @_;
2616 2713
2617 $self->deactivate_recursive; 2714 $self->deactivate_recursive;
2618 2715
2716 ++$self->{_link_recursion};
2717
2619 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2718 return if UNIVERSAL::isa $self->map, "ext::map_link";
2620 2719
2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2720 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622 if $self->map && $self->map->{path} ne "{link}"; 2721 if $self->map && $self->map->{path} ne "{link}";
2623 2722
… …
2649 # use -1 or undef as default coordinates, not 0, 0 2748 # use -1 or undef as default coordinates, not 0, 0
2650 ($x, $y) = ($map->enter_x, $map->enter_y) 2749 ($x, $y) = ($map->enter_x, $map->enter_y)
2651 if $x <= 0 && $y <= 0; 2750 if $x <= 0 && $y <= 0;
2652 2751
2653 $map->load; 2752 $map->load;
2654 $map->load_neighbours;
2655 2753
2656 return unless $self->contr->active; 2754 return unless $self->contr->active;
2657 2755
2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2756 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659 $self->enter_map ($map, $x, $y); 2757 if ($self->enter_map ($map, $x, $y)) {
2660 2758 # entering was successful
2759 delete $self->{_link_recursion};
2661 # only activate afterwards, to support waiting in hooks 2760 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive; 2761 $self->activate_recursive;
2663} 2762 }
2664 2763
2764}
2765
2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2766=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2666 2767
2667Moves the player to the given map-path and coordinates by first freezing 2768Moves the player to the given map-path and coordinates by first freezing
2668her, loading and preparing them map, calling the provided $check callback 2769her, loading and preparing them map, calling the provided $check callback
2669that has to return the map if sucecssful, and then unfreezes the player on 2770that has to return the map if sucecssful, and then unfreezes the player on
2670the new (success) or old (failed) map position. In either case, $done will 2771the new (success) or old (failed) map position. In either case, $done will
… …
2677 2778
2678our $GOTOGEN; 2779our $GOTOGEN;
2679 2780
2680sub cf::object::player::goto { 2781sub cf::object::player::goto {
2681 my ($self, $path, $x, $y, $check, $done) = @_; 2782 my ($self, $path, $x, $y, $check, $done) = @_;
2783
2784 if ($self->{_link_recursion} >= $MAX_LINKS) {
2785 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2786 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2787 ($path, $x, $y) = @$EMERGENCY_POSITION;
2788 }
2682 2789
2683 # do generation counting so two concurrent goto's will be executed in-order 2790 # do generation counting so two concurrent goto's will be executed in-order
2684 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2791 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2685 2792
2686 $self->enter_link; 2793 $self->enter_link;
… …
2706 ($path, $x, $y) = (undef, undef, undef); 2813 ($path, $x, $y) = (undef, undef, undef);
2707 } 2814 }
2708 } 2815 }
2709 2816
2710 my $map = eval { 2817 my $map = eval {
2711 my $map = defined $path ? cf::map::find $path : undef; 2818 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2712 2819
2713 if ($map) { 2820 if ($map) {
2714 $map = $map->customise_for ($self); 2821 $map = $map->customise_for ($self);
2715 $map = $check->($map) if $check && $map; 2822 $map = $check->($map, $x, $y, $self) if $check && $map;
2716 } else { 2823 } else {
2717 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2824 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2718 } 2825 }
2719 2826
2720 $map 2827 $map
… …
2728 if ($gen == $self->{_goto_generation}) { 2835 if ($gen == $self->{_goto_generation}) {
2729 delete $self->{_goto_generation}; 2836 delete $self->{_goto_generation};
2730 $self->leave_link ($map, $x, $y); 2837 $self->leave_link ($map, $x, $y);
2731 } 2838 }
2732 2839
2733 $done->() if $done; 2840 $done->($self) if $done;
2734 })->prio (1); 2841 })->prio (1);
2735} 2842}
2736 2843
2737=item $player_object->enter_exit ($exit_object) 2844=item $player_object->enter_exit ($exit_object)
2738 2845
… …
2806 $Coro::current->{desc} = "enter_exit"; 2913 $Coro::current->{desc} = "enter_exit";
2807 2914
2808 unless (eval { 2915 unless (eval {
2809 $self->deactivate_recursive; # just to be sure 2916 $self->deactivate_recursive; # just to be sure
2810 2917
2811 # random map handling
2812 {
2813 my $guard = cf::lock_acquire "exit_prepare:$exit";
2814
2815 prepare_random_map $exit
2816 if $exit->slaying eq "/!";
2817 }
2818
2819 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2918 my $map = cf::map::normalise $exit->slaying, $exit->map;
2820 my $x = $exit->stats->hp; 2919 my $x = $exit->stats->hp;
2821 my $y = $exit->stats->sp; 2920 my $y = $exit->stats->sp;
2921
2922 # special map handling
2923 my $slaying = $exit->slaying;
2924
2925 # special map handling
2926 if ($slaying eq "/!") {
2927 my $guard = cf::lock_acquire "exit_prepare:$exit";
2928
2929 prepare_random_map $exit
2930 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2931
2932 $map = $exit->slaying;
2933
2934 } elsif ($slaying eq '!up') {
2935 $map = $exit->map->tile_path (cf::TILE_UP);
2936 $x = $exit->x;
2937 $y = $exit->y;
2938
2939 } elsif ($slaying eq '!down') {
2940 $map = $exit->map->tile_path (cf::TILE_DOWN);
2941 $x = $exit->x;
2942 $y = $exit->y;
2943 }
2822 2944
2823 $self->goto ($map, $x, $y); 2945 $self->goto ($map, $x, $y);
2824 2946
2825 # if exit is damned, update players death & WoR home-position 2947 # if exit is damned, update players death & WoR home-position
2826 $self->contr->savebed ($map, $x, $y) 2948 $self->contr->savebed ($map, $x, $y)
… …
2831 $self->message ("Something went wrong deep within the deliantra server. " 2953 $self->message ("Something went wrong deep within the deliantra server. "
2832 . "I'll try to bring you back to the map you were before. " 2954 . "I'll try to bring you back to the map you were before. "
2833 . "Please report this to the dungeon master!", 2955 . "Please report this to the dungeon master!",
2834 cf::NDI_UNIQUE | cf::NDI_RED); 2956 cf::NDI_UNIQUE | cf::NDI_RED);
2835 2957
2836 warn "ERROR in enter_exit: $@"; 2958 error "ERROR in enter_exit: $@";
2837 $self->leave_link; 2959 $self->leave_link;
2838 } 2960 }
2839 })->prio (1); 2961 })->prio (1);
2840} 2962}
2841 2963
… …
3154 3276
3155 $ns->ext_reply ($reply, @reply) 3277 $ns->ext_reply ($reply, @reply)
3156 if $reply; 3278 if $reply;
3157 3279
3158 } else { 3280 } else {
3159 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3281 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3160 } 3282 }
3161 3283
3162 cf::override; 3284 cf::override;
3163 }, 3285 },
3164); 3286);
… …
3245 decrease split destroy change_exp value msg lore send_msg)], 3367 decrease split destroy change_exp value msg lore send_msg)],
3246 ["cf::object::player" => qw(player)], 3368 ["cf::object::player" => qw(player)],
3247 ["cf::player" => qw(peaceful send_msg)], 3369 ["cf::player" => qw(peaceful send_msg)],
3248 ["cf::map" => qw(trigger)], 3370 ["cf::map" => qw(trigger)],
3249) { 3371) {
3250 no strict 'refs';
3251 my ($pkg, @funs) = @$_; 3372 my ($pkg, @funs) = @$_;
3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3373 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3253 for @funs; 3374 for @funs;
3254} 3375}
3255 3376
… …
3294 local @cf::_safe_eval_args = values %vars; 3415 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval; 3416 @res = wantarray ? eval eval : scalar eval $eval;
3296 } 3417 }
3297 3418
3298 if ($@) { 3419 if ($@) {
3299 warn "$@"; 3420 warn "$@",
3300 warn "while executing safe code '$code'\n"; 3421 "while executing safe code '$code'\n",
3301 warn "with arguments " . (join " ", %vars) . "\n"; 3422 "with arguments " . (join " ", %vars) . "\n";
3302 } 3423 }
3303 3424
3304 wantarray ? @res : $res[0] 3425 wantarray ? @res : $res[0]
3305} 3426}
3306 3427
… …
3340 # for this (global event?) 3461 # for this (global event?)
3341 %ext::player_env::MUSIC_FACE_CACHE = (); 3462 %ext::player_env::MUSIC_FACE_CACHE = ();
3342 3463
3343 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3464 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3344 3465
3345 warn "loading facedata from $path\n"; 3466 trace "loading facedata from $path\n";
3346 3467
3347 my $facedata; 3468 my $facedata = decode_storable load_file $path;
3348 0 < aio_load $path, $facedata
3349 or die "$path: $!";
3350
3351 $facedata = Coro::Storable::thaw $facedata;
3352 3469
3353 $facedata->{version} == 2 3470 $facedata->{version} == 2
3354 or cf::cleanup "$path: version mismatch, cannot proceed."; 3471 or cf::cleanup "$path: version mismatch, cannot proceed.";
3355 3472
3356 # patch in the exptable 3473 # patch in the exptable
… …
3370 3487
3371 cf::face::set_visibility $idx, $info->{visibility}; 3488 cf::face::set_visibility $idx, $info->{visibility};
3372 cf::face::set_magicmap $idx, $info->{magicmap}; 3489 cf::face::set_magicmap $idx, $info->{magicmap};
3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3490 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3491 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3492 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3375 3493
3376 cf::cede_to_tick; 3494 cf::cede_to_tick;
3377 } 3495 }
3378 3496
3379 while (my ($face, $info) = each %$faces) { 3497 while (my ($face, $info) = each %$faces) {
… …
3384 3502
3385 if (my $smooth = cf::face::find $info->{smooth}) { 3503 if (my $smooth = cf::face::find $info->{smooth}) {
3386 cf::face::set_smooth $idx, $smooth; 3504 cf::face::set_smooth $idx, $smooth;
3387 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3505 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3388 } else { 3506 } else {
3389 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3507 error "smooth face '$info->{smooth}' not found for face '$face'";
3390 } 3508 }
3391 3509
3392 cf::cede_to_tick; 3510 cf::cede_to_tick;
3393 } 3511 }
3394 } 3512 }
… …
3412 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3530 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3413 3531
3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3532 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3415 cf::face::set_type $idx, $info->{type}; 3533 cf::face::set_type $idx, $info->{type};
3416 } else { 3534 } else {
3417 $RESOURCE{$name} = $info; 3535 $RESOURCE{$name} = $info; # unused
3418 } 3536 }
3419 3537
3420 cf::cede_to_tick; 3538 cf::cede_to_tick;
3421 } 3539 }
3422 } 3540 }
3423 3541
3424 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3542 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3425 3543
3426 1 3544 1
3427} 3545}
3428
3429cf::global->attach (on_resource_update => sub {
3430 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3431 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3432
3433 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3434 my $sound = $soundconf->{compat}[$_]
3435 or next;
3436
3437 my $face = cf::face::find "sound/$sound->[1]";
3438 cf::sound::set $sound->[0] => $face;
3439 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3440 }
3441
3442 while (my ($k, $v) = each %{$soundconf->{event}}) {
3443 my $face = cf::face::find "sound/$v";
3444 cf::sound::set $k => $face;
3445 }
3446 }
3447});
3448 3546
3449register_exticmd fx_want => sub { 3547register_exticmd fx_want => sub {
3450 my ($ns, $want) = @_; 3548 my ($ns, $want) = @_;
3451 3549
3452 while (my ($k, $v) = each %$want) { 3550 while (my ($k, $v) = each %$want) {
… …
3491sub reload_treasures { 3589sub reload_treasures {
3492 load_resource_file "$DATADIR/treasures" 3590 load_resource_file "$DATADIR/treasures"
3493 or die "unable to load treasurelists\n"; 3591 or die "unable to load treasurelists\n";
3494} 3592}
3495 3593
3594sub reload_sound {
3595 trace "loading sound config from $DATADIR/sound\n";
3596
3597 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3598
3599 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3600 my $sound = $soundconf->{compat}[$_]
3601 or next;
3602
3603 my $face = cf::face::find "sound/$sound->[1]";
3604 cf::sound::set $sound->[0] => $face;
3605 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3606 }
3607
3608 while (my ($k, $v) = each %{$soundconf->{event}}) {
3609 my $face = cf::face::find "sound/$v";
3610 cf::sound::set $k => $face;
3611 }
3612}
3613
3496sub reload_resources { 3614sub reload_resources {
3497 warn "reloading resource files...\n"; 3615 trace "reloading resource files...\n";
3498 3616
3617 reload_exp_table;
3618 reload_materials;
3499 reload_facedata; 3619 reload_facedata;
3620 reload_sound;
3500 reload_archetypes; 3621 reload_archetypes;
3501 reload_regions; 3622 reload_regions;
3502 reload_treasures; 3623 reload_treasures;
3503 3624
3504 warn "finished reloading resource files\n"; 3625 trace "finished reloading resource files\n";
3505} 3626}
3506 3627
3507sub reload_config { 3628sub reload_config {
3508 warn "reloading config file...\n"; 3629 trace "reloading config file...\n";
3509 3630
3510 open my $fh, "<:utf8", "$CONFDIR/config" 3631 my $config = load_file "$CONFDIR/config";
3511 or return; 3632 utf8::decode $config;
3633 *CFG = decode_yaml $config;
3512 3634
3513 local $/;
3514 *CFG = YAML::XS::Load scalar <$fh>;
3515
3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3635 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3517 3636
3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3637 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3638 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3520 3639
3521 if (exists $CFG{mlockall}) { 3640 if (exists $CFG{mlockall}) {
… …
3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3642 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3524 and die "WARNING: m(un)lockall failed: $!\n"; 3643 and die "WARNING: m(un)lockall failed: $!\n";
3525 }; 3644 };
3526 warn $@ if $@; 3645 warn $@ if $@;
3527 } 3646 }
3528
3529 warn "finished reloading resource files\n";
3530} 3647}
3531 3648
3532sub pidfile() { 3649sub pidfile() {
3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3650 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534 or die "$PIDFILE: $!"; 3651 or die "$PIDFILE: $!";
… …
3547 seek $fh, 0, 0; 3664 seek $fh, 0, 0;
3548 print $fh $$; 3665 print $fh $$;
3549} 3666}
3550 3667
3551sub main_loop { 3668sub main_loop {
3552 warn "EV::loop starting\n"; 3669 trace "EV::loop starting\n";
3553 if (1) { 3670 if (1) {
3554 EV::loop; 3671 EV::loop;
3555 } 3672 }
3556 warn "EV::loop returned\n"; 3673 trace "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP; 3674 goto &main_loop unless $REALLY_UNLOOP;
3558} 3675}
3559 3676
3560sub main { 3677sub main {
3561 cf::init_globals; # initialise logging 3678 cf::init_globals; # initialise logging
3562 3679
3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3680 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3681 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3682 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3683 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567 3684
3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3685 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3569 3686
… …
3577 }; 3694 };
3578 3695
3579 evthread_start IO::AIO::poll_fileno; 3696 evthread_start IO::AIO::poll_fileno;
3580 3697
3581 cf::sync_job { 3698 cf::sync_job {
3582 cf::init_experience; 3699 cf::incloader::init ();
3700
3583 cf::init_anim; 3701 cf::init_anim;
3584 cf::init_attackmess; 3702 cf::init_attackmess;
3585 cf::init_dynamic; 3703 cf::init_dynamic;
3586 3704
3587 cf::load_settings; 3705 cf::load_settings;
3588 cf::load_materials;
3589 3706
3590 reload_resources; 3707 reload_resources;
3591 reload_config; 3708 reload_config;
3592 db_init; 3709 db_init;
3593 3710
… …
3605 3722
3606 # no (long-running) fork's whatsoever before this point(!) 3723 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX (); 3724 use POSIX ();
3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3725 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3609 3726
3610 (pop @POST_INIT)->(0) while @POST_INIT; 3727 cf::_post_init 0;
3611 }; 3728 };
3612 3729
3613 cf::object::thawer::errors_are_fatal 0; 3730 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n"; 3731 info "parse errors in files are no longer fatal from this point on.\n";
3615 3732
3733 my $free_main; $free_main = EV::idle sub {
3734 undef $free_main;
3735 undef &main; # free gobs of memory :)
3736 };
3737
3616 main_loop; 3738 goto &main_loop;
3617} 3739}
3618 3740
3619############################################################################# 3741#############################################################################
3620# initialisation and cleanup 3742# initialisation and cleanup
3621 3743
… …
3660 or return; 3782 or return;
3661 3783
3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3784 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3663 and return; 3785 and return;
3664 3786
3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3787 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3666 3788
3667 1 3789 1
3668} 3790}
3669 3791
3670our $uuid_lock; 3792our $uuid_lock;
… …
3682 or return; 3804 or return;
3683 3805
3684 my $value = uuid_seq uuid_cur; 3806 my $value = uuid_seq uuid_cur;
3685 3807
3686 unless ($value) { 3808 unless ($value) {
3687 warn "cowardly refusing to write zero uuid value!\n"; 3809 info "cowardly refusing to write zero uuid value!\n";
3688 return; 3810 return;
3689 } 3811 }
3690 3812
3691 my $value = uuid_str $value + $uuid_skip; 3813 my $value = uuid_str $value + $uuid_skip;
3692 $uuid_skip = 0; 3814 $uuid_skip = 0;
… …
3702 or return; 3824 or return;
3703 3825
3704 aio_rename "$uuid~", $uuid 3826 aio_rename "$uuid~", $uuid
3705 and return; 3827 and return;
3706 3828
3707 warn "uuid file written ($value).\n"; 3829 trace "uuid file written ($value).\n";
3708 3830
3709 1 3831 1
3710 3832
3711} 3833}
3712 3834
… …
3718} 3840}
3719 3841
3720sub emergency_save() { 3842sub emergency_save() {
3721 my $freeze_guard = cf::freeze_mainloop; 3843 my $freeze_guard = cf::freeze_mainloop;
3722 3844
3723 warn "emergency_perl_save: enter\n"; 3845 info "emergency_perl_save: enter\n";
3846
3847 # this is a trade-off: we want to be very quick here, so
3848 # save all maps without fsync, and later call a global sync
3849 # (which in turn might be very very slow)
3850 local $USE_FSYNC = 0;
3724 3851
3725 cf::sync_job { 3852 cf::sync_job {
3726 # this is a trade-off: we want to be very quick here, so 3853 cf::write_runtime_sync; # external watchdog should not bark
3727 # save all maps without fsync, and later call a global sync
3728 # (which in turn might be very very slow)
3729 local $USE_FSYNC = 0;
3730 3854
3731 # use a peculiar iteration method to avoid tripping on perl 3855 # use a peculiar iteration method to avoid tripping on perl
3732 # refcount bugs in for. also avoids problems with players 3856 # refcount bugs in for. also avoids problems with players
3733 # and maps saved/destroyed asynchronously. 3857 # and maps saved/destroyed asynchronously.
3734 warn "emergency_perl_save: begin player save\n"; 3858 info "emergency_perl_save: begin player save\n";
3735 for my $login (keys %cf::PLAYER) { 3859 for my $login (keys %cf::PLAYER) {
3736 my $pl = $cf::PLAYER{$login} or next; 3860 my $pl = $cf::PLAYER{$login} or next;
3737 $pl->valid or next; 3861 $pl->valid or next;
3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3862 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3739 $pl->save; 3863 $pl->save;
3740 } 3864 }
3741 warn "emergency_perl_save: end player save\n"; 3865 info "emergency_perl_save: end player save\n";
3742 3866
3867 cf::write_runtime_sync; # external watchdog should not bark
3868
3743 warn "emergency_perl_save: begin map save\n"; 3869 info "emergency_perl_save: begin map save\n";
3744 for my $path (keys %cf::MAP) { 3870 for my $path (keys %cf::MAP) {
3745 my $map = $cf::MAP{$path} or next; 3871 my $map = $cf::MAP{$path} or next;
3746 $map->valid or next; 3872 $map->valid or next;
3747 $map->save; 3873 $map->save;
3748 } 3874 }
3749 warn "emergency_perl_save: end map save\n"; 3875 info "emergency_perl_save: end map save\n";
3750 3876
3877 cf::write_runtime_sync; # external watchdog should not bark
3878
3751 warn "emergency_perl_save: begin database checkpoint\n"; 3879 info "emergency_perl_save: begin database checkpoint\n";
3752 BDB::db_env_txn_checkpoint $DB_ENV; 3880 BDB::db_env_txn_checkpoint $DB_ENV;
3753 warn "emergency_perl_save: end database checkpoint\n"; 3881 info "emergency_perl_save: end database checkpoint\n";
3754 3882
3755 warn "emergency_perl_save: begin write uuid\n"; 3883 info "emergency_perl_save: begin write uuid\n";
3756 write_uuid_sync 1; 3884 write_uuid_sync 1;
3757 warn "emergency_perl_save: end write uuid\n"; 3885 info "emergency_perl_save: end write uuid\n";
3886
3887 cf::write_runtime_sync; # external watchdog should not bark
3888
3889 trace "emergency_perl_save: syncing database to disk";
3890 BDB::db_env_txn_checkpoint $DB_ENV;
3891
3892 info "emergency_perl_save: starting sync\n";
3893 IO::AIO::aio_sync sub {
3894 info "emergency_perl_save: finished sync\n";
3895 };
3896
3897 cf::write_runtime_sync; # external watchdog should not bark
3898
3899 trace "emergency_perl_save: flushing outstanding aio requests";
3900 while (IO::AIO::nreqs || BDB::nreqs) {
3901 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3902 }
3903
3904 cf::write_runtime_sync; # external watchdog should not bark
3758 }; 3905 };
3759 3906
3760 warn "emergency_perl_save: starting sync()\n";
3761 IO::AIO::aio_sync sub {
3762 warn "emergency_perl_save: finished sync()\n";
3763 };
3764
3765 warn "emergency_perl_save: leave\n"; 3907 info "emergency_perl_save: leave\n";
3766} 3908}
3767 3909
3768sub post_cleanup { 3910sub post_cleanup {
3769 my ($make_core) = @_; 3911 my ($make_core) = @_;
3770 3912
3913 IO::AIO::flush;
3914
3771 warn Carp::longmess "post_cleanup backtrace" 3915 error Carp::longmess "post_cleanup backtrace"
3772 if $make_core; 3916 if $make_core;
3773 3917
3774 my $fh = pidfile; 3918 my $fh = pidfile;
3775 unlink $PIDFILE if <$fh> == $$; 3919 unlink $PIDFILE if <$fh> == $$;
3776} 3920}
… …
3800 } 3944 }
3801} 3945}
3802 3946
3803sub do_reload_perl() { 3947sub do_reload_perl() {
3804 # can/must only be called in main 3948 # can/must only be called in main
3805 if (in_main) { 3949 unless (in_main) {
3806 warn "can only reload from main coroutine"; 3950 error "can only reload from main coroutine";
3807 return; 3951 return;
3808 } 3952 }
3809 3953
3810 return if $RELOAD++; 3954 return if $RELOAD++;
3811 3955
3812 my $t1 = AE::time; 3956 my $t1 = AE::time;
3813 3957
3814 while ($RELOAD) { 3958 while ($RELOAD) {
3815 warn "reloading..."; 3959 cf::get_slot 0.1, -1, "reload_perl";
3960 info "perl_reload: reloading...";
3816 3961
3817 warn "entering sync_job"; 3962 trace "perl_reload: entering sync_job";
3818 3963
3819 cf::sync_job { 3964 cf::sync_job {
3820 cf::write_runtime_sync; # external watchdog should not bark
3821 cf::emergency_save; 3965 #cf::emergency_save;
3822 cf::write_runtime_sync; # external watchdog should not bark
3823 3966
3824 warn "syncing database to disk";
3825 BDB::db_env_txn_checkpoint $DB_ENV;
3826
3827 # if anything goes wrong in here, we should simply crash as we already saved
3828
3829 warn "flushing outstanding aio requests";
3830 while (IO::AIO::nreqs || BDB::nreqs) {
3831 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3832 }
3833
3834 warn "cancelling all extension coros"; 3967 trace "perl_reload: cancelling all extension coros";
3835 $_->cancel for values %EXT_CORO; 3968 $_->cancel for values %EXT_CORO;
3836 %EXT_CORO = (); 3969 %EXT_CORO = ();
3837 3970
3838 warn "removing commands"; 3971 trace "perl_reload: removing commands";
3839 %COMMAND = (); 3972 %COMMAND = ();
3840 3973
3841 warn "removing ext/exti commands"; 3974 trace "perl_reload: removing ext/exti commands";
3842 %EXTCMD = (); 3975 %EXTCMD = ();
3843 %EXTICMD = (); 3976 %EXTICMD = ();
3844 3977
3845 warn "unloading/nuking all extensions"; 3978 trace "perl_reload: unloading/nuking all extensions";
3846 for my $pkg (@EXTS) { 3979 for my $pkg (@EXTS) {
3847 warn "... unloading $pkg"; 3980 trace "... unloading $pkg";
3848 3981
3849 if (my $cb = $pkg->can ("unload")) { 3982 if (my $cb = $pkg->can ("unload")) {
3850 eval { 3983 eval {
3851 $cb->($pkg); 3984 $cb->($pkg);
3852 1 3985 1
3853 } or warn "$pkg unloaded, but with errors: $@"; 3986 } or error "$pkg unloaded, but with errors: $@";
3854 } 3987 }
3855 3988
3856 warn "... clearing $pkg"; 3989 trace "... clearing $pkg";
3857 clear_package $pkg; 3990 clear_package $pkg;
3858 } 3991 }
3859 3992
3860 warn "unloading all perl modules loaded from $LIBDIR"; 3993 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3861 while (my ($k, $v) = each %INC) { 3994 while (my ($k, $v) = each %INC) {
3862 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3995 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3863 3996
3864 warn "... unloading $k"; 3997 trace "... unloading $k";
3865 delete $INC{$k}; 3998 delete $INC{$k};
3866 3999
3867 $k =~ s/\.pm$//; 4000 $k =~ s/\.pm$//;
3868 $k =~ s/\//::/g; 4001 $k =~ s/\//::/g;
3869 4002
… …
3872 } 4005 }
3873 4006
3874 clear_package $k; 4007 clear_package $k;
3875 } 4008 }
3876 4009
3877 warn "getting rid of safe::, as good as possible"; 4010 trace "perl_reload: getting rid of safe::, as good as possible";
3878 clear_package "safe::$_" 4011 clear_package "safe::$_"
3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4012 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3880 4013
3881 warn "unloading cf.pm \"a bit\""; 4014 trace "perl_reload: unloading cf.pm \"a bit\"";
3882 delete $INC{"cf.pm"}; 4015 delete $INC{"cf.pm"};
3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4016 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3884 4017
3885 # don't, removes xs symbols, too, 4018 # don't, removes xs symbols, too,
3886 # and global variables created in xs 4019 # and global variables created in xs
3887 #clear_package __PACKAGE__; 4020 #clear_package __PACKAGE__;
3888 4021
3889 warn "unload completed, starting to reload now"; 4022 info "perl_reload: unload completed, starting to reload now";
3890 4023
3891 warn "reloading cf.pm"; 4024 trace "perl_reload: reloading cf.pm";
3892 require cf; 4025 require cf;
3893 cf::_connect_to_perl_1; 4026 cf::_connect_to_perl_1;
3894 4027
3895 warn "loading config and database again"; 4028 trace "perl_reload: loading config and database again";
3896 cf::reload_config; 4029 cf::reload_config;
3897 4030
3898 warn "loading extensions"; 4031 trace "perl_reload: loading extensions";
3899 cf::load_extensions; 4032 cf::load_extensions;
3900 4033
3901 if ($REATTACH_ON_RELOAD) { 4034 if ($REATTACH_ON_RELOAD) {
3902 warn "reattaching attachments to objects/players"; 4035 trace "perl_reload: reattaching attachments to objects/players";
3903 _global_reattach; # objects, sockets 4036 _global_reattach; # objects, sockets
3904 warn "reattaching attachments to maps"; 4037 trace "perl_reload: reattaching attachments to maps";
3905 reattach $_ for values %MAP; 4038 reattach $_ for values %MAP;
3906 warn "reattaching attachments to players"; 4039 trace "perl_reload: reattaching attachments to players";
3907 reattach $_ for values %PLAYER; 4040 reattach $_ for values %PLAYER;
3908 } 4041 }
3909 4042
3910 warn "running post_init jobs"; 4043 cf::_post_init 1;
3911 (pop @POST_INIT)->(1) while @POST_INIT;
3912 4044
3913 warn "leaving sync_job"; 4045 trace "perl_reload: leaving sync_job";
3914 4046
3915 1 4047 1
3916 } or do { 4048 } or do {
3917 warn $@; 4049 error $@;
3918 cf::cleanup "error while reloading, exiting."; 4050 cf::cleanup "perl_reload: error, exiting.";
3919 }; 4051 };
3920 4052
3921 warn "reloaded";
3922 --$RELOAD; 4053 --$RELOAD;
3923 } 4054 }
3924 4055
3925 $t1 = AE::time - $t1; 4056 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n"; 4057 info "perl_reload: completed in ${t1}s\n";
3927}; 4058};
3928 4059
3929our $RELOAD_WATCHER; # used only during reload 4060our $RELOAD_WATCHER; # used only during reload
3930 4061
3931sub reload_perl() { 4062sub reload_perl() {
… …
3952 reload_perl; 4083 reload_perl;
3953 }; 4084 };
3954 } 4085 }
3955}; 4086};
3956 4087
3957unshift @INC, $LIBDIR; 4088#############################################################################
3958 4089
3959my $bug_warning = 0; 4090my $bug_warning = 0;
3960 4091
3961our @WAIT_FOR_TICK;
3962our @WAIT_FOR_TICK_BEGIN;
3963
3964sub wait_for_tick { 4092sub wait_for_tick() {
3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4093 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3966 4094
3967 my $signal = new Coro::Signal; 4095 $WAIT_FOR_TICK->wait;
3968 push @WAIT_FOR_TICK, $signal;
3969 $signal->wait;
3970} 4096}
3971 4097
3972sub wait_for_tick_begin { 4098sub wait_for_tick_begin() {
3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4099 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3974 4100
3975 my $signal = new Coro::Signal; 4101 my $signal = new Coro::Signal;
3976 push @WAIT_FOR_TICK_BEGIN, $signal; 4102 push @WAIT_FOR_TICK_BEGIN, $signal;
3977 $signal->wait; 4103 $signal->wait;
3978} 4104}
… …
3982 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4108 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3983 unless ++$bug_warning > 10; 4109 unless ++$bug_warning > 10;
3984 return; 4110 return;
3985 } 4111 }
3986 4112
3987 cf::server_tick; # one server iteration 4113 cf::one_tick; # one server iteration
3988 4114
3989 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4115 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3990 4116
3991 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4117 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4118 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3993 Coro::async_pool { 4119 Coro::async_pool {
3994 $Coro::current->{desc} = "runtime saver"; 4120 $Coro::current->{desc} = "runtime saver";
3995 write_runtime_sync 4121 write_runtime_sync
3996 or warn "ERROR: unable to write runtime file: $!"; 4122 or error "ERROR: unable to write runtime file: $!";
3997 }; 4123 };
3998 } 4124 }
3999 4125
4000 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4126 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4001 $sig->send; 4127 $sig->send;
4002 } 4128 }
4003 while (my $sig = shift @WAIT_FOR_TICK) { 4129 $WAIT_FOR_TICK->broadcast;
4004 $sig->send;
4005 }
4006 4130
4007 $LOAD = ($NOW - $TICK_START) / $TICK; 4131 $LOAD = ($NOW - $TICK_START) / $TICK;
4008 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4132 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4009 4133
4010 if (0) { 4134 if (0) {
4011 if ($NEXT_TICK) { 4135 if ($NEXT_TICK) {
4012 my $jitter = $TICK_START - $NEXT_TICK; 4136 my $jitter = $TICK_START - $NEXT_TICK;
4013 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4137 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4014 warn "jitter $JITTER\n";#d# 4138 debug "jitter $JITTER\n";#d#
4015 } 4139 }
4016 } 4140 }
4017} 4141}
4018 4142
4019{ 4143{
… …
4064 IO::AIO::min_parallel 8; 4188 IO::AIO::min_parallel 8;
4065 IO::AIO::max_poll_time $TICK * 0.1; 4189 IO::AIO::max_poll_time $TICK * 0.1;
4066 undef $AnyEvent::AIO::WATCHER; 4190 undef $AnyEvent::AIO::WATCHER;
4067} 4191}
4068 4192
4069my $_log_backtrace; 4193our $_log_backtrace;
4194our $_log_backtrace_last;
4070 4195
4071sub _log_backtrace { 4196sub _log_backtrace {
4072 my ($msg, @addr) = @_; 4197 my ($msg, @addr) = @_;
4073 4198
4074 $msg =~ s/\n//; 4199 $msg =~ s/\n$//;
4075 4200
4201 if ($_log_backtrace_last eq $msg) {
4202 LOG llevInfo, "[ABT] $msg\n";
4203 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4076 # limit the # of concurrent backtraces 4204 # limit the # of concurrent backtraces
4077 if ($_log_backtrace < 2) { 4205 } elsif ($_log_backtrace < 2) {
4206 $_log_backtrace_last = $msg;
4078 ++$_log_backtrace; 4207 ++$_log_backtrace;
4079 my $perl_bt = Carp::longmess $msg; 4208 my $perl_bt = Carp::longmess $msg;
4080 async { 4209 async {
4081 $Coro::current->{desc} = "abt $msg"; 4210 $Coro::current->{desc} = "abt $msg";
4082 4211
… …
4102 LOG llevInfo, "[ABT] $_\n" for @bt; 4231 LOG llevInfo, "[ABT] $_\n" for @bt;
4103 --$_log_backtrace; 4232 --$_log_backtrace;
4104 }; 4233 };
4105 } else { 4234 } else {
4106 LOG llevInfo, "[ABT] $msg\n"; 4235 LOG llevInfo, "[ABT] $msg\n";
4107 LOG llevInfo, "[ABT] [suppressed]\n"; 4236 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4108 } 4237 }
4109} 4238}
4110 4239
4111# load additional modules 4240# load additional modules
4112require "cf/$_.pm" for @EXTRA_MODULES; 4241require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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