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.511 by root, Wed Apr 7 18:35:56 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";
107our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 112
111our %RESOURCE; 113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
112 120
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 123our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
118our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 129our $DB_ENV;
122 130
123our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 132
125our %CFG; 133our %CFG;
126 134
127our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
129our $NOW; 138our $NOW;
130 139
131our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
132our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
133our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
… …
142 151
143our @POST_INIT; 152our @POST_INIT;
144 153
145our $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)
146our $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;
147 159
148binmode STDOUT; 160binmode STDOUT;
149binmode STDERR; 161binmode STDERR;
150 162
151# read virtual server time, if available 163# read virtual server time, if available
… …
162 174
163our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
164 176
165sub cf::map::normalise; 177sub cf::map::normalise;
166 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
167############################################################################# 183#############################################################################
168 184
169%REFLECT = (); 185%REFLECT = ();
170for (@REFLECT) { 186for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 187 my $reflect = JSON::XS::decode_json $_;
… …
181 197
182=over 4 198=over 4
183 199
184=item $cf::UPTIME 200=item $cf::UPTIME
185 201
186The 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.
187 218
188=item $cf::RUNTIME 219=item $cf::RUNTIME
189 220
190The 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
191every server tick. 222every server tick.
… …
197Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
198directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
199unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
200database environment. 231database environment.
201 232
202=item $cf::NOW
203
204The time of the last (current) server tick.
205
206=item $cf::TICK
207
208The interval between server ticks, in seconds.
209
210=item $cf::LOADAVG 233=item $cf::LOADAVG
211 234
212The 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
213(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
214objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
… …
223from wherever your confdir points to. 246from wherever your confdir points to.
224 247
225=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
226 249
227These 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
228returns 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
229per 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();
230 270
231=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
232 272
233This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
234C<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
… …
242 282
243=back 283=back
244 284
245=cut 285=cut
246 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
247$Coro::State::WARNHOOK = sub { 293$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 294 my $msg = join "", @_;
249 295
250 $msg .= "\n" 296 $msg .= "\n"
251 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
252 298
253 $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;
254 300
255 LOG llevError, $msg; 301 LOG llevWarn, $msg;
256}; 302};
257 303
258$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
260 306
261 warn Carp::longmess $_[0]; 307 error Carp::longmess $_[0];
262 308
263 if ($Coro::current == $Coro::main) {#d# 309 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 311 return;#d#
266 }#d# 312 }#d#
267 313
268 # kill coroutine otherwise 314 # kill coroutine otherwise
269 Coro::terminate 315 Coro::terminate
… …
291} 337}
292 338
293$EV::DIED = sub { 339$EV::DIED = sub {
294 Carp::cluck "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
295}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
296 347
297############################################################################# 348#############################################################################
298 349
299=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
300 351
… …
321 $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;
322 $d 373 $d
323 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
324} 375}
325 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
326=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
327 392
328Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
329 394
330=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
… …
336our $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
337 402
338sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
339sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
340 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
341=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
342 438
343Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
345 441
346The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
347is a reload or not. 443is a reload or not.
348 444
349=cut 445=cut
350 446
351sub post_init(&) { 447sub post_init(&) {
352 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 }
353} 466}
354 467
355=item cf::lock_wait $string 468=item cf::lock_wait $string
356 469
357Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
… …
396} 509}
397 510
398=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
399 512
400Like EV::periodic, but randomly selects a starting point so that the actions 513Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 514get spread over time.
402 515
403=cut 516=cut
404 517
405sub periodic($$) { 518sub periodic($$) {
406 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
… …
410 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
411} 524}
412 525
413=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
414 527
415Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
416This 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
417of 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.
418 535
419The 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
420used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
421 538
422Useful for short background jobs. 539Useful for short background jobs.
… …
451 } 568 }
452 } 569 }
453 570
454 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
455 # 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
456 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
457 $signal->wait;
458 } else { 574 } else {
459 $busy = 0; 575 $busy = 0;
460 Coro::schedule; 576 Coro::schedule;
461 } 577 }
462 } 578 }
… …
502=cut 618=cut
503 619
504sub sync_job(&) { 620sub sync_job(&) {
505 my ($job) = @_; 621 my ($job) = @_;
506 622
507 if ($Coro::current == $Coro::main) { 623 if (in_main) {
508 my $time = EV::time; 624 my $time = AE::time;
509 625
510 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
512 628
513 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
514 630
515 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
516 632
517 my $busy = 1; 633 my $busy = 1;
518 my @res; 634 my @res;
519 635
520 (async { 636 (async {
521 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
522 @res = eval { $job->() }; 638 @res = eval { $job->() };
523 warn $@ if $@; 639 error $@ if $@;
524 undef $busy; 640 undef $busy;
525 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
526 642
527 while ($busy) { 643 while ($busy) {
528 if (Coro::nready) { 644 if (Coro::nready) {
… …
530 } else { 646 } else {
531 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
532 } 648 }
533 } 649 }
534 650
535 my $time = EV::time - $time; 651 my $time = AE::time - $time;
536 652
537 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
538 654
539 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
540 } else { 656 } else {
… …
562 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
563 679
564 $coro 680 $coro
565} 681}
566 682
567=item fork_call { }, $args 683=item fork_call { }, @args
568 684
569Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
570process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
571Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
572never block itself or use any form of event handling. 688never block itself or use any form of event handling.
573 689
574=cut 690=cut
575 691
692sub post_fork {
693 reset_signals;
694}
695
576sub fork_call(&@) { 696sub fork_call(&@) {
577 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
578 698
579 # 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,
580 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
581 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
582 702
583 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
584 reset_signals; 704 cf::post_fork;
585 &$cb 705 &$cb
586 }, @args; 706 } @args;
587 707
588 wantarray ? @res : $res[-1] 708 wantarray ? @res : $res[-1]
709}
710
711sub objinfo {
712 (
713 "counter value" => cf::object::object_count,
714 "objects created" => cf::object::create_count,
715 "objects destroyed" => cf::object::destroy_count,
716 "freelist size" => cf::object::free_count,
717 "allocated objects" => cf::object::objects_size,
718 "active objects" => cf::object::actives_size,
719 )
589} 720}
590 721
591=item $coin = coin_from_name $name 722=item $coin = coin_from_name $name
592 723
593=cut 724=cut
… …
630within each server. 761within each server.
631 762
632=cut 763=cut
633 764
634sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
635 my ($name) = @_; 769 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
637 771
638 eval { 772 eval {
639 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
… …
649} 783}
650 784
651our $DB; 785our $DB;
652 786
653sub db_init { 787sub db_init {
654 cf::sync_job {
655 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
656 };
657} 789}
658 790
659sub db_get($$) { 791sub db_get($$) {
660 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
661 793
662 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
663 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
664 798
665 $! ? () 799 $! ? ()
666 : $data 800 : $data
667 }
668} 801}
669 802
670sub db_put($$$) { 803sub db_put($$$) {
671 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
672 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
700 833
701 my @data; 834 my @data;
702 my $md5; 835 my $md5;
703 836
704 for (0 .. $#$src) { 837 for (0 .. $#$src) {
705 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
706 or Carp::croak "$src->[$_]: $!";
707 } 839 }
708 840
709 # if processing is expensive, check 841 # if processing is expensive, check
710 # checksum first 842 # checksum first
711 if (1) { 843 if (1) {
… …
728 860
729 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
730 my $data = $process->(\@data); 862 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
732 864
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734 866
735 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
738 870
… …
748 880
749=cut 881=cut
750 882
751sub datalog($@) { 883sub datalog($@) {
752 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754} 886}
755 887
756=back 888=back
757 889
758=cut 890=cut
… …
953 1085
954 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
955 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956 1088
957 } elsif (ref $type) { 1089 } elsif (ref $type) {
958 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
959 1091
960 } else { 1092 } else {
961 shift @arg; 1093 shift @arg;
962 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
963 } 1095 }
964 } 1096 }
965} 1097}
966 1098
967sub _object_attach { 1099sub _object_attach {
… …
977 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
978 } 1110 }
979 1111
980 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
981 } else { 1113 } else {
982 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
983 } 1115 }
984 1116
985 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
986} 1118}
987 1119
… …
1046 1178
1047 for (@$callbacks) { 1179 for (@$callbacks) {
1048 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1049 1181
1050 if ($@) { 1182 if ($@) {
1051 warn "$@";
1052 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053 override; 1184 override;
1054 } 1185 }
1055 1186
1056 return 1 if $override; 1187 return 1 if $override;
1057 } 1188 }
… …
1136 for (@$attach) { 1267 for (@$attach) {
1137 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1138 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1139 } 1270 }
1140 } else { 1271 } else {
1141 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1142 } 1273 }
1143 } 1274 }
1144} 1275}
1145 1276
1146cf::attachable->attach ( 1277cf::attachable->attach (
… …
1173 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1174 1305
1175 sync_job { 1306 sync_job {
1176 if (length $$rdata) { 1307 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1180 1312
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1316 if ($cf::USE_FSYNC) {
… …
1206 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1207 1339
1208 $filename =~ s%/[^/]+$%%; 1340 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC; 1341 aio_pathsync $filename if $cf::USE_FSYNC;
1210 } else { 1342 } else {
1211 warn "unable to save objects: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1212 } 1344 }
1213 } else { 1345 } else {
1214 aio_unlink $filename; 1346 aio_unlink $filename;
1215 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1216 } 1348 }
… …
1240 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs}; 1373 $av = $st->{objs};
1242 } 1374 }
1243 1375
1244 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1247 1380
1248 ($data, $av) 1381 ($data, $av)
1249} 1382}
1250 1383
1251=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
… …
1343 1476
1344 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1345 if $reply; 1478 if $reply;
1346 1479
1347 } else { 1480 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1482 }
1350 1483
1351 cf::override; 1484 cf::override;
1352 }, 1485 },
1353); 1486);
… …
1364 1497
1365 $grp 1498 $grp
1366} 1499}
1367 1500
1368sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1369 cf::sync_job { 1504 cf::sync_job {
1370 my %todo; 1505 my %todo;
1371 1506
1372 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1508 next unless -r $path;
… …
1391 1526
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394 1529
1395 $ext{source} = 1530 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1397 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1398 . $source 1533 . $source
1399 . "\n};\n1"; 1534 . "\n};\n1";
1400 1535
1401 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
… …
1413 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext 1549 next ext
1415 unless exists $done{$_}; 1550 unless exists $done{$_};
1416 } 1551 }
1417 1552
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419 1554
1420 my $active = eval $v->{source}; 1555 my $active = eval $v->{source};
1421 1556
1422 if (length $@) { 1557 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1558 error "$v->{path}: $@\n";
1424 1559
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1561 if exists $v->{meta}{mandatory};
1562
1563 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1564 delete $todo{$k};
1427 } else { 1565 } else {
1428 $done{$k} = delete $todo{$k}; 1566 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1567 push @EXTS, $v->{pkg};
1430 $progress = 1; 1568 $progress = 1;
1431 1569
1432 warn "$v->{base}: extension inactive.\n" 1570 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1571 unless $active;
1434 } 1572 }
1435 } 1573 }
1436 1574
1437 unless ($progress) { 1575 unless ($progress) {
… …
1439 1577
1440 while (my ($k, $v) = each %todo) { 1578 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory}; 1580 if exists $v->{meta}{mandatory};
1443 } 1581 }
1582
1583 last;
1444 } 1584 }
1445 } 1585 }
1446 }; 1586 };
1447} 1587}
1448 1588
… …
1606 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1607 1747
1608 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1609 $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
1610 1750
1611 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1612 $pl->deactivate; 1752 $pl->deactivate;
1753
1613 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;
1614 $pl->ob->check_score;
1615 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1616 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1617 1759
1618 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1619 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1620 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
… …
1674 \@logins 1816 \@logins
1675} 1817}
1676 1818
1677=item $player->maps 1819=item $player->maps
1678 1820
1821=item cf::player::maps $login
1822
1679Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1680player. May block. 1824player. May block.
1681 1825
1682=cut 1826=cut
1683 1827
… …
1745=cut 1889=cut
1746 1890
1747sub find_by_path($) { 1891sub find_by_path($) {
1748 my ($path) = @_; 1892 my ($path) = @_;
1749 1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1895
1750 my ($match, $specificity); 1896 my ($match, $specificity);
1751 1897
1752 for my $region (list) { 1898 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1754 ($match, $specificity) = ($region, $region->specificity) 1900 ($match, $specificity) = ($region, $region->specificity)
… …
1782sub generate_random_map { 1928sub generate_random_map {
1783 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1784 1930
1785 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
1786 1932
1787 # mit "rum" bekleckern, nicht
1788 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1792 $rmp->{exit_on_final_map},
1793 $rmp->{xsize}, $rmp->{ysize},
1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1796 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1797 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1798 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1799 (cf::region::find $rmp->{region}), $rmp->{custom}
1800 )
1801} 1934}
1802 1935
1803=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1804 1937
1805Register 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
… …
1810 1943
1811sub register { 1944sub register {
1812 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 1946 my $pkg = caller;
1814 1947
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 1949
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 1951}
1820 1952
1821# also paths starting with '/' 1953# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 1955
1824sub thawer_merge { 1956sub thawer_merge {
1825 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1826 1958
1827 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
… …
1832} 1964}
1833 1965
1834sub normalise { 1966sub normalise {
1835 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1836 1968
1837 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1838 1970
1839 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1840 1972
1841 # map plan: 1973 # map plan:
1842 # 1974 #
… …
1857 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1858 $path = "$base/$path"; 1990 $path = "$base/$path";
1859 } 1991 }
1860 1992
1861 for ($path) { 1993 for ($path) {
1862 redo if s{//}{/};
1863 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1864 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1865 } 1996 }
1866 1997
1867 $path 1998 $path
… …
1881 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1882 return $self; 2013 return $self;
1883 } 2014 }
1884 } 2015 }
1885 2016
1886 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1887 () 2018 ()
1888} 2019}
1889 2020
2021# may re-bless or do other evil things
1890sub init { 2022sub init {
1891 my ($self) = @_; 2023 my ($self) = @_;
1892 2024
1893 $self 2025 $self
1894} 2026}
… …
1959 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1960 2092
1961 1 2093 1
1962} 2094}
1963 2095
2096# used to laod the header of an original map
1964sub load_header_orig { 2097sub load_header_orig {
1965 my ($self) = @_; 2098 my ($self) = @_;
1966 2099
1967 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1968} 2101}
1969 2102
2103# used to laod the header of an instantiated map
1970sub load_header_temp { 2104sub load_header_temp {
1971 my ($self) = @_; 2105 my ($self) = @_;
1972 2106
1973 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1974} 2108}
1975 2109
2110# called after loading the header from an instantiated map
1976sub prepare_temp { 2111sub prepare_temp {
1977 my ($self) = @_; 2112 my ($self) = @_;
1978 2113
1979 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1980 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1981 # safety 2116 # safety
1982 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1983 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1984} 2119}
1985 2120
2121# called after loading the header from an original map
1986sub prepare_orig { 2122sub prepare_orig {
1987 my ($self) = @_; 2123 my ($self) = @_;
1988 2124
1989 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1990 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
… …
2014 2150
2015sub find; 2151sub find;
2016sub find { 2152sub find {
2017 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
2018 2154
2155 cf::cede_to_tick;
2156
2019 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
2020 2158
2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2022 my $guard2 = cf::lock_acquire "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
2023 2161
2024 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
… …
2055 2193
2056 { 2194 {
2057 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2058 2196
2059 return unless $self->valid; 2197 return unless $self->valid;
2060 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2061
2062 $self->in_memory (cf::MAP_LOADING);
2063 2199
2064 $self->alloc; 2200 $self->alloc;
2065 2201
2066 $self->pre_load; 2202 $self->pre_load;
2067 cf::cede_to_tick; 2203 cf::cede_to_tick;
2068 2204
2205 if (exists $self->{load_path}) {
2069 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2070 $f->skip_block; 2207 $f->skip_block;
2071 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2072 or return; 2209 or return;
2073 2210
2074 $self->post_load_original 2211 $self->post_load_original
2075 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2076 2213
2077 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2078 utf8::encode $uniq; 2215 utf8::encode $uniq;
2079 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2080 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2081 $self->clear_unique_items; 2218 $self->clear_unique_items;
2082 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2083 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2084 } 2222 }
2085 } 2223 }
2086 }
2087 2224
2088 $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);
2089 2232
2090 cf::cede_to_tick; 2233 cf::cede_to_tick;
2091 # now do the right thing for maps 2234 # now do the right thing for maps
2092 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2093 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
… …
2096 2239
2097 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2098 $self->decay_objects; 2241 $self->decay_objects;
2099 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2100 $self->update_buttons; 2243 $self->update_buttons;
2244 $self->post_load_physics;
2101 cf::cede_to_tick; 2245 cf::cede_to_tick;
2102 $self->activate; 2246 #$self->activate; # no longer activate maps automatically
2103 } 2247 }
2104 2248
2105 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2106 $self->last_access ($cf::RUNTIME); 2250 $self->last_access ($cf::RUNTIME);
2107
2108 $self->in_memory (cf::MAP_ACTIVE);
2109 } 2251 }
2110 2252
2111 $self->post_load; 2253 $self->post_load;
2254
2255 1
2112} 2256}
2113 2257
2114# customize the map for a given player, i.e. 2258# customize the map for a given player, i.e.
2115# return the _real_ map. used by e.g. per-player 2259# return the _real_ map. used by e.g. per-player
2116# maps to change the path to ~playername/mappath 2260# maps to change the path to ~playername/mappath
… …
2137 or next; 2281 or next;
2138 $neigh = find $neigh, $map 2282 $neigh = find $neigh, $map
2139 or next; 2283 or next;
2140 $neigh->load; 2284 $neigh->load;
2141 2285
2286 # now find the diagonal neighbours
2142 push @neigh, 2287 push @neigh,
2143 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2288 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2144 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2289 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2145 } 2290 }
2146 2291
… …
2153} 2298}
2154 2299
2155sub find_sync { 2300sub find_sync {
2156 my ($path, $origin) = @_; 2301 my ($path, $origin) = @_;
2157 2302
2158 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
2159} 2308}
2160 2309
2161sub do_load_sync { 2310sub do_load_sync {
2162 my ($map) = @_; 2311 my ($map) = @_;
2163 2312
2313 # it's a bug to call this from the main context
2164 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2314 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2165 if $Coro::current == $Coro::main; 2315 if $Coro::current == $Coro::main;
2166 2316
2167 cf::sync_job { $map->load }; 2317 $map->load;
2168} 2318}
2169 2319
2170our %MAP_PREFETCH; 2320our %MAP_PREFETCH;
2171our $MAP_PREFETCHER = undef; 2321our $MAP_PREFETCHER = undef;
2172 2322
2173sub find_async { 2323sub find_async {
2174 my ($path, $origin, $load) = @_; 2324 my ($path, $origin, $load) = @_;
2175 2325
2176 $path = normalise $path, $origin && $origin->{path}; 2326 $path = normalise $path, $origin;
2177 2327
2328 print "find async $path (from $origin)\n";#d#
2329
2178 if (my $map = $cf::MAP{$path}) { 2330 if (my $map = $cf::MAP{$path}) {
2179 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2331 return $map if !$load || $map->linkable;
2180 } 2332 }
2181 2333
2182 $MAP_PREFETCH{$path} |= $load; 2334 $MAP_PREFETCH{$path} |= $load;
2183 2335
2184 $MAP_PREFETCHER ||= cf::async { 2336 $MAP_PREFETCHER ||= cf::async {
… …
2198 $MAP_PREFETCHER->prio (6); 2350 $MAP_PREFETCHER->prio (6);
2199 2351
2200 () 2352 ()
2201} 2353}
2202 2354
2355# common code, used by both ->save and ->swapout
2203sub save { 2356sub _save {
2204 my ($self) = @_; 2357 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2358
2208 $self->{last_save} = $cf::RUNTIME; 2359 $self->{last_save} = $cf::RUNTIME;
2209 2360
2210 return unless $self->dirty; 2361 return unless $self->dirty;
2211 2362
… …
2231 } else { 2382 } else {
2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2383 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2233 } 2384 }
2234} 2385}
2235 2386
2387sub save {
2388 my ($self) = @_;
2389
2390 my $lock = cf::lock_acquire "map_data:$self->{path}";
2391
2392 $self->_save;
2393}
2394
2236sub swap_out { 2395sub swap_out {
2237 my ($self) = @_; 2396 my ($self) = @_;
2238 2397
2239 # save first because save cedes
2240 $self->save;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2398 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243 2399
2400 return if !$self->linkable;
2401 return if $self->{deny_save};
2244 return if $self->players; 2402 return if $self->players;
2245 return if $self->in_memory != cf::MAP_ACTIVE; 2403
2404 # first deactivate the map and "unlink" it from the core
2405 $self->deactivate;
2406 $_->clear_links_to ($self) for values %cf::MAP;
2407 $self->state (cf::MAP_SWAPPED);
2408
2409 # then atomically save
2410 $self->_save;
2411
2412 # then free the map
2413 $self->clear;
2414}
2415
2416sub reset_at {
2417 my ($self) = @_;
2418
2419 # TODO: safety, remove and allow resettable per-player maps
2246 return if $self->{deny_save}; 2420 return 1e99 if $self->{deny_reset};
2247 2421
2422 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2423 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2424
2425 $time + $to
2426}
2427
2428sub should_reset {
2429 my ($self) = @_;
2430
2431 $self->reset_at <= $cf::RUNTIME
2432}
2433
2434sub reset {
2435 my ($self) = @_;
2436
2437 my $lock = cf::lock_acquire "map_data:$self->{path}";
2438
2439 return if $self->players;
2440
2441 cf::trace "resetting map ", $self->path, "\n";
2442
2248 $self->in_memory (cf::MAP_SWAPPED); 2443 $self->state (cf::MAP_SWAPPED);
2444
2445 # need to save uniques path
2446 unless ($self->{deny_save}) {
2447 my $uniq = $self->uniq_path; utf8::encode $uniq;
2448
2449 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2450 if $uniq;
2451 }
2452
2453 delete $cf::MAP{$self->path};
2249 2454
2250 $self->deactivate; 2455 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP; 2456 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear; 2457 $self->clear;
2253}
2254
2255sub reset_at {
2256 my ($self) = @_;
2257
2258 # TODO: safety, remove and allow resettable per-player maps
2259 return 1e99 if $self->{deny_reset};
2260
2261 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2262 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2263
2264 $time + $to
2265}
2266
2267sub should_reset {
2268 my ($self) = @_;
2269
2270 $self->reset_at <= $cf::RUNTIME
2271}
2272
2273sub reset {
2274 my ($self) = @_;
2275
2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2277
2278 return if $self->players;
2279
2280 warn "resetting map ", $self->path, "\n";
2281
2282 $self->in_memory (cf::MAP_SWAPPED);
2283
2284 # need to save uniques path
2285 unless ($self->{deny_save}) {
2286 my $uniq = $self->uniq_path; utf8::encode $uniq;
2287
2288 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2289 if $uniq;
2290 }
2291
2292 delete $cf::MAP{$self->path};
2293
2294 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP;
2296 $self->clear;
2297 2458
2298 $self->unlink_save; 2459 $self->unlink_save;
2299 $self->destroy; 2460 $self->destroy;
2300} 2461}
2301 2462
… …
2309 2470
2310 delete $cf::MAP{$self->path}; 2471 delete $cf::MAP{$self->path};
2311 2472
2312 $self->unlink_save; 2473 $self->unlink_save;
2313 2474
2314 bless $self, "cf::map"; 2475 bless $self, "cf::map::wrap";
2315 delete $self->{deny_reset}; 2476 delete $self->{deny_reset};
2316 $self->{deny_save} = 1; 2477 $self->{deny_save} = 1;
2317 $self->reset_timeout (1); 2478 $self->reset_timeout (1);
2318 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2479 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2319 2480
… …
2549 2710
2550Freezes the player and moves him/her to a special map (C<{link}>). 2711Freezes the player and moves him/her to a special map (C<{link}>).
2551 2712
2552The player should be reasonably safe there for short amounts of time (e.g. 2713The player should be reasonably safe there for short amounts of time (e.g.
2553for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2714for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2554though, as the palyer cannot control the character while it is on the link 2715though, as the player cannot control the character while it is on the link
2555map. 2716map.
2556 2717
2557Will never block. 2718Will never block.
2558 2719
2559=item $player_object->leave_link ($map, $x, $y) 2720=item $player_object->leave_link ($map, $x, $y)
… …
2580sub cf::object::player::enter_link { 2741sub cf::object::player::enter_link {
2581 my ($self) = @_; 2742 my ($self) = @_;
2582 2743
2583 $self->deactivate_recursive; 2744 $self->deactivate_recursive;
2584 2745
2746 ++$self->{_link_recursion};
2747
2585 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2748 return if UNIVERSAL::isa $self->map, "ext::map_link";
2586 2749
2587 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2750 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2588 if $self->map && $self->map->{path} ne "{link}"; 2751 if $self->map && $self->map->{path} ne "{link}";
2589 2752
2590 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2753 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2591} 2754}
2592 2755
2593sub cf::object::player::leave_link { 2756sub cf::object::player::leave_link {
2594 my ($self, $map, $x, $y) = @_; 2757 my ($self, $map, $x, $y) = @_;
2595 2758
… …
2620 $map->load_neighbours; 2783 $map->load_neighbours;
2621 2784
2622 return unless $self->contr->active; 2785 return unless $self->contr->active;
2623 2786
2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2787 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2625 $self->enter_map ($map, $x, $y); 2788 if ($self->enter_map ($map, $x, $y)) {
2626 2789 # entering was successful
2790 delete $self->{_link_recursion};
2627 # only activate afterwards, to support waiting in hooks 2791 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive; 2792 $self->activate_recursive;
2629} 2793 }
2630 2794
2795}
2796
2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2797=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2632 2798
2633Moves the player to the given map-path and coordinates by first freezing 2799Moves the player to the given map-path and coordinates by first freezing
2634her, loading and preparing them map, calling the provided $check callback 2800her, loading and preparing them map, calling the provided $check callback
2635that has to return the map if sucecssful, and then unfreezes the player on 2801that has to return the map if sucecssful, and then unfreezes the player on
2636the new (success) or old (failed) map position. In either case, $done will 2802the new (success) or old (failed) map position. In either case, $done will
… …
2643 2809
2644our $GOTOGEN; 2810our $GOTOGEN;
2645 2811
2646sub cf::object::player::goto { 2812sub cf::object::player::goto {
2647 my ($self, $path, $x, $y, $check, $done) = @_; 2813 my ($self, $path, $x, $y, $check, $done) = @_;
2814
2815 if ($self->{_link_recursion} >= $MAX_LINKS) {
2816 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2817 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2818 ($path, $x, $y) = @$EMERGENCY_POSITION;
2819 }
2648 2820
2649 # 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
2650 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2822 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2651 2823
2652 $self->enter_link; 2824 $self->enter_link;
… …
2672 ($path, $x, $y) = (undef, undef, undef); 2844 ($path, $x, $y) = (undef, undef, undef);
2673 } 2845 }
2674 } 2846 }
2675 2847
2676 my $map = eval { 2848 my $map = eval {
2677 my $map = defined $path ? cf::map::find $path : undef; 2849 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2678 2850
2679 if ($map) { 2851 if ($map) {
2680 $map = $map->customise_for ($self); 2852 $map = $map->customise_for ($self);
2681 $map = $check->($map) if $check && $map; 2853 $map = $check->($map, $x, $y, $self) if $check && $map;
2682 } else { 2854 } else {
2683 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2855 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2684 } 2856 }
2685 2857
2686 $map 2858 $map
… …
2694 if ($gen == $self->{_goto_generation}) { 2866 if ($gen == $self->{_goto_generation}) {
2695 delete $self->{_goto_generation}; 2867 delete $self->{_goto_generation};
2696 $self->leave_link ($map, $x, $y); 2868 $self->leave_link ($map, $x, $y);
2697 } 2869 }
2698 2870
2699 $done->() if $done; 2871 $done->($self) if $done;
2700 })->prio (1); 2872 })->prio (1);
2701} 2873}
2702 2874
2703=item $player_object->enter_exit ($exit_object) 2875=item $player_object->enter_exit ($exit_object)
2704 2876
… …
2772 $Coro::current->{desc} = "enter_exit"; 2944 $Coro::current->{desc} = "enter_exit";
2773 2945
2774 unless (eval { 2946 unless (eval {
2775 $self->deactivate_recursive; # just to be sure 2947 $self->deactivate_recursive; # just to be sure
2776 2948
2777 # random map handling
2778 {
2779 my $guard = cf::lock_acquire "exit_prepare:$exit";
2780
2781 prepare_random_map $exit
2782 if $exit->slaying eq "/!";
2783 }
2784
2785 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2949 my $map = cf::map::normalise $exit->slaying, $exit->map;
2786 my $x = $exit->stats->hp; 2950 my $x = $exit->stats->hp;
2787 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 }
2788 2975
2789 $self->goto ($map, $x, $y); 2976 $self->goto ($map, $x, $y);
2790 2977
2791 # if exit is damned, update players death & WoR home-position 2978 # if exit is damned, update players death & WoR home-position
2792 $self->contr->savebed ($map, $x, $y) 2979 $self->contr->savebed ($map, $x, $y)
… …
2797 $self->message ("Something went wrong deep within the deliantra server. " 2984 $self->message ("Something went wrong deep within the deliantra server. "
2798 . "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. "
2799 . "Please report this to the dungeon master!", 2986 . "Please report this to the dungeon master!",
2800 cf::NDI_UNIQUE | cf::NDI_RED); 2987 cf::NDI_UNIQUE | cf::NDI_RED);
2801 2988
2802 warn "ERROR in enter_exit: $@"; 2989 error "ERROR in enter_exit: $@";
2803 $self->leave_link; 2990 $self->leave_link;
2804 } 2991 }
2805 })->prio (1); 2992 })->prio (1);
2806} 2993}
2807 2994
… …
3120 3307
3121 $ns->ext_reply ($reply, @reply) 3308 $ns->ext_reply ($reply, @reply)
3122 if $reply; 3309 if $reply;
3123 3310
3124 } else { 3311 } else {
3125 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";
3126 } 3313 }
3127 3314
3128 cf::override; 3315 cf::override;
3129 }, 3316 },
3130); 3317);
… …
3211 decrease split destroy change_exp value msg lore send_msg)], 3398 decrease split destroy change_exp value msg lore send_msg)],
3212 ["cf::object::player" => qw(player)], 3399 ["cf::object::player" => qw(player)],
3213 ["cf::player" => qw(peaceful send_msg)], 3400 ["cf::player" => qw(peaceful send_msg)],
3214 ["cf::map" => qw(trigger)], 3401 ["cf::map" => qw(trigger)],
3215) { 3402) {
3216 no strict 'refs';
3217 my ($pkg, @funs) = @$_; 3403 my ($pkg, @funs) = @$_;
3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3404 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3219 for @funs; 3405 for @funs;
3220} 3406}
3221 3407
… …
3260 local @cf::_safe_eval_args = values %vars; 3446 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval; 3447 @res = wantarray ? eval eval : scalar eval $eval;
3262 } 3448 }
3263 3449
3264 if ($@) { 3450 if ($@) {
3265 warn "$@"; 3451 warn "$@",
3266 warn "while executing safe code '$code'\n"; 3452 "while executing safe code '$code'\n",
3267 warn "with arguments " . (join " ", %vars) . "\n"; 3453 "with arguments " . (join " ", %vars) . "\n";
3268 } 3454 }
3269 3455
3270 wantarray ? @res : $res[0] 3456 wantarray ? @res : $res[0]
3271} 3457}
3272 3458
… …
3306 # for this (global event?) 3492 # for this (global event?)
3307 %ext::player_env::MUSIC_FACE_CACHE = (); 3493 %ext::player_env::MUSIC_FACE_CACHE = ();
3308 3494
3309 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3495 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3310 3496
3311 warn "loading facedata from $path\n"; 3497 trace "loading facedata from $path\n";
3312 3498
3313 my $facedata; 3499 my $facedata = decode_storable load_file $path;
3314 0 < aio_load $path, $facedata
3315 or die "$path: $!";
3316
3317 $facedata = Coro::Storable::thaw $facedata;
3318 3500
3319 $facedata->{version} == 2 3501 $facedata->{version} == 2
3320 or cf::cleanup "$path: version mismatch, cannot proceed."; 3502 or cf::cleanup "$path: version mismatch, cannot proceed.";
3321 3503
3322 # patch in the exptable 3504 # patch in the exptable
… …
3336 3518
3337 cf::face::set_visibility $idx, $info->{visibility}; 3519 cf::face::set_visibility $idx, $info->{visibility};
3338 cf::face::set_magicmap $idx, $info->{magicmap}; 3520 cf::face::set_magicmap $idx, $info->{magicmap};
3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3521 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3340 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} ;
3341 3524
3342 cf::cede_to_tick; 3525 cf::cede_to_tick;
3343 } 3526 }
3344 3527
3345 while (my ($face, $info) = each %$faces) { 3528 while (my ($face, $info) = each %$faces) {
… …
3350 3533
3351 if (my $smooth = cf::face::find $info->{smooth}) { 3534 if (my $smooth = cf::face::find $info->{smooth}) {
3352 cf::face::set_smooth $idx, $smooth; 3535 cf::face::set_smooth $idx, $smooth;
3353 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3536 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3354 } else { 3537 } else {
3355 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3538 error "smooth face '$info->{smooth}' not found for face '$face'";
3356 } 3539 }
3357 3540
3358 cf::cede_to_tick; 3541 cf::cede_to_tick;
3359 } 3542 }
3360 } 3543 }
… …
3378 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3561 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3379 3562
3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3563 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3381 cf::face::set_type $idx, $info->{type}; 3564 cf::face::set_type $idx, $info->{type};
3382 } else { 3565 } else {
3383 $RESOURCE{$name} = $info; 3566 $RESOURCE{$name} = $info; # unused
3384 } 3567 }
3385 3568
3386 cf::cede_to_tick; 3569 cf::cede_to_tick;
3387 } 3570 }
3388 } 3571 }
3389 3572
3390 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3573 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3391 3574
3392 1 3575 1
3393} 3576}
3394
3395cf::global->attach (on_resource_update => sub {
3396 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3397 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3398
3399 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3400 my $sound = $soundconf->{compat}[$_]
3401 or next;
3402
3403 my $face = cf::face::find "sound/$sound->[1]";
3404 cf::sound::set $sound->[0] => $face;
3405 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3406 }
3407
3408 while (my ($k, $v) = each %{$soundconf->{event}}) {
3409 my $face = cf::face::find "sound/$v";
3410 cf::sound::set $k => $face;
3411 }
3412 }
3413});
3414 3577
3415register_exticmd fx_want => sub { 3578register_exticmd fx_want => sub {
3416 my ($ns, $want) = @_; 3579 my ($ns, $want) = @_;
3417 3580
3418 while (my ($k, $v) = each %$want) { 3581 while (my ($k, $v) = each %$want) {
… …
3457sub reload_treasures { 3620sub reload_treasures {
3458 load_resource_file "$DATADIR/treasures" 3621 load_resource_file "$DATADIR/treasures"
3459 or die "unable to load treasurelists\n"; 3622 or die "unable to load treasurelists\n";
3460} 3623}
3461 3624
3625sub reload_sound {
3626 trace "loading sound config from $DATADIR/sound\n";
3627
3628 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3629
3630 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3631 my $sound = $soundconf->{compat}[$_]
3632 or next;
3633
3634 my $face = cf::face::find "sound/$sound->[1]";
3635 cf::sound::set $sound->[0] => $face;
3636 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3637 }
3638
3639 while (my ($k, $v) = each %{$soundconf->{event}}) {
3640 my $face = cf::face::find "sound/$v";
3641 cf::sound::set $k => $face;
3642 }
3643}
3644
3462sub reload_resources { 3645sub reload_resources {
3463 warn "reloading resource files...\n"; 3646 trace "reloading resource files...\n";
3464 3647
3648 reload_exp_table;
3649 reload_materials;
3465 reload_facedata; 3650 reload_facedata;
3651 reload_sound;
3466 reload_archetypes; 3652 reload_archetypes;
3467 reload_regions; 3653 reload_regions;
3468 reload_treasures; 3654 reload_treasures;
3469 3655
3470 warn "finished reloading resource files\n"; 3656 trace "finished reloading resource files\n";
3471} 3657}
3472 3658
3473sub reload_config { 3659sub reload_config {
3474 warn "reloading config file...\n"; 3660 trace "reloading config file...\n";
3475 3661
3476 open my $fh, "<:utf8", "$CONFDIR/config" 3662 my $config = load_file "$CONFDIR/config";
3477 or return; 3663 utf8::decode $config;
3664 *CFG = decode_yaml $config;
3478 3665
3479 local $/;
3480 *CFG = YAML::XS::Load scalar <$fh>;
3481
3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3666 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3483 3667
3484 $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};
3485 $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};
3486 3670
3487 if (exists $CFG{mlockall}) { 3671 if (exists $CFG{mlockall}) {
… …
3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3673 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3490 and die "WARNING: m(un)lockall failed: $!\n"; 3674 and die "WARNING: m(un)lockall failed: $!\n";
3491 }; 3675 };
3492 warn $@ if $@; 3676 warn $@ if $@;
3493 } 3677 }
3494
3495 warn "finished reloading resource files\n";
3496} 3678}
3497 3679
3498sub pidfile() { 3680sub pidfile() {
3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3681 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3500 or die "$PIDFILE: $!"; 3682 or die "$PIDFILE: $!";
… …
3513 seek $fh, 0, 0; 3695 seek $fh, 0, 0;
3514 print $fh $$; 3696 print $fh $$;
3515} 3697}
3516 3698
3517sub main_loop { 3699sub main_loop {
3518 warn "EV::loop starting\n"; 3700 trace "EV::loop starting\n";
3519 if (1) { 3701 if (1) {
3520 EV::loop; 3702 EV::loop;
3521 } 3703 }
3522 warn "EV::loop returned\n"; 3704 trace "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP; 3705 goto &main_loop unless $REALLY_UNLOOP;
3524} 3706}
3525 3707
3526sub main { 3708sub main {
3527 cf::init_globals; # initialise logging 3709 cf::init_globals; # initialise logging
3528 3710
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3711 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 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.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3713 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3714 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533
3534 cf::init_experience;
3535 cf::init_anim;
3536 cf::init_attackmess;
3537 cf::init_dynamic;
3538 3715
3539 $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
3540 3717
3541 # we must not ever block the main coroutine 3718 # we must not ever block the main coroutine
3542 local $Coro::idle = sub { 3719 local $Coro::idle = sub {
… …
3548 }; 3725 };
3549 3726
3550 evthread_start IO::AIO::poll_fileno; 3727 evthread_start IO::AIO::poll_fileno;
3551 3728
3552 cf::sync_job { 3729 cf::sync_job {
3730 cf::incloader::init ();
3731
3732 cf::init_anim;
3733 cf::init_attackmess;
3734 cf::init_dynamic;
3735
3553 cf::load_settings; 3736 cf::load_settings;
3554 cf::load_materials;
3555 3737
3556 reload_resources; 3738 reload_resources;
3557 reload_config; 3739 reload_config;
3558 db_init; 3740 db_init;
3559 3741
… …
3571 3753
3572 # no (long-running) fork's whatsoever before this point(!) 3754 # no (long-running) fork's whatsoever before this point(!)
3573 use POSIX (); 3755 use POSIX ();
3574 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};
3575 3757
3576 (pop @POST_INIT)->(0) while @POST_INIT; 3758 cf::_post_init 0;
3577 }; 3759 };
3578 3760
3761 cf::object::thawer::errors_are_fatal 0;
3762 info "parse errors in files are no longer fatal from this point on.\n";
3763
3764 my $free_main; $free_main = EV::idle sub {
3765 undef $free_main;
3766 undef &main; # free gobs of memory :)
3767 };
3768
3579 main_loop; 3769 goto &main_loop;
3580} 3770}
3581 3771
3582############################################################################# 3772#############################################################################
3583# initialisation and cleanup 3773# initialisation and cleanup
3584 3774
3585# install some emergency cleanup handlers 3775# install some emergency cleanup handlers
3586BEGIN { 3776BEGIN {
3587 our %SIGWATCHER = (); 3777 our %SIGWATCHER = ();
3588 for my $signal (qw(INT HUP TERM)) { 3778 for my $signal (qw(INT HUP TERM)) {
3589 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3779 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3590 cf::cleanup "SIG$signal"; 3780 cf::cleanup "SIG$signal";
3591 }; 3781 };
3592 } 3782 }
3593} 3783}
3594 3784
3595sub write_runtime_sync { 3785sub write_runtime_sync {
3596 my $t0 = EV::time; 3786 my $t0 = AE::time;
3597 3787
3598 # first touch the runtime file to show we are still running: 3788 # first touch the runtime file to show we are still running:
3599 # the fsync below can take a very very long time. 3789 # the fsync below can take a very very long time.
3600 3790
3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3791 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
… …
3623 or return; 3813 or return;
3624 3814
3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3815 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3626 and return; 3816 and return;
3627 3817
3628 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 3818 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3629 3819
3630 1 3820 1
3631} 3821}
3632 3822
3633our $uuid_lock; 3823our $uuid_lock;
… …
3645 or return; 3835 or return;
3646 3836
3647 my $value = uuid_seq uuid_cur; 3837 my $value = uuid_seq uuid_cur;
3648 3838
3649 unless ($value) { 3839 unless ($value) {
3650 warn "cowardly refusing to write zero uuid value!\n"; 3840 info "cowardly refusing to write zero uuid value!\n";
3651 return; 3841 return;
3652 } 3842 }
3653 3843
3654 my $value = uuid_str $value + $uuid_skip; 3844 my $value = uuid_str $value + $uuid_skip;
3655 $uuid_skip = 0; 3845 $uuid_skip = 0;
… …
3665 or return; 3855 or return;
3666 3856
3667 aio_rename "$uuid~", $uuid 3857 aio_rename "$uuid~", $uuid
3668 and return; 3858 and return;
3669 3859
3670 warn "uuid file written ($value).\n"; 3860 trace "uuid file written ($value).\n";
3671 3861
3672 1 3862 1
3673 3863
3674} 3864}
3675 3865
… …
3681} 3871}
3682 3872
3683sub emergency_save() { 3873sub emergency_save() {
3684 my $freeze_guard = cf::freeze_mainloop; 3874 my $freeze_guard = cf::freeze_mainloop;
3685 3875
3686 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;
3687 3882
3688 cf::sync_job { 3883 cf::sync_job {
3689 # this is a trade-off: we want to be very quick here, so 3884 cf::write_runtime_sync; # external watchdog should not bark
3690 # save all maps without fsync, and later call a global sync
3691 # (which in turn might be very very slow)
3692 local $USE_FSYNC = 0;
3693 3885
3694 # use a peculiar iteration method to avoid tripping on perl 3886 # use a peculiar iteration method to avoid tripping on perl
3695 # refcount bugs in for. also avoids problems with players 3887 # refcount bugs in for. also avoids problems with players
3696 # and maps saved/destroyed asynchronously. 3888 # and maps saved/destroyed asynchronously.
3697 warn "emergency_perl_save: begin player save\n"; 3889 info "emergency_perl_save: begin player save\n";
3698 for my $login (keys %cf::PLAYER) { 3890 for my $login (keys %cf::PLAYER) {
3699 my $pl = $cf::PLAYER{$login} or next; 3891 my $pl = $cf::PLAYER{$login} or next;
3700 $pl->valid or next; 3892 $pl->valid or next;
3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3893 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3702 $pl->save; 3894 $pl->save;
3703 } 3895 }
3704 warn "emergency_perl_save: end player save\n"; 3896 info "emergency_perl_save: end player save\n";
3705 3897
3898 cf::write_runtime_sync; # external watchdog should not bark
3899
3706 warn "emergency_perl_save: begin map save\n"; 3900 info "emergency_perl_save: begin map save\n";
3707 for my $path (keys %cf::MAP) { 3901 for my $path (keys %cf::MAP) {
3708 my $map = $cf::MAP{$path} or next; 3902 my $map = $cf::MAP{$path} or next;
3709 $map->valid or next; 3903 $map->valid or next;
3710 $map->save; 3904 $map->save;
3711 } 3905 }
3712 warn "emergency_perl_save: end map save\n"; 3906 info "emergency_perl_save: end map save\n";
3713 3907
3908 cf::write_runtime_sync; # external watchdog should not bark
3909
3714 warn "emergency_perl_save: begin database checkpoint\n"; 3910 info "emergency_perl_save: begin database checkpoint\n";
3715 BDB::db_env_txn_checkpoint $DB_ENV; 3911 BDB::db_env_txn_checkpoint $DB_ENV;
3716 warn "emergency_perl_save: end database checkpoint\n"; 3912 info "emergency_perl_save: end database checkpoint\n";
3717 3913
3718 warn "emergency_perl_save: begin write uuid\n"; 3914 info "emergency_perl_save: begin write uuid\n";
3719 write_uuid_sync 1; 3915 write_uuid_sync 1;
3720 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
3721 }; 3936 };
3722 3937
3723 warn "emergency_perl_save: starting sync()\n";
3724 IO::AIO::aio_sync sub {
3725 warn "emergency_perl_save: finished sync()\n";
3726 };
3727
3728 warn "emergency_perl_save: leave\n"; 3938 info "emergency_perl_save: leave\n";
3729} 3939}
3730 3940
3731sub post_cleanup { 3941sub post_cleanup {
3732 my ($make_core) = @_; 3942 my ($make_core) = @_;
3733 3943
3944 IO::AIO::flush;
3945
3734 warn Carp::longmess "post_cleanup backtrace" 3946 error Carp::longmess "post_cleanup backtrace"
3735 if $make_core; 3947 if $make_core;
3736 3948
3737 my $fh = pidfile; 3949 my $fh = pidfile;
3738 unlink $PIDFILE if <$fh> == $$; 3950 unlink $PIDFILE if <$fh> == $$;
3739} 3951}
… …
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3971 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) { 3972 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"}; 3973 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3974# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 } 3975 }
3764 warn "cleared package $pkg\n";#d#
3765} 3976}
3766 3977
3767sub do_reload_perl() { 3978sub do_reload_perl() {
3768 # can/must only be called in main 3979 # can/must only be called in main
3769 if ($Coro::current != $Coro::main) { 3980 unless (in_main) {
3770 warn "can only reload from main coroutine"; 3981 error "can only reload from main coroutine";
3771 return; 3982 return;
3772 } 3983 }
3773 3984
3774 return if $RELOAD++; 3985 return if $RELOAD++;
3775 3986
3776 my $t1 = EV::time; 3987 my $t1 = AE::time;
3777 3988
3778 while ($RELOAD) { 3989 while ($RELOAD) {
3779 warn "reloading..."; 3990 cf::get_slot 0.1, -1, "reload_perl";
3991 info "perl_reload: reloading...";
3780 3992
3781 warn "entering sync_job"; 3993 trace "perl_reload: entering sync_job";
3782 3994
3783 cf::sync_job { 3995 cf::sync_job {
3784 cf::write_runtime_sync; # external watchdog should not bark
3785 cf::emergency_save; 3996 #cf::emergency_save;
3786 cf::write_runtime_sync; # external watchdog should not bark
3787 3997
3788 warn "syncing database to disk";
3789 BDB::db_env_txn_checkpoint $DB_ENV;
3790
3791 # if anything goes wrong in here, we should simply crash as we already saved
3792
3793 warn "flushing outstanding aio requests";
3794 while (IO::AIO::nreqs || BDB::nreqs) {
3795 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3796 }
3797
3798 warn "cancelling all extension coros"; 3998 trace "perl_reload: cancelling all extension coros";
3799 $_->cancel for values %EXT_CORO; 3999 $_->cancel for values %EXT_CORO;
3800 %EXT_CORO = (); 4000 %EXT_CORO = ();
3801 4001
3802 warn "removing commands"; 4002 trace "perl_reload: removing commands";
3803 %COMMAND = (); 4003 %COMMAND = ();
3804 4004
3805 warn "removing ext/exti commands"; 4005 trace "perl_reload: removing ext/exti commands";
3806 %EXTCMD = (); 4006 %EXTCMD = ();
3807 %EXTICMD = (); 4007 %EXTICMD = ();
3808 4008
3809 warn "unloading/nuking all extensions"; 4009 trace "perl_reload: unloading/nuking all extensions";
3810 for my $pkg (@EXTS) { 4010 for my $pkg (@EXTS) {
3811 warn "... unloading $pkg"; 4011 trace "... unloading $pkg";
3812 4012
3813 if (my $cb = $pkg->can ("unload")) { 4013 if (my $cb = $pkg->can ("unload")) {
3814 eval { 4014 eval {
3815 $cb->($pkg); 4015 $cb->($pkg);
3816 1 4016 1
3817 } or warn "$pkg unloaded, but with errors: $@"; 4017 } or error "$pkg unloaded, but with errors: $@";
3818 } 4018 }
3819 4019
3820 warn "... clearing $pkg"; 4020 trace "... clearing $pkg";
3821 clear_package $pkg; 4021 clear_package $pkg;
3822 } 4022 }
3823 4023
3824 warn "unloading all perl modules loaded from $LIBDIR"; 4024 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3825 while (my ($k, $v) = each %INC) { 4025 while (my ($k, $v) = each %INC) {
3826 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4026 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3827 4027
3828 warn "... unloading $k"; 4028 trace "... unloading $k";
3829 delete $INC{$k}; 4029 delete $INC{$k};
3830 4030
3831 $k =~ s/\.pm$//; 4031 $k =~ s/\.pm$//;
3832 $k =~ s/\//::/g; 4032 $k =~ s/\//::/g;
3833 4033
… …
3836 } 4036 }
3837 4037
3838 clear_package $k; 4038 clear_package $k;
3839 } 4039 }
3840 4040
3841 warn "getting rid of safe::, as good as possible"; 4041 trace "perl_reload: getting rid of safe::, as good as possible";
3842 clear_package "safe::$_" 4042 clear_package "safe::$_"
3843 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);
3844 4044
3845 warn "unloading cf.pm \"a bit\""; 4045 trace "perl_reload: unloading cf.pm \"a bit\"";
3846 delete $INC{"cf.pm"}; 4046 delete $INC{"cf.pm"};
3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4047 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3848 4048
3849 # don't, removes xs symbols, too, 4049 # don't, removes xs symbols, too,
3850 # and global variables created in xs 4050 # and global variables created in xs
3851 #clear_package __PACKAGE__; 4051 #clear_package __PACKAGE__;
3852 4052
3853 warn "unload completed, starting to reload now"; 4053 info "perl_reload: unload completed, starting to reload now";
3854 4054
3855 warn "reloading cf.pm"; 4055 trace "perl_reload: reloading cf.pm";
3856 require cf; 4056 require cf;
3857 cf::_connect_to_perl_1; 4057 cf::_connect_to_perl_1;
3858 4058
3859 warn "loading config and database again"; 4059 trace "perl_reload: loading config and database again";
3860 cf::reload_config; 4060 cf::reload_config;
3861 4061
3862 warn "loading extensions"; 4062 trace "perl_reload: loading extensions";
3863 cf::load_extensions; 4063 cf::load_extensions;
3864 4064
3865 if ($REATTACH_ON_RELOAD) { 4065 if ($REATTACH_ON_RELOAD) {
3866 warn "reattaching attachments to objects/players"; 4066 trace "perl_reload: reattaching attachments to objects/players";
3867 _global_reattach; # objects, sockets 4067 _global_reattach; # objects, sockets
3868 warn "reattaching attachments to maps"; 4068 trace "perl_reload: reattaching attachments to maps";
3869 reattach $_ for values %MAP; 4069 reattach $_ for values %MAP;
3870 warn "reattaching attachments to players"; 4070 trace "perl_reload: reattaching attachments to players";
3871 reattach $_ for values %PLAYER; 4071 reattach $_ for values %PLAYER;
3872 } 4072 }
3873 4073
3874 warn "running post_init jobs"; 4074 cf::_post_init 1;
3875 (pop @POST_INIT)->(1) while @POST_INIT;
3876 4075
3877 warn "leaving sync_job"; 4076 trace "perl_reload: leaving sync_job";
3878 4077
3879 1 4078 1
3880 } or do { 4079 } or do {
3881 warn $@; 4080 error $@;
3882 cf::cleanup "error while reloading, exiting."; 4081 cf::cleanup "perl_reload: error, exiting.";
3883 }; 4082 };
3884 4083
3885 warn "reloaded";
3886 --$RELOAD; 4084 --$RELOAD;
3887 } 4085 }
3888 4086
3889 $t1 = EV::time - $t1; 4087 $t1 = AE::time - $t1;
3890 warn "reload completed in ${t1}s\n"; 4088 info "perl_reload: completed in ${t1}s\n";
3891}; 4089};
3892 4090
3893our $RELOAD_WATCHER; # used only during reload 4091our $RELOAD_WATCHER; # used only during reload
3894 4092
3895sub reload_perl() { 4093sub reload_perl() {
… …
3897 # coro crashes during coro_state_free->destroy here. 4095 # coro crashes during coro_state_free->destroy here.
3898 4096
3899 $RELOAD_WATCHER ||= cf::async { 4097 $RELOAD_WATCHER ||= cf::async {
3900 Coro::AIO::aio_wait cache_extensions; 4098 Coro::AIO::aio_wait cache_extensions;
3901 4099
3902 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4100 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3903 do_reload_perl; 4101 do_reload_perl;
3904 undef $RELOAD_WATCHER; 4102 undef $RELOAD_WATCHER;
3905 }; 4103 };
3906 }; 4104 };
3907} 4105}
… …
3916 reload_perl; 4114 reload_perl;
3917 }; 4115 };
3918 } 4116 }
3919}; 4117};
3920 4118
3921unshift @INC, $LIBDIR; 4119#############################################################################
3922 4120
3923my $bug_warning = 0; 4121my $bug_warning = 0;
3924 4122
3925our @WAIT_FOR_TICK;
3926our @WAIT_FOR_TICK_BEGIN;
3927
3928sub wait_for_tick { 4123sub wait_for_tick() {
3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4124 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3930 4125
3931 my $signal = new Coro::Signal; 4126 $WAIT_FOR_TICK->wait;
3932 push @WAIT_FOR_TICK, $signal;
3933 $signal->wait;
3934} 4127}
3935 4128
3936sub wait_for_tick_begin { 4129sub wait_for_tick_begin() {
3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4130 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3938 4131
3939 my $signal = new Coro::Signal; 4132 my $signal = new Coro::Signal;
3940 push @WAIT_FOR_TICK_BEGIN, $signal; 4133 push @WAIT_FOR_TICK_BEGIN, $signal;
3941 $signal->wait; 4134 $signal->wait;
3942} 4135}
… …
3946 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"
3947 unless ++$bug_warning > 10; 4140 unless ++$bug_warning > 10;
3948 return; 4141 return;
3949 } 4142 }
3950 4143
3951 cf::server_tick; # one server iteration 4144 cf::one_tick; # one server iteration
3952 4145
3953 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4146 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3954 4147
3955 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4148 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3956 $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.;
3957 Coro::async_pool { 4150 Coro::async_pool {
3958 $Coro::current->{desc} = "runtime saver"; 4151 $Coro::current->{desc} = "runtime saver";
3959 write_runtime_sync 4152 write_runtime_sync
3960 or warn "ERROR: unable to write runtime file: $!"; 4153 or error "ERROR: unable to write runtime file: $!";
3961 }; 4154 };
3962 } 4155 }
3963 4156
3964 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3965 $sig->send; 4158 $sig->send;
3966 } 4159 }
3967 while (my $sig = shift @WAIT_FOR_TICK) { 4160 $WAIT_FOR_TICK->broadcast;
3968 $sig->send;
3969 }
3970 4161
3971 $LOAD = ($NOW - $TICK_START) / $TICK; 4162 $LOAD = ($NOW - $TICK_START) / $TICK;
3972 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4163 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3973 4164
3974 if (0) { 4165 if (0) {
3975 if ($NEXT_TICK) { 4166 if ($NEXT_TICK) {
3976 my $jitter = $TICK_START - $NEXT_TICK; 4167 my $jitter = $TICK_START - $NEXT_TICK;
3977 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4168 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3978 warn "jitter $JITTER\n";#d# 4169 debug "jitter $JITTER\n";#d#
3979 } 4170 }
3980 } 4171 }
3981} 4172}
3982 4173
3983{ 4174{
… …
4028 IO::AIO::min_parallel 8; 4219 IO::AIO::min_parallel 8;
4029 IO::AIO::max_poll_time $TICK * 0.1; 4220 IO::AIO::max_poll_time $TICK * 0.1;
4030 undef $AnyEvent::AIO::WATCHER; 4221 undef $AnyEvent::AIO::WATCHER;
4031} 4222}
4032 4223
4033my $_log_backtrace; 4224our $_log_backtrace;
4225our $_log_backtrace_last;
4034 4226
4035sub _log_backtrace { 4227sub _log_backtrace {
4036 my ($msg, @addr) = @_; 4228 my ($msg, @addr) = @_;
4037 4229
4038 $msg =~ s/\n//; 4230 $msg =~ s/\n$//;
4039 4231
4232 if ($_log_backtrace_last eq $msg) {
4233 LOG llevInfo, "[ABT] $msg\n";
4234 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4040 # limit the # of concurrent backtraces 4235 # limit the # of concurrent backtraces
4041 if ($_log_backtrace < 2) { 4236 } elsif ($_log_backtrace < 2) {
4237 $_log_backtrace_last = $msg;
4042 ++$_log_backtrace; 4238 ++$_log_backtrace;
4043 my $perl_bt = Carp::longmess $msg; 4239 my $perl_bt = Carp::longmess $msg;
4044 async { 4240 async {
4045 $Coro::current->{desc} = "abt $msg"; 4241 $Coro::current->{desc} = "abt $msg";
4046 4242
… …
4066 LOG llevInfo, "[ABT] $_\n" for @bt; 4262 LOG llevInfo, "[ABT] $_\n" for @bt;
4067 --$_log_backtrace; 4263 --$_log_backtrace;
4068 }; 4264 };
4069 } else { 4265 } else {
4070 LOG llevInfo, "[ABT] $msg\n"; 4266 LOG llevInfo, "[ABT] $msg\n";
4071 LOG llevInfo, "[ABT] [suppressed]\n"; 4267 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4072 } 4268 }
4073} 4269}
4074 4270
4075# load additional modules 4271# load additional modules
4076require "cf/$_.pm" for @EXTRA_MODULES; 4272require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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