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.531 by root, Wed Apr 28 21:07:41 2010 UTC vs.
Revision 1.572 by root, Sun May 8 11:44:43 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";
… …
124our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 129our $DB_ENV;
128 130
129our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 132
131our %CFG; 133our %CFG;
132 134
133our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
135our $NOW; 138our $NOW;
136 139
137our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
… …
148 151
149our @POST_INIT; 152our @POST_INIT;
150 153
151our $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)
152our $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;
153 159
154binmode STDOUT; 160binmode STDOUT;
155binmode STDERR; 161binmode STDERR;
156 162
157# read virtual server time, if available 163# read virtual server time, if available
… …
191 197
192=over 4 198=over 4
193 199
194=item $cf::UPTIME 200=item $cf::UPTIME
195 201
196The 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.
197 218
198=item $cf::RUNTIME 219=item $cf::RUNTIME
199 220
200The 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
201every server tick. 222every server tick.
… …
207Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
210database environment. 231database environment.
211 232
212=item $cf::NOW
213
214The time of the last (current) server tick.
215
216=item $cf::TICK
217
218The interval between server ticks, in seconds.
219
220=item $cf::LOADAVG 233=item $cf::LOADAVG
221 234
222The 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
223(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
224objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
… …
233from wherever your confdir points to. 246from wherever your confdir points to.
234 247
235=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
236 249
237These 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
238returns 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
239per 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();
240 270
241=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
242 272
243This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
244C<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
… …
252 282
253=back 283=back
254 284
255=cut 285=cut
256 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
257$Coro::State::WARNHOOK = sub { 293$Coro::State::WARNHOOK = sub {
258 my $msg = join "", @_; 294 my $msg = join "", @_;
259 295
260 $msg .= "\n" 296 $msg .= "\n"
261 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
262 298
263 $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;
264 300
265 LOG llevError, $msg; 301 LOG llevWarn, $msg;
266}; 302};
267 303
268$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
269 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
270 306
271 warn Carp::longmess $_[0]; 307 error Carp::longmess $_[0];
272 308
273 if (in_main) {#d# 309 if (in_main) {#d#
274 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
275 return;#d# 311 return;#d#
276 }#d# 312 }#d#
277 313
278 # kill coroutine otherwise 314 # kill coroutine otherwise
279 Coro::terminate 315 Coro::terminate
… …
301} 337}
302 338
303$EV::DIED = sub { 339$EV::DIED = sub {
304 Carp::cluck "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
305}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
306 347
307############################################################################# 348#############################################################################
308 349
309=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
310 351
… …
331 $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;
332 $d 373 $d
333 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
334} 375}
335 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
336=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
337 392
338Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
339 394
340=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
… …
346our $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
347 402
348sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
349sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
350 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
351=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
352 438
353Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
354but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
355 441
356The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
357is a reload or not. 443is a reload or not.
358 444
359=cut 445=cut
360 446
361sub post_init(&) { 447sub post_init(&) {
362 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 }
363} 466}
364 467
365=item cf::lock_wait $string 468=item cf::lock_wait $string
366 469
367Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
… …
420 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
421} 524}
422 525
423=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
424 527
425Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
426This 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
427of 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.
428 535
429The 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
430used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
431 538
432Useful for short background jobs. 539Useful for short background jobs.
… …
461 } 568 }
462 } 569 }
463 570
464 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
465 # 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
466 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
467 $signal->wait;
468 } else { 574 } else {
469 $busy = 0; 575 $busy = 0;
470 Coro::schedule; 576 Coro::schedule;
471 } 577 }
472 } 578 }
… …
512=cut 618=cut
513 619
514sub sync_job(&) { 620sub sync_job(&) {
515 my ($job) = @_; 621 my ($job) = @_;
516 622
517 if ($Coro::current == $Coro::main) { 623 if (in_main) {
518 my $time = AE::time; 624 my $time = AE::time;
519 625
520 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
521 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
522 628
523 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
524 630
525 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
526 632
527 my $busy = 1; 633 my $busy = 1;
528 my @res; 634 my @res;
529 635
530 (async { 636 (async {
531 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
532 @res = eval { $job->() }; 638 @res = eval { $job->() };
533 warn $@ if $@; 639 error $@ if $@;
534 undef $busy; 640 undef $busy;
535 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
536 642
537 while ($busy) { 643 while ($busy) {
538 if (Coro::nready) { 644 if (Coro::nready) {
… …
572 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
573 679
574 $coro 680 $coro
575} 681}
576 682
577=item fork_call { }, $args 683=item fork_call { }, @args
578 684
579Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
580process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
581Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
582never block itself or use any form of event handling. 688never block itself or use any form of event handling.
583 689
584=cut 690=cut
585 691
692sub post_fork {
693 reset_signals;
694}
695
586sub fork_call(&@) { 696sub fork_call(&@) {
587 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
588 698
589 # 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,
590 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
591 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
592 702
593 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
594 reset_signals; 704 cf::post_fork;
595 &$cb 705 &$cb
596 }, @args; 706 } @args;
597 707
598 wantarray ? @res : $res[-1] 708 wantarray ? @res : $res[-1]
599} 709}
600 710
601sub objinfo { 711sub objinfo {
… …
651within each server. 761within each server.
652 762
653=cut 763=cut
654 764
655sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
656 my ($name) = @_; 769 my ($name) = @_;
657 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
658 771
659 eval { 772 eval {
660 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
… …
670} 783}
671 784
672our $DB; 785our $DB;
673 786
674sub db_init { 787sub db_init {
675 cf::sync_job {
676 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
677 };
678} 789}
679 790
680sub db_get($$) { 791sub db_get($$) {
681 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
682 793
683 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
684 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
685 798
686 $! ? () 799 $! ? ()
687 : $data 800 : $data
688 }
689} 801}
690 802
691sub db_put($$$) { 803sub db_put($$$) {
692 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
693 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
721 833
722 my @data; 834 my @data;
723 my $md5; 835 my $md5;
724 836
725 for (0 .. $#$src) { 837 for (0 .. $#$src) {
726 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
727 or Carp::croak "$src->[$_]: $!";
728 } 839 }
729 840
730 # if processing is expensive, check 841 # if processing is expensive, check
731 # checksum first 842 # checksum first
732 if (1) { 843 if (1) {
… …
749 860
750 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
751 my $data = $process->(\@data); 862 my $data = $process->(\@data);
752 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
753 864
754 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
755 866
756 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
757 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
758 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
759 870
… …
769 880
770=cut 881=cut
771 882
772sub datalog($@) { 883sub datalog($@) {
773 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
774 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
775} 886}
776 887
777=back 888=back
778 889
779=cut 890=cut
… …
974 1085
975 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
976 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
977 1088
978 } elsif (ref $type) { 1089 } elsif (ref $type) {
979 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
980 1091
981 } else { 1092 } else {
982 shift @arg; 1093 shift @arg;
983 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
984 } 1095 }
985 } 1096 }
986} 1097}
987 1098
988sub _object_attach { 1099sub _object_attach {
… …
998 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
999 } 1110 }
1000 1111
1001 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
1002 } else { 1113 } else {
1003 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
1004 } 1115 }
1005 1116
1006 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
1007} 1118}
1008 1119
… …
1067 1178
1068 for (@$callbacks) { 1179 for (@$callbacks) {
1069 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1070 1181
1071 if ($@) { 1182 if ($@) {
1072 warn "$@";
1073 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1074 override; 1184 override;
1075 } 1185 }
1076 1186
1077 return 1 if $override; 1187 return 1 if $override;
1078 } 1188 }
… …
1157 for (@$attach) { 1267 for (@$attach) {
1158 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1159 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1160 } 1270 }
1161 } else { 1271 } else {
1162 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1163 } 1273 }
1164 } 1274 }
1165} 1275}
1166 1276
1167cf::attachable->attach ( 1277cf::attachable->attach (
… …
1194 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1195 1305
1196 sync_job { 1306 sync_job {
1197 if (length $$rdata) { 1307 if (length $$rdata) {
1198 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1199 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1200 $decname, length $$rdata, scalar @$objs 1310 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO; 1311 if $VERBOSE_IO;
1202 1312
1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1204 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
… …
1228 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1229 1339
1230 $filename =~ s%/[^/]+$%%; 1340 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC; 1341 aio_pathsync $filename if $cf::USE_FSYNC;
1232 } else { 1342 } else {
1233 warn "unable to save objects: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1234 } 1344 }
1235 } else { 1345 } else {
1236 aio_unlink $filename; 1346 aio_unlink $filename;
1237 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1238 } 1348 }
… …
1262 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1263 $av = $st->{objs}; 1373 $av = $st->{objs};
1264 } 1374 }
1265 1375
1266 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1267 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1268 $decname, length $data, scalar @{$av || []} 1378 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO; 1379 if $VERBOSE_IO;
1270 1380
1271 ($data, $av) 1381 ($data, $av)
1272} 1382}
1273 1383
… …
1366 1476
1367 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1368 if $reply; 1478 if $reply;
1369 1479
1370 } else { 1480 } else {
1371 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1372 } 1482 }
1373 1483
1374 cf::override; 1484 cf::override;
1375 }, 1485 },
1376); 1486);
… …
1387 1497
1388 $grp 1498 $grp
1389} 1499}
1390 1500
1391sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1392 cf::sync_job { 1504 cf::sync_job {
1393 my %todo; 1505 my %todo;
1394 1506
1395 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1396 next unless -r $path; 1508 next unless -r $path;
… …
1414 1526
1415 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1416 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1417 1529
1418 $ext{source} = 1530 $ext{source} =
1419 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1420 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1421 . $source 1533 . $source
1422 . "\n};\n1"; 1534 . "\n};\n1";
1423 1535
1424 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
… …
1436 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1437 next ext 1549 next ext
1438 unless exists $done{$_}; 1550 unless exists $done{$_};
1439 } 1551 }
1440 1552
1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1442 1554
1443 my $active = eval $v->{source}; 1555 my $active = eval $v->{source};
1444 1556
1445 if (length $@) { 1557 if (length $@) {
1446 warn "$v->{path}: $@\n"; 1558 error "$v->{path}: $@\n";
1447 1559
1448 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1449 if exists $v->{meta}{mandatory}; 1561 if exists $v->{meta}{mandatory};
1450 1562
1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1563 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1453 } else { 1565 } else {
1454 $done{$k} = delete $todo{$k}; 1566 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg}; 1567 push @EXTS, $v->{pkg};
1456 $progress = 1; 1568 $progress = 1;
1457 1569
1458 warn "$v->{base}: extension inactive.\n" 1570 info "$v->{base}: extension inactive.\n"
1459 unless $active; 1571 unless $active;
1460 } 1572 }
1461 } 1573 }
1462 1574
1463 unless ($progress) { 1575 unless ($progress) {
… …
1465 1577
1466 while (my ($k, $v) = each %todo) { 1578 while (my ($k, $v) = each %todo) {
1467 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468 if exists $v->{meta}{mandatory}; 1580 if exists $v->{meta}{mandatory};
1469 } 1581 }
1582
1583 last;
1470 } 1584 }
1471 } 1585 }
1472 }; 1586 };
1473} 1587}
1474 1588
… …
1632 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1633 1747
1634 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1635 $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
1636 1750
1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1638 $pl->deactivate; 1752 $pl->deactivate;
1753
1639 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;
1640 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1641 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1642 1759
1643 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1644 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1645 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
… …
1811sub generate_random_map { 1928sub generate_random_map {
1812 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1813 1930
1814 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
1815 1932
1816 # mit "rum" bekleckern, nicht
1817 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1821 $rmp->{exit_on_final_map},
1822 $rmp->{xsize}, $rmp->{ysize},
1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1825 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1826 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1827 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1828 (cf::region::find $rmp->{region}), $rmp->{custom}
1829 )
1830} 1934}
1831 1935
1832=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1833 1937
1834Register 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
… …
1839 1943
1840sub register { 1944sub register {
1841 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1842 my $pkg = caller; 1946 my $pkg = caller;
1843 1947
1844 no strict;
1845 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1846 1949
1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1848} 1951}
1849 1952
… …
1861} 1964}
1862 1965
1863sub normalise { 1966sub normalise {
1864 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1865 1968
1866 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1867 1970
1868 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1869 1972
1870 # map plan: 1973 # map plan:
1871 # 1974 #
… …
1886 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1887 $path = "$base/$path"; 1990 $path = "$base/$path";
1888 } 1991 }
1889 1992
1890 for ($path) { 1993 for ($path) {
1891 redo if s{//}{/};
1892 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1893 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1894 } 1996 }
1895 1997
1896 $path 1998 $path
… …
1910 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1911 return $self; 2013 return $self;
1912 } 2014 }
1913 } 2015 }
1914 2016
1915 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1916 () 2018 ()
1917} 2019}
1918 2020
2021# may re-bless or do other evil things
1919sub init { 2022sub init {
1920 my ($self) = @_; 2023 my ($self) = @_;
1921 2024
1922 $self 2025 $self
1923} 2026}
… …
1988 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1989 2092
1990 1 2093 1
1991} 2094}
1992 2095
2096# used to laod the header of an original map
1993sub load_header_orig { 2097sub load_header_orig {
1994 my ($self) = @_; 2098 my ($self) = @_;
1995 2099
1996 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1997} 2101}
1998 2102
2103# used to laod the header of an instantiated map
1999sub load_header_temp { 2104sub load_header_temp {
2000 my ($self) = @_; 2105 my ($self) = @_;
2001 2106
2002 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
2003} 2108}
2004 2109
2110# called after loading the header from an instantiated map
2005sub prepare_temp { 2111sub prepare_temp {
2006 my ($self) = @_; 2112 my ($self) = @_;
2007 2113
2008 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
2009 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
2010 # safety 2116 # safety
2011 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
2012 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
2013} 2119}
2014 2120
2121# called after loading the header from an original map
2015sub prepare_orig { 2122sub prepare_orig {
2016 my ($self) = @_; 2123 my ($self) = @_;
2017 2124
2018 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
2019 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
… …
2043 2150
2044sub find; 2151sub find;
2045sub find { 2152sub find {
2046 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
2047 2154
2155 cf::cede_to_tick;
2156
2048 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
2049 2158
2050 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2051 my $guard2 = cf::lock_acquire "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
2052 2161
2053 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
… …
2084 2193
2085 { 2194 {
2086 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2087 2196
2088 return unless $self->valid; 2197 return unless $self->valid;
2089 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2090
2091 $self->in_memory (cf::MAP_LOADING);
2092 2199
2093 $self->alloc; 2200 $self->alloc;
2094 2201
2095 $self->pre_load; 2202 $self->pre_load;
2096 cf::cede_to_tick; 2203 cf::cede_to_tick;
2097 2204
2205 if (exists $self->{load_path}) {
2098 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2099 $f->skip_block; 2207 $f->skip_block;
2100 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2101 or return; 2209 or return;
2102 2210
2103 $self->post_load_original 2211 $self->post_load_original
2104 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2105 2213
2106 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2107 utf8::encode $uniq; 2215 utf8::encode $uniq;
2108 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2109 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2110 $self->clear_unique_items; 2218 $self->clear_unique_items;
2111 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2112 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2113 } 2222 }
2114 } 2223 }
2115 }
2116 2224
2117 $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);
2118 2232
2119 cf::cede_to_tick; 2233 cf::cede_to_tick;
2120 # now do the right thing for maps 2234 # now do the right thing for maps
2121 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2122 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
… …
2125 2239
2126 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2127 $self->decay_objects; 2241 $self->decay_objects;
2128 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2129 $self->update_buttons; 2243 $self->update_buttons;
2244 $self->post_load_physics;
2130 cf::cede_to_tick; 2245 cf::cede_to_tick;
2131 $self->activate; 2246 #$self->activate; # no longer activate maps automatically
2132 } 2247 }
2133 2248
2134 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2135 $self->last_access ($cf::RUNTIME); 2250 $self->last_access ($cf::RUNTIME);
2136
2137 $self->in_memory (cf::MAP_ACTIVE);
2138 } 2251 }
2139 2252
2140 $self->post_load; 2253 $self->post_load;
2254
2255 1
2141} 2256}
2142 2257
2143# customize the map for a given player, i.e. 2258# customize the map for a given player, i.e.
2144# return the _real_ map. used by e.g. per-player 2259# return the _real_ map. used by e.g. per-player
2145# maps to change the path to ~playername/mappath 2260# maps to change the path to ~playername/mappath
… …
2183} 2298}
2184 2299
2185sub find_sync { 2300sub find_sync {
2186 my ($path, $origin) = @_; 2301 my ($path, $origin) = @_;
2187 2302
2188 cf::sync_job { find $path, $origin } 2303 # it's a bug to call this from the main context
2304 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2305 if $Coro::current == $Coro::main;
2306
2307 find $path, $origin
2189} 2308}
2190 2309
2191sub do_load_sync { 2310sub do_load_sync {
2192 my ($map) = @_; 2311 my ($map) = @_;
2193 2312
2313 # it's a bug to call this from the main context
2194 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2314 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2195 if $Coro::current == $Coro::main; 2315 if $Coro::current == $Coro::main;
2196 2316
2197 cf::sync_job { $map->load }; 2317 $map->load;
2198} 2318}
2199 2319
2200our %MAP_PREFETCH; 2320our %MAP_PREFETCH;
2201our $MAP_PREFETCHER = undef; 2321our $MAP_PREFETCHER = undef;
2202 2322
2203sub find_async { 2323sub find_async {
2204 my ($path, $origin, $load) = @_; 2324 my ($path, $origin, $load) = @_;
2205 2325
2206 $path = normalise $path, $origin && $origin->{path}; 2326 $path = normalise $path, $origin;
2207 2327
2328 print "find async $path (from $origin)\n";#d#
2329
2208 if (my $map = $cf::MAP{$path}) { 2330 if (my $map = $cf::MAP{$path}) {
2209 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2331 return $map if !$load || $map->linkable;
2210 } 2332 }
2211 2333
2212 $MAP_PREFETCH{$path} |= $load; 2334 $MAP_PREFETCH{$path} |= $load;
2213 2335
2214 $MAP_PREFETCHER ||= cf::async { 2336 $MAP_PREFETCHER ||= cf::async {
… …
2273sub swap_out { 2395sub swap_out {
2274 my ($self) = @_; 2396 my ($self) = @_;
2275 2397
2276 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2398 my $lock = cf::lock_acquire "map_data:$self->{path}";
2277 2399
2278 return if $self->in_memory != cf::MAP_ACTIVE; 2400 return if !$self->linkable;
2279 return if $self->{deny_save}; 2401 return if $self->{deny_save};
2280 return if $self->players; 2402 return if $self->players;
2281 2403
2282 # first deactivate the map and "unlink" it from the core 2404 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate; 2405 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP; 2406 $_->clear_links_to ($self) for values %cf::MAP;
2285 $self->in_memory (cf::MAP_SWAPPED); 2407 $self->state (cf::MAP_SWAPPED);
2286 2408
2287 # then atomically save 2409 # then atomically save
2288 $self->_save; 2410 $self->_save;
2289 2411
2290 # then free the map 2412 # then free the map
… …
2314 2436
2315 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2437 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316 2438
2317 return if $self->players; 2439 return if $self->players;
2318 2440
2319 warn "resetting map ", $self->path, "\n"; 2441 cf::trace "resetting map ", $self->path, "\n";
2320 2442
2321 $self->in_memory (cf::MAP_SWAPPED); 2443 $self->state (cf::MAP_SWAPPED);
2322 2444
2323 # need to save uniques path 2445 # need to save uniques path
2324 unless ($self->{deny_save}) { 2446 unless ($self->{deny_save}) {
2325 my $uniq = $self->uniq_path; utf8::encode $uniq; 2447 my $uniq = $self->uniq_path; utf8::encode $uniq;
2326 2448
… …
2689 2811
2690sub cf::object::player::goto { 2812sub cf::object::player::goto {
2691 my ($self, $path, $x, $y, $check, $done) = @_; 2813 my ($self, $path, $x, $y, $check, $done) = @_;
2692 2814
2693 if ($self->{_link_recursion} >= $MAX_LINKS) { 2815 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting."; 2816 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695 $self->failmsg ("Something went wrong inside the server - please contact an administrator!"); 2817 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION; 2818 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 } 2819 }
2698 2820
2699 # do generation counting so two concurrent goto's will be executed in-order 2821 # do generation counting so two concurrent goto's will be executed in-order
… …
2722 ($path, $x, $y) = (undef, undef, undef); 2844 ($path, $x, $y) = (undef, undef, undef);
2723 } 2845 }
2724 } 2846 }
2725 2847
2726 my $map = eval { 2848 my $map = eval {
2727 my $map = defined $path ? cf::map::find $path : undef; 2849 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2728 2850
2729 if ($map) { 2851 if ($map) {
2730 $map = $map->customise_for ($self); 2852 $map = $map->customise_for ($self);
2731 $map = $check->($map, $x, $y, $self) if $check && $map; 2853 $map = $check->($map, $x, $y, $self) if $check && $map;
2732 } else { 2854 } else {
… …
2822 $Coro::current->{desc} = "enter_exit"; 2944 $Coro::current->{desc} = "enter_exit";
2823 2945
2824 unless (eval { 2946 unless (eval {
2825 $self->deactivate_recursive; # just to be sure 2947 $self->deactivate_recursive; # just to be sure
2826 2948
2827 # random map handling
2828 {
2829 my $guard = cf::lock_acquire "exit_prepare:$exit";
2830
2831 prepare_random_map $exit
2832 if $exit->slaying eq "/!";
2833 }
2834
2835 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2949 my $map = cf::map::normalise $exit->slaying, $exit->map;
2836 my $x = $exit->stats->hp; 2950 my $x = $exit->stats->hp;
2837 my $y = $exit->stats->sp; 2951 my $y = $exit->stats->sp;
2952
2953 # special map handling
2954 my $slaying = $exit->slaying;
2955
2956 # special map handling
2957 if ($slaying eq "/!") {
2958 my $guard = cf::lock_acquire "exit_prepare:$exit";
2959
2960 prepare_random_map $exit
2961 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2962
2963 $map = $exit->slaying;
2964
2965 } elsif ($slaying eq '!up') {
2966 $map = $exit->map->tile_path (cf::TILE_UP);
2967 $x = $exit->x;
2968 $y = $exit->y;
2969
2970 } elsif ($slaying eq '!down') {
2971 $map = $exit->map->tile_path (cf::TILE_DOWN);
2972 $x = $exit->x;
2973 $y = $exit->y;
2974 }
2838 2975
2839 $self->goto ($map, $x, $y); 2976 $self->goto ($map, $x, $y);
2840 2977
2841 # if exit is damned, update players death & WoR home-position 2978 # if exit is damned, update players death & WoR home-position
2842 $self->contr->savebed ($map, $x, $y) 2979 $self->contr->savebed ($map, $x, $y)
… …
2847 $self->message ("Something went wrong deep within the deliantra server. " 2984 $self->message ("Something went wrong deep within the deliantra server. "
2848 . "I'll try to bring you back to the map you were before. " 2985 . "I'll try to bring you back to the map you were before. "
2849 . "Please report this to the dungeon master!", 2986 . "Please report this to the dungeon master!",
2850 cf::NDI_UNIQUE | cf::NDI_RED); 2987 cf::NDI_UNIQUE | cf::NDI_RED);
2851 2988
2852 warn "ERROR in enter_exit: $@"; 2989 error "ERROR in enter_exit: $@";
2853 $self->leave_link; 2990 $self->leave_link;
2854 } 2991 }
2855 })->prio (1); 2992 })->prio (1);
2856} 2993}
2857 2994
… …
3170 3307
3171 $ns->ext_reply ($reply, @reply) 3308 $ns->ext_reply ($reply, @reply)
3172 if $reply; 3309 if $reply;
3173 3310
3174 } else { 3311 } else {
3175 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3312 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3176 } 3313 }
3177 3314
3178 cf::override; 3315 cf::override;
3179 }, 3316 },
3180); 3317);
… …
3261 decrease split destroy change_exp value msg lore send_msg)], 3398 decrease split destroy change_exp value msg lore send_msg)],
3262 ["cf::object::player" => qw(player)], 3399 ["cf::object::player" => qw(player)],
3263 ["cf::player" => qw(peaceful send_msg)], 3400 ["cf::player" => qw(peaceful send_msg)],
3264 ["cf::map" => qw(trigger)], 3401 ["cf::map" => qw(trigger)],
3265) { 3402) {
3266 no strict 'refs';
3267 my ($pkg, @funs) = @$_; 3403 my ($pkg, @funs) = @$_;
3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3404 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3269 for @funs; 3405 for @funs;
3270} 3406}
3271 3407
… …
3310 local @cf::_safe_eval_args = values %vars; 3446 local @cf::_safe_eval_args = values %vars;
3311 @res = wantarray ? eval eval : scalar eval $eval; 3447 @res = wantarray ? eval eval : scalar eval $eval;
3312 } 3448 }
3313 3449
3314 if ($@) { 3450 if ($@) {
3315 warn "$@"; 3451 warn "$@",
3316 warn "while executing safe code '$code'\n"; 3452 "while executing safe code '$code'\n",
3317 warn "with arguments " . (join " ", %vars) . "\n"; 3453 "with arguments " . (join " ", %vars) . "\n";
3318 } 3454 }
3319 3455
3320 wantarray ? @res : $res[0] 3456 wantarray ? @res : $res[0]
3321} 3457}
3322 3458
… …
3356 # for this (global event?) 3492 # for this (global event?)
3357 %ext::player_env::MUSIC_FACE_CACHE = (); 3493 %ext::player_env::MUSIC_FACE_CACHE = ();
3358 3494
3359 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3495 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3360 3496
3361 warn "loading facedata from $path\n"; 3497 trace "loading facedata from $path\n";
3362 3498
3363 my $facedata; 3499 my $facedata = decode_storable load_file $path;
3364 0 < aio_load $path, $facedata
3365 or die "$path: $!";
3366
3367 $facedata = Coro::Storable::thaw $facedata;
3368 3500
3369 $facedata->{version} == 2 3501 $facedata->{version} == 2
3370 or cf::cleanup "$path: version mismatch, cannot proceed."; 3502 or cf::cleanup "$path: version mismatch, cannot proceed.";
3371 3503
3372 # patch in the exptable 3504 # patch in the exptable
… …
3386 3518
3387 cf::face::set_visibility $idx, $info->{visibility}; 3519 cf::face::set_visibility $idx, $info->{visibility};
3388 cf::face::set_magicmap $idx, $info->{magicmap}; 3520 cf::face::set_magicmap $idx, $info->{magicmap};
3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3521 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3522 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3523 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3391 3524
3392 cf::cede_to_tick; 3525 cf::cede_to_tick;
3393 } 3526 }
3394 3527
3395 while (my ($face, $info) = each %$faces) { 3528 while (my ($face, $info) = each %$faces) {
… …
3400 3533
3401 if (my $smooth = cf::face::find $info->{smooth}) { 3534 if (my $smooth = cf::face::find $info->{smooth}) {
3402 cf::face::set_smooth $idx, $smooth; 3535 cf::face::set_smooth $idx, $smooth;
3403 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3536 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3404 } else { 3537 } else {
3405 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3538 error "smooth face '$info->{smooth}' not found for face '$face'";
3406 } 3539 }
3407 3540
3408 cf::cede_to_tick; 3541 cf::cede_to_tick;
3409 } 3542 }
3410 } 3543 }
… …
3488 load_resource_file "$DATADIR/treasures" 3621 load_resource_file "$DATADIR/treasures"
3489 or die "unable to load treasurelists\n"; 3622 or die "unable to load treasurelists\n";
3490} 3623}
3491 3624
3492sub reload_sound { 3625sub reload_sound {
3493 warn "loading sound config from $DATADIR/sound\n"; 3626 trace "loading sound config from $DATADIR/sound\n";
3494 3627
3495 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3496 or die "$DATADIR/sound $!";
3497
3498 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3628 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3499 3629
3500 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3630 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3501 my $sound = $soundconf->{compat}[$_] 3631 my $sound = $soundconf->{compat}[$_]
3502 or next; 3632 or next;
3503 3633
… …
3511 cf::sound::set $k => $face; 3641 cf::sound::set $k => $face;
3512 } 3642 }
3513} 3643}
3514 3644
3515sub reload_resources { 3645sub reload_resources {
3516 warn "reloading resource files...\n"; 3646 trace "reloading resource files...\n";
3517 3647
3648 reload_exp_table;
3649 reload_materials;
3518 reload_facedata; 3650 reload_facedata;
3519 reload_sound; 3651 reload_sound;
3520 reload_archetypes; 3652 reload_archetypes;
3521 reload_regions; 3653 reload_regions;
3522 reload_treasures; 3654 reload_treasures;
3523 3655
3524 warn "finished reloading resource files\n"; 3656 trace "finished reloading resource files\n";
3525} 3657}
3526 3658
3527sub reload_config { 3659sub reload_config {
3528 warn "reloading config file...\n"; 3660 trace "reloading config file...\n";
3529 3661
3530 open my $fh, "<:utf8", "$CONFDIR/config" 3662 my $config = load_file "$CONFDIR/config";
3531 or return; 3663 utf8::decode $config;
3532 3664 *CFG = decode_yaml $config;
3533 local $/;
3534 *CFG = YAML::XS::Load scalar <$fh>;
3535 3665
3536 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3666 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3537 3667
3538 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3668 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3539 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3669 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3543 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3673 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3544 and die "WARNING: m(un)lockall failed: $!\n"; 3674 and die "WARNING: m(un)lockall failed: $!\n";
3545 }; 3675 };
3546 warn $@ if $@; 3676 warn $@ if $@;
3547 } 3677 }
3548
3549 warn "finished reloading resource files\n";
3550} 3678}
3551 3679
3552sub pidfile() { 3680sub pidfile() {
3553 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3681 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3554 or die "$PIDFILE: $!"; 3682 or die "$PIDFILE: $!";
… …
3567 seek $fh, 0, 0; 3695 seek $fh, 0, 0;
3568 print $fh $$; 3696 print $fh $$;
3569} 3697}
3570 3698
3571sub main_loop { 3699sub main_loop {
3572 warn "EV::loop starting\n"; 3700 trace "EV::loop starting\n";
3573 if (1) { 3701 if (1) {
3574 EV::loop; 3702 EV::loop;
3575 } 3703 }
3576 warn "EV::loop returned\n"; 3704 trace "EV::loop returned\n";
3577 goto &main_loop unless $REALLY_UNLOOP; 3705 goto &main_loop unless $REALLY_UNLOOP;
3578} 3706}
3579 3707
3580sub main { 3708sub main {
3581 cf::init_globals; # initialise logging 3709 cf::init_globals; # initialise logging
3582 3710
3583 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3711 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3584 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3712 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3585 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3713 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3586 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3714 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3587 3715
3588 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3716 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3589 3717
… …
3597 }; 3725 };
3598 3726
3599 evthread_start IO::AIO::poll_fileno; 3727 evthread_start IO::AIO::poll_fileno;
3600 3728
3601 cf::sync_job { 3729 cf::sync_job {
3602 cf::init_experience; 3730 cf::incloader::init ();
3731
3603 cf::init_anim; 3732 cf::init_anim;
3604 cf::init_attackmess; 3733 cf::init_attackmess;
3605 cf::init_dynamic; 3734 cf::init_dynamic;
3606 3735
3607 cf::load_settings; 3736 cf::load_settings;
3608 cf::load_materials;
3609 3737
3610 reload_resources; 3738 reload_resources;
3611 reload_config; 3739 reload_config;
3612 db_init; 3740 db_init;
3613 3741
… …
3625 3753
3626 # no (long-running) fork's whatsoever before this point(!) 3754 # no (long-running) fork's whatsoever before this point(!)
3627 use POSIX (); 3755 use POSIX ();
3628 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3756 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3629 3757
3630 (pop @POST_INIT)->(0) while @POST_INIT; 3758 cf::_post_init 0;
3631 }; 3759 };
3632 3760
3633 cf::object::thawer::errors_are_fatal 0; 3761 cf::object::thawer::errors_are_fatal 0;
3634 warn "parse errors in files are no longer fatal from this point on.\n"; 3762 info "parse errors in files are no longer fatal from this point on.\n";
3635 3763
3764 my $free_main; $free_main = EV::idle sub {
3765 undef $free_main;
3766 undef &main; # free gobs of memory :)
3767 };
3768
3636 main_loop; 3769 goto &main_loop;
3637} 3770}
3638 3771
3639############################################################################# 3772#############################################################################
3640# initialisation and cleanup 3773# initialisation and cleanup
3641 3774
… …
3680 or return; 3813 or return;
3681 3814
3682 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3815 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3683 and return; 3816 and return;
3684 3817
3685 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3818 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3686 3819
3687 1 3820 1
3688} 3821}
3689 3822
3690our $uuid_lock; 3823our $uuid_lock;
… …
3702 or return; 3835 or return;
3703 3836
3704 my $value = uuid_seq uuid_cur; 3837 my $value = uuid_seq uuid_cur;
3705 3838
3706 unless ($value) { 3839 unless ($value) {
3707 warn "cowardly refusing to write zero uuid value!\n"; 3840 info "cowardly refusing to write zero uuid value!\n";
3708 return; 3841 return;
3709 } 3842 }
3710 3843
3711 my $value = uuid_str $value + $uuid_skip; 3844 my $value = uuid_str $value + $uuid_skip;
3712 $uuid_skip = 0; 3845 $uuid_skip = 0;
… …
3722 or return; 3855 or return;
3723 3856
3724 aio_rename "$uuid~", $uuid 3857 aio_rename "$uuid~", $uuid
3725 and return; 3858 and return;
3726 3859
3727 warn "uuid file written ($value).\n"; 3860 trace "uuid file written ($value).\n";
3728 3861
3729 1 3862 1
3730 3863
3731} 3864}
3732 3865
… …
3738} 3871}
3739 3872
3740sub emergency_save() { 3873sub emergency_save() {
3741 my $freeze_guard = cf::freeze_mainloop; 3874 my $freeze_guard = cf::freeze_mainloop;
3742 3875
3743 warn "emergency_perl_save: enter\n"; 3876 info "emergency_perl_save: enter\n";
3877
3878 # this is a trade-off: we want to be very quick here, so
3879 # save all maps without fsync, and later call a global sync
3880 # (which in turn might be very very slow)
3881 local $USE_FSYNC = 0;
3744 3882
3745 cf::sync_job { 3883 cf::sync_job {
3746 # this is a trade-off: we want to be very quick here, so 3884 cf::write_runtime_sync; # external watchdog should not bark
3747 # save all maps without fsync, and later call a global sync
3748 # (which in turn might be very very slow)
3749 local $USE_FSYNC = 0;
3750 3885
3751 # use a peculiar iteration method to avoid tripping on perl 3886 # use a peculiar iteration method to avoid tripping on perl
3752 # refcount bugs in for. also avoids problems with players 3887 # refcount bugs in for. also avoids problems with players
3753 # and maps saved/destroyed asynchronously. 3888 # and maps saved/destroyed asynchronously.
3754 warn "emergency_perl_save: begin player save\n"; 3889 info "emergency_perl_save: begin player save\n";
3755 for my $login (keys %cf::PLAYER) { 3890 for my $login (keys %cf::PLAYER) {
3756 my $pl = $cf::PLAYER{$login} or next; 3891 my $pl = $cf::PLAYER{$login} or next;
3757 $pl->valid or next; 3892 $pl->valid or next;
3758 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3893 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3759 $pl->save; 3894 $pl->save;
3760 } 3895 }
3761 warn "emergency_perl_save: end player save\n"; 3896 info "emergency_perl_save: end player save\n";
3762 3897
3898 cf::write_runtime_sync; # external watchdog should not bark
3899
3763 warn "emergency_perl_save: begin map save\n"; 3900 info "emergency_perl_save: begin map save\n";
3764 for my $path (keys %cf::MAP) { 3901 for my $path (keys %cf::MAP) {
3765 my $map = $cf::MAP{$path} or next; 3902 my $map = $cf::MAP{$path} or next;
3766 $map->valid or next; 3903 $map->valid or next;
3767 $map->save; 3904 $map->save;
3768 } 3905 }
3769 warn "emergency_perl_save: end map save\n"; 3906 info "emergency_perl_save: end map save\n";
3770 3907
3908 cf::write_runtime_sync; # external watchdog should not bark
3909
3771 warn "emergency_perl_save: begin database checkpoint\n"; 3910 info "emergency_perl_save: begin database checkpoint\n";
3772 BDB::db_env_txn_checkpoint $DB_ENV; 3911 BDB::db_env_txn_checkpoint $DB_ENV;
3773 warn "emergency_perl_save: end database checkpoint\n"; 3912 info "emergency_perl_save: end database checkpoint\n";
3774 3913
3775 warn "emergency_perl_save: begin write uuid\n"; 3914 info "emergency_perl_save: begin write uuid\n";
3776 write_uuid_sync 1; 3915 write_uuid_sync 1;
3777 warn "emergency_perl_save: end write uuid\n"; 3916 info "emergency_perl_save: end write uuid\n";
3917
3918 cf::write_runtime_sync; # external watchdog should not bark
3919
3920 trace "emergency_perl_save: syncing database to disk";
3921 BDB::db_env_txn_checkpoint $DB_ENV;
3922
3923 info "emergency_perl_save: starting sync\n";
3924 IO::AIO::aio_sync sub {
3925 info "emergency_perl_save: finished sync\n";
3926 };
3927
3928 cf::write_runtime_sync; # external watchdog should not bark
3929
3930 trace "emergency_perl_save: flushing outstanding aio requests";
3931 while (IO::AIO::nreqs || BDB::nreqs) {
3932 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3933 }
3934
3935 cf::write_runtime_sync; # external watchdog should not bark
3778 }; 3936 };
3779 3937
3780 warn "emergency_perl_save: starting sync()\n";
3781 IO::AIO::aio_sync sub {
3782 warn "emergency_perl_save: finished sync()\n";
3783 };
3784
3785 warn "emergency_perl_save: leave\n"; 3938 info "emergency_perl_save: leave\n";
3786} 3939}
3787 3940
3788sub post_cleanup { 3941sub post_cleanup {
3789 my ($make_core) = @_; 3942 my ($make_core) = @_;
3790 3943
3944 IO::AIO::flush;
3945
3791 warn Carp::longmess "post_cleanup backtrace" 3946 error Carp::longmess "post_cleanup backtrace"
3792 if $make_core; 3947 if $make_core;
3793 3948
3794 my $fh = pidfile; 3949 my $fh = pidfile;
3795 unlink $PIDFILE if <$fh> == $$; 3950 unlink $PIDFILE if <$fh> == $$;
3796} 3951}
… …
3820 } 3975 }
3821} 3976}
3822 3977
3823sub do_reload_perl() { 3978sub do_reload_perl() {
3824 # can/must only be called in main 3979 # can/must only be called in main
3825 if (in_main) { 3980 unless (in_main) {
3826 warn "can only reload from main coroutine"; 3981 error "can only reload from main coroutine";
3827 return; 3982 return;
3828 } 3983 }
3829 3984
3830 return if $RELOAD++; 3985 return if $RELOAD++;
3831 3986
3832 my $t1 = AE::time; 3987 my $t1 = AE::time;
3833 3988
3834 while ($RELOAD) { 3989 while ($RELOAD) {
3835 warn "reloading..."; 3990 cf::get_slot 0.1, -1, "reload_perl";
3991 info "perl_reload: reloading...";
3836 3992
3837 warn "entering sync_job"; 3993 trace "perl_reload: entering sync_job";
3838 3994
3839 cf::sync_job { 3995 cf::sync_job {
3840 cf::write_runtime_sync; # external watchdog should not bark
3841 cf::emergency_save; 3996 #cf::emergency_save;
3842 cf::write_runtime_sync; # external watchdog should not bark
3843 3997
3844 warn "syncing database to disk";
3845 BDB::db_env_txn_checkpoint $DB_ENV;
3846
3847 # if anything goes wrong in here, we should simply crash as we already saved
3848
3849 warn "flushing outstanding aio requests";
3850 while (IO::AIO::nreqs || BDB::nreqs) {
3851 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3852 }
3853
3854 warn "cancelling all extension coros"; 3998 trace "perl_reload: cancelling all extension coros";
3855 $_->cancel for values %EXT_CORO; 3999 $_->cancel for values %EXT_CORO;
3856 %EXT_CORO = (); 4000 %EXT_CORO = ();
3857 4001
3858 warn "removing commands"; 4002 trace "perl_reload: removing commands";
3859 %COMMAND = (); 4003 %COMMAND = ();
3860 4004
3861 warn "removing ext/exti commands"; 4005 trace "perl_reload: removing ext/exti commands";
3862 %EXTCMD = (); 4006 %EXTCMD = ();
3863 %EXTICMD = (); 4007 %EXTICMD = ();
3864 4008
3865 warn "unloading/nuking all extensions"; 4009 trace "perl_reload: unloading/nuking all extensions";
3866 for my $pkg (@EXTS) { 4010 for my $pkg (@EXTS) {
3867 warn "... unloading $pkg"; 4011 trace "... unloading $pkg";
3868 4012
3869 if (my $cb = $pkg->can ("unload")) { 4013 if (my $cb = $pkg->can ("unload")) {
3870 eval { 4014 eval {
3871 $cb->($pkg); 4015 $cb->($pkg);
3872 1 4016 1
3873 } or warn "$pkg unloaded, but with errors: $@"; 4017 } or error "$pkg unloaded, but with errors: $@";
3874 } 4018 }
3875 4019
3876 warn "... clearing $pkg"; 4020 trace "... clearing $pkg";
3877 clear_package $pkg; 4021 clear_package $pkg;
3878 } 4022 }
3879 4023
3880 warn "unloading all perl modules loaded from $LIBDIR"; 4024 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3881 while (my ($k, $v) = each %INC) { 4025 while (my ($k, $v) = each %INC) {
3882 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4026 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3883 4027
3884 warn "... unloading $k"; 4028 trace "... unloading $k";
3885 delete $INC{$k}; 4029 delete $INC{$k};
3886 4030
3887 $k =~ s/\.pm$//; 4031 $k =~ s/\.pm$//;
3888 $k =~ s/\//::/g; 4032 $k =~ s/\//::/g;
3889 4033
… …
3892 } 4036 }
3893 4037
3894 clear_package $k; 4038 clear_package $k;
3895 } 4039 }
3896 4040
3897 warn "getting rid of safe::, as good as possible"; 4041 trace "perl_reload: getting rid of safe::, as good as possible";
3898 clear_package "safe::$_" 4042 clear_package "safe::$_"
3899 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4043 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3900 4044
3901 warn "unloading cf.pm \"a bit\""; 4045 trace "perl_reload: unloading cf.pm \"a bit\"";
3902 delete $INC{"cf.pm"}; 4046 delete $INC{"cf.pm"};
3903 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4047 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3904 4048
3905 # don't, removes xs symbols, too, 4049 # don't, removes xs symbols, too,
3906 # and global variables created in xs 4050 # and global variables created in xs
3907 #clear_package __PACKAGE__; 4051 #clear_package __PACKAGE__;
3908 4052
3909 warn "unload completed, starting to reload now"; 4053 info "perl_reload: unload completed, starting to reload now";
3910 4054
3911 warn "reloading cf.pm"; 4055 trace "perl_reload: reloading cf.pm";
3912 require cf; 4056 require cf;
3913 cf::_connect_to_perl_1; 4057 cf::_connect_to_perl_1;
3914 4058
3915 warn "loading config and database again"; 4059 trace "perl_reload: loading config and database again";
3916 cf::reload_config; 4060 cf::reload_config;
3917 4061
3918 warn "loading extensions"; 4062 trace "perl_reload: loading extensions";
3919 cf::load_extensions; 4063 cf::load_extensions;
3920 4064
3921 if ($REATTACH_ON_RELOAD) { 4065 if ($REATTACH_ON_RELOAD) {
3922 warn "reattaching attachments to objects/players"; 4066 trace "perl_reload: reattaching attachments to objects/players";
3923 _global_reattach; # objects, sockets 4067 _global_reattach; # objects, sockets
3924 warn "reattaching attachments to maps"; 4068 trace "perl_reload: reattaching attachments to maps";
3925 reattach $_ for values %MAP; 4069 reattach $_ for values %MAP;
3926 warn "reattaching attachments to players"; 4070 trace "perl_reload: reattaching attachments to players";
3927 reattach $_ for values %PLAYER; 4071 reattach $_ for values %PLAYER;
3928 } 4072 }
3929 4073
3930 warn "running post_init jobs"; 4074 cf::_post_init 1;
3931 (pop @POST_INIT)->(1) while @POST_INIT;
3932 4075
3933 warn "leaving sync_job"; 4076 trace "perl_reload: leaving sync_job";
3934 4077
3935 1 4078 1
3936 } or do { 4079 } or do {
3937 warn $@; 4080 error $@;
3938 cf::cleanup "error while reloading, exiting."; 4081 cf::cleanup "perl_reload: error, exiting.";
3939 }; 4082 };
3940 4083
3941 warn "reloaded";
3942 --$RELOAD; 4084 --$RELOAD;
3943 } 4085 }
3944 4086
3945 $t1 = AE::time - $t1; 4087 $t1 = AE::time - $t1;
3946 warn "reload completed in ${t1}s\n"; 4088 info "perl_reload: completed in ${t1}s\n";
3947}; 4089};
3948 4090
3949our $RELOAD_WATCHER; # used only during reload 4091our $RELOAD_WATCHER; # used only during reload
3950 4092
3951sub reload_perl() { 4093sub reload_perl() {
… …
3972 reload_perl; 4114 reload_perl;
3973 }; 4115 };
3974 } 4116 }
3975}; 4117};
3976 4118
3977unshift @INC, $LIBDIR; 4119#############################################################################
3978 4120
3979my $bug_warning = 0; 4121my $bug_warning = 0;
3980 4122
3981our @WAIT_FOR_TICK;
3982our @WAIT_FOR_TICK_BEGIN;
3983
3984sub wait_for_tick { 4123sub wait_for_tick() {
3985 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4124 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3986 4125
3987 my $signal = new Coro::Signal; 4126 $WAIT_FOR_TICK->wait;
3988 push @WAIT_FOR_TICK, $signal;
3989 $signal->wait;
3990} 4127}
3991 4128
3992sub wait_for_tick_begin { 4129sub wait_for_tick_begin() {
3993 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4130 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3994 4131
3995 my $signal = new Coro::Signal; 4132 my $signal = new Coro::Signal;
3996 push @WAIT_FOR_TICK_BEGIN, $signal; 4133 push @WAIT_FOR_TICK_BEGIN, $signal;
3997 $signal->wait; 4134 $signal->wait;
3998} 4135}
… …
4002 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4139 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4003 unless ++$bug_warning > 10; 4140 unless ++$bug_warning > 10;
4004 return; 4141 return;
4005 } 4142 }
4006 4143
4007 cf::server_tick; # one server iteration 4144 cf::one_tick; # one server iteration
4008 4145
4009 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4146 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4010 4147
4011 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4148 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4012 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4149 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4013 Coro::async_pool { 4150 Coro::async_pool {
4014 $Coro::current->{desc} = "runtime saver"; 4151 $Coro::current->{desc} = "runtime saver";
4015 write_runtime_sync 4152 write_runtime_sync
4016 or warn "ERROR: unable to write runtime file: $!"; 4153 or error "ERROR: unable to write runtime file: $!";
4017 }; 4154 };
4018 } 4155 }
4019 4156
4020 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4021 $sig->send; 4158 $sig->send;
4022 } 4159 }
4023 while (my $sig = shift @WAIT_FOR_TICK) { 4160 $WAIT_FOR_TICK->broadcast;
4024 $sig->send;
4025 }
4026 4161
4027 $LOAD = ($NOW - $TICK_START) / $TICK; 4162 $LOAD = ($NOW - $TICK_START) / $TICK;
4028 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4163 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4029 4164
4030 if (0) { 4165 if (0) {
4031 if ($NEXT_TICK) { 4166 if ($NEXT_TICK) {
4032 my $jitter = $TICK_START - $NEXT_TICK; 4167 my $jitter = $TICK_START - $NEXT_TICK;
4033 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4168 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4034 warn "jitter $JITTER\n";#d# 4169 debug "jitter $JITTER\n";#d#
4035 } 4170 }
4036 } 4171 }
4037} 4172}
4038 4173
4039{ 4174{
… …
4084 IO::AIO::min_parallel 8; 4219 IO::AIO::min_parallel 8;
4085 IO::AIO::max_poll_time $TICK * 0.1; 4220 IO::AIO::max_poll_time $TICK * 0.1;
4086 undef $AnyEvent::AIO::WATCHER; 4221 undef $AnyEvent::AIO::WATCHER;
4087} 4222}
4088 4223
4089my $_log_backtrace; 4224our $_log_backtrace;
4225our $_log_backtrace_last;
4090 4226
4091sub _log_backtrace { 4227sub _log_backtrace {
4092 my ($msg, @addr) = @_; 4228 my ($msg, @addr) = @_;
4093 4229
4094 $msg =~ s/\n//; 4230 $msg =~ s/\n$//;
4095 4231
4232 if ($_log_backtrace_last eq $msg) {
4233 LOG llevInfo, "[ABT] $msg\n";
4234 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4096 # limit the # of concurrent backtraces 4235 # limit the # of concurrent backtraces
4097 if ($_log_backtrace < 2) { 4236 } elsif ($_log_backtrace < 2) {
4237 $_log_backtrace_last = $msg;
4098 ++$_log_backtrace; 4238 ++$_log_backtrace;
4099 my $perl_bt = Carp::longmess $msg; 4239 my $perl_bt = Carp::longmess $msg;
4100 async { 4240 async {
4101 $Coro::current->{desc} = "abt $msg"; 4241 $Coro::current->{desc} = "abt $msg";
4102 4242
… …
4122 LOG llevInfo, "[ABT] $_\n" for @bt; 4262 LOG llevInfo, "[ABT] $_\n" for @bt;
4123 --$_log_backtrace; 4263 --$_log_backtrace;
4124 }; 4264 };
4125 } else { 4265 } else {
4126 LOG llevInfo, "[ABT] $msg\n"; 4266 LOG llevInfo, "[ABT] $msg\n";
4127 LOG llevInfo, "[ABT] [suppressed]\n"; 4267 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4128 } 4268 }
4129} 4269}
4130 4270
4131# load additional modules 4271# load additional modules
4132require "cf/$_.pm" for @EXTRA_MODULES; 4272require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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