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.524 by root, Sun Apr 18 07:08:07 2010 UTC vs.
Revision 1.576 by root, Tue Jan 3 02:08:49 2012 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
… …
1346 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1347 1462
1348 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1349 1464
1350 if (ref $msg) { 1465 if (ref $msg) {
1351 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1352 "ARRAY" eq ref $msg
1353 ? @$msg
1354 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1355 1467
1356 my @reply; 1468 my @reply;
1357 1469
1358 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1359 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
… …
1361 1473
1362 $pl->ext_reply ($reply, @reply) 1474 $pl->ext_reply ($reply, @reply)
1363 if $reply; 1475 if $reply;
1364 1476
1365 } else { 1477 } else {
1366 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1478 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367 } 1479 }
1368 1480
1369 cf::override; 1481 cf::override;
1370 }, 1482 },
1371); 1483);
… …
1382 1494
1383 $grp 1495 $grp
1384} 1496}
1385 1497
1386sub load_extensions { 1498sub load_extensions {
1499 info "loading extensions...";
1500
1387 cf::sync_job { 1501 cf::sync_job {
1388 my %todo; 1502 my %todo;
1389 1503
1390 for my $path (<$LIBDIR/*.ext>) { 1504 for my $path (<$LIBDIR/*.ext>) {
1391 next unless -r $path; 1505 next unless -r $path;
… …
1409 1523
1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1524 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1525 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1412 1526
1413 $ext{source} = 1527 $ext{source} =
1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1528 "package $pkg; use common::sense;\n"
1415 . "#line 1 \"$path\"\n{\n" 1529 . "#line 1 \"$path\"\n{\n"
1416 . $source 1530 . $source
1417 . "\n};\n1"; 1531 . "\n};\n1";
1418 1532
1419 $todo{$base} = \%ext; 1533 $todo{$base} = \%ext;
… …
1431 for (split /,\s*/, $v->{meta}{depends}) { 1545 for (split /,\s*/, $v->{meta}{depends}) {
1432 next ext 1546 next ext
1433 unless exists $done{$_}; 1547 unless exists $done{$_};
1434 } 1548 }
1435 1549
1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1550 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437 1551
1438 my $active = eval $v->{source}; 1552 my $active = eval $v->{source};
1439 1553
1440 if (length $@) { 1554 if (length $@) {
1441 warn "$v->{path}: $@\n"; 1555 error "$v->{path}: $@\n";
1442 1556
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1557 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444 if exists $v->{meta}{mandatory}; 1558 if exists $v->{meta}{mandatory};
1445 1559
1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1560 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1448 } else { 1562 } else {
1449 $done{$k} = delete $todo{$k}; 1563 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg}; 1564 push @EXTS, $v->{pkg};
1451 $progress = 1; 1565 $progress = 1;
1452 1566
1453 warn "$v->{base}: extension inactive.\n" 1567 info "$v->{base}: extension inactive.\n"
1454 unless $active; 1568 unless $active;
1455 } 1569 }
1456 } 1570 }
1457 1571
1458 unless ($progress) { 1572 unless ($progress) {
… …
1460 1574
1461 while (my ($k, $v) = each %todo) { 1575 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1576 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory}; 1577 if exists $v->{meta}{mandatory};
1464 } 1578 }
1579
1580 last;
1465 } 1581 }
1466 } 1582 }
1467 }; 1583 };
1468} 1584}
1469 1585
… …
1627 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1628 1744
1629 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1746 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1631 1747
1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1633 $pl->deactivate; 1749 $pl->deactivate;
1750
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1751 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1636 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1637 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1638 1756
1639 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1640 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1641 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
… …
1807sub generate_random_map { 1925sub generate_random_map {
1808 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1809 1927
1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1928 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1811 1929
1812 # mit "rum" bekleckern, nicht
1813 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1817 $rmp->{exit_on_final_map},
1818 $rmp->{xsize}, $rmp->{ysize},
1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1821 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1822 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1823 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1824 (cf::region::find $rmp->{region}), $rmp->{custom}
1825 )
1826} 1931}
1827 1932
1828=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1829 1934
1830Register a handler for the map path matching the given regex at the 1935Register a handler for the map path matching the given regex at the
… …
1835 1940
1836sub register { 1941sub register {
1837 my (undef, $regex, $prio) = @_; 1942 my (undef, $regex, $prio) = @_;
1838 my $pkg = caller; 1943 my $pkg = caller;
1839 1944
1840 no strict;
1841 push @{"$pkg\::ISA"}, __PACKAGE__; 1945 push @{"$pkg\::ISA"}, __PACKAGE__;
1842 1946
1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1947 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1844} 1948}
1845 1949
… …
1857} 1961}
1858 1962
1859sub normalise { 1963sub normalise {
1860 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1861 1965
1862 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1863 1967
1864 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1865 1969
1866 # map plan: 1970 # map plan:
1867 # 1971 #
… …
1882 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1883 $path = "$base/$path"; 1987 $path = "$base/$path";
1884 } 1988 }
1885 1989
1886 for ($path) { 1990 for ($path) {
1887 redo if s{//}{/};
1888 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1889 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1890 } 1993 }
1891 1994
1892 $path 1995 $path
… …
1906 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1907 return $self; 2010 return $self;
1908 } 2011 }
1909 } 2012 }
1910 2013
1911 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1912 () 2015 ()
1913} 2016}
1914 2017
2018# may re-bless or do other evil things
1915sub init { 2019sub init {
1916 my ($self) = @_; 2020 my ($self) = @_;
1917 2021
1918 $self 2022 $self
1919} 2023}
… …
1984 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1985 2089
1986 1 2090 1
1987} 2091}
1988 2092
2093# used to laod the header of an original map
1989sub load_header_orig { 2094sub load_header_orig {
1990 my ($self) = @_; 2095 my ($self) = @_;
1991 2096
1992 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
1993} 2098}
1994 2099
2100# used to laod the header of an instantiated map
1995sub load_header_temp { 2101sub load_header_temp {
1996 my ($self) = @_; 2102 my ($self) = @_;
1997 2103
1998 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
1999} 2105}
2000 2106
2107# called after loading the header from an instantiated map
2001sub prepare_temp { 2108sub prepare_temp {
2002 my ($self) = @_; 2109 my ($self) = @_;
2003 2110
2004 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
2005 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
2006 # safety 2113 # safety
2007 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
2008 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
2009} 2116}
2010 2117
2118# called after loading the header from an original map
2011sub prepare_orig { 2119sub prepare_orig {
2012 my ($self) = @_; 2120 my ($self) = @_;
2013 2121
2014 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
2015 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
… …
2039 2147
2040sub find; 2148sub find;
2041sub find { 2149sub find {
2042 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
2043 2151
2152 cf::cede_to_tick;
2153
2044 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
2045 2155
2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2047 my $guard2 = cf::lock_acquire "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
2048 2158
2049 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
… …
2080 2190
2081 { 2191 {
2082 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
2083 2193
2084 return unless $self->valid; 2194 return unless $self->valid;
2085 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2086
2087 $self->in_memory (cf::MAP_LOADING);
2088 2196
2089 $self->alloc; 2197 $self->alloc;
2090 2198
2091 $self->pre_load; 2199 $self->pre_load;
2092 cf::cede_to_tick; 2200 cf::cede_to_tick;
2093 2201
2202 if (exists $self->{load_path}) {
2094 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2095 $f->skip_block; 2204 $f->skip_block;
2096 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2097 or return; 2206 or return;
2098 2207
2099 $self->post_load_original 2208 $self->post_load_original
2100 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2101 2210
2102 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2103 utf8::encode $uniq; 2212 utf8::encode $uniq;
2104 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2105 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2106 $self->clear_unique_items; 2215 $self->clear_unique_items;
2107 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2108 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2109 } 2219 }
2110 } 2220 }
2111 }
2112 2221
2113 $f->resolve_delayed_derefs; 2222 $f->resolve_delayed_derefs;
2223 } else {
2224 $self->post_load_original
2225 if delete $self->{load_original};
2226 }
2227
2228 $self->state (cf::MAP_INACTIVE);
2114 2229
2115 cf::cede_to_tick; 2230 cf::cede_to_tick;
2116 # now do the right thing for maps 2231 # now do the right thing for maps
2117 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2118 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
… …
2122 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2123 $self->decay_objects; 2238 $self->decay_objects;
2124 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2125 $self->update_buttons; 2240 $self->update_buttons;
2126 cf::cede_to_tick; 2241 cf::cede_to_tick;
2127 $self->activate; 2242 #$self->activate; # no longer activate maps automatically
2128 } 2243 }
2129 2244
2130 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2131 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2132
2133 $self->in_memory (cf::MAP_ACTIVE);
2134 } 2247 }
2135 2248
2136 $self->post_load; 2249 $self->post_load;
2250
2251 1
2137} 2252}
2138 2253
2139# customize the map for a given player, i.e. 2254# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player 2255# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath 2256# maps to change the path to ~playername/mappath
… …
2149# if $self->per_party; 2264# if $self->per_party;
2150 2265
2151 $self 2266 $self
2152} 2267}
2153 2268
2154# find and load all maps in the 3x3 area around a map
2155sub load_neighbours {
2156 my ($map) = @_;
2157
2158 my @neigh; # diagonal neighbours
2159
2160 for (0 .. 3) {
2161 my $neigh = $map->tile_path ($_)
2162 or next;
2163 $neigh = find $neigh, $map
2164 or next;
2165 $neigh->load;
2166
2167 push @neigh,
2168 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2169 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2170 }
2171
2172 for (grep defined $_->[0], @neigh) {
2173 my ($path, $origin) = @$_;
2174 my $neigh = find $path, $origin
2175 or next;
2176 $neigh->load;
2177 }
2178}
2179
2180sub find_sync { 2269sub find_sync {
2181 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2182 2271
2183 cf::sync_job { find $path, $origin } 2272 # it's a bug to call this from the main context
2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2274 if $Coro::current == $Coro::main;
2275
2276 find $path, $origin
2184} 2277}
2185 2278
2186sub do_load_sync { 2279sub do_load_sync {
2187 my ($map) = @_; 2280 my ($map) = @_;
2188 2281
2282 # it's a bug to call this from the main context
2189 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2190 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2191 2285
2192 cf::sync_job { $map->load }; 2286 $map->load;
2193} 2287}
2194 2288
2195our %MAP_PREFETCH; 2289our %MAP_PREFETCH;
2196our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2197 2291
2198sub find_async { 2292sub find_async {
2199 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2200 2294
2201 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2202 2296
2203 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2204 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2205 } 2299 }
2206 2300
2207 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2208 2302
2209 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
… …
2268sub swap_out { 2362sub swap_out {
2269 my ($self) = @_; 2363 my ($self) = @_;
2270 2364
2271 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2272 2366
2273 return if $self->in_memory != cf::MAP_ACTIVE; 2367 return if !$self->linkable;
2274 return if $self->{deny_save}; 2368 return if $self->{deny_save};
2275 return if $self->players; 2369 return if $self->players;
2276 2370
2277 # first deactivate the map and "unlink" it from the core 2371 # first deactivate the map and "unlink" it from the core
2278 $self->deactivate; 2372 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP; 2373 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->in_memory (cf::MAP_SWAPPED); 2374 $self->state (cf::MAP_SWAPPED);
2281 2375
2282 # then atomically save 2376 # then atomically save
2283 $self->_save; 2377 $self->_save;
2284 2378
2285 # then free the map 2379 # then free the map
… …
2309 2403
2310 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2404 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311 2405
2312 return if $self->players; 2406 return if $self->players;
2313 2407
2314 warn "resetting map ", $self->path, "\n"; 2408 cf::trace "resetting map ", $self->path, "\n";
2315 2409
2316 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2317 2411
2318 # need to save uniques path 2412 # need to save uniques path
2319 unless ($self->{deny_save}) { 2413 unless ($self->{deny_save}) {
2320 my $uniq = $self->uniq_path; utf8::encode $uniq; 2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2321 2415
… …
2583 2677
2584Freezes the player and moves him/her to a special map (C<{link}>). 2678Freezes the player and moves him/her to a special map (C<{link}>).
2585 2679
2586The player should be reasonably safe there for short amounts of time (e.g. 2680The player should be reasonably safe there for short amounts of time (e.g.
2587for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2681for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link 2682though, as the player cannot control the character while it is on the link
2589map. 2683map.
2590 2684
2591Will never block. 2685Will never block.
2592 2686
2593=item $player_object->leave_link ($map, $x, $y) 2687=item $player_object->leave_link ($map, $x, $y)
… …
2614sub cf::object::player::enter_link { 2708sub cf::object::player::enter_link {
2615 my ($self) = @_; 2709 my ($self) = @_;
2616 2710
2617 $self->deactivate_recursive; 2711 $self->deactivate_recursive;
2618 2712
2713 ++$self->{_link_recursion};
2714
2619 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2715 return if UNIVERSAL::isa $self->map, "ext::map_link";
2620 2716
2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622 if $self->map && $self->map->{path} ne "{link}"; 2718 if $self->map && $self->map->{path} ne "{link}";
2623 2719
… …
2649 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2650 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2651 if $x <= 0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2652 2748
2653 $map->load; 2749 $map->load;
2654 $map->load_neighbours;
2655 2750
2656 return unless $self->contr->active; 2751 return unless $self->contr->active;
2657 2752
2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2660 2755 # entering was successful
2756 delete $self->{_link_recursion};
2661 # only activate afterwards, to support waiting in hooks 2757 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive; 2758 $self->activate_recursive;
2663} 2759 }
2664 2760
2761}
2762
2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2763=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2666 2764
2667Moves the player to the given map-path and coordinates by first freezing 2765Moves the player to the given map-path and coordinates by first freezing
2668her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2669that has to return the map if sucecssful, and then unfreezes the player on 2767that has to return the map if sucecssful, and then unfreezes the player on
2670the new (success) or old (failed) map position. In either case, $done will 2768the new (success) or old (failed) map position. In either case, $done will
… …
2677 2775
2678our $GOTOGEN; 2776our $GOTOGEN;
2679 2777
2680sub cf::object::player::goto { 2778sub cf::object::player::goto {
2681 my ($self, $path, $x, $y, $check, $done) = @_; 2779 my ($self, $path, $x, $y, $check, $done) = @_;
2780
2781 if ($self->{_link_recursion} >= $MAX_LINKS) {
2782 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2783 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2784 ($path, $x, $y) = @$EMERGENCY_POSITION;
2785 }
2682 2786
2683 # do generation counting so two concurrent goto's will be executed in-order 2787 # do generation counting so two concurrent goto's will be executed in-order
2684 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2685 2789
2686 $self->enter_link; 2790 $self->enter_link;
… …
2706 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2707 } 2811 }
2708 } 2812 }
2709 2813
2710 my $map = eval { 2814 my $map = eval {
2711 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2712 2816
2713 if ($map) { 2817 if ($map) {
2714 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2715 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2716 } else { 2820 } else {
2717 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2821 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2718 } 2822 }
2719 2823
2720 $map 2824 $map
… …
2728 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2729 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2730 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2731 } 2835 }
2732 2836
2733 $done->() if $done; 2837 $done->($self) if $done;
2734 })->prio (1); 2838 })->prio (1);
2735} 2839}
2736 2840
2737=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2738 2842
… …
2806 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2807 2911
2808 unless (eval { 2912 unless (eval {
2809 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2810 2914
2811 # random map handling
2812 {
2813 my $guard = cf::lock_acquire "exit_prepare:$exit";
2814
2815 prepare_random_map $exit
2816 if $exit->slaying eq "/!";
2817 }
2818
2819 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2820 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2821 my $y = $exit->stats->sp; 2917 my $y = $exit->stats->sp;
2918
2919 # special map handling
2920 my $slaying = $exit->slaying;
2921
2922 # special map handling
2923 if ($slaying eq "/!") {
2924 my $guard = cf::lock_acquire "exit_prepare:$exit";
2925
2926 prepare_random_map $exit
2927 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2928
2929 $map = $exit->slaying;
2930
2931 } elsif ($slaying eq '!up') {
2932 $map = $exit->map->tile_path (cf::TILE_UP);
2933 $x = $exit->x;
2934 $y = $exit->y;
2935
2936 } elsif ($slaying eq '!down') {
2937 $map = $exit->map->tile_path (cf::TILE_DOWN);
2938 $x = $exit->x;
2939 $y = $exit->y;
2940 }
2822 2941
2823 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2824 2943
2825 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2826 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
… …
2831 $self->message ("Something went wrong deep within the deliantra server. " 2950 $self->message ("Something went wrong deep within the deliantra server. "
2832 . "I'll try to bring you back to the map you were before. " 2951 . "I'll try to bring you back to the map you were before. "
2833 . "Please report this to the dungeon master!", 2952 . "Please report this to the dungeon master!",
2834 cf::NDI_UNIQUE | cf::NDI_RED); 2953 cf::NDI_UNIQUE | cf::NDI_RED);
2835 2954
2836 warn "ERROR in enter_exit: $@"; 2955 error "ERROR in enter_exit: $@";
2837 $self->leave_link; 2956 $self->leave_link;
2838 } 2957 }
2839 })->prio (1); 2958 })->prio (1);
2840} 2959}
2841 2960
… …
3068=cut 3187=cut
3069 3188
3070sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
3071 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
3072 3191
3073 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3075 } elsif ($self->extcmd == 1) {
3076 #TODO: version 1, remove
3077 unshift @msg, msgtype => "reply", msgid => $id;
3078 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3079 }
3080} 3195}
3081 3196
3082=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
3083 3198
3084Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
… …
3139 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
3140 3255
3141 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3142 3257
3143 if (ref $msg) { 3258 if (ref $msg) {
3144 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3145 "ARRAY" eq ref $msg
3146 ? @$msg
3147 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3148 3260
3149 my @reply; 3261 my @reply;
3150 3262
3151 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
3152 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
… …
3154 3266
3155 $ns->ext_reply ($reply, @reply) 3267 $ns->ext_reply ($reply, @reply)
3156 if $reply; 3268 if $reply;
3157 3269
3158 } else { 3270 } else {
3159 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3271 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3160 } 3272 }
3161 3273
3162 cf::override; 3274 cf::override;
3163 }, 3275 },
3164); 3276);
… …
3245 decrease split destroy change_exp value msg lore send_msg)], 3357 decrease split destroy change_exp value msg lore send_msg)],
3246 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
3247 ["cf::player" => qw(peaceful send_msg)], 3359 ["cf::player" => qw(peaceful send_msg)],
3248 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
3249) { 3361) {
3250 no strict 'refs';
3251 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3253 for @funs; 3364 for @funs;
3254} 3365}
3255 3366
… …
3294 local @cf::_safe_eval_args = values %vars; 3405 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval; 3406 @res = wantarray ? eval eval : scalar eval $eval;
3296 } 3407 }
3297 3408
3298 if ($@) { 3409 if ($@) {
3299 warn "$@"; 3410 warn "$@",
3300 warn "while executing safe code '$code'\n"; 3411 "while executing safe code '$code'\n",
3301 warn "with arguments " . (join " ", %vars) . "\n"; 3412 "with arguments " . (join " ", %vars) . "\n";
3302 } 3413 }
3303 3414
3304 wantarray ? @res : $res[0] 3415 wantarray ? @res : $res[0]
3305} 3416}
3306 3417
… …
3340 # for this (global event?) 3451 # for this (global event?)
3341 %ext::player_env::MUSIC_FACE_CACHE = (); 3452 %ext::player_env::MUSIC_FACE_CACHE = ();
3342 3453
3343 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3344 3455
3345 warn "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3346 3457
3347 my $facedata; 3458 my $facedata = decode_storable load_file $path;
3348 0 < aio_load $path, $facedata
3349 or die "$path: $!";
3350
3351 $facedata = Coro::Storable::thaw $facedata;
3352 3459
3353 $facedata->{version} == 2 3460 $facedata->{version} == 2
3354 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3355 3462
3356 # patch in the exptable 3463 # patch in the exptable
… …
3370 3477
3371 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3372 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3481 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3482 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3375 3483
3376 cf::cede_to_tick; 3484 cf::cede_to_tick;
3377 } 3485 }
3378 3486
3379 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
… …
3384 3492
3385 if (my $smooth = cf::face::find $info->{smooth}) { 3493 if (my $smooth = cf::face::find $info->{smooth}) {
3386 cf::face::set_smooth $idx, $smooth; 3494 cf::face::set_smooth $idx, $smooth;
3387 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3388 } else { 3496 } else {
3389 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3497 error "smooth face '$info->{smooth}' not found for face '$face'";
3390 } 3498 }
3391 3499
3392 cf::cede_to_tick; 3500 cf::cede_to_tick;
3393 } 3501 }
3394 } 3502 }
… …
3412 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3520 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3413 3521
3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3522 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3415 cf::face::set_type $idx, $info->{type}; 3523 cf::face::set_type $idx, $info->{type};
3416 } else { 3524 } else {
3417 $RESOURCE{$name} = $info; 3525 $RESOURCE{$name} = $info; # unused
3418 } 3526 }
3419 3527
3420 cf::cede_to_tick; 3528 cf::cede_to_tick;
3421 } 3529 }
3422 } 3530 }
3423 3531
3424 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3532 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3425 3533
3426 1 3534 1
3427} 3535}
3428
3429cf::global->attach (on_resource_update => sub {
3430 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3431 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3432
3433 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3434 my $sound = $soundconf->{compat}[$_]
3435 or next;
3436
3437 my $face = cf::face::find "sound/$sound->[1]";
3438 cf::sound::set $sound->[0] => $face;
3439 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3440 }
3441
3442 while (my ($k, $v) = each %{$soundconf->{event}}) {
3443 my $face = cf::face::find "sound/$v";
3444 cf::sound::set $k => $face;
3445 }
3446 }
3447});
3448 3536
3449register_exticmd fx_want => sub { 3537register_exticmd fx_want => sub {
3450 my ($ns, $want) = @_; 3538 my ($ns, $want) = @_;
3451 3539
3452 while (my ($k, $v) = each %$want) { 3540 while (my ($k, $v) = each %$want) {
… …
3491sub reload_treasures { 3579sub reload_treasures {
3492 load_resource_file "$DATADIR/treasures" 3580 load_resource_file "$DATADIR/treasures"
3493 or die "unable to load treasurelists\n"; 3581 or die "unable to load treasurelists\n";
3494} 3582}
3495 3583
3584sub reload_sound {
3585 trace "loading sound config from $DATADIR/sound\n";
3586
3587 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3588
3589 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3590 my $sound = $soundconf->{compat}[$_]
3591 or next;
3592
3593 my $face = cf::face::find "sound/$sound->[1]";
3594 cf::sound::set $sound->[0] => $face;
3595 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3596 }
3597
3598 while (my ($k, $v) = each %{$soundconf->{event}}) {
3599 my $face = cf::face::find "sound/$v";
3600 cf::sound::set $k => $face;
3601 }
3602}
3603
3496sub reload_resources { 3604sub reload_resources {
3497 warn "reloading resource files...\n"; 3605 trace "reloading resource files...\n";
3498 3606
3607 reload_exp_table;
3608 reload_materials;
3499 reload_facedata; 3609 reload_facedata;
3610 reload_sound;
3500 reload_archetypes; 3611 reload_archetypes;
3501 reload_regions; 3612 reload_regions;
3502 reload_treasures; 3613 reload_treasures;
3503 3614
3504 warn "finished reloading resource files\n"; 3615 trace "finished reloading resource files\n";
3505} 3616}
3506 3617
3507sub reload_config { 3618sub reload_config {
3508 warn "reloading config file...\n"; 3619 trace "reloading config file...\n";
3509 3620
3510 open my $fh, "<:utf8", "$CONFDIR/config" 3621 my $config = load_file "$CONFDIR/config";
3511 or return; 3622 utf8::decode $config;
3623 *CFG = decode_yaml $config;
3512 3624
3513 local $/;
3514 *CFG = YAML::XS::Load scalar <$fh>;
3515
3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3625 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3517 3626
3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3627 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3628 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3520 3629
3521 if (exists $CFG{mlockall}) { 3630 if (exists $CFG{mlockall}) {
… …
3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3632 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3524 and die "WARNING: m(un)lockall failed: $!\n"; 3633 and die "WARNING: m(un)lockall failed: $!\n";
3525 }; 3634 };
3526 warn $@ if $@; 3635 warn $@ if $@;
3527 } 3636 }
3528
3529 warn "finished reloading resource files\n";
3530} 3637}
3531 3638
3532sub pidfile() { 3639sub pidfile() {
3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3640 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534 or die "$PIDFILE: $!"; 3641 or die "$PIDFILE: $!";
… …
3547 seek $fh, 0, 0; 3654 seek $fh, 0, 0;
3548 print $fh $$; 3655 print $fh $$;
3549} 3656}
3550 3657
3551sub main_loop { 3658sub main_loop {
3552 warn "EV::loop starting\n"; 3659 trace "EV::loop starting\n";
3553 if (1) { 3660 if (1) {
3554 EV::loop; 3661 EV::loop;
3555 } 3662 }
3556 warn "EV::loop returned\n"; 3663 trace "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP; 3664 goto &main_loop unless $REALLY_UNLOOP;
3558} 3665}
3559 3666
3560sub main { 3667sub main {
3561 cf::init_globals; # initialise logging 3668 cf::init_globals; # initialise logging
3562 3669
3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3670 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3671 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3672 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3673 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567 3674
3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3675 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3569 3676
… …
3577 }; 3684 };
3578 3685
3579 evthread_start IO::AIO::poll_fileno; 3686 evthread_start IO::AIO::poll_fileno;
3580 3687
3581 cf::sync_job { 3688 cf::sync_job {
3582 cf::init_experience; 3689 cf::incloader::init ();
3690
3583 cf::init_anim; 3691 cf::init_anim;
3584 cf::init_attackmess; 3692 cf::init_attackmess;
3585 cf::init_dynamic; 3693 cf::init_dynamic;
3586 3694
3587 cf::load_settings; 3695 cf::load_settings;
3588 cf::load_materials;
3589 3696
3590 reload_resources; 3697 reload_resources;
3591 reload_config; 3698 reload_config;
3592 db_init; 3699 db_init;
3593 3700
… …
3605 3712
3606 # no (long-running) fork's whatsoever before this point(!) 3713 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX (); 3714 use POSIX ();
3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3715 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3609 3716
3610 (pop @POST_INIT)->(0) while @POST_INIT; 3717 cf::_post_init 0;
3611 }; 3718 };
3612 3719
3613 cf::object::thawer::errors_are_fatal 0; 3720 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n"; 3721 info "parse errors in files are no longer fatal from this point on.\n";
3615 3722
3723 AE::postpone {
3724 undef &main; # free gobs of memory :)
3725 };
3726
3616 main_loop; 3727 goto &main_loop;
3617} 3728}
3618 3729
3619############################################################################# 3730#############################################################################
3620# initialisation and cleanup 3731# initialisation and cleanup
3621 3732
… …
3660 or return; 3771 or return;
3661 3772
3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3773 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3663 and return; 3774 and return;
3664 3775
3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3776 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3666 3777
3667 1 3778 1
3668} 3779}
3669 3780
3670our $uuid_lock; 3781our $uuid_lock;
… …
3682 or return; 3793 or return;
3683 3794
3684 my $value = uuid_seq uuid_cur; 3795 my $value = uuid_seq uuid_cur;
3685 3796
3686 unless ($value) { 3797 unless ($value) {
3687 warn "cowardly refusing to write zero uuid value!\n"; 3798 info "cowardly refusing to write zero uuid value!\n";
3688 return; 3799 return;
3689 } 3800 }
3690 3801
3691 my $value = uuid_str $value + $uuid_skip; 3802 my $value = uuid_str $value + $uuid_skip;
3692 $uuid_skip = 0; 3803 $uuid_skip = 0;
… …
3702 or return; 3813 or return;
3703 3814
3704 aio_rename "$uuid~", $uuid 3815 aio_rename "$uuid~", $uuid
3705 and return; 3816 and return;
3706 3817
3707 warn "uuid file written ($value).\n"; 3818 trace "uuid file written ($value).\n";
3708 3819
3709 1 3820 1
3710 3821
3711} 3822}
3712 3823
… …
3718} 3829}
3719 3830
3720sub emergency_save() { 3831sub emergency_save() {
3721 my $freeze_guard = cf::freeze_mainloop; 3832 my $freeze_guard = cf::freeze_mainloop;
3722 3833
3723 warn "emergency_perl_save: enter\n"; 3834 info "emergency_perl_save: enter\n";
3835
3836 # this is a trade-off: we want to be very quick here, so
3837 # save all maps without fsync, and later call a global sync
3838 # (which in turn might be very very slow)
3839 local $USE_FSYNC = 0;
3724 3840
3725 cf::sync_job { 3841 cf::sync_job {
3726 # this is a trade-off: we want to be very quick here, so 3842 cf::write_runtime_sync; # external watchdog should not bark
3727 # save all maps without fsync, and later call a global sync
3728 # (which in turn might be very very slow)
3729 local $USE_FSYNC = 0;
3730 3843
3731 # use a peculiar iteration method to avoid tripping on perl 3844 # use a peculiar iteration method to avoid tripping on perl
3732 # refcount bugs in for. also avoids problems with players 3845 # refcount bugs in for. also avoids problems with players
3733 # and maps saved/destroyed asynchronously. 3846 # and maps saved/destroyed asynchronously.
3734 warn "emergency_perl_save: begin player save\n"; 3847 info "emergency_perl_save: begin player save\n";
3735 for my $login (keys %cf::PLAYER) { 3848 for my $login (keys %cf::PLAYER) {
3736 my $pl = $cf::PLAYER{$login} or next; 3849 my $pl = $cf::PLAYER{$login} or next;
3737 $pl->valid or next; 3850 $pl->valid or next;
3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3851 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3739 $pl->save; 3852 $pl->save;
3740 } 3853 }
3741 warn "emergency_perl_save: end player save\n"; 3854 info "emergency_perl_save: end player save\n";
3742 3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3743 warn "emergency_perl_save: begin map save\n"; 3858 info "emergency_perl_save: begin map save\n";
3744 for my $path (keys %cf::MAP) { 3859 for my $path (keys %cf::MAP) {
3745 my $map = $cf::MAP{$path} or next; 3860 my $map = $cf::MAP{$path} or next;
3746 $map->valid or next; 3861 $map->valid or next;
3747 $map->save; 3862 $map->save;
3748 } 3863 }
3749 warn "emergency_perl_save: end map save\n"; 3864 info "emergency_perl_save: end map save\n";
3750 3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3751 warn "emergency_perl_save: begin database checkpoint\n"; 3868 info "emergency_perl_save: begin database checkpoint\n";
3752 BDB::db_env_txn_checkpoint $DB_ENV; 3869 BDB::db_env_txn_checkpoint $DB_ENV;
3753 warn "emergency_perl_save: end database checkpoint\n"; 3870 info "emergency_perl_save: end database checkpoint\n";
3754 3871
3755 warn "emergency_perl_save: begin write uuid\n"; 3872 info "emergency_perl_save: begin write uuid\n";
3756 write_uuid_sync 1; 3873 write_uuid_sync 1;
3757 warn "emergency_perl_save: end write uuid\n"; 3874 info "emergency_perl_save: end write uuid\n";
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: syncing database to disk";
3879 BDB::db_env_txn_checkpoint $DB_ENV;
3880
3881 info "emergency_perl_save: starting sync\n";
3882 IO::AIO::aio_sync sub {
3883 info "emergency_perl_save: finished sync\n";
3884 };
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: flushing outstanding aio requests";
3889 while (IO::AIO::nreqs || BDB::nreqs) {
3890 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3891 }
3892
3893 cf::write_runtime_sync; # external watchdog should not bark
3758 }; 3894 };
3759 3895
3760 warn "emergency_perl_save: starting sync()\n";
3761 IO::AIO::aio_sync sub {
3762 warn "emergency_perl_save: finished sync()\n";
3763 };
3764
3765 warn "emergency_perl_save: leave\n"; 3896 info "emergency_perl_save: leave\n";
3766} 3897}
3767 3898
3768sub post_cleanup { 3899sub post_cleanup {
3769 my ($make_core) = @_; 3900 my ($make_core) = @_;
3770 3901
3902 IO::AIO::flush;
3903
3771 warn Carp::longmess "post_cleanup backtrace" 3904 error Carp::longmess "post_cleanup backtrace"
3772 if $make_core; 3905 if $make_core;
3773 3906
3774 my $fh = pidfile; 3907 my $fh = pidfile;
3775 unlink $PIDFILE if <$fh> == $$; 3908 unlink $PIDFILE if <$fh> == $$;
3776} 3909}
… …
3800 } 3933 }
3801} 3934}
3802 3935
3803sub do_reload_perl() { 3936sub do_reload_perl() {
3804 # can/must only be called in main 3937 # can/must only be called in main
3805 if (in_main) { 3938 unless (in_main) {
3806 warn "can only reload from main coroutine"; 3939 error "can only reload from main coroutine";
3807 return; 3940 return;
3808 } 3941 }
3809 3942
3810 return if $RELOAD++; 3943 return if $RELOAD++;
3811 3944
3812 my $t1 = AE::time; 3945 my $t1 = AE::time;
3813 3946
3814 while ($RELOAD) { 3947 while ($RELOAD) {
3815 warn "reloading..."; 3948 cf::get_slot 0.1, -1, "reload_perl";
3949 info "perl_reload: reloading...";
3816 3950
3817 warn "entering sync_job"; 3951 trace "perl_reload: entering sync_job";
3818 3952
3819 cf::sync_job { 3953 cf::sync_job {
3820 cf::write_runtime_sync; # external watchdog should not bark
3821 cf::emergency_save; 3954 #cf::emergency_save;
3822 cf::write_runtime_sync; # external watchdog should not bark
3823 3955
3824 warn "syncing database to disk";
3825 BDB::db_env_txn_checkpoint $DB_ENV;
3826
3827 # if anything goes wrong in here, we should simply crash as we already saved
3828
3829 warn "flushing outstanding aio requests";
3830 while (IO::AIO::nreqs || BDB::nreqs) {
3831 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3832 }
3833
3834 warn "cancelling all extension coros"; 3956 trace "perl_reload: cancelling all extension coros";
3835 $_->cancel for values %EXT_CORO; 3957 $_->cancel for values %EXT_CORO;
3836 %EXT_CORO = (); 3958 %EXT_CORO = ();
3837 3959
3838 warn "removing commands"; 3960 trace "perl_reload: removing commands";
3839 %COMMAND = (); 3961 %COMMAND = ();
3840 3962
3841 warn "removing ext/exti commands"; 3963 trace "perl_reload: removing ext/exti commands";
3842 %EXTCMD = (); 3964 %EXTCMD = ();
3843 %EXTICMD = (); 3965 %EXTICMD = ();
3844 3966
3845 warn "unloading/nuking all extensions"; 3967 trace "perl_reload: unloading/nuking all extensions";
3846 for my $pkg (@EXTS) { 3968 for my $pkg (@EXTS) {
3847 warn "... unloading $pkg"; 3969 trace "... unloading $pkg";
3848 3970
3849 if (my $cb = $pkg->can ("unload")) { 3971 if (my $cb = $pkg->can ("unload")) {
3850 eval { 3972 eval {
3851 $cb->($pkg); 3973 $cb->($pkg);
3852 1 3974 1
3853 } or warn "$pkg unloaded, but with errors: $@"; 3975 } or error "$pkg unloaded, but with errors: $@";
3854 } 3976 }
3855 3977
3856 warn "... clearing $pkg"; 3978 trace "... clearing $pkg";
3857 clear_package $pkg; 3979 clear_package $pkg;
3858 } 3980 }
3859 3981
3860 warn "unloading all perl modules loaded from $LIBDIR"; 3982 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3861 while (my ($k, $v) = each %INC) { 3983 while (my ($k, $v) = each %INC) {
3862 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3984 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3863 3985
3864 warn "... unloading $k"; 3986 trace "... unloading $k";
3865 delete $INC{$k}; 3987 delete $INC{$k};
3866 3988
3867 $k =~ s/\.pm$//; 3989 $k =~ s/\.pm$//;
3868 $k =~ s/\//::/g; 3990 $k =~ s/\//::/g;
3869 3991
… …
3872 } 3994 }
3873 3995
3874 clear_package $k; 3996 clear_package $k;
3875 } 3997 }
3876 3998
3877 warn "getting rid of safe::, as good as possible"; 3999 trace "perl_reload: getting rid of safe::, as good as possible";
3878 clear_package "safe::$_" 4000 clear_package "safe::$_"
3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4001 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3880 4002
3881 warn "unloading cf.pm \"a bit\""; 4003 trace "perl_reload: unloading cf.pm \"a bit\"";
3882 delete $INC{"cf.pm"}; 4004 delete $INC{"cf.pm"};
3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4005 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3884 4006
3885 # don't, removes xs symbols, too, 4007 # don't, removes xs symbols, too,
3886 # and global variables created in xs 4008 # and global variables created in xs
3887 #clear_package __PACKAGE__; 4009 #clear_package __PACKAGE__;
3888 4010
3889 warn "unload completed, starting to reload now"; 4011 info "perl_reload: unload completed, starting to reload now";
3890 4012
3891 warn "reloading cf.pm"; 4013 trace "perl_reload: reloading cf.pm";
3892 require cf; 4014 require cf;
3893 cf::_connect_to_perl_1; 4015 cf::_connect_to_perl_1;
3894 4016
3895 warn "loading config and database again"; 4017 trace "perl_reload: loading config and database again";
3896 cf::reload_config; 4018 cf::reload_config;
3897 4019
3898 warn "loading extensions"; 4020 trace "perl_reload: loading extensions";
3899 cf::load_extensions; 4021 cf::load_extensions;
3900 4022
3901 if ($REATTACH_ON_RELOAD) { 4023 if ($REATTACH_ON_RELOAD) {
3902 warn "reattaching attachments to objects/players"; 4024 trace "perl_reload: reattaching attachments to objects/players";
3903 _global_reattach; # objects, sockets 4025 _global_reattach; # objects, sockets
3904 warn "reattaching attachments to maps"; 4026 trace "perl_reload: reattaching attachments to maps";
3905 reattach $_ for values %MAP; 4027 reattach $_ for values %MAP;
3906 warn "reattaching attachments to players"; 4028 trace "perl_reload: reattaching attachments to players";
3907 reattach $_ for values %PLAYER; 4029 reattach $_ for values %PLAYER;
3908 } 4030 }
3909 4031
3910 warn "running post_init jobs"; 4032 cf::_post_init 1;
3911 (pop @POST_INIT)->(1) while @POST_INIT;
3912 4033
3913 warn "leaving sync_job"; 4034 trace "perl_reload: leaving sync_job";
3914 4035
3915 1 4036 1
3916 } or do { 4037 } or do {
3917 warn $@; 4038 error $@;
3918 cf::cleanup "error while reloading, exiting."; 4039 cf::cleanup "perl_reload: error, exiting.";
3919 }; 4040 };
3920 4041
3921 warn "reloaded";
3922 --$RELOAD; 4042 --$RELOAD;
3923 } 4043 }
3924 4044
3925 $t1 = AE::time - $t1; 4045 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n"; 4046 info "perl_reload: completed in ${t1}s\n";
3927}; 4047};
3928 4048
3929our $RELOAD_WATCHER; # used only during reload 4049our $RELOAD_WATCHER; # used only during reload
3930 4050
3931sub reload_perl() { 4051sub reload_perl() {
… …
3952 reload_perl; 4072 reload_perl;
3953 }; 4073 };
3954 } 4074 }
3955}; 4075};
3956 4076
3957unshift @INC, $LIBDIR; 4077#############################################################################
3958 4078
3959my $bug_warning = 0; 4079my $bug_warning = 0;
3960 4080
3961our @WAIT_FOR_TICK;
3962our @WAIT_FOR_TICK_BEGIN;
3963
3964sub wait_for_tick { 4081sub wait_for_tick() {
3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4082 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3966 4083
3967 my $signal = new Coro::Signal; 4084 $WAIT_FOR_TICK->wait;
3968 push @WAIT_FOR_TICK, $signal;
3969 $signal->wait;
3970} 4085}
3971 4086
3972sub wait_for_tick_begin { 4087sub wait_for_tick_begin() {
3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4088 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3974 4089
3975 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
3976 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
3977 $signal->wait; 4092 $signal->wait;
3978} 4093}
… …
3982 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4097 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3983 unless ++$bug_warning > 10; 4098 unless ++$bug_warning > 10;
3984 return; 4099 return;
3985 } 4100 }
3986 4101
3987 cf::server_tick; # one server iteration 4102 cf::one_tick; # one server iteration
3988 4103
3989 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4104 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3990 4105
3991 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4106 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3993 Coro::async_pool { 4108 Coro::async_pool {
3994 $Coro::current->{desc} = "runtime saver"; 4109 $Coro::current->{desc} = "runtime saver";
3995 write_runtime_sync 4110 write_runtime_sync
3996 or warn "ERROR: unable to write runtime file: $!"; 4111 or error "ERROR: unable to write runtime file: $!";
3997 }; 4112 };
3998 } 4113 }
3999 4114
4000 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4001 $sig->send; 4116 $sig->send;
4002 } 4117 }
4003 while (my $sig = shift @WAIT_FOR_TICK) { 4118 $WAIT_FOR_TICK->broadcast;
4004 $sig->send;
4005 }
4006 4119
4007 $LOAD = ($NOW - $TICK_START) / $TICK; 4120 $LOAD = ($NOW - $TICK_START) / $TICK;
4008 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4121 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4009 4122
4010 if (0) { 4123 if (0) {
4011 if ($NEXT_TICK) { 4124 if ($NEXT_TICK) {
4012 my $jitter = $TICK_START - $NEXT_TICK; 4125 my $jitter = $TICK_START - $NEXT_TICK;
4013 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4126 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4014 warn "jitter $JITTER\n";#d# 4127 debug "jitter $JITTER\n";#d#
4015 } 4128 }
4016 } 4129 }
4017} 4130}
4018 4131
4019{ 4132{
4020 # configure BDB 4133 # configure BDB
4021 4134
4022 BDB::min_parallel 16; 4135 BDB::min_parallel 16;
4023 BDB::max_poll_reqs $TICK * 0.1; 4136 BDB::max_poll_reqs $TICK * 0.1;
4024 $AnyEvent::BDB::WATCHER->priority (1); 4137 #$AnyEvent::BDB::WATCHER->priority (1);
4025 4138
4026 unless ($DB_ENV) { 4139 unless ($DB_ENV) {
4027 $DB_ENV = BDB::db_env_create; 4140 $DB_ENV = BDB::db_env_create;
4028 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4141 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4029 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4142 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4064 IO::AIO::min_parallel 8; 4177 IO::AIO::min_parallel 8;
4065 IO::AIO::max_poll_time $TICK * 0.1; 4178 IO::AIO::max_poll_time $TICK * 0.1;
4066 undef $AnyEvent::AIO::WATCHER; 4179 undef $AnyEvent::AIO::WATCHER;
4067} 4180}
4068 4181
4069my $_log_backtrace; 4182our $_log_backtrace;
4183our $_log_backtrace_last;
4070 4184
4071sub _log_backtrace { 4185sub _log_backtrace {
4072 my ($msg, @addr) = @_; 4186 my ($msg, @addr) = @_;
4073 4187
4074 $msg =~ s/\n//; 4188 $msg =~ s/\n$//;
4075 4189
4190 if ($_log_backtrace_last eq $msg) {
4191 LOG llevInfo, "[ABT] $msg\n";
4192 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4076 # limit the # of concurrent backtraces 4193 # limit the # of concurrent backtraces
4077 if ($_log_backtrace < 2) { 4194 } elsif ($_log_backtrace < 2) {
4195 $_log_backtrace_last = $msg;
4078 ++$_log_backtrace; 4196 ++$_log_backtrace;
4079 my $perl_bt = Carp::longmess $msg; 4197 my $perl_bt = Carp::longmess $msg;
4080 async { 4198 async {
4081 $Coro::current->{desc} = "abt $msg"; 4199 $Coro::current->{desc} = "abt $msg";
4082 4200
… …
4102 LOG llevInfo, "[ABT] $_\n" for @bt; 4220 LOG llevInfo, "[ABT] $_\n" for @bt;
4103 --$_log_backtrace; 4221 --$_log_backtrace;
4104 }; 4222 };
4105 } else { 4223 } else {
4106 LOG llevInfo, "[ABT] $msg\n"; 4224 LOG llevInfo, "[ABT] $msg\n";
4107 LOG llevInfo, "[ABT] [suppressed]\n"; 4225 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4108 } 4226 }
4109} 4227}
4110 4228
4111# load additional modules 4229# load additional modules
4112require "cf/$_.pm" for @EXTRA_MODULES; 4230require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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