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.522 by root, Sat Apr 17 02:22:14 2010 UTC vs.
Revision 1.571 by root, Wed May 4 19:04:45 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;
… …
1695 \@logins 1816 \@logins
1696} 1817}
1697 1818
1698=item $player->maps 1819=item $player->maps
1699 1820
1821=item cf::player::maps $login
1822
1700Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1701player. May block. 1824player. May block.
1702 1825
1703=cut 1826=cut
1704 1827
… …
1766=cut 1889=cut
1767 1890
1768sub find_by_path($) { 1891sub find_by_path($) {
1769 my ($path) = @_; 1892 my ($path) = @_;
1770 1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1895
1771 my ($match, $specificity); 1896 my ($match, $specificity);
1772 1897
1773 for my $region (list) { 1898 for my $region (list) {
1774 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1775 ($match, $specificity) = ($region, $region->specificity) 1900 ($match, $specificity) = ($region, $region->specificity)
… …
1803sub generate_random_map { 1928sub generate_random_map {
1804 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1805 1930
1806 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
1807 1932
1808 # mit "rum" bekleckern, nicht
1809 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1810 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1811 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1812 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1813 $rmp->{exit_on_final_map},
1814 $rmp->{xsize}, $rmp->{ysize},
1815 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1816 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1817 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1818 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1819 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1820 (cf::region::find $rmp->{region}), $rmp->{custom}
1821 )
1822} 1934}
1823 1935
1824=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1825 1937
1826Register 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
… …
1831 1943
1832sub register { 1944sub register {
1833 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1834 my $pkg = caller; 1946 my $pkg = caller;
1835 1947
1836 no strict;
1837 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1838 1949
1839 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1840} 1951}
1841 1952
1842# also paths starting with '/' 1953# also paths starting with '/'
1843$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1844 1955
1845sub thawer_merge { 1956sub thawer_merge {
1846 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1847 1958
1848 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
… …
1853} 1964}
1854 1965
1855sub normalise { 1966sub normalise {
1856 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1857 1968
1858 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1859 1970
1860 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1861 1972
1862 # map plan: 1973 # map plan:
1863 # 1974 #
… …
1878 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1879 $path = "$base/$path"; 1990 $path = "$base/$path";
1880 } 1991 }
1881 1992
1882 for ($path) { 1993 for ($path) {
1883 redo if s{//}{/};
1884 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1885 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1886 } 1996 }
1887 1997
1888 $path 1998 $path
… …
1902 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1903 return $self; 2013 return $self;
1904 } 2014 }
1905 } 2015 }
1906 2016
1907 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1908 () 2018 ()
1909} 2019}
1910 2020
2021# may re-bless or do other evil things
1911sub init { 2022sub init {
1912 my ($self) = @_; 2023 my ($self) = @_;
1913 2024
1914 $self 2025 $self
1915} 2026}
… …
1980 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1981 2092
1982 1 2093 1
1983} 2094}
1984 2095
2096# used to laod the header of an original map
1985sub load_header_orig { 2097sub load_header_orig {
1986 my ($self) = @_; 2098 my ($self) = @_;
1987 2099
1988 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1989} 2101}
1990 2102
2103# used to laod the header of an instantiated map
1991sub load_header_temp { 2104sub load_header_temp {
1992 my ($self) = @_; 2105 my ($self) = @_;
1993 2106
1994 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1995} 2108}
1996 2109
2110# called after loading the header from an instantiated map
1997sub prepare_temp { 2111sub prepare_temp {
1998 my ($self) = @_; 2112 my ($self) = @_;
1999 2113
2000 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
2001 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
2002 # safety 2116 # safety
2003 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
2004 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
2005} 2119}
2006 2120
2121# called after loading the header from an original map
2007sub prepare_orig { 2122sub prepare_orig {
2008 my ($self) = @_; 2123 my ($self) = @_;
2009 2124
2010 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
2011 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
… …
2035 2150
2036sub find; 2151sub find;
2037sub find { 2152sub find {
2038 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
2039 2154
2155 cf::cede_to_tick;
2156
2040 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
2041 2158
2042 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2043 my $guard2 = cf::lock_acquire "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
2044 2161
2045 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
… …
2076 2193
2077 { 2194 {
2078 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2079 2196
2080 return unless $self->valid; 2197 return unless $self->valid;
2081 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2082
2083 $self->in_memory (cf::MAP_LOADING);
2084 2199
2085 $self->alloc; 2200 $self->alloc;
2086 2201
2087 $self->pre_load; 2202 $self->pre_load;
2088 cf::cede_to_tick; 2203 cf::cede_to_tick;
2089 2204
2205 if (exists $self->{load_path}) {
2090 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2091 $f->skip_block; 2207 $f->skip_block;
2092 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2093 or return; 2209 or return;
2094 2210
2095 $self->post_load_original 2211 $self->post_load_original
2096 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2097 2213
2098 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2099 utf8::encode $uniq; 2215 utf8::encode $uniq;
2100 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2101 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2102 $self->clear_unique_items; 2218 $self->clear_unique_items;
2103 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2104 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2105 } 2222 }
2106 } 2223 }
2107 }
2108 2224
2109 $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);
2110 2232
2111 cf::cede_to_tick; 2233 cf::cede_to_tick;
2112 # now do the right thing for maps 2234 # now do the right thing for maps
2113 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2114 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
… …
2117 2239
2118 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2119 $self->decay_objects; 2241 $self->decay_objects;
2120 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2121 $self->update_buttons; 2243 $self->update_buttons;
2244 $self->post_load_physics;
2122 cf::cede_to_tick; 2245 cf::cede_to_tick;
2123 $self->activate; 2246 #$self->activate; # no longer activate maps automatically
2124 } 2247 }
2125 2248
2126 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2127 $self->last_access ($cf::RUNTIME); 2250 $self->last_access ($cf::RUNTIME);
2128
2129 $self->in_memory (cf::MAP_ACTIVE);
2130 } 2251 }
2131 2252
2132 $self->post_load; 2253 $self->post_load;
2254
2255 1
2133} 2256}
2134 2257
2135# customize the map for a given player, i.e. 2258# customize the map for a given player, i.e.
2136# return the _real_ map. used by e.g. per-player 2259# return the _real_ map. used by e.g. per-player
2137# maps to change the path to ~playername/mappath 2260# maps to change the path to ~playername/mappath
… …
2158 or next; 2281 or next;
2159 $neigh = find $neigh, $map 2282 $neigh = find $neigh, $map
2160 or next; 2283 or next;
2161 $neigh->load; 2284 $neigh->load;
2162 2285
2286 # now find the diagonal neighbours
2163 push @neigh, 2287 push @neigh,
2164 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2288 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2165 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2289 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2166 } 2290 }
2167 2291
… …
2174} 2298}
2175 2299
2176sub find_sync { 2300sub find_sync {
2177 my ($path, $origin) = @_; 2301 my ($path, $origin) = @_;
2178 2302
2179 cf::sync_job { find $path, $origin } 2303 # it's a bug to call this from the main context
2304 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2305 if $Coro::current == $Coro::main;
2306
2307 find $path, $origin
2180} 2308}
2181 2309
2182sub do_load_sync { 2310sub do_load_sync {
2183 my ($map) = @_; 2311 my ($map) = @_;
2184 2312
2313 # it's a bug to call this from the main context
2185 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2314 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2186 if $Coro::current == $Coro::main; 2315 if $Coro::current == $Coro::main;
2187 2316
2188 cf::sync_job { $map->load }; 2317 $map->load;
2189} 2318}
2190 2319
2191our %MAP_PREFETCH; 2320our %MAP_PREFETCH;
2192our $MAP_PREFETCHER = undef; 2321our $MAP_PREFETCHER = undef;
2193 2322
2194sub find_async { 2323sub find_async {
2195 my ($path, $origin, $load) = @_; 2324 my ($path, $origin, $load) = @_;
2196 2325
2197 $path = normalise $path, $origin && $origin->{path}; 2326 $path = normalise $path, $origin;
2198 2327
2199 if (my $map = $cf::MAP{$path}) { 2328 if (my $map = $cf::MAP{$path}) {
2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2329 return $map if !$load || $map->linkable;
2201 } 2330 }
2202 2331
2203 $MAP_PREFETCH{$path} |= $load; 2332 $MAP_PREFETCH{$path} |= $load;
2204 2333
2205 $MAP_PREFETCHER ||= cf::async { 2334 $MAP_PREFETCHER ||= cf::async {
… …
2264sub swap_out { 2393sub swap_out {
2265 my ($self) = @_; 2394 my ($self) = @_;
2266 2395
2267 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2396 my $lock = cf::lock_acquire "map_data:$self->{path}";
2268 2397
2269 return if $self->in_memory != cf::MAP_ACTIVE; 2398 return if !$self->linkable;
2270 return if $self->{deny_save}; 2399 return if $self->{deny_save};
2271 return if $self->players; 2400 return if $self->players;
2272 2401
2273 # first deactivate the map and "unlink" it from the core 2402 # first deactivate the map and "unlink" it from the core
2274 $self->deactivate; 2403 $self->deactivate;
2275 $_->clear_links_to ($self) for values %cf::MAP; 2404 $_->clear_links_to ($self) for values %cf::MAP;
2276 $self->in_memory (cf::MAP_SWAPPED); 2405 $self->state (cf::MAP_SWAPPED);
2277 2406
2278 # then atomically save 2407 # then atomically save
2279 $self->_save; 2408 $self->_save;
2280 2409
2281 # then free the map 2410 # then free the map
… …
2305 2434
2306 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2435 my $lock = cf::lock_acquire "map_data:$self->{path}";
2307 2436
2308 return if $self->players; 2437 return if $self->players;
2309 2438
2310 warn "resetting map ", $self->path, "\n"; 2439 cf::trace "resetting map ", $self->path, "\n";
2311 2440
2312 $self->in_memory (cf::MAP_SWAPPED); 2441 $self->state (cf::MAP_SWAPPED);
2313 2442
2314 # need to save uniques path 2443 # need to save uniques path
2315 unless ($self->{deny_save}) { 2444 unless ($self->{deny_save}) {
2316 my $uniq = $self->uniq_path; utf8::encode $uniq; 2445 my $uniq = $self->uniq_path; utf8::encode $uniq;
2317 2446
… …
2339 2468
2340 delete $cf::MAP{$self->path}; 2469 delete $cf::MAP{$self->path};
2341 2470
2342 $self->unlink_save; 2471 $self->unlink_save;
2343 2472
2344 bless $self, "cf::map"; 2473 bless $self, "cf::map::wrap";
2345 delete $self->{deny_reset}; 2474 delete $self->{deny_reset};
2346 $self->{deny_save} = 1; 2475 $self->{deny_save} = 1;
2347 $self->reset_timeout (1); 2476 $self->reset_timeout (1);
2348 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2477 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2349 2478
… …
2579 2708
2580Freezes the player and moves him/her to a special map (C<{link}>). 2709Freezes the player and moves him/her to a special map (C<{link}>).
2581 2710
2582The player should be reasonably safe there for short amounts of time (e.g. 2711The player should be reasonably safe there for short amounts of time (e.g.
2583for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2712for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2584though, as the palyer cannot control the character while it is on the link 2713though, as the player cannot control the character while it is on the link
2585map. 2714map.
2586 2715
2587Will never block. 2716Will never block.
2588 2717
2589=item $player_object->leave_link ($map, $x, $y) 2718=item $player_object->leave_link ($map, $x, $y)
… …
2610sub cf::object::player::enter_link { 2739sub cf::object::player::enter_link {
2611 my ($self) = @_; 2740 my ($self) = @_;
2612 2741
2613 $self->deactivate_recursive; 2742 $self->deactivate_recursive;
2614 2743
2744 ++$self->{_link_recursion};
2745
2615 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2746 return if UNIVERSAL::isa $self->map, "ext::map_link";
2616 2747
2617 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2748 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2618 if $self->map && $self->map->{path} ne "{link}"; 2749 if $self->map && $self->map->{path} ne "{link}";
2619 2750
… …
2650 $map->load_neighbours; 2781 $map->load_neighbours;
2651 2782
2652 return unless $self->contr->active; 2783 return unless $self->contr->active;
2653 2784
2654 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2785 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2655 $self->enter_map ($map, $x, $y); 2786 if ($self->enter_map ($map, $x, $y)) {
2656 2787 # entering was successful
2788 delete $self->{_link_recursion};
2657 # only activate afterwards, to support waiting in hooks 2789 # only activate afterwards, to support waiting in hooks
2658 $self->activate_recursive; 2790 $self->activate_recursive;
2659} 2791 }
2660 2792
2793}
2794
2661=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2795=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2662 2796
2663Moves the player to the given map-path and coordinates by first freezing 2797Moves the player to the given map-path and coordinates by first freezing
2664her, loading and preparing them map, calling the provided $check callback 2798her, loading and preparing them map, calling the provided $check callback
2665that has to return the map if sucecssful, and then unfreezes the player on 2799that has to return the map if sucecssful, and then unfreezes the player on
2666the new (success) or old (failed) map position. In either case, $done will 2800the new (success) or old (failed) map position. In either case, $done will
… …
2673 2807
2674our $GOTOGEN; 2808our $GOTOGEN;
2675 2809
2676sub cf::object::player::goto { 2810sub cf::object::player::goto {
2677 my ($self, $path, $x, $y, $check, $done) = @_; 2811 my ($self, $path, $x, $y, $check, $done) = @_;
2812
2813 if ($self->{_link_recursion} >= $MAX_LINKS) {
2814 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2815 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2816 ($path, $x, $y) = @$EMERGENCY_POSITION;
2817 }
2678 2818
2679 # do generation counting so two concurrent goto's will be executed in-order 2819 # do generation counting so two concurrent goto's will be executed in-order
2680 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2820 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2681 2821
2682 $self->enter_link; 2822 $self->enter_link;
… …
2702 ($path, $x, $y) = (undef, undef, undef); 2842 ($path, $x, $y) = (undef, undef, undef);
2703 } 2843 }
2704 } 2844 }
2705 2845
2706 my $map = eval { 2846 my $map = eval {
2707 my $map = defined $path ? cf::map::find $path : undef; 2847 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2708 2848
2709 if ($map) { 2849 if ($map) {
2710 $map = $map->customise_for ($self); 2850 $map = $map->customise_for ($self);
2711 $map = $check->($map) if $check && $map; 2851 $map = $check->($map, $x, $y, $self) if $check && $map;
2712 } else { 2852 } else {
2713 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2853 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2714 } 2854 }
2715 2855
2716 $map 2856 $map
… …
2724 if ($gen == $self->{_goto_generation}) { 2864 if ($gen == $self->{_goto_generation}) {
2725 delete $self->{_goto_generation}; 2865 delete $self->{_goto_generation};
2726 $self->leave_link ($map, $x, $y); 2866 $self->leave_link ($map, $x, $y);
2727 } 2867 }
2728 2868
2729 $done->() if $done; 2869 $done->($self) if $done;
2730 })->prio (1); 2870 })->prio (1);
2731} 2871}
2732 2872
2733=item $player_object->enter_exit ($exit_object) 2873=item $player_object->enter_exit ($exit_object)
2734 2874
… …
2802 $Coro::current->{desc} = "enter_exit"; 2942 $Coro::current->{desc} = "enter_exit";
2803 2943
2804 unless (eval { 2944 unless (eval {
2805 $self->deactivate_recursive; # just to be sure 2945 $self->deactivate_recursive; # just to be sure
2806 2946
2807 # random map handling
2808 {
2809 my $guard = cf::lock_acquire "exit_prepare:$exit";
2810
2811 prepare_random_map $exit
2812 if $exit->slaying eq "/!";
2813 }
2814
2815 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2947 my $map = cf::map::normalise $exit->slaying, $exit->map;
2816 my $x = $exit->stats->hp; 2948 my $x = $exit->stats->hp;
2817 my $y = $exit->stats->sp; 2949 my $y = $exit->stats->sp;
2950
2951 # special map handling
2952 my $slaying = $exit->slaying;
2953
2954 # special map handling
2955 if ($slaying eq "/!") {
2956 my $guard = cf::lock_acquire "exit_prepare:$exit";
2957
2958 prepare_random_map $exit
2959 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2960
2961 $map = $exit->slaying;
2962
2963 } elsif ($slaying eq '!up') {
2964 $map = $exit->map->tile_path (cf::TILE_UP);
2965 $x = $exit->x;
2966 $y = $exit->y;
2967
2968 } elsif ($slaying eq '!down') {
2969 $map = $exit->map->tile_path (cf::TILE_DOWN);
2970 $x = $exit->x;
2971 $y = $exit->y;
2972 }
2818 2973
2819 $self->goto ($map, $x, $y); 2974 $self->goto ($map, $x, $y);
2820 2975
2821 # if exit is damned, update players death & WoR home-position 2976 # if exit is damned, update players death & WoR home-position
2822 $self->contr->savebed ($map, $x, $y) 2977 $self->contr->savebed ($map, $x, $y)
… …
2827 $self->message ("Something went wrong deep within the deliantra server. " 2982 $self->message ("Something went wrong deep within the deliantra server. "
2828 . "I'll try to bring you back to the map you were before. " 2983 . "I'll try to bring you back to the map you were before. "
2829 . "Please report this to the dungeon master!", 2984 . "Please report this to the dungeon master!",
2830 cf::NDI_UNIQUE | cf::NDI_RED); 2985 cf::NDI_UNIQUE | cf::NDI_RED);
2831 2986
2832 warn "ERROR in enter_exit: $@"; 2987 error "ERROR in enter_exit: $@";
2833 $self->leave_link; 2988 $self->leave_link;
2834 } 2989 }
2835 })->prio (1); 2990 })->prio (1);
2836} 2991}
2837 2992
… …
3150 3305
3151 $ns->ext_reply ($reply, @reply) 3306 $ns->ext_reply ($reply, @reply)
3152 if $reply; 3307 if $reply;
3153 3308
3154 } else { 3309 } else {
3155 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3310 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3156 } 3311 }
3157 3312
3158 cf::override; 3313 cf::override;
3159 }, 3314 },
3160); 3315);
… …
3241 decrease split destroy change_exp value msg lore send_msg)], 3396 decrease split destroy change_exp value msg lore send_msg)],
3242 ["cf::object::player" => qw(player)], 3397 ["cf::object::player" => qw(player)],
3243 ["cf::player" => qw(peaceful send_msg)], 3398 ["cf::player" => qw(peaceful send_msg)],
3244 ["cf::map" => qw(trigger)], 3399 ["cf::map" => qw(trigger)],
3245) { 3400) {
3246 no strict 'refs';
3247 my ($pkg, @funs) = @$_; 3401 my ($pkg, @funs) = @$_;
3248 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3402 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3249 for @funs; 3403 for @funs;
3250} 3404}
3251 3405
… …
3290 local @cf::_safe_eval_args = values %vars; 3444 local @cf::_safe_eval_args = values %vars;
3291 @res = wantarray ? eval eval : scalar eval $eval; 3445 @res = wantarray ? eval eval : scalar eval $eval;
3292 } 3446 }
3293 3447
3294 if ($@) { 3448 if ($@) {
3295 warn "$@"; 3449 warn "$@",
3296 warn "while executing safe code '$code'\n"; 3450 "while executing safe code '$code'\n",
3297 warn "with arguments " . (join " ", %vars) . "\n"; 3451 "with arguments " . (join " ", %vars) . "\n";
3298 } 3452 }
3299 3453
3300 wantarray ? @res : $res[0] 3454 wantarray ? @res : $res[0]
3301} 3455}
3302 3456
… …
3336 # for this (global event?) 3490 # for this (global event?)
3337 %ext::player_env::MUSIC_FACE_CACHE = (); 3491 %ext::player_env::MUSIC_FACE_CACHE = ();
3338 3492
3339 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3493 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3340 3494
3341 warn "loading facedata from $path\n"; 3495 trace "loading facedata from $path\n";
3342 3496
3343 my $facedata; 3497 my $facedata = decode_storable load_file $path;
3344 0 < aio_load $path, $facedata
3345 or die "$path: $!";
3346
3347 $facedata = Coro::Storable::thaw $facedata;
3348 3498
3349 $facedata->{version} == 2 3499 $facedata->{version} == 2
3350 or cf::cleanup "$path: version mismatch, cannot proceed."; 3500 or cf::cleanup "$path: version mismatch, cannot proceed.";
3351 3501
3352 # patch in the exptable 3502 # patch in the exptable
… …
3366 3516
3367 cf::face::set_visibility $idx, $info->{visibility}; 3517 cf::face::set_visibility $idx, $info->{visibility};
3368 cf::face::set_magicmap $idx, $info->{magicmap}; 3518 cf::face::set_magicmap $idx, $info->{magicmap};
3369 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3519 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3370 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3520 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3521 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3371 3522
3372 cf::cede_to_tick; 3523 cf::cede_to_tick;
3373 } 3524 }
3374 3525
3375 while (my ($face, $info) = each %$faces) { 3526 while (my ($face, $info) = each %$faces) {
… …
3380 3531
3381 if (my $smooth = cf::face::find $info->{smooth}) { 3532 if (my $smooth = cf::face::find $info->{smooth}) {
3382 cf::face::set_smooth $idx, $smooth; 3533 cf::face::set_smooth $idx, $smooth;
3383 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3534 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3384 } else { 3535 } else {
3385 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3536 error "smooth face '$info->{smooth}' not found for face '$face'";
3386 } 3537 }
3387 3538
3388 cf::cede_to_tick; 3539 cf::cede_to_tick;
3389 } 3540 }
3390 } 3541 }
… …
3408 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3559 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3409 3560
3410 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3561 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3411 cf::face::set_type $idx, $info->{type}; 3562 cf::face::set_type $idx, $info->{type};
3412 } else { 3563 } else {
3413 $RESOURCE{$name} = $info; 3564 $RESOURCE{$name} = $info; # unused
3414 } 3565 }
3415 3566
3416 cf::cede_to_tick; 3567 cf::cede_to_tick;
3417 } 3568 }
3418 } 3569 }
3419 3570
3420 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3571 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3421 3572
3422 1 3573 1
3423} 3574}
3424
3425cf::global->attach (on_resource_update => sub {
3426 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3427 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3428
3429 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3430 my $sound = $soundconf->{compat}[$_]
3431 or next;
3432
3433 my $face = cf::face::find "sound/$sound->[1]";
3434 cf::sound::set $sound->[0] => $face;
3435 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3436 }
3437
3438 while (my ($k, $v) = each %{$soundconf->{event}}) {
3439 my $face = cf::face::find "sound/$v";
3440 cf::sound::set $k => $face;
3441 }
3442 }
3443});
3444 3575
3445register_exticmd fx_want => sub { 3576register_exticmd fx_want => sub {
3446 my ($ns, $want) = @_; 3577 my ($ns, $want) = @_;
3447 3578
3448 while (my ($k, $v) = each %$want) { 3579 while (my ($k, $v) = each %$want) {
… …
3487sub reload_treasures { 3618sub reload_treasures {
3488 load_resource_file "$DATADIR/treasures" 3619 load_resource_file "$DATADIR/treasures"
3489 or die "unable to load treasurelists\n"; 3620 or die "unable to load treasurelists\n";
3490} 3621}
3491 3622
3623sub reload_sound {
3624 trace "loading sound config from $DATADIR/sound\n";
3625
3626 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3627
3628 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3629 my $sound = $soundconf->{compat}[$_]
3630 or next;
3631
3632 my $face = cf::face::find "sound/$sound->[1]";
3633 cf::sound::set $sound->[0] => $face;
3634 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3635 }
3636
3637 while (my ($k, $v) = each %{$soundconf->{event}}) {
3638 my $face = cf::face::find "sound/$v";
3639 cf::sound::set $k => $face;
3640 }
3641}
3642
3492sub reload_resources { 3643sub reload_resources {
3493 warn "reloading resource files...\n"; 3644 trace "reloading resource files...\n";
3494 3645
3646 reload_exp_table;
3647 reload_materials;
3495 reload_facedata; 3648 reload_facedata;
3649 reload_sound;
3496 reload_archetypes; 3650 reload_archetypes;
3497 reload_regions; 3651 reload_regions;
3498 reload_treasures; 3652 reload_treasures;
3499 3653
3500 warn "finished reloading resource files\n"; 3654 trace "finished reloading resource files\n";
3501} 3655}
3502 3656
3503sub reload_config { 3657sub reload_config {
3504 warn "reloading config file...\n"; 3658 trace "reloading config file...\n";
3505 3659
3506 open my $fh, "<:utf8", "$CONFDIR/config" 3660 my $config = load_file "$CONFDIR/config";
3507 or return; 3661 utf8::decode $config;
3662 *CFG = decode_yaml $config;
3508 3663
3509 local $/;
3510 *CFG = YAML::XS::Load scalar <$fh>;
3511
3512 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3664 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3513 3665
3514 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3666 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3515 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3667 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3516 3668
3517 if (exists $CFG{mlockall}) { 3669 if (exists $CFG{mlockall}) {
… …
3519 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3671 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3520 and die "WARNING: m(un)lockall failed: $!\n"; 3672 and die "WARNING: m(un)lockall failed: $!\n";
3521 }; 3673 };
3522 warn $@ if $@; 3674 warn $@ if $@;
3523 } 3675 }
3524
3525 warn "finished reloading resource files\n";
3526} 3676}
3527 3677
3528sub pidfile() { 3678sub pidfile() {
3529 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3679 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3530 or die "$PIDFILE: $!"; 3680 or die "$PIDFILE: $!";
… …
3543 seek $fh, 0, 0; 3693 seek $fh, 0, 0;
3544 print $fh $$; 3694 print $fh $$;
3545} 3695}
3546 3696
3547sub main_loop { 3697sub main_loop {
3548 warn "EV::loop starting\n"; 3698 trace "EV::loop starting\n";
3549 if (1) { 3699 if (1) {
3550 EV::loop; 3700 EV::loop;
3551 } 3701 }
3552 warn "EV::loop returned\n"; 3702 trace "EV::loop returned\n";
3553 goto &main_loop unless $REALLY_UNLOOP; 3703 goto &main_loop unless $REALLY_UNLOOP;
3554} 3704}
3555 3705
3556sub main { 3706sub main {
3557 cf::init_globals; # initialise logging 3707 cf::init_globals; # initialise logging
3558 3708
3559 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3709 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3560 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3710 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3561 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3711 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3562 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3712 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3563 3713
3564 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3714 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3565 3715
… …
3573 }; 3723 };
3574 3724
3575 evthread_start IO::AIO::poll_fileno; 3725 evthread_start IO::AIO::poll_fileno;
3576 3726
3577 cf::sync_job { 3727 cf::sync_job {
3578 cf::init_experience; 3728 cf::incloader::init ();
3729
3579 cf::init_anim; 3730 cf::init_anim;
3580 cf::init_attackmess; 3731 cf::init_attackmess;
3581 cf::init_dynamic; 3732 cf::init_dynamic;
3582 3733
3583 cf::load_settings; 3734 cf::load_settings;
3584 cf::load_materials;
3585 3735
3586 reload_resources; 3736 reload_resources;
3587 reload_config; 3737 reload_config;
3588 db_init; 3738 db_init;
3589 3739
… …
3601 3751
3602 # no (long-running) fork's whatsoever before this point(!) 3752 # no (long-running) fork's whatsoever before this point(!)
3603 use POSIX (); 3753 use POSIX ();
3604 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3754 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3605 3755
3606 (pop @POST_INIT)->(0) while @POST_INIT; 3756 cf::_post_init 0;
3607 }; 3757 };
3608 3758
3609 cf::object::thawer::errors_are_fatal 0; 3759 cf::object::thawer::errors_are_fatal 0;
3610 warn "parse errors in files are no longer fatal from this point on.\n"; 3760 info "parse errors in files are no longer fatal from this point on.\n";
3611 3761
3762 my $free_main; $free_main = EV::idle sub {
3763 undef $free_main;
3764 undef &main; # free gobs of memory :)
3765 };
3766
3612 main_loop; 3767 goto &main_loop;
3613} 3768}
3614 3769
3615############################################################################# 3770#############################################################################
3616# initialisation and cleanup 3771# initialisation and cleanup
3617 3772
… …
3656 or return; 3811 or return;
3657 3812
3658 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3813 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3659 and return; 3814 and return;
3660 3815
3661 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3816 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3662 3817
3663 1 3818 1
3664} 3819}
3665 3820
3666our $uuid_lock; 3821our $uuid_lock;
… …
3678 or return; 3833 or return;
3679 3834
3680 my $value = uuid_seq uuid_cur; 3835 my $value = uuid_seq uuid_cur;
3681 3836
3682 unless ($value) { 3837 unless ($value) {
3683 warn "cowardly refusing to write zero uuid value!\n"; 3838 info "cowardly refusing to write zero uuid value!\n";
3684 return; 3839 return;
3685 } 3840 }
3686 3841
3687 my $value = uuid_str $value + $uuid_skip; 3842 my $value = uuid_str $value + $uuid_skip;
3688 $uuid_skip = 0; 3843 $uuid_skip = 0;
… …
3698 or return; 3853 or return;
3699 3854
3700 aio_rename "$uuid~", $uuid 3855 aio_rename "$uuid~", $uuid
3701 and return; 3856 and return;
3702 3857
3703 warn "uuid file written ($value).\n"; 3858 trace "uuid file written ($value).\n";
3704 3859
3705 1 3860 1
3706 3861
3707} 3862}
3708 3863
… …
3714} 3869}
3715 3870
3716sub emergency_save() { 3871sub emergency_save() {
3717 my $freeze_guard = cf::freeze_mainloop; 3872 my $freeze_guard = cf::freeze_mainloop;
3718 3873
3719 warn "emergency_perl_save: enter\n"; 3874 info "emergency_perl_save: enter\n";
3875
3876 # this is a trade-off: we want to be very quick here, so
3877 # save all maps without fsync, and later call a global sync
3878 # (which in turn might be very very slow)
3879 local $USE_FSYNC = 0;
3720 3880
3721 cf::sync_job { 3881 cf::sync_job {
3722 # this is a trade-off: we want to be very quick here, so 3882 cf::write_runtime_sync; # external watchdog should not bark
3723 # save all maps without fsync, and later call a global sync
3724 # (which in turn might be very very slow)
3725 local $USE_FSYNC = 0;
3726 3883
3727 # use a peculiar iteration method to avoid tripping on perl 3884 # use a peculiar iteration method to avoid tripping on perl
3728 # refcount bugs in for. also avoids problems with players 3885 # refcount bugs in for. also avoids problems with players
3729 # and maps saved/destroyed asynchronously. 3886 # and maps saved/destroyed asynchronously.
3730 warn "emergency_perl_save: begin player save\n"; 3887 info "emergency_perl_save: begin player save\n";
3731 for my $login (keys %cf::PLAYER) { 3888 for my $login (keys %cf::PLAYER) {
3732 my $pl = $cf::PLAYER{$login} or next; 3889 my $pl = $cf::PLAYER{$login} or next;
3733 $pl->valid or next; 3890 $pl->valid or next;
3734 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3891 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3735 $pl->save; 3892 $pl->save;
3736 } 3893 }
3737 warn "emergency_perl_save: end player save\n"; 3894 info "emergency_perl_save: end player save\n";
3738 3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3739 warn "emergency_perl_save: begin map save\n"; 3898 info "emergency_perl_save: begin map save\n";
3740 for my $path (keys %cf::MAP) { 3899 for my $path (keys %cf::MAP) {
3741 my $map = $cf::MAP{$path} or next; 3900 my $map = $cf::MAP{$path} or next;
3742 $map->valid or next; 3901 $map->valid or next;
3743 $map->save; 3902 $map->save;
3744 } 3903 }
3745 warn "emergency_perl_save: end map save\n"; 3904 info "emergency_perl_save: end map save\n";
3746 3905
3906 cf::write_runtime_sync; # external watchdog should not bark
3907
3747 warn "emergency_perl_save: begin database checkpoint\n"; 3908 info "emergency_perl_save: begin database checkpoint\n";
3748 BDB::db_env_txn_checkpoint $DB_ENV; 3909 BDB::db_env_txn_checkpoint $DB_ENV;
3749 warn "emergency_perl_save: end database checkpoint\n"; 3910 info "emergency_perl_save: end database checkpoint\n";
3750 3911
3751 warn "emergency_perl_save: begin write uuid\n"; 3912 info "emergency_perl_save: begin write uuid\n";
3752 write_uuid_sync 1; 3913 write_uuid_sync 1;
3753 warn "emergency_perl_save: end write uuid\n"; 3914 info "emergency_perl_save: end write uuid\n";
3915
3916 cf::write_runtime_sync; # external watchdog should not bark
3917
3918 trace "emergency_perl_save: syncing database to disk";
3919 BDB::db_env_txn_checkpoint $DB_ENV;
3920
3921 info "emergency_perl_save: starting sync\n";
3922 IO::AIO::aio_sync sub {
3923 info "emergency_perl_save: finished sync\n";
3924 };
3925
3926 cf::write_runtime_sync; # external watchdog should not bark
3927
3928 trace "emergency_perl_save: flushing outstanding aio requests";
3929 while (IO::AIO::nreqs || BDB::nreqs) {
3930 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3931 }
3932
3933 cf::write_runtime_sync; # external watchdog should not bark
3754 }; 3934 };
3755 3935
3756 warn "emergency_perl_save: starting sync()\n";
3757 IO::AIO::aio_sync sub {
3758 warn "emergency_perl_save: finished sync()\n";
3759 };
3760
3761 warn "emergency_perl_save: leave\n"; 3936 info "emergency_perl_save: leave\n";
3762} 3937}
3763 3938
3764sub post_cleanup { 3939sub post_cleanup {
3765 my ($make_core) = @_; 3940 my ($make_core) = @_;
3766 3941
3942 IO::AIO::flush;
3943
3767 warn Carp::longmess "post_cleanup backtrace" 3944 error Carp::longmess "post_cleanup backtrace"
3768 if $make_core; 3945 if $make_core;
3769 3946
3770 my $fh = pidfile; 3947 my $fh = pidfile;
3771 unlink $PIDFILE if <$fh> == $$; 3948 unlink $PIDFILE if <$fh> == $$;
3772} 3949}
… …
3796 } 3973 }
3797} 3974}
3798 3975
3799sub do_reload_perl() { 3976sub do_reload_perl() {
3800 # can/must only be called in main 3977 # can/must only be called in main
3801 if (in_main) { 3978 unless (in_main) {
3802 warn "can only reload from main coroutine"; 3979 error "can only reload from main coroutine";
3803 return; 3980 return;
3804 } 3981 }
3805 3982
3806 return if $RELOAD++; 3983 return if $RELOAD++;
3807 3984
3808 my $t1 = AE::time; 3985 my $t1 = AE::time;
3809 3986
3810 while ($RELOAD) { 3987 while ($RELOAD) {
3811 warn "reloading..."; 3988 cf::get_slot 0.1, -1, "reload_perl";
3989 info "perl_reload: reloading...";
3812 3990
3813 warn "entering sync_job"; 3991 trace "perl_reload: entering sync_job";
3814 3992
3815 cf::sync_job { 3993 cf::sync_job {
3816 cf::write_runtime_sync; # external watchdog should not bark
3817 cf::emergency_save; 3994 #cf::emergency_save;
3818 cf::write_runtime_sync; # external watchdog should not bark
3819 3995
3820 warn "syncing database to disk";
3821 BDB::db_env_txn_checkpoint $DB_ENV;
3822
3823 # if anything goes wrong in here, we should simply crash as we already saved
3824
3825 warn "flushing outstanding aio requests";
3826 while (IO::AIO::nreqs || BDB::nreqs) {
3827 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3828 }
3829
3830 warn "cancelling all extension coros"; 3996 trace "perl_reload: cancelling all extension coros";
3831 $_->cancel for values %EXT_CORO; 3997 $_->cancel for values %EXT_CORO;
3832 %EXT_CORO = (); 3998 %EXT_CORO = ();
3833 3999
3834 warn "removing commands"; 4000 trace "perl_reload: removing commands";
3835 %COMMAND = (); 4001 %COMMAND = ();
3836 4002
3837 warn "removing ext/exti commands"; 4003 trace "perl_reload: removing ext/exti commands";
3838 %EXTCMD = (); 4004 %EXTCMD = ();
3839 %EXTICMD = (); 4005 %EXTICMD = ();
3840 4006
3841 warn "unloading/nuking all extensions"; 4007 trace "perl_reload: unloading/nuking all extensions";
3842 for my $pkg (@EXTS) { 4008 for my $pkg (@EXTS) {
3843 warn "... unloading $pkg"; 4009 trace "... unloading $pkg";
3844 4010
3845 if (my $cb = $pkg->can ("unload")) { 4011 if (my $cb = $pkg->can ("unload")) {
3846 eval { 4012 eval {
3847 $cb->($pkg); 4013 $cb->($pkg);
3848 1 4014 1
3849 } or warn "$pkg unloaded, but with errors: $@"; 4015 } or error "$pkg unloaded, but with errors: $@";
3850 } 4016 }
3851 4017
3852 warn "... clearing $pkg"; 4018 trace "... clearing $pkg";
3853 clear_package $pkg; 4019 clear_package $pkg;
3854 } 4020 }
3855 4021
3856 warn "unloading all perl modules loaded from $LIBDIR"; 4022 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3857 while (my ($k, $v) = each %INC) { 4023 while (my ($k, $v) = each %INC) {
3858 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4024 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3859 4025
3860 warn "... unloading $k"; 4026 trace "... unloading $k";
3861 delete $INC{$k}; 4027 delete $INC{$k};
3862 4028
3863 $k =~ s/\.pm$//; 4029 $k =~ s/\.pm$//;
3864 $k =~ s/\//::/g; 4030 $k =~ s/\//::/g;
3865 4031
… …
3868 } 4034 }
3869 4035
3870 clear_package $k; 4036 clear_package $k;
3871 } 4037 }
3872 4038
3873 warn "getting rid of safe::, as good as possible"; 4039 trace "perl_reload: getting rid of safe::, as good as possible";
3874 clear_package "safe::$_" 4040 clear_package "safe::$_"
3875 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4041 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3876 4042
3877 warn "unloading cf.pm \"a bit\""; 4043 trace "perl_reload: unloading cf.pm \"a bit\"";
3878 delete $INC{"cf.pm"}; 4044 delete $INC{"cf.pm"};
3879 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4045 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3880 4046
3881 # don't, removes xs symbols, too, 4047 # don't, removes xs symbols, too,
3882 # and global variables created in xs 4048 # and global variables created in xs
3883 #clear_package __PACKAGE__; 4049 #clear_package __PACKAGE__;
3884 4050
3885 warn "unload completed, starting to reload now"; 4051 info "perl_reload: unload completed, starting to reload now";
3886 4052
3887 warn "reloading cf.pm"; 4053 trace "perl_reload: reloading cf.pm";
3888 require cf; 4054 require cf;
3889 cf::_connect_to_perl_1; 4055 cf::_connect_to_perl_1;
3890 4056
3891 warn "loading config and database again"; 4057 trace "perl_reload: loading config and database again";
3892 cf::reload_config; 4058 cf::reload_config;
3893 4059
3894 warn "loading extensions"; 4060 trace "perl_reload: loading extensions";
3895 cf::load_extensions; 4061 cf::load_extensions;
3896 4062
3897 if ($REATTACH_ON_RELOAD) { 4063 if ($REATTACH_ON_RELOAD) {
3898 warn "reattaching attachments to objects/players"; 4064 trace "perl_reload: reattaching attachments to objects/players";
3899 _global_reattach; # objects, sockets 4065 _global_reattach; # objects, sockets
3900 warn "reattaching attachments to maps"; 4066 trace "perl_reload: reattaching attachments to maps";
3901 reattach $_ for values %MAP; 4067 reattach $_ for values %MAP;
3902 warn "reattaching attachments to players"; 4068 trace "perl_reload: reattaching attachments to players";
3903 reattach $_ for values %PLAYER; 4069 reattach $_ for values %PLAYER;
3904 } 4070 }
3905 4071
3906 warn "running post_init jobs"; 4072 cf::_post_init 1;
3907 (pop @POST_INIT)->(1) while @POST_INIT;
3908 4073
3909 warn "leaving sync_job"; 4074 trace "perl_reload: leaving sync_job";
3910 4075
3911 1 4076 1
3912 } or do { 4077 } or do {
3913 warn $@; 4078 error $@;
3914 cf::cleanup "error while reloading, exiting."; 4079 cf::cleanup "perl_reload: error, exiting.";
3915 }; 4080 };
3916 4081
3917 warn "reloaded";
3918 --$RELOAD; 4082 --$RELOAD;
3919 } 4083 }
3920 4084
3921 $t1 = AE::time - $t1; 4085 $t1 = AE::time - $t1;
3922 warn "reload completed in ${t1}s\n"; 4086 info "perl_reload: completed in ${t1}s\n";
3923}; 4087};
3924 4088
3925our $RELOAD_WATCHER; # used only during reload 4089our $RELOAD_WATCHER; # used only during reload
3926 4090
3927sub reload_perl() { 4091sub reload_perl() {
… …
3948 reload_perl; 4112 reload_perl;
3949 }; 4113 };
3950 } 4114 }
3951}; 4115};
3952 4116
3953unshift @INC, $LIBDIR; 4117#############################################################################
3954 4118
3955my $bug_warning = 0; 4119my $bug_warning = 0;
3956 4120
3957our @WAIT_FOR_TICK;
3958our @WAIT_FOR_TICK_BEGIN;
3959
3960sub wait_for_tick { 4121sub wait_for_tick() {
3961 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4122 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3962 4123
3963 my $signal = new Coro::Signal; 4124 $WAIT_FOR_TICK->wait;
3964 push @WAIT_FOR_TICK, $signal;
3965 $signal->wait;
3966} 4125}
3967 4126
3968sub wait_for_tick_begin { 4127sub wait_for_tick_begin() {
3969 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4128 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3970 4129
3971 my $signal = new Coro::Signal; 4130 my $signal = new Coro::Signal;
3972 push @WAIT_FOR_TICK_BEGIN, $signal; 4131 push @WAIT_FOR_TICK_BEGIN, $signal;
3973 $signal->wait; 4132 $signal->wait;
3974} 4133}
… …
3978 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4137 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3979 unless ++$bug_warning > 10; 4138 unless ++$bug_warning > 10;
3980 return; 4139 return;
3981 } 4140 }
3982 4141
3983 cf::server_tick; # one server iteration 4142 cf::one_tick; # one server iteration
3984 4143
3985 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4144 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3986 4145
3987 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3988 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4147 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3989 Coro::async_pool { 4148 Coro::async_pool {
3990 $Coro::current->{desc} = "runtime saver"; 4149 $Coro::current->{desc} = "runtime saver";
3991 write_runtime_sync 4150 write_runtime_sync
3992 or warn "ERROR: unable to write runtime file: $!"; 4151 or error "ERROR: unable to write runtime file: $!";
3993 }; 4152 };
3994 } 4153 }
3995 4154
3996 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4155 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3997 $sig->send; 4156 $sig->send;
3998 } 4157 }
3999 while (my $sig = shift @WAIT_FOR_TICK) { 4158 $WAIT_FOR_TICK->broadcast;
4000 $sig->send;
4001 }
4002 4159
4003 $LOAD = ($NOW - $TICK_START) / $TICK; 4160 $LOAD = ($NOW - $TICK_START) / $TICK;
4004 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4161 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4005 4162
4006 if (0) { 4163 if (0) {
4007 if ($NEXT_TICK) { 4164 if ($NEXT_TICK) {
4008 my $jitter = $TICK_START - $NEXT_TICK; 4165 my $jitter = $TICK_START - $NEXT_TICK;
4009 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4166 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4010 warn "jitter $JITTER\n";#d# 4167 debug "jitter $JITTER\n";#d#
4011 } 4168 }
4012 } 4169 }
4013} 4170}
4014 4171
4015{ 4172{
… …
4060 IO::AIO::min_parallel 8; 4217 IO::AIO::min_parallel 8;
4061 IO::AIO::max_poll_time $TICK * 0.1; 4218 IO::AIO::max_poll_time $TICK * 0.1;
4062 undef $AnyEvent::AIO::WATCHER; 4219 undef $AnyEvent::AIO::WATCHER;
4063} 4220}
4064 4221
4065my $_log_backtrace; 4222our $_log_backtrace;
4223our $_log_backtrace_last;
4066 4224
4067sub _log_backtrace { 4225sub _log_backtrace {
4068 my ($msg, @addr) = @_; 4226 my ($msg, @addr) = @_;
4069 4227
4070 $msg =~ s/\n//; 4228 $msg =~ s/\n$//;
4071 4229
4230 if ($_log_backtrace_last eq $msg) {
4231 LOG llevInfo, "[ABT] $msg\n";
4232 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4072 # limit the # of concurrent backtraces 4233 # limit the # of concurrent backtraces
4073 if ($_log_backtrace < 2) { 4234 } elsif ($_log_backtrace < 2) {
4235 $_log_backtrace_last = $msg;
4074 ++$_log_backtrace; 4236 ++$_log_backtrace;
4075 my $perl_bt = Carp::longmess $msg; 4237 my $perl_bt = Carp::longmess $msg;
4076 async { 4238 async {
4077 $Coro::current->{desc} = "abt $msg"; 4239 $Coro::current->{desc} = "abt $msg";
4078 4240
… …
4098 LOG llevInfo, "[ABT] $_\n" for @bt; 4260 LOG llevInfo, "[ABT] $_\n" for @bt;
4099 --$_log_backtrace; 4261 --$_log_backtrace;
4100 }; 4262 };
4101 } else { 4263 } else {
4102 LOG llevInfo, "[ABT] $msg\n"; 4264 LOG llevInfo, "[ABT] $msg\n";
4103 LOG llevInfo, "[ABT] [suppressed]\n"; 4265 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4104 } 4266 }
4105} 4267}
4106 4268
4107# load additional modules 4269# load additional modules
4108require "cf/$_.pm" for @EXTRA_MODULES; 4270require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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