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.565 by root, Sat Apr 30 05:41:17 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 #
1847 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1848 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1849 # ?random/... random maps 1956 # ?random/... random maps
1850 # /... normal maps 1957 # /... normal maps
1851 # ~user/... per-player map of a specific user 1958 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1852 1960
1853 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1854 1962
1855 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1856 # something that looks reasonable 1964 # something that looks reasonable
1857 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1858 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 1966 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1859 1967
1860 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1861 $path = "$base/$path"; 1969 $path = "$base/$path";
1970
1971 } elsif ($path eq '!up') {
1972 $base && ref $base
1973 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1974
1975 my $uppth = $base->tile_path (cf::TILE_UP);
1976 $path = $uppth if $uppth;
1977
1978 } elsif ($path eq '!down') {
1979 $base && ref $base
1980 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1981
1982 my $dpth = $base->tile_path (cf::TILE_DOWN);
1983 $path = $dpth if $dpth;
1862 } 1984 }
1863 1985
1864 for ($path) { 1986 for ($path) {
1865 redo if s{//}{/};
1866 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1867 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1868 } 1989 }
1869 1990
1870 $path 1991 $path
1884 $self->init; # pass $1 etc. 2005 $self->init; # pass $1 etc.
1885 return $self; 2006 return $self;
1886 } 2007 }
1887 } 2008 }
1888 2009
1889 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1890 () 2011 ()
1891} 2012}
1892 2013
2014# may re-bless or do other evil things
1893sub init { 2015sub init {
1894 my ($self) = @_; 2016 my ($self) = @_;
1895 2017
1896 $self 2018 $self
1897} 2019}
2017 2139
2018sub find; 2140sub find;
2019sub find { 2141sub find {
2020 my ($path, $origin) = @_; 2142 my ($path, $origin) = @_;
2021 2143
2144 cf::cede_to_tick;
2145
2022 $path = normalise $path, $origin && $origin->path; 2146 $path = normalise $path, $origin;
2023 2147
2024 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2148 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2025 my $guard2 = cf::lock_acquire "map_find:$path"; 2149 my $guard2 = cf::lock_acquire "map_find:$path";
2026 2150
2027 $cf::MAP{$path} || do { 2151 $cf::MAP{$path} || do {
2067 $self->alloc; 2191 $self->alloc;
2068 2192
2069 $self->pre_load; 2193 $self->pre_load;
2070 cf::cede_to_tick; 2194 cf::cede_to_tick;
2071 2195
2196 if (exists $self->{load_path}) {
2072 my $f = new_from_file cf::object::thawer $self->{load_path}; 2197 my $f = new_from_file cf::object::thawer $self->{load_path};
2073 $f->skip_block; 2198 $f->skip_block;
2074 $self->_load_objects ($f) 2199 $self->_load_objects ($f)
2075 or return; 2200 or return;
2076 2201
2077 $self->post_load_original 2202 $self->post_load_original
2078 if delete $self->{load_original}; 2203 if delete $self->{load_original};
2079 2204
2080 if (my $uniq = $self->uniq_path) { 2205 if (my $uniq = $self->uniq_path) {
2081 utf8::encode $uniq; 2206 utf8::encode $uniq;
2082 unless (aio_stat $uniq) { 2207 unless (aio_stat $uniq) {
2083 if (my $f = new_from_file cf::object::thawer $uniq) { 2208 if (my $f = new_from_file cf::object::thawer $uniq) {
2084 $self->clear_unique_items; 2209 $self->clear_unique_items;
2085 $self->_load_objects ($f); 2210 $self->_load_objects ($f);
2086 $f->resolve_delayed_derefs; 2211 $f->resolve_delayed_derefs;
2212 }
2087 } 2213 }
2088 } 2214 }
2089 }
2090 2215
2091 $f->resolve_delayed_derefs; 2216 $f->resolve_delayed_derefs;
2217 }
2092 2218
2093 cf::cede_to_tick; 2219 cf::cede_to_tick;
2094 # now do the right thing for maps 2220 # now do the right thing for maps
2095 $self->link_multipart_objects; 2221 $self->link_multipart_objects;
2096 $self->difficulty ($self->estimate_difficulty) 2222 $self->difficulty ($self->estimate_difficulty)
2110 2236
2111 $self->in_memory (cf::MAP_ACTIVE); 2237 $self->in_memory (cf::MAP_ACTIVE);
2112 } 2238 }
2113 2239
2114 $self->post_load; 2240 $self->post_load;
2241
2242 1
2115} 2243}
2116 2244
2117# customize the map for a given player, i.e. 2245# customize the map for a given player, i.e.
2118# return the _real_ map. used by e.g. per-player 2246# return the _real_ map. used by e.g. per-player
2119# maps to change the path to ~playername/mappath 2247# maps to change the path to ~playername/mappath
2140 or next; 2268 or next;
2141 $neigh = find $neigh, $map 2269 $neigh = find $neigh, $map
2142 or next; 2270 or next;
2143 $neigh->load; 2271 $neigh->load;
2144 2272
2273 # now find the diagonal neighbours
2145 push @neigh, 2274 push @neigh,
2146 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2275 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2147 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2276 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2148 } 2277 }
2149 2278
2156} 2285}
2157 2286
2158sub find_sync { 2287sub find_sync {
2159 my ($path, $origin) = @_; 2288 my ($path, $origin) = @_;
2160 2289
2161 cf::sync_job { find $path, $origin } 2290 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2291 if $Coro::current == $Coro::main;
2292
2293 find $path, $origin
2162} 2294}
2163 2295
2164sub do_load_sync { 2296sub do_load_sync {
2165 my ($map) = @_; 2297 my ($map) = @_;
2166 2298
2167 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2299 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2168 if $Coro::current == $Coro::main; 2300 if $Coro::current == $Coro::main;
2169 2301
2170 cf::sync_job { $map->load }; 2302 $map->load;
2171} 2303}
2172 2304
2173our %MAP_PREFETCH; 2305our %MAP_PREFETCH;
2174our $MAP_PREFETCHER = undef; 2306our $MAP_PREFETCHER = undef;
2175 2307
2176sub find_async { 2308sub find_async {
2177 my ($path, $origin, $load) = @_; 2309 my ($path, $origin, $load) = @_;
2178 2310
2179 $path = normalise $path, $origin && $origin->{path}; 2311 $path = normalise $path, $origin;
2180 2312
2181 if (my $map = $cf::MAP{$path}) { 2313 if (my $map = $cf::MAP{$path}) {
2182 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2314 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2183 } 2315 }
2184 2316
2201 $MAP_PREFETCHER->prio (6); 2333 $MAP_PREFETCHER->prio (6);
2202 2334
2203 () 2335 ()
2204} 2336}
2205 2337
2338# common code, used by both ->save and ->swapout
2206sub save { 2339sub _save {
2207 my ($self) = @_; 2340 my ($self) = @_;
2208
2209 my $lock = cf::lock_acquire "map_data:$self->{path}";
2210 2341
2211 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2212 2343
2213 return unless $self->dirty; 2344 return unless $self->dirty;
2214 2345
2234 } else { 2365 } else {
2235 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2366 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2236 } 2367 }
2237} 2368}
2238 2369
2370sub save {
2371 my ($self) = @_;
2372
2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2374
2375 $self->_save;
2376}
2377
2239sub swap_out { 2378sub swap_out {
2240 my ($self) = @_; 2379 my ($self) = @_;
2241 2380
2242 # save first because save cedes
2243 $self->save;
2244
2245 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2381 my $lock = cf::lock_acquire "map_data:$self->{path}";
2246 2382
2247 return if $self->players;
2248 return if $self->in_memory != cf::MAP_ACTIVE; 2383 return if $self->in_memory != cf::MAP_ACTIVE;
2249 return if $self->{deny_save}; 2384 return if $self->{deny_save};
2385 return if $self->players;
2250 2386
2387 # first deactivate the map and "unlink" it from the core
2388 $self->deactivate;
2389 $_->clear_links_to ($self) for values %cf::MAP;
2251 $self->in_memory (cf::MAP_SWAPPED); 2390 $self->in_memory (cf::MAP_SWAPPED);
2391
2392 # then atomically save
2393 $self->_save;
2394
2395 # then free the map
2396 $self->clear;
2397}
2398
2399sub reset_at {
2400 my ($self) = @_;
2401
2402 # TODO: safety, remove and allow resettable per-player maps
2403 return 1e99 if $self->{deny_reset};
2404
2405 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2406 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2407
2408 $time + $to
2409}
2410
2411sub should_reset {
2412 my ($self) = @_;
2413
2414 $self->reset_at <= $cf::RUNTIME
2415}
2416
2417sub reset {
2418 my ($self) = @_;
2419
2420 my $lock = cf::lock_acquire "map_data:$self->{path}";
2421
2422 return if $self->players;
2423
2424 cf::trace "resetting map ", $self->path, "\n";
2425
2426 $self->in_memory (cf::MAP_SWAPPED);
2427
2428 # need to save uniques path
2429 unless ($self->{deny_save}) {
2430 my $uniq = $self->uniq_path; utf8::encode $uniq;
2431
2432 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2433 if $uniq;
2434 }
2435
2436 delete $cf::MAP{$self->path};
2252 2437
2253 $self->deactivate; 2438 $self->deactivate;
2254 $_->clear_links_to ($self) for values %cf::MAP; 2439 $_->clear_links_to ($self) for values %cf::MAP;
2255 $self->clear; 2440 $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 2441
2301 $self->unlink_save; 2442 $self->unlink_save;
2302 $self->destroy; 2443 $self->destroy;
2303} 2444}
2304 2445
2312 2453
2313 delete $cf::MAP{$self->path}; 2454 delete $cf::MAP{$self->path};
2314 2455
2315 $self->unlink_save; 2456 $self->unlink_save;
2316 2457
2317 bless $self, "cf::map"; 2458 bless $self, "cf::map::wrap";
2318 delete $self->{deny_reset}; 2459 delete $self->{deny_reset};
2319 $self->{deny_save} = 1; 2460 $self->{deny_save} = 1;
2320 $self->reset_timeout (1); 2461 $self->reset_timeout (1);
2321 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2462 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2322 2463
2552 2693
2553Freezes the player and moves him/her to a special map (C<{link}>). 2694Freezes the player and moves him/her to a special map (C<{link}>).
2554 2695
2555The player should be reasonably safe there for short amounts of time (e.g. 2696The 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, 2697for 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 2698though, as the player cannot control the character while it is on the link
2558map. 2699map.
2559 2700
2560Will never block. 2701Will never block.
2561 2702
2562=item $player_object->leave_link ($map, $x, $y) 2703=item $player_object->leave_link ($map, $x, $y)
2583sub cf::object::player::enter_link { 2724sub cf::object::player::enter_link {
2584 my ($self) = @_; 2725 my ($self) = @_;
2585 2726
2586 $self->deactivate_recursive; 2727 $self->deactivate_recursive;
2587 2728
2729 ++$self->{_link_recursion};
2730
2588 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2731 return if UNIVERSAL::isa $self->map, "ext::map_link";
2589 2732
2590 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2733 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2591 if $self->map && $self->map->{path} ne "{link}"; 2734 if $self->map && $self->map->{path} ne "{link}";
2592 2735
2593 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2736 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2594} 2737}
2595 2738
2596sub cf::object::player::leave_link { 2739sub cf::object::player::leave_link {
2597 my ($self, $map, $x, $y) = @_; 2740 my ($self, $map, $x, $y) = @_;
2598 2741
2623 $map->load_neighbours; 2766 $map->load_neighbours;
2624 2767
2625 return unless $self->contr->active; 2768 return unless $self->contr->active;
2626 2769
2627 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2770 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2628 $self->enter_map ($map, $x, $y); 2771 if ($self->enter_map ($map, $x, $y)) {
2629 2772 # entering was successful
2773 delete $self->{_link_recursion};
2630 # only activate afterwards, to support waiting in hooks 2774 # only activate afterwards, to support waiting in hooks
2631 $self->activate_recursive; 2775 $self->activate_recursive;
2632} 2776 }
2633 2777
2778}
2779
2634=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2780=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2635 2781
2636Moves the player to the given map-path and coordinates by first freezing 2782Moves the player to the given map-path and coordinates by first freezing
2637her, loading and preparing them map, calling the provided $check callback 2783her, loading and preparing them map, calling the provided $check callback
2638that has to return the map if sucecssful, and then unfreezes the player on 2784that 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 2785the new (success) or old (failed) map position. In either case, $done will
2646 2792
2647our $GOTOGEN; 2793our $GOTOGEN;
2648 2794
2649sub cf::object::player::goto { 2795sub cf::object::player::goto {
2650 my ($self, $path, $x, $y, $check, $done) = @_; 2796 my ($self, $path, $x, $y, $check, $done) = @_;
2797
2798 if ($self->{_link_recursion} >= $MAX_LINKS) {
2799 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2800 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2801 ($path, $x, $y) = @$EMERGENCY_POSITION;
2802 }
2651 2803
2652 # do generation counting so two concurrent goto's will be executed in-order 2804 # do generation counting so two concurrent goto's will be executed in-order
2653 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2805 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2654 2806
2655 $self->enter_link; 2807 $self->enter_link;
2675 ($path, $x, $y) = (undef, undef, undef); 2827 ($path, $x, $y) = (undef, undef, undef);
2676 } 2828 }
2677 } 2829 }
2678 2830
2679 my $map = eval { 2831 my $map = eval {
2680 my $map = defined $path ? cf::map::find $path : undef; 2832 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2681 2833
2682 if ($map) { 2834 if ($map) {
2683 $map = $map->customise_for ($self); 2835 $map = $map->customise_for ($self);
2684 $map = $check->($map) if $check && $map; 2836 $map = $check->($map, $x, $y, $self) if $check && $map;
2685 } else { 2837 } else {
2686 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2838 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2687 } 2839 }
2688 2840
2689 $map 2841 $map
2697 if ($gen == $self->{_goto_generation}) { 2849 if ($gen == $self->{_goto_generation}) {
2698 delete $self->{_goto_generation}; 2850 delete $self->{_goto_generation};
2699 $self->leave_link ($map, $x, $y); 2851 $self->leave_link ($map, $x, $y);
2700 } 2852 }
2701 2853
2702 $done->() if $done; 2854 $done->($self) if $done;
2703 })->prio (1); 2855 })->prio (1);
2704} 2856}
2705 2857
2706=item $player_object->enter_exit ($exit_object) 2858=item $player_object->enter_exit ($exit_object)
2707 2859
2783 2935
2784 prepare_random_map $exit 2936 prepare_random_map $exit
2785 if $exit->slaying eq "/!"; 2937 if $exit->slaying eq "/!";
2786 } 2938 }
2787 2939
2788 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2940 my $map = cf::map::normalise $exit->slaying, $exit->map;
2789 my $x = $exit->stats->hp; 2941 my $x = $exit->stats->hp;
2790 my $y = $exit->stats->sp; 2942 my $y = $exit->stats->sp;
2791 2943
2792 $self->goto ($map, $x, $y); 2944 $self->goto ($map, $x, $y);
2793 2945
2800 $self->message ("Something went wrong deep within the deliantra server. " 2952 $self->message ("Something went wrong deep within the deliantra server. "
2801 . "I'll try to bring you back to the map you were before. " 2953 . "I'll try to bring you back to the map you were before. "
2802 . "Please report this to the dungeon master!", 2954 . "Please report this to the dungeon master!",
2803 cf::NDI_UNIQUE | cf::NDI_RED); 2955 cf::NDI_UNIQUE | cf::NDI_RED);
2804 2956
2805 warn "ERROR in enter_exit: $@"; 2957 error "ERROR in enter_exit: $@";
2806 $self->leave_link; 2958 $self->leave_link;
2807 } 2959 }
2808 })->prio (1); 2960 })->prio (1);
2809} 2961}
2810 2962
3123 3275
3124 $ns->ext_reply ($reply, @reply) 3276 $ns->ext_reply ($reply, @reply)
3125 if $reply; 3277 if $reply;
3126 3278
3127 } else { 3279 } else {
3128 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3280 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3129 } 3281 }
3130 3282
3131 cf::override; 3283 cf::override;
3132 }, 3284 },
3133); 3285);
3214 decrease split destroy change_exp value msg lore send_msg)], 3366 decrease split destroy change_exp value msg lore send_msg)],
3215 ["cf::object::player" => qw(player)], 3367 ["cf::object::player" => qw(player)],
3216 ["cf::player" => qw(peaceful send_msg)], 3368 ["cf::player" => qw(peaceful send_msg)],
3217 ["cf::map" => qw(trigger)], 3369 ["cf::map" => qw(trigger)],
3218) { 3370) {
3219 no strict 'refs';
3220 my ($pkg, @funs) = @$_; 3371 my ($pkg, @funs) = @$_;
3221 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3372 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3222 for @funs; 3373 for @funs;
3223} 3374}
3224 3375
3263 local @cf::_safe_eval_args = values %vars; 3414 local @cf::_safe_eval_args = values %vars;
3264 @res = wantarray ? eval eval : scalar eval $eval; 3415 @res = wantarray ? eval eval : scalar eval $eval;
3265 } 3416 }
3266 3417
3267 if ($@) { 3418 if ($@) {
3268 warn "$@"; 3419 warn "$@",
3269 warn "while executing safe code '$code'\n"; 3420 "while executing safe code '$code'\n",
3270 warn "with arguments " . (join " ", %vars) . "\n"; 3421 "with arguments " . (join " ", %vars) . "\n";
3271 } 3422 }
3272 3423
3273 wantarray ? @res : $res[0] 3424 wantarray ? @res : $res[0]
3274} 3425}
3275 3426
3309 # for this (global event?) 3460 # for this (global event?)
3310 %ext::player_env::MUSIC_FACE_CACHE = (); 3461 %ext::player_env::MUSIC_FACE_CACHE = ();
3311 3462
3312 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3463 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3313 3464
3314 warn "loading facedata from $path\n"; 3465 trace "loading facedata from $path\n";
3315 3466
3316 my $facedata; 3467 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 3468
3322 $facedata->{version} == 2 3469 $facedata->{version} == 2
3323 or cf::cleanup "$path: version mismatch, cannot proceed."; 3470 or cf::cleanup "$path: version mismatch, cannot proceed.";
3324 3471
3325 # patch in the exptable 3472 # patch in the exptable
3339 3486
3340 cf::face::set_visibility $idx, $info->{visibility}; 3487 cf::face::set_visibility $idx, $info->{visibility};
3341 cf::face::set_magicmap $idx, $info->{magicmap}; 3488 cf::face::set_magicmap $idx, $info->{magicmap};
3342 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3489 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3343 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3490 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3491 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3344 3492
3345 cf::cede_to_tick; 3493 cf::cede_to_tick;
3346 } 3494 }
3347 3495
3348 while (my ($face, $info) = each %$faces) { 3496 while (my ($face, $info) = each %$faces) {
3353 3501
3354 if (my $smooth = cf::face::find $info->{smooth}) { 3502 if (my $smooth = cf::face::find $info->{smooth}) {
3355 cf::face::set_smooth $idx, $smooth; 3503 cf::face::set_smooth $idx, $smooth;
3356 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3504 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3357 } else { 3505 } else {
3358 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3506 error "smooth face '$info->{smooth}' not found for face '$face'";
3359 } 3507 }
3360 3508
3361 cf::cede_to_tick; 3509 cf::cede_to_tick;
3362 } 3510 }
3363 } 3511 }
3381 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3529 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3382 3530
3383 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3531 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3384 cf::face::set_type $idx, $info->{type}; 3532 cf::face::set_type $idx, $info->{type};
3385 } else { 3533 } else {
3386 $RESOURCE{$name} = $info; 3534 $RESOURCE{$name} = $info; # unused
3387 } 3535 }
3388 3536
3389 cf::cede_to_tick; 3537 cf::cede_to_tick;
3390 } 3538 }
3391 } 3539 }
3392 3540
3393 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3541 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3394 3542
3395 1 3543 1
3396} 3544}
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 3545
3418register_exticmd fx_want => sub { 3546register_exticmd fx_want => sub {
3419 my ($ns, $want) = @_; 3547 my ($ns, $want) = @_;
3420 3548
3421 while (my ($k, $v) = each %$want) { 3549 while (my ($k, $v) = each %$want) {
3460sub reload_treasures { 3588sub reload_treasures {
3461 load_resource_file "$DATADIR/treasures" 3589 load_resource_file "$DATADIR/treasures"
3462 or die "unable to load treasurelists\n"; 3590 or die "unable to load treasurelists\n";
3463} 3591}
3464 3592
3593sub reload_sound {
3594 trace "loading sound config from $DATADIR/sound\n";
3595
3596 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3597
3598 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3599 my $sound = $soundconf->{compat}[$_]
3600 or next;
3601
3602 my $face = cf::face::find "sound/$sound->[1]";
3603 cf::sound::set $sound->[0] => $face;
3604 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3605 }
3606
3607 while (my ($k, $v) = each %{$soundconf->{event}}) {
3608 my $face = cf::face::find "sound/$v";
3609 cf::sound::set $k => $face;
3610 }
3611}
3612
3465sub reload_resources { 3613sub reload_resources {
3466 warn "reloading resource files...\n"; 3614 trace "reloading resource files...\n";
3467 3615
3616 reload_exp_table;
3617 reload_materials;
3468 reload_facedata; 3618 reload_facedata;
3619 reload_sound;
3469 reload_archetypes; 3620 reload_archetypes;
3470 reload_regions; 3621 reload_regions;
3471 reload_treasures; 3622 reload_treasures;
3472 3623
3473 warn "finished reloading resource files\n"; 3624 trace "finished reloading resource files\n";
3474} 3625}
3475 3626
3476sub reload_config { 3627sub reload_config {
3477 warn "reloading config file...\n"; 3628 trace "reloading config file...\n";
3478 3629
3479 open my $fh, "<:utf8", "$CONFDIR/config" 3630 my $config = load_file "$CONFDIR/config";
3480 or return; 3631 utf8::decode $config;
3632 *CFG = decode_yaml $config;
3481 3633
3482 local $/;
3483 *CFG = YAML::XS::Load scalar <$fh>;
3484
3485 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3634 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3486 3635
3487 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3636 $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}; 3637 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3489 3638
3490 if (exists $CFG{mlockall}) { 3639 if (exists $CFG{mlockall}) {
3492 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3641 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3493 and die "WARNING: m(un)lockall failed: $!\n"; 3642 and die "WARNING: m(un)lockall failed: $!\n";
3494 }; 3643 };
3495 warn $@ if $@; 3644 warn $@ if $@;
3496 } 3645 }
3497
3498 warn "finished reloading resource files\n";
3499} 3646}
3500 3647
3501sub pidfile() { 3648sub pidfile() {
3502 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3649 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3503 or die "$PIDFILE: $!"; 3650 or die "$PIDFILE: $!";
3516 seek $fh, 0, 0; 3663 seek $fh, 0, 0;
3517 print $fh $$; 3664 print $fh $$;
3518} 3665}
3519 3666
3520sub main_loop { 3667sub main_loop {
3521 warn "EV::loop starting\n"; 3668 trace "EV::loop starting\n";
3522 if (1) { 3669 if (1) {
3523 EV::loop; 3670 EV::loop;
3524 } 3671 }
3525 warn "EV::loop returned\n"; 3672 trace "EV::loop returned\n";
3526 goto &main_loop unless $REALLY_UNLOOP; 3673 goto &main_loop unless $REALLY_UNLOOP;
3527} 3674}
3528 3675
3529sub main { 3676sub main {
3530 cf::init_globals; # initialise logging 3677 cf::init_globals; # initialise logging
3531 3678
3532 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3679 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3533 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3680 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3534 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3681 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3535 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3682 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 3683
3542 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3684 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3543 3685
3544 # we must not ever block the main coroutine 3686 # we must not ever block the main coroutine
3545 local $Coro::idle = sub { 3687 local $Coro::idle = sub {
3551 }; 3693 };
3552 3694
3553 evthread_start IO::AIO::poll_fileno; 3695 evthread_start IO::AIO::poll_fileno;
3554 3696
3555 cf::sync_job { 3697 cf::sync_job {
3698 cf::incloader::init ();
3699
3700 cf::init_anim;
3701 cf::init_attackmess;
3702 cf::init_dynamic;
3703
3556 cf::load_settings; 3704 cf::load_settings;
3557 cf::load_materials;
3558 3705
3559 reload_resources; 3706 reload_resources;
3560 reload_config; 3707 reload_config;
3561 db_init; 3708 db_init;
3562 3709
3574 3721
3575 # no (long-running) fork's whatsoever before this point(!) 3722 # no (long-running) fork's whatsoever before this point(!)
3576 use POSIX (); 3723 use POSIX ();
3577 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3724 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3578 3725
3579 (pop @POST_INIT)->(0) while @POST_INIT; 3726 cf::_post_init 0;
3580 }; 3727 };
3581 3728
3729 cf::object::thawer::errors_are_fatal 0;
3730 info "parse errors in files are no longer fatal from this point on.\n";
3731
3732 my $free_main; $free_main = EV::idle sub {
3733 undef $free_main;
3734 undef &main; # free gobs of memory :)
3735 };
3736
3582 main_loop; 3737 goto &main_loop;
3583} 3738}
3584 3739
3585############################################################################# 3740#############################################################################
3586# initialisation and cleanup 3741# initialisation and cleanup
3587 3742
3626 or return; 3781 or return;
3627 3782
3628 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3783 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3629 and return; 3784 and return;
3630 3785
3631 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3786 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3632 3787
3633 1 3788 1
3634} 3789}
3635 3790
3636our $uuid_lock; 3791our $uuid_lock;
3648 or return; 3803 or return;
3649 3804
3650 my $value = uuid_seq uuid_cur; 3805 my $value = uuid_seq uuid_cur;
3651 3806
3652 unless ($value) { 3807 unless ($value) {
3653 warn "cowardly refusing to write zero uuid value!\n"; 3808 info "cowardly refusing to write zero uuid value!\n";
3654 return; 3809 return;
3655 } 3810 }
3656 3811
3657 my $value = uuid_str $value + $uuid_skip; 3812 my $value = uuid_str $value + $uuid_skip;
3658 $uuid_skip = 0; 3813 $uuid_skip = 0;
3668 or return; 3823 or return;
3669 3824
3670 aio_rename "$uuid~", $uuid 3825 aio_rename "$uuid~", $uuid
3671 and return; 3826 and return;
3672 3827
3673 warn "uuid file written ($value).\n"; 3828 trace "uuid file written ($value).\n";
3674 3829
3675 1 3830 1
3676 3831
3677} 3832}
3678 3833
3684} 3839}
3685 3840
3686sub emergency_save() { 3841sub emergency_save() {
3687 my $freeze_guard = cf::freeze_mainloop; 3842 my $freeze_guard = cf::freeze_mainloop;
3688 3843
3689 warn "emergency_perl_save: enter\n"; 3844 info "emergency_perl_save: enter\n";
3845
3846 # this is a trade-off: we want to be very quick here, so
3847 # save all maps without fsync, and later call a global sync
3848 # (which in turn might be very very slow)
3849 local $USE_FSYNC = 0;
3690 3850
3691 cf::sync_job { 3851 cf::sync_job {
3692 # this is a trade-off: we want to be very quick here, so 3852 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 3853
3697 # use a peculiar iteration method to avoid tripping on perl 3854 # use a peculiar iteration method to avoid tripping on perl
3698 # refcount bugs in for. also avoids problems with players 3855 # refcount bugs in for. also avoids problems with players
3699 # and maps saved/destroyed asynchronously. 3856 # and maps saved/destroyed asynchronously.
3700 warn "emergency_perl_save: begin player save\n"; 3857 info "emergency_perl_save: begin player save\n";
3701 for my $login (keys %cf::PLAYER) { 3858 for my $login (keys %cf::PLAYER) {
3702 my $pl = $cf::PLAYER{$login} or next; 3859 my $pl = $cf::PLAYER{$login} or next;
3703 $pl->valid or next; 3860 $pl->valid or next;
3704 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3861 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3705 $pl->save; 3862 $pl->save;
3706 } 3863 }
3707 warn "emergency_perl_save: end player save\n"; 3864 info "emergency_perl_save: end player save\n";
3708 3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3709 warn "emergency_perl_save: begin map save\n"; 3868 info "emergency_perl_save: begin map save\n";
3710 for my $path (keys %cf::MAP) { 3869 for my $path (keys %cf::MAP) {
3711 my $map = $cf::MAP{$path} or next; 3870 my $map = $cf::MAP{$path} or next;
3712 $map->valid or next; 3871 $map->valid or next;
3713 $map->save; 3872 $map->save;
3714 } 3873 }
3715 warn "emergency_perl_save: end map save\n"; 3874 info "emergency_perl_save: end map save\n";
3716 3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3717 warn "emergency_perl_save: begin database checkpoint\n"; 3878 info "emergency_perl_save: begin database checkpoint\n";
3718 BDB::db_env_txn_checkpoint $DB_ENV; 3879 BDB::db_env_txn_checkpoint $DB_ENV;
3719 warn "emergency_perl_save: end database checkpoint\n"; 3880 info "emergency_perl_save: end database checkpoint\n";
3720 3881
3721 warn "emergency_perl_save: begin write uuid\n"; 3882 info "emergency_perl_save: begin write uuid\n";
3722 write_uuid_sync 1; 3883 write_uuid_sync 1;
3723 warn "emergency_perl_save: end write uuid\n"; 3884 info "emergency_perl_save: end write uuid\n";
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: syncing database to disk";
3889 BDB::db_env_txn_checkpoint $DB_ENV;
3890
3891 info "emergency_perl_save: starting sync\n";
3892 IO::AIO::aio_sync sub {
3893 info "emergency_perl_save: finished sync\n";
3894 };
3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3898 trace "emergency_perl_save: flushing outstanding aio requests";
3899 while (IO::AIO::nreqs || BDB::nreqs) {
3900 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3901 }
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3724 }; 3904 };
3725 3905
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"; 3906 info "emergency_perl_save: leave\n";
3732} 3907}
3733 3908
3734sub post_cleanup { 3909sub post_cleanup {
3735 my ($make_core) = @_; 3910 my ($make_core) = @_;
3736 3911
3912 IO::AIO::flush;
3913
3737 warn Carp::longmess "post_cleanup backtrace" 3914 error Carp::longmess "post_cleanup backtrace"
3738 if $make_core; 3915 if $make_core;
3739 3916
3740 my $fh = pidfile; 3917 my $fh = pidfile;
3741 unlink $PIDFILE if <$fh> == $$; 3918 unlink $PIDFILE if <$fh> == $$;
3742} 3919}
3762 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3939 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3763 for my $name (keys %$leaf_symtab) { 3940 for my $name (keys %$leaf_symtab) {
3764 _gv_clear *{"$pkg$name"}; 3941 _gv_clear *{"$pkg$name"};
3765# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3942# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3766 } 3943 }
3767 warn "cleared package $pkg\n";#d#
3768} 3944}
3769 3945
3770sub do_reload_perl() { 3946sub do_reload_perl() {
3771 # can/must only be called in main 3947 # can/must only be called in main
3772 if ($Coro::current != $Coro::main) { 3948 unless (in_main) {
3773 warn "can only reload from main coroutine"; 3949 error "can only reload from main coroutine";
3774 return; 3950 return;
3775 } 3951 }
3776 3952
3777 return if $RELOAD++; 3953 return if $RELOAD++;
3778 3954
3779 my $t1 = AE::time; 3955 my $t1 = AE::time;
3780 3956
3781 while ($RELOAD) { 3957 while ($RELOAD) {
3782 warn "reloading..."; 3958 cf::get_slot 0.1, -1, "reload_perl";
3959 info "perl_reload: reloading...";
3783 3960
3784 warn "entering sync_job"; 3961 trace "perl_reload: entering sync_job";
3785 3962
3786 cf::sync_job { 3963 cf::sync_job {
3787 cf::write_runtime_sync; # external watchdog should not bark
3788 cf::emergency_save; 3964 #cf::emergency_save;
3789 cf::write_runtime_sync; # external watchdog should not bark
3790 3965
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"; 3966 trace "perl_reload: cancelling all extension coros";
3802 $_->cancel for values %EXT_CORO; 3967 $_->cancel for values %EXT_CORO;
3803 %EXT_CORO = (); 3968 %EXT_CORO = ();
3804 3969
3805 warn "removing commands"; 3970 trace "perl_reload: removing commands";
3806 %COMMAND = (); 3971 %COMMAND = ();
3807 3972
3808 warn "removing ext/exti commands"; 3973 trace "perl_reload: removing ext/exti commands";
3809 %EXTCMD = (); 3974 %EXTCMD = ();
3810 %EXTICMD = (); 3975 %EXTICMD = ();
3811 3976
3812 warn "unloading/nuking all extensions"; 3977 trace "perl_reload: unloading/nuking all extensions";
3813 for my $pkg (@EXTS) { 3978 for my $pkg (@EXTS) {
3814 warn "... unloading $pkg"; 3979 trace "... unloading $pkg";
3815 3980
3816 if (my $cb = $pkg->can ("unload")) { 3981 if (my $cb = $pkg->can ("unload")) {
3817 eval { 3982 eval {
3818 $cb->($pkg); 3983 $cb->($pkg);
3819 1 3984 1
3820 } or warn "$pkg unloaded, but with errors: $@"; 3985 } or error "$pkg unloaded, but with errors: $@";
3821 } 3986 }
3822 3987
3823 warn "... clearing $pkg"; 3988 trace "... clearing $pkg";
3824 clear_package $pkg; 3989 clear_package $pkg;
3825 } 3990 }
3826 3991
3827 warn "unloading all perl modules loaded from $LIBDIR"; 3992 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3828 while (my ($k, $v) = each %INC) { 3993 while (my ($k, $v) = each %INC) {
3829 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3994 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3830 3995
3831 warn "... unloading $k"; 3996 trace "... unloading $k";
3832 delete $INC{$k}; 3997 delete $INC{$k};
3833 3998
3834 $k =~ s/\.pm$//; 3999 $k =~ s/\.pm$//;
3835 $k =~ s/\//::/g; 4000 $k =~ s/\//::/g;
3836 4001
3839 } 4004 }
3840 4005
3841 clear_package $k; 4006 clear_package $k;
3842 } 4007 }
3843 4008
3844 warn "getting rid of safe::, as good as possible"; 4009 trace "perl_reload: getting rid of safe::, as good as possible";
3845 clear_package "safe::$_" 4010 clear_package "safe::$_"
3846 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4011 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3847 4012
3848 warn "unloading cf.pm \"a bit\""; 4013 trace "perl_reload: unloading cf.pm \"a bit\"";
3849 delete $INC{"cf.pm"}; 4014 delete $INC{"cf.pm"};
3850 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4015 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3851 4016
3852 # don't, removes xs symbols, too, 4017 # don't, removes xs symbols, too,
3853 # and global variables created in xs 4018 # and global variables created in xs
3854 #clear_package __PACKAGE__; 4019 #clear_package __PACKAGE__;
3855 4020
3856 warn "unload completed, starting to reload now"; 4021 info "perl_reload: unload completed, starting to reload now";
3857 4022
3858 warn "reloading cf.pm"; 4023 trace "perl_reload: reloading cf.pm";
3859 require cf; 4024 require cf;
3860 cf::_connect_to_perl_1; 4025 cf::_connect_to_perl_1;
3861 4026
3862 warn "loading config and database again"; 4027 trace "perl_reload: loading config and database again";
3863 cf::reload_config; 4028 cf::reload_config;
3864 4029
3865 warn "loading extensions"; 4030 trace "perl_reload: loading extensions";
3866 cf::load_extensions; 4031 cf::load_extensions;
3867 4032
3868 if ($REATTACH_ON_RELOAD) { 4033 if ($REATTACH_ON_RELOAD) {
3869 warn "reattaching attachments to objects/players"; 4034 trace "perl_reload: reattaching attachments to objects/players";
3870 _global_reattach; # objects, sockets 4035 _global_reattach; # objects, sockets
3871 warn "reattaching attachments to maps"; 4036 trace "perl_reload: reattaching attachments to maps";
3872 reattach $_ for values %MAP; 4037 reattach $_ for values %MAP;
3873 warn "reattaching attachments to players"; 4038 trace "perl_reload: reattaching attachments to players";
3874 reattach $_ for values %PLAYER; 4039 reattach $_ for values %PLAYER;
3875 } 4040 }
3876 4041
3877 warn "running post_init jobs"; 4042 cf::_post_init 1;
3878 (pop @POST_INIT)->(1) while @POST_INIT;
3879 4043
3880 warn "leaving sync_job"; 4044 trace "perl_reload: leaving sync_job";
3881 4045
3882 1 4046 1
3883 } or do { 4047 } or do {
3884 warn $@; 4048 error $@;
3885 cf::cleanup "error while reloading, exiting."; 4049 cf::cleanup "perl_reload: error, exiting.";
3886 }; 4050 };
3887 4051
3888 warn "reloaded";
3889 --$RELOAD; 4052 --$RELOAD;
3890 } 4053 }
3891 4054
3892 $t1 = AE::time - $t1; 4055 $t1 = AE::time - $t1;
3893 warn "reload completed in ${t1}s\n"; 4056 info "perl_reload: completed in ${t1}s\n";
3894}; 4057};
3895 4058
3896our $RELOAD_WATCHER; # used only during reload 4059our $RELOAD_WATCHER; # used only during reload
3897 4060
3898sub reload_perl() { 4061sub reload_perl() {
3919 reload_perl; 4082 reload_perl;
3920 }; 4083 };
3921 } 4084 }
3922}; 4085};
3923 4086
3924unshift @INC, $LIBDIR; 4087#############################################################################
3925 4088
3926my $bug_warning = 0; 4089my $bug_warning = 0;
3927 4090
3928our @WAIT_FOR_TICK; 4091our @WAIT_FOR_TICK;
3929our @WAIT_FOR_TICK_BEGIN; 4092our @WAIT_FOR_TICK_BEGIN;
3930 4093
3931sub wait_for_tick { 4094sub wait_for_tick() {
3932 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4095 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3933 4096
3934 my $signal = new Coro::Signal; 4097 my $signal = new Coro::Signal;
3935 push @WAIT_FOR_TICK, $signal; 4098 push @WAIT_FOR_TICK, $signal;
3936 $signal->wait; 4099 $signal->wait;
3937} 4100}
3938 4101
3939sub wait_for_tick_begin { 4102sub wait_for_tick_begin() {
3940 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4103 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3941 4104
3942 my $signal = new Coro::Signal; 4105 my $signal = new Coro::Signal;
3943 push @WAIT_FOR_TICK_BEGIN, $signal; 4106 push @WAIT_FOR_TICK_BEGIN, $signal;
3944 $signal->wait; 4107 $signal->wait;
3958 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4121 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3959 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4122 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3960 Coro::async_pool { 4123 Coro::async_pool {
3961 $Coro::current->{desc} = "runtime saver"; 4124 $Coro::current->{desc} = "runtime saver";
3962 write_runtime_sync 4125 write_runtime_sync
3963 or warn "ERROR: unable to write runtime file: $!"; 4126 or error "ERROR: unable to write runtime file: $!";
3964 }; 4127 };
3965 } 4128 }
3966 4129
3967 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4130 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3968 $sig->send; 4131 $sig->send;
3976 4139
3977 if (0) { 4140 if (0) {
3978 if ($NEXT_TICK) { 4141 if ($NEXT_TICK) {
3979 my $jitter = $TICK_START - $NEXT_TICK; 4142 my $jitter = $TICK_START - $NEXT_TICK;
3980 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4143 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3981 warn "jitter $JITTER\n";#d# 4144 debug "jitter $JITTER\n";#d#
3982 } 4145 }
3983 } 4146 }
3984} 4147}
3985 4148
3986{ 4149{
4031 IO::AIO::min_parallel 8; 4194 IO::AIO::min_parallel 8;
4032 IO::AIO::max_poll_time $TICK * 0.1; 4195 IO::AIO::max_poll_time $TICK * 0.1;
4033 undef $AnyEvent::AIO::WATCHER; 4196 undef $AnyEvent::AIO::WATCHER;
4034} 4197}
4035 4198
4036my $_log_backtrace; 4199our $_log_backtrace;
4200our $_log_backtrace_last;
4037 4201
4038sub _log_backtrace { 4202sub _log_backtrace {
4039 my ($msg, @addr) = @_; 4203 my ($msg, @addr) = @_;
4040 4204
4041 $msg =~ s/\n//; 4205 $msg =~ s/\n$//;
4042 4206
4207 if ($_log_backtrace_last eq $msg) {
4208 LOG llevInfo, "[ABT] $msg\n";
4209 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4043 # limit the # of concurrent backtraces 4210 # limit the # of concurrent backtraces
4044 if ($_log_backtrace < 2) { 4211 } elsif ($_log_backtrace < 2) {
4212 $_log_backtrace_last = $msg;
4045 ++$_log_backtrace; 4213 ++$_log_backtrace;
4046 my $perl_bt = Carp::longmess $msg; 4214 my $perl_bt = Carp::longmess $msg;
4047 async { 4215 async {
4048 $Coro::current->{desc} = "abt $msg"; 4216 $Coro::current->{desc} = "abt $msg";
4049 4217
4069 LOG llevInfo, "[ABT] $_\n" for @bt; 4237 LOG llevInfo, "[ABT] $_\n" for @bt;
4070 --$_log_backtrace; 4238 --$_log_backtrace;
4071 }; 4239 };
4072 } else { 4240 } else {
4073 LOG llevInfo, "[ABT] $msg\n"; 4241 LOG llevInfo, "[ABT] $msg\n";
4074 LOG llevInfo, "[ABT] [suppressed]\n"; 4242 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4075 } 4243 }
4076} 4244}
4077 4245
4078# load additional modules 4246# load additional modules
4079require "cf/$_.pm" for @EXTRA_MODULES; 4247require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines