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.503 by root, Sat Jan 30 23:46:39 2010 UTC vs.
Revision 1.574 by root, Sun May 8 21:51:27 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 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
… …
1310} 1443}
1311 1444
1312use File::Glob (); 1445use File::Glob ();
1313 1446
1314cf::player->attach ( 1447cf::player->attach (
1315 on_command => sub { 1448 on_unknown_command => sub {
1316 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1317 1450
1318 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1319 or return; 1452 or return;
1320 1453
… …
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;
1402 } 1537 }
1403 1538
1539 my $pass = 0;
1404 my %done; 1540 my %done;
1405 while (%todo) { 1541 while (%todo) {
1406 my $progress; 1542 my $progress;
1407 1543
1544 ++$pass;
1545
1546 ext:
1408 while (my ($k, $v) = each %todo) { 1547 while (my ($k, $v) = each %todo) {
1409 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1410 goto skip 1549 next ext
1411 unless exists $done{$_}; 1550 unless exists $done{$_};
1412 } 1551 }
1413 1552
1414 warn "... loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1415 1554
1416 unless (eval $v->{source}) { 1555 my $active = eval $v->{source};
1556
1557 if (length $@) {
1417 my $msg = $@ ? "$v->{path}: $@\n" 1558 error "$v->{path}: $@\n";
1418 : "$v->{base}: extension inactive.\n";
1419 1559
1420 if (exists $v->{meta}{mandatory}) {
1421 warn $msg;
1422 cf::cleanup "mandatory extension failed to load, exiting."; 1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1423 } 1561 if exists $v->{meta}{mandatory};
1424 1562
1425 warn $msg; 1563 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1564 delete $todo{$k};
1565 } else {
1566 $done{$k} = delete $todo{$k};
1567 push @EXTS, $v->{pkg};
1568 $progress = 1;
1569
1570 info "$v->{base}: extension inactive.\n"
1571 unless $active;
1426 } 1572 }
1427
1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431 } 1573 }
1432 1574
1433 skip: 1575 unless ($progress) {
1434 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1576 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1435 unless $progress; 1577
1578 while (my ($k, $v) = each %todo) {
1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1580 if exists $v->{meta}{mandatory};
1581 }
1582
1583 last;
1584 }
1436 } 1585 }
1437 }; 1586 };
1438} 1587}
1439 1588
1440############################################################################# 1589#############################################################################
… …
1524 $cf::PLAYER{$login} = $pl 1673 $cf::PLAYER{$login} = $pl
1525 } 1674 }
1526 } 1675 }
1527} 1676}
1528 1677
1678cf::player->attach (
1679 on_load => sub {
1680 my ($pl, $path) = @_;
1681
1682 # restore slots saved in save, below
1683 my $slots = delete $pl->{_slots};
1684
1685 $pl->ob->current_weapon ($slots->[0]);
1686 $pl->combat_ob ($slots->[1]);
1687 $pl->ranged_ob ($slots->[2]);
1688 },
1689);
1690
1529sub save($) { 1691sub save($) {
1530 my ($pl) = @_; 1692 my ($pl) = @_;
1531 1693
1532 return if $pl->{deny_save}; 1694 return if $pl->{deny_save};
1533 1695
… …
1538 1700
1539 aio_mkdir playerdir $pl, 0770; 1701 aio_mkdir playerdir $pl, 0770;
1540 $pl->{last_save} = $cf::RUNTIME; 1702 $pl->{last_save} = $cf::RUNTIME;
1541 1703
1542 cf::get_slot 0.01; 1704 cf::get_slot 0.01;
1705
1706 # save slots, to be restored later
1707 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1543 1708
1544 $pl->save_pl ($path); 1709 $pl->save_pl ($path);
1545 cf::cede_to_tick; 1710 cf::cede_to_tick;
1546} 1711}
1547 1712
… …
1581 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1582 1747
1583 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1584 $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
1585 1750
1586 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1587 $pl->deactivate; 1752 $pl->deactivate;
1753
1588 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;
1589 $pl->ob->check_score;
1590 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1591 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1592 1759
1593 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1594 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1595 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
… …
1649 \@logins 1816 \@logins
1650} 1817}
1651 1818
1652=item $player->maps 1819=item $player->maps
1653 1820
1821=item cf::player::maps $login
1822
1654Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1655player. May block. 1824player. May block.
1656 1825
1657=cut 1826=cut
1658 1827
… …
1720=cut 1889=cut
1721 1890
1722sub find_by_path($) { 1891sub find_by_path($) {
1723 my ($path) = @_; 1892 my ($path) = @_;
1724 1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1895
1725 my ($match, $specificity); 1896 my ($match, $specificity);
1726 1897
1727 for my $region (list) { 1898 for my $region (list) {
1728 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1729 ($match, $specificity) = ($region, $region->specificity) 1900 ($match, $specificity) = ($region, $region->specificity)
… …
1757sub generate_random_map { 1928sub generate_random_map {
1758 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1759 1930
1760 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
1761 1932
1762 # mit "rum" bekleckern, nicht
1763 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1764 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1765 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1766 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1767 $rmp->{exit_on_final_map},
1768 $rmp->{xsize}, $rmp->{ysize},
1769 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1770 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1771 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1772 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1773 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1774 (cf::region::find $rmp->{region}), $rmp->{custom}
1775 )
1776} 1934}
1777 1935
1778=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1779 1937
1780Register 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
… …
1785 1943
1786sub register { 1944sub register {
1787 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1788 my $pkg = caller; 1946 my $pkg = caller;
1789 1947
1790 no strict;
1791 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1792 1949
1793 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1794} 1951}
1795 1952
1796# also paths starting with '/' 1953# also paths starting with '/'
1797$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1798 1955
1799sub thawer_merge { 1956sub thawer_merge {
1800 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1801 1958
1802 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
… …
1807} 1964}
1808 1965
1809sub normalise { 1966sub normalise {
1810 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1811 1968
1812 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1813 1970
1814 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1815 1972
1816 # map plan: 1973 # map plan:
1817 # 1974 #
… …
1832 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1833 $path = "$base/$path"; 1990 $path = "$base/$path";
1834 } 1991 }
1835 1992
1836 for ($path) { 1993 for ($path) {
1837 redo if s{//}{/};
1838 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1839 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1840 } 1996 }
1841 1997
1842 $path 1998 $path
… …
1856 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1857 return $self; 2013 return $self;
1858 } 2014 }
1859 } 2015 }
1860 2016
1861 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1862 () 2018 ()
1863} 2019}
1864 2020
2021# may re-bless or do other evil things
1865sub init { 2022sub init {
1866 my ($self) = @_; 2023 my ($self) = @_;
1867 2024
1868 $self 2025 $self
1869} 2026}
… …
1934 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1935 2092
1936 1 2093 1
1937} 2094}
1938 2095
2096# used to laod the header of an original map
1939sub load_header_orig { 2097sub load_header_orig {
1940 my ($self) = @_; 2098 my ($self) = @_;
1941 2099
1942 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1943} 2101}
1944 2102
2103# used to laod the header of an instantiated map
1945sub load_header_temp { 2104sub load_header_temp {
1946 my ($self) = @_; 2105 my ($self) = @_;
1947 2106
1948 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1949} 2108}
1950 2109
2110# called after loading the header from an instantiated map
1951sub prepare_temp { 2111sub prepare_temp {
1952 my ($self) = @_; 2112 my ($self) = @_;
1953 2113
1954 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1955 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1956 # safety 2116 # safety
1957 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1958 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1959} 2119}
1960 2120
2121# called after loading the header from an original map
1961sub prepare_orig { 2122sub prepare_orig {
1962 my ($self) = @_; 2123 my ($self) = @_;
1963 2124
1964 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1965 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
… …
1989 2150
1990sub find; 2151sub find;
1991sub find { 2152sub find {
1992 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
1993 2154
2155 cf::cede_to_tick;
2156
1994 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
1995 2158
1996 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997 my $guard2 = cf::lock_acquire "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
1998 2161
1999 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
… …
2030 2193
2031 { 2194 {
2032 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2033 2196
2034 return unless $self->valid; 2197 return unless $self->valid;
2035 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2036
2037 $self->in_memory (cf::MAP_LOADING);
2038 2199
2039 $self->alloc; 2200 $self->alloc;
2040 2201
2041 $self->pre_load; 2202 $self->pre_load;
2042 cf::cede_to_tick; 2203 cf::cede_to_tick;
2043 2204
2205 if (exists $self->{load_path}) {
2044 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2045 $f->skip_block; 2207 $f->skip_block;
2046 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2047 or return; 2209 or return;
2048 2210
2049 $self->post_load_original 2211 $self->post_load_original
2050 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2051 2213
2052 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2053 utf8::encode $uniq; 2215 utf8::encode $uniq;
2054 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2055 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2056 $self->clear_unique_items; 2218 $self->clear_unique_items;
2057 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2058 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2059 } 2222 }
2060 } 2223 }
2061 }
2062 2224
2063 $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);
2064 2232
2065 cf::cede_to_tick; 2233 cf::cede_to_tick;
2066 # now do the right thing for maps 2234 # now do the right thing for maps
2067 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2068 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
… …
2072 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2073 $self->decay_objects; 2241 $self->decay_objects;
2074 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2075 $self->update_buttons; 2243 $self->update_buttons;
2076 cf::cede_to_tick; 2244 cf::cede_to_tick;
2077 $self->activate; 2245 #$self->activate; # no longer activate maps automatically
2078 } 2246 }
2079 2247
2080 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2081 $self->last_access ($cf::RUNTIME); 2249 $self->last_access ($cf::RUNTIME);
2082
2083 $self->in_memory (cf::MAP_ACTIVE);
2084 } 2250 }
2085 2251
2086 $self->post_load; 2252 $self->post_load;
2087}
2088 2253
2254 1
2255}
2256
2257# customize the map for a given player, i.e.
2258# return the _real_ map. used by e.g. per-player
2259# maps to change the path to ~playername/mappath
2089sub customise_for { 2260sub customise_for {
2090 my ($self, $ob) = @_; 2261 my ($self, $ob) = @_;
2091 2262
2092 return find "~" . $ob->name . "/" . $self->{path} 2263 return find "~" . $ob->name . "/" . $self->{path}
2093 if $self->per_player; 2264 if $self->per_player;
… …
2096# if $self->per_party; 2267# if $self->per_party;
2097 2268
2098 $self 2269 $self
2099} 2270}
2100 2271
2101# find and load all maps in the 3x3 area around a map
2102sub load_neighbours {
2103 my ($map) = @_;
2104
2105 my @neigh; # diagonal neighbours
2106
2107 for (0 .. 3) {
2108 my $neigh = $map->tile_path ($_)
2109 or next;
2110 $neigh = find $neigh, $map
2111 or next;
2112 $neigh->load;
2113
2114 push @neigh,
2115 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2116 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2117 }
2118
2119 for (grep defined $_->[0], @neigh) {
2120 my ($path, $origin) = @$_;
2121 my $neigh = find $path, $origin
2122 or next;
2123 $neigh->load;
2124 }
2125}
2126
2127sub find_sync { 2272sub find_sync {
2128 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
2129 2274
2130 cf::sync_job { find $path, $origin } 2275 # it's a bug to call this from the main context
2276 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2277 if $Coro::current == $Coro::main;
2278
2279 find $path, $origin
2131} 2280}
2132 2281
2133sub do_load_sync { 2282sub do_load_sync {
2134 my ($map) = @_; 2283 my ($map) = @_;
2135 2284
2285 # it's a bug to call this from the main context
2136 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2286 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2137 if $Coro::current == $Coro::main; 2287 if $Coro::current == $Coro::main;
2138 2288
2139 cf::sync_job { $map->load }; 2289 $map->load;
2140} 2290}
2141 2291
2142our %MAP_PREFETCH; 2292our %MAP_PREFETCH;
2143our $MAP_PREFETCHER = undef; 2293our $MAP_PREFETCHER = undef;
2144 2294
2145sub find_async { 2295sub find_async {
2146 my ($path, $origin, $load) = @_; 2296 my ($path, $origin, $load) = @_;
2147 2297
2148 $path = normalise $path, $origin && $origin->{path}; 2298 $path = normalise $path, $origin;
2149 2299
2150 if (my $map = $cf::MAP{$path}) { 2300 if (my $map = $cf::MAP{$path}) {
2151 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2301 return $map if !$load || $map->linkable;
2152 } 2302 }
2153 2303
2154 $MAP_PREFETCH{$path} |= $load; 2304 $MAP_PREFETCH{$path} |= $load;
2155 2305
2156 $MAP_PREFETCHER ||= cf::async { 2306 $MAP_PREFETCHER ||= cf::async {
… …
2170 $MAP_PREFETCHER->prio (6); 2320 $MAP_PREFETCHER->prio (6);
2171 2321
2172 () 2322 ()
2173} 2323}
2174 2324
2325# common code, used by both ->save and ->swapout
2175sub save { 2326sub _save {
2176 my ($self) = @_; 2327 my ($self) = @_;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2328
2180 $self->{last_save} = $cf::RUNTIME; 2329 $self->{last_save} = $cf::RUNTIME;
2181 2330
2182 return unless $self->dirty; 2331 return unless $self->dirty;
2183 2332
… …
2203 } else { 2352 } else {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2353 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2205 } 2354 }
2206} 2355}
2207 2356
2357sub save {
2358 my ($self) = @_;
2359
2360 my $lock = cf::lock_acquire "map_data:$self->{path}";
2361
2362 $self->_save;
2363}
2364
2208sub swap_out { 2365sub swap_out {
2209 my ($self) = @_; 2366 my ($self) = @_;
2210 2367
2211 # save first because save cedes
2212 $self->save;
2213
2214 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215 2369
2370 return if !$self->linkable;
2371 return if $self->{deny_save};
2216 return if $self->players; 2372 return if $self->players;
2217 return if $self->in_memory != cf::MAP_ACTIVE; 2373
2374 # first deactivate the map and "unlink" it from the core
2375 $self->deactivate;
2376 $_->clear_links_to ($self) for values %cf::MAP;
2377 $self->state (cf::MAP_SWAPPED);
2378
2379 # then atomically save
2380 $self->_save;
2381
2382 # then free the map
2383 $self->clear;
2384}
2385
2386sub reset_at {
2387 my ($self) = @_;
2388
2389 # TODO: safety, remove and allow resettable per-player maps
2218 return if $self->{deny_save}; 2390 return 1e99 if $self->{deny_reset};
2219 2391
2392 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2393 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2394
2395 $time + $to
2396}
2397
2398sub should_reset {
2399 my ($self) = @_;
2400
2401 $self->reset_at <= $cf::RUNTIME
2402}
2403
2404sub reset {
2405 my ($self) = @_;
2406
2407 my $lock = cf::lock_acquire "map_data:$self->{path}";
2408
2409 return if $self->players;
2410
2411 cf::trace "resetting map ", $self->path, "\n";
2412
2220 $self->in_memory (cf::MAP_SWAPPED); 2413 $self->state (cf::MAP_SWAPPED);
2414
2415 # need to save uniques path
2416 unless ($self->{deny_save}) {
2417 my $uniq = $self->uniq_path; utf8::encode $uniq;
2418
2419 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2420 if $uniq;
2421 }
2422
2423 delete $cf::MAP{$self->path};
2221 2424
2222 $self->deactivate; 2425 $self->deactivate;
2223 $_->clear_links_to ($self) for values %cf::MAP; 2426 $_->clear_links_to ($self) for values %cf::MAP;
2224 $self->clear; 2427 $self->clear;
2225}
2226
2227sub reset_at {
2228 my ($self) = @_;
2229
2230 # TODO: safety, remove and allow resettable per-player maps
2231 return 1e99 if $self->{deny_reset};
2232
2233 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2234 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2235
2236 $time + $to
2237}
2238
2239sub should_reset {
2240 my ($self) = @_;
2241
2242 $self->reset_at <= $cf::RUNTIME
2243}
2244
2245sub reset {
2246 my ($self) = @_;
2247
2248 my $lock = cf::lock_acquire "map_data:$self->{path}";
2249
2250 return if $self->players;
2251
2252 warn "resetting map ", $self->path, "\n";
2253
2254 $self->in_memory (cf::MAP_SWAPPED);
2255
2256 # need to save uniques path
2257 unless ($self->{deny_save}) {
2258 my $uniq = $self->uniq_path; utf8::encode $uniq;
2259
2260 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2261 if $uniq;
2262 }
2263
2264 delete $cf::MAP{$self->path};
2265
2266 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP;
2268 $self->clear;
2269 2428
2270 $self->unlink_save; 2429 $self->unlink_save;
2271 $self->destroy; 2430 $self->destroy;
2272} 2431}
2273 2432
… …
2281 2440
2282 delete $cf::MAP{$self->path}; 2441 delete $cf::MAP{$self->path};
2283 2442
2284 $self->unlink_save; 2443 $self->unlink_save;
2285 2444
2286 bless $self, "cf::map"; 2445 bless $self, "cf::map::wrap";
2287 delete $self->{deny_reset}; 2446 delete $self->{deny_reset};
2288 $self->{deny_save} = 1; 2447 $self->{deny_save} = 1;
2289 $self->reset_timeout (1); 2448 $self->reset_timeout (1);
2290 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2449 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2291 2450
… …
2521 2680
2522Freezes the player and moves him/her to a special map (C<{link}>). 2681Freezes the player and moves him/her to a special map (C<{link}>).
2523 2682
2524The player should be reasonably safe there for short amounts of time (e.g. 2683The player should be reasonably safe there for short amounts of time (e.g.
2525for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2684for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2526though, as the palyer cannot control the character while it is on the link 2685though, as the player cannot control the character while it is on the link
2527map. 2686map.
2528 2687
2529Will never block. 2688Will never block.
2530 2689
2531=item $player_object->leave_link ($map, $x, $y) 2690=item $player_object->leave_link ($map, $x, $y)
… …
2552sub cf::object::player::enter_link { 2711sub cf::object::player::enter_link {
2553 my ($self) = @_; 2712 my ($self) = @_;
2554 2713
2555 $self->deactivate_recursive; 2714 $self->deactivate_recursive;
2556 2715
2716 ++$self->{_link_recursion};
2717
2557 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2718 return if UNIVERSAL::isa $self->map, "ext::map_link";
2558 2719
2559 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2720 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2560 if $self->map && $self->map->{path} ne "{link}"; 2721 if $self->map && $self->map->{path} ne "{link}";
2561 2722
2562 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2723 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2563} 2724}
2564 2725
2565sub cf::object::player::leave_link { 2726sub cf::object::player::leave_link {
2566 my ($self, $map, $x, $y) = @_; 2727 my ($self, $map, $x, $y) = @_;
2567 2728
… …
2587 # use -1 or undef as default coordinates, not 0, 0 2748 # use -1 or undef as default coordinates, not 0, 0
2588 ($x, $y) = ($map->enter_x, $map->enter_y) 2749 ($x, $y) = ($map->enter_x, $map->enter_y)
2589 if $x <= 0 && $y <= 0; 2750 if $x <= 0 && $y <= 0;
2590 2751
2591 $map->load; 2752 $map->load;
2592 $map->load_neighbours;
2593 2753
2594 return unless $self->contr->active; 2754 return unless $self->contr->active;
2595 2755
2596 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2756 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2597 $self->enter_map ($map, $x, $y); 2757 if ($self->enter_map ($map, $x, $y)) {
2598 2758 # entering was successful
2759 delete $self->{_link_recursion};
2599 # only activate afterwards, to support waiting in hooks 2760 # only activate afterwards, to support waiting in hooks
2600 $self->activate_recursive; 2761 $self->activate_recursive;
2601} 2762 }
2602 2763
2764}
2765
2603=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2766=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2604 2767
2605Moves the player to the given map-path and coordinates by first freezing 2768Moves the player to the given map-path and coordinates by first freezing
2606her, loading and preparing them map, calling the provided $check callback 2769her, loading and preparing them map, calling the provided $check callback
2607that has to return the map if sucecssful, and then unfreezes the player on 2770that has to return the map if sucecssful, and then unfreezes the player on
2608the new (success) or old (failed) map position. In either case, $done will 2771the new (success) or old (failed) map position. In either case, $done will
… …
2615 2778
2616our $GOTOGEN; 2779our $GOTOGEN;
2617 2780
2618sub cf::object::player::goto { 2781sub cf::object::player::goto {
2619 my ($self, $path, $x, $y, $check, $done) = @_; 2782 my ($self, $path, $x, $y, $check, $done) = @_;
2783
2784 if ($self->{_link_recursion} >= $MAX_LINKS) {
2785 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2786 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2787 ($path, $x, $y) = @$EMERGENCY_POSITION;
2788 }
2620 2789
2621 # do generation counting so two concurrent goto's will be executed in-order 2790 # do generation counting so two concurrent goto's will be executed in-order
2622 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2791 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2623 2792
2624 $self->enter_link; 2793 $self->enter_link;
… …
2644 ($path, $x, $y) = (undef, undef, undef); 2813 ($path, $x, $y) = (undef, undef, undef);
2645 } 2814 }
2646 } 2815 }
2647 2816
2648 my $map = eval { 2817 my $map = eval {
2649 my $map = defined $path ? cf::map::find $path : undef; 2818 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2650 2819
2651 if ($map) { 2820 if ($map) {
2652 $map = $map->customise_for ($self); 2821 $map = $map->customise_for ($self);
2653 $map = $check->($map) if $check && $map; 2822 $map = $check->($map, $x, $y, $self) if $check && $map;
2654 } else { 2823 } else {
2655 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2824 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2656 } 2825 }
2657 2826
2658 $map 2827 $map
… …
2666 if ($gen == $self->{_goto_generation}) { 2835 if ($gen == $self->{_goto_generation}) {
2667 delete $self->{_goto_generation}; 2836 delete $self->{_goto_generation};
2668 $self->leave_link ($map, $x, $y); 2837 $self->leave_link ($map, $x, $y);
2669 } 2838 }
2670 2839
2671 $done->() if $done; 2840 $done->($self) if $done;
2672 })->prio (1); 2841 })->prio (1);
2673} 2842}
2674 2843
2675=item $player_object->enter_exit ($exit_object) 2844=item $player_object->enter_exit ($exit_object)
2676 2845
… …
2744 $Coro::current->{desc} = "enter_exit"; 2913 $Coro::current->{desc} = "enter_exit";
2745 2914
2746 unless (eval { 2915 unless (eval {
2747 $self->deactivate_recursive; # just to be sure 2916 $self->deactivate_recursive; # just to be sure
2748 2917
2749 # random map handling
2750 {
2751 my $guard = cf::lock_acquire "exit_prepare:$exit";
2752
2753 prepare_random_map $exit
2754 if $exit->slaying eq "/!";
2755 }
2756
2757 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2918 my $map = cf::map::normalise $exit->slaying, $exit->map;
2758 my $x = $exit->stats->hp; 2919 my $x = $exit->stats->hp;
2759 my $y = $exit->stats->sp; 2920 my $y = $exit->stats->sp;
2921
2922 # special map handling
2923 my $slaying = $exit->slaying;
2924
2925 # special map handling
2926 if ($slaying eq "/!") {
2927 my $guard = cf::lock_acquire "exit_prepare:$exit";
2928
2929 prepare_random_map $exit
2930 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2931
2932 $map = $exit->slaying;
2933
2934 } elsif ($slaying eq '!up') {
2935 $map = $exit->map->tile_path (cf::TILE_UP);
2936 $x = $exit->x;
2937 $y = $exit->y;
2938
2939 } elsif ($slaying eq '!down') {
2940 $map = $exit->map->tile_path (cf::TILE_DOWN);
2941 $x = $exit->x;
2942 $y = $exit->y;
2943 }
2760 2944
2761 $self->goto ($map, $x, $y); 2945 $self->goto ($map, $x, $y);
2762 2946
2763 # if exit is damned, update players death & WoR home-position 2947 # if exit is damned, update players death & WoR home-position
2764 $self->contr->savebed ($map, $x, $y) 2948 $self->contr->savebed ($map, $x, $y)
… …
2769 $self->message ("Something went wrong deep within the deliantra server. " 2953 $self->message ("Something went wrong deep within the deliantra server. "
2770 . "I'll try to bring you back to the map you were before. " 2954 . "I'll try to bring you back to the map you were before. "
2771 . "Please report this to the dungeon master!", 2955 . "Please report this to the dungeon master!",
2772 cf::NDI_UNIQUE | cf::NDI_RED); 2956 cf::NDI_UNIQUE | cf::NDI_RED);
2773 2957
2774 warn "ERROR in enter_exit: $@"; 2958 error "ERROR in enter_exit: $@";
2775 $self->leave_link; 2959 $self->leave_link;
2776 } 2960 }
2777 })->prio (1); 2961 })->prio (1);
2778} 2962}
2779 2963
… …
3092 3276
3093 $ns->ext_reply ($reply, @reply) 3277 $ns->ext_reply ($reply, @reply)
3094 if $reply; 3278 if $reply;
3095 3279
3096 } else { 3280 } else {
3097 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3281 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3098 } 3282 }
3099 3283
3100 cf::override; 3284 cf::override;
3101 }, 3285 },
3102); 3286);
… …
3122 3306
3123 $coro 3307 $coro
3124} 3308}
3125 3309
3126cf::client->attach ( 3310cf::client->attach (
3127 on_destroy => sub { 3311 on_client_destroy => sub {
3128 my ($ns) = @_; 3312 my ($ns) = @_;
3129 3313
3130 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3314 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3131 }, 3315 },
3132); 3316);
… …
3183 decrease split destroy change_exp value msg lore send_msg)], 3367 decrease split destroy change_exp value msg lore send_msg)],
3184 ["cf::object::player" => qw(player)], 3368 ["cf::object::player" => qw(player)],
3185 ["cf::player" => qw(peaceful send_msg)], 3369 ["cf::player" => qw(peaceful send_msg)],
3186 ["cf::map" => qw(trigger)], 3370 ["cf::map" => qw(trigger)],
3187) { 3371) {
3188 no strict 'refs';
3189 my ($pkg, @funs) = @$_; 3372 my ($pkg, @funs) = @$_;
3190 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3373 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3191 for @funs; 3374 for @funs;
3192} 3375}
3193 3376
… …
3232 local @cf::_safe_eval_args = values %vars; 3415 local @cf::_safe_eval_args = values %vars;
3233 @res = wantarray ? eval eval : scalar eval $eval; 3416 @res = wantarray ? eval eval : scalar eval $eval;
3234 } 3417 }
3235 3418
3236 if ($@) { 3419 if ($@) {
3237 warn "$@"; 3420 warn "$@",
3238 warn "while executing safe code '$code'\n"; 3421 "while executing safe code '$code'\n",
3239 warn "with arguments " . (join " ", %vars) . "\n"; 3422 "with arguments " . (join " ", %vars) . "\n";
3240 } 3423 }
3241 3424
3242 wantarray ? @res : $res[0] 3425 wantarray ? @res : $res[0]
3243} 3426}
3244 3427
… …
3278 # for this (global event?) 3461 # for this (global event?)
3279 %ext::player_env::MUSIC_FACE_CACHE = (); 3462 %ext::player_env::MUSIC_FACE_CACHE = ();
3280 3463
3281 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3464 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3282 3465
3283 warn "loading facedata from $path\n"; 3466 trace "loading facedata from $path\n";
3284 3467
3285 my $facedata; 3468 my $facedata = decode_storable load_file $path;
3286 0 < aio_load $path, $facedata
3287 or die "$path: $!";
3288
3289 $facedata = Coro::Storable::thaw $facedata;
3290 3469
3291 $facedata->{version} == 2 3470 $facedata->{version} == 2
3292 or cf::cleanup "$path: version mismatch, cannot proceed."; 3471 or cf::cleanup "$path: version mismatch, cannot proceed.";
3293 3472
3294 # patch in the exptable 3473 # patch in the exptable
… …
3308 3487
3309 cf::face::set_visibility $idx, $info->{visibility}; 3488 cf::face::set_visibility $idx, $info->{visibility};
3310 cf::face::set_magicmap $idx, $info->{magicmap}; 3489 cf::face::set_magicmap $idx, $info->{magicmap};
3311 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3490 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3312 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3491 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3492 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3313 3493
3314 cf::cede_to_tick; 3494 cf::cede_to_tick;
3315 } 3495 }
3316 3496
3317 while (my ($face, $info) = each %$faces) { 3497 while (my ($face, $info) = each %$faces) {
… …
3322 3502
3323 if (my $smooth = cf::face::find $info->{smooth}) { 3503 if (my $smooth = cf::face::find $info->{smooth}) {
3324 cf::face::set_smooth $idx, $smooth; 3504 cf::face::set_smooth $idx, $smooth;
3325 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3505 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3326 } else { 3506 } else {
3327 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3507 error "smooth face '$info->{smooth}' not found for face '$face'";
3328 } 3508 }
3329 3509
3330 cf::cede_to_tick; 3510 cf::cede_to_tick;
3331 } 3511 }
3332 } 3512 }
… …
3350 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3530 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3351 3531
3352 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3532 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3353 cf::face::set_type $idx, $info->{type}; 3533 cf::face::set_type $idx, $info->{type};
3354 } else { 3534 } else {
3355 $RESOURCE{$name} = $info; 3535 $RESOURCE{$name} = $info; # unused
3356 } 3536 }
3357 3537
3358 cf::cede_to_tick; 3538 cf::cede_to_tick;
3359 } 3539 }
3360 } 3540 }
3361 3541
3362 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3542 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3363 3543
3364 1 3544 1
3365} 3545}
3366
3367cf::global->attach (on_resource_update => sub {
3368 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3369 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3370
3371 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3372 my $sound = $soundconf->{compat}[$_]
3373 or next;
3374
3375 my $face = cf::face::find "sound/$sound->[1]";
3376 cf::sound::set $sound->[0] => $face;
3377 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3378 }
3379
3380 while (my ($k, $v) = each %{$soundconf->{event}}) {
3381 my $face = cf::face::find "sound/$v";
3382 cf::sound::set $k => $face;
3383 }
3384 }
3385});
3386 3546
3387register_exticmd fx_want => sub { 3547register_exticmd fx_want => sub {
3388 my ($ns, $want) = @_; 3548 my ($ns, $want) = @_;
3389 3549
3390 while (my ($k, $v) = each %$want) { 3550 while (my ($k, $v) = each %$want) {
… …
3429sub reload_treasures { 3589sub reload_treasures {
3430 load_resource_file "$DATADIR/treasures" 3590 load_resource_file "$DATADIR/treasures"
3431 or die "unable to load treasurelists\n"; 3591 or die "unable to load treasurelists\n";
3432} 3592}
3433 3593
3594sub reload_sound {
3595 trace "loading sound config from $DATADIR/sound\n";
3596
3597 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3598
3599 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3600 my $sound = $soundconf->{compat}[$_]
3601 or next;
3602
3603 my $face = cf::face::find "sound/$sound->[1]";
3604 cf::sound::set $sound->[0] => $face;
3605 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3606 }
3607
3608 while (my ($k, $v) = each %{$soundconf->{event}}) {
3609 my $face = cf::face::find "sound/$v";
3610 cf::sound::set $k => $face;
3611 }
3612}
3613
3434sub reload_resources { 3614sub reload_resources {
3435 warn "reloading resource files...\n"; 3615 trace "reloading resource files...\n";
3436 3616
3617 reload_exp_table;
3618 reload_materials;
3437 reload_facedata; 3619 reload_facedata;
3620 reload_sound;
3438 reload_archetypes; 3621 reload_archetypes;
3439 reload_regions; 3622 reload_regions;
3440 reload_treasures; 3623 reload_treasures;
3441 3624
3442 warn "finished reloading resource files\n"; 3625 trace "finished reloading resource files\n";
3443} 3626}
3444 3627
3445sub reload_config { 3628sub reload_config {
3446 warn "reloading config file...\n"; 3629 trace "reloading config file...\n";
3447 3630
3448 open my $fh, "<:utf8", "$CONFDIR/config" 3631 my $config = load_file "$CONFDIR/config";
3449 or return; 3632 utf8::decode $config;
3633 *CFG = decode_yaml $config;
3450 3634
3451 local $/;
3452 *CFG = YAML::XS::Load scalar <$fh>;
3453
3454 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3635 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3455 3636
3456 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3637 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3457 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3638 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3458 3639
3459 if (exists $CFG{mlockall}) { 3640 if (exists $CFG{mlockall}) {
… …
3461 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3642 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3462 and die "WARNING: m(un)lockall failed: $!\n"; 3643 and die "WARNING: m(un)lockall failed: $!\n";
3463 }; 3644 };
3464 warn $@ if $@; 3645 warn $@ if $@;
3465 } 3646 }
3466
3467 warn "finished reloading resource files\n";
3468} 3647}
3469 3648
3470sub pidfile() { 3649sub pidfile() {
3471 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3650 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3472 or die "$PIDFILE: $!"; 3651 or die "$PIDFILE: $!";
… …
3485 seek $fh, 0, 0; 3664 seek $fh, 0, 0;
3486 print $fh $$; 3665 print $fh $$;
3487} 3666}
3488 3667
3489sub main_loop { 3668sub main_loop {
3490 warn "EV::loop starting\n"; 3669 trace "EV::loop starting\n";
3491 if (1) { 3670 if (1) {
3492 EV::loop; 3671 EV::loop;
3493 } 3672 }
3494 warn "EV::loop returned\n"; 3673 trace "EV::loop returned\n";
3495 goto &main_loop unless $REALLY_UNLOOP; 3674 goto &main_loop unless $REALLY_UNLOOP;
3496} 3675}
3497 3676
3498sub main { 3677sub main {
3499 cf::init_globals; # initialise logging 3678 cf::init_globals; # initialise logging
3500 3679
3501 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3680 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3502 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3681 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3503 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3682 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3504 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3683 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3505
3506 cf::init_experience;
3507 cf::init_anim;
3508 cf::init_attackmess;
3509 cf::init_dynamic;
3510 3684
3511 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3685 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3512 3686
3513 # we must not ever block the main coroutine 3687 # we must not ever block the main coroutine
3514 local $Coro::idle = sub { 3688 local $Coro::idle = sub {
… …
3520 }; 3694 };
3521 3695
3522 evthread_start IO::AIO::poll_fileno; 3696 evthread_start IO::AIO::poll_fileno;
3523 3697
3524 cf::sync_job { 3698 cf::sync_job {
3699 cf::incloader::init ();
3700
3701 cf::init_anim;
3702 cf::init_attackmess;
3703 cf::init_dynamic;
3704
3525 cf::load_settings; 3705 cf::load_settings;
3526 cf::load_materials;
3527 3706
3528 reload_resources; 3707 reload_resources;
3529 reload_config; 3708 reload_config;
3530 db_init; 3709 db_init;
3531 3710
3532 cf::init_uuid; 3711 cf::init_uuid;
3533 cf::init_signals; 3712 cf::init_signals;
3534 cf::init_commands;
3535 cf::init_skills; 3713 cf::init_skills;
3536 3714
3537 cf::init_beforeplay; 3715 cf::init_beforeplay;
3538 3716
3539 atomic; 3717 atomic;
… …
3544 3722
3545 # no (long-running) fork's whatsoever before this point(!) 3723 # no (long-running) fork's whatsoever before this point(!)
3546 use POSIX (); 3724 use POSIX ();
3547 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3725 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3548 3726
3549 (pop @POST_INIT)->(0) while @POST_INIT; 3727 cf::_post_init 0;
3550 }; 3728 };
3551 3729
3730 cf::object::thawer::errors_are_fatal 0;
3731 info "parse errors in files are no longer fatal from this point on.\n";
3732
3733 my $free_main; $free_main = EV::idle sub {
3734 undef $free_main;
3735 undef &main; # free gobs of memory :)
3736 };
3737
3552 main_loop; 3738 goto &main_loop;
3553} 3739}
3554 3740
3555############################################################################# 3741#############################################################################
3556# initialisation and cleanup 3742# initialisation and cleanup
3557 3743
3558# install some emergency cleanup handlers 3744# install some emergency cleanup handlers
3559BEGIN { 3745BEGIN {
3560 our %SIGWATCHER = (); 3746 our %SIGWATCHER = ();
3561 for my $signal (qw(INT HUP TERM)) { 3747 for my $signal (qw(INT HUP TERM)) {
3562 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3748 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3563 cf::cleanup "SIG$signal"; 3749 cf::cleanup "SIG$signal";
3564 }; 3750 };
3565 } 3751 }
3566} 3752}
3567 3753
3568sub write_runtime_sync { 3754sub write_runtime_sync {
3755 my $t0 = AE::time;
3756
3569 # first touch the runtime file to show we are still running: 3757 # first touch the runtime file to show we are still running:
3570 # the fsync below can take a very very long time. 3758 # the fsync below can take a very very long time.
3571 3759
3572 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3760 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3573 3761
3574 my $guard = cf::lock_acquire "write_runtime"; 3762 my $guard = cf::lock_acquire "write_runtime";
3575 3763
3576 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3764 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3577 or return; 3765 or return;
3578 3766
3579 my $value = $cf::RUNTIME + 90 + 10; 3767 my $value = $cf::RUNTIME + 90 + 10;
3580 # 10 is the runtime save interval, for a monotonic clock 3768 # 10 is the runtime save interval, for a monotonic clock
3581 # 60 allows for the watchdog to kill the server. 3769 # 60 allows for the watchdog to kill the server.
… …
3594 or return; 3782 or return;
3595 3783
3596 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3784 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3597 and return; 3785 and return;
3598 3786
3599 warn "runtime file written.\n"; 3787 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3600 3788
3601 1 3789 1
3602} 3790}
3603 3791
3604our $uuid_lock; 3792our $uuid_lock;
… …
3616 or return; 3804 or return;
3617 3805
3618 my $value = uuid_seq uuid_cur; 3806 my $value = uuid_seq uuid_cur;
3619 3807
3620 unless ($value) { 3808 unless ($value) {
3621 warn "cowardly refusing to write zero uuid value!\n"; 3809 info "cowardly refusing to write zero uuid value!\n";
3622 return; 3810 return;
3623 } 3811 }
3624 3812
3625 my $value = uuid_str $value + $uuid_skip; 3813 my $value = uuid_str $value + $uuid_skip;
3626 $uuid_skip = 0; 3814 $uuid_skip = 0;
… …
3636 or return; 3824 or return;
3637 3825
3638 aio_rename "$uuid~", $uuid 3826 aio_rename "$uuid~", $uuid
3639 and return; 3827 and return;
3640 3828
3641 warn "uuid file written ($value).\n"; 3829 trace "uuid file written ($value).\n";
3642 3830
3643 1 3831 1
3644 3832
3645} 3833}
3646 3834
… …
3652} 3840}
3653 3841
3654sub emergency_save() { 3842sub emergency_save() {
3655 my $freeze_guard = cf::freeze_mainloop; 3843 my $freeze_guard = cf::freeze_mainloop;
3656 3844
3657 warn "emergency_perl_save: enter\n"; 3845 info "emergency_perl_save: enter\n";
3846
3847 # this is a trade-off: we want to be very quick here, so
3848 # save all maps without fsync, and later call a global sync
3849 # (which in turn might be very very slow)
3850 local $USE_FSYNC = 0;
3658 3851
3659 cf::sync_job { 3852 cf::sync_job {
3660 # this is a trade-off: we want to be very quick here, so 3853 cf::write_runtime_sync; # external watchdog should not bark
3661 # save all maps without fsync, and later call a global sync
3662 # (which in turn might be very very slow)
3663 local $USE_FSYNC = 0;
3664 3854
3665 # use a peculiar iteration method to avoid tripping on perl 3855 # use a peculiar iteration method to avoid tripping on perl
3666 # refcount bugs in for. also avoids problems with players 3856 # refcount bugs in for. also avoids problems with players
3667 # and maps saved/destroyed asynchronously. 3857 # and maps saved/destroyed asynchronously.
3668 warn "emergency_perl_save: begin player save\n"; 3858 info "emergency_perl_save: begin player save\n";
3669 for my $login (keys %cf::PLAYER) { 3859 for my $login (keys %cf::PLAYER) {
3670 my $pl = $cf::PLAYER{$login} or next; 3860 my $pl = $cf::PLAYER{$login} or next;
3671 $pl->valid or next; 3861 $pl->valid or next;
3672 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3862 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3673 $pl->save; 3863 $pl->save;
3674 } 3864 }
3675 warn "emergency_perl_save: end player save\n"; 3865 info "emergency_perl_save: end player save\n";
3676 3866
3867 cf::write_runtime_sync; # external watchdog should not bark
3868
3677 warn "emergency_perl_save: begin map save\n"; 3869 info "emergency_perl_save: begin map save\n";
3678 for my $path (keys %cf::MAP) { 3870 for my $path (keys %cf::MAP) {
3679 my $map = $cf::MAP{$path} or next; 3871 my $map = $cf::MAP{$path} or next;
3680 $map->valid or next; 3872 $map->valid or next;
3681 $map->save; 3873 $map->save;
3682 } 3874 }
3683 warn "emergency_perl_save: end map save\n"; 3875 info "emergency_perl_save: end map save\n";
3684 3876
3877 cf::write_runtime_sync; # external watchdog should not bark
3878
3685 warn "emergency_perl_save: begin database checkpoint\n"; 3879 info "emergency_perl_save: begin database checkpoint\n";
3686 BDB::db_env_txn_checkpoint $DB_ENV; 3880 BDB::db_env_txn_checkpoint $DB_ENV;
3687 warn "emergency_perl_save: end database checkpoint\n"; 3881 info "emergency_perl_save: end database checkpoint\n";
3688 3882
3689 warn "emergency_perl_save: begin write uuid\n"; 3883 info "emergency_perl_save: begin write uuid\n";
3690 write_uuid_sync 1; 3884 write_uuid_sync 1;
3691 warn "emergency_perl_save: end write uuid\n"; 3885 info "emergency_perl_save: end write uuid\n";
3886
3887 cf::write_runtime_sync; # external watchdog should not bark
3888
3889 trace "emergency_perl_save: syncing database to disk";
3890 BDB::db_env_txn_checkpoint $DB_ENV;
3891
3892 info "emergency_perl_save: starting sync\n";
3893 IO::AIO::aio_sync sub {
3894 info "emergency_perl_save: finished sync\n";
3895 };
3896
3897 cf::write_runtime_sync; # external watchdog should not bark
3898
3899 trace "emergency_perl_save: flushing outstanding aio requests";
3900 while (IO::AIO::nreqs || BDB::nreqs) {
3901 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3902 }
3903
3904 cf::write_runtime_sync; # external watchdog should not bark
3692 }; 3905 };
3693 3906
3694 warn "emergency_perl_save: starting sync()\n";
3695 IO::AIO::aio_sync sub {
3696 warn "emergency_perl_save: finished sync()\n";
3697 };
3698
3699 warn "emergency_perl_save: leave\n"; 3907 info "emergency_perl_save: leave\n";
3700} 3908}
3701 3909
3702sub post_cleanup { 3910sub post_cleanup {
3703 my ($make_core) = @_; 3911 my ($make_core) = @_;
3704 3912
3913 IO::AIO::flush;
3914
3705 warn Carp::longmess "post_cleanup backtrace" 3915 error Carp::longmess "post_cleanup backtrace"
3706 if $make_core; 3916 if $make_core;
3707 3917
3708 my $fh = pidfile; 3918 my $fh = pidfile;
3709 unlink $PIDFILE if <$fh> == $$; 3919 unlink $PIDFILE if <$fh> == $$;
3710} 3920}
… …
3730 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3940 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3731 for my $name (keys %$leaf_symtab) { 3941 for my $name (keys %$leaf_symtab) {
3732 _gv_clear *{"$pkg$name"}; 3942 _gv_clear *{"$pkg$name"};
3733# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3943# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3734 } 3944 }
3735 warn "cleared package $pkg\n";#d#
3736} 3945}
3737 3946
3738sub do_reload_perl() { 3947sub do_reload_perl() {
3739 # can/must only be called in main 3948 # can/must only be called in main
3740 if ($Coro::current != $Coro::main) { 3949 unless (in_main) {
3741 warn "can only reload from main coroutine"; 3950 error "can only reload from main coroutine";
3742 return; 3951 return;
3743 } 3952 }
3744 3953
3745 return if $RELOAD++; 3954 return if $RELOAD++;
3746 3955
3747 my $t1 = EV::time; 3956 my $t1 = AE::time;
3748 3957
3749 while ($RELOAD) { 3958 while ($RELOAD) {
3750 warn "reloading..."; 3959 cf::get_slot 0.1, -1, "reload_perl";
3960 info "perl_reload: reloading...";
3751 3961
3752 warn "entering sync_job"; 3962 trace "perl_reload: entering sync_job";
3753 3963
3754 cf::sync_job { 3964 cf::sync_job {
3755 cf::write_runtime_sync; # external watchdog should not bark
3756 cf::emergency_save; 3965 #cf::emergency_save;
3757 cf::write_runtime_sync; # external watchdog should not bark
3758 3966
3759 warn "syncing database to disk";
3760 BDB::db_env_txn_checkpoint $DB_ENV;
3761
3762 # if anything goes wrong in here, we should simply crash as we already saved
3763
3764 warn "flushing outstanding aio requests";
3765 while (IO::AIO::nreqs || BDB::nreqs) {
3766 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3767 }
3768
3769 warn "cancelling all extension coros"; 3967 trace "perl_reload: cancelling all extension coros";
3770 $_->cancel for values %EXT_CORO; 3968 $_->cancel for values %EXT_CORO;
3771 %EXT_CORO = (); 3969 %EXT_CORO = ();
3772 3970
3773 warn "removing commands"; 3971 trace "perl_reload: removing commands";
3774 %COMMAND = (); 3972 %COMMAND = ();
3775 3973
3776 warn "removing ext/exti commands"; 3974 trace "perl_reload: removing ext/exti commands";
3777 %EXTCMD = (); 3975 %EXTCMD = ();
3778 %EXTICMD = (); 3976 %EXTICMD = ();
3779 3977
3780 warn "unloading/nuking all extensions"; 3978 trace "perl_reload: unloading/nuking all extensions";
3781 for my $pkg (@EXTS) { 3979 for my $pkg (@EXTS) {
3782 warn "... unloading $pkg"; 3980 trace "... unloading $pkg";
3783 3981
3784 if (my $cb = $pkg->can ("unload")) { 3982 if (my $cb = $pkg->can ("unload")) {
3785 eval { 3983 eval {
3786 $cb->($pkg); 3984 $cb->($pkg);
3787 1 3985 1
3788 } or warn "$pkg unloaded, but with errors: $@"; 3986 } or error "$pkg unloaded, but with errors: $@";
3789 } 3987 }
3790 3988
3791 warn "... clearing $pkg"; 3989 trace "... clearing $pkg";
3792 clear_package $pkg; 3990 clear_package $pkg;
3793 } 3991 }
3794 3992
3795 warn "unloading all perl modules loaded from $LIBDIR"; 3993 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3796 while (my ($k, $v) = each %INC) { 3994 while (my ($k, $v) = each %INC) {
3797 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3995 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3798 3996
3799 warn "... unloading $k"; 3997 trace "... unloading $k";
3800 delete $INC{$k}; 3998 delete $INC{$k};
3801 3999
3802 $k =~ s/\.pm$//; 4000 $k =~ s/\.pm$//;
3803 $k =~ s/\//::/g; 4001 $k =~ s/\//::/g;
3804 4002
… …
3807 } 4005 }
3808 4006
3809 clear_package $k; 4007 clear_package $k;
3810 } 4008 }
3811 4009
3812 warn "getting rid of safe::, as good as possible"; 4010 trace "perl_reload: getting rid of safe::, as good as possible";
3813 clear_package "safe::$_" 4011 clear_package "safe::$_"
3814 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4012 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3815 4013
3816 warn "unloading cf.pm \"a bit\""; 4014 trace "perl_reload: unloading cf.pm \"a bit\"";
3817 delete $INC{"cf.pm"}; 4015 delete $INC{"cf.pm"};
3818 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4016 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3819 4017
3820 # don't, removes xs symbols, too, 4018 # don't, removes xs symbols, too,
3821 # and global variables created in xs 4019 # and global variables created in xs
3822 #clear_package __PACKAGE__; 4020 #clear_package __PACKAGE__;
3823 4021
3824 warn "unload completed, starting to reload now"; 4022 info "perl_reload: unload completed, starting to reload now";
3825 4023
3826 warn "reloading cf.pm"; 4024 trace "perl_reload: reloading cf.pm";
3827 require cf; 4025 require cf;
3828 cf::_connect_to_perl_1; 4026 cf::_connect_to_perl_1;
3829 4027
3830 warn "loading config and database again"; 4028 trace "perl_reload: loading config and database again";
3831 cf::reload_config; 4029 cf::reload_config;
3832 4030
3833 warn "loading extensions"; 4031 trace "perl_reload: loading extensions";
3834 cf::load_extensions; 4032 cf::load_extensions;
3835 4033
3836 if ($REATTACH_ON_RELOAD) { 4034 if ($REATTACH_ON_RELOAD) {
3837 warn "reattaching attachments to objects/players"; 4035 trace "perl_reload: reattaching attachments to objects/players";
3838 _global_reattach; # objects, sockets 4036 _global_reattach; # objects, sockets
3839 warn "reattaching attachments to maps"; 4037 trace "perl_reload: reattaching attachments to maps";
3840 reattach $_ for values %MAP; 4038 reattach $_ for values %MAP;
3841 warn "reattaching attachments to players"; 4039 trace "perl_reload: reattaching attachments to players";
3842 reattach $_ for values %PLAYER; 4040 reattach $_ for values %PLAYER;
3843 } 4041 }
3844 4042
3845 warn "running post_init jobs"; 4043 cf::_post_init 1;
3846 (pop @POST_INIT)->(1) while @POST_INIT;
3847 4044
3848 warn "leaving sync_job"; 4045 trace "perl_reload: leaving sync_job";
3849 4046
3850 1 4047 1
3851 } or do { 4048 } or do {
3852 warn $@; 4049 error $@;
3853 cf::cleanup "error while reloading, exiting."; 4050 cf::cleanup "perl_reload: error, exiting.";
3854 }; 4051 };
3855 4052
3856 warn "reloaded";
3857 --$RELOAD; 4053 --$RELOAD;
3858 } 4054 }
3859 4055
3860 $t1 = EV::time - $t1; 4056 $t1 = AE::time - $t1;
3861 warn "reload completed in ${t1}s\n"; 4057 info "perl_reload: completed in ${t1}s\n";
3862}; 4058};
3863 4059
3864our $RELOAD_WATCHER; # used only during reload 4060our $RELOAD_WATCHER; # used only during reload
3865 4061
3866sub reload_perl() { 4062sub reload_perl() {
… …
3868 # coro crashes during coro_state_free->destroy here. 4064 # coro crashes during coro_state_free->destroy here.
3869 4065
3870 $RELOAD_WATCHER ||= cf::async { 4066 $RELOAD_WATCHER ||= cf::async {
3871 Coro::AIO::aio_wait cache_extensions; 4067 Coro::AIO::aio_wait cache_extensions;
3872 4068
3873 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4069 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3874 do_reload_perl; 4070 do_reload_perl;
3875 undef $RELOAD_WATCHER; 4071 undef $RELOAD_WATCHER;
3876 }; 4072 };
3877 }; 4073 };
3878} 4074}
… …
3887 reload_perl; 4083 reload_perl;
3888 }; 4084 };
3889 } 4085 }
3890}; 4086};
3891 4087
3892unshift @INC, $LIBDIR; 4088#############################################################################
3893 4089
3894my $bug_warning = 0; 4090my $bug_warning = 0;
3895 4091
3896our @WAIT_FOR_TICK;
3897our @WAIT_FOR_TICK_BEGIN;
3898
3899sub wait_for_tick { 4092sub wait_for_tick() {
3900 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4093 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3901 4094
3902 my $signal = new Coro::Signal; 4095 $WAIT_FOR_TICK->wait;
3903 push @WAIT_FOR_TICK, $signal;
3904 $signal->wait;
3905} 4096}
3906 4097
3907sub wait_for_tick_begin { 4098sub wait_for_tick_begin() {
3908 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4099 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3909 4100
3910 my $signal = new Coro::Signal; 4101 my $signal = new Coro::Signal;
3911 push @WAIT_FOR_TICK_BEGIN, $signal; 4102 push @WAIT_FOR_TICK_BEGIN, $signal;
3912 $signal->wait; 4103 $signal->wait;
3913} 4104}
… …
3917 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4108 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3918 unless ++$bug_warning > 10; 4109 unless ++$bug_warning > 10;
3919 return; 4110 return;
3920 } 4111 }
3921 4112
3922 cf::server_tick; # one server iteration 4113 cf::one_tick; # one server iteration
3923 4114
3924 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4115 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3925 4116
3926 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4117 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3927 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4118 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3928 Coro::async_pool { 4119 Coro::async_pool {
3929 $Coro::current->{desc} = "runtime saver"; 4120 $Coro::current->{desc} = "runtime saver";
3930 write_runtime_sync 4121 write_runtime_sync
3931 or warn "ERROR: unable to write runtime file: $!"; 4122 or error "ERROR: unable to write runtime file: $!";
3932 }; 4123 };
3933 } 4124 }
3934 4125
3935 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4126 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3936 $sig->send; 4127 $sig->send;
3937 } 4128 }
3938 while (my $sig = shift @WAIT_FOR_TICK) { 4129 $WAIT_FOR_TICK->broadcast;
3939 $sig->send;
3940 }
3941 4130
3942 $LOAD = ($NOW - $TICK_START) / $TICK; 4131 $LOAD = ($NOW - $TICK_START) / $TICK;
3943 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4132 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3944 4133
3945 if (0) { 4134 if (0) {
3946 if ($NEXT_TICK) { 4135 if ($NEXT_TICK) {
3947 my $jitter = $TICK_START - $NEXT_TICK; 4136 my $jitter = $TICK_START - $NEXT_TICK;
3948 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4137 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3949 warn "jitter $JITTER\n";#d# 4138 debug "jitter $JITTER\n";#d#
3950 } 4139 }
3951 } 4140 }
3952} 4141}
3953 4142
3954{ 4143{
… …
3999 IO::AIO::min_parallel 8; 4188 IO::AIO::min_parallel 8;
4000 IO::AIO::max_poll_time $TICK * 0.1; 4189 IO::AIO::max_poll_time $TICK * 0.1;
4001 undef $AnyEvent::AIO::WATCHER; 4190 undef $AnyEvent::AIO::WATCHER;
4002} 4191}
4003 4192
4004my $_log_backtrace; 4193our $_log_backtrace;
4194our $_log_backtrace_last;
4005 4195
4006sub _log_backtrace { 4196sub _log_backtrace {
4007 my ($msg, @addr) = @_; 4197 my ($msg, @addr) = @_;
4008 4198
4009 $msg =~ s/\n//; 4199 $msg =~ s/\n$//;
4010 4200
4201 if ($_log_backtrace_last eq $msg) {
4202 LOG llevInfo, "[ABT] $msg\n";
4203 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4011 # limit the # of concurrent backtraces 4204 # limit the # of concurrent backtraces
4012 if ($_log_backtrace < 2) { 4205 } elsif ($_log_backtrace < 2) {
4206 $_log_backtrace_last = $msg;
4013 ++$_log_backtrace; 4207 ++$_log_backtrace;
4014 my $perl_bt = Carp::longmess $msg; 4208 my $perl_bt = Carp::longmess $msg;
4015 async { 4209 async {
4016 $Coro::current->{desc} = "abt $msg"; 4210 $Coro::current->{desc} = "abt $msg";
4017 4211
… …
4037 LOG llevInfo, "[ABT] $_\n" for @bt; 4231 LOG llevInfo, "[ABT] $_\n" for @bt;
4038 --$_log_backtrace; 4232 --$_log_backtrace;
4039 }; 4233 };
4040 } else { 4234 } else {
4041 LOG llevInfo, "[ABT] $msg\n"; 4235 LOG llevInfo, "[ABT] $msg\n";
4042 LOG llevInfo, "[ABT] [suppressed]\n"; 4236 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4043 } 4237 }
4044} 4238}
4045 4239
4046# load additional modules 4240# load additional modules
4047require "cf/$_.pm" for @EXTRA_MODULES; 4241require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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