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.513 by root, Mon Apr 12 05:22:38 2010 UTC vs.
Revision 1.570 by root, Wed May 4 07:41:14 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
… …
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 112
111our %RESOURCE; 113our %RESOURCE; # unused
112 114
113our $OUTPUT_RATE_MIN = 4000; 115our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 100000; 116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
115 120
116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118our $NEXT_TICK; 123our $NEXT_TICK;
119our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
121our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
122our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
123our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
124our $DB_ENV; 129our $DB_ENV;
125 130
126our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
127 132
128our %CFG; 133our %CFG;
129 134
130our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 136our $RUNTIME;
… …
165 170
166our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
167 172
168sub cf::map::normalise; 173sub cf::map::normalise;
169 174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
170############################################################################# 179#############################################################################
171 180
172%REFLECT = (); 181%REFLECT = ();
173for (@REFLECT) { 182for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_; 183 my $reflect = JSON::XS::decode_json $_;
… …
226from wherever your confdir points to. 235from wherever your confdir points to.
227 236
228=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
229 238
230These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
231returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
232per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
233 247
234=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
235 249
236This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
245 259
246=back 260=back
247 261
248=cut 262=cut
249 263
264sub error(@) { LOG llevError, join "", @_ }
265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
250$Coro::State::WARNHOOK = sub { 270$Coro::State::WARNHOOK = sub {
251 my $msg = join "", @_; 271 my $msg = join "", @_;
252 272
253 $msg .= "\n" 273 $msg .= "\n"
254 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
255 275
256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
257 277
258 LOG llevError, $msg; 278 LOG llevWarn, $msg;
259}; 279};
260 280
261$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
262 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
263 283
264 warn Carp::longmess $_[0]; 284 error Carp::longmess $_[0];
265 285
266 if ($Coro::current == $Coro::main) {#d# 286 if (in_main) {#d#
267 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
268 return;#d# 288 return;#d#
269 }#d# 289 }#d#
270 290
271 # kill coroutine otherwise 291 # kill coroutine otherwise
272 Coro::terminate 292 Coro::terminate
… …
294} 314}
295 315
296$EV::DIED = sub { 316$EV::DIED = sub {
297 Carp::cluck "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
298}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
299 324
300############################################################################# 325#############################################################################
301 326
302=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
303 328
… …
324 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
325 $d 350 $d
326 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
327} 352}
328 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
329=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
330 369
331Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
332 371
333=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
… …
339our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
340 379
341sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
342sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
343 382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
344=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
345 415
346Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
348 418
349The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
350is a reload or not. 420is a reload or not.
351 421
352=cut 422=cut
353 423
354sub post_init(&) { 424sub post_init(&) {
355 push @POST_INIT, shift; 425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
356} 443}
357 444
358=item cf::lock_wait $string 445=item cf::lock_wait $string
359 446
360Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
… …
399} 486}
400 487
401=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
402 489
403Like EV::periodic, but randomly selects a starting point so that the actions 490Like EV::periodic, but randomly selects a starting point so that the actions
404get spread over timer. 491get spread over time.
405 492
406=cut 493=cut
407 494
408sub periodic($$) { 495sub periodic($$) {
409 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
… …
413 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
414} 501}
415 502
416=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
417 504
418Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
419This call blocks and returns only when you have at least C<$time> seconds 506(default: 0): This call blocks and returns only when you have at least
420of cpu time till the next tick. The slot is only valid till the next cede. 507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
421 512
422The optional C<$name> can be used to identify the job to run. It might be 513The optional C<$name> can be used to identify the job to run. It might be
423used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
424 515
425Useful for short background jobs. 516Useful for short background jobs.
… …
505=cut 596=cut
506 597
507sub sync_job(&) { 598sub sync_job(&) {
508 my ($job) = @_; 599 my ($job) = @_;
509 600
510 if ($Coro::current == $Coro::main) { 601 if (in_main) {
511 my $time = AE::time; 602 my $time = AE::time;
512 603
513 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
514 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
515 606
516 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
517 608
518 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
519 610
520 my $busy = 1; 611 my $busy = 1;
521 my @res; 612 my @res;
522 613
523 (async { 614 (async {
524 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
525 @res = eval { $job->() }; 616 @res = eval { $job->() };
526 warn $@ if $@; 617 error $@ if $@;
527 undef $busy; 618 undef $busy;
528 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
529 620
530 while ($busy) { 621 while ($busy) {
531 if (Coro::nready) { 622 if (Coro::nready) {
… …
565 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
566 657
567 $coro 658 $coro
568} 659}
569 660
570=item fork_call { }, $args 661=item fork_call { }, @args
571 662
572Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
573process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
574Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
575never block itself or use any form of event handling. 666never block itself or use any form of event handling.
576 667
577=cut 668=cut
578 669
670sub post_fork {
671 reset_signals;
672}
673
579sub fork_call(&@) { 674sub fork_call(&@) {
580 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
581 676
582 # we seemingly have to make a local copy of the whole thing, 677 # we seemingly have to make a local copy of the whole thing,
583 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
584 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
585 680
586 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
587 reset_signals; 682 cf::post_fork;
588 &$cb 683 &$cb
589 }, @args; 684 } @args;
590 685
591 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
687}
688
689sub objinfo {
690 (
691 "counter value" => cf::object::object_count,
692 "objects created" => cf::object::create_count,
693 "objects destroyed" => cf::object::destroy_count,
694 "freelist size" => cf::object::free_count,
695 "allocated objects" => cf::object::objects_size,
696 "active objects" => cf::object::actives_size,
697 )
592} 698}
593 699
594=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
595 701
596=cut 702=cut
… …
633within each server. 739within each server.
634 740
635=cut 741=cut
636 742
637sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
638 my ($name) = @_; 747 my ($name) = @_;
639 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
640 749
641 eval { 750 eval {
642 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
… …
652} 761}
653 762
654our $DB; 763our $DB;
655 764
656sub db_init { 765sub db_init {
657 cf::sync_job {
658 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
659 };
660} 767}
661 768
662sub db_get($$) { 769sub db_get($$) {
663 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
664 771
665 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
666 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
667 776
668 $! ? () 777 $! ? ()
669 : $data 778 : $data
670 }
671} 779}
672 780
673sub db_put($$$) { 781sub db_put($$$) {
674 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
675 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
703 811
704 my @data; 812 my @data;
705 my $md5; 813 my $md5;
706 814
707 for (0 .. $#$src) { 815 for (0 .. $#$src) {
708 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
709 or Carp::croak "$src->[$_]: $!";
710 } 817 }
711 818
712 # if processing is expensive, check 819 # if processing is expensive, check
713 # checksum first 820 # checksum first
714 if (1) { 821 if (1) {
… …
731 838
732 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
733 my $data = $process->(\@data); 840 my $data = $process->(\@data);
734 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
735 842
736 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
737 844
738 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
739 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
740 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
741 848
… …
751 858
752=cut 859=cut
753 860
754sub datalog($@) { 861sub datalog($@) {
755 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
756 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
757} 864}
758 865
759=back 866=back
760 867
761=cut 868=cut
… …
956 1063
957 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
958 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
959 1066
960 } elsif (ref $type) { 1067 } elsif (ref $type) {
961 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
962 1069
963 } else { 1070 } else {
964 shift @arg; 1071 shift @arg;
965 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
966 } 1073 }
967 } 1074 }
968} 1075}
969 1076
970sub _object_attach { 1077sub _object_attach {
… …
980 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
981 } 1088 }
982 1089
983 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
984 } else { 1091 } else {
985 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
986 } 1093 }
987 1094
988 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
989} 1096}
990 1097
… …
1049 1156
1050 for (@$callbacks) { 1157 for (@$callbacks) {
1051 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1052 1159
1053 if ($@) { 1160 if ($@) {
1054 warn "$@";
1055 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1056 override; 1162 override;
1057 } 1163 }
1058 1164
1059 return 1 if $override; 1165 return 1 if $override;
1060 } 1166 }
… …
1139 for (@$attach) { 1245 for (@$attach) {
1140 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1141 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1142 } 1248 }
1143 } else { 1249 } else {
1144 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1145 } 1251 }
1146 } 1252 }
1147} 1253}
1148 1254
1149cf::attachable->attach ( 1255cf::attachable->attach (
… …
1176 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1177 1283
1178 sync_job { 1284 sync_job {
1179 if (length $$rdata) { 1285 if (length $$rdata) {
1180 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1181 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1182 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1183 1290
1184 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1185 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1186 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1187 if ($cf::USE_FSYNC) { 1294 if ($cf::USE_FSYNC) {
… …
1209 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1210 1317
1211 $filename =~ s%/[^/]+$%%; 1318 $filename =~ s%/[^/]+$%%;
1212 aio_pathsync $filename if $cf::USE_FSYNC; 1319 aio_pathsync $filename if $cf::USE_FSYNC;
1213 } else { 1320 } else {
1214 warn "unable to save objects: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1215 } 1322 }
1216 } else { 1323 } else {
1217 aio_unlink $filename; 1324 aio_unlink $filename;
1218 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1219 } 1326 }
… …
1243 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1244 $av = $st->{objs}; 1351 $av = $st->{objs};
1245 } 1352 }
1246 1353
1247 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1248 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1249 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1250 1358
1251 ($data, $av) 1359 ($data, $av)
1252} 1360}
1253 1361
1254=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
… …
1346 1454
1347 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1348 if $reply; 1456 if $reply;
1349 1457
1350 } else { 1458 } else {
1351 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1352 } 1460 }
1353 1461
1354 cf::override; 1462 cf::override;
1355 }, 1463 },
1356); 1464);
… …
1367 1475
1368 $grp 1476 $grp
1369} 1477}
1370 1478
1371sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1372 cf::sync_job { 1482 cf::sync_job {
1373 my %todo; 1483 my %todo;
1374 1484
1375 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1376 next unless -r $path; 1486 next unless -r $path;
… …
1394 1504
1395 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1396 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1397 1507
1398 $ext{source} = 1508 $ext{source} =
1399 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1400 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1401 . $source 1511 . $source
1402 . "\n};\n1"; 1512 . "\n};\n1";
1403 1513
1404 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
… …
1416 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1417 next ext 1527 next ext
1418 unless exists $done{$_}; 1528 unless exists $done{$_};
1419 } 1529 }
1420 1530
1421 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1422 1532
1423 my $active = eval $v->{source}; 1533 my $active = eval $v->{source};
1424 1534
1425 if (length $@) { 1535 if (length $@) {
1426 warn "$v->{path}: $@\n"; 1536 error "$v->{path}: $@\n";
1427 1537
1428 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1429 if exists $v->{meta}{mandatory}; 1539 if exists $v->{meta}{mandatory};
1540
1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1542 delete $todo{$k};
1430 } else { 1543 } else {
1431 $done{$k} = delete $todo{$k}; 1544 $done{$k} = delete $todo{$k};
1432 push @EXTS, $v->{pkg}; 1545 push @EXTS, $v->{pkg};
1433 $progress = 1; 1546 $progress = 1;
1434 1547
1435 warn "$v->{base}: extension inactive.\n" 1548 info "$v->{base}: extension inactive.\n"
1436 unless $active; 1549 unless $active;
1437 } 1550 }
1438 } 1551 }
1439 1552
1440 unless ($progress) { 1553 unless ($progress) {
… …
1442 1555
1443 while (my ($k, $v) = each %todo) { 1556 while (my ($k, $v) = each %todo) {
1444 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1445 if exists $v->{meta}{mandatory}; 1558 if exists $v->{meta}{mandatory};
1446 } 1559 }
1560
1561 last;
1447 } 1562 }
1448 } 1563 }
1449 }; 1564 };
1450} 1565}
1451 1566
… …
1609 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1610 1725
1611 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1612 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1613 1728
1614 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1615 $pl->deactivate; 1730 $pl->deactivate;
1731
1616 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1617 $pl->ob->check_score;
1618 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1619 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1620 1737
1621 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1622 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1623 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
… …
1677 \@logins 1794 \@logins
1678} 1795}
1679 1796
1680=item $player->maps 1797=item $player->maps
1681 1798
1799=item cf::player::maps $login
1800
1682Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1683player. May block. 1802player. May block.
1684 1803
1685=cut 1804=cut
1686 1805
… …
1748=cut 1867=cut
1749 1868
1750sub find_by_path($) { 1869sub find_by_path($) {
1751 my ($path) = @_; 1870 my ($path) = @_;
1752 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1753 my ($match, $specificity); 1874 my ($match, $specificity);
1754 1875
1755 for my $region (list) { 1876 for my $region (list) {
1756 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1757 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
… …
1785sub generate_random_map { 1906sub generate_random_map {
1786 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1787 1908
1788 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1789 1910
1790 # mit "rum" bekleckern, nicht
1791 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1792 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1793 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1794 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1795 $rmp->{exit_on_final_map},
1796 $rmp->{xsize}, $rmp->{ysize},
1797 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1798 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1799 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1800 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1801 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1802 (cf::region::find $rmp->{region}), $rmp->{custom}
1803 )
1804} 1912}
1805 1913
1806=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1807 1915
1808Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
… …
1813 1921
1814sub register { 1922sub register {
1815 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1816 my $pkg = caller; 1924 my $pkg = caller;
1817 1925
1818 no strict;
1819 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1820 1927
1821 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1822} 1929}
1823 1930
1824# also paths starting with '/' 1931# also paths starting with '/'
1825$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1826 1933
1827sub thawer_merge { 1934sub thawer_merge {
1828 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1829 1936
1830 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
… …
1835} 1942}
1836 1943
1837sub normalise { 1944sub normalise {
1838 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1839 1946
1840 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1841 1948
1842 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1843 1950
1844 # map plan: 1951 # map plan:
1845 # 1952 #
… …
1860 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1861 $path = "$base/$path"; 1968 $path = "$base/$path";
1862 } 1969 }
1863 1970
1864 for ($path) { 1971 for ($path) {
1865 redo if s{//}{/};
1866 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1867 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1868 } 1974 }
1869 1975
1870 $path 1976 $path
… …
1884 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1885 return $self; 1991 return $self;
1886 } 1992 }
1887 } 1993 }
1888 1994
1889 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1890 () 1996 ()
1891} 1997}
1892 1998
1999# may re-bless or do other evil things
1893sub init { 2000sub init {
1894 my ($self) = @_; 2001 my ($self) = @_;
1895 2002
1896 $self 2003 $self
1897} 2004}
… …
1962 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
1963 2070
1964 1 2071 1
1965} 2072}
1966 2073
2074# used to laod the header of an original map
1967sub load_header_orig { 2075sub load_header_orig {
1968 my ($self) = @_; 2076 my ($self) = @_;
1969 2077
1970 $self->load_header_from ($self->load_path) 2078 $self->load_header_from ($self->load_path)
1971} 2079}
1972 2080
2081# used to laod the header of an instantiated map
1973sub load_header_temp { 2082sub load_header_temp {
1974 my ($self) = @_; 2083 my ($self) = @_;
1975 2084
1976 $self->load_header_from ($self->save_path) 2085 $self->load_header_from ($self->save_path)
1977} 2086}
1978 2087
2088# called after loading the header from an instantiated map
1979sub prepare_temp { 2089sub prepare_temp {
1980 my ($self) = @_; 2090 my ($self) = @_;
1981 2091
1982 $self->last_access ((delete $self->{last_access}) 2092 $self->last_access ((delete $self->{last_access})
1983 || $cf::RUNTIME); #d# 2093 || $cf::RUNTIME); #d#
1984 # safety 2094 # safety
1985 $self->{instantiate_time} = $cf::RUNTIME 2095 $self->{instantiate_time} = $cf::RUNTIME
1986 if $self->{instantiate_time} > $cf::RUNTIME; 2096 if $self->{instantiate_time} > $cf::RUNTIME;
1987} 2097}
1988 2098
2099# called after loading the header from an original map
1989sub prepare_orig { 2100sub prepare_orig {
1990 my ($self) = @_; 2101 my ($self) = @_;
1991 2102
1992 $self->{load_original} = 1; 2103 $self->{load_original} = 1;
1993 $self->{instantiate_time} = $cf::RUNTIME; 2104 $self->{instantiate_time} = $cf::RUNTIME;
… …
2017 2128
2018sub find; 2129sub find;
2019sub find { 2130sub find {
2020 my ($path, $origin) = @_; 2131 my ($path, $origin) = @_;
2021 2132
2133 cf::cede_to_tick;
2134
2022 $path = normalise $path, $origin && $origin->path; 2135 $path = normalise $path, $origin;
2023 2136
2024 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2137 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2025 my $guard2 = cf::lock_acquire "map_find:$path"; 2138 my $guard2 = cf::lock_acquire "map_find:$path";
2026 2139
2027 $cf::MAP{$path} || do { 2140 $cf::MAP{$path} || do {
… …
2058 2171
2059 { 2172 {
2060 my $guard = cf::lock_acquire "map_data:$path"; 2173 my $guard = cf::lock_acquire "map_data:$path";
2061 2174
2062 return unless $self->valid; 2175 return unless $self->valid;
2063 return unless $self->in_memory == cf::MAP_SWAPPED; 2176 return unless $self->state == cf::MAP_SWAPPED;
2064
2065 $self->in_memory (cf::MAP_LOADING);
2066 2177
2067 $self->alloc; 2178 $self->alloc;
2068 2179
2069 $self->pre_load; 2180 $self->pre_load;
2070 cf::cede_to_tick; 2181 cf::cede_to_tick;
2071 2182
2183 if (exists $self->{load_path}) {
2072 my $f = new_from_file cf::object::thawer $self->{load_path}; 2184 my $f = new_from_file cf::object::thawer $self->{load_path};
2073 $f->skip_block; 2185 $f->skip_block;
2074 $self->_load_objects ($f) 2186 $self->_load_objects ($f)
2075 or return; 2187 or return;
2076 2188
2077 $self->post_load_original 2189 $self->post_load_original
2078 if delete $self->{load_original}; 2190 if delete $self->{load_original};
2079 2191
2080 if (my $uniq = $self->uniq_path) { 2192 if (my $uniq = $self->uniq_path) {
2081 utf8::encode $uniq; 2193 utf8::encode $uniq;
2082 unless (aio_stat $uniq) { 2194 unless (aio_stat $uniq) {
2083 if (my $f = new_from_file cf::object::thawer $uniq) { 2195 if (my $f = new_from_file cf::object::thawer $uniq) {
2084 $self->clear_unique_items; 2196 $self->clear_unique_items;
2085 $self->_load_objects ($f); 2197 $self->_load_objects ($f);
2086 $f->resolve_delayed_derefs; 2198 $f->resolve_delayed_derefs;
2199 }
2087 } 2200 }
2088 } 2201 }
2089 }
2090 2202
2091 $f->resolve_delayed_derefs; 2203 $f->resolve_delayed_derefs;
2204 } else {
2205 $self->post_load_original
2206 if delete $self->{load_original};
2207 }
2208
2209 $self->state (cf::MAP_INACTIVE);
2092 2210
2093 cf::cede_to_tick; 2211 cf::cede_to_tick;
2094 # now do the right thing for maps 2212 # now do the right thing for maps
2095 $self->link_multipart_objects; 2213 $self->link_multipart_objects;
2096 $self->difficulty ($self->estimate_difficulty) 2214 $self->difficulty ($self->estimate_difficulty)
… …
2100 unless ($self->{deny_activate}) { 2218 unless ($self->{deny_activate}) {
2101 $self->decay_objects; 2219 $self->decay_objects;
2102 $self->fix_auto_apply; 2220 $self->fix_auto_apply;
2103 $self->update_buttons; 2221 $self->update_buttons;
2104 cf::cede_to_tick; 2222 cf::cede_to_tick;
2105 $self->activate; 2223 #$self->activate; # no longer activate maps automatically
2106 } 2224 }
2107 2225
2108 $self->{last_save} = $cf::RUNTIME; 2226 $self->{last_save} = $cf::RUNTIME;
2109 $self->last_access ($cf::RUNTIME); 2227 $self->last_access ($cf::RUNTIME);
2110
2111 $self->in_memory (cf::MAP_ACTIVE);
2112 } 2228 }
2113 2229
2114 $self->post_load; 2230 $self->post_load;
2231
2232 1
2115} 2233}
2116 2234
2117# customize the map for a given player, i.e. 2235# customize the map for a given player, i.e.
2118# return the _real_ map. used by e.g. per-player 2236# return the _real_ map. used by e.g. per-player
2119# maps to change the path to ~playername/mappath 2237# maps to change the path to ~playername/mappath
… …
2140 or next; 2258 or next;
2141 $neigh = find $neigh, $map 2259 $neigh = find $neigh, $map
2142 or next; 2260 or next;
2143 $neigh->load; 2261 $neigh->load;
2144 2262
2263 # now find the diagonal neighbours
2145 push @neigh, 2264 push @neigh,
2146 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2265 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2147 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2266 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2148 } 2267 }
2149 2268
… …
2156} 2275}
2157 2276
2158sub find_sync { 2277sub find_sync {
2159 my ($path, $origin) = @_; 2278 my ($path, $origin) = @_;
2160 2279
2161 cf::sync_job { find $path, $origin } 2280 # it's a bug to call this from the main context
2281 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2282 if $Coro::current == $Coro::main;
2283
2284 find $path, $origin
2162} 2285}
2163 2286
2164sub do_load_sync { 2287sub do_load_sync {
2165 my ($map) = @_; 2288 my ($map) = @_;
2166 2289
2290 # it's a bug to call this from the main context
2167 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2291 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2168 if $Coro::current == $Coro::main; 2292 if $Coro::current == $Coro::main;
2169 2293
2170 cf::sync_job { $map->load }; 2294 $map->load;
2171} 2295}
2172 2296
2173our %MAP_PREFETCH; 2297our %MAP_PREFETCH;
2174our $MAP_PREFETCHER = undef; 2298our $MAP_PREFETCHER = undef;
2175 2299
2176sub find_async { 2300sub find_async {
2177 my ($path, $origin, $load) = @_; 2301 my ($path, $origin, $load) = @_;
2178 2302
2179 $path = normalise $path, $origin && $origin->{path}; 2303 $path = normalise $path, $origin;
2180 2304
2181 if (my $map = $cf::MAP{$path}) { 2305 if (my $map = $cf::MAP{$path}) {
2182 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2306 return $map if !$load || $map->linkable;
2183 } 2307 }
2184 2308
2185 $MAP_PREFETCH{$path} |= $load; 2309 $MAP_PREFETCH{$path} |= $load;
2186 2310
2187 $MAP_PREFETCHER ||= cf::async { 2311 $MAP_PREFETCHER ||= cf::async {
… …
2201 $MAP_PREFETCHER->prio (6); 2325 $MAP_PREFETCHER->prio (6);
2202 2326
2203 () 2327 ()
2204} 2328}
2205 2329
2330# common code, used by both ->save and ->swapout
2206sub save { 2331sub _save {
2207 my ($self) = @_; 2332 my ($self) = @_;
2208
2209 my $lock = cf::lock_acquire "map_data:$self->{path}";
2210 2333
2211 $self->{last_save} = $cf::RUNTIME; 2334 $self->{last_save} = $cf::RUNTIME;
2212 2335
2213 return unless $self->dirty; 2336 return unless $self->dirty;
2214 2337
… …
2234 } else { 2357 } else {
2235 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2358 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2236 } 2359 }
2237} 2360}
2238 2361
2362sub save {
2363 my ($self) = @_;
2364
2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2366
2367 $self->_save;
2368}
2369
2239sub swap_out { 2370sub swap_out {
2240 my ($self) = @_; 2371 my ($self) = @_;
2241 2372
2242 # save first because save cedes
2243 $self->save;
2244
2245 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2246 2374
2375 return if !$self->linkable;
2376 return if $self->{deny_save};
2247 return if $self->players; 2377 return if $self->players;
2248 return if $self->in_memory != cf::MAP_ACTIVE; 2378
2379 # first deactivate the map and "unlink" it from the core
2380 $self->deactivate;
2381 $_->clear_links_to ($self) for values %cf::MAP;
2382 $self->state (cf::MAP_SWAPPED);
2383
2384 # then atomically save
2385 $self->_save;
2386
2387 # then free the map
2388 $self->clear;
2389}
2390
2391sub reset_at {
2392 my ($self) = @_;
2393
2394 # TODO: safety, remove and allow resettable per-player maps
2249 return if $self->{deny_save}; 2395 return 1e99 if $self->{deny_reset};
2250 2396
2397 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2398 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2399
2400 $time + $to
2401}
2402
2403sub should_reset {
2404 my ($self) = @_;
2405
2406 $self->reset_at <= $cf::RUNTIME
2407}
2408
2409sub reset {
2410 my ($self) = @_;
2411
2412 my $lock = cf::lock_acquire "map_data:$self->{path}";
2413
2414 return if $self->players;
2415
2416 cf::trace "resetting map ", $self->path, "\n";
2417
2251 $self->in_memory (cf::MAP_SWAPPED); 2418 $self->state (cf::MAP_SWAPPED);
2419
2420 # need to save uniques path
2421 unless ($self->{deny_save}) {
2422 my $uniq = $self->uniq_path; utf8::encode $uniq;
2423
2424 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2425 if $uniq;
2426 }
2427
2428 delete $cf::MAP{$self->path};
2252 2429
2253 $self->deactivate; 2430 $self->deactivate;
2254 $_->clear_links_to ($self) for values %cf::MAP; 2431 $_->clear_links_to ($self) for values %cf::MAP;
2255 $self->clear; 2432 $self->clear;
2256}
2257
2258sub reset_at {
2259 my ($self) = @_;
2260
2261 # TODO: safety, remove and allow resettable per-player maps
2262 return 1e99 if $self->{deny_reset};
2263
2264 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2265 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2266
2267 $time + $to
2268}
2269
2270sub should_reset {
2271 my ($self) = @_;
2272
2273 $self->reset_at <= $cf::RUNTIME
2274}
2275
2276sub reset {
2277 my ($self) = @_;
2278
2279 my $lock = cf::lock_acquire "map_data:$self->{path}";
2280
2281 return if $self->players;
2282
2283 warn "resetting map ", $self->path, "\n";
2284
2285 $self->in_memory (cf::MAP_SWAPPED);
2286
2287 # need to save uniques path
2288 unless ($self->{deny_save}) {
2289 my $uniq = $self->uniq_path; utf8::encode $uniq;
2290
2291 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2292 if $uniq;
2293 }
2294
2295 delete $cf::MAP{$self->path};
2296
2297 $self->deactivate;
2298 $_->clear_links_to ($self) for values %cf::MAP;
2299 $self->clear;
2300 2433
2301 $self->unlink_save; 2434 $self->unlink_save;
2302 $self->destroy; 2435 $self->destroy;
2303} 2436}
2304 2437
… …
2312 2445
2313 delete $cf::MAP{$self->path}; 2446 delete $cf::MAP{$self->path};
2314 2447
2315 $self->unlink_save; 2448 $self->unlink_save;
2316 2449
2317 bless $self, "cf::map"; 2450 bless $self, "cf::map::wrap";
2318 delete $self->{deny_reset}; 2451 delete $self->{deny_reset};
2319 $self->{deny_save} = 1; 2452 $self->{deny_save} = 1;
2320 $self->reset_timeout (1); 2453 $self->reset_timeout (1);
2321 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2454 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2322 2455
… …
2552 2685
2553Freezes the player and moves him/her to a special map (C<{link}>). 2686Freezes the player and moves him/her to a special map (C<{link}>).
2554 2687
2555The player should be reasonably safe there for short amounts of time (e.g. 2688The player should be reasonably safe there for short amounts of time (e.g.
2556for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2689for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2557though, as the palyer cannot control the character while it is on the link 2690though, as the player cannot control the character while it is on the link
2558map. 2691map.
2559 2692
2560Will never block. 2693Will never block.
2561 2694
2562=item $player_object->leave_link ($map, $x, $y) 2695=item $player_object->leave_link ($map, $x, $y)
… …
2583sub cf::object::player::enter_link { 2716sub cf::object::player::enter_link {
2584 my ($self) = @_; 2717 my ($self) = @_;
2585 2718
2586 $self->deactivate_recursive; 2719 $self->deactivate_recursive;
2587 2720
2721 ++$self->{_link_recursion};
2722
2588 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2723 return if UNIVERSAL::isa $self->map, "ext::map_link";
2589 2724
2590 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2725 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2591 if $self->map && $self->map->{path} ne "{link}"; 2726 if $self->map && $self->map->{path} ne "{link}";
2592 2727
2593 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2728 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2594} 2729}
2595 2730
2596sub cf::object::player::leave_link { 2731sub cf::object::player::leave_link {
2597 my ($self, $map, $x, $y) = @_; 2732 my ($self, $map, $x, $y) = @_;
2598 2733
… …
2623 $map->load_neighbours; 2758 $map->load_neighbours;
2624 2759
2625 return unless $self->contr->active; 2760 return unless $self->contr->active;
2626 2761
2627 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2762 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2628 $self->enter_map ($map, $x, $y); 2763 if ($self->enter_map ($map, $x, $y)) {
2629 2764 # entering was successful
2765 delete $self->{_link_recursion};
2630 # only activate afterwards, to support waiting in hooks 2766 # only activate afterwards, to support waiting in hooks
2631 $self->activate_recursive; 2767 $self->activate_recursive;
2632} 2768 }
2633 2769
2770}
2771
2634=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2772=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2635 2773
2636Moves the player to the given map-path and coordinates by first freezing 2774Moves the player to the given map-path and coordinates by first freezing
2637her, loading and preparing them map, calling the provided $check callback 2775her, loading and preparing them map, calling the provided $check callback
2638that has to return the map if sucecssful, and then unfreezes the player on 2776that has to return the map if sucecssful, and then unfreezes the player on
2639the new (success) or old (failed) map position. In either case, $done will 2777the new (success) or old (failed) map position. In either case, $done will
… …
2646 2784
2647our $GOTOGEN; 2785our $GOTOGEN;
2648 2786
2649sub cf::object::player::goto { 2787sub cf::object::player::goto {
2650 my ($self, $path, $x, $y, $check, $done) = @_; 2788 my ($self, $path, $x, $y, $check, $done) = @_;
2789
2790 if ($self->{_link_recursion} >= $MAX_LINKS) {
2791 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2792 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2793 ($path, $x, $y) = @$EMERGENCY_POSITION;
2794 }
2651 2795
2652 # do generation counting so two concurrent goto's will be executed in-order 2796 # do generation counting so two concurrent goto's will be executed in-order
2653 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2797 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2654 2798
2655 $self->enter_link; 2799 $self->enter_link;
… …
2675 ($path, $x, $y) = (undef, undef, undef); 2819 ($path, $x, $y) = (undef, undef, undef);
2676 } 2820 }
2677 } 2821 }
2678 2822
2679 my $map = eval { 2823 my $map = eval {
2680 my $map = defined $path ? cf::map::find $path : undef; 2824 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2681 2825
2682 if ($map) { 2826 if ($map) {
2683 $map = $map->customise_for ($self); 2827 $map = $map->customise_for ($self);
2684 $map = $check->($map) if $check && $map; 2828 $map = $check->($map, $x, $y, $self) if $check && $map;
2685 } else { 2829 } else {
2686 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2830 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2687 } 2831 }
2688 2832
2689 $map 2833 $map
… …
2697 if ($gen == $self->{_goto_generation}) { 2841 if ($gen == $self->{_goto_generation}) {
2698 delete $self->{_goto_generation}; 2842 delete $self->{_goto_generation};
2699 $self->leave_link ($map, $x, $y); 2843 $self->leave_link ($map, $x, $y);
2700 } 2844 }
2701 2845
2702 $done->() if $done; 2846 $done->($self) if $done;
2703 })->prio (1); 2847 })->prio (1);
2704} 2848}
2705 2849
2706=item $player_object->enter_exit ($exit_object) 2850=item $player_object->enter_exit ($exit_object)
2707 2851
… …
2775 $Coro::current->{desc} = "enter_exit"; 2919 $Coro::current->{desc} = "enter_exit";
2776 2920
2777 unless (eval { 2921 unless (eval {
2778 $self->deactivate_recursive; # just to be sure 2922 $self->deactivate_recursive; # just to be sure
2779 2923
2780 # random map handling
2781 {
2782 my $guard = cf::lock_acquire "exit_prepare:$exit";
2783
2784 prepare_random_map $exit
2785 if $exit->slaying eq "/!";
2786 }
2787
2788 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2924 my $map = cf::map::normalise $exit->slaying, $exit->map;
2789 my $x = $exit->stats->hp; 2925 my $x = $exit->stats->hp;
2790 my $y = $exit->stats->sp; 2926 my $y = $exit->stats->sp;
2927
2928 # special map handling
2929 my $slaying = $exit->slaying;
2930
2931 # special map handling
2932 if ($slaying eq "/!") {
2933 my $guard = cf::lock_acquire "exit_prepare:$exit";
2934
2935 prepare_random_map $exit
2936 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2937
2938 $map = $exit->slaying;
2939
2940 } elsif ($slaying eq '!up') {
2941 $map = $exit->map->tile_path (cf::TILE_UP);
2942 $x = $exit->x;
2943 $y = $exit->y;
2944
2945 } elsif ($slaying eq '!down') {
2946 $map = $exit->map->tile_path (cf::TILE_DOWN);
2947 $x = $exit->x;
2948 $y = $exit->y;
2949 }
2791 2950
2792 $self->goto ($map, $x, $y); 2951 $self->goto ($map, $x, $y);
2793 2952
2794 # if exit is damned, update players death & WoR home-position 2953 # if exit is damned, update players death & WoR home-position
2795 $self->contr->savebed ($map, $x, $y) 2954 $self->contr->savebed ($map, $x, $y)
… …
2800 $self->message ("Something went wrong deep within the deliantra server. " 2959 $self->message ("Something went wrong deep within the deliantra server. "
2801 . "I'll try to bring you back to the map you were before. " 2960 . "I'll try to bring you back to the map you were before. "
2802 . "Please report this to the dungeon master!", 2961 . "Please report this to the dungeon master!",
2803 cf::NDI_UNIQUE | cf::NDI_RED); 2962 cf::NDI_UNIQUE | cf::NDI_RED);
2804 2963
2805 warn "ERROR in enter_exit: $@"; 2964 error "ERROR in enter_exit: $@";
2806 $self->leave_link; 2965 $self->leave_link;
2807 } 2966 }
2808 })->prio (1); 2967 })->prio (1);
2809} 2968}
2810 2969
… …
3123 3282
3124 $ns->ext_reply ($reply, @reply) 3283 $ns->ext_reply ($reply, @reply)
3125 if $reply; 3284 if $reply;
3126 3285
3127 } else { 3286 } else {
3128 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3287 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3129 } 3288 }
3130 3289
3131 cf::override; 3290 cf::override;
3132 }, 3291 },
3133); 3292);
… …
3214 decrease split destroy change_exp value msg lore send_msg)], 3373 decrease split destroy change_exp value msg lore send_msg)],
3215 ["cf::object::player" => qw(player)], 3374 ["cf::object::player" => qw(player)],
3216 ["cf::player" => qw(peaceful send_msg)], 3375 ["cf::player" => qw(peaceful send_msg)],
3217 ["cf::map" => qw(trigger)], 3376 ["cf::map" => qw(trigger)],
3218) { 3377) {
3219 no strict 'refs';
3220 my ($pkg, @funs) = @$_; 3378 my ($pkg, @funs) = @$_;
3221 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3379 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3222 for @funs; 3380 for @funs;
3223} 3381}
3224 3382
… …
3263 local @cf::_safe_eval_args = values %vars; 3421 local @cf::_safe_eval_args = values %vars;
3264 @res = wantarray ? eval eval : scalar eval $eval; 3422 @res = wantarray ? eval eval : scalar eval $eval;
3265 } 3423 }
3266 3424
3267 if ($@) { 3425 if ($@) {
3268 warn "$@"; 3426 warn "$@",
3269 warn "while executing safe code '$code'\n"; 3427 "while executing safe code '$code'\n",
3270 warn "with arguments " . (join " ", %vars) . "\n"; 3428 "with arguments " . (join " ", %vars) . "\n";
3271 } 3429 }
3272 3430
3273 wantarray ? @res : $res[0] 3431 wantarray ? @res : $res[0]
3274} 3432}
3275 3433
… …
3309 # for this (global event?) 3467 # for this (global event?)
3310 %ext::player_env::MUSIC_FACE_CACHE = (); 3468 %ext::player_env::MUSIC_FACE_CACHE = ();
3311 3469
3312 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3470 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3313 3471
3314 warn "loading facedata from $path\n"; 3472 trace "loading facedata from $path\n";
3315 3473
3316 my $facedata; 3474 my $facedata = decode_storable load_file $path;
3317 0 < aio_load $path, $facedata
3318 or die "$path: $!";
3319
3320 $facedata = Coro::Storable::thaw $facedata;
3321 3475
3322 $facedata->{version} == 2 3476 $facedata->{version} == 2
3323 or cf::cleanup "$path: version mismatch, cannot proceed."; 3477 or cf::cleanup "$path: version mismatch, cannot proceed.";
3324 3478
3325 # patch in the exptable 3479 # patch in the exptable
… …
3339 3493
3340 cf::face::set_visibility $idx, $info->{visibility}; 3494 cf::face::set_visibility $idx, $info->{visibility};
3341 cf::face::set_magicmap $idx, $info->{magicmap}; 3495 cf::face::set_magicmap $idx, $info->{magicmap};
3342 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3496 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3343 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3497 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3498 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3344 3499
3345 cf::cede_to_tick; 3500 cf::cede_to_tick;
3346 } 3501 }
3347 3502
3348 while (my ($face, $info) = each %$faces) { 3503 while (my ($face, $info) = each %$faces) {
… …
3353 3508
3354 if (my $smooth = cf::face::find $info->{smooth}) { 3509 if (my $smooth = cf::face::find $info->{smooth}) {
3355 cf::face::set_smooth $idx, $smooth; 3510 cf::face::set_smooth $idx, $smooth;
3356 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3511 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3357 } else { 3512 } else {
3358 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3513 error "smooth face '$info->{smooth}' not found for face '$face'";
3359 } 3514 }
3360 3515
3361 cf::cede_to_tick; 3516 cf::cede_to_tick;
3362 } 3517 }
3363 } 3518 }
… …
3381 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3536 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3382 3537
3383 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3538 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3384 cf::face::set_type $idx, $info->{type}; 3539 cf::face::set_type $idx, $info->{type};
3385 } else { 3540 } else {
3386 $RESOURCE{$name} = $info; 3541 $RESOURCE{$name} = $info; # unused
3387 } 3542 }
3388 3543
3389 cf::cede_to_tick; 3544 cf::cede_to_tick;
3390 } 3545 }
3391 } 3546 }
3392 3547
3393 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3548 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3394 3549
3395 1 3550 1
3396} 3551}
3397
3398cf::global->attach (on_resource_update => sub {
3399 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3400 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3401
3402 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3403 my $sound = $soundconf->{compat}[$_]
3404 or next;
3405
3406 my $face = cf::face::find "sound/$sound->[1]";
3407 cf::sound::set $sound->[0] => $face;
3408 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3409 }
3410
3411 while (my ($k, $v) = each %{$soundconf->{event}}) {
3412 my $face = cf::face::find "sound/$v";
3413 cf::sound::set $k => $face;
3414 }
3415 }
3416});
3417 3552
3418register_exticmd fx_want => sub { 3553register_exticmd fx_want => sub {
3419 my ($ns, $want) = @_; 3554 my ($ns, $want) = @_;
3420 3555
3421 while (my ($k, $v) = each %$want) { 3556 while (my ($k, $v) = each %$want) {
… …
3460sub reload_treasures { 3595sub reload_treasures {
3461 load_resource_file "$DATADIR/treasures" 3596 load_resource_file "$DATADIR/treasures"
3462 or die "unable to load treasurelists\n"; 3597 or die "unable to load treasurelists\n";
3463} 3598}
3464 3599
3600sub reload_sound {
3601 trace "loading sound config from $DATADIR/sound\n";
3602
3603 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3604
3605 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3606 my $sound = $soundconf->{compat}[$_]
3607 or next;
3608
3609 my $face = cf::face::find "sound/$sound->[1]";
3610 cf::sound::set $sound->[0] => $face;
3611 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3612 }
3613
3614 while (my ($k, $v) = each %{$soundconf->{event}}) {
3615 my $face = cf::face::find "sound/$v";
3616 cf::sound::set $k => $face;
3617 }
3618}
3619
3465sub reload_resources { 3620sub reload_resources {
3466 warn "reloading resource files...\n"; 3621 trace "reloading resource files...\n";
3467 3622
3623 reload_exp_table;
3624 reload_materials;
3468 reload_facedata; 3625 reload_facedata;
3626 reload_sound;
3469 reload_archetypes; 3627 reload_archetypes;
3470 reload_regions; 3628 reload_regions;
3471 reload_treasures; 3629 reload_treasures;
3472 3630
3473 warn "finished reloading resource files\n"; 3631 trace "finished reloading resource files\n";
3474} 3632}
3475 3633
3476sub reload_config { 3634sub reload_config {
3477 warn "reloading config file...\n"; 3635 trace "reloading config file...\n";
3478 3636
3479 open my $fh, "<:utf8", "$CONFDIR/config" 3637 my $config = load_file "$CONFDIR/config";
3480 or return; 3638 utf8::decode $config;
3639 *CFG = decode_yaml $config;
3481 3640
3482 local $/;
3483 *CFG = YAML::XS::Load scalar <$fh>;
3484
3485 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3641 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3486 3642
3487 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3643 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3488 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3644 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3489 3645
3490 if (exists $CFG{mlockall}) { 3646 if (exists $CFG{mlockall}) {
… …
3492 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3648 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3493 and die "WARNING: m(un)lockall failed: $!\n"; 3649 and die "WARNING: m(un)lockall failed: $!\n";
3494 }; 3650 };
3495 warn $@ if $@; 3651 warn $@ if $@;
3496 } 3652 }
3497
3498 warn "finished reloading resource files\n";
3499} 3653}
3500 3654
3501sub pidfile() { 3655sub pidfile() {
3502 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3656 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3503 or die "$PIDFILE: $!"; 3657 or die "$PIDFILE: $!";
… …
3516 seek $fh, 0, 0; 3670 seek $fh, 0, 0;
3517 print $fh $$; 3671 print $fh $$;
3518} 3672}
3519 3673
3520sub main_loop { 3674sub main_loop {
3521 warn "EV::loop starting\n"; 3675 trace "EV::loop starting\n";
3522 if (1) { 3676 if (1) {
3523 EV::loop; 3677 EV::loop;
3524 } 3678 }
3525 warn "EV::loop returned\n"; 3679 trace "EV::loop returned\n";
3526 goto &main_loop unless $REALLY_UNLOOP; 3680 goto &main_loop unless $REALLY_UNLOOP;
3527} 3681}
3528 3682
3529sub main { 3683sub main {
3530 cf::init_globals; # initialise logging 3684 cf::init_globals; # initialise logging
3531 3685
3532 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3686 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3533 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3687 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3534 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3688 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3535 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3689 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3536
3537 cf::init_experience;
3538 cf::init_anim;
3539 cf::init_attackmess;
3540 cf::init_dynamic;
3541 3690
3542 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3691 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3543 3692
3544 # we must not ever block the main coroutine 3693 # we must not ever block the main coroutine
3545 local $Coro::idle = sub { 3694 local $Coro::idle = sub {
… …
3551 }; 3700 };
3552 3701
3553 evthread_start IO::AIO::poll_fileno; 3702 evthread_start IO::AIO::poll_fileno;
3554 3703
3555 cf::sync_job { 3704 cf::sync_job {
3705 cf::incloader::init ();
3706
3707 cf::init_anim;
3708 cf::init_attackmess;
3709 cf::init_dynamic;
3710
3556 cf::load_settings; 3711 cf::load_settings;
3557 cf::load_materials;
3558 3712
3559 reload_resources; 3713 reload_resources;
3560 reload_config; 3714 reload_config;
3561 db_init; 3715 db_init;
3562 3716
… …
3574 3728
3575 # no (long-running) fork's whatsoever before this point(!) 3729 # no (long-running) fork's whatsoever before this point(!)
3576 use POSIX (); 3730 use POSIX ();
3577 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3731 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3578 3732
3579 (pop @POST_INIT)->(0) while @POST_INIT; 3733 cf::_post_init 0;
3580 }; 3734 };
3581 3735
3736 cf::object::thawer::errors_are_fatal 0;
3737 info "parse errors in files are no longer fatal from this point on.\n";
3738
3739 my $free_main; $free_main = EV::idle sub {
3740 undef $free_main;
3741 undef &main; # free gobs of memory :)
3742 };
3743
3582 main_loop; 3744 goto &main_loop;
3583} 3745}
3584 3746
3585############################################################################# 3747#############################################################################
3586# initialisation and cleanup 3748# initialisation and cleanup
3587 3749
… …
3626 or return; 3788 or return;
3627 3789
3628 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3790 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3629 and return; 3791 and return;
3630 3792
3631 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3793 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3632 3794
3633 1 3795 1
3634} 3796}
3635 3797
3636our $uuid_lock; 3798our $uuid_lock;
… …
3648 or return; 3810 or return;
3649 3811
3650 my $value = uuid_seq uuid_cur; 3812 my $value = uuid_seq uuid_cur;
3651 3813
3652 unless ($value) { 3814 unless ($value) {
3653 warn "cowardly refusing to write zero uuid value!\n"; 3815 info "cowardly refusing to write zero uuid value!\n";
3654 return; 3816 return;
3655 } 3817 }
3656 3818
3657 my $value = uuid_str $value + $uuid_skip; 3819 my $value = uuid_str $value + $uuid_skip;
3658 $uuid_skip = 0; 3820 $uuid_skip = 0;
… …
3668 or return; 3830 or return;
3669 3831
3670 aio_rename "$uuid~", $uuid 3832 aio_rename "$uuid~", $uuid
3671 and return; 3833 and return;
3672 3834
3673 warn "uuid file written ($value).\n"; 3835 trace "uuid file written ($value).\n";
3674 3836
3675 1 3837 1
3676 3838
3677} 3839}
3678 3840
… …
3684} 3846}
3685 3847
3686sub emergency_save() { 3848sub emergency_save() {
3687 my $freeze_guard = cf::freeze_mainloop; 3849 my $freeze_guard = cf::freeze_mainloop;
3688 3850
3689 warn "emergency_perl_save: enter\n"; 3851 info "emergency_perl_save: enter\n";
3852
3853 # this is a trade-off: we want to be very quick here, so
3854 # save all maps without fsync, and later call a global sync
3855 # (which in turn might be very very slow)
3856 local $USE_FSYNC = 0;
3690 3857
3691 cf::sync_job { 3858 cf::sync_job {
3692 # this is a trade-off: we want to be very quick here, so 3859 cf::write_runtime_sync; # external watchdog should not bark
3693 # save all maps without fsync, and later call a global sync
3694 # (which in turn might be very very slow)
3695 local $USE_FSYNC = 0;
3696 3860
3697 # use a peculiar iteration method to avoid tripping on perl 3861 # use a peculiar iteration method to avoid tripping on perl
3698 # refcount bugs in for. also avoids problems with players 3862 # refcount bugs in for. also avoids problems with players
3699 # and maps saved/destroyed asynchronously. 3863 # and maps saved/destroyed asynchronously.
3700 warn "emergency_perl_save: begin player save\n"; 3864 info "emergency_perl_save: begin player save\n";
3701 for my $login (keys %cf::PLAYER) { 3865 for my $login (keys %cf::PLAYER) {
3702 my $pl = $cf::PLAYER{$login} or next; 3866 my $pl = $cf::PLAYER{$login} or next;
3703 $pl->valid or next; 3867 $pl->valid or next;
3704 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3868 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3705 $pl->save; 3869 $pl->save;
3706 } 3870 }
3707 warn "emergency_perl_save: end player save\n"; 3871 info "emergency_perl_save: end player save\n";
3708 3872
3873 cf::write_runtime_sync; # external watchdog should not bark
3874
3709 warn "emergency_perl_save: begin map save\n"; 3875 info "emergency_perl_save: begin map save\n";
3710 for my $path (keys %cf::MAP) { 3876 for my $path (keys %cf::MAP) {
3711 my $map = $cf::MAP{$path} or next; 3877 my $map = $cf::MAP{$path} or next;
3712 $map->valid or next; 3878 $map->valid or next;
3713 $map->save; 3879 $map->save;
3714 } 3880 }
3715 warn "emergency_perl_save: end map save\n"; 3881 info "emergency_perl_save: end map save\n";
3716 3882
3883 cf::write_runtime_sync; # external watchdog should not bark
3884
3717 warn "emergency_perl_save: begin database checkpoint\n"; 3885 info "emergency_perl_save: begin database checkpoint\n";
3718 BDB::db_env_txn_checkpoint $DB_ENV; 3886 BDB::db_env_txn_checkpoint $DB_ENV;
3719 warn "emergency_perl_save: end database checkpoint\n"; 3887 info "emergency_perl_save: end database checkpoint\n";
3720 3888
3721 warn "emergency_perl_save: begin write uuid\n"; 3889 info "emergency_perl_save: begin write uuid\n";
3722 write_uuid_sync 1; 3890 write_uuid_sync 1;
3723 warn "emergency_perl_save: end write uuid\n"; 3891 info "emergency_perl_save: end write uuid\n";
3892
3893 cf::write_runtime_sync; # external watchdog should not bark
3894
3895 trace "emergency_perl_save: syncing database to disk";
3896 BDB::db_env_txn_checkpoint $DB_ENV;
3897
3898 info "emergency_perl_save: starting sync\n";
3899 IO::AIO::aio_sync sub {
3900 info "emergency_perl_save: finished sync\n";
3901 };
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3904
3905 trace "emergency_perl_save: flushing outstanding aio requests";
3906 while (IO::AIO::nreqs || BDB::nreqs) {
3907 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3908 }
3909
3910 cf::write_runtime_sync; # external watchdog should not bark
3724 }; 3911 };
3725 3912
3726 warn "emergency_perl_save: starting sync()\n";
3727 IO::AIO::aio_sync sub {
3728 warn "emergency_perl_save: finished sync()\n";
3729 };
3730
3731 warn "emergency_perl_save: leave\n"; 3913 info "emergency_perl_save: leave\n";
3732} 3914}
3733 3915
3734sub post_cleanup { 3916sub post_cleanup {
3735 my ($make_core) = @_; 3917 my ($make_core) = @_;
3736 3918
3919 IO::AIO::flush;
3920
3737 warn Carp::longmess "post_cleanup backtrace" 3921 error Carp::longmess "post_cleanup backtrace"
3738 if $make_core; 3922 if $make_core;
3739 3923
3740 my $fh = pidfile; 3924 my $fh = pidfile;
3741 unlink $PIDFILE if <$fh> == $$; 3925 unlink $PIDFILE if <$fh> == $$;
3742} 3926}
… …
3762 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3946 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3763 for my $name (keys %$leaf_symtab) { 3947 for my $name (keys %$leaf_symtab) {
3764 _gv_clear *{"$pkg$name"}; 3948 _gv_clear *{"$pkg$name"};
3765# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3949# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3766 } 3950 }
3767 warn "cleared package $pkg\n";#d#
3768} 3951}
3769 3952
3770sub do_reload_perl() { 3953sub do_reload_perl() {
3771 # can/must only be called in main 3954 # can/must only be called in main
3772 if ($Coro::current != $Coro::main) { 3955 unless (in_main) {
3773 warn "can only reload from main coroutine"; 3956 error "can only reload from main coroutine";
3774 return; 3957 return;
3775 } 3958 }
3776 3959
3777 return if $RELOAD++; 3960 return if $RELOAD++;
3778 3961
3779 my $t1 = AE::time; 3962 my $t1 = AE::time;
3780 3963
3781 while ($RELOAD) { 3964 while ($RELOAD) {
3782 warn "reloading..."; 3965 cf::get_slot 0.1, -1, "reload_perl";
3966 info "perl_reload: reloading...";
3783 3967
3784 warn "entering sync_job"; 3968 trace "perl_reload: entering sync_job";
3785 3969
3786 cf::sync_job { 3970 cf::sync_job {
3787 cf::write_runtime_sync; # external watchdog should not bark
3788 cf::emergency_save; 3971 #cf::emergency_save;
3789 cf::write_runtime_sync; # external watchdog should not bark
3790 3972
3791 warn "syncing database to disk";
3792 BDB::db_env_txn_checkpoint $DB_ENV;
3793
3794 # if anything goes wrong in here, we should simply crash as we already saved
3795
3796 warn "flushing outstanding aio requests";
3797 while (IO::AIO::nreqs || BDB::nreqs) {
3798 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3799 }
3800
3801 warn "cancelling all extension coros"; 3973 trace "perl_reload: cancelling all extension coros";
3802 $_->cancel for values %EXT_CORO; 3974 $_->cancel for values %EXT_CORO;
3803 %EXT_CORO = (); 3975 %EXT_CORO = ();
3804 3976
3805 warn "removing commands"; 3977 trace "perl_reload: removing commands";
3806 %COMMAND = (); 3978 %COMMAND = ();
3807 3979
3808 warn "removing ext/exti commands"; 3980 trace "perl_reload: removing ext/exti commands";
3809 %EXTCMD = (); 3981 %EXTCMD = ();
3810 %EXTICMD = (); 3982 %EXTICMD = ();
3811 3983
3812 warn "unloading/nuking all extensions"; 3984 trace "perl_reload: unloading/nuking all extensions";
3813 for my $pkg (@EXTS) { 3985 for my $pkg (@EXTS) {
3814 warn "... unloading $pkg"; 3986 trace "... unloading $pkg";
3815 3987
3816 if (my $cb = $pkg->can ("unload")) { 3988 if (my $cb = $pkg->can ("unload")) {
3817 eval { 3989 eval {
3818 $cb->($pkg); 3990 $cb->($pkg);
3819 1 3991 1
3820 } or warn "$pkg unloaded, but with errors: $@"; 3992 } or error "$pkg unloaded, but with errors: $@";
3821 } 3993 }
3822 3994
3823 warn "... clearing $pkg"; 3995 trace "... clearing $pkg";
3824 clear_package $pkg; 3996 clear_package $pkg;
3825 } 3997 }
3826 3998
3827 warn "unloading all perl modules loaded from $LIBDIR"; 3999 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3828 while (my ($k, $v) = each %INC) { 4000 while (my ($k, $v) = each %INC) {
3829 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4001 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3830 4002
3831 warn "... unloading $k"; 4003 trace "... unloading $k";
3832 delete $INC{$k}; 4004 delete $INC{$k};
3833 4005
3834 $k =~ s/\.pm$//; 4006 $k =~ s/\.pm$//;
3835 $k =~ s/\//::/g; 4007 $k =~ s/\//::/g;
3836 4008
… …
3839 } 4011 }
3840 4012
3841 clear_package $k; 4013 clear_package $k;
3842 } 4014 }
3843 4015
3844 warn "getting rid of safe::, as good as possible"; 4016 trace "perl_reload: getting rid of safe::, as good as possible";
3845 clear_package "safe::$_" 4017 clear_package "safe::$_"
3846 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4018 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3847 4019
3848 warn "unloading cf.pm \"a bit\""; 4020 trace "perl_reload: unloading cf.pm \"a bit\"";
3849 delete $INC{"cf.pm"}; 4021 delete $INC{"cf.pm"};
3850 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4022 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3851 4023
3852 # don't, removes xs symbols, too, 4024 # don't, removes xs symbols, too,
3853 # and global variables created in xs 4025 # and global variables created in xs
3854 #clear_package __PACKAGE__; 4026 #clear_package __PACKAGE__;
3855 4027
3856 warn "unload completed, starting to reload now"; 4028 info "perl_reload: unload completed, starting to reload now";
3857 4029
3858 warn "reloading cf.pm"; 4030 trace "perl_reload: reloading cf.pm";
3859 require cf; 4031 require cf;
3860 cf::_connect_to_perl_1; 4032 cf::_connect_to_perl_1;
3861 4033
3862 warn "loading config and database again"; 4034 trace "perl_reload: loading config and database again";
3863 cf::reload_config; 4035 cf::reload_config;
3864 4036
3865 warn "loading extensions"; 4037 trace "perl_reload: loading extensions";
3866 cf::load_extensions; 4038 cf::load_extensions;
3867 4039
3868 if ($REATTACH_ON_RELOAD) { 4040 if ($REATTACH_ON_RELOAD) {
3869 warn "reattaching attachments to objects/players"; 4041 trace "perl_reload: reattaching attachments to objects/players";
3870 _global_reattach; # objects, sockets 4042 _global_reattach; # objects, sockets
3871 warn "reattaching attachments to maps"; 4043 trace "perl_reload: reattaching attachments to maps";
3872 reattach $_ for values %MAP; 4044 reattach $_ for values %MAP;
3873 warn "reattaching attachments to players"; 4045 trace "perl_reload: reattaching attachments to players";
3874 reattach $_ for values %PLAYER; 4046 reattach $_ for values %PLAYER;
3875 } 4047 }
3876 4048
3877 warn "running post_init jobs"; 4049 cf::_post_init 1;
3878 (pop @POST_INIT)->(1) while @POST_INIT;
3879 4050
3880 warn "leaving sync_job"; 4051 trace "perl_reload: leaving sync_job";
3881 4052
3882 1 4053 1
3883 } or do { 4054 } or do {
3884 warn $@; 4055 error $@;
3885 cf::cleanup "error while reloading, exiting."; 4056 cf::cleanup "perl_reload: error, exiting.";
3886 }; 4057 };
3887 4058
3888 warn "reloaded";
3889 --$RELOAD; 4059 --$RELOAD;
3890 } 4060 }
3891 4061
3892 $t1 = AE::time - $t1; 4062 $t1 = AE::time - $t1;
3893 warn "reload completed in ${t1}s\n"; 4063 info "perl_reload: completed in ${t1}s\n";
3894}; 4064};
3895 4065
3896our $RELOAD_WATCHER; # used only during reload 4066our $RELOAD_WATCHER; # used only during reload
3897 4067
3898sub reload_perl() { 4068sub reload_perl() {
… …
3919 reload_perl; 4089 reload_perl;
3920 }; 4090 };
3921 } 4091 }
3922}; 4092};
3923 4093
3924unshift @INC, $LIBDIR; 4094#############################################################################
3925 4095
3926my $bug_warning = 0; 4096my $bug_warning = 0;
3927 4097
3928our @WAIT_FOR_TICK; 4098our @WAIT_FOR_TICK;
3929our @WAIT_FOR_TICK_BEGIN; 4099our @WAIT_FOR_TICK_BEGIN;
3930 4100
3931sub wait_for_tick { 4101sub wait_for_tick() {
3932 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3933 4103
3934 my $signal = new Coro::Signal; 4104 my $signal = new Coro::Signal;
3935 push @WAIT_FOR_TICK, $signal; 4105 push @WAIT_FOR_TICK, $signal;
3936 $signal->wait; 4106 $signal->wait;
3937} 4107}
3938 4108
3939sub wait_for_tick_begin { 4109sub wait_for_tick_begin() {
3940 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3941 4111
3942 my $signal = new Coro::Signal; 4112 my $signal = new Coro::Signal;
3943 push @WAIT_FOR_TICK_BEGIN, $signal; 4113 push @WAIT_FOR_TICK_BEGIN, $signal;
3944 $signal->wait; 4114 $signal->wait;
… …
3958 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4128 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3959 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4129 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3960 Coro::async_pool { 4130 Coro::async_pool {
3961 $Coro::current->{desc} = "runtime saver"; 4131 $Coro::current->{desc} = "runtime saver";
3962 write_runtime_sync 4132 write_runtime_sync
3963 or warn "ERROR: unable to write runtime file: $!"; 4133 or error "ERROR: unable to write runtime file: $!";
3964 }; 4134 };
3965 } 4135 }
3966 4136
3967 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3968 $sig->send; 4138 $sig->send;
… …
3976 4146
3977 if (0) { 4147 if (0) {
3978 if ($NEXT_TICK) { 4148 if ($NEXT_TICK) {
3979 my $jitter = $TICK_START - $NEXT_TICK; 4149 my $jitter = $TICK_START - $NEXT_TICK;
3980 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4150 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3981 warn "jitter $JITTER\n";#d# 4151 debug "jitter $JITTER\n";#d#
3982 } 4152 }
3983 } 4153 }
3984} 4154}
3985 4155
3986{ 4156{
… …
4031 IO::AIO::min_parallel 8; 4201 IO::AIO::min_parallel 8;
4032 IO::AIO::max_poll_time $TICK * 0.1; 4202 IO::AIO::max_poll_time $TICK * 0.1;
4033 undef $AnyEvent::AIO::WATCHER; 4203 undef $AnyEvent::AIO::WATCHER;
4034} 4204}
4035 4205
4036my $_log_backtrace; 4206our $_log_backtrace;
4207our $_log_backtrace_last;
4037 4208
4038sub _log_backtrace { 4209sub _log_backtrace {
4039 my ($msg, @addr) = @_; 4210 my ($msg, @addr) = @_;
4040 4211
4041 $msg =~ s/\n//; 4212 $msg =~ s/\n$//;
4042 4213
4214 if ($_log_backtrace_last eq $msg) {
4215 LOG llevInfo, "[ABT] $msg\n";
4216 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4043 # limit the # of concurrent backtraces 4217 # limit the # of concurrent backtraces
4044 if ($_log_backtrace < 2) { 4218 } elsif ($_log_backtrace < 2) {
4219 $_log_backtrace_last = $msg;
4045 ++$_log_backtrace; 4220 ++$_log_backtrace;
4046 my $perl_bt = Carp::longmess $msg; 4221 my $perl_bt = Carp::longmess $msg;
4047 async { 4222 async {
4048 $Coro::current->{desc} = "abt $msg"; 4223 $Coro::current->{desc} = "abt $msg";
4049 4224
… …
4069 LOG llevInfo, "[ABT] $_\n" for @bt; 4244 LOG llevInfo, "[ABT] $_\n" for @bt;
4070 --$_log_backtrace; 4245 --$_log_backtrace;
4071 }; 4246 };
4072 } else { 4247 } else {
4073 LOG llevInfo, "[ABT] $msg\n"; 4248 LOG llevInfo, "[ABT] $msg\n";
4074 LOG llevInfo, "[ABT] [suppressed]\n"; 4249 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4075 } 4250 }
4076} 4251}
4077 4252
4078# load additional modules 4253# load additional modules
4079require "cf/$_.pm" for @EXTRA_MODULES; 4254require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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