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.509 by root, Mon Apr 5 03:22:25 2010 UTC vs.
Revision 1.579 by root, Wed Jan 4 03:22:28 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 = 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
… …
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}, $rmp->{miningstyle},
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;
2250
2251 1
2096} 2252}
2097 2253
2098# customize the map for a given player, i.e. 2254# customize the map for a given player, i.e.
2099# return the _real_ map. used by e.g. per-player 2255# return the _real_ map. used by e.g. per-player
2100# maps to change the path to ~playername/mappath 2256# maps to change the path to ~playername/mappath
… …
2108# if $self->per_party; 2264# if $self->per_party;
2109 2265
2110 $self 2266 $self
2111} 2267}
2112 2268
2113# find and load all maps in the 3x3 area around a map
2114sub load_neighbours {
2115 my ($map) = @_;
2116
2117 my @neigh; # diagonal neighbours
2118
2119 for (0 .. 3) {
2120 my $neigh = $map->tile_path ($_)
2121 or next;
2122 $neigh = find $neigh, $map
2123 or next;
2124 $neigh->load;
2125
2126 push @neigh,
2127 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2128 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2129 }
2130
2131 for (grep defined $_->[0], @neigh) {
2132 my ($path, $origin) = @$_;
2133 my $neigh = find $path, $origin
2134 or next;
2135 $neigh->load;
2136 }
2137}
2138
2139sub find_sync { 2269sub find_sync {
2140 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2141 2271
2142 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
2143} 2277}
2144 2278
2145sub do_load_sync { 2279sub do_load_sync {
2146 my ($map) = @_; 2280 my ($map) = @_;
2147 2281
2282 # it's a bug to call this from the main context
2148 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2149 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2150 2285
2151 cf::sync_job { $map->load }; 2286 $map->load;
2152} 2287}
2153 2288
2154our %MAP_PREFETCH; 2289our %MAP_PREFETCH;
2155our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2156 2291
2157sub find_async { 2292sub find_async {
2158 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2159 2294
2160 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2161 2296
2162 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2163 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2164 } 2299 }
2165 2300
2166 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2167 2302
2168 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
… …
2182 $MAP_PREFETCHER->prio (6); 2317 $MAP_PREFETCHER->prio (6);
2183 2318
2184 () 2319 ()
2185} 2320}
2186 2321
2322# common code, used by both ->save and ->swapout
2187sub save { 2323sub _save {
2188 my ($self) = @_; 2324 my ($self) = @_;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2325
2192 $self->{last_save} = $cf::RUNTIME; 2326 $self->{last_save} = $cf::RUNTIME;
2193 2327
2194 return unless $self->dirty; 2328 return unless $self->dirty;
2195 2329
… …
2215 } else { 2349 } else {
2216 $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);
2217 } 2351 }
2218} 2352}
2219 2353
2354sub save {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 $self->_save;
2360}
2361
2220sub swap_out { 2362sub swap_out {
2221 my ($self) = @_; 2363 my ($self) = @_;
2222 2364
2223 # save first because save cedes
2224 $self->save;
2225
2226 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227 2366
2367 return if !$self->linkable;
2368 return if $self->{deny_save};
2228 return if $self->players; 2369 return if $self->players;
2229 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
2230 return if $self->{deny_save}; 2387 return 1e99 if $self->{deny_reset};
2231 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
2232 $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};
2233 2421
2234 $self->deactivate; 2422 $self->deactivate;
2235 $_->clear_links_to ($self) for values %cf::MAP; 2423 $_->clear_links_to ($self) for values %cf::MAP;
2236 $self->clear; 2424 $self->clear;
2237}
2238
2239sub reset_at {
2240 my ($self) = @_;
2241
2242 # TODO: safety, remove and allow resettable per-player maps
2243 return 1e99 if $self->{deny_reset};
2244
2245 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2246 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2247
2248 $time + $to
2249}
2250
2251sub should_reset {
2252 my ($self) = @_;
2253
2254 $self->reset_at <= $cf::RUNTIME
2255}
2256
2257sub reset {
2258 my ($self) = @_;
2259
2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261
2262 return if $self->players;
2263
2264 warn "resetting map ", $self->path, "\n";
2265
2266 $self->in_memory (cf::MAP_SWAPPED);
2267
2268 # need to save uniques path
2269 unless ($self->{deny_save}) {
2270 my $uniq = $self->uniq_path; utf8::encode $uniq;
2271
2272 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2273 if $uniq;
2274 }
2275
2276 delete $cf::MAP{$self->path};
2277
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->clear;
2281 2425
2282 $self->unlink_save; 2426 $self->unlink_save;
2283 $self->destroy; 2427 $self->destroy;
2284} 2428}
2285 2429
… …
2293 2437
2294 delete $cf::MAP{$self->path}; 2438 delete $cf::MAP{$self->path};
2295 2439
2296 $self->unlink_save; 2440 $self->unlink_save;
2297 2441
2298 bless $self, "cf::map"; 2442 bless $self, "cf::map::wrap";
2299 delete $self->{deny_reset}; 2443 delete $self->{deny_reset};
2300 $self->{deny_save} = 1; 2444 $self->{deny_save} = 1;
2301 $self->reset_timeout (1); 2445 $self->reset_timeout (1);
2302 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2446 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2303 2447
… …
2533 2677
2534Freezes 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}>).
2535 2679
2536The 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.
2537for 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,
2538though, 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
2539map. 2683map.
2540 2684
2541Will never block. 2685Will never block.
2542 2686
2543=item $player_object->leave_link ($map, $x, $y) 2687=item $player_object->leave_link ($map, $x, $y)
… …
2564sub cf::object::player::enter_link { 2708sub cf::object::player::enter_link {
2565 my ($self) = @_; 2709 my ($self) = @_;
2566 2710
2567 $self->deactivate_recursive; 2711 $self->deactivate_recursive;
2568 2712
2713 ++$self->{_link_recursion};
2714
2569 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2715 return if UNIVERSAL::isa $self->map, "ext::map_link";
2570 2716
2571 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2572 if $self->map && $self->map->{path} ne "{link}"; 2718 if $self->map && $self->map->{path} ne "{link}";
2573 2719
2574 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2720 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2575} 2721}
2576 2722
2577sub cf::object::player::leave_link { 2723sub cf::object::player::leave_link {
2578 my ($self, $map, $x, $y) = @_; 2724 my ($self, $map, $x, $y) = @_;
2579 2725
… …
2599 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2600 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2601 if $x <= 0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2602 2748
2603 $map->load; 2749 $map->load;
2604 $map->load_neighbours;
2605 2750
2606 return unless $self->contr->active; 2751 return unless $self->contr->active;
2607 2752
2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2610 2755 # entering was successful
2756 delete $self->{_link_recursion};
2611 # only activate afterwards, to support waiting in hooks 2757 # only activate afterwards, to support waiting in hooks
2612 $self->activate_recursive; 2758 $self->activate_recursive;
2613} 2759 }
2614 2760
2761}
2762
2615=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)]])
2616 2764
2617Moves 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
2618her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2619that 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
2620the 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
… …
2627 2775
2628our $GOTOGEN; 2776our $GOTOGEN;
2629 2777
2630sub cf::object::player::goto { 2778sub cf::object::player::goto {
2631 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 }
2632 2786
2633 # 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
2634 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2635 2789
2636 $self->enter_link; 2790 $self->enter_link;
… …
2656 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2657 } 2811 }
2658 } 2812 }
2659 2813
2660 my $map = eval { 2814 my $map = eval {
2661 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2662 2816
2663 if ($map) { 2817 if ($map) {
2664 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2665 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2666 } else { 2820 } else {
2667 $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);
2668 } 2822 }
2669 2823
2670 $map 2824 $map
… …
2678 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2679 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2680 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2681 } 2835 }
2682 2836
2683 $done->() if $done; 2837 $done->($self) if $done;
2684 })->prio (1); 2838 })->prio (1);
2685} 2839}
2686 2840
2687=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2688 2842
… …
2756 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2757 2911
2758 unless (eval { 2912 unless (eval {
2759 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2760 2914
2761 # random map handling
2762 {
2763 my $guard = cf::lock_acquire "exit_prepare:$exit";
2764
2765 prepare_random_map $exit
2766 if $exit->slaying eq "/!";
2767 }
2768
2769 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2770 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2771 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 }
2772 2941
2773 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2774 2943
2775 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2776 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
… …
2781 $self->message ("Something went wrong deep within the deliantra server. " 2950 $self->message ("Something went wrong deep within the deliantra server. "
2782 . "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. "
2783 . "Please report this to the dungeon master!", 2952 . "Please report this to the dungeon master!",
2784 cf::NDI_UNIQUE | cf::NDI_RED); 2953 cf::NDI_UNIQUE | cf::NDI_RED);
2785 2954
2786 warn "ERROR in enter_exit: $@"; 2955 error "ERROR in enter_exit: $@";
2787 $self->leave_link; 2956 $self->leave_link;
2788 } 2957 }
2789 })->prio (1); 2958 })->prio (1);
2790} 2959}
2791 2960
… …
3018=cut 3187=cut
3019 3188
3020sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
3021 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
3022 3191
3023 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
3024 $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]));
3025 } elsif ($self->extcmd == 1) {
3026 #TODO: version 1, remove
3027 unshift @msg, msgtype => "reply", msgid => $id;
3028 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3029 }
3030} 3195}
3031 3196
3032=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
3033 3198
3034Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
… …
3089 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
3090 3255
3091 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3092 3257
3093 if (ref $msg) { 3258 if (ref $msg) {
3094 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3095 "ARRAY" eq ref $msg
3096 ? @$msg
3097 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3098 3260
3099 my @reply; 3261 my @reply;
3100 3262
3101 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
3102 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
… …
3104 3266
3105 $ns->ext_reply ($reply, @reply) 3267 $ns->ext_reply ($reply, @reply)
3106 if $reply; 3268 if $reply;
3107 3269
3108 } else { 3270 } else {
3109 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";
3110 } 3272 }
3111 3273
3112 cf::override; 3274 cf::override;
3113 }, 3275 },
3114); 3276);
… …
3195 decrease split destroy change_exp value msg lore send_msg)], 3357 decrease split destroy change_exp value msg lore send_msg)],
3196 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
3197 ["cf::player" => qw(peaceful send_msg)], 3359 ["cf::player" => qw(peaceful send_msg)],
3198 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
3199) { 3361) {
3200 no strict 'refs';
3201 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
3202 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3203 for @funs; 3364 for @funs;
3204} 3365}
3205 3366
… …
3244 local @cf::_safe_eval_args = values %vars; 3405 local @cf::_safe_eval_args = values %vars;
3245 @res = wantarray ? eval eval : scalar eval $eval; 3406 @res = wantarray ? eval eval : scalar eval $eval;
3246 } 3407 }
3247 3408
3248 if ($@) { 3409 if ($@) {
3249 warn "$@"; 3410 warn "$@",
3250 warn "while executing safe code '$code'\n"; 3411 "while executing safe code '$code'\n",
3251 warn "with arguments " . (join " ", %vars) . "\n"; 3412 "with arguments " . (join " ", %vars) . "\n";
3252 } 3413 }
3253 3414
3254 wantarray ? @res : $res[0] 3415 wantarray ? @res : $res[0]
3255} 3416}
3256 3417
… …
3290 # for this (global event?) 3451 # for this (global event?)
3291 %ext::player_env::MUSIC_FACE_CACHE = (); 3452 %ext::player_env::MUSIC_FACE_CACHE = ();
3292 3453
3293 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3294 3455
3295 warn "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3296 3457
3297 my $facedata; 3458 my $facedata = decode_storable load_file $path;
3298 0 < aio_load $path, $facedata
3299 or die "$path: $!";
3300
3301 $facedata = Coro::Storable::thaw $facedata;
3302 3459
3303 $facedata->{version} == 2 3460 $facedata->{version} == 2
3304 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3305 3462
3306 # patch in the exptable 3463 # patch in the exptable
… …
3320 3477
3321 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3322 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3323 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3324 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} ;
3325 3483
3326 cf::cede_to_tick; 3484 cf::cede_to_tick;
3327 } 3485 }
3328 3486
3329 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
… …
3334 3492
3335 if (my $smooth = cf::face::find $info->{smooth}) { 3493 if (my $smooth = cf::face::find $info->{smooth}) {
3336 cf::face::set_smooth $idx, $smooth; 3494 cf::face::set_smooth $idx, $smooth;
3337 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3338 } else { 3496 } else {
3339 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3497 error "smooth face '$info->{smooth}' not found for face '$face'";
3340 } 3498 }
3341 3499
3342 cf::cede_to_tick; 3500 cf::cede_to_tick;
3343 } 3501 }
3344 } 3502 }
… …
3356 3514
3357 { 3515 {
3358 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3359 3517
3360 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3361 if (defined $info->{type}) { 3519 if (defined (my $type = $info->{type})) {
3520 # TODO: different hash - must free and use new index, or cache ixface data queue
3362 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3521 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3363 3522
3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3523 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3365 cf::face::set_type $idx, $info->{type}; 3524 cf::face::set_type $idx, $type;
3525 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # any keys left are stashed into meta unless prepended
3366 } else { 3526 } else {
3367 $RESOURCE{$name} = $info; 3527# $RESOURCE{$name} = $info; # unused
3368 } 3528 }
3369 3529
3370 cf::cede_to_tick; 3530 cf::cede_to_tick;
3371 } 3531 }
3372 } 3532 }
3373 3533
3374 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3534 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3375 3535
3376 1 3536 1
3377} 3537}
3378
3379cf::global->attach (on_resource_update => sub {
3380 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3381 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3382
3383 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3384 my $sound = $soundconf->{compat}[$_]
3385 or next;
3386
3387 my $face = cf::face::find "sound/$sound->[1]";
3388 cf::sound::set $sound->[0] => $face;
3389 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3390 }
3391
3392 while (my ($k, $v) = each %{$soundconf->{event}}) {
3393 my $face = cf::face::find "sound/$v";
3394 cf::sound::set $k => $face;
3395 }
3396 }
3397});
3398 3538
3399register_exticmd fx_want => sub { 3539register_exticmd fx_want => sub {
3400 my ($ns, $want) = @_; 3540 my ($ns, $want) = @_;
3401 3541
3402 while (my ($k, $v) = each %$want) { 3542 while (my ($k, $v) = each %$want) {
… …
3441sub reload_treasures { 3581sub reload_treasures {
3442 load_resource_file "$DATADIR/treasures" 3582 load_resource_file "$DATADIR/treasures"
3443 or die "unable to load treasurelists\n"; 3583 or die "unable to load treasurelists\n";
3444} 3584}
3445 3585
3586sub reload_sound {
3587 trace "loading sound config from $DATADIR/sound\n";
3588
3589 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3590
3591 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3592 my $sound = $soundconf->{compat}[$_]
3593 or next;
3594
3595 my $face = cf::face::find "sound/$sound->[1]";
3596 cf::sound::set $sound->[0] => $face;
3597 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3598 }
3599
3600 while (my ($k, $v) = each %{$soundconf->{event}}) {
3601 my $face = cf::face::find "sound/$v";
3602 cf::sound::set $k => $face;
3603 }
3604}
3605
3446sub reload_resources { 3606sub reload_resources {
3447 warn "reloading resource files...\n"; 3607 trace "reloading resource files...\n";
3448 3608
3609 reload_exp_table;
3610 reload_materials;
3449 reload_facedata; 3611 reload_facedata;
3612 reload_sound;
3450 reload_archetypes; 3613 reload_archetypes;
3451 reload_regions; 3614 reload_regions;
3452 reload_treasures; 3615 reload_treasures;
3453 3616
3454 warn "finished reloading resource files\n"; 3617 trace "finished reloading resource files\n";
3455} 3618}
3456 3619
3457sub reload_config { 3620sub reload_config {
3458 warn "reloading config file...\n"; 3621 trace "reloading config file...\n";
3459 3622
3460 open my $fh, "<:utf8", "$CONFDIR/config" 3623 my $config = load_file "$CONFDIR/config";
3461 or return; 3624 utf8::decode $config;
3625 *CFG = decode_yaml $config;
3462 3626
3463 local $/;
3464 *CFG = YAML::XS::Load scalar <$fh>;
3465
3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3627 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3467 3628
3468 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3629 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3469 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3630 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3470 3631
3471 if (exists $CFG{mlockall}) { 3632 if (exists $CFG{mlockall}) {
… …
3473 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3634 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3474 and die "WARNING: m(un)lockall failed: $!\n"; 3635 and die "WARNING: m(un)lockall failed: $!\n";
3475 }; 3636 };
3476 warn $@ if $@; 3637 warn $@ if $@;
3477 } 3638 }
3478
3479 warn "finished reloading resource files\n";
3480} 3639}
3481 3640
3482sub pidfile() { 3641sub pidfile() {
3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3642 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3484 or die "$PIDFILE: $!"; 3643 or die "$PIDFILE: $!";
… …
3497 seek $fh, 0, 0; 3656 seek $fh, 0, 0;
3498 print $fh $$; 3657 print $fh $$;
3499} 3658}
3500 3659
3501sub main_loop { 3660sub main_loop {
3502 warn "EV::loop starting\n"; 3661 trace "EV::loop starting\n";
3503 if (1) { 3662 if (1) {
3504 EV::loop; 3663 EV::loop;
3505 } 3664 }
3506 warn "EV::loop returned\n"; 3665 trace "EV::loop returned\n";
3507 goto &main_loop unless $REALLY_UNLOOP; 3666 goto &main_loop unless $REALLY_UNLOOP;
3508} 3667}
3509 3668
3510sub main { 3669sub main {
3511 cf::init_globals; # initialise logging 3670 cf::init_globals; # initialise logging
3512 3671
3513 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3672 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3514 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3673 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3515 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3674 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3516 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3675 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3517
3518 cf::init_experience;
3519 cf::init_anim;
3520 cf::init_attackmess;
3521 cf::init_dynamic;
3522 3676
3523 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3677 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3524 3678
3525 # we must not ever block the main coroutine 3679 # we must not ever block the main coroutine
3526 local $Coro::idle = sub { 3680 local $Coro::idle = sub {
… …
3532 }; 3686 };
3533 3687
3534 evthread_start IO::AIO::poll_fileno; 3688 evthread_start IO::AIO::poll_fileno;
3535 3689
3536 cf::sync_job { 3690 cf::sync_job {
3691 cf::incloader::init ();
3692
3693 cf::init_anim;
3694 cf::init_attackmess;
3695 cf::init_dynamic;
3696
3537 cf::load_settings; 3697 cf::load_settings;
3538 cf::load_materials;
3539 3698
3540 reload_resources; 3699 reload_resources;
3541 reload_config; 3700 reload_config;
3542 db_init; 3701 db_init;
3543 3702
3544 cf::init_uuid; 3703 cf::init_uuid;
3545 cf::init_signals; 3704 cf::init_signals;
3546 cf::init_commands;
3547 cf::init_skills; 3705 cf::init_skills;
3548 3706
3549 cf::init_beforeplay; 3707 cf::init_beforeplay;
3550 3708
3551 atomic; 3709 atomic;
… …
3556 3714
3557 # no (long-running) fork's whatsoever before this point(!) 3715 # no (long-running) fork's whatsoever before this point(!)
3558 use POSIX (); 3716 use POSIX ();
3559 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3717 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3560 3718
3561 (pop @POST_INIT)->(0) while @POST_INIT; 3719 cf::_post_init 0;
3562 }; 3720 };
3563 3721
3722 cf::object::thawer::errors_are_fatal 0;
3723 info "parse errors in files are no longer fatal from this point on.\n";
3724
3725 AE::postpone {
3726 undef &main; # free gobs of memory :)
3727 };
3728
3564 main_loop; 3729 goto &main_loop;
3565} 3730}
3566 3731
3567############################################################################# 3732#############################################################################
3568# initialisation and cleanup 3733# initialisation and cleanup
3569 3734
3570# install some emergency cleanup handlers 3735# install some emergency cleanup handlers
3571BEGIN { 3736BEGIN {
3572 our %SIGWATCHER = (); 3737 our %SIGWATCHER = ();
3573 for my $signal (qw(INT HUP TERM)) { 3738 for my $signal (qw(INT HUP TERM)) {
3574 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3739 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3575 cf::cleanup "SIG$signal"; 3740 cf::cleanup "SIG$signal";
3576 }; 3741 };
3577 } 3742 }
3578} 3743}
3579 3744
3580sub write_runtime_sync { 3745sub write_runtime_sync {
3581 my $t0 = EV::time; 3746 my $t0 = AE::time;
3582 3747
3583 # first touch the runtime file to show we are still running: 3748 # first touch the runtime file to show we are still running:
3584 # the fsync below can take a very very long time. 3749 # the fsync below can take a very very long time.
3585 3750
3586 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3751 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
… …
3608 or return; 3773 or return;
3609 3774
3610 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3775 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3611 and return; 3776 and return;
3612 3777
3613 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 3778 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3614 3779
3615 1 3780 1
3616} 3781}
3617 3782
3618our $uuid_lock; 3783our $uuid_lock;
… …
3630 or return; 3795 or return;
3631 3796
3632 my $value = uuid_seq uuid_cur; 3797 my $value = uuid_seq uuid_cur;
3633 3798
3634 unless ($value) { 3799 unless ($value) {
3635 warn "cowardly refusing to write zero uuid value!\n"; 3800 info "cowardly refusing to write zero uuid value!\n";
3636 return; 3801 return;
3637 } 3802 }
3638 3803
3639 my $value = uuid_str $value + $uuid_skip; 3804 my $value = uuid_str $value + $uuid_skip;
3640 $uuid_skip = 0; 3805 $uuid_skip = 0;
… …
3650 or return; 3815 or return;
3651 3816
3652 aio_rename "$uuid~", $uuid 3817 aio_rename "$uuid~", $uuid
3653 and return; 3818 and return;
3654 3819
3655 warn "uuid file written ($value).\n"; 3820 trace "uuid file written ($value).\n";
3656 3821
3657 1 3822 1
3658 3823
3659} 3824}
3660 3825
… …
3666} 3831}
3667 3832
3668sub emergency_save() { 3833sub emergency_save() {
3669 my $freeze_guard = cf::freeze_mainloop; 3834 my $freeze_guard = cf::freeze_mainloop;
3670 3835
3671 warn "emergency_perl_save: enter\n"; 3836 info "emergency_perl_save: enter\n";
3837
3838 # this is a trade-off: we want to be very quick here, so
3839 # save all maps without fsync, and later call a global sync
3840 # (which in turn might be very very slow)
3841 local $USE_FSYNC = 0;
3672 3842
3673 cf::sync_job { 3843 cf::sync_job {
3674 # this is a trade-off: we want to be very quick here, so 3844 cf::write_runtime_sync; # external watchdog should not bark
3675 # save all maps without fsync, and later call a global sync
3676 # (which in turn might be very very slow)
3677 local $USE_FSYNC = 0;
3678 3845
3679 # use a peculiar iteration method to avoid tripping on perl 3846 # use a peculiar iteration method to avoid tripping on perl
3680 # refcount bugs in for. also avoids problems with players 3847 # refcount bugs in for. also avoids problems with players
3681 # and maps saved/destroyed asynchronously. 3848 # and maps saved/destroyed asynchronously.
3682 warn "emergency_perl_save: begin player save\n"; 3849 info "emergency_perl_save: begin player save\n";
3683 for my $login (keys %cf::PLAYER) { 3850 for my $login (keys %cf::PLAYER) {
3684 my $pl = $cf::PLAYER{$login} or next; 3851 my $pl = $cf::PLAYER{$login} or next;
3685 $pl->valid or next; 3852 $pl->valid or next;
3686 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3853 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3687 $pl->save; 3854 $pl->save;
3688 } 3855 }
3689 warn "emergency_perl_save: end player save\n"; 3856 info "emergency_perl_save: end player save\n";
3690 3857
3858 cf::write_runtime_sync; # external watchdog should not bark
3859
3691 warn "emergency_perl_save: begin map save\n"; 3860 info "emergency_perl_save: begin map save\n";
3692 for my $path (keys %cf::MAP) { 3861 for my $path (keys %cf::MAP) {
3693 my $map = $cf::MAP{$path} or next; 3862 my $map = $cf::MAP{$path} or next;
3694 $map->valid or next; 3863 $map->valid or next;
3695 $map->save; 3864 $map->save;
3696 } 3865 }
3697 warn "emergency_perl_save: end map save\n"; 3866 info "emergency_perl_save: end map save\n";
3698 3867
3868 cf::write_runtime_sync; # external watchdog should not bark
3869
3699 warn "emergency_perl_save: begin database checkpoint\n"; 3870 info "emergency_perl_save: begin database checkpoint\n";
3700 BDB::db_env_txn_checkpoint $DB_ENV; 3871 BDB::db_env_txn_checkpoint $DB_ENV;
3701 warn "emergency_perl_save: end database checkpoint\n"; 3872 info "emergency_perl_save: end database checkpoint\n";
3702 3873
3703 warn "emergency_perl_save: begin write uuid\n"; 3874 info "emergency_perl_save: begin write uuid\n";
3704 write_uuid_sync 1; 3875 write_uuid_sync 1;
3705 warn "emergency_perl_save: end write uuid\n"; 3876 info "emergency_perl_save: end write uuid\n";
3877
3878 cf::write_runtime_sync; # external watchdog should not bark
3879
3880 trace "emergency_perl_save: syncing database to disk";
3881 BDB::db_env_txn_checkpoint $DB_ENV;
3882
3883 info "emergency_perl_save: starting sync\n";
3884 IO::AIO::aio_sync sub {
3885 info "emergency_perl_save: finished sync\n";
3886 };
3887
3888 cf::write_runtime_sync; # external watchdog should not bark
3889
3890 trace "emergency_perl_save: flushing outstanding aio requests";
3891 while (IO::AIO::nreqs || BDB::nreqs) {
3892 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3893 }
3894
3895 cf::write_runtime_sync; # external watchdog should not bark
3706 }; 3896 };
3707 3897
3708 warn "emergency_perl_save: starting sync()\n";
3709 IO::AIO::aio_sync sub {
3710 warn "emergency_perl_save: finished sync()\n";
3711 };
3712
3713 warn "emergency_perl_save: leave\n"; 3898 info "emergency_perl_save: leave\n";
3714} 3899}
3715 3900
3716sub post_cleanup { 3901sub post_cleanup {
3717 my ($make_core) = @_; 3902 my ($make_core) = @_;
3718 3903
3904 IO::AIO::flush;
3905
3719 warn Carp::longmess "post_cleanup backtrace" 3906 error Carp::longmess "post_cleanup backtrace"
3720 if $make_core; 3907 if $make_core;
3721 3908
3722 my $fh = pidfile; 3909 my $fh = pidfile;
3723 unlink $PIDFILE if <$fh> == $$; 3910 unlink $PIDFILE if <$fh> == $$;
3724} 3911}
… …
3744 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3931 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3745 for my $name (keys %$leaf_symtab) { 3932 for my $name (keys %$leaf_symtab) {
3746 _gv_clear *{"$pkg$name"}; 3933 _gv_clear *{"$pkg$name"};
3747# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3934# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3748 } 3935 }
3749 warn "cleared package $pkg\n";#d#
3750} 3936}
3751 3937
3752sub do_reload_perl() { 3938sub do_reload_perl() {
3753 # can/must only be called in main 3939 # can/must only be called in main
3754 if ($Coro::current != $Coro::main) { 3940 unless (in_main) {
3755 warn "can only reload from main coroutine"; 3941 error "can only reload from main coroutine";
3756 return; 3942 return;
3757 } 3943 }
3758 3944
3759 return if $RELOAD++; 3945 return if $RELOAD++;
3760 3946
3761 my $t1 = EV::time; 3947 my $t1 = AE::time;
3762 3948
3763 while ($RELOAD) { 3949 while ($RELOAD) {
3764 warn "reloading..."; 3950 cf::get_slot 0.1, -1, "reload_perl";
3951 info "perl_reload: reloading...";
3765 3952
3766 warn "entering sync_job"; 3953 trace "perl_reload: entering sync_job";
3767 3954
3768 cf::sync_job { 3955 cf::sync_job {
3769 cf::write_runtime_sync; # external watchdog should not bark
3770 cf::emergency_save; 3956 #cf::emergency_save;
3771 cf::write_runtime_sync; # external watchdog should not bark
3772 3957
3773 warn "syncing database to disk";
3774 BDB::db_env_txn_checkpoint $DB_ENV;
3775
3776 # if anything goes wrong in here, we should simply crash as we already saved
3777
3778 warn "flushing outstanding aio requests";
3779 while (IO::AIO::nreqs || BDB::nreqs) {
3780 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3781 }
3782
3783 warn "cancelling all extension coros"; 3958 trace "perl_reload: cancelling all extension coros";
3784 $_->cancel for values %EXT_CORO; 3959 $_->cancel for values %EXT_CORO;
3785 %EXT_CORO = (); 3960 %EXT_CORO = ();
3786 3961
3787 warn "removing commands"; 3962 trace "perl_reload: removing commands";
3788 %COMMAND = (); 3963 %COMMAND = ();
3789 3964
3790 warn "removing ext/exti commands"; 3965 trace "perl_reload: removing ext/exti commands";
3791 %EXTCMD = (); 3966 %EXTCMD = ();
3792 %EXTICMD = (); 3967 %EXTICMD = ();
3793 3968
3794 warn "unloading/nuking all extensions"; 3969 trace "perl_reload: unloading/nuking all extensions";
3795 for my $pkg (@EXTS) { 3970 for my $pkg (@EXTS) {
3796 warn "... unloading $pkg"; 3971 trace "... unloading $pkg";
3797 3972
3798 if (my $cb = $pkg->can ("unload")) { 3973 if (my $cb = $pkg->can ("unload")) {
3799 eval { 3974 eval {
3800 $cb->($pkg); 3975 $cb->($pkg);
3801 1 3976 1
3802 } or warn "$pkg unloaded, but with errors: $@"; 3977 } or error "$pkg unloaded, but with errors: $@";
3803 } 3978 }
3804 3979
3805 warn "... clearing $pkg"; 3980 trace "... clearing $pkg";
3806 clear_package $pkg; 3981 clear_package $pkg;
3807 } 3982 }
3808 3983
3809 warn "unloading all perl modules loaded from $LIBDIR"; 3984 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3810 while (my ($k, $v) = each %INC) { 3985 while (my ($k, $v) = each %INC) {
3811 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3986 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3812 3987
3813 warn "... unloading $k"; 3988 trace "... unloading $k";
3814 delete $INC{$k}; 3989 delete $INC{$k};
3815 3990
3816 $k =~ s/\.pm$//; 3991 $k =~ s/\.pm$//;
3817 $k =~ s/\//::/g; 3992 $k =~ s/\//::/g;
3818 3993
… …
3821 } 3996 }
3822 3997
3823 clear_package $k; 3998 clear_package $k;
3824 } 3999 }
3825 4000
3826 warn "getting rid of safe::, as good as possible"; 4001 trace "perl_reload: getting rid of safe::, as good as possible";
3827 clear_package "safe::$_" 4002 clear_package "safe::$_"
3828 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4003 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3829 4004
3830 warn "unloading cf.pm \"a bit\""; 4005 trace "perl_reload: unloading cf.pm \"a bit\"";
3831 delete $INC{"cf.pm"}; 4006 delete $INC{"cf.pm"};
3832 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4007 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3833 4008
3834 # don't, removes xs symbols, too, 4009 # don't, removes xs symbols, too,
3835 # and global variables created in xs 4010 # and global variables created in xs
3836 #clear_package __PACKAGE__; 4011 #clear_package __PACKAGE__;
3837 4012
3838 warn "unload completed, starting to reload now"; 4013 info "perl_reload: unload completed, starting to reload now";
3839 4014
3840 warn "reloading cf.pm"; 4015 trace "perl_reload: reloading cf.pm";
3841 require cf; 4016 require cf;
3842 cf::_connect_to_perl_1; 4017 cf::_connect_to_perl_1;
3843 4018
3844 warn "loading config and database again"; 4019 trace "perl_reload: loading config and database again";
3845 cf::reload_config; 4020 cf::reload_config;
3846 4021
3847 warn "loading extensions"; 4022 trace "perl_reload: loading extensions";
3848 cf::load_extensions; 4023 cf::load_extensions;
3849 4024
3850 if ($REATTACH_ON_RELOAD) { 4025 if ($REATTACH_ON_RELOAD) {
3851 warn "reattaching attachments to objects/players"; 4026 trace "perl_reload: reattaching attachments to objects/players";
3852 _global_reattach; # objects, sockets 4027 _global_reattach; # objects, sockets
3853 warn "reattaching attachments to maps"; 4028 trace "perl_reload: reattaching attachments to maps";
3854 reattach $_ for values %MAP; 4029 reattach $_ for values %MAP;
3855 warn "reattaching attachments to players"; 4030 trace "perl_reload: reattaching attachments to players";
3856 reattach $_ for values %PLAYER; 4031 reattach $_ for values %PLAYER;
3857 } 4032 }
3858 4033
3859 warn "running post_init jobs"; 4034 cf::_post_init 1;
3860 (pop @POST_INIT)->(1) while @POST_INIT;
3861 4035
3862 warn "leaving sync_job"; 4036 trace "perl_reload: leaving sync_job";
3863 4037
3864 1 4038 1
3865 } or do { 4039 } or do {
3866 warn $@; 4040 error $@;
3867 cf::cleanup "error while reloading, exiting."; 4041 cf::cleanup "perl_reload: error, exiting.";
3868 }; 4042 };
3869 4043
3870 warn "reloaded";
3871 --$RELOAD; 4044 --$RELOAD;
3872 } 4045 }
3873 4046
3874 $t1 = EV::time - $t1; 4047 $t1 = AE::time - $t1;
3875 warn "reload completed in ${t1}s\n"; 4048 info "perl_reload: completed in ${t1}s\n";
3876}; 4049};
3877 4050
3878our $RELOAD_WATCHER; # used only during reload 4051our $RELOAD_WATCHER; # used only during reload
3879 4052
3880sub reload_perl() { 4053sub reload_perl() {
… …
3882 # coro crashes during coro_state_free->destroy here. 4055 # coro crashes during coro_state_free->destroy here.
3883 4056
3884 $RELOAD_WATCHER ||= cf::async { 4057 $RELOAD_WATCHER ||= cf::async {
3885 Coro::AIO::aio_wait cache_extensions; 4058 Coro::AIO::aio_wait cache_extensions;
3886 4059
3887 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4060 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3888 do_reload_perl; 4061 do_reload_perl;
3889 undef $RELOAD_WATCHER; 4062 undef $RELOAD_WATCHER;
3890 }; 4063 };
3891 }; 4064 };
3892} 4065}
… …
3901 reload_perl; 4074 reload_perl;
3902 }; 4075 };
3903 } 4076 }
3904}; 4077};
3905 4078
3906unshift @INC, $LIBDIR; 4079#############################################################################
3907 4080
3908my $bug_warning = 0; 4081my $bug_warning = 0;
3909 4082
3910our @WAIT_FOR_TICK;
3911our @WAIT_FOR_TICK_BEGIN;
3912
3913sub wait_for_tick { 4083sub wait_for_tick() {
3914 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4084 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3915 4085
3916 my $signal = new Coro::Signal; 4086 $WAIT_FOR_TICK->wait;
3917 push @WAIT_FOR_TICK, $signal;
3918 $signal->wait;
3919} 4087}
3920 4088
3921sub wait_for_tick_begin { 4089sub wait_for_tick_begin() {
3922 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4090 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3923 4091
3924 my $signal = new Coro::Signal; 4092 my $signal = new Coro::Signal;
3925 push @WAIT_FOR_TICK_BEGIN, $signal; 4093 push @WAIT_FOR_TICK_BEGIN, $signal;
3926 $signal->wait; 4094 $signal->wait;
3927} 4095}
… …
3931 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4099 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3932 unless ++$bug_warning > 10; 4100 unless ++$bug_warning > 10;
3933 return; 4101 return;
3934 } 4102 }
3935 4103
3936 cf::server_tick; # one server iteration 4104 cf::one_tick; # one server iteration
3937 4105
3938 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4106 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3939 4107
3940 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4108 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3941 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4109 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3942 Coro::async_pool { 4110 Coro::async_pool {
3943 $Coro::current->{desc} = "runtime saver"; 4111 $Coro::current->{desc} = "runtime saver";
3944 write_runtime_sync 4112 write_runtime_sync
3945 or warn "ERROR: unable to write runtime file: $!"; 4113 or error "ERROR: unable to write runtime file: $!";
3946 }; 4114 };
3947 } 4115 }
3948 4116
3949 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4117 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3950 $sig->send; 4118 $sig->send;
3951 } 4119 }
3952 while (my $sig = shift @WAIT_FOR_TICK) { 4120 $WAIT_FOR_TICK->broadcast;
3953 $sig->send;
3954 }
3955 4121
3956 $LOAD = ($NOW - $TICK_START) / $TICK; 4122 $LOAD = ($NOW - $TICK_START) / $TICK;
3957 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3958 4124
3959 if (0) { 4125 if (0) {
3960 if ($NEXT_TICK) { 4126 if ($NEXT_TICK) {
3961 my $jitter = $TICK_START - $NEXT_TICK; 4127 my $jitter = $TICK_START - $NEXT_TICK;
3962 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4128 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3963 warn "jitter $JITTER\n";#d# 4129 debug "jitter $JITTER\n";#d#
3964 } 4130 }
3965 } 4131 }
3966} 4132}
3967 4133
3968{ 4134{
3969 # configure BDB 4135 # configure BDB
3970 4136
3971 BDB::min_parallel 16; 4137 BDB::min_parallel 16;
3972 BDB::max_poll_reqs $TICK * 0.1; 4138 BDB::max_poll_reqs $TICK * 0.1;
3973 $AnyEvent::BDB::WATCHER->priority (1); 4139 #$AnyEvent::BDB::WATCHER->priority (1);
3974 4140
3975 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
3976 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
3977 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3978 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4144 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4013 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
4014 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
4015 undef $AnyEvent::AIO::WATCHER; 4181 undef $AnyEvent::AIO::WATCHER;
4016} 4182}
4017 4183
4018my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
4019 4186
4020sub _log_backtrace { 4187sub _log_backtrace {
4021 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
4022 4189
4023 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
4024 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4025 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
4026 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
4027 ++$_log_backtrace; 4198 ++$_log_backtrace;
4028 my $perl_bt = Carp::longmess $msg; 4199 my $perl_bt = Carp::longmess $msg;
4029 async { 4200 async {
4030 $Coro::current->{desc} = "abt $msg"; 4201 $Coro::current->{desc} = "abt $msg";
4031 4202
… …
4051 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
4052 --$_log_backtrace; 4223 --$_log_backtrace;
4053 }; 4224 };
4054 } else { 4225 } else {
4055 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
4056 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4057 } 4228 }
4058} 4229}
4059 4230
4060# load additional modules 4231# load additional modules
4061require "cf/$_.pm" for @EXTRA_MODULES; 4232require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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