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.521 by root, Fri Apr 16 23:28:42 2010 UTC vs.
Revision 1.573 by root, Sun May 8 12:40:42 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,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
… …
165 174
166our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
167 176
168sub cf::map::normalise; 177sub cf::map::normalise;
169 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
170############################################################################# 183#############################################################################
171 184
172%REFLECT = (); 185%REFLECT = ();
173for (@REFLECT) { 186for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_; 187 my $reflect = JSON::XS::decode_json $_;
… …
184 197
185=over 4 198=over 4
186 199
187=item $cf::UPTIME 200=item $cf::UPTIME
188 201
189The 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.
190 218
191=item $cf::RUNTIME 219=item $cf::RUNTIME
192 220
193The 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
194every server tick. 222every server tick.
… …
200Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
201directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
202unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
203database environment. 231database environment.
204 232
205=item $cf::NOW
206
207The time of the last (current) server tick.
208
209=item $cf::TICK
210
211The interval between server ticks, in seconds.
212
213=item $cf::LOADAVG 233=item $cf::LOADAVG
214 234
215The 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
216(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
217objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
… …
226from wherever your confdir points to. 246from wherever your confdir points to.
227 247
228=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
229 249
230These 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
231returns 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
232per 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();
233 270
234=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
235 272
236This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
237C<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
… …
245 282
246=back 283=back
247 284
248=cut 285=cut
249 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
250$Coro::State::WARNHOOK = sub { 293$Coro::State::WARNHOOK = sub {
251 my $msg = join "", @_; 294 my $msg = join "", @_;
252 295
253 $msg .= "\n" 296 $msg .= "\n"
254 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
255 298
256 $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;
257 300
258 LOG llevError, $msg; 301 LOG llevWarn, $msg;
259}; 302};
260 303
261$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
262 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
263 306
264 warn Carp::longmess $_[0]; 307 error Carp::longmess $_[0];
265 308
266 if ($Coro::current == $Coro::main) {#d# 309 if (in_main) {#d#
267 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
268 return;#d# 311 return;#d#
269 }#d# 312 }#d#
270 313
271 # kill coroutine otherwise 314 # kill coroutine otherwise
272 Coro::terminate 315 Coro::terminate
… …
294} 337}
295 338
296$EV::DIED = sub { 339$EV::DIED = sub {
297 Carp::cluck "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
298}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
299 347
300############################################################################# 348#############################################################################
301 349
302=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
303 351
… …
324 $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;
325 $d 373 $d
326 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
327} 375}
328 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
329=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
330 392
331Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
332 394
333=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
… …
339our $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
340 402
341sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
342sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
343 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
344=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
345 438
346Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
348 441
349The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
350is a reload or not. 443is a reload or not.
351 444
352=cut 445=cut
353 446
354sub post_init(&) { 447sub post_init(&) {
355 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 }
356} 466}
357 467
358=item cf::lock_wait $string 468=item cf::lock_wait $string
359 469
360Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
… …
413 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
414} 524}
415 525
416=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
417 527
418Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
419This 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
420of 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.
421 535
422The 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
423used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
424 538
425Useful for short background jobs. 539Useful for short background jobs.
… …
454 } 568 }
455 } 569 }
456 570
457 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
458 # 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
459 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
460 $signal->wait;
461 } else { 574 } else {
462 $busy = 0; 575 $busy = 0;
463 Coro::schedule; 576 Coro::schedule;
464 } 577 }
465 } 578 }
… …
505=cut 618=cut
506 619
507sub sync_job(&) { 620sub sync_job(&) {
508 my ($job) = @_; 621 my ($job) = @_;
509 622
510 if ($Coro::current == $Coro::main) { 623 if (in_main) {
511 my $time = AE::time; 624 my $time = AE::time;
512 625
513 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
514 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
515 628
516 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
517 630
518 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
519 632
520 my $busy = 1; 633 my $busy = 1;
521 my @res; 634 my @res;
522 635
523 (async { 636 (async {
524 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
525 @res = eval { $job->() }; 638 @res = eval { $job->() };
526 warn $@ if $@; 639 error $@ if $@;
527 undef $busy; 640 undef $busy;
528 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
529 642
530 while ($busy) { 643 while ($busy) {
531 if (Coro::nready) { 644 if (Coro::nready) {
… …
565 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
566 679
567 $coro 680 $coro
568} 681}
569 682
570=item fork_call { }, $args 683=item fork_call { }, @args
571 684
572Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
573process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
574Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
575never block itself or use any form of event handling. 688never block itself or use any form of event handling.
576 689
577=cut 690=cut
578 691
692sub post_fork {
693 reset_signals;
694}
695
579sub fork_call(&@) { 696sub fork_call(&@) {
580 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
581 698
582 # 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,
583 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
584 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
585 702
586 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
587 reset_signals; 704 cf::post_fork;
588 &$cb 705 &$cb
589 }, @args; 706 } @args;
590 707
591 wantarray ? @res : $res[-1] 708 wantarray ? @res : $res[-1]
592} 709}
593 710
594sub objinfo { 711sub objinfo {
… …
644within each server. 761within each server.
645 762
646=cut 763=cut
647 764
648sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
649 my ($name) = @_; 769 my ($name) = @_;
650 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
651 771
652 eval { 772 eval {
653 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
… …
663} 783}
664 784
665our $DB; 785our $DB;
666 786
667sub db_init { 787sub db_init {
668 cf::sync_job {
669 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
670 };
671} 789}
672 790
673sub db_get($$) { 791sub db_get($$) {
674 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
675 793
676 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
677 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
678 798
679 $! ? () 799 $! ? ()
680 : $data 800 : $data
681 }
682} 801}
683 802
684sub db_put($$$) { 803sub db_put($$$) {
685 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
686 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
714 833
715 my @data; 834 my @data;
716 my $md5; 835 my $md5;
717 836
718 for (0 .. $#$src) { 837 for (0 .. $#$src) {
719 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
720 or Carp::croak "$src->[$_]: $!";
721 } 839 }
722 840
723 # if processing is expensive, check 841 # if processing is expensive, check
724 # checksum first 842 # checksum first
725 if (1) { 843 if (1) {
… …
742 860
743 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
744 my $data = $process->(\@data); 862 my $data = $process->(\@data);
745 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
746 864
747 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
748 866
749 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
750 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
751 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
752 870
… …
762 880
763=cut 881=cut
764 882
765sub datalog($@) { 883sub datalog($@) {
766 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
767 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
768} 886}
769 887
770=back 888=back
771 889
772=cut 890=cut
… …
967 1085
968 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
969 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
970 1088
971 } elsif (ref $type) { 1089 } elsif (ref $type) {
972 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
973 1091
974 } else { 1092 } else {
975 shift @arg; 1093 shift @arg;
976 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
977 } 1095 }
978 } 1096 }
979} 1097}
980 1098
981sub _object_attach { 1099sub _object_attach {
… …
991 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
992 } 1110 }
993 1111
994 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
995 } else { 1113 } else {
996 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
997 } 1115 }
998 1116
999 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
1000} 1118}
1001 1119
… …
1060 1178
1061 for (@$callbacks) { 1179 for (@$callbacks) {
1062 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1063 1181
1064 if ($@) { 1182 if ($@) {
1065 warn "$@";
1066 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1067 override; 1184 override;
1068 } 1185 }
1069 1186
1070 return 1 if $override; 1187 return 1 if $override;
1071 } 1188 }
… …
1150 for (@$attach) { 1267 for (@$attach) {
1151 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1152 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1153 } 1270 }
1154 } else { 1271 } else {
1155 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1156 } 1273 }
1157 } 1274 }
1158} 1275}
1159 1276
1160cf::attachable->attach ( 1277cf::attachable->attach (
… …
1187 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1188 1305
1189 sync_job { 1306 sync_job {
1190 if (length $$rdata) { 1307 if (length $$rdata) {
1191 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1192 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1193 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1194 1312
1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1196 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1198 if ($cf::USE_FSYNC) { 1316 if ($cf::USE_FSYNC) {
… …
1220 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1221 1339
1222 $filename =~ s%/[^/]+$%%; 1340 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC; 1341 aio_pathsync $filename if $cf::USE_FSYNC;
1224 } else { 1342 } else {
1225 warn "unable to save objects: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1226 } 1344 }
1227 } else { 1345 } else {
1228 aio_unlink $filename; 1346 aio_unlink $filename;
1229 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1230 } 1348 }
… …
1254 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1255 $av = $st->{objs}; 1373 $av = $st->{objs};
1256 } 1374 }
1257 1375
1258 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1259 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1260 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1261 1380
1262 ($data, $av) 1381 ($data, $av)
1263} 1382}
1264 1383
1265=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
… …
1357 1476
1358 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1359 if $reply; 1478 if $reply;
1360 1479
1361 } else { 1480 } else {
1362 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1363 } 1482 }
1364 1483
1365 cf::override; 1484 cf::override;
1366 }, 1485 },
1367); 1486);
… …
1378 1497
1379 $grp 1498 $grp
1380} 1499}
1381 1500
1382sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1383 cf::sync_job { 1504 cf::sync_job {
1384 my %todo; 1505 my %todo;
1385 1506
1386 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1387 next unless -r $path; 1508 next unless -r $path;
… …
1405 1526
1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1408 1529
1409 $ext{source} = 1530 $ext{source} =
1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1411 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1412 . $source 1533 . $source
1413 . "\n};\n1"; 1534 . "\n};\n1";
1414 1535
1415 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
… …
1427 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1428 next ext 1549 next ext
1429 unless exists $done{$_}; 1550 unless exists $done{$_};
1430 } 1551 }
1431 1552
1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1433 1554
1434 my $active = eval $v->{source}; 1555 my $active = eval $v->{source};
1435 1556
1436 if (length $@) { 1557 if (length $@) {
1437 warn "$v->{path}: $@\n"; 1558 error "$v->{path}: $@\n";
1438 1559
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1440 if exists $v->{meta}{mandatory}; 1561 if exists $v->{meta}{mandatory};
1441 1562
1442 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1563 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1444 } else { 1565 } else {
1445 $done{$k} = delete $todo{$k}; 1566 $done{$k} = delete $todo{$k};
1446 push @EXTS, $v->{pkg}; 1567 push @EXTS, $v->{pkg};
1447 $progress = 1; 1568 $progress = 1;
1448 1569
1449 warn "$v->{base}: extension inactive.\n" 1570 info "$v->{base}: extension inactive.\n"
1450 unless $active; 1571 unless $active;
1451 } 1572 }
1452 } 1573 }
1453 1574
1454 unless ($progress) { 1575 unless ($progress) {
… …
1456 1577
1457 while (my ($k, $v) = each %todo) { 1578 while (my ($k, $v) = each %todo) {
1458 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1459 if exists $v->{meta}{mandatory}; 1580 if exists $v->{meta}{mandatory};
1460 } 1581 }
1582
1583 last;
1461 } 1584 }
1462 } 1585 }
1463 }; 1586 };
1464} 1587}
1465 1588
… …
1623 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1624 1747
1625 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1626 $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
1627 1750
1628 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1629 $pl->deactivate; 1752 $pl->deactivate;
1753
1630 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;
1631 $pl->ob->check_score;
1632 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1633 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1634 1759
1635 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1636 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1637 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
… …
1691 \@logins 1816 \@logins
1692} 1817}
1693 1818
1694=item $player->maps 1819=item $player->maps
1695 1820
1821=item cf::player::maps $login
1822
1696Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1697player. May block. 1824player. May block.
1698 1825
1699=cut 1826=cut
1700 1827
… …
1762=cut 1889=cut
1763 1890
1764sub find_by_path($) { 1891sub find_by_path($) {
1765 my ($path) = @_; 1892 my ($path) = @_;
1766 1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1895
1767 my ($match, $specificity); 1896 my ($match, $specificity);
1768 1897
1769 for my $region (list) { 1898 for my $region (list) {
1770 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1771 ($match, $specificity) = ($region, $region->specificity) 1900 ($match, $specificity) = ($region, $region->specificity)
… …
1799sub generate_random_map { 1928sub generate_random_map {
1800 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1801 1930
1802 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
1803 1932
1804 # mit "rum" bekleckern, nicht
1805 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1806 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1807 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1808 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1809 $rmp->{exit_on_final_map},
1810 $rmp->{xsize}, $rmp->{ysize},
1811 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1812 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1813 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1814 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1815 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1816 (cf::region::find $rmp->{region}), $rmp->{custom}
1817 )
1818} 1934}
1819 1935
1820=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1821 1937
1822Register 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
… …
1827 1943
1828sub register { 1944sub register {
1829 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1830 my $pkg = caller; 1946 my $pkg = caller;
1831 1947
1832 no strict;
1833 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1834 1949
1835 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1836} 1951}
1837 1952
1838# also paths starting with '/' 1953# also paths starting with '/'
1839$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1840 1955
1841sub thawer_merge { 1956sub thawer_merge {
1842 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1843 1958
1844 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
… …
1849} 1964}
1850 1965
1851sub normalise { 1966sub normalise {
1852 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1853 1968
1854 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1855 1970
1856 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1857 1972
1858 # map plan: 1973 # map plan:
1859 # 1974 #
… …
1874 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1875 $path = "$base/$path"; 1990 $path = "$base/$path";
1876 } 1991 }
1877 1992
1878 for ($path) { 1993 for ($path) {
1879 redo if s{//}{/};
1880 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1881 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1882 } 1996 }
1883 1997
1884 $path 1998 $path
… …
1898 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1899 return $self; 2013 return $self;
1900 } 2014 }
1901 } 2015 }
1902 2016
1903 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1904 () 2018 ()
1905} 2019}
1906 2020
2021# may re-bless or do other evil things
1907sub init { 2022sub init {
1908 my ($self) = @_; 2023 my ($self) = @_;
1909 2024
1910 $self 2025 $self
1911} 2026}
… …
1976 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1977 2092
1978 1 2093 1
1979} 2094}
1980 2095
2096# used to laod the header of an original map
1981sub load_header_orig { 2097sub load_header_orig {
1982 my ($self) = @_; 2098 my ($self) = @_;
1983 2099
1984 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1985} 2101}
1986 2102
2103# used to laod the header of an instantiated map
1987sub load_header_temp { 2104sub load_header_temp {
1988 my ($self) = @_; 2105 my ($self) = @_;
1989 2106
1990 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1991} 2108}
1992 2109
2110# called after loading the header from an instantiated map
1993sub prepare_temp { 2111sub prepare_temp {
1994 my ($self) = @_; 2112 my ($self) = @_;
1995 2113
1996 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1997 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1998 # safety 2116 # safety
1999 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
2000 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
2001} 2119}
2002 2120
2121# called after loading the header from an original map
2003sub prepare_orig { 2122sub prepare_orig {
2004 my ($self) = @_; 2123 my ($self) = @_;
2005 2124
2006 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
2007 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
… …
2031 2150
2032sub find; 2151sub find;
2033sub find { 2152sub find {
2034 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
2035 2154
2155 cf::cede_to_tick;
2156
2036 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
2037 2158
2038 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2039 my $guard2 = cf::lock_acquire "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
2040 2161
2041 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
… …
2072 2193
2073 { 2194 {
2074 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2075 2196
2076 return unless $self->valid; 2197 return unless $self->valid;
2077 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2078
2079 $self->in_memory (cf::MAP_LOADING);
2080 2199
2081 $self->alloc; 2200 $self->alloc;
2082 2201
2083 $self->pre_load; 2202 $self->pre_load;
2084 cf::cede_to_tick; 2203 cf::cede_to_tick;
2085 2204
2205 if (exists $self->{load_path}) {
2086 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block; 2207 $f->skip_block;
2088 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2089 or return; 2209 or return;
2090 2210
2091 $self->post_load_original 2211 $self->post_load_original
2092 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2093 2213
2094 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2095 utf8::encode $uniq; 2215 utf8::encode $uniq;
2096 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2097 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2098 $self->clear_unique_items; 2218 $self->clear_unique_items;
2099 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2100 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2101 } 2222 }
2102 } 2223 }
2103 }
2104 2224
2105 $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);
2106 2232
2107 cf::cede_to_tick; 2233 cf::cede_to_tick;
2108 # now do the right thing for maps 2234 # now do the right thing for maps
2109 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2110 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
… …
2114 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2115 $self->decay_objects; 2241 $self->decay_objects;
2116 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2117 $self->update_buttons; 2243 $self->update_buttons;
2118 cf::cede_to_tick; 2244 cf::cede_to_tick;
2119 $self->activate; 2245 #$self->activate; # no longer activate maps automatically
2120 } 2246 }
2121 2247
2122 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2123 $self->last_access ($cf::RUNTIME); 2249 $self->last_access ($cf::RUNTIME);
2124
2125 $self->in_memory (cf::MAP_ACTIVE);
2126 } 2250 }
2127 2251
2128 $self->post_load; 2252 $self->post_load;
2253
2254 1
2129} 2255}
2130 2256
2131# customize the map for a given player, i.e. 2257# customize the map for a given player, i.e.
2132# return the _real_ map. used by e.g. per-player 2258# return the _real_ map. used by e.g. per-player
2133# maps to change the path to ~playername/mappath 2259# maps to change the path to ~playername/mappath
… …
2154 or next; 2280 or next;
2155 $neigh = find $neigh, $map 2281 $neigh = find $neigh, $map
2156 or next; 2282 or next;
2157 $neigh->load; 2283 $neigh->load;
2158 2284
2285 # now find the diagonal neighbours
2159 push @neigh, 2286 push @neigh,
2160 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2287 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2161 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2288 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2162 } 2289 }
2163 2290
… …
2170} 2297}
2171 2298
2172sub find_sync { 2299sub find_sync {
2173 my ($path, $origin) = @_; 2300 my ($path, $origin) = @_;
2174 2301
2175 cf::sync_job { find $path, $origin } 2302 # it's a bug to call this from the main context
2303 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2304 if $Coro::current == $Coro::main;
2305
2306 find $path, $origin
2176} 2307}
2177 2308
2178sub do_load_sync { 2309sub do_load_sync {
2179 my ($map) = @_; 2310 my ($map) = @_;
2180 2311
2312 # it's a bug to call this from the main context
2181 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2313 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2182 if $Coro::current == $Coro::main; 2314 if $Coro::current == $Coro::main;
2183 2315
2184 cf::sync_job { $map->load }; 2316 $map->load;
2185} 2317}
2186 2318
2187our %MAP_PREFETCH; 2319our %MAP_PREFETCH;
2188our $MAP_PREFETCHER = undef; 2320our $MAP_PREFETCHER = undef;
2189 2321
2190sub find_async { 2322sub find_async {
2191 my ($path, $origin, $load) = @_; 2323 my ($path, $origin, $load) = @_;
2192 2324
2193 $path = normalise $path, $origin && $origin->{path}; 2325 $path = normalise $path, $origin;
2194 2326
2195 if (my $map = $cf::MAP{$path}) { 2327 if (my $map = $cf::MAP{$path}) {
2196 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2328 return $map if !$load || $map->linkable;
2197 } 2329 }
2198 2330
2199 $MAP_PREFETCH{$path} |= $load; 2331 $MAP_PREFETCH{$path} |= $load;
2200 2332
2201 $MAP_PREFETCHER ||= cf::async { 2333 $MAP_PREFETCHER ||= cf::async {
… …
2260sub swap_out { 2392sub swap_out {
2261 my ($self) = @_; 2393 my ($self) = @_;
2262 2394
2263 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2395 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264 2396
2265 return if $self->in_memory != cf::MAP_ACTIVE; 2397 return if !$self->linkable;
2266 return if $self->{deny_save}; 2398 return if $self->{deny_save};
2267 return if $self->players; 2399 return if $self->players;
2268 2400
2269 # first deactivate the map and "unlink" it from the core 2401 # first deactivate the map and "unlink" it from the core
2270 $self->deactivate; 2402 $self->deactivate;
2271 $_->clear_links_to ($self) for values %cf::MAP; 2403 $_->clear_links_to ($self) for values %cf::MAP;
2272 $self->in_memory (cf::MAP_SWAPPED); 2404 $self->state (cf::MAP_SWAPPED);
2273 2405
2274 # then atomically save 2406 # then atomically save
2275 $self->_save; 2407 $self->_save;
2276 2408
2277 # then free the map 2409 # then free the map
… …
2301 2433
2302 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2434 my $lock = cf::lock_acquire "map_data:$self->{path}";
2303 2435
2304 return if $self->players; 2436 return if $self->players;
2305 2437
2306 warn "resetting map ", $self->path, "\n"; 2438 cf::trace "resetting map ", $self->path, "\n";
2307 2439
2308 $self->in_memory (cf::MAP_SWAPPED); 2440 $self->state (cf::MAP_SWAPPED);
2309 2441
2310 # need to save uniques path 2442 # need to save uniques path
2311 unless ($self->{deny_save}) { 2443 unless ($self->{deny_save}) {
2312 my $uniq = $self->uniq_path; utf8::encode $uniq; 2444 my $uniq = $self->uniq_path; utf8::encode $uniq;
2313 2445
… …
2335 2467
2336 delete $cf::MAP{$self->path}; 2468 delete $cf::MAP{$self->path};
2337 2469
2338 $self->unlink_save; 2470 $self->unlink_save;
2339 2471
2340 bless $self, "cf::map"; 2472 bless $self, "cf::map::wrap";
2341 delete $self->{deny_reset}; 2473 delete $self->{deny_reset};
2342 $self->{deny_save} = 1; 2474 $self->{deny_save} = 1;
2343 $self->reset_timeout (1); 2475 $self->reset_timeout (1);
2344 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2476 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2345 2477
… …
2575 2707
2576Freezes the player and moves him/her to a special map (C<{link}>). 2708Freezes the player and moves him/her to a special map (C<{link}>).
2577 2709
2578The player should be reasonably safe there for short amounts of time (e.g. 2710The player should be reasonably safe there for short amounts of time (e.g.
2579for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2711for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2580though, as the palyer cannot control the character while it is on the link 2712though, as the player cannot control the character while it is on the link
2581map. 2713map.
2582 2714
2583Will never block. 2715Will never block.
2584 2716
2585=item $player_object->leave_link ($map, $x, $y) 2717=item $player_object->leave_link ($map, $x, $y)
… …
2606sub cf::object::player::enter_link { 2738sub cf::object::player::enter_link {
2607 my ($self) = @_; 2739 my ($self) = @_;
2608 2740
2609 $self->deactivate_recursive; 2741 $self->deactivate_recursive;
2610 2742
2743 ++$self->{_link_recursion};
2744
2611 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2745 return if UNIVERSAL::isa $self->map, "ext::map_link";
2612 2746
2613 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2747 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2614 if $self->map && $self->map->{path} ne "{link}"; 2748 if $self->map && $self->map->{path} ne "{link}";
2615 2749
… …
2646 $map->load_neighbours; 2780 $map->load_neighbours;
2647 2781
2648 return unless $self->contr->active; 2782 return unless $self->contr->active;
2649 2783
2650 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2784 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2651 $self->enter_map ($map, $x, $y); 2785 if ($self->enter_map ($map, $x, $y)) {
2652 2786 # entering was successful
2787 delete $self->{_link_recursion};
2653 # only activate afterwards, to support waiting in hooks 2788 # only activate afterwards, to support waiting in hooks
2654 $self->activate_recursive; 2789 $self->activate_recursive;
2655} 2790 }
2656 2791
2792}
2793
2657=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2794=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2658 2795
2659Moves the player to the given map-path and coordinates by first freezing 2796Moves the player to the given map-path and coordinates by first freezing
2660her, loading and preparing them map, calling the provided $check callback 2797her, loading and preparing them map, calling the provided $check callback
2661that has to return the map if sucecssful, and then unfreezes the player on 2798that has to return the map if sucecssful, and then unfreezes the player on
2662the new (success) or old (failed) map position. In either case, $done will 2799the new (success) or old (failed) map position. In either case, $done will
… …
2669 2806
2670our $GOTOGEN; 2807our $GOTOGEN;
2671 2808
2672sub cf::object::player::goto { 2809sub cf::object::player::goto {
2673 my ($self, $path, $x, $y, $check, $done) = @_; 2810 my ($self, $path, $x, $y, $check, $done) = @_;
2811
2812 if ($self->{_link_recursion} >= $MAX_LINKS) {
2813 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2814 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2815 ($path, $x, $y) = @$EMERGENCY_POSITION;
2816 }
2674 2817
2675 # do generation counting so two concurrent goto's will be executed in-order 2818 # do generation counting so two concurrent goto's will be executed in-order
2676 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2819 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2677 2820
2678 $self->enter_link; 2821 $self->enter_link;
… …
2698 ($path, $x, $y) = (undef, undef, undef); 2841 ($path, $x, $y) = (undef, undef, undef);
2699 } 2842 }
2700 } 2843 }
2701 2844
2702 my $map = eval { 2845 my $map = eval {
2703 my $map = defined $path ? cf::map::find $path : undef; 2846 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2704 2847
2705 if ($map) { 2848 if ($map) {
2706 $map = $map->customise_for ($self); 2849 $map = $map->customise_for ($self);
2707 $map = $check->($map) if $check && $map; 2850 $map = $check->($map, $x, $y, $self) if $check && $map;
2708 } else { 2851 } else {
2709 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2852 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2710 } 2853 }
2711 2854
2712 $map 2855 $map
… …
2720 if ($gen == $self->{_goto_generation}) { 2863 if ($gen == $self->{_goto_generation}) {
2721 delete $self->{_goto_generation}; 2864 delete $self->{_goto_generation};
2722 $self->leave_link ($map, $x, $y); 2865 $self->leave_link ($map, $x, $y);
2723 } 2866 }
2724 2867
2725 $done->() if $done; 2868 $done->($self) if $done;
2726 })->prio (1); 2869 })->prio (1);
2727} 2870}
2728 2871
2729=item $player_object->enter_exit ($exit_object) 2872=item $player_object->enter_exit ($exit_object)
2730 2873
… …
2798 $Coro::current->{desc} = "enter_exit"; 2941 $Coro::current->{desc} = "enter_exit";
2799 2942
2800 unless (eval { 2943 unless (eval {
2801 $self->deactivate_recursive; # just to be sure 2944 $self->deactivate_recursive; # just to be sure
2802 2945
2803 # random map handling
2804 {
2805 my $guard = cf::lock_acquire "exit_prepare:$exit";
2806
2807 prepare_random_map $exit
2808 if $exit->slaying eq "/!";
2809 }
2810
2811 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2946 my $map = cf::map::normalise $exit->slaying, $exit->map;
2812 my $x = $exit->stats->hp; 2947 my $x = $exit->stats->hp;
2813 my $y = $exit->stats->sp; 2948 my $y = $exit->stats->sp;
2949
2950 # special map handling
2951 my $slaying = $exit->slaying;
2952
2953 # special map handling
2954 if ($slaying eq "/!") {
2955 my $guard = cf::lock_acquire "exit_prepare:$exit";
2956
2957 prepare_random_map $exit
2958 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2959
2960 $map = $exit->slaying;
2961
2962 } elsif ($slaying eq '!up') {
2963 $map = $exit->map->tile_path (cf::TILE_UP);
2964 $x = $exit->x;
2965 $y = $exit->y;
2966
2967 } elsif ($slaying eq '!down') {
2968 $map = $exit->map->tile_path (cf::TILE_DOWN);
2969 $x = $exit->x;
2970 $y = $exit->y;
2971 }
2814 2972
2815 $self->goto ($map, $x, $y); 2973 $self->goto ($map, $x, $y);
2816 2974
2817 # if exit is damned, update players death & WoR home-position 2975 # if exit is damned, update players death & WoR home-position
2818 $self->contr->savebed ($map, $x, $y) 2976 $self->contr->savebed ($map, $x, $y)
… …
2823 $self->message ("Something went wrong deep within the deliantra server. " 2981 $self->message ("Something went wrong deep within the deliantra server. "
2824 . "I'll try to bring you back to the map you were before. " 2982 . "I'll try to bring you back to the map you were before. "
2825 . "Please report this to the dungeon master!", 2983 . "Please report this to the dungeon master!",
2826 cf::NDI_UNIQUE | cf::NDI_RED); 2984 cf::NDI_UNIQUE | cf::NDI_RED);
2827 2985
2828 warn "ERROR in enter_exit: $@"; 2986 error "ERROR in enter_exit: $@";
2829 $self->leave_link; 2987 $self->leave_link;
2830 } 2988 }
2831 })->prio (1); 2989 })->prio (1);
2832} 2990}
2833 2991
… …
3146 3304
3147 $ns->ext_reply ($reply, @reply) 3305 $ns->ext_reply ($reply, @reply)
3148 if $reply; 3306 if $reply;
3149 3307
3150 } else { 3308 } else {
3151 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3309 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3152 } 3310 }
3153 3311
3154 cf::override; 3312 cf::override;
3155 }, 3313 },
3156); 3314);
… …
3237 decrease split destroy change_exp value msg lore send_msg)], 3395 decrease split destroy change_exp value msg lore send_msg)],
3238 ["cf::object::player" => qw(player)], 3396 ["cf::object::player" => qw(player)],
3239 ["cf::player" => qw(peaceful send_msg)], 3397 ["cf::player" => qw(peaceful send_msg)],
3240 ["cf::map" => qw(trigger)], 3398 ["cf::map" => qw(trigger)],
3241) { 3399) {
3242 no strict 'refs';
3243 my ($pkg, @funs) = @$_; 3400 my ($pkg, @funs) = @$_;
3244 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3401 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3245 for @funs; 3402 for @funs;
3246} 3403}
3247 3404
… …
3286 local @cf::_safe_eval_args = values %vars; 3443 local @cf::_safe_eval_args = values %vars;
3287 @res = wantarray ? eval eval : scalar eval $eval; 3444 @res = wantarray ? eval eval : scalar eval $eval;
3288 } 3445 }
3289 3446
3290 if ($@) { 3447 if ($@) {
3291 warn "$@"; 3448 warn "$@",
3292 warn "while executing safe code '$code'\n"; 3449 "while executing safe code '$code'\n",
3293 warn "with arguments " . (join " ", %vars) . "\n"; 3450 "with arguments " . (join " ", %vars) . "\n";
3294 } 3451 }
3295 3452
3296 wantarray ? @res : $res[0] 3453 wantarray ? @res : $res[0]
3297} 3454}
3298 3455
… …
3332 # for this (global event?) 3489 # for this (global event?)
3333 %ext::player_env::MUSIC_FACE_CACHE = (); 3490 %ext::player_env::MUSIC_FACE_CACHE = ();
3334 3491
3335 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3492 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3336 3493
3337 warn "loading facedata from $path\n"; 3494 trace "loading facedata from $path\n";
3338 3495
3339 my $facedata; 3496 my $facedata = decode_storable load_file $path;
3340 0 < aio_load $path, $facedata
3341 or die "$path: $!";
3342
3343 $facedata = Coro::Storable::thaw $facedata;
3344 3497
3345 $facedata->{version} == 2 3498 $facedata->{version} == 2
3346 or cf::cleanup "$path: version mismatch, cannot proceed."; 3499 or cf::cleanup "$path: version mismatch, cannot proceed.";
3347 3500
3348 # patch in the exptable 3501 # patch in the exptable
… …
3362 3515
3363 cf::face::set_visibility $idx, $info->{visibility}; 3516 cf::face::set_visibility $idx, $info->{visibility};
3364 cf::face::set_magicmap $idx, $info->{magicmap}; 3517 cf::face::set_magicmap $idx, $info->{magicmap};
3365 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3518 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3366 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3519 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3520 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3367 3521
3368 cf::cede_to_tick; 3522 cf::cede_to_tick;
3369 } 3523 }
3370 3524
3371 while (my ($face, $info) = each %$faces) { 3525 while (my ($face, $info) = each %$faces) {
… …
3376 3530
3377 if (my $smooth = cf::face::find $info->{smooth}) { 3531 if (my $smooth = cf::face::find $info->{smooth}) {
3378 cf::face::set_smooth $idx, $smooth; 3532 cf::face::set_smooth $idx, $smooth;
3379 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3533 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3380 } else { 3534 } else {
3381 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3535 error "smooth face '$info->{smooth}' not found for face '$face'";
3382 } 3536 }
3383 3537
3384 cf::cede_to_tick; 3538 cf::cede_to_tick;
3385 } 3539 }
3386 } 3540 }
… …
3404 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3558 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3405 3559
3406 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3560 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3407 cf::face::set_type $idx, $info->{type}; 3561 cf::face::set_type $idx, $info->{type};
3408 } else { 3562 } else {
3409 $RESOURCE{$name} = $info; 3563 $RESOURCE{$name} = $info; # unused
3410 } 3564 }
3411 3565
3412 cf::cede_to_tick; 3566 cf::cede_to_tick;
3413 } 3567 }
3414 } 3568 }
3415 3569
3416 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3570 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3417 3571
3418 1 3572 1
3419} 3573}
3420
3421cf::global->attach (on_resource_update => sub {
3422 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3423 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3424
3425 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3426 my $sound = $soundconf->{compat}[$_]
3427 or next;
3428
3429 my $face = cf::face::find "sound/$sound->[1]";
3430 cf::sound::set $sound->[0] => $face;
3431 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3432 }
3433
3434 while (my ($k, $v) = each %{$soundconf->{event}}) {
3435 my $face = cf::face::find "sound/$v";
3436 cf::sound::set $k => $face;
3437 }
3438 }
3439});
3440 3574
3441register_exticmd fx_want => sub { 3575register_exticmd fx_want => sub {
3442 my ($ns, $want) = @_; 3576 my ($ns, $want) = @_;
3443 3577
3444 while (my ($k, $v) = each %$want) { 3578 while (my ($k, $v) = each %$want) {
… …
3483sub reload_treasures { 3617sub reload_treasures {
3484 load_resource_file "$DATADIR/treasures" 3618 load_resource_file "$DATADIR/treasures"
3485 or die "unable to load treasurelists\n"; 3619 or die "unable to load treasurelists\n";
3486} 3620}
3487 3621
3622sub reload_sound {
3623 trace "loading sound config from $DATADIR/sound\n";
3624
3625 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3626
3627 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3628 my $sound = $soundconf->{compat}[$_]
3629 or next;
3630
3631 my $face = cf::face::find "sound/$sound->[1]";
3632 cf::sound::set $sound->[0] => $face;
3633 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3634 }
3635
3636 while (my ($k, $v) = each %{$soundconf->{event}}) {
3637 my $face = cf::face::find "sound/$v";
3638 cf::sound::set $k => $face;
3639 }
3640}
3641
3488sub reload_resources { 3642sub reload_resources {
3489 warn "reloading resource files...\n"; 3643 trace "reloading resource files...\n";
3490 3644
3645 reload_exp_table;
3646 reload_materials;
3491 reload_facedata; 3647 reload_facedata;
3648 reload_sound;
3492 reload_archetypes; 3649 reload_archetypes;
3493 reload_regions; 3650 reload_regions;
3494 reload_treasures; 3651 reload_treasures;
3495 3652
3496 warn "finished reloading resource files\n"; 3653 trace "finished reloading resource files\n";
3497} 3654}
3498 3655
3499sub reload_config { 3656sub reload_config {
3500 warn "reloading config file...\n"; 3657 trace "reloading config file...\n";
3501 3658
3502 open my $fh, "<:utf8", "$CONFDIR/config" 3659 my $config = load_file "$CONFDIR/config";
3503 or return; 3660 utf8::decode $config;
3661 *CFG = decode_yaml $config;
3504 3662
3505 local $/;
3506 *CFG = YAML::XS::Load scalar <$fh>;
3507
3508 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3663 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3509 3664
3510 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3665 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3511 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3666 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3512 3667
3513 if (exists $CFG{mlockall}) { 3668 if (exists $CFG{mlockall}) {
… …
3515 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3670 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3516 and die "WARNING: m(un)lockall failed: $!\n"; 3671 and die "WARNING: m(un)lockall failed: $!\n";
3517 }; 3672 };
3518 warn $@ if $@; 3673 warn $@ if $@;
3519 } 3674 }
3520
3521 warn "finished reloading resource files\n";
3522} 3675}
3523 3676
3524sub pidfile() { 3677sub pidfile() {
3525 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3678 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3526 or die "$PIDFILE: $!"; 3679 or die "$PIDFILE: $!";
… …
3539 seek $fh, 0, 0; 3692 seek $fh, 0, 0;
3540 print $fh $$; 3693 print $fh $$;
3541} 3694}
3542 3695
3543sub main_loop { 3696sub main_loop {
3544 warn "EV::loop starting\n"; 3697 trace "EV::loop starting\n";
3545 if (1) { 3698 if (1) {
3546 EV::loop; 3699 EV::loop;
3547 } 3700 }
3548 warn "EV::loop returned\n"; 3701 trace "EV::loop returned\n";
3549 goto &main_loop unless $REALLY_UNLOOP; 3702 goto &main_loop unless $REALLY_UNLOOP;
3550} 3703}
3551 3704
3552sub main { 3705sub main {
3553 cf::init_globals; # initialise logging 3706 cf::init_globals; # initialise logging
3554 3707
3555 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3708 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3556 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3709 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3557 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3710 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3558 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3711 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3559 3712
3560 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3713 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3561 3714
… …
3569 }; 3722 };
3570 3723
3571 evthread_start IO::AIO::poll_fileno; 3724 evthread_start IO::AIO::poll_fileno;
3572 3725
3573 cf::sync_job { 3726 cf::sync_job {
3574 cf::init_experience; 3727 cf::incloader::init ();
3728
3575 cf::init_anim; 3729 cf::init_anim;
3576 cf::init_attackmess; 3730 cf::init_attackmess;
3577 cf::init_dynamic; 3731 cf::init_dynamic;
3578 3732
3579 cf::load_settings; 3733 cf::load_settings;
3580 cf::load_materials;
3581 3734
3582 reload_resources; 3735 reload_resources;
3583 reload_config; 3736 reload_config;
3584 db_init; 3737 db_init;
3585 3738
… …
3597 3750
3598 # no (long-running) fork's whatsoever before this point(!) 3751 # no (long-running) fork's whatsoever before this point(!)
3599 use POSIX (); 3752 use POSIX ();
3600 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3753 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3601 3754
3602 (pop @POST_INIT)->(0) while @POST_INIT; 3755 cf::_post_init 0;
3603 }; 3756 };
3604 3757
3605 cf::object::thawer::errors_are_fatal 0; 3758 cf::object::thawer::errors_are_fatal 0;
3606 warn "parse errors in files are no longer fatal from this point on.\n"; 3759 info "parse errors in files are no longer fatal from this point on.\n";
3607 3760
3761 my $free_main; $free_main = EV::idle sub {
3762 undef $free_main;
3763 undef &main; # free gobs of memory :)
3764 };
3765
3608 main_loop; 3766 goto &main_loop;
3609} 3767}
3610 3768
3611############################################################################# 3769#############################################################################
3612# initialisation and cleanup 3770# initialisation and cleanup
3613 3771
… …
3652 or return; 3810 or return;
3653 3811
3654 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3812 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3655 and return; 3813 and return;
3656 3814
3657 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3815 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3658 3816
3659 1 3817 1
3660} 3818}
3661 3819
3662our $uuid_lock; 3820our $uuid_lock;
… …
3674 or return; 3832 or return;
3675 3833
3676 my $value = uuid_seq uuid_cur; 3834 my $value = uuid_seq uuid_cur;
3677 3835
3678 unless ($value) { 3836 unless ($value) {
3679 warn "cowardly refusing to write zero uuid value!\n"; 3837 info "cowardly refusing to write zero uuid value!\n";
3680 return; 3838 return;
3681 } 3839 }
3682 3840
3683 my $value = uuid_str $value + $uuid_skip; 3841 my $value = uuid_str $value + $uuid_skip;
3684 $uuid_skip = 0; 3842 $uuid_skip = 0;
… …
3694 or return; 3852 or return;
3695 3853
3696 aio_rename "$uuid~", $uuid 3854 aio_rename "$uuid~", $uuid
3697 and return; 3855 and return;
3698 3856
3699 warn "uuid file written ($value).\n"; 3857 trace "uuid file written ($value).\n";
3700 3858
3701 1 3859 1
3702 3860
3703} 3861}
3704 3862
… …
3710} 3868}
3711 3869
3712sub emergency_save() { 3870sub emergency_save() {
3713 my $freeze_guard = cf::freeze_mainloop; 3871 my $freeze_guard = cf::freeze_mainloop;
3714 3872
3715 warn "emergency_perl_save: enter\n"; 3873 info "emergency_perl_save: enter\n";
3874
3875 # this is a trade-off: we want to be very quick here, so
3876 # save all maps without fsync, and later call a global sync
3877 # (which in turn might be very very slow)
3878 local $USE_FSYNC = 0;
3716 3879
3717 cf::sync_job { 3880 cf::sync_job {
3718 # this is a trade-off: we want to be very quick here, so 3881 cf::write_runtime_sync; # external watchdog should not bark
3719 # save all maps without fsync, and later call a global sync
3720 # (which in turn might be very very slow)
3721 local $USE_FSYNC = 0;
3722 3882
3723 # use a peculiar iteration method to avoid tripping on perl 3883 # use a peculiar iteration method to avoid tripping on perl
3724 # refcount bugs in for. also avoids problems with players 3884 # refcount bugs in for. also avoids problems with players
3725 # and maps saved/destroyed asynchronously. 3885 # and maps saved/destroyed asynchronously.
3726 warn "emergency_perl_save: begin player save\n"; 3886 info "emergency_perl_save: begin player save\n";
3727 for my $login (keys %cf::PLAYER) { 3887 for my $login (keys %cf::PLAYER) {
3728 my $pl = $cf::PLAYER{$login} or next; 3888 my $pl = $cf::PLAYER{$login} or next;
3729 $pl->valid or next; 3889 $pl->valid or next;
3730 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3890 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3731 $pl->save; 3891 $pl->save;
3732 } 3892 }
3733 warn "emergency_perl_save: end player save\n"; 3893 info "emergency_perl_save: end player save\n";
3734 3894
3895 cf::write_runtime_sync; # external watchdog should not bark
3896
3735 warn "emergency_perl_save: begin map save\n"; 3897 info "emergency_perl_save: begin map save\n";
3736 for my $path (keys %cf::MAP) { 3898 for my $path (keys %cf::MAP) {
3737 my $map = $cf::MAP{$path} or next; 3899 my $map = $cf::MAP{$path} or next;
3738 $map->valid or next; 3900 $map->valid or next;
3739 $map->save; 3901 $map->save;
3740 } 3902 }
3741 warn "emergency_perl_save: end map save\n"; 3903 info "emergency_perl_save: end map save\n";
3742 3904
3905 cf::write_runtime_sync; # external watchdog should not bark
3906
3743 warn "emergency_perl_save: begin database checkpoint\n"; 3907 info "emergency_perl_save: begin database checkpoint\n";
3744 BDB::db_env_txn_checkpoint $DB_ENV; 3908 BDB::db_env_txn_checkpoint $DB_ENV;
3745 warn "emergency_perl_save: end database checkpoint\n"; 3909 info "emergency_perl_save: end database checkpoint\n";
3746 3910
3747 warn "emergency_perl_save: begin write uuid\n"; 3911 info "emergency_perl_save: begin write uuid\n";
3748 write_uuid_sync 1; 3912 write_uuid_sync 1;
3749 warn "emergency_perl_save: end write uuid\n"; 3913 info "emergency_perl_save: end write uuid\n";
3914
3915 cf::write_runtime_sync; # external watchdog should not bark
3916
3917 trace "emergency_perl_save: syncing database to disk";
3918 BDB::db_env_txn_checkpoint $DB_ENV;
3919
3920 info "emergency_perl_save: starting sync\n";
3921 IO::AIO::aio_sync sub {
3922 info "emergency_perl_save: finished sync\n";
3923 };
3924
3925 cf::write_runtime_sync; # external watchdog should not bark
3926
3927 trace "emergency_perl_save: flushing outstanding aio requests";
3928 while (IO::AIO::nreqs || BDB::nreqs) {
3929 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3930 }
3931
3932 cf::write_runtime_sync; # external watchdog should not bark
3750 }; 3933 };
3751 3934
3752 warn "emergency_perl_save: starting sync()\n";
3753 IO::AIO::aio_sync sub {
3754 warn "emergency_perl_save: finished sync()\n";
3755 };
3756
3757 warn "emergency_perl_save: leave\n"; 3935 info "emergency_perl_save: leave\n";
3758} 3936}
3759 3937
3760sub post_cleanup { 3938sub post_cleanup {
3761 my ($make_core) = @_; 3939 my ($make_core) = @_;
3762 3940
3941 IO::AIO::flush;
3942
3763 warn Carp::longmess "post_cleanup backtrace" 3943 error Carp::longmess "post_cleanup backtrace"
3764 if $make_core; 3944 if $make_core;
3765 3945
3766 my $fh = pidfile; 3946 my $fh = pidfile;
3767 unlink $PIDFILE if <$fh> == $$; 3947 unlink $PIDFILE if <$fh> == $$;
3768} 3948}
… …
3792 } 3972 }
3793} 3973}
3794 3974
3795sub do_reload_perl() { 3975sub do_reload_perl() {
3796 # can/must only be called in main 3976 # can/must only be called in main
3797 if ($Coro::current != $Coro::main) { 3977 unless (in_main) {
3798 warn "can only reload from main coroutine"; 3978 error "can only reload from main coroutine";
3799 return; 3979 return;
3800 } 3980 }
3801 3981
3802 return if $RELOAD++; 3982 return if $RELOAD++;
3803 3983
3804 my $t1 = AE::time; 3984 my $t1 = AE::time;
3805 3985
3806 while ($RELOAD) { 3986 while ($RELOAD) {
3807 warn "reloading..."; 3987 cf::get_slot 0.1, -1, "reload_perl";
3988 info "perl_reload: reloading...";
3808 3989
3809 warn "entering sync_job"; 3990 trace "perl_reload: entering sync_job";
3810 3991
3811 cf::sync_job { 3992 cf::sync_job {
3812 cf::write_runtime_sync; # external watchdog should not bark
3813 cf::emergency_save; 3993 #cf::emergency_save;
3814 cf::write_runtime_sync; # external watchdog should not bark
3815 3994
3816 warn "syncing database to disk";
3817 BDB::db_env_txn_checkpoint $DB_ENV;
3818
3819 # if anything goes wrong in here, we should simply crash as we already saved
3820
3821 warn "flushing outstanding aio requests";
3822 while (IO::AIO::nreqs || BDB::nreqs) {
3823 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3824 }
3825
3826 warn "cancelling all extension coros"; 3995 trace "perl_reload: cancelling all extension coros";
3827 $_->cancel for values %EXT_CORO; 3996 $_->cancel for values %EXT_CORO;
3828 %EXT_CORO = (); 3997 %EXT_CORO = ();
3829 3998
3830 warn "removing commands"; 3999 trace "perl_reload: removing commands";
3831 %COMMAND = (); 4000 %COMMAND = ();
3832 4001
3833 warn "removing ext/exti commands"; 4002 trace "perl_reload: removing ext/exti commands";
3834 %EXTCMD = (); 4003 %EXTCMD = ();
3835 %EXTICMD = (); 4004 %EXTICMD = ();
3836 4005
3837 warn "unloading/nuking all extensions"; 4006 trace "perl_reload: unloading/nuking all extensions";
3838 for my $pkg (@EXTS) { 4007 for my $pkg (@EXTS) {
3839 warn "... unloading $pkg"; 4008 trace "... unloading $pkg";
3840 4009
3841 if (my $cb = $pkg->can ("unload")) { 4010 if (my $cb = $pkg->can ("unload")) {
3842 eval { 4011 eval {
3843 $cb->($pkg); 4012 $cb->($pkg);
3844 1 4013 1
3845 } or warn "$pkg unloaded, but with errors: $@"; 4014 } or error "$pkg unloaded, but with errors: $@";
3846 } 4015 }
3847 4016
3848 warn "... clearing $pkg"; 4017 trace "... clearing $pkg";
3849 clear_package $pkg; 4018 clear_package $pkg;
3850 } 4019 }
3851 4020
3852 warn "unloading all perl modules loaded from $LIBDIR"; 4021 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3853 while (my ($k, $v) = each %INC) { 4022 while (my ($k, $v) = each %INC) {
3854 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4023 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3855 4024
3856 warn "... unloading $k"; 4025 trace "... unloading $k";
3857 delete $INC{$k}; 4026 delete $INC{$k};
3858 4027
3859 $k =~ s/\.pm$//; 4028 $k =~ s/\.pm$//;
3860 $k =~ s/\//::/g; 4029 $k =~ s/\//::/g;
3861 4030
… …
3864 } 4033 }
3865 4034
3866 clear_package $k; 4035 clear_package $k;
3867 } 4036 }
3868 4037
3869 warn "getting rid of safe::, as good as possible"; 4038 trace "perl_reload: getting rid of safe::, as good as possible";
3870 clear_package "safe::$_" 4039 clear_package "safe::$_"
3871 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4040 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3872 4041
3873 warn "unloading cf.pm \"a bit\""; 4042 trace "perl_reload: unloading cf.pm \"a bit\"";
3874 delete $INC{"cf.pm"}; 4043 delete $INC{"cf.pm"};
3875 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4044 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3876 4045
3877 # don't, removes xs symbols, too, 4046 # don't, removes xs symbols, too,
3878 # and global variables created in xs 4047 # and global variables created in xs
3879 #clear_package __PACKAGE__; 4048 #clear_package __PACKAGE__;
3880 4049
3881 warn "unload completed, starting to reload now"; 4050 info "perl_reload: unload completed, starting to reload now";
3882 4051
3883 warn "reloading cf.pm"; 4052 trace "perl_reload: reloading cf.pm";
3884 require cf; 4053 require cf;
3885 cf::_connect_to_perl_1; 4054 cf::_connect_to_perl_1;
3886 4055
3887 warn "loading config and database again"; 4056 trace "perl_reload: loading config and database again";
3888 cf::reload_config; 4057 cf::reload_config;
3889 4058
3890 warn "loading extensions"; 4059 trace "perl_reload: loading extensions";
3891 cf::load_extensions; 4060 cf::load_extensions;
3892 4061
3893 if ($REATTACH_ON_RELOAD) { 4062 if ($REATTACH_ON_RELOAD) {
3894 warn "reattaching attachments to objects/players"; 4063 trace "perl_reload: reattaching attachments to objects/players";
3895 _global_reattach; # objects, sockets 4064 _global_reattach; # objects, sockets
3896 warn "reattaching attachments to maps"; 4065 trace "perl_reload: reattaching attachments to maps";
3897 reattach $_ for values %MAP; 4066 reattach $_ for values %MAP;
3898 warn "reattaching attachments to players"; 4067 trace "perl_reload: reattaching attachments to players";
3899 reattach $_ for values %PLAYER; 4068 reattach $_ for values %PLAYER;
3900 } 4069 }
3901 4070
3902 warn "running post_init jobs"; 4071 cf::_post_init 1;
3903 (pop @POST_INIT)->(1) while @POST_INIT;
3904 4072
3905 warn "leaving sync_job"; 4073 trace "perl_reload: leaving sync_job";
3906 4074
3907 1 4075 1
3908 } or do { 4076 } or do {
3909 warn $@; 4077 error $@;
3910 cf::cleanup "error while reloading, exiting."; 4078 cf::cleanup "perl_reload: error, exiting.";
3911 }; 4079 };
3912 4080
3913 warn "reloaded";
3914 --$RELOAD; 4081 --$RELOAD;
3915 } 4082 }
3916 4083
3917 $t1 = AE::time - $t1; 4084 $t1 = AE::time - $t1;
3918 warn "reload completed in ${t1}s\n"; 4085 info "perl_reload: completed in ${t1}s\n";
3919}; 4086};
3920 4087
3921our $RELOAD_WATCHER; # used only during reload 4088our $RELOAD_WATCHER; # used only during reload
3922 4089
3923sub reload_perl() { 4090sub reload_perl() {
… …
3944 reload_perl; 4111 reload_perl;
3945 }; 4112 };
3946 } 4113 }
3947}; 4114};
3948 4115
3949unshift @INC, $LIBDIR; 4116#############################################################################
3950 4117
3951my $bug_warning = 0; 4118my $bug_warning = 0;
3952 4119
3953our @WAIT_FOR_TICK;
3954our @WAIT_FOR_TICK_BEGIN;
3955
3956sub wait_for_tick { 4120sub wait_for_tick() {
3957 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4121 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3958 4122
3959 my $signal = new Coro::Signal; 4123 $WAIT_FOR_TICK->wait;
3960 push @WAIT_FOR_TICK, $signal;
3961 $signal->wait;
3962} 4124}
3963 4125
3964sub wait_for_tick_begin { 4126sub wait_for_tick_begin() {
3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4127 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3966 4128
3967 my $signal = new Coro::Signal; 4129 my $signal = new Coro::Signal;
3968 push @WAIT_FOR_TICK_BEGIN, $signal; 4130 push @WAIT_FOR_TICK_BEGIN, $signal;
3969 $signal->wait; 4131 $signal->wait;
3970} 4132}
… …
3974 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4136 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3975 unless ++$bug_warning > 10; 4137 unless ++$bug_warning > 10;
3976 return; 4138 return;
3977 } 4139 }
3978 4140
3979 cf::server_tick; # one server iteration 4141 cf::one_tick; # one server iteration
3980 4142
3981 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4143 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3982 4144
3983 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4145 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3984 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4146 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3985 Coro::async_pool { 4147 Coro::async_pool {
3986 $Coro::current->{desc} = "runtime saver"; 4148 $Coro::current->{desc} = "runtime saver";
3987 write_runtime_sync 4149 write_runtime_sync
3988 or warn "ERROR: unable to write runtime file: $!"; 4150 or error "ERROR: unable to write runtime file: $!";
3989 }; 4151 };
3990 } 4152 }
3991 4153
3992 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4154 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3993 $sig->send; 4155 $sig->send;
3994 } 4156 }
3995 while (my $sig = shift @WAIT_FOR_TICK) { 4157 $WAIT_FOR_TICK->broadcast;
3996 $sig->send;
3997 }
3998 4158
3999 $LOAD = ($NOW - $TICK_START) / $TICK; 4159 $LOAD = ($NOW - $TICK_START) / $TICK;
4000 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4160 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4001 4161
4002 if (0) { 4162 if (0) {
4003 if ($NEXT_TICK) { 4163 if ($NEXT_TICK) {
4004 my $jitter = $TICK_START - $NEXT_TICK; 4164 my $jitter = $TICK_START - $NEXT_TICK;
4005 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4165 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4006 warn "jitter $JITTER\n";#d# 4166 debug "jitter $JITTER\n";#d#
4007 } 4167 }
4008 } 4168 }
4009} 4169}
4010 4170
4011{ 4171{
… …
4056 IO::AIO::min_parallel 8; 4216 IO::AIO::min_parallel 8;
4057 IO::AIO::max_poll_time $TICK * 0.1; 4217 IO::AIO::max_poll_time $TICK * 0.1;
4058 undef $AnyEvent::AIO::WATCHER; 4218 undef $AnyEvent::AIO::WATCHER;
4059} 4219}
4060 4220
4061my $_log_backtrace; 4221our $_log_backtrace;
4222our $_log_backtrace_last;
4062 4223
4063sub _log_backtrace { 4224sub _log_backtrace {
4064 my ($msg, @addr) = @_; 4225 my ($msg, @addr) = @_;
4065 4226
4066 $msg =~ s/\n//; 4227 $msg =~ s/\n$//;
4067 4228
4229 if ($_log_backtrace_last eq $msg) {
4230 LOG llevInfo, "[ABT] $msg\n";
4231 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4068 # limit the # of concurrent backtraces 4232 # limit the # of concurrent backtraces
4069 if ($_log_backtrace < 2) { 4233 } elsif ($_log_backtrace < 2) {
4234 $_log_backtrace_last = $msg;
4070 ++$_log_backtrace; 4235 ++$_log_backtrace;
4071 my $perl_bt = Carp::longmess $msg; 4236 my $perl_bt = Carp::longmess $msg;
4072 async { 4237 async {
4073 $Coro::current->{desc} = "abt $msg"; 4238 $Coro::current->{desc} = "abt $msg";
4074 4239
… …
4094 LOG llevInfo, "[ABT] $_\n" for @bt; 4259 LOG llevInfo, "[ABT] $_\n" for @bt;
4095 --$_log_backtrace; 4260 --$_log_backtrace;
4096 }; 4261 };
4097 } else { 4262 } else {
4098 LOG llevInfo, "[ABT] $msg\n"; 4263 LOG llevInfo, "[ABT] $msg\n";
4099 LOG llevInfo, "[ABT] [suppressed]\n"; 4264 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4100 } 4265 }
4101} 4266}
4102 4267
4103# load additional modules 4268# load additional modules
4104require "cf/$_.pm" for @EXTRA_MODULES; 4269require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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