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.506 by root, Wed Feb 3 20:48:22 2010 UTC vs.
Revision 1.576 by root, Tue Jan 3 02:08:49 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 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
… …
1328 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1329 1462
1330 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1331 1464
1332 if (ref $msg) { 1465 if (ref $msg) {
1333 my ($type, $reply, @payload) = 1466 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 1467
1338 my @reply; 1468 my @reply;
1339 1469
1340 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1341 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
… …
1343 1473
1344 $pl->ext_reply ($reply, @reply) 1474 $pl->ext_reply ($reply, @reply)
1345 if $reply; 1475 if $reply;
1346 1476
1347 } else { 1477 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1478 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1479 }
1350 1480
1351 cf::override; 1481 cf::override;
1352 }, 1482 },
1353); 1483);
… …
1364 1494
1365 $grp 1495 $grp
1366} 1496}
1367 1497
1368sub load_extensions { 1498sub load_extensions {
1499 info "loading extensions...";
1500
1369 cf::sync_job { 1501 cf::sync_job {
1370 my %todo; 1502 my %todo;
1371 1503
1372 for my $path (<$LIBDIR/*.ext>) { 1504 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1505 next unless -r $path;
… …
1391 1523
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1524 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1525 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394 1526
1395 $ext{source} = 1527 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1528 "package $pkg; use common::sense;\n"
1397 . "#line 1 \"$path\"\n{\n" 1529 . "#line 1 \"$path\"\n{\n"
1398 . $source 1530 . $source
1399 . "\n};\n1"; 1531 . "\n};\n1";
1400 1532
1401 $todo{$base} = \%ext; 1533 $todo{$base} = \%ext;
… …
1413 for (split /,\s*/, $v->{meta}{depends}) { 1545 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext 1546 next ext
1415 unless exists $done{$_}; 1547 unless exists $done{$_};
1416 } 1548 }
1417 1549
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1550 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419 1551
1420 my $active = eval $v->{source}; 1552 my $active = eval $v->{source};
1421 1553
1422 if (length $@) { 1554 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1555 error "$v->{path}: $@\n";
1424 1556
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1557 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1558 if exists $v->{meta}{mandatory};
1559
1560 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1561 delete $todo{$k};
1427 } else { 1562 } else {
1428 $done{$k} = delete $todo{$k}; 1563 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1564 push @EXTS, $v->{pkg};
1430 $progress = 1; 1565 $progress = 1;
1431 1566
1432 warn "$v->{base}: extension inactive.\n" 1567 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1568 unless $active;
1434 } 1569 }
1435 } 1570 }
1436 1571
1437 unless ($progress) { 1572 unless ($progress) {
… …
1439 1574
1440 while (my ($k, $v) = each %todo) { 1575 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1576 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory}; 1577 if exists $v->{meta}{mandatory};
1443 } 1578 }
1579
1580 last;
1444 } 1581 }
1445 } 1582 }
1446 }; 1583 };
1447} 1584}
1448 1585
… …
1533 $cf::PLAYER{$login} = $pl 1670 $cf::PLAYER{$login} = $pl
1534 } 1671 }
1535 } 1672 }
1536} 1673}
1537 1674
1675cf::player->attach (
1676 on_load => sub {
1677 my ($pl, $path) = @_;
1678
1679 # restore slots saved in save, below
1680 my $slots = delete $pl->{_slots};
1681
1682 $pl->ob->current_weapon ($slots->[0]);
1683 $pl->combat_ob ($slots->[1]);
1684 $pl->ranged_ob ($slots->[2]);
1685 },
1686);
1687
1538sub save($) { 1688sub save($) {
1539 my ($pl) = @_; 1689 my ($pl) = @_;
1540 1690
1541 return if $pl->{deny_save}; 1691 return if $pl->{deny_save};
1542 1692
… …
1547 1697
1548 aio_mkdir playerdir $pl, 0770; 1698 aio_mkdir playerdir $pl, 0770;
1549 $pl->{last_save} = $cf::RUNTIME; 1699 $pl->{last_save} = $cf::RUNTIME;
1550 1700
1551 cf::get_slot 0.01; 1701 cf::get_slot 0.01;
1702
1703 # save slots, to be restored later
1704 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1552 1705
1553 $pl->save_pl ($path); 1706 $pl->save_pl ($path);
1554 cf::cede_to_tick; 1707 cf::cede_to_tick;
1555} 1708}
1556 1709
… …
1590 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1591 1744
1592 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1593 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1746 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1594 1747
1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1596 $pl->deactivate; 1749 $pl->deactivate;
1750
1597 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1751 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1598 $pl->ob->check_score;
1599 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1600 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1601 1756
1602 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1603 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1604 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
… …
1658 \@logins 1813 \@logins
1659} 1814}
1660 1815
1661=item $player->maps 1816=item $player->maps
1662 1817
1818=item cf::player::maps $login
1819
1663Returns an arrayref of map paths that are private for this 1820Returns an arrayref of map paths that are private for this
1664player. May block. 1821player. May block.
1665 1822
1666=cut 1823=cut
1667 1824
… …
1729=cut 1886=cut
1730 1887
1731sub find_by_path($) { 1888sub find_by_path($) {
1732 my ($path) = @_; 1889 my ($path) = @_;
1733 1890
1891 $path =~ s/^~[^\/]*//; # skip ~login
1892
1734 my ($match, $specificity); 1893 my ($match, $specificity);
1735 1894
1736 for my $region (list) { 1895 for my $region (list) {
1737 if ($region->{match} && $path =~ $region->{match}) { 1896 if ($region->{match} && $path =~ $region->{match}) {
1738 ($match, $specificity) = ($region, $region->specificity) 1897 ($match, $specificity) = ($region, $region->specificity)
… …
1766sub generate_random_map { 1925sub generate_random_map {
1767 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1768 1927
1769 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1928 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1770 1929
1771 # mit "rum" bekleckern, nicht
1772 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1776 $rmp->{exit_on_final_map},
1777 $rmp->{xsize}, $rmp->{ysize},
1778 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1779 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1780 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1781 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1782 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1783 (cf::region::find $rmp->{region}), $rmp->{custom}
1784 )
1785} 1931}
1786 1932
1787=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1788 1934
1789Register a handler for the map path matching the given regex at the 1935Register a handler for the map path matching the given regex at the
… …
1794 1940
1795sub register { 1941sub register {
1796 my (undef, $regex, $prio) = @_; 1942 my (undef, $regex, $prio) = @_;
1797 my $pkg = caller; 1943 my $pkg = caller;
1798 1944
1799 no strict;
1800 push @{"$pkg\::ISA"}, __PACKAGE__; 1945 push @{"$pkg\::ISA"}, __PACKAGE__;
1801 1946
1802 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1947 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1803} 1948}
1804 1949
1805# also paths starting with '/' 1950# also paths starting with '/'
1806$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1951$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1807 1952
1808sub thawer_merge { 1953sub thawer_merge {
1809 my ($self, $merge) = @_; 1954 my ($self, $merge) = @_;
1810 1955
1811 # we have to keep some variables in memory intact 1956 # we have to keep some variables in memory intact
… …
1816} 1961}
1817 1962
1818sub normalise { 1963sub normalise {
1819 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1820 1965
1821 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1822 1967
1823 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1824 1969
1825 # map plan: 1970 # map plan:
1826 # 1971 #
… …
1841 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1842 $path = "$base/$path"; 1987 $path = "$base/$path";
1843 } 1988 }
1844 1989
1845 for ($path) { 1990 for ($path) {
1846 redo if s{//}{/};
1847 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1848 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1849 } 1993 }
1850 1994
1851 $path 1995 $path
… …
1865 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1866 return $self; 2010 return $self;
1867 } 2011 }
1868 } 2012 }
1869 2013
1870 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1871 () 2015 ()
1872} 2016}
1873 2017
2018# may re-bless or do other evil things
1874sub init { 2019sub init {
1875 my ($self) = @_; 2020 my ($self) = @_;
1876 2021
1877 $self 2022 $self
1878} 2023}
… …
1943 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1944 2089
1945 1 2090 1
1946} 2091}
1947 2092
2093# used to laod the header of an original map
1948sub load_header_orig { 2094sub load_header_orig {
1949 my ($self) = @_; 2095 my ($self) = @_;
1950 2096
1951 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
1952} 2098}
1953 2099
2100# used to laod the header of an instantiated map
1954sub load_header_temp { 2101sub load_header_temp {
1955 my ($self) = @_; 2102 my ($self) = @_;
1956 2103
1957 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
1958} 2105}
1959 2106
2107# called after loading the header from an instantiated map
1960sub prepare_temp { 2108sub prepare_temp {
1961 my ($self) = @_; 2109 my ($self) = @_;
1962 2110
1963 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
1964 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
1965 # safety 2113 # safety
1966 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
1967 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
1968} 2116}
1969 2117
2118# called after loading the header from an original map
1970sub prepare_orig { 2119sub prepare_orig {
1971 my ($self) = @_; 2120 my ($self) = @_;
1972 2121
1973 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
1974 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
… …
1998 2147
1999sub find; 2148sub find;
2000sub find { 2149sub find {
2001 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
2002 2151
2152 cf::cede_to_tick;
2153
2003 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
2004 2155
2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2006 my $guard2 = cf::lock_acquire "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
2007 2158
2008 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
… …
2039 2190
2040 { 2191 {
2041 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
2042 2193
2043 return unless $self->valid; 2194 return unless $self->valid;
2044 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2045
2046 $self->in_memory (cf::MAP_LOADING);
2047 2196
2048 $self->alloc; 2197 $self->alloc;
2049 2198
2050 $self->pre_load; 2199 $self->pre_load;
2051 cf::cede_to_tick; 2200 cf::cede_to_tick;
2052 2201
2202 if (exists $self->{load_path}) {
2053 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2054 $f->skip_block; 2204 $f->skip_block;
2055 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2056 or return; 2206 or return;
2057 2207
2058 $self->post_load_original 2208 $self->post_load_original
2059 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2060 2210
2061 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2062 utf8::encode $uniq; 2212 utf8::encode $uniq;
2063 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2064 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2065 $self->clear_unique_items; 2215 $self->clear_unique_items;
2066 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2067 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2068 } 2219 }
2069 } 2220 }
2070 }
2071 2221
2072 $f->resolve_delayed_derefs; 2222 $f->resolve_delayed_derefs;
2223 } else {
2224 $self->post_load_original
2225 if delete $self->{load_original};
2226 }
2227
2228 $self->state (cf::MAP_INACTIVE);
2073 2229
2074 cf::cede_to_tick; 2230 cf::cede_to_tick;
2075 # now do the right thing for maps 2231 # now do the right thing for maps
2076 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2077 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
… …
2081 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2082 $self->decay_objects; 2238 $self->decay_objects;
2083 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2084 $self->update_buttons; 2240 $self->update_buttons;
2085 cf::cede_to_tick; 2241 cf::cede_to_tick;
2086 $self->activate; 2242 #$self->activate; # no longer activate maps automatically
2087 } 2243 }
2088 2244
2089 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2090 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2091
2092 $self->in_memory (cf::MAP_ACTIVE);
2093 } 2247 }
2094 2248
2095 $self->post_load; 2249 $self->post_load;
2096}
2097 2250
2251 1
2252}
2253
2254# customize the map for a given player, i.e.
2255# return the _real_ map. used by e.g. per-player
2256# maps to change the path to ~playername/mappath
2098sub customise_for { 2257sub customise_for {
2099 my ($self, $ob) = @_; 2258 my ($self, $ob) = @_;
2100 2259
2101 return find "~" . $ob->name . "/" . $self->{path} 2260 return find "~" . $ob->name . "/" . $self->{path}
2102 if $self->per_player; 2261 if $self->per_player;
… …
2105# if $self->per_party; 2264# if $self->per_party;
2106 2265
2107 $self 2266 $self
2108} 2267}
2109 2268
2110# find and load all maps in the 3x3 area around a map
2111sub load_neighbours {
2112 my ($map) = @_;
2113
2114 my @neigh; # diagonal neighbours
2115
2116 for (0 .. 3) {
2117 my $neigh = $map->tile_path ($_)
2118 or next;
2119 $neigh = find $neigh, $map
2120 or next;
2121 $neigh->load;
2122
2123 push @neigh,
2124 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2125 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2126 }
2127
2128 for (grep defined $_->[0], @neigh) {
2129 my ($path, $origin) = @$_;
2130 my $neigh = find $path, $origin
2131 or next;
2132 $neigh->load;
2133 }
2134}
2135
2136sub find_sync { 2269sub find_sync {
2137 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2138 2271
2139 cf::sync_job { find $path, $origin } 2272 # it's a bug to call this from the main context
2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2274 if $Coro::current == $Coro::main;
2275
2276 find $path, $origin
2140} 2277}
2141 2278
2142sub do_load_sync { 2279sub do_load_sync {
2143 my ($map) = @_; 2280 my ($map) = @_;
2144 2281
2282 # it's a bug to call this from the main context
2145 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2146 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2147 2285
2148 cf::sync_job { $map->load }; 2286 $map->load;
2149} 2287}
2150 2288
2151our %MAP_PREFETCH; 2289our %MAP_PREFETCH;
2152our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2153 2291
2154sub find_async { 2292sub find_async {
2155 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2156 2294
2157 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2158 2296
2159 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2160 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2161 } 2299 }
2162 2300
2163 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2164 2302
2165 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
… …
2179 $MAP_PREFETCHER->prio (6); 2317 $MAP_PREFETCHER->prio (6);
2180 2318
2181 () 2319 ()
2182} 2320}
2183 2321
2322# common code, used by both ->save and ->swapout
2184sub save { 2323sub _save {
2185 my ($self) = @_; 2324 my ($self) = @_;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2325
2189 $self->{last_save} = $cf::RUNTIME; 2326 $self->{last_save} = $cf::RUNTIME;
2190 2327
2191 return unless $self->dirty; 2328 return unless $self->dirty;
2192 2329
… …
2212 } else { 2349 } else {
2213 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2350 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2214 } 2351 }
2215} 2352}
2216 2353
2354sub save {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 $self->_save;
2360}
2361
2217sub swap_out { 2362sub swap_out {
2218 my ($self) = @_; 2363 my ($self) = @_;
2219 2364
2220 # save first because save cedes
2221 $self->save;
2222
2223 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2224 2366
2367 return if !$self->linkable;
2368 return if $self->{deny_save};
2225 return if $self->players; 2369 return if $self->players;
2226 return if $self->in_memory != cf::MAP_ACTIVE; 2370
2371 # first deactivate the map and "unlink" it from the core
2372 $self->deactivate;
2373 $_->clear_links_to ($self) for values %cf::MAP;
2374 $self->state (cf::MAP_SWAPPED);
2375
2376 # then atomically save
2377 $self->_save;
2378
2379 # then free the map
2380 $self->clear;
2381}
2382
2383sub reset_at {
2384 my ($self) = @_;
2385
2386 # TODO: safety, remove and allow resettable per-player maps
2227 return if $self->{deny_save}; 2387 return 1e99 if $self->{deny_reset};
2228 2388
2389 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2390 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2391
2392 $time + $to
2393}
2394
2395sub should_reset {
2396 my ($self) = @_;
2397
2398 $self->reset_at <= $cf::RUNTIME
2399}
2400
2401sub reset {
2402 my ($self) = @_;
2403
2404 my $lock = cf::lock_acquire "map_data:$self->{path}";
2405
2406 return if $self->players;
2407
2408 cf::trace "resetting map ", $self->path, "\n";
2409
2229 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2411
2412 # need to save uniques path
2413 unless ($self->{deny_save}) {
2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2415
2416 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2417 if $uniq;
2418 }
2419
2420 delete $cf::MAP{$self->path};
2230 2421
2231 $self->deactivate; 2422 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP; 2423 $_->clear_links_to ($self) for values %cf::MAP;
2233 $self->clear; 2424 $self->clear;
2234}
2235
2236sub reset_at {
2237 my ($self) = @_;
2238
2239 # TODO: safety, remove and allow resettable per-player maps
2240 return 1e99 if $self->{deny_reset};
2241
2242 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2243 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2244
2245 $time + $to
2246}
2247
2248sub should_reset {
2249 my ($self) = @_;
2250
2251 $self->reset_at <= $cf::RUNTIME
2252}
2253
2254sub reset {
2255 my ($self) = @_;
2256
2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2258
2259 return if $self->players;
2260
2261 warn "resetting map ", $self->path, "\n";
2262
2263 $self->in_memory (cf::MAP_SWAPPED);
2264
2265 # need to save uniques path
2266 unless ($self->{deny_save}) {
2267 my $uniq = $self->uniq_path; utf8::encode $uniq;
2268
2269 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2270 if $uniq;
2271 }
2272
2273 delete $cf::MAP{$self->path};
2274
2275 $self->deactivate;
2276 $_->clear_links_to ($self) for values %cf::MAP;
2277 $self->clear;
2278 2425
2279 $self->unlink_save; 2426 $self->unlink_save;
2280 $self->destroy; 2427 $self->destroy;
2281} 2428}
2282 2429
… …
2290 2437
2291 delete $cf::MAP{$self->path}; 2438 delete $cf::MAP{$self->path};
2292 2439
2293 $self->unlink_save; 2440 $self->unlink_save;
2294 2441
2295 bless $self, "cf::map"; 2442 bless $self, "cf::map::wrap";
2296 delete $self->{deny_reset}; 2443 delete $self->{deny_reset};
2297 $self->{deny_save} = 1; 2444 $self->{deny_save} = 1;
2298 $self->reset_timeout (1); 2445 $self->reset_timeout (1);
2299 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2446 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2300 2447
… …
2530 2677
2531Freezes the player and moves him/her to a special map (C<{link}>). 2678Freezes the player and moves him/her to a special map (C<{link}>).
2532 2679
2533The player should be reasonably safe there for short amounts of time (e.g. 2680The player should be reasonably safe there for short amounts of time (e.g.
2534for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2681for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2535though, as the palyer cannot control the character while it is on the link 2682though, as the player cannot control the character while it is on the link
2536map. 2683map.
2537 2684
2538Will never block. 2685Will never block.
2539 2686
2540=item $player_object->leave_link ($map, $x, $y) 2687=item $player_object->leave_link ($map, $x, $y)
… …
2561sub cf::object::player::enter_link { 2708sub cf::object::player::enter_link {
2562 my ($self) = @_; 2709 my ($self) = @_;
2563 2710
2564 $self->deactivate_recursive; 2711 $self->deactivate_recursive;
2565 2712
2713 ++$self->{_link_recursion};
2714
2566 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2715 return if UNIVERSAL::isa $self->map, "ext::map_link";
2567 2716
2568 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2569 if $self->map && $self->map->{path} ne "{link}"; 2718 if $self->map && $self->map->{path} ne "{link}";
2570 2719
2571 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2720 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2572} 2721}
2573 2722
2574sub cf::object::player::leave_link { 2723sub cf::object::player::leave_link {
2575 my ($self, $map, $x, $y) = @_; 2724 my ($self, $map, $x, $y) = @_;
2576 2725
… …
2596 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2597 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2598 if $x <= 0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2599 2748
2600 $map->load; 2749 $map->load;
2601 $map->load_neighbours;
2602 2750
2603 return unless $self->contr->active; 2751 return unless $self->contr->active;
2604 2752
2605 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2606 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2607 2755 # entering was successful
2756 delete $self->{_link_recursion};
2608 # only activate afterwards, to support waiting in hooks 2757 # only activate afterwards, to support waiting in hooks
2609 $self->activate_recursive; 2758 $self->activate_recursive;
2610} 2759 }
2611 2760
2761}
2762
2612=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2763=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2613 2764
2614Moves the player to the given map-path and coordinates by first freezing 2765Moves the player to the given map-path and coordinates by first freezing
2615her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2616that has to return the map if sucecssful, and then unfreezes the player on 2767that has to return the map if sucecssful, and then unfreezes the player on
2617the new (success) or old (failed) map position. In either case, $done will 2768the new (success) or old (failed) map position. In either case, $done will
… …
2624 2775
2625our $GOTOGEN; 2776our $GOTOGEN;
2626 2777
2627sub cf::object::player::goto { 2778sub cf::object::player::goto {
2628 my ($self, $path, $x, $y, $check, $done) = @_; 2779 my ($self, $path, $x, $y, $check, $done) = @_;
2780
2781 if ($self->{_link_recursion} >= $MAX_LINKS) {
2782 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2783 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2784 ($path, $x, $y) = @$EMERGENCY_POSITION;
2785 }
2629 2786
2630 # do generation counting so two concurrent goto's will be executed in-order 2787 # do generation counting so two concurrent goto's will be executed in-order
2631 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2632 2789
2633 $self->enter_link; 2790 $self->enter_link;
… …
2653 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2654 } 2811 }
2655 } 2812 }
2656 2813
2657 my $map = eval { 2814 my $map = eval {
2658 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2659 2816
2660 if ($map) { 2817 if ($map) {
2661 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2662 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2663 } else { 2820 } else {
2664 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2821 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2665 } 2822 }
2666 2823
2667 $map 2824 $map
… …
2675 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2676 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2677 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2678 } 2835 }
2679 2836
2680 $done->() if $done; 2837 $done->($self) if $done;
2681 })->prio (1); 2838 })->prio (1);
2682} 2839}
2683 2840
2684=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2685 2842
… …
2753 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2754 2911
2755 unless (eval { 2912 unless (eval {
2756 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2757 2914
2758 # random map handling
2759 {
2760 my $guard = cf::lock_acquire "exit_prepare:$exit";
2761
2762 prepare_random_map $exit
2763 if $exit->slaying eq "/!";
2764 }
2765
2766 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2767 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2768 my $y = $exit->stats->sp; 2917 my $y = $exit->stats->sp;
2918
2919 # special map handling
2920 my $slaying = $exit->slaying;
2921
2922 # special map handling
2923 if ($slaying eq "/!") {
2924 my $guard = cf::lock_acquire "exit_prepare:$exit";
2925
2926 prepare_random_map $exit
2927 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2928
2929 $map = $exit->slaying;
2930
2931 } elsif ($slaying eq '!up') {
2932 $map = $exit->map->tile_path (cf::TILE_UP);
2933 $x = $exit->x;
2934 $y = $exit->y;
2935
2936 } elsif ($slaying eq '!down') {
2937 $map = $exit->map->tile_path (cf::TILE_DOWN);
2938 $x = $exit->x;
2939 $y = $exit->y;
2940 }
2769 2941
2770 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2771 2943
2772 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2773 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
… …
2778 $self->message ("Something went wrong deep within the deliantra server. " 2950 $self->message ("Something went wrong deep within the deliantra server. "
2779 . "I'll try to bring you back to the map you were before. " 2951 . "I'll try to bring you back to the map you were before. "
2780 . "Please report this to the dungeon master!", 2952 . "Please report this to the dungeon master!",
2781 cf::NDI_UNIQUE | cf::NDI_RED); 2953 cf::NDI_UNIQUE | cf::NDI_RED);
2782 2954
2783 warn "ERROR in enter_exit: $@"; 2955 error "ERROR in enter_exit: $@";
2784 $self->leave_link; 2956 $self->leave_link;
2785 } 2957 }
2786 })->prio (1); 2958 })->prio (1);
2787} 2959}
2788 2960
… …
3015=cut 3187=cut
3016 3188
3017sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
3018 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
3019 3191
3020 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
3021 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3022 } elsif ($self->extcmd == 1) {
3023 #TODO: version 1, remove
3024 unshift @msg, msgtype => "reply", msgid => $id;
3025 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3026 }
3027} 3195}
3028 3196
3029=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
3030 3198
3031Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
… …
3086 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
3087 3255
3088 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3089 3257
3090 if (ref $msg) { 3258 if (ref $msg) {
3091 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3092 "ARRAY" eq ref $msg
3093 ? @$msg
3094 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3095 3260
3096 my @reply; 3261 my @reply;
3097 3262
3098 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
3099 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
… …
3101 3266
3102 $ns->ext_reply ($reply, @reply) 3267 $ns->ext_reply ($reply, @reply)
3103 if $reply; 3268 if $reply;
3104 3269
3105 } else { 3270 } else {
3106 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3271 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3107 } 3272 }
3108 3273
3109 cf::override; 3274 cf::override;
3110 }, 3275 },
3111); 3276);
… …
3131 3296
3132 $coro 3297 $coro
3133} 3298}
3134 3299
3135cf::client->attach ( 3300cf::client->attach (
3136 on_destroy => sub { 3301 on_client_destroy => sub {
3137 my ($ns) = @_; 3302 my ($ns) = @_;
3138 3303
3139 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3304 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3140 }, 3305 },
3141); 3306);
… …
3192 decrease split destroy change_exp value msg lore send_msg)], 3357 decrease split destroy change_exp value msg lore send_msg)],
3193 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
3194 ["cf::player" => qw(peaceful send_msg)], 3359 ["cf::player" => qw(peaceful send_msg)],
3195 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
3196) { 3361) {
3197 no strict 'refs';
3198 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
3199 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3200 for @funs; 3364 for @funs;
3201} 3365}
3202 3366
… …
3241 local @cf::_safe_eval_args = values %vars; 3405 local @cf::_safe_eval_args = values %vars;
3242 @res = wantarray ? eval eval : scalar eval $eval; 3406 @res = wantarray ? eval eval : scalar eval $eval;
3243 } 3407 }
3244 3408
3245 if ($@) { 3409 if ($@) {
3246 warn "$@"; 3410 warn "$@",
3247 warn "while executing safe code '$code'\n"; 3411 "while executing safe code '$code'\n",
3248 warn "with arguments " . (join " ", %vars) . "\n"; 3412 "with arguments " . (join " ", %vars) . "\n";
3249 } 3413 }
3250 3414
3251 wantarray ? @res : $res[0] 3415 wantarray ? @res : $res[0]
3252} 3416}
3253 3417
… …
3287 # for this (global event?) 3451 # for this (global event?)
3288 %ext::player_env::MUSIC_FACE_CACHE = (); 3452 %ext::player_env::MUSIC_FACE_CACHE = ();
3289 3453
3290 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3291 3455
3292 warn "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3293 3457
3294 my $facedata; 3458 my $facedata = decode_storable load_file $path;
3295 0 < aio_load $path, $facedata
3296 or die "$path: $!";
3297
3298 $facedata = Coro::Storable::thaw $facedata;
3299 3459
3300 $facedata->{version} == 2 3460 $facedata->{version} == 2
3301 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3302 3462
3303 # patch in the exptable 3463 # patch in the exptable
… …
3317 3477
3318 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3319 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3320 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3321 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3481 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3482 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3322 3483
3323 cf::cede_to_tick; 3484 cf::cede_to_tick;
3324 } 3485 }
3325 3486
3326 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
… …
3331 3492
3332 if (my $smooth = cf::face::find $info->{smooth}) { 3493 if (my $smooth = cf::face::find $info->{smooth}) {
3333 cf::face::set_smooth $idx, $smooth; 3494 cf::face::set_smooth $idx, $smooth;
3334 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3335 } else { 3496 } else {
3336 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3497 error "smooth face '$info->{smooth}' not found for face '$face'";
3337 } 3498 }
3338 3499
3339 cf::cede_to_tick; 3500 cf::cede_to_tick;
3340 } 3501 }
3341 } 3502 }
… …
3359 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3520 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3360 3521
3361 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3522 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3362 cf::face::set_type $idx, $info->{type}; 3523 cf::face::set_type $idx, $info->{type};
3363 } else { 3524 } else {
3364 $RESOURCE{$name} = $info; 3525 $RESOURCE{$name} = $info; # unused
3365 } 3526 }
3366 3527
3367 cf::cede_to_tick; 3528 cf::cede_to_tick;
3368 } 3529 }
3369 } 3530 }
3370 3531
3371 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3532 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3372 3533
3373 1 3534 1
3374} 3535}
3375
3376cf::global->attach (on_resource_update => sub {
3377 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3378 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3379
3380 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3381 my $sound = $soundconf->{compat}[$_]
3382 or next;
3383
3384 my $face = cf::face::find "sound/$sound->[1]";
3385 cf::sound::set $sound->[0] => $face;
3386 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3387 }
3388
3389 while (my ($k, $v) = each %{$soundconf->{event}}) {
3390 my $face = cf::face::find "sound/$v";
3391 cf::sound::set $k => $face;
3392 }
3393 }
3394});
3395 3536
3396register_exticmd fx_want => sub { 3537register_exticmd fx_want => sub {
3397 my ($ns, $want) = @_; 3538 my ($ns, $want) = @_;
3398 3539
3399 while (my ($k, $v) = each %$want) { 3540 while (my ($k, $v) = each %$want) {
… …
3438sub reload_treasures { 3579sub reload_treasures {
3439 load_resource_file "$DATADIR/treasures" 3580 load_resource_file "$DATADIR/treasures"
3440 or die "unable to load treasurelists\n"; 3581 or die "unable to load treasurelists\n";
3441} 3582}
3442 3583
3584sub reload_sound {
3585 trace "loading sound config from $DATADIR/sound\n";
3586
3587 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3588
3589 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3590 my $sound = $soundconf->{compat}[$_]
3591 or next;
3592
3593 my $face = cf::face::find "sound/$sound->[1]";
3594 cf::sound::set $sound->[0] => $face;
3595 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3596 }
3597
3598 while (my ($k, $v) = each %{$soundconf->{event}}) {
3599 my $face = cf::face::find "sound/$v";
3600 cf::sound::set $k => $face;
3601 }
3602}
3603
3443sub reload_resources { 3604sub reload_resources {
3444 warn "reloading resource files...\n"; 3605 trace "reloading resource files...\n";
3445 3606
3607 reload_exp_table;
3608 reload_materials;
3446 reload_facedata; 3609 reload_facedata;
3610 reload_sound;
3447 reload_archetypes; 3611 reload_archetypes;
3448 reload_regions; 3612 reload_regions;
3449 reload_treasures; 3613 reload_treasures;
3450 3614
3451 warn "finished reloading resource files\n"; 3615 trace "finished reloading resource files\n";
3452} 3616}
3453 3617
3454sub reload_config { 3618sub reload_config {
3455 warn "reloading config file...\n"; 3619 trace "reloading config file...\n";
3456 3620
3457 open my $fh, "<:utf8", "$CONFDIR/config" 3621 my $config = load_file "$CONFDIR/config";
3458 or return; 3622 utf8::decode $config;
3623 *CFG = decode_yaml $config;
3459 3624
3460 local $/;
3461 *CFG = YAML::XS::Load scalar <$fh>;
3462
3463 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3625 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3464 3626
3465 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3627 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3466 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3628 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3467 3629
3468 if (exists $CFG{mlockall}) { 3630 if (exists $CFG{mlockall}) {
… …
3470 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3632 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3471 and die "WARNING: m(un)lockall failed: $!\n"; 3633 and die "WARNING: m(un)lockall failed: $!\n";
3472 }; 3634 };
3473 warn $@ if $@; 3635 warn $@ if $@;
3474 } 3636 }
3475
3476 warn "finished reloading resource files\n";
3477} 3637}
3478 3638
3479sub pidfile() { 3639sub pidfile() {
3480 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3640 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3481 or die "$PIDFILE: $!"; 3641 or die "$PIDFILE: $!";
… …
3494 seek $fh, 0, 0; 3654 seek $fh, 0, 0;
3495 print $fh $$; 3655 print $fh $$;
3496} 3656}
3497 3657
3498sub main_loop { 3658sub main_loop {
3499 warn "EV::loop starting\n"; 3659 trace "EV::loop starting\n";
3500 if (1) { 3660 if (1) {
3501 EV::loop; 3661 EV::loop;
3502 } 3662 }
3503 warn "EV::loop returned\n"; 3663 trace "EV::loop returned\n";
3504 goto &main_loop unless $REALLY_UNLOOP; 3664 goto &main_loop unless $REALLY_UNLOOP;
3505} 3665}
3506 3666
3507sub main { 3667sub main {
3508 cf::init_globals; # initialise logging 3668 cf::init_globals; # initialise logging
3509 3669
3510 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3670 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3511 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3671 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3512 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3672 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3513 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3673 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3514
3515 cf::init_experience;
3516 cf::init_anim;
3517 cf::init_attackmess;
3518 cf::init_dynamic;
3519 3674
3520 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3675 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3521 3676
3522 # we must not ever block the main coroutine 3677 # we must not ever block the main coroutine
3523 local $Coro::idle = sub { 3678 local $Coro::idle = sub {
… …
3529 }; 3684 };
3530 3685
3531 evthread_start IO::AIO::poll_fileno; 3686 evthread_start IO::AIO::poll_fileno;
3532 3687
3533 cf::sync_job { 3688 cf::sync_job {
3689 cf::incloader::init ();
3690
3691 cf::init_anim;
3692 cf::init_attackmess;
3693 cf::init_dynamic;
3694
3534 cf::load_settings; 3695 cf::load_settings;
3535 cf::load_materials;
3536 3696
3537 reload_resources; 3697 reload_resources;
3538 reload_config; 3698 reload_config;
3539 db_init; 3699 db_init;
3540 3700
3541 cf::init_uuid; 3701 cf::init_uuid;
3542 cf::init_signals; 3702 cf::init_signals;
3543 cf::init_commands;
3544 cf::init_skills; 3703 cf::init_skills;
3545 3704
3546 cf::init_beforeplay; 3705 cf::init_beforeplay;
3547 3706
3548 atomic; 3707 atomic;
… …
3553 3712
3554 # no (long-running) fork's whatsoever before this point(!) 3713 # no (long-running) fork's whatsoever before this point(!)
3555 use POSIX (); 3714 use POSIX ();
3556 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3715 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3557 3716
3558 (pop @POST_INIT)->(0) while @POST_INIT; 3717 cf::_post_init 0;
3559 }; 3718 };
3560 3719
3720 cf::object::thawer::errors_are_fatal 0;
3721 info "parse errors in files are no longer fatal from this point on.\n";
3722
3723 AE::postpone {
3724 undef &main; # free gobs of memory :)
3725 };
3726
3561 main_loop; 3727 goto &main_loop;
3562} 3728}
3563 3729
3564############################################################################# 3730#############################################################################
3565# initialisation and cleanup 3731# initialisation and cleanup
3566 3732
3567# install some emergency cleanup handlers 3733# install some emergency cleanup handlers
3568BEGIN { 3734BEGIN {
3569 our %SIGWATCHER = (); 3735 our %SIGWATCHER = ();
3570 for my $signal (qw(INT HUP TERM)) { 3736 for my $signal (qw(INT HUP TERM)) {
3571 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3737 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3572 cf::cleanup "SIG$signal"; 3738 cf::cleanup "SIG$signal";
3573 }; 3739 };
3574 } 3740 }
3575} 3741}
3576 3742
3577sub write_runtime_sync { 3743sub write_runtime_sync {
3578 my $t0 = EV::time; 3744 my $t0 = AE::time;
3579 3745
3580 # first touch the runtime file to show we are still running: 3746 # first touch the runtime file to show we are still running:
3581 # the fsync below can take a very very long time. 3747 # the fsync below can take a very very long time.
3582 3748
3583 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3749 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
… …
3605 or return; 3771 or return;
3606 3772
3607 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3773 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3608 and return; 3774 and return;
3609 3775
3610 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 3776 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3611 3777
3612 1 3778 1
3613} 3779}
3614 3780
3615our $uuid_lock; 3781our $uuid_lock;
… …
3627 or return; 3793 or return;
3628 3794
3629 my $value = uuid_seq uuid_cur; 3795 my $value = uuid_seq uuid_cur;
3630 3796
3631 unless ($value) { 3797 unless ($value) {
3632 warn "cowardly refusing to write zero uuid value!\n"; 3798 info "cowardly refusing to write zero uuid value!\n";
3633 return; 3799 return;
3634 } 3800 }
3635 3801
3636 my $value = uuid_str $value + $uuid_skip; 3802 my $value = uuid_str $value + $uuid_skip;
3637 $uuid_skip = 0; 3803 $uuid_skip = 0;
… …
3647 or return; 3813 or return;
3648 3814
3649 aio_rename "$uuid~", $uuid 3815 aio_rename "$uuid~", $uuid
3650 and return; 3816 and return;
3651 3817
3652 warn "uuid file written ($value).\n"; 3818 trace "uuid file written ($value).\n";
3653 3819
3654 1 3820 1
3655 3821
3656} 3822}
3657 3823
… …
3663} 3829}
3664 3830
3665sub emergency_save() { 3831sub emergency_save() {
3666 my $freeze_guard = cf::freeze_mainloop; 3832 my $freeze_guard = cf::freeze_mainloop;
3667 3833
3668 warn "emergency_perl_save: enter\n"; 3834 info "emergency_perl_save: enter\n";
3835
3836 # this is a trade-off: we want to be very quick here, so
3837 # save all maps without fsync, and later call a global sync
3838 # (which in turn might be very very slow)
3839 local $USE_FSYNC = 0;
3669 3840
3670 cf::sync_job { 3841 cf::sync_job {
3671 # this is a trade-off: we want to be very quick here, so 3842 cf::write_runtime_sync; # external watchdog should not bark
3672 # save all maps without fsync, and later call a global sync
3673 # (which in turn might be very very slow)
3674 local $USE_FSYNC = 0;
3675 3843
3676 # use a peculiar iteration method to avoid tripping on perl 3844 # use a peculiar iteration method to avoid tripping on perl
3677 # refcount bugs in for. also avoids problems with players 3845 # refcount bugs in for. also avoids problems with players
3678 # and maps saved/destroyed asynchronously. 3846 # and maps saved/destroyed asynchronously.
3679 warn "emergency_perl_save: begin player save\n"; 3847 info "emergency_perl_save: begin player save\n";
3680 for my $login (keys %cf::PLAYER) { 3848 for my $login (keys %cf::PLAYER) {
3681 my $pl = $cf::PLAYER{$login} or next; 3849 my $pl = $cf::PLAYER{$login} or next;
3682 $pl->valid or next; 3850 $pl->valid or next;
3683 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3851 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3684 $pl->save; 3852 $pl->save;
3685 } 3853 }
3686 warn "emergency_perl_save: end player save\n"; 3854 info "emergency_perl_save: end player save\n";
3687 3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3688 warn "emergency_perl_save: begin map save\n"; 3858 info "emergency_perl_save: begin map save\n";
3689 for my $path (keys %cf::MAP) { 3859 for my $path (keys %cf::MAP) {
3690 my $map = $cf::MAP{$path} or next; 3860 my $map = $cf::MAP{$path} or next;
3691 $map->valid or next; 3861 $map->valid or next;
3692 $map->save; 3862 $map->save;
3693 } 3863 }
3694 warn "emergency_perl_save: end map save\n"; 3864 info "emergency_perl_save: end map save\n";
3695 3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3696 warn "emergency_perl_save: begin database checkpoint\n"; 3868 info "emergency_perl_save: begin database checkpoint\n";
3697 BDB::db_env_txn_checkpoint $DB_ENV; 3869 BDB::db_env_txn_checkpoint $DB_ENV;
3698 warn "emergency_perl_save: end database checkpoint\n"; 3870 info "emergency_perl_save: end database checkpoint\n";
3699 3871
3700 warn "emergency_perl_save: begin write uuid\n"; 3872 info "emergency_perl_save: begin write uuid\n";
3701 write_uuid_sync 1; 3873 write_uuid_sync 1;
3702 warn "emergency_perl_save: end write uuid\n"; 3874 info "emergency_perl_save: end write uuid\n";
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: syncing database to disk";
3879 BDB::db_env_txn_checkpoint $DB_ENV;
3880
3881 info "emergency_perl_save: starting sync\n";
3882 IO::AIO::aio_sync sub {
3883 info "emergency_perl_save: finished sync\n";
3884 };
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: flushing outstanding aio requests";
3889 while (IO::AIO::nreqs || BDB::nreqs) {
3890 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3891 }
3892
3893 cf::write_runtime_sync; # external watchdog should not bark
3703 }; 3894 };
3704 3895
3705 warn "emergency_perl_save: starting sync()\n";
3706 IO::AIO::aio_sync sub {
3707 warn "emergency_perl_save: finished sync()\n";
3708 };
3709
3710 warn "emergency_perl_save: leave\n"; 3896 info "emergency_perl_save: leave\n";
3711} 3897}
3712 3898
3713sub post_cleanup { 3899sub post_cleanup {
3714 my ($make_core) = @_; 3900 my ($make_core) = @_;
3715 3901
3902 IO::AIO::flush;
3903
3716 warn Carp::longmess "post_cleanup backtrace" 3904 error Carp::longmess "post_cleanup backtrace"
3717 if $make_core; 3905 if $make_core;
3718 3906
3719 my $fh = pidfile; 3907 my $fh = pidfile;
3720 unlink $PIDFILE if <$fh> == $$; 3908 unlink $PIDFILE if <$fh> == $$;
3721} 3909}
… …
3741 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3929 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3742 for my $name (keys %$leaf_symtab) { 3930 for my $name (keys %$leaf_symtab) {
3743 _gv_clear *{"$pkg$name"}; 3931 _gv_clear *{"$pkg$name"};
3744# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3932# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3745 } 3933 }
3746 warn "cleared package $pkg\n";#d#
3747} 3934}
3748 3935
3749sub do_reload_perl() { 3936sub do_reload_perl() {
3750 # can/must only be called in main 3937 # can/must only be called in main
3751 if ($Coro::current != $Coro::main) { 3938 unless (in_main) {
3752 warn "can only reload from main coroutine"; 3939 error "can only reload from main coroutine";
3753 return; 3940 return;
3754 } 3941 }
3755 3942
3756 return if $RELOAD++; 3943 return if $RELOAD++;
3757 3944
3758 my $t1 = EV::time; 3945 my $t1 = AE::time;
3759 3946
3760 while ($RELOAD) { 3947 while ($RELOAD) {
3761 warn "reloading..."; 3948 cf::get_slot 0.1, -1, "reload_perl";
3949 info "perl_reload: reloading...";
3762 3950
3763 warn "entering sync_job"; 3951 trace "perl_reload: entering sync_job";
3764 3952
3765 cf::sync_job { 3953 cf::sync_job {
3766 cf::write_runtime_sync; # external watchdog should not bark
3767 cf::emergency_save; 3954 #cf::emergency_save;
3768 cf::write_runtime_sync; # external watchdog should not bark
3769 3955
3770 warn "syncing database to disk";
3771 BDB::db_env_txn_checkpoint $DB_ENV;
3772
3773 # if anything goes wrong in here, we should simply crash as we already saved
3774
3775 warn "flushing outstanding aio requests";
3776 while (IO::AIO::nreqs || BDB::nreqs) {
3777 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3778 }
3779
3780 warn "cancelling all extension coros"; 3956 trace "perl_reload: cancelling all extension coros";
3781 $_->cancel for values %EXT_CORO; 3957 $_->cancel for values %EXT_CORO;
3782 %EXT_CORO = (); 3958 %EXT_CORO = ();
3783 3959
3784 warn "removing commands"; 3960 trace "perl_reload: removing commands";
3785 %COMMAND = (); 3961 %COMMAND = ();
3786 3962
3787 warn "removing ext/exti commands"; 3963 trace "perl_reload: removing ext/exti commands";
3788 %EXTCMD = (); 3964 %EXTCMD = ();
3789 %EXTICMD = (); 3965 %EXTICMD = ();
3790 3966
3791 warn "unloading/nuking all extensions"; 3967 trace "perl_reload: unloading/nuking all extensions";
3792 for my $pkg (@EXTS) { 3968 for my $pkg (@EXTS) {
3793 warn "... unloading $pkg"; 3969 trace "... unloading $pkg";
3794 3970
3795 if (my $cb = $pkg->can ("unload")) { 3971 if (my $cb = $pkg->can ("unload")) {
3796 eval { 3972 eval {
3797 $cb->($pkg); 3973 $cb->($pkg);
3798 1 3974 1
3799 } or warn "$pkg unloaded, but with errors: $@"; 3975 } or error "$pkg unloaded, but with errors: $@";
3800 } 3976 }
3801 3977
3802 warn "... clearing $pkg"; 3978 trace "... clearing $pkg";
3803 clear_package $pkg; 3979 clear_package $pkg;
3804 } 3980 }
3805 3981
3806 warn "unloading all perl modules loaded from $LIBDIR"; 3982 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3807 while (my ($k, $v) = each %INC) { 3983 while (my ($k, $v) = each %INC) {
3808 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3984 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3809 3985
3810 warn "... unloading $k"; 3986 trace "... unloading $k";
3811 delete $INC{$k}; 3987 delete $INC{$k};
3812 3988
3813 $k =~ s/\.pm$//; 3989 $k =~ s/\.pm$//;
3814 $k =~ s/\//::/g; 3990 $k =~ s/\//::/g;
3815 3991
… …
3818 } 3994 }
3819 3995
3820 clear_package $k; 3996 clear_package $k;
3821 } 3997 }
3822 3998
3823 warn "getting rid of safe::, as good as possible"; 3999 trace "perl_reload: getting rid of safe::, as good as possible";
3824 clear_package "safe::$_" 4000 clear_package "safe::$_"
3825 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4001 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3826 4002
3827 warn "unloading cf.pm \"a bit\""; 4003 trace "perl_reload: unloading cf.pm \"a bit\"";
3828 delete $INC{"cf.pm"}; 4004 delete $INC{"cf.pm"};
3829 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4005 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3830 4006
3831 # don't, removes xs symbols, too, 4007 # don't, removes xs symbols, too,
3832 # and global variables created in xs 4008 # and global variables created in xs
3833 #clear_package __PACKAGE__; 4009 #clear_package __PACKAGE__;
3834 4010
3835 warn "unload completed, starting to reload now"; 4011 info "perl_reload: unload completed, starting to reload now";
3836 4012
3837 warn "reloading cf.pm"; 4013 trace "perl_reload: reloading cf.pm";
3838 require cf; 4014 require cf;
3839 cf::_connect_to_perl_1; 4015 cf::_connect_to_perl_1;
3840 4016
3841 warn "loading config and database again"; 4017 trace "perl_reload: loading config and database again";
3842 cf::reload_config; 4018 cf::reload_config;
3843 4019
3844 warn "loading extensions"; 4020 trace "perl_reload: loading extensions";
3845 cf::load_extensions; 4021 cf::load_extensions;
3846 4022
3847 if ($REATTACH_ON_RELOAD) { 4023 if ($REATTACH_ON_RELOAD) {
3848 warn "reattaching attachments to objects/players"; 4024 trace "perl_reload: reattaching attachments to objects/players";
3849 _global_reattach; # objects, sockets 4025 _global_reattach; # objects, sockets
3850 warn "reattaching attachments to maps"; 4026 trace "perl_reload: reattaching attachments to maps";
3851 reattach $_ for values %MAP; 4027 reattach $_ for values %MAP;
3852 warn "reattaching attachments to players"; 4028 trace "perl_reload: reattaching attachments to players";
3853 reattach $_ for values %PLAYER; 4029 reattach $_ for values %PLAYER;
3854 } 4030 }
3855 4031
3856 warn "running post_init jobs"; 4032 cf::_post_init 1;
3857 (pop @POST_INIT)->(1) while @POST_INIT;
3858 4033
3859 warn "leaving sync_job"; 4034 trace "perl_reload: leaving sync_job";
3860 4035
3861 1 4036 1
3862 } or do { 4037 } or do {
3863 warn $@; 4038 error $@;
3864 cf::cleanup "error while reloading, exiting."; 4039 cf::cleanup "perl_reload: error, exiting.";
3865 }; 4040 };
3866 4041
3867 warn "reloaded";
3868 --$RELOAD; 4042 --$RELOAD;
3869 } 4043 }
3870 4044
3871 $t1 = EV::time - $t1; 4045 $t1 = AE::time - $t1;
3872 warn "reload completed in ${t1}s\n"; 4046 info "perl_reload: completed in ${t1}s\n";
3873}; 4047};
3874 4048
3875our $RELOAD_WATCHER; # used only during reload 4049our $RELOAD_WATCHER; # used only during reload
3876 4050
3877sub reload_perl() { 4051sub reload_perl() {
… …
3879 # coro crashes during coro_state_free->destroy here. 4053 # coro crashes during coro_state_free->destroy here.
3880 4054
3881 $RELOAD_WATCHER ||= cf::async { 4055 $RELOAD_WATCHER ||= cf::async {
3882 Coro::AIO::aio_wait cache_extensions; 4056 Coro::AIO::aio_wait cache_extensions;
3883 4057
3884 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4058 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3885 do_reload_perl; 4059 do_reload_perl;
3886 undef $RELOAD_WATCHER; 4060 undef $RELOAD_WATCHER;
3887 }; 4061 };
3888 }; 4062 };
3889} 4063}
… …
3898 reload_perl; 4072 reload_perl;
3899 }; 4073 };
3900 } 4074 }
3901}; 4075};
3902 4076
3903unshift @INC, $LIBDIR; 4077#############################################################################
3904 4078
3905my $bug_warning = 0; 4079my $bug_warning = 0;
3906 4080
3907our @WAIT_FOR_TICK;
3908our @WAIT_FOR_TICK_BEGIN;
3909
3910sub wait_for_tick { 4081sub wait_for_tick() {
3911 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4082 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3912 4083
3913 my $signal = new Coro::Signal; 4084 $WAIT_FOR_TICK->wait;
3914 push @WAIT_FOR_TICK, $signal;
3915 $signal->wait;
3916} 4085}
3917 4086
3918sub wait_for_tick_begin { 4087sub wait_for_tick_begin() {
3919 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4088 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3920 4089
3921 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
3922 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
3923 $signal->wait; 4092 $signal->wait;
3924} 4093}
… …
3928 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4097 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3929 unless ++$bug_warning > 10; 4098 unless ++$bug_warning > 10;
3930 return; 4099 return;
3931 } 4100 }
3932 4101
3933 cf::server_tick; # one server iteration 4102 cf::one_tick; # one server iteration
3934 4103
3935 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4104 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3936 4105
3937 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4106 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3938 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3939 Coro::async_pool { 4108 Coro::async_pool {
3940 $Coro::current->{desc} = "runtime saver"; 4109 $Coro::current->{desc} = "runtime saver";
3941 write_runtime_sync 4110 write_runtime_sync
3942 or warn "ERROR: unable to write runtime file: $!"; 4111 or error "ERROR: unable to write runtime file: $!";
3943 }; 4112 };
3944 } 4113 }
3945 4114
3946 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3947 $sig->send; 4116 $sig->send;
3948 } 4117 }
3949 while (my $sig = shift @WAIT_FOR_TICK) { 4118 $WAIT_FOR_TICK->broadcast;
3950 $sig->send;
3951 }
3952 4119
3953 $LOAD = ($NOW - $TICK_START) / $TICK; 4120 $LOAD = ($NOW - $TICK_START) / $TICK;
3954 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4121 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3955 4122
3956 if (0) { 4123 if (0) {
3957 if ($NEXT_TICK) { 4124 if ($NEXT_TICK) {
3958 my $jitter = $TICK_START - $NEXT_TICK; 4125 my $jitter = $TICK_START - $NEXT_TICK;
3959 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4126 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3960 warn "jitter $JITTER\n";#d# 4127 debug "jitter $JITTER\n";#d#
3961 } 4128 }
3962 } 4129 }
3963} 4130}
3964 4131
3965{ 4132{
3966 # configure BDB 4133 # configure BDB
3967 4134
3968 BDB::min_parallel 16; 4135 BDB::min_parallel 16;
3969 BDB::max_poll_reqs $TICK * 0.1; 4136 BDB::max_poll_reqs $TICK * 0.1;
3970 $AnyEvent::BDB::WATCHER->priority (1); 4137 #$AnyEvent::BDB::WATCHER->priority (1);
3971 4138
3972 unless ($DB_ENV) { 4139 unless ($DB_ENV) {
3973 $DB_ENV = BDB::db_env_create; 4140 $DB_ENV = BDB::db_env_create;
3974 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4141 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3975 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4142 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4010 IO::AIO::min_parallel 8; 4177 IO::AIO::min_parallel 8;
4011 IO::AIO::max_poll_time $TICK * 0.1; 4178 IO::AIO::max_poll_time $TICK * 0.1;
4012 undef $AnyEvent::AIO::WATCHER; 4179 undef $AnyEvent::AIO::WATCHER;
4013} 4180}
4014 4181
4015my $_log_backtrace; 4182our $_log_backtrace;
4183our $_log_backtrace_last;
4016 4184
4017sub _log_backtrace { 4185sub _log_backtrace {
4018 my ($msg, @addr) = @_; 4186 my ($msg, @addr) = @_;
4019 4187
4020 $msg =~ s/\n//; 4188 $msg =~ s/\n$//;
4021 4189
4190 if ($_log_backtrace_last eq $msg) {
4191 LOG llevInfo, "[ABT] $msg\n";
4192 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4022 # limit the # of concurrent backtraces 4193 # limit the # of concurrent backtraces
4023 if ($_log_backtrace < 2) { 4194 } elsif ($_log_backtrace < 2) {
4195 $_log_backtrace_last = $msg;
4024 ++$_log_backtrace; 4196 ++$_log_backtrace;
4025 my $perl_bt = Carp::longmess $msg; 4197 my $perl_bt = Carp::longmess $msg;
4026 async { 4198 async {
4027 $Coro::current->{desc} = "abt $msg"; 4199 $Coro::current->{desc} = "abt $msg";
4028 4200
… …
4048 LOG llevInfo, "[ABT] $_\n" for @bt; 4220 LOG llevInfo, "[ABT] $_\n" for @bt;
4049 --$_log_backtrace; 4221 --$_log_backtrace;
4050 }; 4222 };
4051 } else { 4223 } else {
4052 LOG llevInfo, "[ABT] $msg\n"; 4224 LOG llevInfo, "[ABT] $msg\n";
4053 LOG llevInfo, "[ABT] [suppressed]\n"; 4225 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4054 } 4226 }
4055} 4227}
4056 4228
4057# load additional modules 4229# load additional modules
4058require "cf/$_.pm" for @EXTRA_MODULES; 4230require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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