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.505 by root, Sun Jan 31 03:46:20 2010 UTC vs.
Revision 1.541 by root, Tue May 4 23:33:16 2010 UTC

… …
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
… …
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 $_;
… …
242 252
243=back 253=back
244 254
245=cut 255=cut
246 256
257sub error(@) { LOG llevError, join "", @_ }
258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
247$Coro::State::WARNHOOK = sub { 263$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 264 my $msg = join "", @_;
249 265
250 $msg .= "\n" 266 $msg .= "\n"
251 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
252 268
253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254 270
255 LOG llevError, $msg; 271 LOG llevWarn, $msg;
256}; 272};
257 273
258$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
260 276
261 warn Carp::longmess $_[0]; 277 error Carp::longmess $_[0];
262 278
263 if ($Coro::current == $Coro::main) {#d# 279 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 281 return;#d#
266 }#d# 282 }#d#
267 283
268 # kill coroutine otherwise 284 # kill coroutine otherwise
269 Coro::terminate 285 Coro::terminate
… …
396} 412}
397 413
398=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
399 415
400Like EV::periodic, but randomly selects a starting point so that the actions 416Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 417get spread over time.
402 418
403=cut 419=cut
404 420
405sub periodic($$) { 421sub periodic($$) {
406 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
… …
502=cut 518=cut
503 519
504sub sync_job(&) { 520sub sync_job(&) {
505 my ($job) = @_; 521 my ($job) = @_;
506 522
507 if ($Coro::current == $Coro::main) { 523 if (in_main) {
508 my $time = EV::time; 524 my $time = AE::time;
509 525
510 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
512 528
513 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
514 530
515 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
516 532
517 my $busy = 1; 533 my $busy = 1;
518 my @res; 534 my @res;
519 535
520 (async { 536 (async {
521 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
522 @res = eval { $job->() }; 538 @res = eval { $job->() };
523 warn $@ if $@; 539 error $@ if $@;
524 undef $busy; 540 undef $busy;
525 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
526 542
527 while ($busy) { 543 while ($busy) {
528 if (Coro::nready) { 544 if (Coro::nready) {
… …
530 } else { 546 } else {
531 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
532 } 548 }
533 } 549 }
534 550
535 my $time = EV::time - $time; 551 my $time = AE::time - $time;
536 552
537 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
538 554
539 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
540 } else { 556 } else {
… …
584 reset_signals; 600 reset_signals;
585 &$cb 601 &$cb
586 }, @args; 602 }, @args;
587 603
588 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
605}
606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
589} 616}
590 617
591=item $coin = coin_from_name $name 618=item $coin = coin_from_name $name
592 619
593=cut 620=cut
… …
630within each server. 657within each server.
631 658
632=cut 659=cut
633 660
634sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
635 my ($name) = @_; 665 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
637 667
638 eval { 668 eval {
639 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
… …
649} 679}
650 680
651our $DB; 681our $DB;
652 682
653sub db_init { 683sub db_init {
654 cf::sync_job {
655 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
656 };
657} 685}
658 686
659sub db_get($$) { 687sub db_get($$) {
660 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
661 689
662 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
663 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
664 694
665 $! ? () 695 $! ? ()
666 : $data 696 : $data
667 }
668} 697}
669 698
670sub db_put($$$) { 699sub db_put($$$) {
671 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
672 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
728 757
729 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
730 my $data = $process->(\@data); 759 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
732 761
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734 763
735 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
738 767
… …
748 777
749=cut 778=cut
750 779
751sub datalog($@) { 780sub datalog($@) {
752 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754} 783}
755 784
756=back 785=back
757 786
758=cut 787=cut
… …
953 982
954 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
955 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956 985
957 } elsif (ref $type) { 986 } elsif (ref $type) {
958 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
959 988
960 } else { 989 } else {
961 shift @arg; 990 shift @arg;
962 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
963 } 992 }
964 } 993 }
965} 994}
966 995
967sub _object_attach { 996sub _object_attach {
… …
977 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
978 } 1007 }
979 1008
980 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
981 } else { 1010 } else {
982 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
983 } 1012 }
984 1013
985 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
986} 1015}
987 1016
… …
1046 1075
1047 for (@$callbacks) { 1076 for (@$callbacks) {
1048 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
1049 1078
1050 if ($@) { 1079 if ($@) {
1051 warn "$@";
1052 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053 override; 1081 override;
1054 } 1082 }
1055 1083
1056 return 1 if $override; 1084 return 1 if $override;
1057 } 1085 }
… …
1136 for (@$attach) { 1164 for (@$attach) {
1137 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1138 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1139 } 1167 }
1140 } else { 1168 } else {
1141 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1142 } 1170 }
1143 } 1171 }
1144} 1172}
1145 1173
1146cf::attachable->attach ( 1174cf::attachable->attach (
… …
1173 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1174 1202
1175 sync_job { 1203 sync_job {
1176 if (length $$rdata) { 1204 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1180 1209
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1211 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1213 if ($cf::USE_FSYNC) {
… …
1206 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1207 1236
1208 $filename =~ s%/[^/]+$%%; 1237 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC; 1238 aio_pathsync $filename if $cf::USE_FSYNC;
1210 } else { 1239 } else {
1211 warn "unable to save objects: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1212 } 1241 }
1213 } else { 1242 } else {
1214 aio_unlink $filename; 1243 aio_unlink $filename;
1215 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1216 } 1245 }
… …
1240 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs}; 1270 $av = $st->{objs};
1242 } 1271 }
1243 1272
1244 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1247 1277
1248 ($data, $av) 1278 ($data, $av)
1249} 1279}
1250 1280
1251=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
… …
1310} 1340}
1311 1341
1312use File::Glob (); 1342use File::Glob ();
1313 1343
1314cf::player->attach ( 1344cf::player->attach (
1315 on_command => sub { 1345 on_unknown_command => sub {
1316 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1317 1347
1318 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1319 or return; 1349 or return;
1320 1350
… …
1343 1373
1344 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1345 if $reply; 1375 if $reply;
1346 1376
1347 } else { 1377 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1379 }
1350 1380
1351 cf::override; 1381 cf::override;
1352 }, 1382 },
1353); 1383);
… …
1364 1394
1365 $grp 1395 $grp
1366} 1396}
1367 1397
1368sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1369 cf::sync_job { 1401 cf::sync_job {
1370 my %todo; 1402 my %todo;
1371 1403
1372 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1405 next unless -r $path;
… …
1391 1423
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394 1426
1395 $ext{source} = 1427 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1397 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1398 . $source 1430 . $source
1399 . "\n};\n1"; 1431 . "\n};\n1";
1400 1432
1401 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
… …
1413 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext 1446 next ext
1415 unless exists $done{$_}; 1447 unless exists $done{$_};
1416 } 1448 }
1417 1449
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419 1451
1420 my $active = eval $v->{source}; 1452 my $active = eval $v->{source};
1421 1453
1422 if (length $@) { 1454 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1455 error "$v->{path}: $@\n";
1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1424 1457
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1459 if exists $v->{meta}{mandatory};
1460
1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1462 delete $todo{$k};
1427 } else { 1463 } else {
1428 $done{$k} = delete $todo{$k}; 1464 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1465 push @EXTS, $v->{pkg};
1430 $progress = 1; 1466 $progress = 1;
1431 1467
1432 warn "$v->{base}: extension inactive.\n" 1468 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1469 unless $active;
1434 } 1470 }
1435 } 1471 }
1436 1472
1437 unless ($progress) { 1473 unless ($progress) {
… …
1533 $cf::PLAYER{$login} = $pl 1569 $cf::PLAYER{$login} = $pl
1534 } 1570 }
1535 } 1571 }
1536} 1572}
1537 1573
1574cf::player->attach (
1575 on_load => sub {
1576 my ($pl, $path) = @_;
1577
1578 # restore slots saved in save, below
1579 my $slots = delete $pl->{_slots};
1580
1581 $pl->ob->current_weapon ($slots->[0]);
1582 $pl->combat_ob ($slots->[1]);
1583 $pl->ranged_ob ($slots->[2]);
1584 },
1585);
1586
1538sub save($) { 1587sub save($) {
1539 my ($pl) = @_; 1588 my ($pl) = @_;
1540 1589
1541 return if $pl->{deny_save}; 1590 return if $pl->{deny_save};
1542 1591
… …
1547 1596
1548 aio_mkdir playerdir $pl, 0770; 1597 aio_mkdir playerdir $pl, 0770;
1549 $pl->{last_save} = $cf::RUNTIME; 1598 $pl->{last_save} = $cf::RUNTIME;
1550 1599
1551 cf::get_slot 0.01; 1600 cf::get_slot 0.01;
1601
1602 # save slots, to be restored later
1603 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1552 1604
1553 $pl->save_pl ($path); 1605 $pl->save_pl ($path);
1554 cf::cede_to_tick; 1606 cf::cede_to_tick;
1555} 1607}
1556 1608
… …
1593 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1645 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1594 1646
1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1596 $pl->deactivate; 1648 $pl->deactivate;
1597 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1649 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1598 $pl->ob->check_score;
1599 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1600 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1601 1652
1602 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1603 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1658 \@logins 1709 \@logins
1659} 1710}
1660 1711
1661=item $player->maps 1712=item $player->maps
1662 1713
1714=item cf::player::maps $login
1715
1663Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1664player. May block. 1717player. May block.
1665 1718
1666=cut 1719=cut
1667 1720
… …
1729=cut 1782=cut
1730 1783
1731sub find_by_path($) { 1784sub find_by_path($) {
1732 my ($path) = @_; 1785 my ($path) = @_;
1733 1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1788
1734 my ($match, $specificity); 1789 my ($match, $specificity);
1735 1790
1736 for my $region (list) { 1791 for my $region (list) {
1737 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
1738 ($match, $specificity) = ($region, $region->specificity) 1793 ($match, $specificity) = ($region, $region->specificity)
… …
1769 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1824 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1770 1825
1771 # mit "rum" bekleckern, nicht 1826 # mit "rum" bekleckern, nicht
1772 $self->_create_random_map ( 1827 $self->_create_random_map (
1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1828 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1829 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1830 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1776 $rmp->{exit_on_final_map}, 1831 $rmp->{exit_on_final_map},
1777 $rmp->{xsize}, $rmp->{ysize}, 1832 $rmp->{xsize}, $rmp->{ysize},
1778 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1833 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1779 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1834 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1794 1849
1795sub register { 1850sub register {
1796 my (undef, $regex, $prio) = @_; 1851 my (undef, $regex, $prio) = @_;
1797 my $pkg = caller; 1852 my $pkg = caller;
1798 1853
1799 no strict;
1800 push @{"$pkg\::ISA"}, __PACKAGE__; 1854 push @{"$pkg\::ISA"}, __PACKAGE__;
1801 1855
1802 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1803} 1857}
1804 1858
1805# also paths starting with '/' 1859# also paths starting with '/'
1806$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1807 1861
1808sub thawer_merge { 1862sub thawer_merge {
1809 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1810 1864
1811 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
… …
2093 } 2147 }
2094 2148
2095 $self->post_load; 2149 $self->post_load;
2096} 2150}
2097 2151
2152# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath
2098sub customise_for { 2155sub customise_for {
2099 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
2100 2157
2101 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
2102 if $self->per_player; 2159 if $self->per_player;
… …
2118 or next; 2175 or next;
2119 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2120 or next; 2177 or next;
2121 $neigh->load; 2178 $neigh->load;
2122 2179
2180 # now find the diagonal neighbours
2123 push @neigh, 2181 push @neigh,
2124 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2125 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2126 } 2184 }
2127 2185
… …
2134} 2192}
2135 2193
2136sub find_sync { 2194sub find_sync {
2137 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2138 2196
2139 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
2140} 2201}
2141 2202
2142sub do_load_sync { 2203sub do_load_sync {
2143 my ($map) = @_; 2204 my ($map) = @_;
2144 2205
2145 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2146 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2147 2208
2148 cf::sync_job { $map->load }; 2209 $map->load;
2149} 2210}
2150 2211
2151our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2152our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2153 2214
… …
2179 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2180 2241
2181 () 2242 ()
2182} 2243}
2183 2244
2245# common code, used by both ->save and ->swapout
2184sub save { 2246sub _save {
2185 my ($self) = @_; 2247 my ($self) = @_;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2248
2189 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2190 2250
2191 return unless $self->dirty; 2251 return unless $self->dirty;
2192 2252
… …
2212 } else { 2272 } else {
2213 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2273 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2214 } 2274 }
2215} 2275}
2216 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2217sub swap_out { 2285sub swap_out {
2218 my ($self) = @_; 2286 my ($self) = @_;
2219 2287
2220 # save first because save cedes
2221 $self->save;
2222
2223 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2224 2289
2225 return if $self->players;
2226 return if $self->in_memory != cf::MAP_ACTIVE; 2290 return if $self->in_memory != cf::MAP_ACTIVE;
2227 return if $self->{deny_save}; 2291 return if $self->{deny_save};
2292 return if $self->players;
2228 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2229 $self->in_memory (cf::MAP_SWAPPED); 2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # then atomically save
2300 $self->_save;
2301
2302 # then free the map
2303 $self->clear;
2304}
2305
2306sub reset_at {
2307 my ($self) = @_;
2308
2309 # TODO: safety, remove and allow resettable per-player maps
2310 return 1e99 if $self->{deny_reset};
2311
2312 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2313 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2314
2315 $time + $to
2316}
2317
2318sub should_reset {
2319 my ($self) = @_;
2320
2321 $self->reset_at <= $cf::RUNTIME
2322}
2323
2324sub reset {
2325 my ($self) = @_;
2326
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
2329 return if $self->players;
2330
2331 cf::trace "resetting map ", $self->path, "\n";
2332
2333 $self->in_memory (cf::MAP_SWAPPED);
2334
2335 # need to save uniques path
2336 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338
2339 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2340 if $uniq;
2341 }
2342
2343 delete $cf::MAP{$self->path};
2230 2344
2231 $self->deactivate; 2345 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2233 $self->clear; 2347 $self->clear;
2234}
2235
2236sub reset_at {
2237 my ($self) = @_;
2238
2239 # TODO: safety, remove and allow resettable per-player maps
2240 return 1e99 if $self->{deny_reset};
2241
2242 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2243 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2244
2245 $time + $to
2246}
2247
2248sub should_reset {
2249 my ($self) = @_;
2250
2251 $self->reset_at <= $cf::RUNTIME
2252}
2253
2254sub reset {
2255 my ($self) = @_;
2256
2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2258
2259 return if $self->players;
2260
2261 warn "resetting map ", $self->path, "\n";
2262
2263 $self->in_memory (cf::MAP_SWAPPED);
2264
2265 # need to save uniques path
2266 unless ($self->{deny_save}) {
2267 my $uniq = $self->uniq_path; utf8::encode $uniq;
2268
2269 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2270 if $uniq;
2271 }
2272
2273 delete $cf::MAP{$self->path};
2274
2275 $self->deactivate;
2276 $_->clear_links_to ($self) for values %cf::MAP;
2277 $self->clear;
2278 2348
2279 $self->unlink_save; 2349 $self->unlink_save;
2280 $self->destroy; 2350 $self->destroy;
2281} 2351}
2282 2352
… …
2290 2360
2291 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2292 2362
2293 $self->unlink_save; 2363 $self->unlink_save;
2294 2364
2295 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2296 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2297 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2298 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2299 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2300 2370
… …
2530 2600
2531Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2532 2602
2533The player should be reasonably safe there for short amounts of time (e.g. 2603The player should be reasonably safe there for short amounts of time (e.g.
2534for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2535though, as the palyer cannot control the character while it is on the link 2605though, as the player cannot control the character while it is on the link
2536map. 2606map.
2537 2607
2538Will never block. 2608Will never block.
2539 2609
2540=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
… …
2561sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2562 my ($self) = @_; 2632 my ($self) = @_;
2563 2633
2564 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2565 2635
2636 ++$self->{_link_recursion};
2637
2566 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2567 2639
2568 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2569 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2570 2642
2571 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2572} 2644}
2573 2645
2574sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2575 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2576 2648
… …
2601 $map->load_neighbours; 2673 $map->load_neighbours;
2602 2674
2603 return unless $self->contr->active; 2675 return unless $self->contr->active;
2604 2676
2605 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2606 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2607 2679 # entering was successful
2680 delete $self->{_link_recursion};
2608 # only activate afterwards, to support waiting in hooks 2681 # only activate afterwards, to support waiting in hooks
2609 $self->activate_recursive; 2682 $self->activate_recursive;
2610} 2683 }
2611 2684
2685}
2686
2612=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2613 2688
2614Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2615her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2616that has to return the map if sucecssful, and then unfreezes the player on 2691that has to return the map if sucecssful, and then unfreezes the player on
2617the new (success) or old (failed) map position. In either case, $done will 2692the new (success) or old (failed) map position. In either case, $done will
… …
2624 2699
2625our $GOTOGEN; 2700our $GOTOGEN;
2626 2701
2627sub cf::object::player::goto { 2702sub cf::object::player::goto {
2628 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2629 2710
2630 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
2631 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2632 2713
2633 $self->enter_link; 2714 $self->enter_link;
… …
2657 my $map = eval { 2738 my $map = eval {
2658 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2659 2740
2660 if ($map) { 2741 if ($map) {
2661 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2662 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2663 } else { 2744 } else {
2664 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2665 } 2746 }
2666 2747
2667 $map 2748 $map
… …
2675 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2676 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2677 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2678 } 2759 }
2679 2760
2680 $done->() if $done; 2761 $done->($self) if $done;
2681 })->prio (1); 2762 })->prio (1);
2682} 2763}
2683 2764
2684=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2685 2766
… …
2778 $self->message ("Something went wrong deep within the deliantra server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2779 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2780 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2781 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2782 2863
2783 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2784 $self->leave_link; 2865 $self->leave_link;
2785 } 2866 }
2786 })->prio (1); 2867 })->prio (1);
2787} 2868}
2788 2869
… …
3101 3182
3102 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
3103 if $reply; 3184 if $reply;
3104 3185
3105 } else { 3186 } else {
3106 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3107 } 3188 }
3108 3189
3109 cf::override; 3190 cf::override;
3110 }, 3191 },
3111); 3192);
… …
3131 3212
3132 $coro 3213 $coro
3133} 3214}
3134 3215
3135cf::client->attach ( 3216cf::client->attach (
3136 on_destroy => sub { 3217 on_client_destroy => sub {
3137 my ($ns) = @_; 3218 my ($ns) = @_;
3138 3219
3139 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3140 }, 3221 },
3141); 3222);
… …
3192 decrease split destroy change_exp value msg lore send_msg)], 3273 decrease split destroy change_exp value msg lore send_msg)],
3193 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
3194 ["cf::player" => qw(peaceful send_msg)], 3275 ["cf::player" => qw(peaceful send_msg)],
3195 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
3196) { 3277) {
3197 no strict 'refs';
3198 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
3199 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3200 for @funs; 3280 for @funs;
3201} 3281}
3202 3282
… …
3241 local @cf::_safe_eval_args = values %vars; 3321 local @cf::_safe_eval_args = values %vars;
3242 @res = wantarray ? eval eval : scalar eval $eval; 3322 @res = wantarray ? eval eval : scalar eval $eval;
3243 } 3323 }
3244 3324
3245 if ($@) { 3325 if ($@) {
3246 warn "$@"; 3326 warn "$@",
3247 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
3248 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
3249 } 3329 }
3250 3330
3251 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
3252} 3332}
3253 3333
… …
3278=cut 3358=cut
3279 3359
3280############################################################################# 3360#############################################################################
3281# the server's init and main functions 3361# the server's init and main functions
3282 3362
3363# async inc loader. yay.
3364sub inc_loader {
3365 my $mod = $_[1];
3366
3367 if (in_main && !tick_inhibit) {
3368 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3369 } else {
3370 debug "loading perl module $mod\n";
3371 }
3372
3373 # 1. find real file
3374 for my $dir (@ORIG_INC) {
3375 ref $dir and next;
3376 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3377 or next;
3378
3379 $data = "#line 1 $dir/$mod\n$data";
3380
3381 open my $fh, "<", \$data or die;
3382
3383 return $fh;
3384 }
3385
3386 ()
3387}
3388
3389sub init_inc {
3390 # save original @INC
3391 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3392
3393 # make sure we can do scalar-opens
3394 open my $dummy, "<", \my $dummy2;
3395
3396 # execute some stuff so perl load's some of the core modules
3397 /Ü/ =~ /ü/i;
3398 eval { &Storable::nstore_fd };
3399
3400 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3401
3402 debug "module loading will be asynchronous from this point on.";
3403}
3404
3283sub load_facedata($) { 3405sub load_facedata($) {
3284 my ($path) = @_; 3406 my ($path) = @_;
3285 3407
3286 # HACK to clear player env face cache, we need some signal framework 3408 # HACK to clear player env face cache, we need some signal framework
3287 # for this (global event?) 3409 # for this (global event?)
3288 %ext::player_env::MUSIC_FACE_CACHE = (); 3410 %ext::player_env::MUSIC_FACE_CACHE = ();
3289 3411
3290 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3412 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3291 3413
3292 warn "loading facedata from $path\n"; 3414 trace "loading facedata from $path\n";
3293 3415
3294 my $facedata; 3416 my $facedata;
3295 0 < aio_load $path, $facedata 3417 0 < aio_load $path, $facedata
3296 or die "$path: $!"; 3418 or die "$path: $!";
3297 3419
… …
3331 3453
3332 if (my $smooth = cf::face::find $info->{smooth}) { 3454 if (my $smooth = cf::face::find $info->{smooth}) {
3333 cf::face::set_smooth $idx, $smooth; 3455 cf::face::set_smooth $idx, $smooth;
3334 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3456 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3335 } else { 3457 } else {
3336 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3458 error "smooth face '$info->{smooth}' not found for face '$face'";
3337 } 3459 }
3338 3460
3339 cf::cede_to_tick; 3461 cf::cede_to_tick;
3340 } 3462 }
3341 } 3463 }
… …
3359 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3481 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3360 3482
3361 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3483 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3362 cf::face::set_type $idx, $info->{type}; 3484 cf::face::set_type $idx, $info->{type};
3363 } else { 3485 } else {
3364 $RESOURCE{$name} = $info; 3486 $RESOURCE{$name} = $info; # unused
3365 } 3487 }
3366 3488
3367 cf::cede_to_tick; 3489 cf::cede_to_tick;
3368 } 3490 }
3369 } 3491 }
3370 3492
3371 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3493 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3372 3494
3373 1 3495 1
3374} 3496}
3375
3376cf::global->attach (on_resource_update => sub {
3377 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3378 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3379
3380 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3381 my $sound = $soundconf->{compat}[$_]
3382 or next;
3383
3384 my $face = cf::face::find "sound/$sound->[1]";
3385 cf::sound::set $sound->[0] => $face;
3386 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3387 }
3388
3389 while (my ($k, $v) = each %{$soundconf->{event}}) {
3390 my $face = cf::face::find "sound/$v";
3391 cf::sound::set $k => $face;
3392 }
3393 }
3394});
3395 3497
3396register_exticmd fx_want => sub { 3498register_exticmd fx_want => sub {
3397 my ($ns, $want) = @_; 3499 my ($ns, $want) = @_;
3398 3500
3399 while (my ($k, $v) = each %$want) { 3501 while (my ($k, $v) = each %$want) {
… …
3438sub reload_treasures { 3540sub reload_treasures {
3439 load_resource_file "$DATADIR/treasures" 3541 load_resource_file "$DATADIR/treasures"
3440 or die "unable to load treasurelists\n"; 3542 or die "unable to load treasurelists\n";
3441} 3543}
3442 3544
3545sub reload_sound {
3546 trace "loading sound config from $DATADIR/sound\n";
3547
3548 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3549 or die "$DATADIR/sound $!";
3550
3551 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3552
3553 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3554 my $sound = $soundconf->{compat}[$_]
3555 or next;
3556
3557 my $face = cf::face::find "sound/$sound->[1]";
3558 cf::sound::set $sound->[0] => $face;
3559 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3560 }
3561
3562 while (my ($k, $v) = each %{$soundconf->{event}}) {
3563 my $face = cf::face::find "sound/$v";
3564 cf::sound::set $k => $face;
3565 }
3566}
3567
3443sub reload_resources { 3568sub reload_resources {
3444 warn "reloading resource files...\n"; 3569 trace "reloading resource files...\n";
3445 3570
3446 reload_facedata; 3571 reload_facedata;
3572 reload_sound;
3447 reload_archetypes; 3573 reload_archetypes;
3448 reload_regions; 3574 reload_regions;
3449 reload_treasures; 3575 reload_treasures;
3450 3576
3451 warn "finished reloading resource files\n"; 3577 trace "finished reloading resource files\n";
3452} 3578}
3453 3579
3454sub reload_config { 3580sub reload_config {
3455 warn "reloading config file...\n"; 3581 trace "reloading config file...\n";
3456 3582
3457 open my $fh, "<:utf8", "$CONFDIR/config" 3583 open my $fh, "<:utf8", "$CONFDIR/config"
3458 or return; 3584 or return;
3459 3585
3460 local $/; 3586 local $/;
3461 *CFG = YAML::XS::Load scalar <$fh>; 3587 *CFG = YAML::XS::Load scalar <$fh>;
3462 3588
3463 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3589 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3464 3590
3465 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3591 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3466 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3592 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3467 3593
3468 if (exists $CFG{mlockall}) { 3594 if (exists $CFG{mlockall}) {
… …
3471 and die "WARNING: m(un)lockall failed: $!\n"; 3597 and die "WARNING: m(un)lockall failed: $!\n";
3472 }; 3598 };
3473 warn $@ if $@; 3599 warn $@ if $@;
3474 } 3600 }
3475 3601
3476 warn "finished reloading resource files\n"; 3602 trace "finished reloading resource files\n";
3477} 3603}
3478 3604
3479sub pidfile() { 3605sub pidfile() {
3480 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3606 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3481 or die "$PIDFILE: $!"; 3607 or die "$PIDFILE: $!";
… …
3494 seek $fh, 0, 0; 3620 seek $fh, 0, 0;
3495 print $fh $$; 3621 print $fh $$;
3496} 3622}
3497 3623
3498sub main_loop { 3624sub main_loop {
3499 warn "EV::loop starting\n"; 3625 trace "EV::loop starting\n";
3500 if (1) { 3626 if (1) {
3501 EV::loop; 3627 EV::loop;
3502 } 3628 }
3503 warn "EV::loop returned\n"; 3629 trace "EV::loop returned\n";
3504 goto &main_loop unless $REALLY_UNLOOP; 3630 goto &main_loop unless $REALLY_UNLOOP;
3505} 3631}
3506 3632
3507sub main { 3633sub main {
3508 cf::init_globals; # initialise logging 3634 cf::init_globals; # initialise logging
3509 3635
3510 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3636 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3511 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3637 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3512 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3638 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3513 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3639 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3514
3515 cf::init_experience;
3516 cf::init_anim;
3517 cf::init_attackmess;
3518 cf::init_dynamic;
3519 3640
3520 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3641 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3521 3642
3522 # we must not ever block the main coroutine 3643 # we must not ever block the main coroutine
3523 local $Coro::idle = sub { 3644 local $Coro::idle = sub {
… …
3529 }; 3650 };
3530 3651
3531 evthread_start IO::AIO::poll_fileno; 3652 evthread_start IO::AIO::poll_fileno;
3532 3653
3533 cf::sync_job { 3654 cf::sync_job {
3655 init_inc;
3656
3657 cf::init_experience;
3658 cf::init_anim;
3659 cf::init_attackmess;
3660 cf::init_dynamic;
3661
3534 cf::load_settings; 3662 cf::load_settings;
3535 cf::load_materials; 3663 cf::load_materials;
3536 3664
3537 reload_resources; 3665 reload_resources;
3538 reload_config; 3666 reload_config;
3539 db_init; 3667 db_init;
3540 3668
3541 cf::init_uuid; 3669 cf::init_uuid;
3542 cf::init_signals; 3670 cf::init_signals;
3543 cf::init_commands;
3544 cf::init_skills; 3671 cf::init_skills;
3545 3672
3546 cf::init_beforeplay; 3673 cf::init_beforeplay;
3547 3674
3548 atomic; 3675 atomic;
… …
3556 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3683 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3557 3684
3558 (pop @POST_INIT)->(0) while @POST_INIT; 3685 (pop @POST_INIT)->(0) while @POST_INIT;
3559 }; 3686 };
3560 3687
3688 cf::object::thawer::errors_are_fatal 0;
3689 info "parse errors in files are no longer fatal from this point on.\n";
3690
3691 my $free_main; $free_main = EV::idle sub {
3692 undef $free_main;
3693 undef &main; # free gobs of memory :)
3694 };
3695
3561 main_loop; 3696 goto &main_loop;
3562} 3697}
3563 3698
3564############################################################################# 3699#############################################################################
3565# initialisation and cleanup 3700# initialisation and cleanup
3566 3701
3567# install some emergency cleanup handlers 3702# install some emergency cleanup handlers
3568BEGIN { 3703BEGIN {
3569 our %SIGWATCHER = (); 3704 our %SIGWATCHER = ();
3570 for my $signal (qw(INT HUP TERM)) { 3705 for my $signal (qw(INT HUP TERM)) {
3571 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3706 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3572 cf::cleanup "SIG$signal"; 3707 cf::cleanup "SIG$signal";
3573 }; 3708 };
3574 } 3709 }
3575} 3710}
3576 3711
3577sub write_runtime_sync { 3712sub write_runtime_sync {
3713 my $t0 = AE::time;
3714
3578 # first touch the runtime file to show we are still running: 3715 # first touch the runtime file to show we are still running:
3579 # the fsync below can take a very very long time. 3716 # the fsync below can take a very very long time.
3580 3717
3581 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3718 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3582 3719
… …
3603 or return; 3740 or return;
3604 3741
3605 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3742 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3606 and return; 3743 and return;
3607 3744
3608 warn "runtime file written.\n"; 3745 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3609 3746
3610 1 3747 1
3611} 3748}
3612 3749
3613our $uuid_lock; 3750our $uuid_lock;
… …
3625 or return; 3762 or return;
3626 3763
3627 my $value = uuid_seq uuid_cur; 3764 my $value = uuid_seq uuid_cur;
3628 3765
3629 unless ($value) { 3766 unless ($value) {
3630 warn "cowardly refusing to write zero uuid value!\n"; 3767 info "cowardly refusing to write zero uuid value!\n";
3631 return; 3768 return;
3632 } 3769 }
3633 3770
3634 my $value = uuid_str $value + $uuid_skip; 3771 my $value = uuid_str $value + $uuid_skip;
3635 $uuid_skip = 0; 3772 $uuid_skip = 0;
… …
3645 or return; 3782 or return;
3646 3783
3647 aio_rename "$uuid~", $uuid 3784 aio_rename "$uuid~", $uuid
3648 and return; 3785 and return;
3649 3786
3650 warn "uuid file written ($value).\n"; 3787 trace "uuid file written ($value).\n";
3651 3788
3652 1 3789 1
3653 3790
3654} 3791}
3655 3792
… …
3661} 3798}
3662 3799
3663sub emergency_save() { 3800sub emergency_save() {
3664 my $freeze_guard = cf::freeze_mainloop; 3801 my $freeze_guard = cf::freeze_mainloop;
3665 3802
3666 warn "emergency_perl_save: enter\n"; 3803 info "emergency_perl_save: enter\n";
3804
3805 # this is a trade-off: we want to be very quick here, so
3806 # save all maps without fsync, and later call a global sync
3807 # (which in turn might be very very slow)
3808 local $USE_FSYNC = 0;
3667 3809
3668 cf::sync_job { 3810 cf::sync_job {
3669 # this is a trade-off: we want to be very quick here, so 3811 cf::write_runtime_sync; # external watchdog should not bark
3670 # save all maps without fsync, and later call a global sync
3671 # (which in turn might be very very slow)
3672 local $USE_FSYNC = 0;
3673 3812
3674 # use a peculiar iteration method to avoid tripping on perl 3813 # use a peculiar iteration method to avoid tripping on perl
3675 # refcount bugs in for. also avoids problems with players 3814 # refcount bugs in for. also avoids problems with players
3676 # and maps saved/destroyed asynchronously. 3815 # and maps saved/destroyed asynchronously.
3677 warn "emergency_perl_save: begin player save\n"; 3816 info "emergency_perl_save: begin player save\n";
3678 for my $login (keys %cf::PLAYER) { 3817 for my $login (keys %cf::PLAYER) {
3679 my $pl = $cf::PLAYER{$login} or next; 3818 my $pl = $cf::PLAYER{$login} or next;
3680 $pl->valid or next; 3819 $pl->valid or next;
3681 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3820 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3682 $pl->save; 3821 $pl->save;
3683 } 3822 }
3684 warn "emergency_perl_save: end player save\n"; 3823 info "emergency_perl_save: end player save\n";
3685 3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3686 warn "emergency_perl_save: begin map save\n"; 3827 info "emergency_perl_save: begin map save\n";
3687 for my $path (keys %cf::MAP) { 3828 for my $path (keys %cf::MAP) {
3688 my $map = $cf::MAP{$path} or next; 3829 my $map = $cf::MAP{$path} or next;
3689 $map->valid or next; 3830 $map->valid or next;
3690 $map->save; 3831 $map->save;
3691 } 3832 }
3692 warn "emergency_perl_save: end map save\n"; 3833 info "emergency_perl_save: end map save\n";
3693 3834
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3694 warn "emergency_perl_save: begin database checkpoint\n"; 3837 info "emergency_perl_save: begin database checkpoint\n";
3695 BDB::db_env_txn_checkpoint $DB_ENV; 3838 BDB::db_env_txn_checkpoint $DB_ENV;
3696 warn "emergency_perl_save: end database checkpoint\n"; 3839 info "emergency_perl_save: end database checkpoint\n";
3697 3840
3698 warn "emergency_perl_save: begin write uuid\n"; 3841 info "emergency_perl_save: begin write uuid\n";
3699 write_uuid_sync 1; 3842 write_uuid_sync 1;
3700 warn "emergency_perl_save: end write uuid\n"; 3843 info "emergency_perl_save: end write uuid\n";
3844
3845 cf::write_runtime_sync; # external watchdog should not bark
3846
3847 trace "emergency_perl_save: syncing database to disk";
3848 BDB::db_env_txn_checkpoint $DB_ENV;
3849
3850 info "emergency_perl_save: starting sync\n";
3851 IO::AIO::aio_sync sub {
3852 info "emergency_perl_save: finished sync\n";
3853 };
3854
3855 cf::write_runtime_sync; # external watchdog should not bark
3856
3857 trace "emergency_perl_save: flushing outstanding aio requests";
3858 while (IO::AIO::nreqs || BDB::nreqs) {
3859 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3860 }
3861
3862 cf::write_runtime_sync; # external watchdog should not bark
3701 }; 3863 };
3702 3864
3703 warn "emergency_perl_save: starting sync()\n";
3704 IO::AIO::aio_sync sub {
3705 warn "emergency_perl_save: finished sync()\n";
3706 };
3707
3708 warn "emergency_perl_save: leave\n"; 3865 info "emergency_perl_save: leave\n";
3709} 3866}
3710 3867
3711sub post_cleanup { 3868sub post_cleanup {
3712 my ($make_core) = @_; 3869 my ($make_core) = @_;
3713 3870
3871 IO::AIO::flush;
3872
3714 warn Carp::longmess "post_cleanup backtrace" 3873 error Carp::longmess "post_cleanup backtrace"
3715 if $make_core; 3874 if $make_core;
3716 3875
3717 my $fh = pidfile; 3876 my $fh = pidfile;
3718 unlink $PIDFILE if <$fh> == $$; 3877 unlink $PIDFILE if <$fh> == $$;
3719} 3878}
… …
3739 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3898 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3740 for my $name (keys %$leaf_symtab) { 3899 for my $name (keys %$leaf_symtab) {
3741 _gv_clear *{"$pkg$name"}; 3900 _gv_clear *{"$pkg$name"};
3742# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3901# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3743 } 3902 }
3744 warn "cleared package $pkg\n";#d#
3745} 3903}
3746 3904
3747sub do_reload_perl() { 3905sub do_reload_perl() {
3748 # can/must only be called in main 3906 # can/must only be called in main
3749 if ($Coro::current != $Coro::main) { 3907 if (in_main) {
3750 warn "can only reload from main coroutine"; 3908 error "can only reload from main coroutine";
3751 return; 3909 return;
3752 } 3910 }
3753 3911
3754 return if $RELOAD++; 3912 return if $RELOAD++;
3755 3913
3756 my $t1 = EV::time; 3914 my $t1 = AE::time;
3757 3915
3758 while ($RELOAD) { 3916 while ($RELOAD) {
3759 warn "reloading..."; 3917 info "reloading...";
3760 3918
3761 warn "entering sync_job"; 3919 trace "entering sync_job";
3762 3920
3763 cf::sync_job { 3921 cf::sync_job {
3764 cf::write_runtime_sync; # external watchdog should not bark
3765 cf::emergency_save; 3922 cf::emergency_save;
3766 cf::write_runtime_sync; # external watchdog should not bark
3767 3923
3768 warn "syncing database to disk";
3769 BDB::db_env_txn_checkpoint $DB_ENV;
3770
3771 # if anything goes wrong in here, we should simply crash as we already saved
3772
3773 warn "flushing outstanding aio requests";
3774 while (IO::AIO::nreqs || BDB::nreqs) {
3775 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3776 }
3777
3778 warn "cancelling all extension coros"; 3924 trace "cancelling all extension coros";
3779 $_->cancel for values %EXT_CORO; 3925 $_->cancel for values %EXT_CORO;
3780 %EXT_CORO = (); 3926 %EXT_CORO = ();
3781 3927
3782 warn "removing commands"; 3928 trace "removing commands";
3783 %COMMAND = (); 3929 %COMMAND = ();
3784 3930
3785 warn "removing ext/exti commands"; 3931 trace "removing ext/exti commands";
3786 %EXTCMD = (); 3932 %EXTCMD = ();
3787 %EXTICMD = (); 3933 %EXTICMD = ();
3788 3934
3789 warn "unloading/nuking all extensions"; 3935 trace "unloading/nuking all extensions";
3790 for my $pkg (@EXTS) { 3936 for my $pkg (@EXTS) {
3791 warn "... unloading $pkg"; 3937 trace "... unloading $pkg";
3792 3938
3793 if (my $cb = $pkg->can ("unload")) { 3939 if (my $cb = $pkg->can ("unload")) {
3794 eval { 3940 eval {
3795 $cb->($pkg); 3941 $cb->($pkg);
3796 1 3942 1
3797 } or warn "$pkg unloaded, but with errors: $@"; 3943 } or error "$pkg unloaded, but with errors: $@";
3798 } 3944 }
3799 3945
3800 warn "... clearing $pkg"; 3946 trace "... clearing $pkg";
3801 clear_package $pkg; 3947 clear_package $pkg;
3802 } 3948 }
3803 3949
3804 warn "unloading all perl modules loaded from $LIBDIR"; 3950 trace "unloading all perl modules loaded from $LIBDIR";
3805 while (my ($k, $v) = each %INC) { 3951 while (my ($k, $v) = each %INC) {
3806 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3952 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3807 3953
3808 warn "... unloading $k"; 3954 trace "... unloading $k";
3809 delete $INC{$k}; 3955 delete $INC{$k};
3810 3956
3811 $k =~ s/\.pm$//; 3957 $k =~ s/\.pm$//;
3812 $k =~ s/\//::/g; 3958 $k =~ s/\//::/g;
3813 3959
… …
3816 } 3962 }
3817 3963
3818 clear_package $k; 3964 clear_package $k;
3819 } 3965 }
3820 3966
3821 warn "getting rid of safe::, as good as possible"; 3967 trace "getting rid of safe::, as good as possible";
3822 clear_package "safe::$_" 3968 clear_package "safe::$_"
3823 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3969 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3824 3970
3825 warn "unloading cf.pm \"a bit\""; 3971 trace "unloading cf.pm \"a bit\"";
3826 delete $INC{"cf.pm"}; 3972 delete $INC{"cf.pm"};
3827 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3973 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3828 3974
3829 # don't, removes xs symbols, too, 3975 # don't, removes xs symbols, too,
3830 # and global variables created in xs 3976 # and global variables created in xs
3831 #clear_package __PACKAGE__; 3977 #clear_package __PACKAGE__;
3832 3978
3833 warn "unload completed, starting to reload now"; 3979 info "unload completed, starting to reload now";
3834 3980
3835 warn "reloading cf.pm"; 3981 trace "reloading cf.pm";
3836 require cf; 3982 require cf;
3837 cf::_connect_to_perl_1; 3983 cf::_connect_to_perl_1;
3838 3984
3839 warn "loading config and database again"; 3985 trace "loading config and database again";
3840 cf::reload_config; 3986 cf::reload_config;
3841 3987
3842 warn "loading extensions"; 3988 trace "loading extensions";
3843 cf::load_extensions; 3989 cf::load_extensions;
3844 3990
3845 if ($REATTACH_ON_RELOAD) { 3991 if ($REATTACH_ON_RELOAD) {
3846 warn "reattaching attachments to objects/players"; 3992 trace "reattaching attachments to objects/players";
3847 _global_reattach; # objects, sockets 3993 _global_reattach; # objects, sockets
3848 warn "reattaching attachments to maps"; 3994 trace "reattaching attachments to maps";
3849 reattach $_ for values %MAP; 3995 reattach $_ for values %MAP;
3850 warn "reattaching attachments to players"; 3996 trace "reattaching attachments to players";
3851 reattach $_ for values %PLAYER; 3997 reattach $_ for values %PLAYER;
3852 } 3998 }
3853 3999
3854 warn "running post_init jobs"; 4000 trace "running post_init jobs";
3855 (pop @POST_INIT)->(1) while @POST_INIT; 4001 (pop @POST_INIT)->(1) while @POST_INIT;
3856 4002
3857 warn "leaving sync_job"; 4003 trace "leaving sync_job";
3858 4004
3859 1 4005 1
3860 } or do { 4006 } or do {
3861 warn $@; 4007 error $@;
3862 cf::cleanup "error while reloading, exiting."; 4008 cf::cleanup "error while reloading, exiting.";
3863 }; 4009 };
3864 4010
3865 warn "reloaded"; 4011 info "reloaded";
3866 --$RELOAD; 4012 --$RELOAD;
3867 } 4013 }
3868 4014
3869 $t1 = EV::time - $t1; 4015 $t1 = AE::time - $t1;
3870 warn "reload completed in ${t1}s\n"; 4016 info "reload completed in ${t1}s\n";
3871}; 4017};
3872 4018
3873our $RELOAD_WATCHER; # used only during reload 4019our $RELOAD_WATCHER; # used only during reload
3874 4020
3875sub reload_perl() { 4021sub reload_perl() {
… …
3877 # coro crashes during coro_state_free->destroy here. 4023 # coro crashes during coro_state_free->destroy here.
3878 4024
3879 $RELOAD_WATCHER ||= cf::async { 4025 $RELOAD_WATCHER ||= cf::async {
3880 Coro::AIO::aio_wait cache_extensions; 4026 Coro::AIO::aio_wait cache_extensions;
3881 4027
3882 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4028 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3883 do_reload_perl; 4029 do_reload_perl;
3884 undef $RELOAD_WATCHER; 4030 undef $RELOAD_WATCHER;
3885 }; 4031 };
3886 }; 4032 };
3887} 4033}
… …
3896 reload_perl; 4042 reload_perl;
3897 }; 4043 };
3898 } 4044 }
3899}; 4045};
3900 4046
3901unshift @INC, $LIBDIR; 4047#############################################################################
3902 4048
3903my $bug_warning = 0; 4049my $bug_warning = 0;
3904 4050
3905our @WAIT_FOR_TICK; 4051our @WAIT_FOR_TICK;
3906our @WAIT_FOR_TICK_BEGIN; 4052our @WAIT_FOR_TICK_BEGIN;
… …
3928 return; 4074 return;
3929 } 4075 }
3930 4076
3931 cf::server_tick; # one server iteration 4077 cf::server_tick; # one server iteration
3932 4078
3933 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4079 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3934 4080
3935 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4081 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3936 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4082 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3937 Coro::async_pool { 4083 Coro::async_pool {
3938 $Coro::current->{desc} = "runtime saver"; 4084 $Coro::current->{desc} = "runtime saver";
3939 write_runtime_sync 4085 write_runtime_sync
3940 or warn "ERROR: unable to write runtime file: $!"; 4086 or error "ERROR: unable to write runtime file: $!";
3941 }; 4087 };
3942 } 4088 }
3943 4089
3944 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4090 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3945 $sig->send; 4091 $sig->send;
… …
3953 4099
3954 if (0) { 4100 if (0) {
3955 if ($NEXT_TICK) { 4101 if ($NEXT_TICK) {
3956 my $jitter = $TICK_START - $NEXT_TICK; 4102 my $jitter = $TICK_START - $NEXT_TICK;
3957 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4103 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3958 warn "jitter $JITTER\n";#d# 4104 debug "jitter $JITTER\n";#d#
3959 } 4105 }
3960 } 4106 }
3961} 4107}
3962 4108
3963{ 4109{

Diff Legend

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