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.530 by root, Wed Apr 28 21:05:33 2010 UTC vs.
Revision 1.573 by root, Sun May 8 12:40:42 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
… …
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
… …
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)
… …
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;
2130 cf::cede_to_tick; 2244 cf::cede_to_tick;
2131 $self->activate; 2245 #$self->activate; # no longer activate maps automatically
2132 } 2246 }
2133 2247
2134 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2135 $self->last_access ($cf::RUNTIME); 2249 $self->last_access ($cf::RUNTIME);
2136
2137 $self->in_memory (cf::MAP_ACTIVE);
2138 } 2250 }
2139 2251
2140 $self->post_load; 2252 $self->post_load;
2253
2254 1
2141} 2255}
2142 2256
2143# customize the map for a given player, i.e. 2257# customize the map for a given player, i.e.
2144# return the _real_ map. used by e.g. per-player 2258# return the _real_ map. used by e.g. per-player
2145# maps to change the path to ~playername/mappath 2259# maps to change the path to ~playername/mappath
… …
2183} 2297}
2184 2298
2185sub find_sync { 2299sub find_sync {
2186 my ($path, $origin) = @_; 2300 my ($path, $origin) = @_;
2187 2301
2188 cf::sync_job { find $path, $origin } 2302 # it's a bug to call this from the main context
2303 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2304 if $Coro::current == $Coro::main;
2305
2306 find $path, $origin
2189} 2307}
2190 2308
2191sub do_load_sync { 2309sub do_load_sync {
2192 my ($map) = @_; 2310 my ($map) = @_;
2193 2311
2312 # it's a bug to call this from the main context
2194 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2313 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2195 if $Coro::current == $Coro::main; 2314 if $Coro::current == $Coro::main;
2196 2315
2197 cf::sync_job { $map->load }; 2316 $map->load;
2198} 2317}
2199 2318
2200our %MAP_PREFETCH; 2319our %MAP_PREFETCH;
2201our $MAP_PREFETCHER = undef; 2320our $MAP_PREFETCHER = undef;
2202 2321
2203sub find_async { 2322sub find_async {
2204 my ($path, $origin, $load) = @_; 2323 my ($path, $origin, $load) = @_;
2205 2324
2206 $path = normalise $path, $origin && $origin->{path}; 2325 $path = normalise $path, $origin;
2207 2326
2208 if (my $map = $cf::MAP{$path}) { 2327 if (my $map = $cf::MAP{$path}) {
2209 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2328 return $map if !$load || $map->linkable;
2210 } 2329 }
2211 2330
2212 $MAP_PREFETCH{$path} |= $load; 2331 $MAP_PREFETCH{$path} |= $load;
2213 2332
2214 $MAP_PREFETCHER ||= cf::async { 2333 $MAP_PREFETCHER ||= cf::async {
… …
2273sub swap_out { 2392sub swap_out {
2274 my ($self) = @_; 2393 my ($self) = @_;
2275 2394
2276 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2395 my $lock = cf::lock_acquire "map_data:$self->{path}";
2277 2396
2278 return if $self->in_memory != cf::MAP_ACTIVE; 2397 return if !$self->linkable;
2279 return if $self->{deny_save}; 2398 return if $self->{deny_save};
2280 return if $self->players; 2399 return if $self->players;
2281 2400
2282 # first deactivate the map and "unlink" it from the core 2401 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate; 2402 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP; 2403 $_->clear_links_to ($self) for values %cf::MAP;
2285 $self->in_memory (cf::MAP_SWAPPED); 2404 $self->state (cf::MAP_SWAPPED);
2286 2405
2287 # then atomically save 2406 # then atomically save
2288 $self->_save; 2407 $self->_save;
2289 2408
2290 # then free the map 2409 # then free the map
… …
2314 2433
2315 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2434 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316 2435
2317 return if $self->players; 2436 return if $self->players;
2318 2437
2319 warn "resetting map ", $self->path, "\n"; 2438 cf::trace "resetting map ", $self->path, "\n";
2320 2439
2321 $self->in_memory (cf::MAP_SWAPPED); 2440 $self->state (cf::MAP_SWAPPED);
2322 2441
2323 # need to save uniques path 2442 # need to save uniques path
2324 unless ($self->{deny_save}) { 2443 unless ($self->{deny_save}) {
2325 my $uniq = $self->uniq_path; utf8::encode $uniq; 2444 my $uniq = $self->uniq_path; utf8::encode $uniq;
2326 2445
… …
2689 2808
2690sub cf::object::player::goto { 2809sub cf::object::player::goto {
2691 my ($self, $path, $x, $y, $check, $done) = @_; 2810 my ($self, $path, $x, $y, $check, $done) = @_;
2692 2811
2693 if ($self->{_link_recursion} >= $MAX_LINKS) { 2812 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting."; 2813 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!"); 2814 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION; 2815 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 } 2816 }
2698 2817
2699 # do generation counting so two concurrent goto's will be executed in-order 2818 # do generation counting so two concurrent goto's will be executed in-order
… …
2722 ($path, $x, $y) = (undef, undef, undef); 2841 ($path, $x, $y) = (undef, undef, undef);
2723 } 2842 }
2724 } 2843 }
2725 2844
2726 my $map = eval { 2845 my $map = eval {
2727 my $map = defined $path ? cf::map::find $path : undef; 2846 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2728 2847
2729 if ($map) { 2848 if ($map) {
2730 $map = $map->customise_for ($self); 2849 $map = $map->customise_for ($self);
2731 $map = $check->($map, $x, $y, $self) if $check && $map; 2850 $map = $check->($map, $x, $y, $self) if $check && $map;
2732 } else { 2851 } else {
… …
2822 $Coro::current->{desc} = "enter_exit"; 2941 $Coro::current->{desc} = "enter_exit";
2823 2942
2824 unless (eval { 2943 unless (eval {
2825 $self->deactivate_recursive; # just to be sure 2944 $self->deactivate_recursive; # just to be sure
2826 2945
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; 2946 my $map = cf::map::normalise $exit->slaying, $exit->map;
2836 my $x = $exit->stats->hp; 2947 my $x = $exit->stats->hp;
2837 my $y = $exit->stats->sp; 2948 my $y = $exit->stats->sp;
2949
2950 # special map handling
2951 my $slaying = $exit->slaying;
2952
2953 # special map handling
2954 if ($slaying eq "/!") {
2955 my $guard = cf::lock_acquire "exit_prepare:$exit";
2956
2957 prepare_random_map $exit
2958 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2959
2960 $map = $exit->slaying;
2961
2962 } elsif ($slaying eq '!up') {
2963 $map = $exit->map->tile_path (cf::TILE_UP);
2964 $x = $exit->x;
2965 $y = $exit->y;
2966
2967 } elsif ($slaying eq '!down') {
2968 $map = $exit->map->tile_path (cf::TILE_DOWN);
2969 $x = $exit->x;
2970 $y = $exit->y;
2971 }
2838 2972
2839 $self->goto ($map, $x, $y); 2973 $self->goto ($map, $x, $y);
2840 2974
2841 # if exit is damned, update players death & WoR home-position 2975 # if exit is damned, update players death & WoR home-position
2842 $self->contr->savebed ($map, $x, $y) 2976 $self->contr->savebed ($map, $x, $y)
… …
2847 $self->message ("Something went wrong deep within the deliantra server. " 2981 $self->message ("Something went wrong deep within the deliantra server. "
2848 . "I'll try to bring you back to the map you were before. " 2982 . "I'll try to bring you back to the map you were before. "
2849 . "Please report this to the dungeon master!", 2983 . "Please report this to the dungeon master!",
2850 cf::NDI_UNIQUE | cf::NDI_RED); 2984 cf::NDI_UNIQUE | cf::NDI_RED);
2851 2985
2852 warn "ERROR in enter_exit: $@"; 2986 error "ERROR in enter_exit: $@";
2853 $self->leave_link; 2987 $self->leave_link;
2854 } 2988 }
2855 })->prio (1); 2989 })->prio (1);
2856} 2990}
2857 2991
… …
3170 3304
3171 $ns->ext_reply ($reply, @reply) 3305 $ns->ext_reply ($reply, @reply)
3172 if $reply; 3306 if $reply;
3173 3307
3174 } else { 3308 } else {
3175 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3309 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3176 } 3310 }
3177 3311
3178 cf::override; 3312 cf::override;
3179 }, 3313 },
3180); 3314);
… …
3261 decrease split destroy change_exp value msg lore send_msg)], 3395 decrease split destroy change_exp value msg lore send_msg)],
3262 ["cf::object::player" => qw(player)], 3396 ["cf::object::player" => qw(player)],
3263 ["cf::player" => qw(peaceful send_msg)], 3397 ["cf::player" => qw(peaceful send_msg)],
3264 ["cf::map" => qw(trigger)], 3398 ["cf::map" => qw(trigger)],
3265) { 3399) {
3266 no strict 'refs';
3267 my ($pkg, @funs) = @$_; 3400 my ($pkg, @funs) = @$_;
3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3401 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3269 for @funs; 3402 for @funs;
3270} 3403}
3271 3404
… …
3310 local @cf::_safe_eval_args = values %vars; 3443 local @cf::_safe_eval_args = values %vars;
3311 @res = wantarray ? eval eval : scalar eval $eval; 3444 @res = wantarray ? eval eval : scalar eval $eval;
3312 } 3445 }
3313 3446
3314 if ($@) { 3447 if ($@) {
3315 warn "$@"; 3448 warn "$@",
3316 warn "while executing safe code '$code'\n"; 3449 "while executing safe code '$code'\n",
3317 warn "with arguments " . (join " ", %vars) . "\n"; 3450 "with arguments " . (join " ", %vars) . "\n";
3318 } 3451 }
3319 3452
3320 wantarray ? @res : $res[0] 3453 wantarray ? @res : $res[0]
3321} 3454}
3322 3455
… …
3356 # for this (global event?) 3489 # for this (global event?)
3357 %ext::player_env::MUSIC_FACE_CACHE = (); 3490 %ext::player_env::MUSIC_FACE_CACHE = ();
3358 3491
3359 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3492 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3360 3493
3361 warn "loading facedata from $path\n"; 3494 trace "loading facedata from $path\n";
3362 3495
3363 my $facedata; 3496 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 3497
3369 $facedata->{version} == 2 3498 $facedata->{version} == 2
3370 or cf::cleanup "$path: version mismatch, cannot proceed."; 3499 or cf::cleanup "$path: version mismatch, cannot proceed.";
3371 3500
3372 # patch in the exptable 3501 # patch in the exptable
… …
3386 3515
3387 cf::face::set_visibility $idx, $info->{visibility}; 3516 cf::face::set_visibility $idx, $info->{visibility};
3388 cf::face::set_magicmap $idx, $info->{magicmap}; 3517 cf::face::set_magicmap $idx, $info->{magicmap};
3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3518 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3519 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3520 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3391 3521
3392 cf::cede_to_tick; 3522 cf::cede_to_tick;
3393 } 3523 }
3394 3524
3395 while (my ($face, $info) = each %$faces) { 3525 while (my ($face, $info) = each %$faces) {
… …
3400 3530
3401 if (my $smooth = cf::face::find $info->{smooth}) { 3531 if (my $smooth = cf::face::find $info->{smooth}) {
3402 cf::face::set_smooth $idx, $smooth; 3532 cf::face::set_smooth $idx, $smooth;
3403 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3533 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3404 } else { 3534 } else {
3405 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3535 error "smooth face '$info->{smooth}' not found for face '$face'";
3406 } 3536 }
3407 3537
3408 cf::cede_to_tick; 3538 cf::cede_to_tick;
3409 } 3539 }
3410 } 3540 }
… …
3488 load_resource_file "$DATADIR/treasures" 3618 load_resource_file "$DATADIR/treasures"
3489 or die "unable to load treasurelists\n"; 3619 or die "unable to load treasurelists\n";
3490} 3620}
3491 3621
3492sub reload_sound { 3622sub reload_sound {
3493 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data 3623 trace "loading sound config from $DATADIR/sound\n";
3494 or die "$DATADIR/sound $!";
3495 3624
3496 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3625 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3497 3626
3498 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3627 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3499 my $sound = $soundconf->{compat}[$_] 3628 my $sound = $soundconf->{compat}[$_]
3500 or next; 3629 or next;
3501 3630
… …
3509 cf::sound::set $k => $face; 3638 cf::sound::set $k => $face;
3510 } 3639 }
3511} 3640}
3512 3641
3513sub reload_resources { 3642sub reload_resources {
3514 warn "reloading resource files...\n"; 3643 trace "reloading resource files...\n";
3515 3644
3645 reload_exp_table;
3646 reload_materials;
3516 reload_facedata; 3647 reload_facedata;
3517 reload_sound; 3648 reload_sound;
3518 reload_archetypes; 3649 reload_archetypes;
3519 reload_regions; 3650 reload_regions;
3520 reload_treasures; 3651 reload_treasures;
3521 3652
3522 warn "finished reloading resource files\n"; 3653 trace "finished reloading resource files\n";
3523} 3654}
3524 3655
3525sub reload_config { 3656sub reload_config {
3526 warn "reloading config file...\n"; 3657 trace "reloading config file...\n";
3527 3658
3528 open my $fh, "<:utf8", "$CONFDIR/config" 3659 my $config = load_file "$CONFDIR/config";
3529 or return; 3660 utf8::decode $config;
3530 3661 *CFG = decode_yaml $config;
3531 local $/;
3532 *CFG = YAML::XS::Load scalar <$fh>;
3533 3662
3534 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3663 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3535 3664
3536 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3665 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3537 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3666 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3541 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3670 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3542 and die "WARNING: m(un)lockall failed: $!\n"; 3671 and die "WARNING: m(un)lockall failed: $!\n";
3543 }; 3672 };
3544 warn $@ if $@; 3673 warn $@ if $@;
3545 } 3674 }
3546
3547 warn "finished reloading resource files\n";
3548} 3675}
3549 3676
3550sub pidfile() { 3677sub pidfile() {
3551 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3678 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3552 or die "$PIDFILE: $!"; 3679 or die "$PIDFILE: $!";
… …
3565 seek $fh, 0, 0; 3692 seek $fh, 0, 0;
3566 print $fh $$; 3693 print $fh $$;
3567} 3694}
3568 3695
3569sub main_loop { 3696sub main_loop {
3570 warn "EV::loop starting\n"; 3697 trace "EV::loop starting\n";
3571 if (1) { 3698 if (1) {
3572 EV::loop; 3699 EV::loop;
3573 } 3700 }
3574 warn "EV::loop returned\n"; 3701 trace "EV::loop returned\n";
3575 goto &main_loop unless $REALLY_UNLOOP; 3702 goto &main_loop unless $REALLY_UNLOOP;
3576} 3703}
3577 3704
3578sub main { 3705sub main {
3579 cf::init_globals; # initialise logging 3706 cf::init_globals; # initialise logging
3580 3707
3581 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3708 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3582 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3709 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3583 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3710 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3584 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3711 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3585 3712
3586 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3713 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3587 3714
… …
3595 }; 3722 };
3596 3723
3597 evthread_start IO::AIO::poll_fileno; 3724 evthread_start IO::AIO::poll_fileno;
3598 3725
3599 cf::sync_job { 3726 cf::sync_job {
3600 cf::init_experience; 3727 cf::incloader::init ();
3728
3601 cf::init_anim; 3729 cf::init_anim;
3602 cf::init_attackmess; 3730 cf::init_attackmess;
3603 cf::init_dynamic; 3731 cf::init_dynamic;
3604 3732
3605 cf::load_settings; 3733 cf::load_settings;
3606 cf::load_materials;
3607 3734
3608 reload_resources; 3735 reload_resources;
3609 reload_config; 3736 reload_config;
3610 db_init; 3737 db_init;
3611 3738
… …
3623 3750
3624 # no (long-running) fork's whatsoever before this point(!) 3751 # no (long-running) fork's whatsoever before this point(!)
3625 use POSIX (); 3752 use POSIX ();
3626 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3753 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3627 3754
3628 (pop @POST_INIT)->(0) while @POST_INIT; 3755 cf::_post_init 0;
3629 }; 3756 };
3630 3757
3631 cf::object::thawer::errors_are_fatal 0; 3758 cf::object::thawer::errors_are_fatal 0;
3632 warn "parse errors in files are no longer fatal from this point on.\n"; 3759 info "parse errors in files are no longer fatal from this point on.\n";
3633 3760
3761 my $free_main; $free_main = EV::idle sub {
3762 undef $free_main;
3763 undef &main; # free gobs of memory :)
3764 };
3765
3634 main_loop; 3766 goto &main_loop;
3635} 3767}
3636 3768
3637############################################################################# 3769#############################################################################
3638# initialisation and cleanup 3770# initialisation and cleanup
3639 3771
… …
3678 or return; 3810 or return;
3679 3811
3680 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3812 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3681 and return; 3813 and return;
3682 3814
3683 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3815 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3684 3816
3685 1 3817 1
3686} 3818}
3687 3819
3688our $uuid_lock; 3820our $uuid_lock;
… …
3700 or return; 3832 or return;
3701 3833
3702 my $value = uuid_seq uuid_cur; 3834 my $value = uuid_seq uuid_cur;
3703 3835
3704 unless ($value) { 3836 unless ($value) {
3705 warn "cowardly refusing to write zero uuid value!\n"; 3837 info "cowardly refusing to write zero uuid value!\n";
3706 return; 3838 return;
3707 } 3839 }
3708 3840
3709 my $value = uuid_str $value + $uuid_skip; 3841 my $value = uuid_str $value + $uuid_skip;
3710 $uuid_skip = 0; 3842 $uuid_skip = 0;
… …
3720 or return; 3852 or return;
3721 3853
3722 aio_rename "$uuid~", $uuid 3854 aio_rename "$uuid~", $uuid
3723 and return; 3855 and return;
3724 3856
3725 warn "uuid file written ($value).\n"; 3857 trace "uuid file written ($value).\n";
3726 3858
3727 1 3859 1
3728 3860
3729} 3861}
3730 3862
… …
3736} 3868}
3737 3869
3738sub emergency_save() { 3870sub emergency_save() {
3739 my $freeze_guard = cf::freeze_mainloop; 3871 my $freeze_guard = cf::freeze_mainloop;
3740 3872
3741 warn "emergency_perl_save: enter\n"; 3873 info "emergency_perl_save: enter\n";
3874
3875 # this is a trade-off: we want to be very quick here, so
3876 # save all maps without fsync, and later call a global sync
3877 # (which in turn might be very very slow)
3878 local $USE_FSYNC = 0;
3742 3879
3743 cf::sync_job { 3880 cf::sync_job {
3744 # this is a trade-off: we want to be very quick here, so 3881 cf::write_runtime_sync; # external watchdog should not bark
3745 # save all maps without fsync, and later call a global sync
3746 # (which in turn might be very very slow)
3747 local $USE_FSYNC = 0;
3748 3882
3749 # use a peculiar iteration method to avoid tripping on perl 3883 # use a peculiar iteration method to avoid tripping on perl
3750 # refcount bugs in for. also avoids problems with players 3884 # refcount bugs in for. also avoids problems with players
3751 # and maps saved/destroyed asynchronously. 3885 # and maps saved/destroyed asynchronously.
3752 warn "emergency_perl_save: begin player save\n"; 3886 info "emergency_perl_save: begin player save\n";
3753 for my $login (keys %cf::PLAYER) { 3887 for my $login (keys %cf::PLAYER) {
3754 my $pl = $cf::PLAYER{$login} or next; 3888 my $pl = $cf::PLAYER{$login} or next;
3755 $pl->valid or next; 3889 $pl->valid or next;
3756 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3890 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3757 $pl->save; 3891 $pl->save;
3758 } 3892 }
3759 warn "emergency_perl_save: end player save\n"; 3893 info "emergency_perl_save: end player save\n";
3760 3894
3895 cf::write_runtime_sync; # external watchdog should not bark
3896
3761 warn "emergency_perl_save: begin map save\n"; 3897 info "emergency_perl_save: begin map save\n";
3762 for my $path (keys %cf::MAP) { 3898 for my $path (keys %cf::MAP) {
3763 my $map = $cf::MAP{$path} or next; 3899 my $map = $cf::MAP{$path} or next;
3764 $map->valid or next; 3900 $map->valid or next;
3765 $map->save; 3901 $map->save;
3766 } 3902 }
3767 warn "emergency_perl_save: end map save\n"; 3903 info "emergency_perl_save: end map save\n";
3768 3904
3905 cf::write_runtime_sync; # external watchdog should not bark
3906
3769 warn "emergency_perl_save: begin database checkpoint\n"; 3907 info "emergency_perl_save: begin database checkpoint\n";
3770 BDB::db_env_txn_checkpoint $DB_ENV; 3908 BDB::db_env_txn_checkpoint $DB_ENV;
3771 warn "emergency_perl_save: end database checkpoint\n"; 3909 info "emergency_perl_save: end database checkpoint\n";
3772 3910
3773 warn "emergency_perl_save: begin write uuid\n"; 3911 info "emergency_perl_save: begin write uuid\n";
3774 write_uuid_sync 1; 3912 write_uuid_sync 1;
3775 warn "emergency_perl_save: end write uuid\n"; 3913 info "emergency_perl_save: end write uuid\n";
3914
3915 cf::write_runtime_sync; # external watchdog should not bark
3916
3917 trace "emergency_perl_save: syncing database to disk";
3918 BDB::db_env_txn_checkpoint $DB_ENV;
3919
3920 info "emergency_perl_save: starting sync\n";
3921 IO::AIO::aio_sync sub {
3922 info "emergency_perl_save: finished sync\n";
3923 };
3924
3925 cf::write_runtime_sync; # external watchdog should not bark
3926
3927 trace "emergency_perl_save: flushing outstanding aio requests";
3928 while (IO::AIO::nreqs || BDB::nreqs) {
3929 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3930 }
3931
3932 cf::write_runtime_sync; # external watchdog should not bark
3776 }; 3933 };
3777 3934
3778 warn "emergency_perl_save: starting sync()\n";
3779 IO::AIO::aio_sync sub {
3780 warn "emergency_perl_save: finished sync()\n";
3781 };
3782
3783 warn "emergency_perl_save: leave\n"; 3935 info "emergency_perl_save: leave\n";
3784} 3936}
3785 3937
3786sub post_cleanup { 3938sub post_cleanup {
3787 my ($make_core) = @_; 3939 my ($make_core) = @_;
3788 3940
3941 IO::AIO::flush;
3942
3789 warn Carp::longmess "post_cleanup backtrace" 3943 error Carp::longmess "post_cleanup backtrace"
3790 if $make_core; 3944 if $make_core;
3791 3945
3792 my $fh = pidfile; 3946 my $fh = pidfile;
3793 unlink $PIDFILE if <$fh> == $$; 3947 unlink $PIDFILE if <$fh> == $$;
3794} 3948}
… …
3818 } 3972 }
3819} 3973}
3820 3974
3821sub do_reload_perl() { 3975sub do_reload_perl() {
3822 # can/must only be called in main 3976 # can/must only be called in main
3823 if (in_main) { 3977 unless (in_main) {
3824 warn "can only reload from main coroutine"; 3978 error "can only reload from main coroutine";
3825 return; 3979 return;
3826 } 3980 }
3827 3981
3828 return if $RELOAD++; 3982 return if $RELOAD++;
3829 3983
3830 my $t1 = AE::time; 3984 my $t1 = AE::time;
3831 3985
3832 while ($RELOAD) { 3986 while ($RELOAD) {
3833 warn "reloading..."; 3987 cf::get_slot 0.1, -1, "reload_perl";
3988 info "perl_reload: reloading...";
3834 3989
3835 warn "entering sync_job"; 3990 trace "perl_reload: entering sync_job";
3836 3991
3837 cf::sync_job { 3992 cf::sync_job {
3838 cf::write_runtime_sync; # external watchdog should not bark
3839 cf::emergency_save; 3993 #cf::emergency_save;
3840 cf::write_runtime_sync; # external watchdog should not bark
3841 3994
3842 warn "syncing database to disk";
3843 BDB::db_env_txn_checkpoint $DB_ENV;
3844
3845 # if anything goes wrong in here, we should simply crash as we already saved
3846
3847 warn "flushing outstanding aio requests";
3848 while (IO::AIO::nreqs || BDB::nreqs) {
3849 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3850 }
3851
3852 warn "cancelling all extension coros"; 3995 trace "perl_reload: cancelling all extension coros";
3853 $_->cancel for values %EXT_CORO; 3996 $_->cancel for values %EXT_CORO;
3854 %EXT_CORO = (); 3997 %EXT_CORO = ();
3855 3998
3856 warn "removing commands"; 3999 trace "perl_reload: removing commands";
3857 %COMMAND = (); 4000 %COMMAND = ();
3858 4001
3859 warn "removing ext/exti commands"; 4002 trace "perl_reload: removing ext/exti commands";
3860 %EXTCMD = (); 4003 %EXTCMD = ();
3861 %EXTICMD = (); 4004 %EXTICMD = ();
3862 4005
3863 warn "unloading/nuking all extensions"; 4006 trace "perl_reload: unloading/nuking all extensions";
3864 for my $pkg (@EXTS) { 4007 for my $pkg (@EXTS) {
3865 warn "... unloading $pkg"; 4008 trace "... unloading $pkg";
3866 4009
3867 if (my $cb = $pkg->can ("unload")) { 4010 if (my $cb = $pkg->can ("unload")) {
3868 eval { 4011 eval {
3869 $cb->($pkg); 4012 $cb->($pkg);
3870 1 4013 1
3871 } or warn "$pkg unloaded, but with errors: $@"; 4014 } or error "$pkg unloaded, but with errors: $@";
3872 } 4015 }
3873 4016
3874 warn "... clearing $pkg"; 4017 trace "... clearing $pkg";
3875 clear_package $pkg; 4018 clear_package $pkg;
3876 } 4019 }
3877 4020
3878 warn "unloading all perl modules loaded from $LIBDIR"; 4021 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3879 while (my ($k, $v) = each %INC) { 4022 while (my ($k, $v) = each %INC) {
3880 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4023 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3881 4024
3882 warn "... unloading $k"; 4025 trace "... unloading $k";
3883 delete $INC{$k}; 4026 delete $INC{$k};
3884 4027
3885 $k =~ s/\.pm$//; 4028 $k =~ s/\.pm$//;
3886 $k =~ s/\//::/g; 4029 $k =~ s/\//::/g;
3887 4030
… …
3890 } 4033 }
3891 4034
3892 clear_package $k; 4035 clear_package $k;
3893 } 4036 }
3894 4037
3895 warn "getting rid of safe::, as good as possible"; 4038 trace "perl_reload: getting rid of safe::, as good as possible";
3896 clear_package "safe::$_" 4039 clear_package "safe::$_"
3897 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4040 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3898 4041
3899 warn "unloading cf.pm \"a bit\""; 4042 trace "perl_reload: unloading cf.pm \"a bit\"";
3900 delete $INC{"cf.pm"}; 4043 delete $INC{"cf.pm"};
3901 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4044 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3902 4045
3903 # don't, removes xs symbols, too, 4046 # don't, removes xs symbols, too,
3904 # and global variables created in xs 4047 # and global variables created in xs
3905 #clear_package __PACKAGE__; 4048 #clear_package __PACKAGE__;
3906 4049
3907 warn "unload completed, starting to reload now"; 4050 info "perl_reload: unload completed, starting to reload now";
3908 4051
3909 warn "reloading cf.pm"; 4052 trace "perl_reload: reloading cf.pm";
3910 require cf; 4053 require cf;
3911 cf::_connect_to_perl_1; 4054 cf::_connect_to_perl_1;
3912 4055
3913 warn "loading config and database again"; 4056 trace "perl_reload: loading config and database again";
3914 cf::reload_config; 4057 cf::reload_config;
3915 4058
3916 warn "loading extensions"; 4059 trace "perl_reload: loading extensions";
3917 cf::load_extensions; 4060 cf::load_extensions;
3918 4061
3919 if ($REATTACH_ON_RELOAD) { 4062 if ($REATTACH_ON_RELOAD) {
3920 warn "reattaching attachments to objects/players"; 4063 trace "perl_reload: reattaching attachments to objects/players";
3921 _global_reattach; # objects, sockets 4064 _global_reattach; # objects, sockets
3922 warn "reattaching attachments to maps"; 4065 trace "perl_reload: reattaching attachments to maps";
3923 reattach $_ for values %MAP; 4066 reattach $_ for values %MAP;
3924 warn "reattaching attachments to players"; 4067 trace "perl_reload: reattaching attachments to players";
3925 reattach $_ for values %PLAYER; 4068 reattach $_ for values %PLAYER;
3926 } 4069 }
3927 4070
3928 warn "running post_init jobs"; 4071 cf::_post_init 1;
3929 (pop @POST_INIT)->(1) while @POST_INIT;
3930 4072
3931 warn "leaving sync_job"; 4073 trace "perl_reload: leaving sync_job";
3932 4074
3933 1 4075 1
3934 } or do { 4076 } or do {
3935 warn $@; 4077 error $@;
3936 cf::cleanup "error while reloading, exiting."; 4078 cf::cleanup "perl_reload: error, exiting.";
3937 }; 4079 };
3938 4080
3939 warn "reloaded";
3940 --$RELOAD; 4081 --$RELOAD;
3941 } 4082 }
3942 4083
3943 $t1 = AE::time - $t1; 4084 $t1 = AE::time - $t1;
3944 warn "reload completed in ${t1}s\n"; 4085 info "perl_reload: completed in ${t1}s\n";
3945}; 4086};
3946 4087
3947our $RELOAD_WATCHER; # used only during reload 4088our $RELOAD_WATCHER; # used only during reload
3948 4089
3949sub reload_perl() { 4090sub reload_perl() {
… …
3970 reload_perl; 4111 reload_perl;
3971 }; 4112 };
3972 } 4113 }
3973}; 4114};
3974 4115
3975unshift @INC, $LIBDIR; 4116#############################################################################
3976 4117
3977my $bug_warning = 0; 4118my $bug_warning = 0;
3978 4119
3979our @WAIT_FOR_TICK;
3980our @WAIT_FOR_TICK_BEGIN;
3981
3982sub wait_for_tick { 4120sub wait_for_tick() {
3983 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4121 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3984 4122
3985 my $signal = new Coro::Signal; 4123 $WAIT_FOR_TICK->wait;
3986 push @WAIT_FOR_TICK, $signal;
3987 $signal->wait;
3988} 4124}
3989 4125
3990sub wait_for_tick_begin { 4126sub wait_for_tick_begin() {
3991 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4127 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3992 4128
3993 my $signal = new Coro::Signal; 4129 my $signal = new Coro::Signal;
3994 push @WAIT_FOR_TICK_BEGIN, $signal; 4130 push @WAIT_FOR_TICK_BEGIN, $signal;
3995 $signal->wait; 4131 $signal->wait;
3996} 4132}
… …
4000 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4136 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4001 unless ++$bug_warning > 10; 4137 unless ++$bug_warning > 10;
4002 return; 4138 return;
4003 } 4139 }
4004 4140
4005 cf::server_tick; # one server iteration 4141 cf::one_tick; # one server iteration
4006 4142
4007 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4143 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4008 4144
4009 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4145 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4010 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4146 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4011 Coro::async_pool { 4147 Coro::async_pool {
4012 $Coro::current->{desc} = "runtime saver"; 4148 $Coro::current->{desc} = "runtime saver";
4013 write_runtime_sync 4149 write_runtime_sync
4014 or warn "ERROR: unable to write runtime file: $!"; 4150 or error "ERROR: unable to write runtime file: $!";
4015 }; 4151 };
4016 } 4152 }
4017 4153
4018 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4154 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4019 $sig->send; 4155 $sig->send;
4020 } 4156 }
4021 while (my $sig = shift @WAIT_FOR_TICK) { 4157 $WAIT_FOR_TICK->broadcast;
4022 $sig->send;
4023 }
4024 4158
4025 $LOAD = ($NOW - $TICK_START) / $TICK; 4159 $LOAD = ($NOW - $TICK_START) / $TICK;
4026 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4160 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4027 4161
4028 if (0) { 4162 if (0) {
4029 if ($NEXT_TICK) { 4163 if ($NEXT_TICK) {
4030 my $jitter = $TICK_START - $NEXT_TICK; 4164 my $jitter = $TICK_START - $NEXT_TICK;
4031 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4165 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4032 warn "jitter $JITTER\n";#d# 4166 debug "jitter $JITTER\n";#d#
4033 } 4167 }
4034 } 4168 }
4035} 4169}
4036 4170
4037{ 4171{
… …
4082 IO::AIO::min_parallel 8; 4216 IO::AIO::min_parallel 8;
4083 IO::AIO::max_poll_time $TICK * 0.1; 4217 IO::AIO::max_poll_time $TICK * 0.1;
4084 undef $AnyEvent::AIO::WATCHER; 4218 undef $AnyEvent::AIO::WATCHER;
4085} 4219}
4086 4220
4087my $_log_backtrace; 4221our $_log_backtrace;
4222our $_log_backtrace_last;
4088 4223
4089sub _log_backtrace { 4224sub _log_backtrace {
4090 my ($msg, @addr) = @_; 4225 my ($msg, @addr) = @_;
4091 4226
4092 $msg =~ s/\n//; 4227 $msg =~ s/\n$//;
4093 4228
4229 if ($_log_backtrace_last eq $msg) {
4230 LOG llevInfo, "[ABT] $msg\n";
4231 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4094 # limit the # of concurrent backtraces 4232 # limit the # of concurrent backtraces
4095 if ($_log_backtrace < 2) { 4233 } elsif ($_log_backtrace < 2) {
4234 $_log_backtrace_last = $msg;
4096 ++$_log_backtrace; 4235 ++$_log_backtrace;
4097 my $perl_bt = Carp::longmess $msg; 4236 my $perl_bt = Carp::longmess $msg;
4098 async { 4237 async {
4099 $Coro::current->{desc} = "abt $msg"; 4238 $Coro::current->{desc} = "abt $msg";
4100 4239
… …
4120 LOG llevInfo, "[ABT] $_\n" for @bt; 4259 LOG llevInfo, "[ABT] $_\n" for @bt;
4121 --$_log_backtrace; 4260 --$_log_backtrace;
4122 }; 4261 };
4123 } else { 4262 } else {
4124 LOG llevInfo, "[ABT] $msg\n"; 4263 LOG llevInfo, "[ABT] $msg\n";
4125 LOG llevInfo, "[ABT] [suppressed]\n"; 4264 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4126 } 4265 }
4127} 4266}
4128 4267
4129# load additional modules 4268# load additional modules
4130require "cf/$_.pm" for @EXTRA_MODULES; 4269require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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