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.502 by root, Sat Jan 23 20:24:50 2010 UTC vs.
Revision 1.549 by root, Tue May 11 13:19:59 2010 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 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 = ();
… …
106our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 110
111our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
112 118
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 121our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
118our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 127our $DB_ENV;
122 128
123our @EXTRA_MODULES = qw(pod match mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 130
125our %CFG; 131our %CFG;
126 132
127our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 134our $RUNTIME;
… …
162 168
163our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
164 170
165sub cf::map::normalise; 171sub cf::map::normalise;
166 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
167############################################################################# 177#############################################################################
168 178
169%REFLECT = (); 179%REFLECT = ();
170for (@REFLECT) { 180for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
… …
223from wherever your confdir points to. 233from wherever your confdir points to.
224 234
225=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
226 236
227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
228returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
229per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
230 245
231=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
232 247
233This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
242 257
243=back 258=back
244 259
245=cut 260=cut
246 261
262sub error(@) { LOG llevError, join "", @_ }
263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
247$Coro::State::WARNHOOK = sub { 268$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 269 my $msg = join "", @_;
249 270
250 $msg .= "\n" 271 $msg .= "\n"
251 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
252 273
253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254 275
255 LOG llevError, $msg; 276 LOG llevWarn, $msg;
256}; 277};
257 278
258$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
260 281
261 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
262 283
263 if ($Coro::current == $Coro::main) {#d# 284 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 286 return;#d#
266 }#d# 287 }#d#
267 288
268 # kill coroutine otherwise 289 # kill coroutine otherwise
269 Coro::terminate 290 Coro::terminate
… …
336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337 358
338sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
339sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
340 361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
341=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
342 375
343Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
345 378
346The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
347is a reload or not. 380is a reload or not.
348 381
349=cut 382=cut
350 383
351sub post_init(&) { 384sub post_init(&) {
… …
396} 429}
397 430
398=item cf::periodic $interval, $cb 431=item cf::periodic $interval, $cb
399 432
400Like EV::periodic, but randomly selects a starting point so that the actions 433Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 434get spread over time.
402 435
403=cut 436=cut
404 437
405sub periodic($$) { 438sub periodic($$) {
406 my ($interval, $cb) = @_; 439 my ($interval, $cb) = @_;
… …
502=cut 535=cut
503 536
504sub sync_job(&) { 537sub sync_job(&) {
505 my ($job) = @_; 538 my ($job) = @_;
506 539
507 if ($Coro::current == $Coro::main) { 540 if (in_main) {
508 my $time = EV::time; 541 my $time = AE::time;
509 542
510 # this is the main coro, too bad, we have to block 543 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 544 # till the operation succeeds, freezing the server :/
512 545
513 LOG llevError, Carp::longmess "sync job";#d# 546 #LOG llevError, Carp::longmess "sync job";#d#
514 547
515 my $freeze_guard = freeze_mainloop; 548 my $freeze_guard = freeze_mainloop;
516 549
517 my $busy = 1; 550 my $busy = 1;
518 my @res; 551 my @res;
519 552
520 (async { 553 (async {
521 $Coro::current->desc ("sync job coro"); 554 $Coro::current->desc ("sync job coro");
522 @res = eval { $job->() }; 555 @res = eval { $job->() };
523 warn $@ if $@; 556 error $@ if $@;
524 undef $busy; 557 undef $busy;
525 })->prio (Coro::PRIO_MAX); 558 })->prio (Coro::PRIO_MAX);
526 559
527 while ($busy) { 560 while ($busy) {
528 if (Coro::nready) { 561 if (Coro::nready) {
… …
530 } else { 563 } else {
531 EV::loop EV::LOOP_ONESHOT; 564 EV::loop EV::LOOP_ONESHOT;
532 } 565 }
533 } 566 }
534 567
535 my $time = EV::time - $time; 568 my $time = AE::time - $time;
536 569
537 $TICK_START += $time; # do not account sync jobs to server load 570 $TICK_START += $time; # do not account sync jobs to server load
538 571
539 wantarray ? @res : $res[0] 572 wantarray ? @res : $res[0]
540 } else { 573 } else {
… …
562 $EXT_CORO{$coro+0} = $coro; 595 $EXT_CORO{$coro+0} = $coro;
563 596
564 $coro 597 $coro
565} 598}
566 599
567=item fork_call { }, $args 600=item fork_call { }, @args
568 601
569Executes the given code block with the given arguments in a seperate 602Executes the given code block with the given arguments in a seperate
570process, returning the results. Everything must be serialisable with 603process, returning the results. Everything must be serialisable with
571Coro::Storable. May, of course, block. Note that the executed sub may 604Coro::Storable. May, of course, block. Note that the executed sub may
572never block itself or use any form of event handling. 605never block itself or use any form of event handling.
573 606
574=cut 607=cut
575 608
609sub post_fork {
610 reset_signals;
611}
612
576sub fork_call(&@) { 613sub fork_call(&@) {
577 my ($cb, @args) = @_; 614 my ($cb, @args) = @_;
578 615
579 # we seemingly have to make a local copy of the whole thing, 616 # we seemingly have to make a local copy of the whole thing,
580 # otherwise perl prematurely frees the stuff :/ 617 # otherwise perl prematurely frees the stuff :/
581 # TODO: investigate and fix (likely this will be rather laborious) 618 # TODO: investigate and fix (likely this will be rather laborious)
582 619
583 my @res = Coro::Util::fork_eval { 620 my @res = Coro::Util::fork_eval {
584 reset_signals; 621 cf::post_fork;
585 &$cb 622 &$cb
586 }, @args; 623 } @args;
587 624
588 wantarray ? @res : $res[-1] 625 wantarray ? @res : $res[-1]
626}
627
628sub objinfo {
629 (
630 "counter value" => cf::object::object_count,
631 "objects created" => cf::object::create_count,
632 "objects destroyed" => cf::object::destroy_count,
633 "freelist size" => cf::object::free_count,
634 "allocated objects" => cf::object::objects_size,
635 "active objects" => cf::object::actives_size,
636 )
589} 637}
590 638
591=item $coin = coin_from_name $name 639=item $coin = coin_from_name $name
592 640
593=cut 641=cut
… …
630within each server. 678within each server.
631 679
632=cut 680=cut
633 681
634sub db_table($) { 682sub db_table($) {
683 cf::error "db_get called from main context"
684 if $Coro::current == $Coro::main;
685
635 my ($name) = @_; 686 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV; 687 my $db = BDB::db_create $DB_ENV;
637 688
638 eval { 689 eval {
639 $db->set_flags (BDB::CHKSUM); 690 $db->set_flags (BDB::CHKSUM);
… …
649} 700}
650 701
651our $DB; 702our $DB;
652 703
653sub db_init { 704sub db_init {
654 cf::sync_job {
655 $DB ||= db_table "db"; 705 $DB ||= db_table "db";
656 };
657} 706}
658 707
659sub db_get($$) { 708sub db_get($$) {
660 my $key = "$_[0]/$_[1]"; 709 my $key = "$_[0]/$_[1]";
661 710
662 cf::sync_job { 711 cf::error "db_get called from main context"
712 if $Coro::current == $Coro::main;
713
663 BDB::db_get $DB, undef, $key, my $data; 714 BDB::db_get $DB, undef, $key, my $data;
664 715
665 $! ? () 716 $! ? ()
666 : $data 717 : $data
667 }
668} 718}
669 719
670sub db_put($$$) { 720sub db_put($$$) {
671 BDB::dbreq_pri 4; 721 BDB::dbreq_pri 4;
672 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 722 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
728 778
729 my $t1 = Time::HiRes::time; 779 my $t1 = Time::HiRes::time;
730 my $data = $process->(\@data); 780 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time; 781 my $t2 = Time::HiRes::time;
732 782
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 783 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734 784
735 db_put cache => "$id/data", $data; 785 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5; 786 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta; 787 db_put cache => "$id/meta", $meta;
738 788
… …
748 798
749=cut 799=cut
750 800
751sub datalog($@) { 801sub datalog($@) {
752 my ($type, %kv) = @_; 802 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 803 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754} 804}
755 805
756=back 806=back
757 807
758=cut 808=cut
… …
953 1003
954 } elsif (exists $cb_id{$type}) { 1004 } elsif (exists $cb_id{$type}) {
955 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1005 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956 1006
957 } elsif (ref $type) { 1007 } elsif (ref $type) {
958 warn "attaching objects not supported, ignoring.\n"; 1008 error "attaching objects not supported, ignoring.\n";
959 1009
960 } else { 1010 } else {
961 shift @arg; 1011 shift @arg;
962 warn "attach argument '$type' not supported, ignoring.\n"; 1012 error "attach argument '$type' not supported, ignoring.\n";
963 } 1013 }
964 } 1014 }
965} 1015}
966 1016
967sub _object_attach { 1017sub _object_attach {
… …
977 _attach $registry, $klass, @attach; 1027 _attach $registry, $klass, @attach;
978 } 1028 }
979 1029
980 $obj->{$name} = \%arg; 1030 $obj->{$name} = \%arg;
981 } else { 1031 } else {
982 warn "object uses attachment '$name' which is not available, postponing.\n"; 1032 info "object uses attachment '$name' which is not available, postponing.\n";
983 } 1033 }
984 1034
985 $obj->{_attachment}{$name} = undef; 1035 $obj->{_attachment}{$name} = undef;
986} 1036}
987 1037
… …
1046 1096
1047 for (@$callbacks) { 1097 for (@$callbacks) {
1048 eval { &{$_->[1]} }; 1098 eval { &{$_->[1]} };
1049 1099
1050 if ($@) { 1100 if ($@) {
1051 warn "$@";
1052 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1101 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053 override; 1102 override;
1054 } 1103 }
1055 1104
1056 return 1 if $override; 1105 return 1 if $override;
1057 } 1106 }
… …
1136 for (@$attach) { 1185 for (@$attach) {
1137 my ($klass, @attach) = @$_; 1186 my ($klass, @attach) = @$_;
1138 _attach $registry, $klass, @attach; 1187 _attach $registry, $klass, @attach;
1139 } 1188 }
1140 } else { 1189 } else {
1141 warn "object uses attachment '$name' that is not available, postponing.\n"; 1190 info "object uses attachment '$name' that is not available, postponing.\n";
1142 } 1191 }
1143 } 1192 }
1144} 1193}
1145 1194
1146cf::attachable->attach ( 1195cf::attachable->attach (
… …
1173 my ($filename, $rdata, $objs) = @_; 1222 my ($filename, $rdata, $objs) = @_;
1174 1223
1175 sync_job { 1224 sync_job {
1176 if (length $$rdata) { 1225 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1226 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1227 trace sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1228 $decname, length $$rdata, scalar @$objs
1229 if $VERBOSE_IO;
1180 1230
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1231 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1232 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1233 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1234 if ($cf::USE_FSYNC) {
… …
1206 aio_rename "$filename~", $filename; 1256 aio_rename "$filename~", $filename;
1207 1257
1208 $filename =~ s%/[^/]+$%%; 1258 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC; 1259 aio_pathsync $filename if $cf::USE_FSYNC;
1210 } else { 1260 } else {
1211 warn "unable to save objects: $filename~: $!\n"; 1261 error "unable to save objects: $filename~: $!\n";
1212 } 1262 }
1213 } else { 1263 } else {
1214 aio_unlink $filename; 1264 aio_unlink $filename;
1215 aio_unlink "$filename.pst"; 1265 aio_unlink "$filename.pst";
1216 } 1266 }
… …
1240 my $st = eval { Coro::Storable::thaw $av }; 1290 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs}; 1291 $av = $st->{objs};
1242 } 1292 }
1243 1293
1244 utf8::decode (my $decname = $filename); 1294 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1295 trace sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1296 $decname, length $data, scalar @{$av || []}
1297 if $VERBOSE_IO;
1247 1298
1248 ($data, $av) 1299 ($data, $av)
1249} 1300}
1250 1301
1251=head2 COMMAND CALLBACKS 1302=head2 COMMAND CALLBACKS
… …
1310} 1361}
1311 1362
1312use File::Glob (); 1363use File::Glob ();
1313 1364
1314cf::player->attach ( 1365cf::player->attach (
1315 on_command => sub { 1366 on_unknown_command => sub {
1316 my ($pl, $name, $params) = @_; 1367 my ($pl, $name, $params) = @_;
1317 1368
1318 my $cb = $COMMAND{$name} 1369 my $cb = $COMMAND{$name}
1319 or return; 1370 or return;
1320 1371
… …
1343 1394
1344 $pl->ext_reply ($reply, @reply) 1395 $pl->ext_reply ($reply, @reply)
1345 if $reply; 1396 if $reply;
1346 1397
1347 } else { 1398 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1399 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1400 }
1350 1401
1351 cf::override; 1402 cf::override;
1352 }, 1403 },
1353); 1404);
… …
1364 1415
1365 $grp 1416 $grp
1366} 1417}
1367 1418
1368sub load_extensions { 1419sub load_extensions {
1420 info "loading extensions...";
1421
1369 cf::sync_job { 1422 cf::sync_job {
1370 my %todo; 1423 my %todo;
1371 1424
1372 for my $path (<$LIBDIR/*.ext>) { 1425 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1426 next unless -r $path;
… …
1391 1444
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1445 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1446 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394 1447
1395 $ext{source} = 1448 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1449 "package $pkg; use common::sense;\n"
1397 . "#line 1 \"$path\"\n{\n" 1450 . "#line 1 \"$path\"\n{\n"
1398 . $source 1451 . $source
1399 . "\n};\n1"; 1452 . "\n};\n1";
1400 1453
1401 $todo{$base} = \%ext; 1454 $todo{$base} = \%ext;
1402 } 1455 }
1403 1456
1457 my $pass = 0;
1404 my %done; 1458 my %done;
1405 while (%todo) { 1459 while (%todo) {
1406 my $progress; 1460 my $progress;
1407 1461
1462 ++$pass;
1463
1464 ext:
1408 while (my ($k, $v) = each %todo) { 1465 while (my ($k, $v) = each %todo) {
1409 for (split /,\s*/, $v->{meta}{depends}) { 1466 for (split /,\s*/, $v->{meta}{depends}) {
1410 goto skip 1467 next ext
1411 unless exists $done{$_}; 1468 unless exists $done{$_};
1412 } 1469 }
1413 1470
1414 warn "... loading '$k' into '$v->{pkg}'\n"; 1471 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1415 1472
1416 unless (eval $v->{source}) { 1473 my $active = eval $v->{source};
1474
1475 if (length $@) {
1417 my $msg = $@ ? "$v->{path}: $@\n" 1476 error "$v->{path}: $@\n";
1418 : "$v->{base}: extension inactive.\n";
1419 1477
1420 if (exists $v->{meta}{mandatory}) {
1421 warn $msg;
1422 cf::cleanup "mandatory extension failed to load, exiting."; 1478 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1423 } 1479 if exists $v->{meta}{mandatory};
1424 1480
1425 warn $msg; 1481 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1482 delete $todo{$k};
1483 } else {
1484 $done{$k} = delete $todo{$k};
1485 push @EXTS, $v->{pkg};
1486 $progress = 1;
1487
1488 info "$v->{base}: extension inactive.\n"
1489 unless $active;
1426 } 1490 }
1427
1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431 } 1491 }
1432 1492
1433 skip: 1493 unless ($progress) {
1434 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1494 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1435 unless $progress; 1495
1496 while (my ($k, $v) = each %todo) {
1497 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1498 if exists $v->{meta}{mandatory};
1499 }
1500 }
1436 } 1501 }
1437 }; 1502 };
1438} 1503}
1439 1504
1440############################################################################# 1505#############################################################################
… …
1524 $cf::PLAYER{$login} = $pl 1589 $cf::PLAYER{$login} = $pl
1525 } 1590 }
1526 } 1591 }
1527} 1592}
1528 1593
1594cf::player->attach (
1595 on_load => sub {
1596 my ($pl, $path) = @_;
1597
1598 # restore slots saved in save, below
1599 my $slots = delete $pl->{_slots};
1600
1601 $pl->ob->current_weapon ($slots->[0]);
1602 $pl->combat_ob ($slots->[1]);
1603 $pl->ranged_ob ($slots->[2]);
1604 },
1605);
1606
1529sub save($) { 1607sub save($) {
1530 my ($pl) = @_; 1608 my ($pl) = @_;
1531 1609
1532 return if $pl->{deny_save}; 1610 return if $pl->{deny_save};
1533 1611
… …
1538 1616
1539 aio_mkdir playerdir $pl, 0770; 1617 aio_mkdir playerdir $pl, 0770;
1540 $pl->{last_save} = $cf::RUNTIME; 1618 $pl->{last_save} = $cf::RUNTIME;
1541 1619
1542 cf::get_slot 0.01; 1620 cf::get_slot 0.01;
1621
1622 # save slots, to be restored later
1623 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1543 1624
1544 $pl->save_pl ($path); 1625 $pl->save_pl ($path);
1545 cf::cede_to_tick; 1626 cf::cede_to_tick;
1546} 1627}
1547 1628
… …
1581 my $name = $pl->ob->name; 1662 my $name = $pl->ob->name;
1582 1663
1583 $pl->{deny_save} = 1; 1664 $pl->{deny_save} = 1;
1584 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1665 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1585 1666
1586 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1587 $pl->deactivate; 1668 $pl->deactivate;
1669
1588 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1670 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1589 $pl->ob->check_score;
1590 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1671 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1672 ext::highscore::check ($pl->ob);
1673
1591 $pl->ns->destroy if $pl->ns; 1674 $pl->ns->destroy if $pl->ns;
1592 1675
1593 my $path = playerdir $pl; 1676 my $path = playerdir $pl;
1594 my $temp = "$path~$cf::RUNTIME~deleting~"; 1677 my $temp = "$path~$cf::RUNTIME~deleting~";
1595 aio_rename $path, $temp; 1678 aio_rename $path, $temp;
… …
1649 \@logins 1732 \@logins
1650} 1733}
1651 1734
1652=item $player->maps 1735=item $player->maps
1653 1736
1737=item cf::player::maps $login
1738
1654Returns an arrayref of map paths that are private for this 1739Returns an arrayref of map paths that are private for this
1655player. May block. 1740player. May block.
1656 1741
1657=cut 1742=cut
1658 1743
… …
1720=cut 1805=cut
1721 1806
1722sub find_by_path($) { 1807sub find_by_path($) {
1723 my ($path) = @_; 1808 my ($path) = @_;
1724 1809
1810 $path =~ s/^~[^\/]*//; # skip ~login
1811
1725 my ($match, $specificity); 1812 my ($match, $specificity);
1726 1813
1727 for my $region (list) { 1814 for my $region (list) {
1728 if ($region->{match} && $path =~ $region->{match}) { 1815 if ($region->{match} && $path =~ $region->{match}) {
1729 ($match, $specificity) = ($region, $region->specificity) 1816 ($match, $specificity) = ($region, $region->specificity)
… …
1760 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1847 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1761 1848
1762 # mit "rum" bekleckern, nicht 1849 # mit "rum" bekleckern, nicht
1763 $self->_create_random_map ( 1850 $self->_create_random_map (
1764 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1851 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1765 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1852 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1766 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1853 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1767 $rmp->{exit_on_final_map}, 1854 $rmp->{exit_on_final_map},
1768 $rmp->{xsize}, $rmp->{ysize}, 1855 $rmp->{xsize}, $rmp->{ysize},
1769 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1856 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1770 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1857 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1785 1872
1786sub register { 1873sub register {
1787 my (undef, $regex, $prio) = @_; 1874 my (undef, $regex, $prio) = @_;
1788 my $pkg = caller; 1875 my $pkg = caller;
1789 1876
1790 no strict;
1791 push @{"$pkg\::ISA"}, __PACKAGE__; 1877 push @{"$pkg\::ISA"}, __PACKAGE__;
1792 1878
1793 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1879 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1794} 1880}
1795 1881
1796# also paths starting with '/' 1882# also paths starting with '/'
1797$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1883$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1798 1884
1799sub thawer_merge { 1885sub thawer_merge {
1800 my ($self, $merge) = @_; 1886 my ($self, $merge) = @_;
1801 1887
1802 # we have to keep some variables in memory intact 1888 # we have to keep some variables in memory intact
… …
1807} 1893}
1808 1894
1809sub normalise { 1895sub normalise {
1810 my ($path, $base) = @_; 1896 my ($path, $base) = @_;
1811 1897
1812 $path = "$path"; # make sure its a string 1898 $path = "$path"; # make sure it's a string
1813 1899
1814 $path =~ s/\.map$//; 1900 $path =~ s/\.map$//;
1815 1901
1816 # map plan: 1902 # map plan:
1817 # 1903 #
… …
1856 $self->init; # pass $1 etc. 1942 $self->init; # pass $1 etc.
1857 return $self; 1943 return $self;
1858 } 1944 }
1859 } 1945 }
1860 1946
1861 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1947 Carp::cluck "unable to resolve path '$path' (base '$base')";
1862 () 1948 ()
1863} 1949}
1864 1950
1865sub init { 1951sub init {
1866 my ($self) = @_; 1952 my ($self) = @_;
… …
1988} 2074}
1989 2075
1990sub find; 2076sub find;
1991sub find { 2077sub find {
1992 my ($path, $origin) = @_; 2078 my ($path, $origin) = @_;
2079
2080 cf::cede_to_tick;
1993 2081
1994 $path = normalise $path, $origin && $origin->path; 2082 $path = normalise $path, $origin && $origin->path;
1995 2083
1996 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997 my $guard2 = cf::lock_acquire "map_find:$path"; 2085 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2084 } 2172 }
2085 2173
2086 $self->post_load; 2174 $self->post_load;
2087} 2175}
2088 2176
2177# customize the map for a given player, i.e.
2178# return the _real_ map. used by e.g. per-player
2179# maps to change the path to ~playername/mappath
2089sub customise_for { 2180sub customise_for {
2090 my ($self, $ob) = @_; 2181 my ($self, $ob) = @_;
2091 2182
2092 return find "~" . $ob->name . "/" . $self->{path} 2183 return find "~" . $ob->name . "/" . $self->{path}
2093 if $self->per_player; 2184 if $self->per_player;
… …
2109 or next; 2200 or next;
2110 $neigh = find $neigh, $map 2201 $neigh = find $neigh, $map
2111 or next; 2202 or next;
2112 $neigh->load; 2203 $neigh->load;
2113 2204
2205 # now find the diagonal neighbours
2114 push @neigh, 2206 push @neigh,
2115 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2207 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2116 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2208 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2117 } 2209 }
2118 2210
… …
2125} 2217}
2126 2218
2127sub find_sync { 2219sub find_sync {
2128 my ($path, $origin) = @_; 2220 my ($path, $origin) = @_;
2129 2221
2130 cf::sync_job { find $path, $origin } 2222 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2223 if $Coro::current == $Coro::main;
2224
2225 find $path, $origin
2131} 2226}
2132 2227
2133sub do_load_sync { 2228sub do_load_sync {
2134 my ($map) = @_; 2229 my ($map) = @_;
2135 2230
2136 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2137 if $Coro::current == $Coro::main; 2232 if $Coro::current == $Coro::main;
2138 2233
2139 cf::sync_job { $map->load }; 2234 $map->load;
2140} 2235}
2141 2236
2142our %MAP_PREFETCH; 2237our %MAP_PREFETCH;
2143our $MAP_PREFETCHER = undef; 2238our $MAP_PREFETCHER = undef;
2144 2239
… …
2170 $MAP_PREFETCHER->prio (6); 2265 $MAP_PREFETCHER->prio (6);
2171 2266
2172 () 2267 ()
2173} 2268}
2174 2269
2270# common code, used by both ->save and ->swapout
2175sub save { 2271sub _save {
2176 my ($self) = @_; 2272 my ($self) = @_;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2273
2180 $self->{last_save} = $cf::RUNTIME; 2274 $self->{last_save} = $cf::RUNTIME;
2181 2275
2182 return unless $self->dirty; 2276 return unless $self->dirty;
2183 2277
… …
2203 } else { 2297 } else {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2298 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2205 } 2299 }
2206} 2300}
2207 2301
2302sub save {
2303 my ($self) = @_;
2304
2305 my $lock = cf::lock_acquire "map_data:$self->{path}";
2306
2307 $self->_save;
2308}
2309
2208sub swap_out { 2310sub swap_out {
2209 my ($self) = @_; 2311 my ($self) = @_;
2210 2312
2211 # save first because save cedes
2212 $self->save;
2213
2214 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215 2314
2216 return if $self->players;
2217 return if $self->in_memory != cf::MAP_ACTIVE; 2315 return if $self->in_memory != cf::MAP_ACTIVE;
2218 return if $self->{deny_save}; 2316 return if $self->{deny_save};
2317 return if $self->players;
2219 2318
2319 # first deactivate the map and "unlink" it from the core
2320 $self->deactivate;
2321 $_->clear_links_to ($self) for values %cf::MAP;
2220 $self->in_memory (cf::MAP_SWAPPED); 2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # then atomically save
2325 $self->_save;
2326
2327 # then free the map
2328 $self->clear;
2329}
2330
2331sub reset_at {
2332 my ($self) = @_;
2333
2334 # TODO: safety, remove and allow resettable per-player maps
2335 return 1e99 if $self->{deny_reset};
2336
2337 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2338 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2339
2340 $time + $to
2341}
2342
2343sub should_reset {
2344 my ($self) = @_;
2345
2346 $self->reset_at <= $cf::RUNTIME
2347}
2348
2349sub reset {
2350 my ($self) = @_;
2351
2352 my $lock = cf::lock_acquire "map_data:$self->{path}";
2353
2354 return if $self->players;
2355
2356 cf::trace "resetting map ", $self->path, "\n";
2357
2358 $self->in_memory (cf::MAP_SWAPPED);
2359
2360 # need to save uniques path
2361 unless ($self->{deny_save}) {
2362 my $uniq = $self->uniq_path; utf8::encode $uniq;
2363
2364 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2365 if $uniq;
2366 }
2367
2368 delete $cf::MAP{$self->path};
2221 2369
2222 $self->deactivate; 2370 $self->deactivate;
2223 $_->clear_links_to ($self) for values %cf::MAP; 2371 $_->clear_links_to ($self) for values %cf::MAP;
2224 $self->clear; 2372 $self->clear;
2225}
2226
2227sub reset_at {
2228 my ($self) = @_;
2229
2230 # TODO: safety, remove and allow resettable per-player maps
2231 return 1e99 if $self->{deny_reset};
2232
2233 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2234 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2235
2236 $time + $to
2237}
2238
2239sub should_reset {
2240 my ($self) = @_;
2241
2242 $self->reset_at <= $cf::RUNTIME
2243}
2244
2245sub reset {
2246 my ($self) = @_;
2247
2248 my $lock = cf::lock_acquire "map_data:$self->{path}";
2249
2250 return if $self->players;
2251
2252 warn "resetting map ", $self->path, "\n";
2253
2254 $self->in_memory (cf::MAP_SWAPPED);
2255
2256 # need to save uniques path
2257 unless ($self->{deny_save}) {
2258 my $uniq = $self->uniq_path; utf8::encode $uniq;
2259
2260 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2261 if $uniq;
2262 }
2263
2264 delete $cf::MAP{$self->path};
2265
2266 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP;
2268 $self->clear;
2269 2373
2270 $self->unlink_save; 2374 $self->unlink_save;
2271 $self->destroy; 2375 $self->destroy;
2272} 2376}
2273 2377
… …
2281 2385
2282 delete $cf::MAP{$self->path}; 2386 delete $cf::MAP{$self->path};
2283 2387
2284 $self->unlink_save; 2388 $self->unlink_save;
2285 2389
2286 bless $self, "cf::map"; 2390 bless $self, "cf::map::wrap";
2287 delete $self->{deny_reset}; 2391 delete $self->{deny_reset};
2288 $self->{deny_save} = 1; 2392 $self->{deny_save} = 1;
2289 $self->reset_timeout (1); 2393 $self->reset_timeout (1);
2290 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2394 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2291 2395
… …
2521 2625
2522Freezes the player and moves him/her to a special map (C<{link}>). 2626Freezes the player and moves him/her to a special map (C<{link}>).
2523 2627
2524The player should be reasonably safe there for short amounts of time (e.g. 2628The player should be reasonably safe there for short amounts of time (e.g.
2525for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2629for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2526though, as the palyer cannot control the character while it is on the link 2630though, as the player cannot control the character while it is on the link
2527map. 2631map.
2528 2632
2529Will never block. 2633Will never block.
2530 2634
2531=item $player_object->leave_link ($map, $x, $y) 2635=item $player_object->leave_link ($map, $x, $y)
… …
2552sub cf::object::player::enter_link { 2656sub cf::object::player::enter_link {
2553 my ($self) = @_; 2657 my ($self) = @_;
2554 2658
2555 $self->deactivate_recursive; 2659 $self->deactivate_recursive;
2556 2660
2661 ++$self->{_link_recursion};
2662
2557 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2663 return if UNIVERSAL::isa $self->map, "ext::map_link";
2558 2664
2559 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2665 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2560 if $self->map && $self->map->{path} ne "{link}"; 2666 if $self->map && $self->map->{path} ne "{link}";
2561 2667
2562 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2668 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2563} 2669}
2564 2670
2565sub cf::object::player::leave_link { 2671sub cf::object::player::leave_link {
2566 my ($self, $map, $x, $y) = @_; 2672 my ($self, $map, $x, $y) = @_;
2567 2673
… …
2592 $map->load_neighbours; 2698 $map->load_neighbours;
2593 2699
2594 return unless $self->contr->active; 2700 return unless $self->contr->active;
2595 2701
2596 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2702 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2597 $self->enter_map ($map, $x, $y); 2703 if ($self->enter_map ($map, $x, $y)) {
2598 2704 # entering was successful
2705 delete $self->{_link_recursion};
2599 # only activate afterwards, to support waiting in hooks 2706 # only activate afterwards, to support waiting in hooks
2600 $self->activate_recursive; 2707 $self->activate_recursive;
2601} 2708 }
2602 2709
2710}
2711
2603=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2712=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2604 2713
2605Moves the player to the given map-path and coordinates by first freezing 2714Moves the player to the given map-path and coordinates by first freezing
2606her, loading and preparing them map, calling the provided $check callback 2715her, loading and preparing them map, calling the provided $check callback
2607that has to return the map if sucecssful, and then unfreezes the player on 2716that has to return the map if sucecssful, and then unfreezes the player on
2608the new (success) or old (failed) map position. In either case, $done will 2717the new (success) or old (failed) map position. In either case, $done will
… …
2615 2724
2616our $GOTOGEN; 2725our $GOTOGEN;
2617 2726
2618sub cf::object::player::goto { 2727sub cf::object::player::goto {
2619 my ($self, $path, $x, $y, $check, $done) = @_; 2728 my ($self, $path, $x, $y, $check, $done) = @_;
2729
2730 if ($self->{_link_recursion} >= $MAX_LINKS) {
2731 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2732 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2733 ($path, $x, $y) = @$EMERGENCY_POSITION;
2734 }
2620 2735
2621 # do generation counting so two concurrent goto's will be executed in-order 2736 # do generation counting so two concurrent goto's will be executed in-order
2622 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2737 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2623 2738
2624 $self->enter_link; 2739 $self->enter_link;
… …
2648 my $map = eval { 2763 my $map = eval {
2649 my $map = defined $path ? cf::map::find $path : undef; 2764 my $map = defined $path ? cf::map::find $path : undef;
2650 2765
2651 if ($map) { 2766 if ($map) {
2652 $map = $map->customise_for ($self); 2767 $map = $map->customise_for ($self);
2653 $map = $check->($map) if $check && $map; 2768 $map = $check->($map, $x, $y, $self) if $check && $map;
2654 } else { 2769 } else {
2655 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2770 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2656 } 2771 }
2657 2772
2658 $map 2773 $map
… …
2666 if ($gen == $self->{_goto_generation}) { 2781 if ($gen == $self->{_goto_generation}) {
2667 delete $self->{_goto_generation}; 2782 delete $self->{_goto_generation};
2668 $self->leave_link ($map, $x, $y); 2783 $self->leave_link ($map, $x, $y);
2669 } 2784 }
2670 2785
2671 $done->() if $done; 2786 $done->($self) if $done;
2672 })->prio (1); 2787 })->prio (1);
2673} 2788}
2674 2789
2675=item $player_object->enter_exit ($exit_object) 2790=item $player_object->enter_exit ($exit_object)
2676 2791
… …
2769 $self->message ("Something went wrong deep within the deliantra server. " 2884 $self->message ("Something went wrong deep within the deliantra server. "
2770 . "I'll try to bring you back to the map you were before. " 2885 . "I'll try to bring you back to the map you were before. "
2771 . "Please report this to the dungeon master!", 2886 . "Please report this to the dungeon master!",
2772 cf::NDI_UNIQUE | cf::NDI_RED); 2887 cf::NDI_UNIQUE | cf::NDI_RED);
2773 2888
2774 warn "ERROR in enter_exit: $@"; 2889 error "ERROR in enter_exit: $@";
2775 $self->leave_link; 2890 $self->leave_link;
2776 } 2891 }
2777 })->prio (1); 2892 })->prio (1);
2778} 2893}
2779 2894
… …
3092 3207
3093 $ns->ext_reply ($reply, @reply) 3208 $ns->ext_reply ($reply, @reply)
3094 if $reply; 3209 if $reply;
3095 3210
3096 } else { 3211 } else {
3097 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3212 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3098 } 3213 }
3099 3214
3100 cf::override; 3215 cf::override;
3101 }, 3216 },
3102); 3217);
… …
3122 3237
3123 $coro 3238 $coro
3124} 3239}
3125 3240
3126cf::client->attach ( 3241cf::client->attach (
3127 on_destroy => sub { 3242 on_client_destroy => sub {
3128 my ($ns) = @_; 3243 my ($ns) = @_;
3129 3244
3130 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3245 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3131 }, 3246 },
3132); 3247);
… …
3183 decrease split destroy change_exp value msg lore send_msg)], 3298 decrease split destroy change_exp value msg lore send_msg)],
3184 ["cf::object::player" => qw(player)], 3299 ["cf::object::player" => qw(player)],
3185 ["cf::player" => qw(peaceful send_msg)], 3300 ["cf::player" => qw(peaceful send_msg)],
3186 ["cf::map" => qw(trigger)], 3301 ["cf::map" => qw(trigger)],
3187) { 3302) {
3188 no strict 'refs';
3189 my ($pkg, @funs) = @$_; 3303 my ($pkg, @funs) = @$_;
3190 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3304 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3191 for @funs; 3305 for @funs;
3192} 3306}
3193 3307
… …
3232 local @cf::_safe_eval_args = values %vars; 3346 local @cf::_safe_eval_args = values %vars;
3233 @res = wantarray ? eval eval : scalar eval $eval; 3347 @res = wantarray ? eval eval : scalar eval $eval;
3234 } 3348 }
3235 3349
3236 if ($@) { 3350 if ($@) {
3237 warn "$@"; 3351 warn "$@",
3238 warn "while executing safe code '$code'\n"; 3352 "while executing safe code '$code'\n",
3239 warn "with arguments " . (join " ", %vars) . "\n"; 3353 "with arguments " . (join " ", %vars) . "\n";
3240 } 3354 }
3241 3355
3242 wantarray ? @res : $res[0] 3356 wantarray ? @res : $res[0]
3243} 3357}
3244 3358
… …
3278 # for this (global event?) 3392 # for this (global event?)
3279 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3280 3394
3281 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3395 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3282 3396
3283 warn "loading facedata from $path\n"; 3397 trace "loading facedata from $path\n";
3284 3398
3285 my $facedata;
3286 0 < aio_load $path, $facedata 3399 0 < aio_load $path, my $facedata
3287 or die "$path: $!"; 3400 or die "$path: $!";
3288 3401
3289 $facedata = Coro::Storable::thaw $facedata; 3402 $facedata = Coro::Storable::thaw $facedata;
3290 3403
3291 $facedata->{version} == 2 3404 $facedata->{version} == 2
… …
3322 3435
3323 if (my $smooth = cf::face::find $info->{smooth}) { 3436 if (my $smooth = cf::face::find $info->{smooth}) {
3324 cf::face::set_smooth $idx, $smooth; 3437 cf::face::set_smooth $idx, $smooth;
3325 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3438 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3326 } else { 3439 } else {
3327 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3440 error "smooth face '$info->{smooth}' not found for face '$face'";
3328 } 3441 }
3329 3442
3330 cf::cede_to_tick; 3443 cf::cede_to_tick;
3331 } 3444 }
3332 } 3445 }
… …
3350 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3463 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3351 3464
3352 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3465 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3353 cf::face::set_type $idx, $info->{type}; 3466 cf::face::set_type $idx, $info->{type};
3354 } else { 3467 } else {
3355 $RESOURCE{$name} = $info; 3468 $RESOURCE{$name} = $info; # unused
3356 } 3469 }
3357 3470
3358 cf::cede_to_tick; 3471 cf::cede_to_tick;
3359 } 3472 }
3360 } 3473 }
3361 3474
3362 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3475 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3363 3476
3364 1 3477 1
3365} 3478}
3366
3367cf::global->attach (on_resource_update => sub {
3368 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3369 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3370
3371 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3372 my $sound = $soundconf->{compat}[$_]
3373 or next;
3374
3375 my $face = cf::face::find "sound/$sound->[1]";
3376 cf::sound::set $sound->[0] => $face;
3377 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3378 }
3379
3380 while (my ($k, $v) = each %{$soundconf->{event}}) {
3381 my $face = cf::face::find "sound/$v";
3382 cf::sound::set $k => $face;
3383 }
3384 }
3385});
3386 3479
3387register_exticmd fx_want => sub { 3480register_exticmd fx_want => sub {
3388 my ($ns, $want) = @_; 3481 my ($ns, $want) = @_;
3389 3482
3390 while (my ($k, $v) = each %$want) { 3483 while (my ($k, $v) = each %$want) {
… …
3429sub reload_treasures { 3522sub reload_treasures {
3430 load_resource_file "$DATADIR/treasures" 3523 load_resource_file "$DATADIR/treasures"
3431 or die "unable to load treasurelists\n"; 3524 or die "unable to load treasurelists\n";
3432} 3525}
3433 3526
3527sub reload_sound {
3528 trace "loading sound config from $DATADIR/sound\n";
3529
3530 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3531 or die "$DATADIR/sound $!";
3532
3533 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3534
3535 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3536 my $sound = $soundconf->{compat}[$_]
3537 or next;
3538
3539 my $face = cf::face::find "sound/$sound->[1]";
3540 cf::sound::set $sound->[0] => $face;
3541 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3542 }
3543
3544 while (my ($k, $v) = each %{$soundconf->{event}}) {
3545 my $face = cf::face::find "sound/$v";
3546 cf::sound::set $k => $face;
3547 }
3548}
3549
3434sub reload_resources { 3550sub reload_resources {
3435 warn "reloading resource files...\n"; 3551 trace "reloading resource files...\n";
3436 3552
3553 reload_exp_table;
3554 reload_materials;
3437 reload_facedata; 3555 reload_facedata;
3556 reload_sound;
3438 reload_archetypes; 3557 reload_archetypes;
3439 reload_regions; 3558 reload_regions;
3440 reload_treasures; 3559 reload_treasures;
3441 3560
3442 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3443} 3562}
3444 3563
3445sub reload_config { 3564sub reload_config {
3446 warn "reloading config file...\n"; 3565 trace "reloading config file...\n";
3447 3566
3448 open my $fh, "<:utf8", "$CONFDIR/config" 3567 0 < aio_load "$CONFDIR/config", my $config
3449 or return; 3568 or die "$CONFDIR/config: $!";
3450 3569
3451 local $/; 3570 utf8::decode $config;
3452 *CFG = YAML::XS::Load scalar <$fh>; 3571 *CFG = yaml_load $config;
3453 3572
3454 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3455 3574
3456 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3575 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3457 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3576 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3458 3577
3459 if (exists $CFG{mlockall}) { 3578 if (exists $CFG{mlockall}) {
… …
3461 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3580 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3462 and die "WARNING: m(un)lockall failed: $!\n"; 3581 and die "WARNING: m(un)lockall failed: $!\n";
3463 }; 3582 };
3464 warn $@ if $@; 3583 warn $@ if $@;
3465 } 3584 }
3466
3467 warn "finished reloading resource files\n";
3468} 3585}
3469 3586
3470sub pidfile() { 3587sub pidfile() {
3471 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3588 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3472 or die "$PIDFILE: $!"; 3589 or die "$PIDFILE: $!";
… …
3485 seek $fh, 0, 0; 3602 seek $fh, 0, 0;
3486 print $fh $$; 3603 print $fh $$;
3487} 3604}
3488 3605
3489sub main_loop { 3606sub main_loop {
3490 warn "EV::loop starting\n"; 3607 trace "EV::loop starting\n";
3491 if (1) { 3608 if (1) {
3492 EV::loop; 3609 EV::loop;
3493 } 3610 }
3494 warn "EV::loop returned\n"; 3611 trace "EV::loop returned\n";
3495 goto &main_loop unless $REALLY_UNLOOP; 3612 goto &main_loop unless $REALLY_UNLOOP;
3496} 3613}
3497 3614
3498sub main { 3615sub main {
3499 cf::init_globals; # initialise logging 3616 cf::init_globals; # initialise logging
3500 3617
3501 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3618 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3502 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3619 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3503 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3620 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3504 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3621 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3505
3506 cf::init_experience;
3507 cf::init_anim;
3508 cf::init_attackmess;
3509 cf::init_dynamic;
3510 3622
3511 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3623 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3512 3624
3513 # we must not ever block the main coroutine 3625 # we must not ever block the main coroutine
3514 local $Coro::idle = sub { 3626 local $Coro::idle = sub {
… …
3520 }; 3632 };
3521 3633
3522 evthread_start IO::AIO::poll_fileno; 3634 evthread_start IO::AIO::poll_fileno;
3523 3635
3524 cf::sync_job { 3636 cf::sync_job {
3637 cf::incloader::init ();
3638
3639 cf::init_anim;
3640 cf::init_attackmess;
3641 cf::init_dynamic;
3642
3525 cf::load_settings; 3643 cf::load_settings;
3526 cf::load_materials;
3527 3644
3528 reload_resources; 3645 reload_resources;
3529 reload_config; 3646 reload_config;
3530 db_init; 3647 db_init;
3531 3648
3532 cf::init_uuid; 3649 cf::init_uuid;
3533 cf::init_signals; 3650 cf::init_signals;
3534 cf::init_commands;
3535 cf::init_skills; 3651 cf::init_skills;
3536 3652
3537 cf::init_beforeplay; 3653 cf::init_beforeplay;
3538 3654
3539 atomic; 3655 atomic;
… …
3547 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3663 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3548 3664
3549 (pop @POST_INIT)->(0) while @POST_INIT; 3665 (pop @POST_INIT)->(0) while @POST_INIT;
3550 }; 3666 };
3551 3667
3668 cf::object::thawer::errors_are_fatal 0;
3669 info "parse errors in files are no longer fatal from this point on.\n";
3670
3671 my $free_main; $free_main = EV::idle sub {
3672 undef $free_main;
3673 undef &main; # free gobs of memory :)
3674 };
3675
3552 main_loop; 3676 goto &main_loop;
3553} 3677}
3554 3678
3555############################################################################# 3679#############################################################################
3556# initialisation and cleanup 3680# initialisation and cleanup
3557 3681
3558# install some emergency cleanup handlers 3682# install some emergency cleanup handlers
3559BEGIN { 3683BEGIN {
3560 our %SIGWATCHER = (); 3684 our %SIGWATCHER = ();
3561 for my $signal (qw(INT HUP TERM)) { 3685 for my $signal (qw(INT HUP TERM)) {
3562 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3686 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3563 cf::cleanup "SIG$signal"; 3687 cf::cleanup "SIG$signal";
3564 }; 3688 };
3565 } 3689 }
3566} 3690}
3567 3691
3568sub write_runtime_sync { 3692sub write_runtime_sync {
3693 my $t0 = AE::time;
3694
3569 # first touch the runtime file to show we are still running: 3695 # first touch the runtime file to show we are still running:
3570 # the fsync below can take a very very long time. 3696 # the fsync below can take a very very long time.
3571 3697
3572 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3698 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3573 3699
3574 my $guard = cf::lock_acquire "write_runtime"; 3700 my $guard = cf::lock_acquire "write_runtime";
3575 3701
3576 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3702 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3577 or return; 3703 or return;
3578 3704
3579 my $value = $cf::RUNTIME + 90 + 10; 3705 my $value = $cf::RUNTIME + 90 + 10;
3580 # 10 is the runtime save interval, for a monotonic clock 3706 # 10 is the runtime save interval, for a monotonic clock
3581 # 60 allows for the watchdog to kill the server. 3707 # 60 allows for the watchdog to kill the server.
… …
3594 or return; 3720 or return;
3595 3721
3596 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3722 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3597 and return; 3723 and return;
3598 3724
3599 warn "runtime file written.\n"; 3725 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3600 3726
3601 1 3727 1
3602} 3728}
3603 3729
3604our $uuid_lock; 3730our $uuid_lock;
… …
3616 or return; 3742 or return;
3617 3743
3618 my $value = uuid_seq uuid_cur; 3744 my $value = uuid_seq uuid_cur;
3619 3745
3620 unless ($value) { 3746 unless ($value) {
3621 warn "cowardly refusing to write zero uuid value!\n"; 3747 info "cowardly refusing to write zero uuid value!\n";
3622 return; 3748 return;
3623 } 3749 }
3624 3750
3625 my $value = uuid_str $value + $uuid_skip; 3751 my $value = uuid_str $value + $uuid_skip;
3626 $uuid_skip = 0; 3752 $uuid_skip = 0;
… …
3636 or return; 3762 or return;
3637 3763
3638 aio_rename "$uuid~", $uuid 3764 aio_rename "$uuid~", $uuid
3639 and return; 3765 and return;
3640 3766
3641 warn "uuid file written ($value).\n"; 3767 trace "uuid file written ($value).\n";
3642 3768
3643 1 3769 1
3644 3770
3645} 3771}
3646 3772
… …
3652} 3778}
3653 3779
3654sub emergency_save() { 3780sub emergency_save() {
3655 my $freeze_guard = cf::freeze_mainloop; 3781 my $freeze_guard = cf::freeze_mainloop;
3656 3782
3657 warn "emergency_perl_save: enter\n"; 3783 info "emergency_perl_save: enter\n";
3784
3785 # this is a trade-off: we want to be very quick here, so
3786 # save all maps without fsync, and later call a global sync
3787 # (which in turn might be very very slow)
3788 local $USE_FSYNC = 0;
3658 3789
3659 cf::sync_job { 3790 cf::sync_job {
3660 # this is a trade-off: we want to be very quick here, so 3791 cf::write_runtime_sync; # external watchdog should not bark
3661 # save all maps without fsync, and later call a global sync
3662 # (which in turn might be very very slow)
3663 local $USE_FSYNC = 0;
3664 3792
3665 # use a peculiar iteration method to avoid tripping on perl 3793 # use a peculiar iteration method to avoid tripping on perl
3666 # refcount bugs in for. also avoids problems with players 3794 # refcount bugs in for. also avoids problems with players
3667 # and maps saved/destroyed asynchronously. 3795 # and maps saved/destroyed asynchronously.
3668 warn "emergency_perl_save: begin player save\n"; 3796 info "emergency_perl_save: begin player save\n";
3669 for my $login (keys %cf::PLAYER) { 3797 for my $login (keys %cf::PLAYER) {
3670 my $pl = $cf::PLAYER{$login} or next; 3798 my $pl = $cf::PLAYER{$login} or next;
3671 $pl->valid or next; 3799 $pl->valid or next;
3672 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3800 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3673 $pl->save; 3801 $pl->save;
3674 } 3802 }
3675 warn "emergency_perl_save: end player save\n"; 3803 info "emergency_perl_save: end player save\n";
3676 3804
3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3677 warn "emergency_perl_save: begin map save\n"; 3807 info "emergency_perl_save: begin map save\n";
3678 for my $path (keys %cf::MAP) { 3808 for my $path (keys %cf::MAP) {
3679 my $map = $cf::MAP{$path} or next; 3809 my $map = $cf::MAP{$path} or next;
3680 $map->valid or next; 3810 $map->valid or next;
3681 $map->save; 3811 $map->save;
3682 } 3812 }
3683 warn "emergency_perl_save: end map save\n"; 3813 info "emergency_perl_save: end map save\n";
3684 3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3685 warn "emergency_perl_save: begin database checkpoint\n"; 3817 info "emergency_perl_save: begin database checkpoint\n";
3686 BDB::db_env_txn_checkpoint $DB_ENV; 3818 BDB::db_env_txn_checkpoint $DB_ENV;
3687 warn "emergency_perl_save: end database checkpoint\n"; 3819 info "emergency_perl_save: end database checkpoint\n";
3688 3820
3689 warn "emergency_perl_save: begin write uuid\n"; 3821 info "emergency_perl_save: begin write uuid\n";
3690 write_uuid_sync 1; 3822 write_uuid_sync 1;
3691 warn "emergency_perl_save: end write uuid\n"; 3823 info "emergency_perl_save: end write uuid\n";
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: syncing database to disk";
3828 BDB::db_env_txn_checkpoint $DB_ENV;
3829
3830 info "emergency_perl_save: starting sync\n";
3831 IO::AIO::aio_sync sub {
3832 info "emergency_perl_save: finished sync\n";
3833 };
3834
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3837 trace "emergency_perl_save: flushing outstanding aio requests";
3838 while (IO::AIO::nreqs || BDB::nreqs) {
3839 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3840 }
3841
3842 cf::write_runtime_sync; # external watchdog should not bark
3692 }; 3843 };
3693 3844
3694 warn "emergency_perl_save: starting sync()\n";
3695 IO::AIO::aio_sync sub {
3696 warn "emergency_perl_save: finished sync()\n";
3697 };
3698
3699 warn "emergency_perl_save: leave\n"; 3845 info "emergency_perl_save: leave\n";
3700} 3846}
3701 3847
3702sub post_cleanup { 3848sub post_cleanup {
3703 my ($make_core) = @_; 3849 my ($make_core) = @_;
3704 3850
3851 IO::AIO::flush;
3852
3705 warn Carp::longmess "post_cleanup backtrace" 3853 error Carp::longmess "post_cleanup backtrace"
3706 if $make_core; 3854 if $make_core;
3707 3855
3708 my $fh = pidfile; 3856 my $fh = pidfile;
3709 unlink $PIDFILE if <$fh> == $$; 3857 unlink $PIDFILE if <$fh> == $$;
3710} 3858}
… …
3730 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3878 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3731 for my $name (keys %$leaf_symtab) { 3879 for my $name (keys %$leaf_symtab) {
3732 _gv_clear *{"$pkg$name"}; 3880 _gv_clear *{"$pkg$name"};
3733# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3881# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3734 } 3882 }
3735 warn "cleared package $pkg\n";#d#
3736} 3883}
3737 3884
3738sub do_reload_perl() { 3885sub do_reload_perl() {
3739 # can/must only be called in main 3886 # can/must only be called in main
3740 if ($Coro::current != $Coro::main) { 3887 unless (in_main) {
3741 warn "can only reload from main coroutine"; 3888 error "can only reload from main coroutine";
3742 return; 3889 return;
3743 } 3890 }
3744 3891
3745 return if $RELOAD++; 3892 return if $RELOAD++;
3746 3893
3747 my $t1 = EV::time; 3894 my $t1 = AE::time;
3748 3895
3749 while ($RELOAD) { 3896 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl";
3750 warn "reloading..."; 3898 info "reloading...";
3751 3899
3752 warn "entering sync_job"; 3900 trace "entering sync_job";
3753 3901
3754 cf::sync_job { 3902 cf::sync_job {
3755 cf::write_runtime_sync; # external watchdog should not bark
3756 cf::emergency_save; 3903 #cf::emergency_save;
3757 cf::write_runtime_sync; # external watchdog should not bark
3758 3904
3759 warn "syncing database to disk";
3760 BDB::db_env_txn_checkpoint $DB_ENV;
3761
3762 # if anything goes wrong in here, we should simply crash as we already saved
3763
3764 warn "flushing outstanding aio requests";
3765 while (IO::AIO::nreqs || BDB::nreqs) {
3766 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3767 }
3768
3769 warn "cancelling all extension coros"; 3905 trace "cancelling all extension coros";
3770 $_->cancel for values %EXT_CORO; 3906 $_->cancel for values %EXT_CORO;
3771 %EXT_CORO = (); 3907 %EXT_CORO = ();
3772 3908
3773 warn "removing commands"; 3909 trace "removing commands";
3774 %COMMAND = (); 3910 %COMMAND = ();
3775 3911
3776 warn "removing ext/exti commands"; 3912 trace "removing ext/exti commands";
3777 %EXTCMD = (); 3913 %EXTCMD = ();
3778 %EXTICMD = (); 3914 %EXTICMD = ();
3779 3915
3780 warn "unloading/nuking all extensions"; 3916 trace "unloading/nuking all extensions";
3781 for my $pkg (@EXTS) { 3917 for my $pkg (@EXTS) {
3782 warn "... unloading $pkg"; 3918 trace "... unloading $pkg";
3783 3919
3784 if (my $cb = $pkg->can ("unload")) { 3920 if (my $cb = $pkg->can ("unload")) {
3785 eval { 3921 eval {
3786 $cb->($pkg); 3922 $cb->($pkg);
3787 1 3923 1
3788 } or warn "$pkg unloaded, but with errors: $@"; 3924 } or error "$pkg unloaded, but with errors: $@";
3789 } 3925 }
3790 3926
3791 warn "... clearing $pkg"; 3927 trace "... clearing $pkg";
3792 clear_package $pkg; 3928 clear_package $pkg;
3793 } 3929 }
3794 3930
3795 warn "unloading all perl modules loaded from $LIBDIR"; 3931 trace "unloading all perl modules loaded from $LIBDIR";
3796 while (my ($k, $v) = each %INC) { 3932 while (my ($k, $v) = each %INC) {
3797 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3798 3934
3799 warn "... unloading $k"; 3935 trace "... unloading $k";
3800 delete $INC{$k}; 3936 delete $INC{$k};
3801 3937
3802 $k =~ s/\.pm$//; 3938 $k =~ s/\.pm$//;
3803 $k =~ s/\//::/g; 3939 $k =~ s/\//::/g;
3804 3940
… …
3807 } 3943 }
3808 3944
3809 clear_package $k; 3945 clear_package $k;
3810 } 3946 }
3811 3947
3812 warn "getting rid of safe::, as good as possible"; 3948 trace "getting rid of safe::, as good as possible";
3813 clear_package "safe::$_" 3949 clear_package "safe::$_"
3814 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3950 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3815 3951
3816 warn "unloading cf.pm \"a bit\""; 3952 trace "unloading cf.pm \"a bit\"";
3817 delete $INC{"cf.pm"}; 3953 delete $INC{"cf.pm"};
3818 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3819 3955
3820 # don't, removes xs symbols, too, 3956 # don't, removes xs symbols, too,
3821 # and global variables created in xs 3957 # and global variables created in xs
3822 #clear_package __PACKAGE__; 3958 #clear_package __PACKAGE__;
3823 3959
3824 warn "unload completed, starting to reload now"; 3960 info "unload completed, starting to reload now";
3825 3961
3826 warn "reloading cf.pm"; 3962 trace "reloading cf.pm";
3827 require cf; 3963 require cf;
3828 cf::_connect_to_perl_1; 3964 cf::_connect_to_perl_1;
3829 3965
3830 warn "loading config and database again"; 3966 trace "loading config and database again";
3831 cf::reload_config; 3967 cf::reload_config;
3832 3968
3833 warn "loading extensions"; 3969 trace "loading extensions";
3834 cf::load_extensions; 3970 cf::load_extensions;
3835 3971
3836 if ($REATTACH_ON_RELOAD) { 3972 if ($REATTACH_ON_RELOAD) {
3837 warn "reattaching attachments to objects/players"; 3973 trace "reattaching attachments to objects/players";
3838 _global_reattach; # objects, sockets 3974 _global_reattach; # objects, sockets
3839 warn "reattaching attachments to maps"; 3975 trace "reattaching attachments to maps";
3840 reattach $_ for values %MAP; 3976 reattach $_ for values %MAP;
3841 warn "reattaching attachments to players"; 3977 trace "reattaching attachments to players";
3842 reattach $_ for values %PLAYER; 3978 reattach $_ for values %PLAYER;
3843 } 3979 }
3844 3980
3845 warn "running post_init jobs"; 3981 trace "running post_init jobs";
3846 (pop @POST_INIT)->(1) while @POST_INIT; 3982 (pop @POST_INIT)->(1) while @POST_INIT;
3847 3983
3848 warn "leaving sync_job"; 3984 trace "leaving sync_job";
3849 3985
3850 1 3986 1
3851 } or do { 3987 } or do {
3852 warn $@; 3988 error $@;
3853 cf::cleanup "error while reloading, exiting."; 3989 cf::cleanup "error while reloading, exiting.";
3854 }; 3990 };
3855 3991
3856 warn "reloaded"; 3992 info "reloaded";
3857 --$RELOAD; 3993 --$RELOAD;
3858 } 3994 }
3859 3995
3860 $t1 = EV::time - $t1; 3996 $t1 = AE::time - $t1;
3861 warn "reload completed in ${t1}s\n"; 3997 info "reload completed in ${t1}s\n";
3862}; 3998};
3863 3999
3864our $RELOAD_WATCHER; # used only during reload 4000our $RELOAD_WATCHER; # used only during reload
3865 4001
3866sub reload_perl() { 4002sub reload_perl() {
… …
3868 # coro crashes during coro_state_free->destroy here. 4004 # coro crashes during coro_state_free->destroy here.
3869 4005
3870 $RELOAD_WATCHER ||= cf::async { 4006 $RELOAD_WATCHER ||= cf::async {
3871 Coro::AIO::aio_wait cache_extensions; 4007 Coro::AIO::aio_wait cache_extensions;
3872 4008
3873 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4009 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3874 do_reload_perl; 4010 do_reload_perl;
3875 undef $RELOAD_WATCHER; 4011 undef $RELOAD_WATCHER;
3876 }; 4012 };
3877 }; 4013 };
3878} 4014}
… …
3887 reload_perl; 4023 reload_perl;
3888 }; 4024 };
3889 } 4025 }
3890}; 4026};
3891 4027
3892unshift @INC, $LIBDIR; 4028#############################################################################
3893 4029
3894my $bug_warning = 0; 4030my $bug_warning = 0;
3895 4031
3896our @WAIT_FOR_TICK; 4032our @WAIT_FOR_TICK;
3897our @WAIT_FOR_TICK_BEGIN; 4033our @WAIT_FOR_TICK_BEGIN;
3898 4034
3899sub wait_for_tick { 4035sub wait_for_tick() {
3900 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3901 4037
3902 my $signal = new Coro::Signal; 4038 my $signal = new Coro::Signal;
3903 push @WAIT_FOR_TICK, $signal; 4039 push @WAIT_FOR_TICK, $signal;
3904 $signal->wait; 4040 $signal->wait;
3905} 4041}
3906 4042
3907sub wait_for_tick_begin { 4043sub wait_for_tick_begin() {
3908 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3909 4045
3910 my $signal = new Coro::Signal; 4046 my $signal = new Coro::Signal;
3911 push @WAIT_FOR_TICK_BEGIN, $signal; 4047 push @WAIT_FOR_TICK_BEGIN, $signal;
3912 $signal->wait; 4048 $signal->wait;
… …
3919 return; 4055 return;
3920 } 4056 }
3921 4057
3922 cf::server_tick; # one server iteration 4058 cf::server_tick; # one server iteration
3923 4059
3924 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4060 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3925 4061
3926 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4062 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3927 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4063 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3928 Coro::async_pool { 4064 Coro::async_pool {
3929 $Coro::current->{desc} = "runtime saver"; 4065 $Coro::current->{desc} = "runtime saver";
3930 write_runtime_sync 4066 write_runtime_sync
3931 or warn "ERROR: unable to write runtime file: $!"; 4067 or error "ERROR: unable to write runtime file: $!";
3932 }; 4068 };
3933 } 4069 }
3934 4070
3935 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3936 $sig->send; 4072 $sig->send;
… …
3944 4080
3945 if (0) { 4081 if (0) {
3946 if ($NEXT_TICK) { 4082 if ($NEXT_TICK) {
3947 my $jitter = $TICK_START - $NEXT_TICK; 4083 my $jitter = $TICK_START - $NEXT_TICK;
3948 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4084 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3949 warn "jitter $JITTER\n";#d# 4085 debug "jitter $JITTER\n";#d#
3950 } 4086 }
3951 } 4087 }
3952} 4088}
3953 4089
3954{ 4090{
3955 # configure BDB 4091 # configure BDB
3956 4092
3957 BDB::min_parallel 8; 4093 BDB::min_parallel 16;
3958 BDB::max_poll_reqs $TICK * 0.1; 4094 BDB::max_poll_reqs $TICK * 0.1;
3959 $AnyEvent::BDB::WATCHER->priority (1); 4095 $AnyEvent::BDB::WATCHER->priority (1);
3960 4096
3961 unless ($DB_ENV) { 4097 unless ($DB_ENV) {
3962 $DB_ENV = BDB::db_env_create; 4098 $DB_ENV = BDB::db_env_create;

Diff Legend

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