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.507 by root, Sat Mar 20 02:24:38 2010 UTC vs.
Revision 1.540 by root, Tue May 4 23:32:29 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
… …
2121 or next; 2175 or next;
2122 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2123 or next; 2177 or next;
2124 $neigh->load; 2178 $neigh->load;
2125 2179
2180 # now find the diagonal neighbours
2126 push @neigh, 2181 push @neigh,
2127 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2128 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2129 } 2184 }
2130 2185
… …
2137} 2192}
2138 2193
2139sub find_sync { 2194sub find_sync {
2140 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2141 2196
2142 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
2143} 2201}
2144 2202
2145sub do_load_sync { 2203sub do_load_sync {
2146 my ($map) = @_; 2204 my ($map) = @_;
2147 2205
2148 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2149 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2150 2208
2151 cf::sync_job { $map->load }; 2209 $map->load;
2152} 2210}
2153 2211
2154our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2155our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2156 2214
… …
2182 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2183 2241
2184 () 2242 ()
2185} 2243}
2186 2244
2245# common code, used by both ->save and ->swapout
2187sub save { 2246sub _save {
2188 my ($self) = @_; 2247 my ($self) = @_;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2248
2192 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2193 2250
2194 return unless $self->dirty; 2251 return unless $self->dirty;
2195 2252
… …
2215 } else { 2272 } else {
2216 $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);
2217 } 2274 }
2218} 2275}
2219 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2220sub swap_out { 2285sub swap_out {
2221 my ($self) = @_; 2286 my ($self) = @_;
2222 2287
2223 # save first because save cedes
2224 $self->save;
2225
2226 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227 2289
2228 return if $self->players;
2229 return if $self->in_memory != cf::MAP_ACTIVE; 2290 return if $self->in_memory != cf::MAP_ACTIVE;
2230 return if $self->{deny_save}; 2291 return if $self->{deny_save};
2292 return if $self->players;
2231 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2232 $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};
2233 2344
2234 $self->deactivate; 2345 $self->deactivate;
2235 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2236 $self->clear; 2347 $self->clear;
2237}
2238
2239sub reset_at {
2240 my ($self) = @_;
2241
2242 # TODO: safety, remove and allow resettable per-player maps
2243 return 1e99 if $self->{deny_reset};
2244
2245 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2246 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2247
2248 $time + $to
2249}
2250
2251sub should_reset {
2252 my ($self) = @_;
2253
2254 $self->reset_at <= $cf::RUNTIME
2255}
2256
2257sub reset {
2258 my ($self) = @_;
2259
2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261
2262 return if $self->players;
2263
2264 warn "resetting map ", $self->path, "\n";
2265
2266 $self->in_memory (cf::MAP_SWAPPED);
2267
2268 # need to save uniques path
2269 unless ($self->{deny_save}) {
2270 my $uniq = $self->uniq_path; utf8::encode $uniq;
2271
2272 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2273 if $uniq;
2274 }
2275
2276 delete $cf::MAP{$self->path};
2277
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->clear;
2281 2348
2282 $self->unlink_save; 2349 $self->unlink_save;
2283 $self->destroy; 2350 $self->destroy;
2284} 2351}
2285 2352
… …
2293 2360
2294 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2295 2362
2296 $self->unlink_save; 2363 $self->unlink_save;
2297 2364
2298 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2299 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2300 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2301 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2302 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2303 2370
… …
2533 2600
2534Freezes 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}>).
2535 2602
2536The 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.
2537for 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,
2538though, 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
2539map. 2606map.
2540 2607
2541Will never block. 2608Will never block.
2542 2609
2543=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
… …
2564sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2565 my ($self) = @_; 2632 my ($self) = @_;
2566 2633
2567 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2568 2635
2636 ++$self->{_link_recursion};
2637
2569 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2570 2639
2571 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2572 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2573 2642
2574 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2575} 2644}
2576 2645
2577sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2578 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2579 2648
… …
2604 $map->load_neighbours; 2673 $map->load_neighbours;
2605 2674
2606 return unless $self->contr->active; 2675 return unless $self->contr->active;
2607 2676
2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2610 2679 # entering was successful
2680 delete $self->{_link_recursion};
2611 # only activate afterwards, to support waiting in hooks 2681 # only activate afterwards, to support waiting in hooks
2612 $self->activate_recursive; 2682 $self->activate_recursive;
2613} 2683 }
2614 2684
2685}
2686
2615=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)]])
2616 2688
2617Moves 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
2618her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2619that 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
2620the 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
… …
2627 2699
2628our $GOTOGEN; 2700our $GOTOGEN;
2629 2701
2630sub cf::object::player::goto { 2702sub cf::object::player::goto {
2631 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 }
2632 2710
2633 # 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
2634 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2635 2713
2636 $self->enter_link; 2714 $self->enter_link;
… …
2660 my $map = eval { 2738 my $map = eval {
2661 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2662 2740
2663 if ($map) { 2741 if ($map) {
2664 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2665 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2666 } else { 2744 } else {
2667 $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);
2668 } 2746 }
2669 2747
2670 $map 2748 $map
… …
2678 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2679 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2680 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2681 } 2759 }
2682 2760
2683 $done->() if $done; 2761 $done->($self) if $done;
2684 })->prio (1); 2762 })->prio (1);
2685} 2763}
2686 2764
2687=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2688 2766
… …
2781 $self->message ("Something went wrong deep within the deliantra server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2782 . "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. "
2783 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2784 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2785 2863
2786 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2787 $self->leave_link; 2865 $self->leave_link;
2788 } 2866 }
2789 })->prio (1); 2867 })->prio (1);
2790} 2868}
2791 2869
… …
3104 3182
3105 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
3106 if $reply; 3184 if $reply;
3107 3185
3108 } else { 3186 } else {
3109 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";
3110 } 3188 }
3111 3189
3112 cf::override; 3190 cf::override;
3113 }, 3191 },
3114); 3192);
… …
3134 3212
3135 $coro 3213 $coro
3136} 3214}
3137 3215
3138cf::client->attach ( 3216cf::client->attach (
3139 on_destroy => sub { 3217 on_client_destroy => sub {
3140 my ($ns) = @_; 3218 my ($ns) = @_;
3141 3219
3142 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3143 }, 3221 },
3144); 3222);
… …
3195 decrease split destroy change_exp value msg lore send_msg)], 3273 decrease split destroy change_exp value msg lore send_msg)],
3196 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
3197 ["cf::player" => qw(peaceful send_msg)], 3275 ["cf::player" => qw(peaceful send_msg)],
3198 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
3199) { 3277) {
3200 no strict 'refs';
3201 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
3202 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3203 for @funs; 3280 for @funs;
3204} 3281}
3205 3282
… …
3244 local @cf::_safe_eval_args = values %vars; 3321 local @cf::_safe_eval_args = values %vars;
3245 @res = wantarray ? eval eval : scalar eval $eval; 3322 @res = wantarray ? eval eval : scalar eval $eval;
3246 } 3323 }
3247 3324
3248 if ($@) { 3325 if ($@) {
3249 warn "$@"; 3326 warn "$@",
3250 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
3251 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
3252 } 3329 }
3253 3330
3254 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
3255} 3332}
3256 3333
… …
3281=cut 3358=cut
3282 3359
3283############################################################################# 3360#############################################################################
3284# the server's init and main functions 3361# the server's init and main functions
3285 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 warn "$dir/$mod\n";#d#
3376 ref $dir and next;
3377 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3378 or next;
3379
3380 $data = "#line 1 $dir/$mod\n$data";
3381
3382 open my $fh, "<", \$data or die;
3383
3384 return $fh;
3385 }
3386
3387 ()
3388}
3389
3390sub init_inc {
3391 # save original @INC
3392 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3393
3394 # make sure we can do scalar-opens
3395 open my $dummy, "<", \my $dummy2;
3396
3397 # execute some stuff so perl load's some of the core modules
3398 /Ü/ =~ /ü/i;
3399 eval { &Storable::nstore_fd };
3400
3401 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3402
3403 debug "module loading will be asynchronous from this point on.";
3404}
3405
3286sub load_facedata($) { 3406sub load_facedata($) {
3287 my ($path) = @_; 3407 my ($path) = @_;
3288 3408
3289 # HACK to clear player env face cache, we need some signal framework 3409 # HACK to clear player env face cache, we need some signal framework
3290 # for this (global event?) 3410 # for this (global event?)
3291 %ext::player_env::MUSIC_FACE_CACHE = (); 3411 %ext::player_env::MUSIC_FACE_CACHE = ();
3292 3412
3293 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3413 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3294 3414
3295 warn "loading facedata from $path\n"; 3415 trace "loading facedata from $path\n";
3296 3416
3297 my $facedata; 3417 my $facedata;
3298 0 < aio_load $path, $facedata 3418 0 < aio_load $path, $facedata
3299 or die "$path: $!"; 3419 or die "$path: $!";
3300 3420
… …
3334 3454
3335 if (my $smooth = cf::face::find $info->{smooth}) { 3455 if (my $smooth = cf::face::find $info->{smooth}) {
3336 cf::face::set_smooth $idx, $smooth; 3456 cf::face::set_smooth $idx, $smooth;
3337 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3457 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3338 } else { 3458 } else {
3339 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3459 error "smooth face '$info->{smooth}' not found for face '$face'";
3340 } 3460 }
3341 3461
3342 cf::cede_to_tick; 3462 cf::cede_to_tick;
3343 } 3463 }
3344 } 3464 }
… …
3362 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3482 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3363 3483
3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3484 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3365 cf::face::set_type $idx, $info->{type}; 3485 cf::face::set_type $idx, $info->{type};
3366 } else { 3486 } else {
3367 $RESOURCE{$name} = $info; 3487 $RESOURCE{$name} = $info; # unused
3368 } 3488 }
3369 3489
3370 cf::cede_to_tick; 3490 cf::cede_to_tick;
3371 } 3491 }
3372 } 3492 }
3373 3493
3374 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3494 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3375 3495
3376 1 3496 1
3377} 3497}
3378
3379cf::global->attach (on_resource_update => sub {
3380 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3381 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3382
3383 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3384 my $sound = $soundconf->{compat}[$_]
3385 or next;
3386
3387 my $face = cf::face::find "sound/$sound->[1]";
3388 cf::sound::set $sound->[0] => $face;
3389 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3390 }
3391
3392 while (my ($k, $v) = each %{$soundconf->{event}}) {
3393 my $face = cf::face::find "sound/$v";
3394 cf::sound::set $k => $face;
3395 }
3396 }
3397});
3398 3498
3399register_exticmd fx_want => sub { 3499register_exticmd fx_want => sub {
3400 my ($ns, $want) = @_; 3500 my ($ns, $want) = @_;
3401 3501
3402 while (my ($k, $v) = each %$want) { 3502 while (my ($k, $v) = each %$want) {
… …
3441sub reload_treasures { 3541sub reload_treasures {
3442 load_resource_file "$DATADIR/treasures" 3542 load_resource_file "$DATADIR/treasures"
3443 or die "unable to load treasurelists\n"; 3543 or die "unable to load treasurelists\n";
3444} 3544}
3445 3545
3546sub reload_sound {
3547 trace "loading sound config from $DATADIR/sound\n";
3548
3549 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3550 or die "$DATADIR/sound $!";
3551
3552 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3553
3554 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3555 my $sound = $soundconf->{compat}[$_]
3556 or next;
3557
3558 my $face = cf::face::find "sound/$sound->[1]";
3559 cf::sound::set $sound->[0] => $face;
3560 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3561 }
3562
3563 while (my ($k, $v) = each %{$soundconf->{event}}) {
3564 my $face = cf::face::find "sound/$v";
3565 cf::sound::set $k => $face;
3566 }
3567}
3568
3446sub reload_resources { 3569sub reload_resources {
3447 warn "reloading resource files...\n"; 3570 trace "reloading resource files...\n";
3448 3571
3449 reload_facedata; 3572 reload_facedata;
3573 reload_sound;
3450 reload_archetypes; 3574 reload_archetypes;
3451 reload_regions; 3575 reload_regions;
3452 reload_treasures; 3576 reload_treasures;
3453 3577
3454 warn "finished reloading resource files\n"; 3578 trace "finished reloading resource files\n";
3455} 3579}
3456 3580
3457sub reload_config { 3581sub reload_config {
3458 warn "reloading config file...\n"; 3582 trace "reloading config file...\n";
3459 3583
3460 open my $fh, "<:utf8", "$CONFDIR/config" 3584 open my $fh, "<:utf8", "$CONFDIR/config"
3461 or return; 3585 or return;
3462 3586
3463 local $/; 3587 local $/;
3464 *CFG = YAML::XS::Load scalar <$fh>; 3588 *CFG = YAML::XS::Load scalar <$fh>;
3465 3589
3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3467 3591
3468 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3592 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3469 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3593 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3470 3594
3471 if (exists $CFG{mlockall}) { 3595 if (exists $CFG{mlockall}) {
… …
3474 and die "WARNING: m(un)lockall failed: $!\n"; 3598 and die "WARNING: m(un)lockall failed: $!\n";
3475 }; 3599 };
3476 warn $@ if $@; 3600 warn $@ if $@;
3477 } 3601 }
3478 3602
3479 warn "finished reloading resource files\n"; 3603 trace "finished reloading resource files\n";
3480} 3604}
3481 3605
3482sub pidfile() { 3606sub pidfile() {
3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3607 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3484 or die "$PIDFILE: $!"; 3608 or die "$PIDFILE: $!";
… …
3497 seek $fh, 0, 0; 3621 seek $fh, 0, 0;
3498 print $fh $$; 3622 print $fh $$;
3499} 3623}
3500 3624
3501sub main_loop { 3625sub main_loop {
3502 warn "EV::loop starting\n"; 3626 trace "EV::loop starting\n";
3503 if (1) { 3627 if (1) {
3504 EV::loop; 3628 EV::loop;
3505 } 3629 }
3506 warn "EV::loop returned\n"; 3630 trace "EV::loop returned\n";
3507 goto &main_loop unless $REALLY_UNLOOP; 3631 goto &main_loop unless $REALLY_UNLOOP;
3508} 3632}
3509 3633
3510sub main { 3634sub main {
3511 cf::init_globals; # initialise logging 3635 cf::init_globals; # initialise logging
3512 3636
3513 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3637 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3514 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3638 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3515 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3639 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3516 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3640 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3517
3518 cf::init_experience;
3519 cf::init_anim;
3520 cf::init_attackmess;
3521 cf::init_dynamic;
3522 3641
3523 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3642 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3524 3643
3525 # we must not ever block the main coroutine 3644 # we must not ever block the main coroutine
3526 local $Coro::idle = sub { 3645 local $Coro::idle = sub {
… …
3532 }; 3651 };
3533 3652
3534 evthread_start IO::AIO::poll_fileno; 3653 evthread_start IO::AIO::poll_fileno;
3535 3654
3536 cf::sync_job { 3655 cf::sync_job {
3656 init_inc;
3657
3658 cf::init_experience;
3659 cf::init_anim;
3660 cf::init_attackmess;
3661 cf::init_dynamic;
3662
3537 cf::load_settings; 3663 cf::load_settings;
3538 cf::load_materials; 3664 cf::load_materials;
3539 3665
3540 reload_resources; 3666 reload_resources;
3541 reload_config; 3667 reload_config;
3542 db_init; 3668 db_init;
3543 3669
3544 cf::init_uuid; 3670 cf::init_uuid;
3545 cf::init_signals; 3671 cf::init_signals;
3546 cf::init_commands;
3547 cf::init_skills; 3672 cf::init_skills;
3548 3673
3549 cf::init_beforeplay; 3674 cf::init_beforeplay;
3550 3675
3551 atomic; 3676 atomic;
… …
3559 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3684 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3560 3685
3561 (pop @POST_INIT)->(0) while @POST_INIT; 3686 (pop @POST_INIT)->(0) while @POST_INIT;
3562 }; 3687 };
3563 3688
3689 cf::object::thawer::errors_are_fatal 0;
3690 info "parse errors in files are no longer fatal from this point on.\n";
3691
3692 my $free_main; $free_main = EV::idle sub {
3693 undef $free_main;
3694 undef &main; # free gobs of memory :)
3695 };
3696
3564 main_loop; 3697 goto &main_loop;
3565} 3698}
3566 3699
3567############################################################################# 3700#############################################################################
3568# initialisation and cleanup 3701# initialisation and cleanup
3569 3702
3570# install some emergency cleanup handlers 3703# install some emergency cleanup handlers
3571BEGIN { 3704BEGIN {
3572 our %SIGWATCHER = (); 3705 our %SIGWATCHER = ();
3573 for my $signal (qw(INT HUP TERM)) { 3706 for my $signal (qw(INT HUP TERM)) {
3574 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3707 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3575 cf::cleanup "SIG$signal"; 3708 cf::cleanup "SIG$signal";
3576 }; 3709 };
3577 } 3710 }
3578} 3711}
3579 3712
3580sub write_runtime_sync { 3713sub write_runtime_sync {
3581 my $t0 = EV::time; 3714 my $t0 = AE::time;
3582 3715
3583 # first touch the runtime file to show we are still running: 3716 # first touch the runtime file to show we are still running:
3584 # the fsync below can take a very very long time. 3717 # the fsync below can take a very very long time.
3585 3718
3586 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3719 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
… …
3608 or return; 3741 or return;
3609 3742
3610 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3743 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3611 and return; 3744 and return;
3612 3745
3613 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 3746 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3614 3747
3615 1 3748 1
3616} 3749}
3617 3750
3618our $uuid_lock; 3751our $uuid_lock;
… …
3630 or return; 3763 or return;
3631 3764
3632 my $value = uuid_seq uuid_cur; 3765 my $value = uuid_seq uuid_cur;
3633 3766
3634 unless ($value) { 3767 unless ($value) {
3635 warn "cowardly refusing to write zero uuid value!\n"; 3768 info "cowardly refusing to write zero uuid value!\n";
3636 return; 3769 return;
3637 } 3770 }
3638 3771
3639 my $value = uuid_str $value + $uuid_skip; 3772 my $value = uuid_str $value + $uuid_skip;
3640 $uuid_skip = 0; 3773 $uuid_skip = 0;
… …
3650 or return; 3783 or return;
3651 3784
3652 aio_rename "$uuid~", $uuid 3785 aio_rename "$uuid~", $uuid
3653 and return; 3786 and return;
3654 3787
3655 warn "uuid file written ($value).\n"; 3788 trace "uuid file written ($value).\n";
3656 3789
3657 1 3790 1
3658 3791
3659} 3792}
3660 3793
… …
3666} 3799}
3667 3800
3668sub emergency_save() { 3801sub emergency_save() {
3669 my $freeze_guard = cf::freeze_mainloop; 3802 my $freeze_guard = cf::freeze_mainloop;
3670 3803
3671 warn "emergency_perl_save: enter\n"; 3804 info "emergency_perl_save: enter\n";
3805
3806 # this is a trade-off: we want to be very quick here, so
3807 # save all maps without fsync, and later call a global sync
3808 # (which in turn might be very very slow)
3809 local $USE_FSYNC = 0;
3672 3810
3673 cf::sync_job { 3811 cf::sync_job {
3674 # this is a trade-off: we want to be very quick here, so 3812 cf::write_runtime_sync; # external watchdog should not bark
3675 # save all maps without fsync, and later call a global sync
3676 # (which in turn might be very very slow)
3677 local $USE_FSYNC = 0;
3678 3813
3679 # use a peculiar iteration method to avoid tripping on perl 3814 # use a peculiar iteration method to avoid tripping on perl
3680 # refcount bugs in for. also avoids problems with players 3815 # refcount bugs in for. also avoids problems with players
3681 # and maps saved/destroyed asynchronously. 3816 # and maps saved/destroyed asynchronously.
3682 warn "emergency_perl_save: begin player save\n"; 3817 info "emergency_perl_save: begin player save\n";
3683 for my $login (keys %cf::PLAYER) { 3818 for my $login (keys %cf::PLAYER) {
3684 my $pl = $cf::PLAYER{$login} or next; 3819 my $pl = $cf::PLAYER{$login} or next;
3685 $pl->valid or next; 3820 $pl->valid or next;
3686 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3821 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3687 $pl->save; 3822 $pl->save;
3688 } 3823 }
3689 warn "emergency_perl_save: end player save\n"; 3824 info "emergency_perl_save: end player save\n";
3690 3825
3826 cf::write_runtime_sync; # external watchdog should not bark
3827
3691 warn "emergency_perl_save: begin map save\n"; 3828 info "emergency_perl_save: begin map save\n";
3692 for my $path (keys %cf::MAP) { 3829 for my $path (keys %cf::MAP) {
3693 my $map = $cf::MAP{$path} or next; 3830 my $map = $cf::MAP{$path} or next;
3694 $map->valid or next; 3831 $map->valid or next;
3695 $map->save; 3832 $map->save;
3696 } 3833 }
3697 warn "emergency_perl_save: end map save\n"; 3834 info "emergency_perl_save: end map save\n";
3698 3835
3836 cf::write_runtime_sync; # external watchdog should not bark
3837
3699 warn "emergency_perl_save: begin database checkpoint\n"; 3838 info "emergency_perl_save: begin database checkpoint\n";
3700 BDB::db_env_txn_checkpoint $DB_ENV; 3839 BDB::db_env_txn_checkpoint $DB_ENV;
3701 warn "emergency_perl_save: end database checkpoint\n"; 3840 info "emergency_perl_save: end database checkpoint\n";
3702 3841
3703 warn "emergency_perl_save: begin write uuid\n"; 3842 info "emergency_perl_save: begin write uuid\n";
3704 write_uuid_sync 1; 3843 write_uuid_sync 1;
3705 warn "emergency_perl_save: end write uuid\n"; 3844 info "emergency_perl_save: end write uuid\n";
3845
3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3848 trace "emergency_perl_save: syncing database to disk";
3849 BDB::db_env_txn_checkpoint $DB_ENV;
3850
3851 info "emergency_perl_save: starting sync\n";
3852 IO::AIO::aio_sync sub {
3853 info "emergency_perl_save: finished sync\n";
3854 };
3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 trace "emergency_perl_save: flushing outstanding aio requests";
3859 while (IO::AIO::nreqs || BDB::nreqs) {
3860 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3861 }
3862
3863 cf::write_runtime_sync; # external watchdog should not bark
3706 }; 3864 };
3707 3865
3708 warn "emergency_perl_save: starting sync()\n";
3709 IO::AIO::aio_sync sub {
3710 warn "emergency_perl_save: finished sync()\n";
3711 };
3712
3713 warn "emergency_perl_save: leave\n"; 3866 info "emergency_perl_save: leave\n";
3714} 3867}
3715 3868
3716sub post_cleanup { 3869sub post_cleanup {
3717 my ($make_core) = @_; 3870 my ($make_core) = @_;
3718 3871
3872 IO::AIO::flush;
3873
3719 warn Carp::longmess "post_cleanup backtrace" 3874 error Carp::longmess "post_cleanup backtrace"
3720 if $make_core; 3875 if $make_core;
3721 3876
3722 my $fh = pidfile; 3877 my $fh = pidfile;
3723 unlink $PIDFILE if <$fh> == $$; 3878 unlink $PIDFILE if <$fh> == $$;
3724} 3879}
… …
3744 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3899 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3745 for my $name (keys %$leaf_symtab) { 3900 for my $name (keys %$leaf_symtab) {
3746 _gv_clear *{"$pkg$name"}; 3901 _gv_clear *{"$pkg$name"};
3747# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3902# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3748 } 3903 }
3749 warn "cleared package $pkg\n";#d#
3750} 3904}
3751 3905
3752sub do_reload_perl() { 3906sub do_reload_perl() {
3753 # can/must only be called in main 3907 # can/must only be called in main
3754 if ($Coro::current != $Coro::main) { 3908 if (in_main) {
3755 warn "can only reload from main coroutine"; 3909 error "can only reload from main coroutine";
3756 return; 3910 return;
3757 } 3911 }
3758 3912
3759 return if $RELOAD++; 3913 return if $RELOAD++;
3760 3914
3761 my $t1 = EV::time; 3915 my $t1 = AE::time;
3762 3916
3763 while ($RELOAD) { 3917 while ($RELOAD) {
3764 warn "reloading..."; 3918 info "reloading...";
3765 3919
3766 warn "entering sync_job"; 3920 trace "entering sync_job";
3767 3921
3768 cf::sync_job { 3922 cf::sync_job {
3769 cf::write_runtime_sync; # external watchdog should not bark
3770 cf::emergency_save; 3923 cf::emergency_save;
3771 cf::write_runtime_sync; # external watchdog should not bark
3772 3924
3773 warn "syncing database to disk";
3774 BDB::db_env_txn_checkpoint $DB_ENV;
3775
3776 # if anything goes wrong in here, we should simply crash as we already saved
3777
3778 warn "flushing outstanding aio requests";
3779 while (IO::AIO::nreqs || BDB::nreqs) {
3780 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3781 }
3782
3783 warn "cancelling all extension coros"; 3925 trace "cancelling all extension coros";
3784 $_->cancel for values %EXT_CORO; 3926 $_->cancel for values %EXT_CORO;
3785 %EXT_CORO = (); 3927 %EXT_CORO = ();
3786 3928
3787 warn "removing commands"; 3929 trace "removing commands";
3788 %COMMAND = (); 3930 %COMMAND = ();
3789 3931
3790 warn "removing ext/exti commands"; 3932 trace "removing ext/exti commands";
3791 %EXTCMD = (); 3933 %EXTCMD = ();
3792 %EXTICMD = (); 3934 %EXTICMD = ();
3793 3935
3794 warn "unloading/nuking all extensions"; 3936 trace "unloading/nuking all extensions";
3795 for my $pkg (@EXTS) { 3937 for my $pkg (@EXTS) {
3796 warn "... unloading $pkg"; 3938 trace "... unloading $pkg";
3797 3939
3798 if (my $cb = $pkg->can ("unload")) { 3940 if (my $cb = $pkg->can ("unload")) {
3799 eval { 3941 eval {
3800 $cb->($pkg); 3942 $cb->($pkg);
3801 1 3943 1
3802 } or warn "$pkg unloaded, but with errors: $@"; 3944 } or error "$pkg unloaded, but with errors: $@";
3803 } 3945 }
3804 3946
3805 warn "... clearing $pkg"; 3947 trace "... clearing $pkg";
3806 clear_package $pkg; 3948 clear_package $pkg;
3807 } 3949 }
3808 3950
3809 warn "unloading all perl modules loaded from $LIBDIR"; 3951 trace "unloading all perl modules loaded from $LIBDIR";
3810 while (my ($k, $v) = each %INC) { 3952 while (my ($k, $v) = each %INC) {
3811 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3953 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3812 3954
3813 warn "... unloading $k"; 3955 trace "... unloading $k";
3814 delete $INC{$k}; 3956 delete $INC{$k};
3815 3957
3816 $k =~ s/\.pm$//; 3958 $k =~ s/\.pm$//;
3817 $k =~ s/\//::/g; 3959 $k =~ s/\//::/g;
3818 3960
… …
3821 } 3963 }
3822 3964
3823 clear_package $k; 3965 clear_package $k;
3824 } 3966 }
3825 3967
3826 warn "getting rid of safe::, as good as possible"; 3968 trace "getting rid of safe::, as good as possible";
3827 clear_package "safe::$_" 3969 clear_package "safe::$_"
3828 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3970 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3829 3971
3830 warn "unloading cf.pm \"a bit\""; 3972 trace "unloading cf.pm \"a bit\"";
3831 delete $INC{"cf.pm"}; 3973 delete $INC{"cf.pm"};
3832 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3974 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3833 3975
3834 # don't, removes xs symbols, too, 3976 # don't, removes xs symbols, too,
3835 # and global variables created in xs 3977 # and global variables created in xs
3836 #clear_package __PACKAGE__; 3978 #clear_package __PACKAGE__;
3837 3979
3838 warn "unload completed, starting to reload now"; 3980 info "unload completed, starting to reload now";
3839 3981
3840 warn "reloading cf.pm"; 3982 trace "reloading cf.pm";
3841 require cf; 3983 require cf;
3842 cf::_connect_to_perl_1; 3984 cf::_connect_to_perl_1;
3843 3985
3844 warn "loading config and database again"; 3986 trace "loading config and database again";
3845 cf::reload_config; 3987 cf::reload_config;
3846 3988
3847 warn "loading extensions"; 3989 trace "loading extensions";
3848 cf::load_extensions; 3990 cf::load_extensions;
3849 3991
3850 if ($REATTACH_ON_RELOAD) { 3992 if ($REATTACH_ON_RELOAD) {
3851 warn "reattaching attachments to objects/players"; 3993 trace "reattaching attachments to objects/players";
3852 _global_reattach; # objects, sockets 3994 _global_reattach; # objects, sockets
3853 warn "reattaching attachments to maps"; 3995 trace "reattaching attachments to maps";
3854 reattach $_ for values %MAP; 3996 reattach $_ for values %MAP;
3855 warn "reattaching attachments to players"; 3997 trace "reattaching attachments to players";
3856 reattach $_ for values %PLAYER; 3998 reattach $_ for values %PLAYER;
3857 } 3999 }
3858 4000
3859 warn "running post_init jobs"; 4001 trace "running post_init jobs";
3860 (pop @POST_INIT)->(1) while @POST_INIT; 4002 (pop @POST_INIT)->(1) while @POST_INIT;
3861 4003
3862 warn "leaving sync_job"; 4004 trace "leaving sync_job";
3863 4005
3864 1 4006 1
3865 } or do { 4007 } or do {
3866 warn $@; 4008 error $@;
3867 cf::cleanup "error while reloading, exiting."; 4009 cf::cleanup "error while reloading, exiting.";
3868 }; 4010 };
3869 4011
3870 warn "reloaded"; 4012 info "reloaded";
3871 --$RELOAD; 4013 --$RELOAD;
3872 } 4014 }
3873 4015
3874 $t1 = EV::time - $t1; 4016 $t1 = AE::time - $t1;
3875 warn "reload completed in ${t1}s\n"; 4017 info "reload completed in ${t1}s\n";
3876}; 4018};
3877 4019
3878our $RELOAD_WATCHER; # used only during reload 4020our $RELOAD_WATCHER; # used only during reload
3879 4021
3880sub reload_perl() { 4022sub reload_perl() {
… …
3882 # coro crashes during coro_state_free->destroy here. 4024 # coro crashes during coro_state_free->destroy here.
3883 4025
3884 $RELOAD_WATCHER ||= cf::async { 4026 $RELOAD_WATCHER ||= cf::async {
3885 Coro::AIO::aio_wait cache_extensions; 4027 Coro::AIO::aio_wait cache_extensions;
3886 4028
3887 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4029 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3888 do_reload_perl; 4030 do_reload_perl;
3889 undef $RELOAD_WATCHER; 4031 undef $RELOAD_WATCHER;
3890 }; 4032 };
3891 }; 4033 };
3892} 4034}
… …
3901 reload_perl; 4043 reload_perl;
3902 }; 4044 };
3903 } 4045 }
3904}; 4046};
3905 4047
3906unshift @INC, $LIBDIR; 4048#############################################################################
3907 4049
3908my $bug_warning = 0; 4050my $bug_warning = 0;
3909 4051
3910our @WAIT_FOR_TICK; 4052our @WAIT_FOR_TICK;
3911our @WAIT_FOR_TICK_BEGIN; 4053our @WAIT_FOR_TICK_BEGIN;
… …
3933 return; 4075 return;
3934 } 4076 }
3935 4077
3936 cf::server_tick; # one server iteration 4078 cf::server_tick; # one server iteration
3937 4079
3938 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4080 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3939 4081
3940 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4082 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3941 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4083 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3942 Coro::async_pool { 4084 Coro::async_pool {
3943 $Coro::current->{desc} = "runtime saver"; 4085 $Coro::current->{desc} = "runtime saver";
3944 write_runtime_sync 4086 write_runtime_sync
3945 or warn "ERROR: unable to write runtime file: $!"; 4087 or error "ERROR: unable to write runtime file: $!";
3946 }; 4088 };
3947 } 4089 }
3948 4090
3949 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4091 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3950 $sig->send; 4092 $sig->send;
… …
3958 4100
3959 if (0) { 4101 if (0) {
3960 if ($NEXT_TICK) { 4102 if ($NEXT_TICK) {
3961 my $jitter = $TICK_START - $NEXT_TICK; 4103 my $jitter = $TICK_START - $NEXT_TICK;
3962 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4104 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3963 warn "jitter $JITTER\n";#d# 4105 debug "jitter $JITTER\n";#d#
3964 } 4106 }
3965 } 4107 }
3966} 4108}
3967 4109
3968{ 4110{

Diff Legend

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