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.512 by root, Sun Apr 11 04:52:07 2010 UTC vs.
Revision 1.581 by root, Fri Feb 3 02:04:11 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 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; 113#our %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 = cf::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
391=item $success = cf::replace_file $path, $data, $sync
392
393Atomically replaces the file at the given $path with new $data, and
394optionally $sync the data to disk before replacing the file.
395
396=cut
397
398sub replace_file($$;$) {
399 my ($path, $data, $sync) = @_;
400
401 my $lock = cf::lock_acquire ("replace_file:$path");
402
403 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
404 or return;
405
406 $data = $data->() if ref $data;
407
408 length $data == aio_write $fh, 0, (length $data), $data, 0
409 or return;
410
411 !$sync
412 or !aio_fsync $fh
413 or return;
414
415 aio_close $fh
416 and return;
417
418 aio_rename "$path~", $path
419 and return;
420
421 if ($sync) {
422 $path =~ s%/[^/]*$%%;
423 aio_pathsync $path;
424 }
425
426 1
427}
428
326=item $ref = cf::decode_json $json 429=item $ref = cf::decode_json $json
327 430
328Converts a JSON string into the corresponding perl data structure. 431Converts a JSON string into the corresponding perl data structure.
329 432
330=item $json = cf::encode_json $ref 433=item $json = cf::encode_json $ref
… …
336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 439our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337 440
338sub encode_json($) { $json_coder->encode ($_[0]) } 441sub encode_json($) { $json_coder->encode ($_[0]) }
339sub decode_json($) { $json_coder->decode ($_[0]) } 442sub decode_json($) { $json_coder->decode ($_[0]) }
340 443
444=item $ref = cf::decode_storable $scalar
445
446Same as Coro::Storable::thaw, so blocks.
447
448=cut
449
450BEGIN { *decode_storable = \&Coro::Storable::thaw }
451
452=item $ref = cf::decode_yaml $scalar
453
454Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
455
456=cut
457
458sub decode_yaml($) {
459 fork_call { YAML::XS::Load $_[0] } @_
460}
461
462=item $scalar = cf::unlzf $scalar
463
464Same as Compress::LZF::compress, but takes server ticks into account, so
465blocks.
466
467=cut
468
469sub unlzf($) {
470 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
471 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
472 Compress::LZF::decompress $_[0]
473}
474
341=item cf::post_init { BLOCK } 475=item cf::post_init { BLOCK }
342 476
343Execute the given codeblock, I<after> all extensions have been (re-)loaded, 477Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again. 478but I<before> the server starts ticking again.
345 479
346The cdoeblock will have a single boolean argument to indicate whether this 480The codeblock will have a single boolean argument to indicate whether this
347is a reload or not. 481is a reload or not.
348 482
349=cut 483=cut
350 484
351sub post_init(&) { 485sub post_init(&) {
352 push @POST_INIT, shift; 486 push @POST_INIT, shift;
487}
488
489sub _post_init {
490 trace "running post_init jobs";
491
492 # run them in parallel...
493
494 my @join;
495
496 while () {
497 push @join, map &Coro::async ($_, 0), @POST_INIT;
498 @POST_INIT = ();
499
500 @join or last;
501
502 (pop @join)->join;
503 }
353} 504}
354 505
355=item cf::lock_wait $string 506=item cf::lock_wait $string
356 507
357Wait until the given lock is available. See cf::lock_acquire. 508Wait until the given lock is available. See cf::lock_acquire.
… …
396} 547}
397 548
398=item cf::periodic $interval, $cb 549=item cf::periodic $interval, $cb
399 550
400Like EV::periodic, but randomly selects a starting point so that the actions 551Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 552get spread over time.
402 553
403=cut 554=cut
404 555
405sub periodic($$) { 556sub periodic($$) {
406 my ($interval, $cb) = @_; 557 my ($interval, $cb) = @_;
… …
410 EV::periodic $start, $interval, 0, $cb 561 EV::periodic $start, $interval, 0, $cb
411} 562}
412 563
413=item cf::get_slot $time[, $priority[, $name]] 564=item cf::get_slot $time[, $priority[, $name]]
414 565
415Allocate $time seconds of blocking CPU time at priority C<$priority>: 566Allocate $time seconds of blocking CPU time at priority C<$priority>
416This call blocks and returns only when you have at least C<$time> seconds 567(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. 568C<$time> seconds of cpu time till the next tick. The slot is only valid
569till the next cede.
570
571Background jobs should use a priority les than zero, interactive jobs
572should use 100 or more.
418 573
419The optional C<$name> can be used to identify the job to run. It might be 574The 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. 575used for statistical purposes and should identify the same time-class.
421 576
422Useful for short background jobs. 577Useful for short background jobs.
… …
451 } 606 }
452 } 607 }
453 608
454 if (@SLOT_QUEUE) { 609 if (@SLOT_QUEUE) {
455 # we do not use wait_for_tick() as it returns immediately when tick is inactive 610 # we do not use wait_for_tick() as it returns immediately when tick is inactive
456 push @cf::WAIT_FOR_TICK, $signal; 611 $WAIT_FOR_TICK->wait;
457 $signal->wait;
458 } else { 612 } else {
459 $busy = 0; 613 $busy = 0;
460 Coro::schedule; 614 Coro::schedule;
461 } 615 }
462 } 616 }
… …
502=cut 656=cut
503 657
504sub sync_job(&) { 658sub sync_job(&) {
505 my ($job) = @_; 659 my ($job) = @_;
506 660
507 if ($Coro::current == $Coro::main) { 661 if (in_main) {
508 my $time = AE::time; 662 my $time = AE::time;
509 663
510 # this is the main coro, too bad, we have to block 664 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 665 # till the operation succeeds, freezing the server :/
512 666
513 LOG llevError, Carp::longmess "sync job";#d# 667 #LOG llevError, Carp::longmess "sync job";#d#
514 668
515 my $freeze_guard = freeze_mainloop; 669 my $freeze_guard = freeze_mainloop;
516 670
517 my $busy = 1; 671 my $busy = 1;
518 my @res; 672 my @res;
519 673
520 (async { 674 (async {
521 $Coro::current->desc ("sync job coro"); 675 $Coro::current->desc ("sync job coro");
522 @res = eval { $job->() }; 676 @res = eval { $job->() };
523 warn $@ if $@; 677 error $@ if $@;
524 undef $busy; 678 undef $busy;
525 })->prio (Coro::PRIO_MAX); 679 })->prio (Coro::PRIO_MAX);
526 680
527 while ($busy) { 681 while ($busy) {
528 if (Coro::nready) { 682 if (Coro::nready) {
… …
562 $EXT_CORO{$coro+0} = $coro; 716 $EXT_CORO{$coro+0} = $coro;
563 717
564 $coro 718 $coro
565} 719}
566 720
567=item fork_call { }, $args 721=item fork_call { }, @args
568 722
569Executes the given code block with the given arguments in a seperate 723Executes the given code block with the given arguments in a seperate
570process, returning the results. Everything must be serialisable with 724process, returning the results. Everything must be serialisable with
571Coro::Storable. May, of course, block. Note that the executed sub may 725Coro::Storable. May, of course, block. Note that the executed sub may
572never block itself or use any form of event handling. 726never block itself or use any form of event handling.
573 727
574=cut 728=cut
575 729
730sub post_fork {
731 reset_signals;
732}
733
576sub fork_call(&@) { 734sub fork_call(&@) {
577 my ($cb, @args) = @_; 735 my ($cb, @args) = @_;
578 736
579 # we seemingly have to make a local copy of the whole thing, 737 # we seemingly have to make a local copy of the whole thing,
580 # otherwise perl prematurely frees the stuff :/ 738 # otherwise perl prematurely frees the stuff :/
581 # TODO: investigate and fix (likely this will be rather laborious) 739 # TODO: investigate and fix (likely this will be rather laborious)
582 740
583 my @res = Coro::Util::fork_eval { 741 my @res = Coro::Util::fork_eval {
584 reset_signals; 742 cf::post_fork;
585 &$cb 743 &$cb
586 }, @args; 744 } @args;
587 745
588 wantarray ? @res : $res[-1] 746 wantarray ? @res : $res[-1]
747}
748
749sub objinfo {
750 (
751 "counter value" => cf::object::object_count,
752 "objects created" => cf::object::create_count,
753 "objects destroyed" => cf::object::destroy_count,
754 "freelist size" => cf::object::free_count,
755 "allocated objects" => cf::object::objects_size,
756 "active objects" => cf::object::actives_size,
757 )
589} 758}
590 759
591=item $coin = coin_from_name $name 760=item $coin = coin_from_name $name
592 761
593=cut 762=cut
… …
630within each server. 799within each server.
631 800
632=cut 801=cut
633 802
634sub db_table($) { 803sub db_table($) {
804 cf::error "db_get called from main context"
805 if $Coro::current == $Coro::main;
806
635 my ($name) = @_; 807 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV; 808 my $db = BDB::db_create $DB_ENV;
637 809
638 eval { 810 eval {
639 $db->set_flags (BDB::CHKSUM); 811 $db->set_flags (BDB::CHKSUM);
… …
649} 821}
650 822
651our $DB; 823our $DB;
652 824
653sub db_init { 825sub db_init {
654 cf::sync_job {
655 $DB ||= db_table "db"; 826 $DB ||= db_table "db";
656 };
657} 827}
658 828
659sub db_get($$) { 829sub db_get($$) {
660 my $key = "$_[0]/$_[1]"; 830 my $key = "$_[0]/$_[1]";
661 831
662 cf::sync_job { 832 cf::error "db_get called from main context"
833 if $Coro::current == $Coro::main;
834
663 BDB::db_get $DB, undef, $key, my $data; 835 BDB::db_get $DB, undef, $key, my $data;
664 836
665 $! ? () 837 $! ? ()
666 : $data 838 : $data
667 }
668} 839}
669 840
670sub db_put($$$) { 841sub db_put($$$) {
671 BDB::dbreq_pri 4; 842 BDB::dbreq_pri 4;
672 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 843 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
700 871
701 my @data; 872 my @data;
702 my $md5; 873 my $md5;
703 874
704 for (0 .. $#$src) { 875 for (0 .. $#$src) {
705 0 <= aio_load $src->[$_], $data[$_] 876 $data[$_] = load_file $src->[$_];
706 or Carp::croak "$src->[$_]: $!";
707 } 877 }
708 878
709 # if processing is expensive, check 879 # if processing is expensive, check
710 # checksum first 880 # checksum first
711 if (1) { 881 if (1) {
… …
728 898
729 my $t1 = Time::HiRes::time; 899 my $t1 = Time::HiRes::time;
730 my $data = $process->(\@data); 900 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time; 901 my $t2 = Time::HiRes::time;
732 902
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 903 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734 904
735 db_put cache => "$id/data", $data; 905 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5; 906 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta; 907 db_put cache => "$id/meta", $meta;
738 908
… …
748 918
749=cut 919=cut
750 920
751sub datalog($@) { 921sub datalog($@) {
752 my ($type, %kv) = @_; 922 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 923 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754} 924}
755 925
756=back 926=back
757 927
758=cut 928=cut
… …
953 1123
954 } elsif (exists $cb_id{$type}) { 1124 } elsif (exists $cb_id{$type}) {
955 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1125 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956 1126
957 } elsif (ref $type) { 1127 } elsif (ref $type) {
958 warn "attaching objects not supported, ignoring.\n"; 1128 error "attaching objects not supported, ignoring.\n";
959 1129
960 } else { 1130 } else {
961 shift @arg; 1131 shift @arg;
962 warn "attach argument '$type' not supported, ignoring.\n"; 1132 error "attach argument '$type' not supported, ignoring.\n";
963 } 1133 }
964 } 1134 }
965} 1135}
966 1136
967sub _object_attach { 1137sub _object_attach {
… …
977 _attach $registry, $klass, @attach; 1147 _attach $registry, $klass, @attach;
978 } 1148 }
979 1149
980 $obj->{$name} = \%arg; 1150 $obj->{$name} = \%arg;
981 } else { 1151 } else {
982 warn "object uses attachment '$name' which is not available, postponing.\n"; 1152 info "object uses attachment '$name' which is not available, postponing.\n";
983 } 1153 }
984 1154
985 $obj->{_attachment}{$name} = undef; 1155 $obj->{_attachment}{$name} = undef;
986} 1156}
987 1157
… …
1046 1216
1047 for (@$callbacks) { 1217 for (@$callbacks) {
1048 eval { &{$_->[1]} }; 1218 eval { &{$_->[1]} };
1049 1219
1050 if ($@) { 1220 if ($@) {
1051 warn "$@";
1052 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1221 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053 override; 1222 override;
1054 } 1223 }
1055 1224
1056 return 1 if $override; 1225 return 1 if $override;
1057 } 1226 }
… …
1136 for (@$attach) { 1305 for (@$attach) {
1137 my ($klass, @attach) = @$_; 1306 my ($klass, @attach) = @$_;
1138 _attach $registry, $klass, @attach; 1307 _attach $registry, $klass, @attach;
1139 } 1308 }
1140 } else { 1309 } else {
1141 warn "object uses attachment '$name' that is not available, postponing.\n"; 1310 info "object uses attachment '$name' that is not available, postponing.\n";
1142 } 1311 }
1143 } 1312 }
1144} 1313}
1145 1314
1146cf::attachable->attach ( 1315cf::attachable->attach (
… …
1173 my ($filename, $rdata, $objs) = @_; 1342 my ($filename, $rdata, $objs) = @_;
1174 1343
1175 sync_job { 1344 sync_job {
1176 if (length $$rdata) { 1345 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1346 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1347 trace sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1348 $decname, length $$rdata, scalar @$objs
1349 if $VERBOSE_IO;
1180 1350
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1351 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1352 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1353 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1354 if ($cf::USE_FSYNC) {
… …
1206 aio_rename "$filename~", $filename; 1376 aio_rename "$filename~", $filename;
1207 1377
1208 $filename =~ s%/[^/]+$%%; 1378 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC; 1379 aio_pathsync $filename if $cf::USE_FSYNC;
1210 } else { 1380 } else {
1211 warn "unable to save objects: $filename~: $!\n"; 1381 error "unable to save objects: $filename~: $!\n";
1212 } 1382 }
1213 } else { 1383 } else {
1214 aio_unlink $filename; 1384 aio_unlink $filename;
1215 aio_unlink "$filename.pst"; 1385 aio_unlink "$filename.pst";
1216 } 1386 }
… …
1240 my $st = eval { Coro::Storable::thaw $av }; 1410 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs}; 1411 $av = $st->{objs};
1242 } 1412 }
1243 1413
1244 utf8::decode (my $decname = $filename); 1414 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1415 trace sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1416 $decname, length $data, scalar @{$av || []}
1417 if $VERBOSE_IO;
1247 1418
1248 ($data, $av) 1419 ($data, $av)
1249} 1420}
1250 1421
1251=head2 COMMAND CALLBACKS 1422=head2 COMMAND CALLBACKS
… …
1328 my ($pl, $buf) = @_; 1499 my ($pl, $buf) = @_;
1329 1500
1330 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1501 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1331 1502
1332 if (ref $msg) { 1503 if (ref $msg) {
1333 my ($type, $reply, @payload) = 1504 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1334 "ARRAY" eq ref $msg
1335 ? @$msg
1336 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1337 1505
1338 my @reply; 1506 my @reply;
1339 1507
1340 if (my $cb = $EXTCMD{$type}) { 1508 if (my $cb = $EXTCMD{$type}) {
1341 @reply = $cb->($pl, @payload); 1509 @reply = $cb->($pl, @payload);
… …
1343 1511
1344 $pl->ext_reply ($reply, @reply) 1512 $pl->ext_reply ($reply, @reply)
1345 if $reply; 1513 if $reply;
1346 1514
1347 } else { 1515 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1516 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1517 }
1350 1518
1351 cf::override; 1519 cf::override;
1352 }, 1520 },
1353); 1521);
… …
1364 1532
1365 $grp 1533 $grp
1366} 1534}
1367 1535
1368sub load_extensions { 1536sub load_extensions {
1537 info "loading extensions...";
1538
1369 cf::sync_job { 1539 cf::sync_job {
1370 my %todo; 1540 my %todo;
1371 1541
1372 for my $path (<$LIBDIR/*.ext>) { 1542 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1543 next unless -r $path;
… …
1391 1561
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1562 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1563 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394 1564
1395 $ext{source} = 1565 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1566 "package $pkg; use common::sense;\n"
1397 . "#line 1 \"$path\"\n{\n" 1567 . "#line 1 \"$path\"\n{\n"
1398 . $source 1568 . $source
1399 . "\n};\n1"; 1569 . "\n};\n1";
1400 1570
1401 $todo{$base} = \%ext; 1571 $todo{$base} = \%ext;
… …
1413 for (split /,\s*/, $v->{meta}{depends}) { 1583 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext 1584 next ext
1415 unless exists $done{$_}; 1585 unless exists $done{$_};
1416 } 1586 }
1417 1587
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1588 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419 1589
1420 my $active = eval $v->{source}; 1590 my $active = eval $v->{source};
1421 1591
1422 if (length $@) { 1592 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1593 error "$v->{path}: $@\n";
1424 1594
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1595 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1596 if exists $v->{meta}{mandatory};
1597
1598 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1599 delete $todo{$k};
1427 } else { 1600 } else {
1428 $done{$k} = delete $todo{$k}; 1601 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1602 push @EXTS, $v->{pkg};
1430 $progress = 1; 1603 $progress = 1;
1431 1604
1432 warn "$v->{base}: extension inactive.\n" 1605 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1606 unless $active;
1434 } 1607 }
1435 } 1608 }
1436 1609
1437 unless ($progress) { 1610 unless ($progress) {
… …
1439 1612
1440 while (my ($k, $v) = each %todo) { 1613 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1614 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory}; 1615 if exists $v->{meta}{mandatory};
1443 } 1616 }
1617
1618 last;
1444 } 1619 }
1445 } 1620 }
1446 }; 1621 };
1447} 1622}
1448 1623
… …
1606 my $name = $pl->ob->name; 1781 my $name = $pl->ob->name;
1607 1782
1608 $pl->{deny_save} = 1; 1783 $pl->{deny_save} = 1;
1609 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1784 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1610 1785
1611 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1786 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1612 $pl->deactivate; 1787 $pl->deactivate;
1788
1613 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1789 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1614 $pl->ob->check_score;
1615 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1790 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1791 ext::highscore::check ($pl->ob);
1792
1616 $pl->ns->destroy if $pl->ns; 1793 $pl->ns->destroy if $pl->ns;
1617 1794
1618 my $path = playerdir $pl; 1795 my $path = playerdir $pl;
1619 my $temp = "$path~$cf::RUNTIME~deleting~"; 1796 my $temp = "$path~$cf::RUNTIME~deleting~";
1620 aio_rename $path, $temp; 1797 aio_rename $path, $temp;
… …
1674 \@logins 1851 \@logins
1675} 1852}
1676 1853
1677=item $player->maps 1854=item $player->maps
1678 1855
1856=item cf::player::maps $login
1857
1679Returns an arrayref of map paths that are private for this 1858Returns an arrayref of map paths that are private for this
1680player. May block. 1859player. May block.
1681 1860
1682=cut 1861=cut
1683 1862
… …
1745=cut 1924=cut
1746 1925
1747sub find_by_path($) { 1926sub find_by_path($) {
1748 my ($path) = @_; 1927 my ($path) = @_;
1749 1928
1929 $path =~ s/^~[^\/]*//; # skip ~login
1930
1750 my ($match, $specificity); 1931 my ($match, $specificity);
1751 1932
1752 for my $region (list) { 1933 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1934 if ($region->{match} && $path =~ $region->{match}) {
1754 ($match, $specificity) = ($region, $region->specificity) 1935 ($match, $specificity) = ($region, $region->specificity)
… …
1782sub generate_random_map { 1963sub generate_random_map {
1783 my ($self, $rmp) = @_; 1964 my ($self, $rmp) = @_;
1784 1965
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1966 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786 1967
1787 # mit "rum" bekleckern, nicht
1788 $self->_create_random_map ( 1968 $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} 1969}
1802 1970
1803=item cf::map->register ($regex, $prio) 1971=item cf::map->register ($regex, $prio)
1804 1972
1805Register a handler for the map path matching the given regex at the 1973Register a handler for the map path matching the given regex at the
… …
1810 1978
1811sub register { 1979sub register {
1812 my (undef, $regex, $prio) = @_; 1980 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 1981 my $pkg = caller;
1814 1982
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 1983 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 1984
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1985 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 1986}
1820 1987
1821# also paths starting with '/' 1988# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1989$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 1990
1824sub thawer_merge { 1991sub thawer_merge {
1825 my ($self, $merge) = @_; 1992 my ($self, $merge) = @_;
1826 1993
1827 # we have to keep some variables in memory intact 1994 # we have to keep some variables in memory intact
… …
1832} 1999}
1833 2000
1834sub normalise { 2001sub normalise {
1835 my ($path, $base) = @_; 2002 my ($path, $base) = @_;
1836 2003
1837 $path = "$path"; # make sure its a string 2004 $path = "$path"; # make sure it's a string
1838 2005
1839 $path =~ s/\.map$//; 2006 $path =~ s/\.map$//;
1840 2007
1841 # map plan: 2008 # map plan:
1842 # 2009 #
… …
1857 $base =~ s{[^/]+/?$}{}; 2024 $base =~ s{[^/]+/?$}{};
1858 $path = "$base/$path"; 2025 $path = "$base/$path";
1859 } 2026 }
1860 2027
1861 for ($path) { 2028 for ($path) {
1862 redo if s{//}{/};
1863 redo if s{/\.?/}{/}; 2029 redo if s{/\.?/}{/};
1864 redo if s{/[^/]+/\.\./}{/}; 2030 redo if s{/[^/]+/\.\./}{/};
1865 } 2031 }
1866 2032
1867 $path 2033 $path
… …
1881 $self->init; # pass $1 etc. 2047 $self->init; # pass $1 etc.
1882 return $self; 2048 return $self;
1883 } 2049 }
1884 } 2050 }
1885 2051
1886 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2052 Carp::cluck "unable to resolve path '$path' (base '$base')";
1887 () 2053 ()
1888} 2054}
1889 2055
2056# may re-bless or do other evil things
1890sub init { 2057sub init {
1891 my ($self) = @_; 2058 my ($self) = @_;
1892 2059
1893 $self 2060 $self
1894} 2061}
… …
1959 $self->{load_path} = $path; 2126 $self->{load_path} = $path;
1960 2127
1961 1 2128 1
1962} 2129}
1963 2130
2131# used to laod the header of an original map
1964sub load_header_orig { 2132sub load_header_orig {
1965 my ($self) = @_; 2133 my ($self) = @_;
1966 2134
1967 $self->load_header_from ($self->load_path) 2135 $self->load_header_from ($self->load_path)
1968} 2136}
1969 2137
2138# used to laod the header of an instantiated map
1970sub load_header_temp { 2139sub load_header_temp {
1971 my ($self) = @_; 2140 my ($self) = @_;
1972 2141
1973 $self->load_header_from ($self->save_path) 2142 $self->load_header_from ($self->save_path)
1974} 2143}
1975 2144
2145# called after loading the header from an instantiated map
1976sub prepare_temp { 2146sub prepare_temp {
1977 my ($self) = @_; 2147 my ($self) = @_;
1978 2148
1979 $self->last_access ((delete $self->{last_access}) 2149 $self->last_access ((delete $self->{last_access})
1980 || $cf::RUNTIME); #d# 2150 || $cf::RUNTIME); #d#
1981 # safety 2151 # safety
1982 $self->{instantiate_time} = $cf::RUNTIME 2152 $self->{instantiate_time} = $cf::RUNTIME
1983 if $self->{instantiate_time} > $cf::RUNTIME; 2153 if $self->{instantiate_time} > $cf::RUNTIME;
1984} 2154}
1985 2155
2156# called after loading the header from an original map
1986sub prepare_orig { 2157sub prepare_orig {
1987 my ($self) = @_; 2158 my ($self) = @_;
1988 2159
1989 $self->{load_original} = 1; 2160 $self->{load_original} = 1;
1990 $self->{instantiate_time} = $cf::RUNTIME; 2161 $self->{instantiate_time} = $cf::RUNTIME;
… …
2014 2185
2015sub find; 2186sub find;
2016sub find { 2187sub find {
2017 my ($path, $origin) = @_; 2188 my ($path, $origin) = @_;
2018 2189
2190 cf::cede_to_tick;
2191
2019 $path = normalise $path, $origin && $origin->path; 2192 $path = normalise $path, $origin;
2020 2193
2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2194 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2022 my $guard2 = cf::lock_acquire "map_find:$path"; 2195 my $guard2 = cf::lock_acquire "map_find:$path";
2023 2196
2024 $cf::MAP{$path} || do { 2197 $cf::MAP{$path} || do {
… …
2055 2228
2056 { 2229 {
2057 my $guard = cf::lock_acquire "map_data:$path"; 2230 my $guard = cf::lock_acquire "map_data:$path";
2058 2231
2059 return unless $self->valid; 2232 return unless $self->valid;
2060 return unless $self->in_memory == cf::MAP_SWAPPED; 2233 return unless $self->state == cf::MAP_SWAPPED;
2061
2062 $self->in_memory (cf::MAP_LOADING);
2063 2234
2064 $self->alloc; 2235 $self->alloc;
2065 2236
2066 $self->pre_load; 2237 $self->pre_load;
2067 cf::cede_to_tick; 2238 cf::cede_to_tick;
2068 2239
2240 if (exists $self->{load_path}) {
2069 my $f = new_from_file cf::object::thawer $self->{load_path}; 2241 my $f = new_from_file cf::object::thawer $self->{load_path};
2070 $f->skip_block; 2242 $f->skip_block;
2071 $self->_load_objects ($f) 2243 $self->_load_objects ($f)
2072 or return; 2244 or return;
2073 2245
2074 $self->post_load_original 2246 $self->post_load_original
2075 if delete $self->{load_original}; 2247 if delete $self->{load_original};
2076 2248
2077 if (my $uniq = $self->uniq_path) { 2249 if (my $uniq = $self->uniq_path) {
2078 utf8::encode $uniq; 2250 utf8::encode $uniq;
2079 unless (aio_stat $uniq) { 2251 unless (aio_stat $uniq) {
2080 if (my $f = new_from_file cf::object::thawer $uniq) { 2252 if (my $f = new_from_file cf::object::thawer $uniq) {
2081 $self->clear_unique_items; 2253 $self->clear_unique_items;
2082 $self->_load_objects ($f); 2254 $self->_load_objects ($f);
2083 $f->resolve_delayed_derefs; 2255 $f->resolve_delayed_derefs;
2256 }
2084 } 2257 }
2085 } 2258 }
2086 }
2087 2259
2088 $f->resolve_delayed_derefs; 2260 $f->resolve_delayed_derefs;
2261 } else {
2262 $self->post_load_original
2263 if delete $self->{load_original};
2264 }
2265
2266 $self->state (cf::MAP_INACTIVE);
2089 2267
2090 cf::cede_to_tick; 2268 cf::cede_to_tick;
2091 # now do the right thing for maps 2269 # now do the right thing for maps
2092 $self->link_multipart_objects; 2270 $self->link_multipart_objects;
2093 $self->difficulty ($self->estimate_difficulty) 2271 $self->difficulty ($self->estimate_difficulty)
… …
2097 unless ($self->{deny_activate}) { 2275 unless ($self->{deny_activate}) {
2098 $self->decay_objects; 2276 $self->decay_objects;
2099 $self->fix_auto_apply; 2277 $self->fix_auto_apply;
2100 $self->update_buttons; 2278 $self->update_buttons;
2101 cf::cede_to_tick; 2279 cf::cede_to_tick;
2102 $self->activate; 2280 #$self->activate; # no longer activate maps automatically
2103 } 2281 }
2104 2282
2105 $self->{last_save} = $cf::RUNTIME; 2283 $self->{last_save} = $cf::RUNTIME;
2106 $self->last_access ($cf::RUNTIME); 2284 $self->last_access ($cf::RUNTIME);
2107
2108 $self->in_memory (cf::MAP_ACTIVE);
2109 } 2285 }
2110 2286
2111 $self->post_load; 2287 $self->post_load;
2288
2289 1
2112} 2290}
2113 2291
2114# customize the map for a given player, i.e. 2292# customize the map for a given player, i.e.
2115# return the _real_ map. used by e.g. per-player 2293# return the _real_ map. used by e.g. per-player
2116# maps to change the path to ~playername/mappath 2294# maps to change the path to ~playername/mappath
… …
2124# if $self->per_party; 2302# if $self->per_party;
2125 2303
2126 $self 2304 $self
2127} 2305}
2128 2306
2129# find and load all maps in the 3x3 area around a map
2130sub load_neighbours {
2131 my ($map) = @_;
2132
2133 my @neigh; # diagonal neighbours
2134
2135 for (0 .. 3) {
2136 my $neigh = $map->tile_path ($_)
2137 or next;
2138 $neigh = find $neigh, $map
2139 or next;
2140 $neigh->load;
2141
2142 push @neigh,
2143 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2144 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2145 }
2146
2147 for (grep defined $_->[0], @neigh) {
2148 my ($path, $origin) = @$_;
2149 my $neigh = find $path, $origin
2150 or next;
2151 $neigh->load;
2152 }
2153}
2154
2155sub find_sync { 2307sub find_sync {
2156 my ($path, $origin) = @_; 2308 my ($path, $origin) = @_;
2157 2309
2158 cf::sync_job { find $path, $origin } 2310 # it's a bug to call this from the main context
2311 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2312 if $Coro::current == $Coro::main;
2313
2314 find $path, $origin
2159} 2315}
2160 2316
2161sub do_load_sync { 2317sub do_load_sync {
2162 my ($map) = @_; 2318 my ($map) = @_;
2163 2319
2320 # it's a bug to call this from the main context
2164 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2321 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2165 if $Coro::current == $Coro::main; 2322 if $Coro::current == $Coro::main;
2166 2323
2167 cf::sync_job { $map->load }; 2324 $map->load;
2168} 2325}
2169 2326
2170our %MAP_PREFETCH; 2327our %MAP_PREFETCH;
2171our $MAP_PREFETCHER = undef; 2328our $MAP_PREFETCHER = undef;
2172 2329
2173sub find_async { 2330sub find_async {
2174 my ($path, $origin, $load) = @_; 2331 my ($path, $origin, $load) = @_;
2175 2332
2176 $path = normalise $path, $origin && $origin->{path}; 2333 $path = normalise $path, $origin;
2177 2334
2178 if (my $map = $cf::MAP{$path}) { 2335 if (my $map = $cf::MAP{$path}) {
2179 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2336 return $map if !$load || $map->linkable;
2180 } 2337 }
2181 2338
2182 $MAP_PREFETCH{$path} |= $load; 2339 $MAP_PREFETCH{$path} |= $load;
2183 2340
2184 $MAP_PREFETCHER ||= cf::async { 2341 $MAP_PREFETCHER ||= cf::async {
… …
2198 $MAP_PREFETCHER->prio (6); 2355 $MAP_PREFETCHER->prio (6);
2199 2356
2200 () 2357 ()
2201} 2358}
2202 2359
2360# common code, used by both ->save and ->swapout
2203sub save { 2361sub _save {
2204 my ($self) = @_; 2362 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2363
2208 $self->{last_save} = $cf::RUNTIME; 2364 $self->{last_save} = $cf::RUNTIME;
2209 2365
2210 return unless $self->dirty; 2366 return unless $self->dirty;
2211 2367
… …
2231 } else { 2387 } else {
2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2388 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2233 } 2389 }
2234} 2390}
2235 2391
2392sub save {
2393 my ($self) = @_;
2394
2395 my $lock = cf::lock_acquire "map_data:$self->{path}";
2396
2397 $self->_save;
2398}
2399
2236sub swap_out { 2400sub swap_out {
2237 my ($self) = @_; 2401 my ($self) = @_;
2238 2402
2239 # save first because save cedes
2240 $self->save;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2403 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243 2404
2405 return if !$self->linkable;
2406 return if $self->{deny_save};
2244 return if $self->players; 2407 return if $self->players;
2245 return if $self->in_memory != cf::MAP_ACTIVE; 2408
2409 # first deactivate the map and "unlink" it from the core
2410 $self->deactivate;
2411 $_->clear_links_to ($self) for values %cf::MAP;
2412 $self->state (cf::MAP_SWAPPED);
2413
2414 # then atomically save
2415 $self->_save;
2416
2417 # then free the map
2418 $self->clear;
2419}
2420
2421sub reset_at {
2422 my ($self) = @_;
2423
2424 # TODO: safety, remove and allow resettable per-player maps
2246 return if $self->{deny_save}; 2425 return 1e99 if $self->{deny_reset};
2247 2426
2427 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2428 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2429
2430 $time + $to
2431}
2432
2433sub should_reset {
2434 my ($self) = @_;
2435
2436 $self->reset_at <= $cf::RUNTIME
2437}
2438
2439sub reset {
2440 my ($self) = @_;
2441
2442 my $lock = cf::lock_acquire "map_data:$self->{path}";
2443
2444 return if $self->players;
2445
2446 cf::trace "resetting map ", $self->path, "\n";
2447
2248 $self->in_memory (cf::MAP_SWAPPED); 2448 $self->state (cf::MAP_SWAPPED);
2449
2450 # need to save uniques path
2451 unless ($self->{deny_save}) {
2452 my $uniq = $self->uniq_path; utf8::encode $uniq;
2453
2454 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2455 if $uniq;
2456 }
2457
2458 delete $cf::MAP{$self->path};
2249 2459
2250 $self->deactivate; 2460 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP; 2461 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear; 2462 $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 2463
2298 $self->unlink_save; 2464 $self->unlink_save;
2299 $self->destroy; 2465 $self->destroy;
2300} 2466}
2301 2467
… …
2309 2475
2310 delete $cf::MAP{$self->path}; 2476 delete $cf::MAP{$self->path};
2311 2477
2312 $self->unlink_save; 2478 $self->unlink_save;
2313 2479
2314 bless $self, "cf::map"; 2480 bless $self, "cf::map::wrap";
2315 delete $self->{deny_reset}; 2481 delete $self->{deny_reset};
2316 $self->{deny_save} = 1; 2482 $self->{deny_save} = 1;
2317 $self->reset_timeout (1); 2483 $self->reset_timeout (1);
2318 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2484 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2319 2485
… …
2549 2715
2550Freezes the player and moves him/her to a special map (C<{link}>). 2716Freezes the player and moves him/her to a special map (C<{link}>).
2551 2717
2552The player should be reasonably safe there for short amounts of time (e.g. 2718The 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, 2719for 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 2720though, as the player cannot control the character while it is on the link
2555map. 2721map.
2556 2722
2557Will never block. 2723Will never block.
2558 2724
2559=item $player_object->leave_link ($map, $x, $y) 2725=item $player_object->leave_link ($map, $x, $y)
… …
2580sub cf::object::player::enter_link { 2746sub cf::object::player::enter_link {
2581 my ($self) = @_; 2747 my ($self) = @_;
2582 2748
2583 $self->deactivate_recursive; 2749 $self->deactivate_recursive;
2584 2750
2751 ++$self->{_link_recursion};
2752
2585 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2753 return if UNIVERSAL::isa $self->map, "ext::map_link";
2586 2754
2587 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2755 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2588 if $self->map && $self->map->{path} ne "{link}"; 2756 if $self->map && $self->map->{path} ne "{link}";
2589 2757
2590 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2758 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2591} 2759}
2592 2760
2593sub cf::object::player::leave_link { 2761sub cf::object::player::leave_link {
2594 my ($self, $map, $x, $y) = @_; 2762 my ($self, $map, $x, $y) = @_;
2595 2763
… …
2615 # use -1 or undef as default coordinates, not 0, 0 2783 # use -1 or undef as default coordinates, not 0, 0
2616 ($x, $y) = ($map->enter_x, $map->enter_y) 2784 ($x, $y) = ($map->enter_x, $map->enter_y)
2617 if $x <= 0 && $y <= 0; 2785 if $x <= 0 && $y <= 0;
2618 2786
2619 $map->load; 2787 $map->load;
2620 $map->load_neighbours;
2621 2788
2622 return unless $self->contr->active; 2789 return unless $self->contr->active;
2623 2790
2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2791 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2625 $self->enter_map ($map, $x, $y); 2792 if ($self->enter_map ($map, $x, $y)) {
2626 2793 # entering was successful
2794 delete $self->{_link_recursion};
2627 # only activate afterwards, to support waiting in hooks 2795 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive; 2796 $self->activate_recursive;
2629} 2797 }
2630 2798
2799}
2800
2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2801=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2632 2802
2633Moves the player to the given map-path and coordinates by first freezing 2803Moves the player to the given map-path and coordinates by first freezing
2634her, loading and preparing them map, calling the provided $check callback 2804her, loading and preparing them map, calling the provided $check callback
2635that has to return the map if sucecssful, and then unfreezes the player on 2805that 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 2806the new (success) or old (failed) map position. In either case, $done will
… …
2643 2813
2644our $GOTOGEN; 2814our $GOTOGEN;
2645 2815
2646sub cf::object::player::goto { 2816sub cf::object::player::goto {
2647 my ($self, $path, $x, $y, $check, $done) = @_; 2817 my ($self, $path, $x, $y, $check, $done) = @_;
2818
2819 if ($self->{_link_recursion} >= $MAX_LINKS) {
2820 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2821 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2822 ($path, $x, $y) = @$EMERGENCY_POSITION;
2823 }
2648 2824
2649 # do generation counting so two concurrent goto's will be executed in-order 2825 # do generation counting so two concurrent goto's will be executed in-order
2650 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2826 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2651 2827
2652 $self->enter_link; 2828 $self->enter_link;
… …
2672 ($path, $x, $y) = (undef, undef, undef); 2848 ($path, $x, $y) = (undef, undef, undef);
2673 } 2849 }
2674 } 2850 }
2675 2851
2676 my $map = eval { 2852 my $map = eval {
2677 my $map = defined $path ? cf::map::find $path : undef; 2853 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2678 2854
2679 if ($map) { 2855 if ($map) {
2680 $map = $map->customise_for ($self); 2856 $map = $map->customise_for ($self);
2681 $map = $check->($map) if $check && $map; 2857 $map = $check->($map, $x, $y, $self) if $check && $map;
2682 } else { 2858 } else {
2683 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2859 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2684 } 2860 }
2685 2861
2686 $map 2862 $map
… …
2694 if ($gen == $self->{_goto_generation}) { 2870 if ($gen == $self->{_goto_generation}) {
2695 delete $self->{_goto_generation}; 2871 delete $self->{_goto_generation};
2696 $self->leave_link ($map, $x, $y); 2872 $self->leave_link ($map, $x, $y);
2697 } 2873 }
2698 2874
2699 $done->() if $done; 2875 $done->($self) if $done;
2700 })->prio (1); 2876 })->prio (1);
2701} 2877}
2702 2878
2703=item $player_object->enter_exit ($exit_object) 2879=item $player_object->enter_exit ($exit_object)
2704 2880
… …
2772 $Coro::current->{desc} = "enter_exit"; 2948 $Coro::current->{desc} = "enter_exit";
2773 2949
2774 unless (eval { 2950 unless (eval {
2775 $self->deactivate_recursive; # just to be sure 2951 $self->deactivate_recursive; # just to be sure
2776 2952
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; 2953 my $map = cf::map::normalise $exit->slaying, $exit->map;
2786 my $x = $exit->stats->hp; 2954 my $x = $exit->stats->hp;
2787 my $y = $exit->stats->sp; 2955 my $y = $exit->stats->sp;
2956
2957 # special map handling
2958 my $slaying = $exit->slaying;
2959
2960 # special map handling
2961 if ($slaying eq "/!") {
2962 my $guard = cf::lock_acquire "exit_prepare:$exit";
2963
2964 prepare_random_map $exit
2965 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2966
2967 $map = $exit->slaying;
2968
2969 } elsif ($slaying eq '!up') {
2970 $map = $exit->map->tile_path (cf::TILE_UP);
2971 $x = $exit->x;
2972 $y = $exit->y;
2973
2974 } elsif ($slaying eq '!down') {
2975 $map = $exit->map->tile_path (cf::TILE_DOWN);
2976 $x = $exit->x;
2977 $y = $exit->y;
2978 }
2788 2979
2789 $self->goto ($map, $x, $y); 2980 $self->goto ($map, $x, $y);
2790 2981
2791 # if exit is damned, update players death & WoR home-position 2982 # if exit is damned, update players death & WoR home-position
2792 $self->contr->savebed ($map, $x, $y) 2983 $self->contr->savebed ($map, $x, $y)
… …
2797 $self->message ("Something went wrong deep within the deliantra server. " 2988 $self->message ("Something went wrong deep within the deliantra server. "
2798 . "I'll try to bring you back to the map you were before. " 2989 . "I'll try to bring you back to the map you were before. "
2799 . "Please report this to the dungeon master!", 2990 . "Please report this to the dungeon master!",
2800 cf::NDI_UNIQUE | cf::NDI_RED); 2991 cf::NDI_UNIQUE | cf::NDI_RED);
2801 2992
2802 warn "ERROR in enter_exit: $@"; 2993 error "ERROR in enter_exit: $@";
2803 $self->leave_link; 2994 $self->leave_link;
2804 } 2995 }
2805 })->prio (1); 2996 })->prio (1);
2806} 2997}
2807 2998
… …
3034=cut 3225=cut
3035 3226
3036sub cf::client::ext_reply($$@) { 3227sub cf::client::ext_reply($$@) {
3037 my ($self, $id, @msg) = @_; 3228 my ($self, $id, @msg) = @_;
3038 3229
3039 if ($self->extcmd == 2) { 3230 return unless $self->extcmd == 2;
3231
3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3232 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3041 } elsif ($self->extcmd == 1) {
3042 #TODO: version 1, remove
3043 unshift @msg, msgtype => "reply", msgid => $id;
3044 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3045 }
3046} 3233}
3047 3234
3048=item $success = $client->query ($flags, "text", \&cb) 3235=item $success = $client->query ($flags, "text", \&cb)
3049 3236
3050Queues a query to the client, calling the given callback with 3237Queues a query to the client, calling the given callback with
… …
3105 my ($ns, $buf) = @_; 3292 my ($ns, $buf) = @_;
3106 3293
3107 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3294 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3108 3295
3109 if (ref $msg) { 3296 if (ref $msg) {
3110 my ($type, $reply, @payload) = 3297 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3111 "ARRAY" eq ref $msg
3112 ? @$msg
3113 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3114 3298
3115 my @reply; 3299 my @reply;
3116 3300
3117 if (my $cb = $EXTICMD{$type}) { 3301 if (my $cb = $EXTICMD{$type}) {
3118 @reply = $cb->($ns, @payload); 3302 @reply = $cb->($ns, @payload);
… …
3120 3304
3121 $ns->ext_reply ($reply, @reply) 3305 $ns->ext_reply ($reply, @reply)
3122 if $reply; 3306 if $reply;
3123 3307
3124 } else { 3308 } else {
3125 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3309 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3126 } 3310 }
3127 3311
3128 cf::override; 3312 cf::override;
3129 }, 3313 },
3130); 3314);
… …
3211 decrease split destroy change_exp value msg lore send_msg)], 3395 decrease split destroy change_exp value msg lore send_msg)],
3212 ["cf::object::player" => qw(player)], 3396 ["cf::object::player" => qw(player)],
3213 ["cf::player" => qw(peaceful send_msg)], 3397 ["cf::player" => qw(peaceful send_msg)],
3214 ["cf::map" => qw(trigger)], 3398 ["cf::map" => qw(trigger)],
3215) { 3399) {
3216 no strict 'refs';
3217 my ($pkg, @funs) = @$_; 3400 my ($pkg, @funs) = @$_;
3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3401 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3219 for @funs; 3402 for @funs;
3220} 3403}
3221 3404
… …
3260 local @cf::_safe_eval_args = values %vars; 3443 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval; 3444 @res = wantarray ? eval eval : scalar eval $eval;
3262 } 3445 }
3263 3446
3264 if ($@) { 3447 if ($@) {
3265 warn "$@"; 3448 warn "$@",
3266 warn "while executing safe code '$code'\n"; 3449 "while executing safe code '$code'\n",
3267 warn "with arguments " . (join " ", %vars) . "\n"; 3450 "with arguments " . (join " ", %vars) . "\n";
3268 } 3451 }
3269 3452
3270 wantarray ? @res : $res[0] 3453 wantarray ? @res : $res[0]
3271} 3454}
3272 3455
… …
3306 # for this (global event?) 3489 # for this (global event?)
3307 %ext::player_env::MUSIC_FACE_CACHE = (); 3490 %ext::player_env::MUSIC_FACE_CACHE = ();
3308 3491
3309 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3492 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3310 3493
3311 warn "loading facedata from $path\n"; 3494 trace "loading facedata from $path\n";
3312 3495
3313 my $facedata; 3496 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 3497
3319 $facedata->{version} == 2 3498 $facedata->{version} == 2
3320 or cf::cleanup "$path: version mismatch, cannot proceed."; 3499 or cf::cleanup "$path: version mismatch, cannot proceed.";
3321 3500
3322 # patch in the exptable 3501 # patch in the exptable
… …
3336 3515
3337 cf::face::set_visibility $idx, $info->{visibility}; 3516 cf::face::set_visibility $idx, $info->{visibility};
3338 cf::face::set_magicmap $idx, $info->{magicmap}; 3517 cf::face::set_magicmap $idx, $info->{magicmap};
3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3518 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3519 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3520 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3341 3521
3342 cf::cede_to_tick; 3522 cf::cede_to_tick;
3343 } 3523 }
3344 3524
3345 while (my ($face, $info) = each %$faces) { 3525 while (my ($face, $info) = each %$faces) {
… …
3350 3530
3351 if (my $smooth = cf::face::find $info->{smooth}) { 3531 if (my $smooth = cf::face::find $info->{smooth}) {
3352 cf::face::set_smooth $idx, $smooth; 3532 cf::face::set_smooth $idx, $smooth;
3353 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3533 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3354 } else { 3534 } else {
3355 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3535 error "smooth face '$info->{smooth}' not found for face '$face'";
3356 } 3536 }
3357 3537
3358 cf::cede_to_tick; 3538 cf::cede_to_tick;
3359 } 3539 }
3360 } 3540 }
… …
3372 3552
3373 { 3553 {
3374 my $res = $facedata->{resource}; 3554 my $res = $facedata->{resource};
3375 3555
3376 while (my ($name, $info) = each %$res) { 3556 while (my ($name, $info) = each %$res) {
3377 if (defined $info->{type}) { 3557 if (defined (my $type = $info->{type})) {
3558 # TODO: different hash - must free and use new index, or cache ixface data queue
3378 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3559 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3379 3560
3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3561 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3381 cf::face::set_type $idx, $info->{type}; 3562 cf::face::set_type $idx, $type;
3563 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3382 } else { 3564 } else {
3383 $RESOURCE{$name} = $info; 3565# $RESOURCE{$name} = $info; # unused
3384 } 3566 }
3385 3567
3386 cf::cede_to_tick; 3568 cf::cede_to_tick;
3387 } 3569 }
3388 } 3570 }
3389 3571
3390 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3572 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3391 3573
3392 1 3574 1
3393} 3575}
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 3576
3415register_exticmd fx_want => sub { 3577register_exticmd fx_want => sub {
3416 my ($ns, $want) = @_; 3578 my ($ns, $want) = @_;
3417 3579
3418 while (my ($k, $v) = each %$want) { 3580 while (my ($k, $v) = each %$want) {
… …
3457sub reload_treasures { 3619sub reload_treasures {
3458 load_resource_file "$DATADIR/treasures" 3620 load_resource_file "$DATADIR/treasures"
3459 or die "unable to load treasurelists\n"; 3621 or die "unable to load treasurelists\n";
3460} 3622}
3461 3623
3624sub reload_sound {
3625 trace "loading sound config from $DATADIR/sound\n";
3626
3627 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3628
3629 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3630 my $sound = $soundconf->{compat}[$_]
3631 or next;
3632
3633 my $face = cf::face::find "sound/$sound->[1]";
3634 cf::sound::set $sound->[0] => $face;
3635 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3636 }
3637
3638 while (my ($k, $v) = each %{$soundconf->{event}}) {
3639 my $face = cf::face::find "sound/$v";
3640 cf::sound::set $k => $face;
3641 }
3642}
3643
3462sub reload_resources { 3644sub reload_resources {
3463 warn "reloading resource files...\n"; 3645 trace "reloading resource files...\n";
3464 3646
3647 reload_exp_table;
3648 reload_materials;
3465 reload_facedata; 3649 reload_facedata;
3650 reload_sound;
3466 reload_archetypes; 3651 reload_archetypes;
3467 reload_regions; 3652 reload_regions;
3468 reload_treasures; 3653 reload_treasures;
3469 3654
3470 warn "finished reloading resource files\n"; 3655 trace "finished reloading resource files\n";
3471} 3656}
3472 3657
3473sub reload_config { 3658sub reload_config {
3474 warn "reloading config file...\n"; 3659 trace "reloading config file...\n";
3475 3660
3476 open my $fh, "<:utf8", "$CONFDIR/config" 3661 my $config = load_file "$CONFDIR/config";
3477 or return; 3662 utf8::decode $config;
3663 *CFG = decode_yaml $config;
3478 3664
3479 local $/;
3480 *CFG = YAML::XS::Load scalar <$fh>;
3481
3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3665 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3483 3666
3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3667 $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}; 3668 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3486 3669
3487 if (exists $CFG{mlockall}) { 3670 if (exists $CFG{mlockall}) {
… …
3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3672 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3490 and die "WARNING: m(un)lockall failed: $!\n"; 3673 and die "WARNING: m(un)lockall failed: $!\n";
3491 }; 3674 };
3492 warn $@ if $@; 3675 warn $@ if $@;
3493 } 3676 }
3494
3495 warn "finished reloading resource files\n";
3496} 3677}
3497 3678
3498sub pidfile() { 3679sub pidfile() {
3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3680 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3500 or die "$PIDFILE: $!"; 3681 or die "$PIDFILE: $!";
… …
3513 seek $fh, 0, 0; 3694 seek $fh, 0, 0;
3514 print $fh $$; 3695 print $fh $$;
3515} 3696}
3516 3697
3517sub main_loop { 3698sub main_loop {
3518 warn "EV::loop starting\n"; 3699 trace "EV::loop starting\n";
3519 if (1) { 3700 if (1) {
3520 EV::loop; 3701 EV::loop;
3521 } 3702 }
3522 warn "EV::loop returned\n"; 3703 trace "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP; 3704 goto &main_loop unless $REALLY_UNLOOP;
3524} 3705}
3525 3706
3526sub main { 3707sub main {
3527 cf::init_globals; # initialise logging 3708 cf::init_globals; # initialise logging
3528 3709
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3710 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3711 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3712 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3713 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 3714
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3715 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540 3716
3541 # we must not ever block the main coroutine 3717 # we must not ever block the main coroutine
3542 local $Coro::idle = sub { 3718 local $Coro::idle = sub {
… …
3548 }; 3724 };
3549 3725
3550 evthread_start IO::AIO::poll_fileno; 3726 evthread_start IO::AIO::poll_fileno;
3551 3727
3552 cf::sync_job { 3728 cf::sync_job {
3729 cf::incloader::init ();
3730
3731 cf::init_anim;
3732 cf::init_attackmess;
3733 cf::init_dynamic;
3734
3553 cf::load_settings; 3735 cf::load_settings;
3554 cf::load_materials;
3555 3736
3556 reload_resources; 3737 reload_resources;
3557 reload_config; 3738 reload_config;
3558 db_init; 3739 db_init;
3559 3740
… …
3571 3752
3572 # no (long-running) fork's whatsoever before this point(!) 3753 # no (long-running) fork's whatsoever before this point(!)
3573 use POSIX (); 3754 use POSIX ();
3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3755 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575 3756
3576 (pop @POST_INIT)->(0) while @POST_INIT; 3757 cf::_post_init 0;
3577 }; 3758 };
3578 3759
3760 cf::object::thawer::errors_are_fatal 0;
3761 info "parse errors in files are no longer fatal from this point on.\n";
3762
3763 AE::postpone {
3764 undef &main; # free gobs of memory :)
3765 };
3766
3579 main_loop; 3767 goto &main_loop;
3580} 3768}
3581 3769
3582############################################################################# 3770#############################################################################
3583# initialisation and cleanup 3771# initialisation and cleanup
3584 3772
… …
3623 or return; 3811 or return;
3624 3812
3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3813 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3626 and return; 3814 and return;
3627 3815
3628 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3816 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3629 3817
3630 1 3818 1
3631} 3819}
3632 3820
3633our $uuid_lock; 3821our $uuid_lock;
… …
3645 or return; 3833 or return;
3646 3834
3647 my $value = uuid_seq uuid_cur; 3835 my $value = uuid_seq uuid_cur;
3648 3836
3649 unless ($value) { 3837 unless ($value) {
3650 warn "cowardly refusing to write zero uuid value!\n"; 3838 info "cowardly refusing to write zero uuid value!\n";
3651 return; 3839 return;
3652 } 3840 }
3653 3841
3654 my $value = uuid_str $value + $uuid_skip; 3842 my $value = uuid_str $value + $uuid_skip;
3655 $uuid_skip = 0; 3843 $uuid_skip = 0;
… …
3665 or return; 3853 or return;
3666 3854
3667 aio_rename "$uuid~", $uuid 3855 aio_rename "$uuid~", $uuid
3668 and return; 3856 and return;
3669 3857
3670 warn "uuid file written ($value).\n"; 3858 trace "uuid file written ($value).\n";
3671 3859
3672 1 3860 1
3673 3861
3674} 3862}
3675 3863
… …
3681} 3869}
3682 3870
3683sub emergency_save() { 3871sub emergency_save() {
3684 my $freeze_guard = cf::freeze_mainloop; 3872 my $freeze_guard = cf::freeze_mainloop;
3685 3873
3686 warn "emergency_perl_save: enter\n"; 3874 info "emergency_perl_save: enter\n";
3875
3876 # this is a trade-off: we want to be very quick here, so
3877 # save all maps without fsync, and later call a global sync
3878 # (which in turn might be very very slow)
3879 local $USE_FSYNC = 0;
3687 3880
3688 cf::sync_job { 3881 cf::sync_job {
3689 # this is a trade-off: we want to be very quick here, so 3882 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 3883
3694 # use a peculiar iteration method to avoid tripping on perl 3884 # use a peculiar iteration method to avoid tripping on perl
3695 # refcount bugs in for. also avoids problems with players 3885 # refcount bugs in for. also avoids problems with players
3696 # and maps saved/destroyed asynchronously. 3886 # and maps saved/destroyed asynchronously.
3697 warn "emergency_perl_save: begin player save\n"; 3887 info "emergency_perl_save: begin player save\n";
3698 for my $login (keys %cf::PLAYER) { 3888 for my $login (keys %cf::PLAYER) {
3699 my $pl = $cf::PLAYER{$login} or next; 3889 my $pl = $cf::PLAYER{$login} or next;
3700 $pl->valid or next; 3890 $pl->valid or next;
3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3891 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3702 $pl->save; 3892 $pl->save;
3703 } 3893 }
3704 warn "emergency_perl_save: end player save\n"; 3894 info "emergency_perl_save: end player save\n";
3705 3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3706 warn "emergency_perl_save: begin map save\n"; 3898 info "emergency_perl_save: begin map save\n";
3707 for my $path (keys %cf::MAP) { 3899 for my $path (keys %cf::MAP) {
3708 my $map = $cf::MAP{$path} or next; 3900 my $map = $cf::MAP{$path} or next;
3709 $map->valid or next; 3901 $map->valid or next;
3710 $map->save; 3902 $map->save;
3711 } 3903 }
3712 warn "emergency_perl_save: end map save\n"; 3904 info "emergency_perl_save: end map save\n";
3713 3905
3906 cf::write_runtime_sync; # external watchdog should not bark
3907
3714 warn "emergency_perl_save: begin database checkpoint\n"; 3908 info "emergency_perl_save: begin database checkpoint\n";
3715 BDB::db_env_txn_checkpoint $DB_ENV; 3909 BDB::db_env_txn_checkpoint $DB_ENV;
3716 warn "emergency_perl_save: end database checkpoint\n"; 3910 info "emergency_perl_save: end database checkpoint\n";
3717 3911
3718 warn "emergency_perl_save: begin write uuid\n"; 3912 info "emergency_perl_save: begin write uuid\n";
3719 write_uuid_sync 1; 3913 write_uuid_sync 1;
3720 warn "emergency_perl_save: end write uuid\n"; 3914 info "emergency_perl_save: end write uuid\n";
3915
3916 cf::write_runtime_sync; # external watchdog should not bark
3917
3918 trace "emergency_perl_save: syncing database to disk";
3919 BDB::db_env_txn_checkpoint $DB_ENV;
3920
3921 info "emergency_perl_save: starting sync\n";
3922 IO::AIO::aio_sync sub {
3923 info "emergency_perl_save: finished sync\n";
3924 };
3925
3926 cf::write_runtime_sync; # external watchdog should not bark
3927
3928 trace "emergency_perl_save: flushing outstanding aio requests";
3929 while (IO::AIO::nreqs || BDB::nreqs) {
3930 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3931 }
3932
3933 cf::write_runtime_sync; # external watchdog should not bark
3721 }; 3934 };
3722 3935
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"; 3936 info "emergency_perl_save: leave\n";
3729} 3937}
3730 3938
3731sub post_cleanup { 3939sub post_cleanup {
3732 my ($make_core) = @_; 3940 my ($make_core) = @_;
3733 3941
3942 IO::AIO::flush;
3943
3734 warn Carp::longmess "post_cleanup backtrace" 3944 error Carp::longmess "post_cleanup backtrace"
3735 if $make_core; 3945 if $make_core;
3736 3946
3737 my $fh = pidfile; 3947 my $fh = pidfile;
3738 unlink $PIDFILE if <$fh> == $$; 3948 unlink $PIDFILE if <$fh> == $$;
3739} 3949}
… …
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3969 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) { 3970 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"}; 3971 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3972# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 } 3973 }
3764 warn "cleared package $pkg\n";#d#
3765} 3974}
3766 3975
3767sub do_reload_perl() { 3976sub do_reload_perl() {
3768 # can/must only be called in main 3977 # can/must only be called in main
3769 if ($Coro::current != $Coro::main) { 3978 unless (in_main) {
3770 warn "can only reload from main coroutine"; 3979 error "can only reload from main coroutine";
3771 return; 3980 return;
3772 } 3981 }
3773 3982
3774 return if $RELOAD++; 3983 return if $RELOAD++;
3775 3984
3776 my $t1 = AE::time; 3985 my $t1 = AE::time;
3777 3986
3778 while ($RELOAD) { 3987 while ($RELOAD) {
3779 warn "reloading..."; 3988 cf::get_slot 0.1, -1, "reload_perl";
3989 info "perl_reload: reloading...";
3780 3990
3781 warn "entering sync_job"; 3991 trace "perl_reload: entering sync_job";
3782 3992
3783 cf::sync_job { 3993 cf::sync_job {
3784 cf::write_runtime_sync; # external watchdog should not bark
3785 cf::emergency_save; 3994 #cf::emergency_save;
3786 cf::write_runtime_sync; # external watchdog should not bark
3787 3995
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"; 3996 trace "perl_reload: cancelling all extension coros";
3799 $_->cancel for values %EXT_CORO; 3997 $_->cancel for values %EXT_CORO;
3800 %EXT_CORO = (); 3998 %EXT_CORO = ();
3801 3999
3802 warn "removing commands"; 4000 trace "perl_reload: removing commands";
3803 %COMMAND = (); 4001 %COMMAND = ();
3804 4002
3805 warn "removing ext/exti commands"; 4003 trace "perl_reload: removing ext/exti commands";
3806 %EXTCMD = (); 4004 %EXTCMD = ();
3807 %EXTICMD = (); 4005 %EXTICMD = ();
3808 4006
3809 warn "unloading/nuking all extensions"; 4007 trace "perl_reload: unloading/nuking all extensions";
3810 for my $pkg (@EXTS) { 4008 for my $pkg (@EXTS) {
3811 warn "... unloading $pkg"; 4009 trace "... unloading $pkg";
3812 4010
3813 if (my $cb = $pkg->can ("unload")) { 4011 if (my $cb = $pkg->can ("unload")) {
3814 eval { 4012 eval {
3815 $cb->($pkg); 4013 $cb->($pkg);
3816 1 4014 1
3817 } or warn "$pkg unloaded, but with errors: $@"; 4015 } or error "$pkg unloaded, but with errors: $@";
3818 } 4016 }
3819 4017
3820 warn "... clearing $pkg"; 4018 trace "... clearing $pkg";
3821 clear_package $pkg; 4019 clear_package $pkg;
3822 } 4020 }
3823 4021
3824 warn "unloading all perl modules loaded from $LIBDIR"; 4022 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3825 while (my ($k, $v) = each %INC) { 4023 while (my ($k, $v) = each %INC) {
3826 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4024 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3827 4025
3828 warn "... unloading $k"; 4026 trace "... unloading $k";
3829 delete $INC{$k}; 4027 delete $INC{$k};
3830 4028
3831 $k =~ s/\.pm$//; 4029 $k =~ s/\.pm$//;
3832 $k =~ s/\//::/g; 4030 $k =~ s/\//::/g;
3833 4031
… …
3836 } 4034 }
3837 4035
3838 clear_package $k; 4036 clear_package $k;
3839 } 4037 }
3840 4038
3841 warn "getting rid of safe::, as good as possible"; 4039 trace "perl_reload: getting rid of safe::, as good as possible";
3842 clear_package "safe::$_" 4040 clear_package "safe::$_"
3843 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4041 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3844 4042
3845 warn "unloading cf.pm \"a bit\""; 4043 trace "perl_reload: unloading cf.pm \"a bit\"";
3846 delete $INC{"cf.pm"}; 4044 delete $INC{"cf.pm"};
3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4045 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3848 4046
3849 # don't, removes xs symbols, too, 4047 # don't, removes xs symbols, too,
3850 # and global variables created in xs 4048 # and global variables created in xs
3851 #clear_package __PACKAGE__; 4049 #clear_package __PACKAGE__;
3852 4050
3853 warn "unload completed, starting to reload now"; 4051 info "perl_reload: unload completed, starting to reload now";
3854 4052
3855 warn "reloading cf.pm"; 4053 trace "perl_reload: reloading cf.pm";
3856 require cf; 4054 require cf;
3857 cf::_connect_to_perl_1; 4055 cf::_connect_to_perl_1;
3858 4056
3859 warn "loading config and database again"; 4057 trace "perl_reload: loading config and database again";
3860 cf::reload_config; 4058 cf::reload_config;
3861 4059
3862 warn "loading extensions"; 4060 trace "perl_reload: loading extensions";
3863 cf::load_extensions; 4061 cf::load_extensions;
3864 4062
3865 if ($REATTACH_ON_RELOAD) { 4063 if ($REATTACH_ON_RELOAD) {
3866 warn "reattaching attachments to objects/players"; 4064 trace "perl_reload: reattaching attachments to objects/players";
3867 _global_reattach; # objects, sockets 4065 _global_reattach; # objects, sockets
3868 warn "reattaching attachments to maps"; 4066 trace "perl_reload: reattaching attachments to maps";
3869 reattach $_ for values %MAP; 4067 reattach $_ for values %MAP;
3870 warn "reattaching attachments to players"; 4068 trace "perl_reload: reattaching attachments to players";
3871 reattach $_ for values %PLAYER; 4069 reattach $_ for values %PLAYER;
3872 } 4070 }
3873 4071
3874 warn "running post_init jobs"; 4072 cf::_post_init 1;
3875 (pop @POST_INIT)->(1) while @POST_INIT;
3876 4073
3877 warn "leaving sync_job"; 4074 trace "perl_reload: leaving sync_job";
3878 4075
3879 1 4076 1
3880 } or do { 4077 } or do {
3881 warn $@; 4078 error $@;
3882 cf::cleanup "error while reloading, exiting."; 4079 cf::cleanup "perl_reload: error, exiting.";
3883 }; 4080 };
3884 4081
3885 warn "reloaded";
3886 --$RELOAD; 4082 --$RELOAD;
3887 } 4083 }
3888 4084
3889 $t1 = AE::time - $t1; 4085 $t1 = AE::time - $t1;
3890 warn "reload completed in ${t1}s\n"; 4086 info "perl_reload: completed in ${t1}s\n";
3891}; 4087};
3892 4088
3893our $RELOAD_WATCHER; # used only during reload 4089our $RELOAD_WATCHER; # used only during reload
3894 4090
3895sub reload_perl() { 4091sub reload_perl() {
… …
3916 reload_perl; 4112 reload_perl;
3917 }; 4113 };
3918 } 4114 }
3919}; 4115};
3920 4116
3921unshift @INC, $LIBDIR; 4117#############################################################################
3922 4118
3923my $bug_warning = 0; 4119my $bug_warning = 0;
3924 4120
3925our @WAIT_FOR_TICK;
3926our @WAIT_FOR_TICK_BEGIN;
3927
3928sub wait_for_tick { 4121sub wait_for_tick() {
3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4122 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3930 4123
3931 my $signal = new Coro::Signal; 4124 $WAIT_FOR_TICK->wait;
3932 push @WAIT_FOR_TICK, $signal;
3933 $signal->wait;
3934} 4125}
3935 4126
3936sub wait_for_tick_begin { 4127sub wait_for_tick_begin() {
3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4128 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3938 4129
3939 my $signal = new Coro::Signal; 4130 my $signal = new Coro::Signal;
3940 push @WAIT_FOR_TICK_BEGIN, $signal; 4131 push @WAIT_FOR_TICK_BEGIN, $signal;
3941 $signal->wait; 4132 $signal->wait;
3942} 4133}
… …
3946 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4137 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3947 unless ++$bug_warning > 10; 4138 unless ++$bug_warning > 10;
3948 return; 4139 return;
3949 } 4140 }
3950 4141
3951 cf::server_tick; # one server iteration 4142 cf::one_tick; # one server iteration
3952 4143
3953 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4144 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3954 4145
3955 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4147 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3957 Coro::async_pool { 4148 Coro::async_pool {
3958 $Coro::current->{desc} = "runtime saver"; 4149 $Coro::current->{desc} = "runtime saver";
3959 write_runtime_sync 4150 write_runtime_sync
3960 or warn "ERROR: unable to write runtime file: $!"; 4151 or error "ERROR: unable to write runtime file: $!";
3961 }; 4152 };
3962 } 4153 }
3963 4154
3964 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4155 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3965 $sig->send; 4156 $sig->send;
3966 } 4157 }
3967 while (my $sig = shift @WAIT_FOR_TICK) { 4158 $WAIT_FOR_TICK->broadcast;
3968 $sig->send;
3969 }
3970 4159
3971 $LOAD = ($NOW - $TICK_START) / $TICK; 4160 $LOAD = ($NOW - $TICK_START) / $TICK;
3972 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4161 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3973 4162
3974 if (0) { 4163 if (0) {
3975 if ($NEXT_TICK) { 4164 if ($NEXT_TICK) {
3976 my $jitter = $TICK_START - $NEXT_TICK; 4165 my $jitter = $TICK_START - $NEXT_TICK;
3977 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4166 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3978 warn "jitter $JITTER\n";#d# 4167 debug "jitter $JITTER\n";#d#
3979 } 4168 }
3980 } 4169 }
3981} 4170}
3982 4171
3983{ 4172{
3984 # configure BDB 4173 # configure BDB
3985 4174
3986 BDB::min_parallel 16; 4175 BDB::min_parallel 16;
3987 BDB::max_poll_reqs $TICK * 0.1; 4176 BDB::max_poll_reqs $TICK * 0.1;
3988 $AnyEvent::BDB::WATCHER->priority (1); 4177 #$AnyEvent::BDB::WATCHER->priority (1);
3989 4178
3990 unless ($DB_ENV) { 4179 unless ($DB_ENV) {
3991 $DB_ENV = BDB::db_env_create; 4180 $DB_ENV = BDB::db_env_create;
3992 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4181 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3993 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4182 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4028 IO::AIO::min_parallel 8; 4217 IO::AIO::min_parallel 8;
4029 IO::AIO::max_poll_time $TICK * 0.1; 4218 IO::AIO::max_poll_time $TICK * 0.1;
4030 undef $AnyEvent::AIO::WATCHER; 4219 undef $AnyEvent::AIO::WATCHER;
4031} 4220}
4032 4221
4033my $_log_backtrace; 4222our $_log_backtrace;
4223our $_log_backtrace_last;
4034 4224
4035sub _log_backtrace { 4225sub _log_backtrace {
4036 my ($msg, @addr) = @_; 4226 my ($msg, @addr) = @_;
4037 4227
4038 $msg =~ s/\n//; 4228 $msg =~ s/\n$//;
4039 4229
4230 if ($_log_backtrace_last eq $msg) {
4231 LOG llevInfo, "[ABT] $msg\n";
4232 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4040 # limit the # of concurrent backtraces 4233 # limit the # of concurrent backtraces
4041 if ($_log_backtrace < 2) { 4234 } elsif ($_log_backtrace < 2) {
4235 $_log_backtrace_last = $msg;
4042 ++$_log_backtrace; 4236 ++$_log_backtrace;
4043 my $perl_bt = Carp::longmess $msg; 4237 my $perl_bt = Carp::longmess $msg;
4044 async { 4238 async {
4045 $Coro::current->{desc} = "abt $msg"; 4239 $Coro::current->{desc} = "abt $msg";
4046 4240
… …
4066 LOG llevInfo, "[ABT] $_\n" for @bt; 4260 LOG llevInfo, "[ABT] $_\n" for @bt;
4067 --$_log_backtrace; 4261 --$_log_backtrace;
4068 }; 4262 };
4069 } else { 4263 } else {
4070 LOG llevInfo, "[ABT] $msg\n"; 4264 LOG llevInfo, "[ABT] $msg\n";
4071 LOG llevInfo, "[ABT] [suppressed]\n"; 4265 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4072 } 4266 }
4073} 4267}
4074 4268
4075# load additional modules 4269# load additional modules
4076require "cf/$_.pm" for @EXTRA_MODULES; 4270require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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