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.511 by root, Wed Apr 7 18:35:56 2010 UTC vs.
Revision 1.546 by root, Thu May 6 22:57:49 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
… …
118our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 127our $DB_ENV;
122 128
123our @EXTRA_MODULES = qw(pod match mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 130
125our %CFG; 131our %CFG;
126 132
127our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 134our $RUNTIME;
… …
162 168
163our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
164 170
165sub cf::map::normalise; 171sub cf::map::normalise;
166 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
167############################################################################# 177#############################################################################
168 178
169%REFLECT = (); 179%REFLECT = ();
170for (@REFLECT) { 180for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
… …
223from wherever your confdir points to. 233from wherever your confdir points to.
224 234
225=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
226 236
227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
228returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
229per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
230 245
231=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
232 247
233This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
242 257
243=back 258=back
244 259
245=cut 260=cut
246 261
262sub error(@) { LOG llevError, join "", @_ }
263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
247$Coro::State::WARNHOOK = sub { 268$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 269 my $msg = join "", @_;
249 270
250 $msg .= "\n" 271 $msg .= "\n"
251 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
252 273
253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254 275
255 LOG llevError, $msg; 276 LOG llevWarn, $msg;
256}; 277};
257 278
258$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
260 281
261 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
262 283
263 if ($Coro::current == $Coro::main) {#d# 284 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 286 return;#d#
266 }#d# 287 }#d#
267 288
268 # kill coroutine otherwise 289 # kill coroutine otherwise
269 Coro::terminate 290 Coro::terminate
… …
396} 417}
397 418
398=item cf::periodic $interval, $cb 419=item cf::periodic $interval, $cb
399 420
400Like EV::periodic, but randomly selects a starting point so that the actions 421Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 422get spread over time.
402 423
403=cut 424=cut
404 425
405sub periodic($$) { 426sub periodic($$) {
406 my ($interval, $cb) = @_; 427 my ($interval, $cb) = @_;
… …
502=cut 523=cut
503 524
504sub sync_job(&) { 525sub sync_job(&) {
505 my ($job) = @_; 526 my ($job) = @_;
506 527
507 if ($Coro::current == $Coro::main) { 528 if (in_main) {
508 my $time = EV::time; 529 my $time = AE::time;
509 530
510 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
512 533
513 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
514 535
515 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
516 537
517 my $busy = 1; 538 my $busy = 1;
518 my @res; 539 my @res;
519 540
520 (async { 541 (async {
521 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
522 @res = eval { $job->() }; 543 @res = eval { $job->() };
523 warn $@ if $@; 544 error $@ if $@;
524 undef $busy; 545 undef $busy;
525 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
526 547
527 while ($busy) { 548 while ($busy) {
528 if (Coro::nready) { 549 if (Coro::nready) {
… …
530 } else { 551 } else {
531 EV::loop EV::LOOP_ONESHOT; 552 EV::loop EV::LOOP_ONESHOT;
532 } 553 }
533 } 554 }
534 555
535 my $time = EV::time - $time; 556 my $time = AE::time - $time;
536 557
537 $TICK_START += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
538 559
539 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
540 } else { 561 } else {
… …
584 reset_signals; 605 reset_signals;
585 &$cb 606 &$cb
586 }, @args; 607 }, @args;
587 608
588 wantarray ? @res : $res[-1] 609 wantarray ? @res : $res[-1]
610}
611
612sub objinfo {
613 (
614 "counter value" => cf::object::object_count,
615 "objects created" => cf::object::create_count,
616 "objects destroyed" => cf::object::destroy_count,
617 "freelist size" => cf::object::free_count,
618 "allocated objects" => cf::object::objects_size,
619 "active objects" => cf::object::actives_size,
620 )
589} 621}
590 622
591=item $coin = coin_from_name $name 623=item $coin = coin_from_name $name
592 624
593=cut 625=cut
… …
630within each server. 662within each server.
631 663
632=cut 664=cut
633 665
634sub db_table($) { 666sub db_table($) {
667 cf::error "db_get called from main context"
668 if $Coro::current == $Coro::main;
669
635 my ($name) = @_; 670 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV; 671 my $db = BDB::db_create $DB_ENV;
637 672
638 eval { 673 eval {
639 $db->set_flags (BDB::CHKSUM); 674 $db->set_flags (BDB::CHKSUM);
… …
649} 684}
650 685
651our $DB; 686our $DB;
652 687
653sub db_init { 688sub db_init {
654 cf::sync_job {
655 $DB ||= db_table "db"; 689 $DB ||= db_table "db";
656 };
657} 690}
658 691
659sub db_get($$) { 692sub db_get($$) {
660 my $key = "$_[0]/$_[1]"; 693 my $key = "$_[0]/$_[1]";
661 694
662 cf::sync_job { 695 cf::error "db_get called from main context"
696 if $Coro::current == $Coro::main;
697
663 BDB::db_get $DB, undef, $key, my $data; 698 BDB::db_get $DB, undef, $key, my $data;
664 699
665 $! ? () 700 $! ? ()
666 : $data 701 : $data
667 }
668} 702}
669 703
670sub db_put($$$) { 704sub db_put($$$) {
671 BDB::dbreq_pri 4; 705 BDB::dbreq_pri 4;
672 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 706 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
728 762
729 my $t1 = Time::HiRes::time; 763 my $t1 = Time::HiRes::time;
730 my $data = $process->(\@data); 764 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time; 765 my $t2 = Time::HiRes::time;
732 766
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 767 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734 768
735 db_put cache => "$id/data", $data; 769 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5; 770 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta; 771 db_put cache => "$id/meta", $meta;
738 772
… …
748 782
749=cut 783=cut
750 784
751sub datalog($@) { 785sub datalog($@) {
752 my ($type, %kv) = @_; 786 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 787 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754} 788}
755 789
756=back 790=back
757 791
758=cut 792=cut
… …
953 987
954 } elsif (exists $cb_id{$type}) { 988 } elsif (exists $cb_id{$type}) {
955 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 989 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956 990
957 } elsif (ref $type) { 991 } elsif (ref $type) {
958 warn "attaching objects not supported, ignoring.\n"; 992 error "attaching objects not supported, ignoring.\n";
959 993
960 } else { 994 } else {
961 shift @arg; 995 shift @arg;
962 warn "attach argument '$type' not supported, ignoring.\n"; 996 error "attach argument '$type' not supported, ignoring.\n";
963 } 997 }
964 } 998 }
965} 999}
966 1000
967sub _object_attach { 1001sub _object_attach {
… …
977 _attach $registry, $klass, @attach; 1011 _attach $registry, $klass, @attach;
978 } 1012 }
979 1013
980 $obj->{$name} = \%arg; 1014 $obj->{$name} = \%arg;
981 } else { 1015 } else {
982 warn "object uses attachment '$name' which is not available, postponing.\n"; 1016 info "object uses attachment '$name' which is not available, postponing.\n";
983 } 1017 }
984 1018
985 $obj->{_attachment}{$name} = undef; 1019 $obj->{_attachment}{$name} = undef;
986} 1020}
987 1021
… …
1046 1080
1047 for (@$callbacks) { 1081 for (@$callbacks) {
1048 eval { &{$_->[1]} }; 1082 eval { &{$_->[1]} };
1049 1083
1050 if ($@) { 1084 if ($@) {
1051 warn "$@";
1052 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1085 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053 override; 1086 override;
1054 } 1087 }
1055 1088
1056 return 1 if $override; 1089 return 1 if $override;
1057 } 1090 }
… …
1136 for (@$attach) { 1169 for (@$attach) {
1137 my ($klass, @attach) = @$_; 1170 my ($klass, @attach) = @$_;
1138 _attach $registry, $klass, @attach; 1171 _attach $registry, $klass, @attach;
1139 } 1172 }
1140 } else { 1173 } else {
1141 warn "object uses attachment '$name' that is not available, postponing.\n"; 1174 info "object uses attachment '$name' that is not available, postponing.\n";
1142 } 1175 }
1143 } 1176 }
1144} 1177}
1145 1178
1146cf::attachable->attach ( 1179cf::attachable->attach (
… …
1173 my ($filename, $rdata, $objs) = @_; 1206 my ($filename, $rdata, $objs) = @_;
1174 1207
1175 sync_job { 1208 sync_job {
1176 if (length $$rdata) { 1209 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1210 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1211 trace sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1212 $decname, length $$rdata, scalar @$objs
1213 if $VERBOSE_IO;
1180 1214
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1215 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1216 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1217 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1218 if ($cf::USE_FSYNC) {
… …
1206 aio_rename "$filename~", $filename; 1240 aio_rename "$filename~", $filename;
1207 1241
1208 $filename =~ s%/[^/]+$%%; 1242 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC; 1243 aio_pathsync $filename if $cf::USE_FSYNC;
1210 } else { 1244 } else {
1211 warn "unable to save objects: $filename~: $!\n"; 1245 error "unable to save objects: $filename~: $!\n";
1212 } 1246 }
1213 } else { 1247 } else {
1214 aio_unlink $filename; 1248 aio_unlink $filename;
1215 aio_unlink "$filename.pst"; 1249 aio_unlink "$filename.pst";
1216 } 1250 }
… …
1240 my $st = eval { Coro::Storable::thaw $av }; 1274 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs}; 1275 $av = $st->{objs};
1242 } 1276 }
1243 1277
1244 utf8::decode (my $decname = $filename); 1278 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1279 trace sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1280 $decname, length $data, scalar @{$av || []}
1281 if $VERBOSE_IO;
1247 1282
1248 ($data, $av) 1283 ($data, $av)
1249} 1284}
1250 1285
1251=head2 COMMAND CALLBACKS 1286=head2 COMMAND CALLBACKS
… …
1343 1378
1344 $pl->ext_reply ($reply, @reply) 1379 $pl->ext_reply ($reply, @reply)
1345 if $reply; 1380 if $reply;
1346 1381
1347 } else { 1382 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1383 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1384 }
1350 1385
1351 cf::override; 1386 cf::override;
1352 }, 1387 },
1353); 1388);
… …
1364 1399
1365 $grp 1400 $grp
1366} 1401}
1367 1402
1368sub load_extensions { 1403sub load_extensions {
1404 info "loading extensions...";
1405
1369 cf::sync_job { 1406 cf::sync_job {
1370 my %todo; 1407 my %todo;
1371 1408
1372 for my $path (<$LIBDIR/*.ext>) { 1409 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1410 next unless -r $path;
… …
1391 1428
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1429 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1430 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394 1431
1395 $ext{source} = 1432 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1433 "package $pkg; use common::sense;\n"
1397 . "#line 1 \"$path\"\n{\n" 1434 . "#line 1 \"$path\"\n{\n"
1398 . $source 1435 . $source
1399 . "\n};\n1"; 1436 . "\n};\n1";
1400 1437
1401 $todo{$base} = \%ext; 1438 $todo{$base} = \%ext;
… …
1413 for (split /,\s*/, $v->{meta}{depends}) { 1450 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext 1451 next ext
1415 unless exists $done{$_}; 1452 unless exists $done{$_};
1416 } 1453 }
1417 1454
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1455 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419 1456
1420 my $active = eval $v->{source}; 1457 my $active = eval $v->{source};
1421 1458
1422 if (length $@) { 1459 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1460 error "$v->{path}: $@\n";
1424 1461
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1462 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1463 if exists $v->{meta}{mandatory};
1464
1465 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1466 delete $todo{$k};
1427 } else { 1467 } else {
1428 $done{$k} = delete $todo{$k}; 1468 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1469 push @EXTS, $v->{pkg};
1430 $progress = 1; 1470 $progress = 1;
1431 1471
1432 warn "$v->{base}: extension inactive.\n" 1472 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1473 unless $active;
1434 } 1474 }
1435 } 1475 }
1436 1476
1437 unless ($progress) { 1477 unless ($progress) {
… …
1609 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1649 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1610 1650
1611 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1651 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1612 $pl->deactivate; 1652 $pl->deactivate;
1613 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1653 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1614 $pl->ob->check_score;
1615 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1654 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1616 $pl->ns->destroy if $pl->ns; 1655 $pl->ns->destroy if $pl->ns;
1617 1656
1618 my $path = playerdir $pl; 1657 my $path = playerdir $pl;
1619 my $temp = "$path~$cf::RUNTIME~deleting~"; 1658 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1674 \@logins 1713 \@logins
1675} 1714}
1676 1715
1677=item $player->maps 1716=item $player->maps
1678 1717
1718=item cf::player::maps $login
1719
1679Returns an arrayref of map paths that are private for this 1720Returns an arrayref of map paths that are private for this
1680player. May block. 1721player. May block.
1681 1722
1682=cut 1723=cut
1683 1724
… …
1744 1785
1745=cut 1786=cut
1746 1787
1747sub find_by_path($) { 1788sub find_by_path($) {
1748 my ($path) = @_; 1789 my ($path) = @_;
1790
1791 $path =~ s/^~[^\/]*//; # skip ~login
1749 1792
1750 my ($match, $specificity); 1793 my ($match, $specificity);
1751 1794
1752 for my $region (list) { 1795 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1796 if ($region->{match} && $path =~ $region->{match}) {
… …
1810 1853
1811sub register { 1854sub register {
1812 my (undef, $regex, $prio) = @_; 1855 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 1856 my $pkg = caller;
1814 1857
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 1858 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 1859
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1860 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 1861}
1820 1862
1821# also paths starting with '/' 1863# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1864$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 1865
1824sub thawer_merge { 1866sub thawer_merge {
1825 my ($self, $merge) = @_; 1867 my ($self, $merge) = @_;
1826 1868
1827 # we have to keep some variables in memory intact 1869 # we have to keep some variables in memory intact
… …
1832} 1874}
1833 1875
1834sub normalise { 1876sub normalise {
1835 my ($path, $base) = @_; 1877 my ($path, $base) = @_;
1836 1878
1837 $path = "$path"; # make sure its a string 1879 $path = "$path"; # make sure it's a string
1838 1880
1839 $path =~ s/\.map$//; 1881 $path =~ s/\.map$//;
1840 1882
1841 # map plan: 1883 # map plan:
1842 # 1884 #
… …
1881 $self->init; # pass $1 etc. 1923 $self->init; # pass $1 etc.
1882 return $self; 1924 return $self;
1883 } 1925 }
1884 } 1926 }
1885 1927
1886 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1928 Carp::cluck "unable to resolve path '$path' (base '$base')";
1887 () 1929 ()
1888} 1930}
1889 1931
1890sub init { 1932sub init {
1891 my ($self) = @_; 1933 my ($self) = @_;
… …
2013} 2055}
2014 2056
2015sub find; 2057sub find;
2016sub find { 2058sub find {
2017 my ($path, $origin) = @_; 2059 my ($path, $origin) = @_;
2060
2061 cf::cede_to_tick;
2018 2062
2019 $path = normalise $path, $origin && $origin->path; 2063 $path = normalise $path, $origin && $origin->path;
2020 2064
2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2065 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2022 my $guard2 = cf::lock_acquire "map_find:$path"; 2066 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2137 or next; 2181 or next;
2138 $neigh = find $neigh, $map 2182 $neigh = find $neigh, $map
2139 or next; 2183 or next;
2140 $neigh->load; 2184 $neigh->load;
2141 2185
2186 # now find the diagonal neighbours
2142 push @neigh, 2187 push @neigh,
2143 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2188 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2144 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2189 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2145 } 2190 }
2146 2191
… …
2153} 2198}
2154 2199
2155sub find_sync { 2200sub find_sync {
2156 my ($path, $origin) = @_; 2201 my ($path, $origin) = @_;
2157 2202
2158 cf::sync_job { find $path, $origin } 2203 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2204 if $Coro::current == $Coro::main;
2205
2206 find $path, $origin
2159} 2207}
2160 2208
2161sub do_load_sync { 2209sub do_load_sync {
2162 my ($map) = @_; 2210 my ($map) = @_;
2163 2211
2164 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2212 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2165 if $Coro::current == $Coro::main; 2213 if $Coro::current == $Coro::main;
2166 2214
2167 cf::sync_job { $map->load }; 2215 $map->load;
2168} 2216}
2169 2217
2170our %MAP_PREFETCH; 2218our %MAP_PREFETCH;
2171our $MAP_PREFETCHER = undef; 2219our $MAP_PREFETCHER = undef;
2172 2220
… …
2198 $MAP_PREFETCHER->prio (6); 2246 $MAP_PREFETCHER->prio (6);
2199 2247
2200 () 2248 ()
2201} 2249}
2202 2250
2251# common code, used by both ->save and ->swapout
2203sub save { 2252sub _save {
2204 my ($self) = @_; 2253 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2254
2208 $self->{last_save} = $cf::RUNTIME; 2255 $self->{last_save} = $cf::RUNTIME;
2209 2256
2210 return unless $self->dirty; 2257 return unless $self->dirty;
2211 2258
… …
2231 } else { 2278 } else {
2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2279 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2233 } 2280 }
2234} 2281}
2235 2282
2283sub save {
2284 my ($self) = @_;
2285
2286 my $lock = cf::lock_acquire "map_data:$self->{path}";
2287
2288 $self->_save;
2289}
2290
2236sub swap_out { 2291sub swap_out {
2237 my ($self) = @_; 2292 my ($self) = @_;
2238 2293
2239 # save first because save cedes
2240 $self->save;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2294 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243 2295
2244 return if $self->players;
2245 return if $self->in_memory != cf::MAP_ACTIVE; 2296 return if $self->in_memory != cf::MAP_ACTIVE;
2246 return if $self->{deny_save}; 2297 return if $self->{deny_save};
2298 return if $self->players;
2247 2299
2300 # first deactivate the map and "unlink" it from the core
2301 $self->deactivate;
2302 $_->clear_links_to ($self) for values %cf::MAP;
2248 $self->in_memory (cf::MAP_SWAPPED); 2303 $self->in_memory (cf::MAP_SWAPPED);
2304
2305 # then atomically save
2306 $self->_save;
2307
2308 # then free the map
2309 $self->clear;
2310}
2311
2312sub reset_at {
2313 my ($self) = @_;
2314
2315 # TODO: safety, remove and allow resettable per-player maps
2316 return 1e99 if $self->{deny_reset};
2317
2318 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2319 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2320
2321 $time + $to
2322}
2323
2324sub should_reset {
2325 my ($self) = @_;
2326
2327 $self->reset_at <= $cf::RUNTIME
2328}
2329
2330sub reset {
2331 my ($self) = @_;
2332
2333 my $lock = cf::lock_acquire "map_data:$self->{path}";
2334
2335 return if $self->players;
2336
2337 cf::trace "resetting map ", $self->path, "\n";
2338
2339 $self->in_memory (cf::MAP_SWAPPED);
2340
2341 # need to save uniques path
2342 unless ($self->{deny_save}) {
2343 my $uniq = $self->uniq_path; utf8::encode $uniq;
2344
2345 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2346 if $uniq;
2347 }
2348
2349 delete $cf::MAP{$self->path};
2249 2350
2250 $self->deactivate; 2351 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP; 2352 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear; 2353 $self->clear;
2253}
2254
2255sub reset_at {
2256 my ($self) = @_;
2257
2258 # TODO: safety, remove and allow resettable per-player maps
2259 return 1e99 if $self->{deny_reset};
2260
2261 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2262 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2263
2264 $time + $to
2265}
2266
2267sub should_reset {
2268 my ($self) = @_;
2269
2270 $self->reset_at <= $cf::RUNTIME
2271}
2272
2273sub reset {
2274 my ($self) = @_;
2275
2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2277
2278 return if $self->players;
2279
2280 warn "resetting map ", $self->path, "\n";
2281
2282 $self->in_memory (cf::MAP_SWAPPED);
2283
2284 # need to save uniques path
2285 unless ($self->{deny_save}) {
2286 my $uniq = $self->uniq_path; utf8::encode $uniq;
2287
2288 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2289 if $uniq;
2290 }
2291
2292 delete $cf::MAP{$self->path};
2293
2294 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP;
2296 $self->clear;
2297 2354
2298 $self->unlink_save; 2355 $self->unlink_save;
2299 $self->destroy; 2356 $self->destroy;
2300} 2357}
2301 2358
… …
2309 2366
2310 delete $cf::MAP{$self->path}; 2367 delete $cf::MAP{$self->path};
2311 2368
2312 $self->unlink_save; 2369 $self->unlink_save;
2313 2370
2314 bless $self, "cf::map"; 2371 bless $self, "cf::map::wrap";
2315 delete $self->{deny_reset}; 2372 delete $self->{deny_reset};
2316 $self->{deny_save} = 1; 2373 $self->{deny_save} = 1;
2317 $self->reset_timeout (1); 2374 $self->reset_timeout (1);
2318 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2375 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2319 2376
… …
2549 2606
2550Freezes the player and moves him/her to a special map (C<{link}>). 2607Freezes the player and moves him/her to a special map (C<{link}>).
2551 2608
2552The player should be reasonably safe there for short amounts of time (e.g. 2609The player should be reasonably safe there for short amounts of time (e.g.
2553for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2610for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2554though, as the palyer cannot control the character while it is on the link 2611though, as the player cannot control the character while it is on the link
2555map. 2612map.
2556 2613
2557Will never block. 2614Will never block.
2558 2615
2559=item $player_object->leave_link ($map, $x, $y) 2616=item $player_object->leave_link ($map, $x, $y)
… …
2580sub cf::object::player::enter_link { 2637sub cf::object::player::enter_link {
2581 my ($self) = @_; 2638 my ($self) = @_;
2582 2639
2583 $self->deactivate_recursive; 2640 $self->deactivate_recursive;
2584 2641
2642 ++$self->{_link_recursion};
2643
2585 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2644 return if UNIVERSAL::isa $self->map, "ext::map_link";
2586 2645
2587 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2646 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2588 if $self->map && $self->map->{path} ne "{link}"; 2647 if $self->map && $self->map->{path} ne "{link}";
2589 2648
2590 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2649 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2591} 2650}
2592 2651
2593sub cf::object::player::leave_link { 2652sub cf::object::player::leave_link {
2594 my ($self, $map, $x, $y) = @_; 2653 my ($self, $map, $x, $y) = @_;
2595 2654
… …
2620 $map->load_neighbours; 2679 $map->load_neighbours;
2621 2680
2622 return unless $self->contr->active; 2681 return unless $self->contr->active;
2623 2682
2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2683 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2625 $self->enter_map ($map, $x, $y); 2684 if ($self->enter_map ($map, $x, $y)) {
2626 2685 # entering was successful
2686 delete $self->{_link_recursion};
2627 # only activate afterwards, to support waiting in hooks 2687 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive; 2688 $self->activate_recursive;
2629} 2689 }
2630 2690
2691}
2692
2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2693=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2632 2694
2633Moves the player to the given map-path and coordinates by first freezing 2695Moves the player to the given map-path and coordinates by first freezing
2634her, loading and preparing them map, calling the provided $check callback 2696her, loading and preparing them map, calling the provided $check callback
2635that has to return the map if sucecssful, and then unfreezes the player on 2697that has to return the map if sucecssful, and then unfreezes the player on
2636the new (success) or old (failed) map position. In either case, $done will 2698the new (success) or old (failed) map position. In either case, $done will
… …
2643 2705
2644our $GOTOGEN; 2706our $GOTOGEN;
2645 2707
2646sub cf::object::player::goto { 2708sub cf::object::player::goto {
2647 my ($self, $path, $x, $y, $check, $done) = @_; 2709 my ($self, $path, $x, $y, $check, $done) = @_;
2710
2711 if ($self->{_link_recursion} >= $MAX_LINKS) {
2712 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2713 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2714 ($path, $x, $y) = @$EMERGENCY_POSITION;
2715 }
2648 2716
2649 # do generation counting so two concurrent goto's will be executed in-order 2717 # do generation counting so two concurrent goto's will be executed in-order
2650 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2718 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2651 2719
2652 $self->enter_link; 2720 $self->enter_link;
… …
2676 my $map = eval { 2744 my $map = eval {
2677 my $map = defined $path ? cf::map::find $path : undef; 2745 my $map = defined $path ? cf::map::find $path : undef;
2678 2746
2679 if ($map) { 2747 if ($map) {
2680 $map = $map->customise_for ($self); 2748 $map = $map->customise_for ($self);
2681 $map = $check->($map) if $check && $map; 2749 $map = $check->($map, $x, $y, $self) if $check && $map;
2682 } else { 2750 } else {
2683 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2751 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2684 } 2752 }
2685 2753
2686 $map 2754 $map
… …
2694 if ($gen == $self->{_goto_generation}) { 2762 if ($gen == $self->{_goto_generation}) {
2695 delete $self->{_goto_generation}; 2763 delete $self->{_goto_generation};
2696 $self->leave_link ($map, $x, $y); 2764 $self->leave_link ($map, $x, $y);
2697 } 2765 }
2698 2766
2699 $done->() if $done; 2767 $done->($self) if $done;
2700 })->prio (1); 2768 })->prio (1);
2701} 2769}
2702 2770
2703=item $player_object->enter_exit ($exit_object) 2771=item $player_object->enter_exit ($exit_object)
2704 2772
… …
2797 $self->message ("Something went wrong deep within the deliantra server. " 2865 $self->message ("Something went wrong deep within the deliantra server. "
2798 . "I'll try to bring you back to the map you were before. " 2866 . "I'll try to bring you back to the map you were before. "
2799 . "Please report this to the dungeon master!", 2867 . "Please report this to the dungeon master!",
2800 cf::NDI_UNIQUE | cf::NDI_RED); 2868 cf::NDI_UNIQUE | cf::NDI_RED);
2801 2869
2802 warn "ERROR in enter_exit: $@"; 2870 error "ERROR in enter_exit: $@";
2803 $self->leave_link; 2871 $self->leave_link;
2804 } 2872 }
2805 })->prio (1); 2873 })->prio (1);
2806} 2874}
2807 2875
… …
3120 3188
3121 $ns->ext_reply ($reply, @reply) 3189 $ns->ext_reply ($reply, @reply)
3122 if $reply; 3190 if $reply;
3123 3191
3124 } else { 3192 } else {
3125 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3193 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3126 } 3194 }
3127 3195
3128 cf::override; 3196 cf::override;
3129 }, 3197 },
3130); 3198);
… …
3211 decrease split destroy change_exp value msg lore send_msg)], 3279 decrease split destroy change_exp value msg lore send_msg)],
3212 ["cf::object::player" => qw(player)], 3280 ["cf::object::player" => qw(player)],
3213 ["cf::player" => qw(peaceful send_msg)], 3281 ["cf::player" => qw(peaceful send_msg)],
3214 ["cf::map" => qw(trigger)], 3282 ["cf::map" => qw(trigger)],
3215) { 3283) {
3216 no strict 'refs';
3217 my ($pkg, @funs) = @$_; 3284 my ($pkg, @funs) = @$_;
3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3285 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3219 for @funs; 3286 for @funs;
3220} 3287}
3221 3288
… …
3260 local @cf::_safe_eval_args = values %vars; 3327 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval; 3328 @res = wantarray ? eval eval : scalar eval $eval;
3262 } 3329 }
3263 3330
3264 if ($@) { 3331 if ($@) {
3265 warn "$@"; 3332 warn "$@",
3266 warn "while executing safe code '$code'\n"; 3333 "while executing safe code '$code'\n",
3267 warn "with arguments " . (join " ", %vars) . "\n"; 3334 "with arguments " . (join " ", %vars) . "\n";
3268 } 3335 }
3269 3336
3270 wantarray ? @res : $res[0] 3337 wantarray ? @res : $res[0]
3271} 3338}
3272 3339
… …
3306 # for this (global event?) 3373 # for this (global event?)
3307 %ext::player_env::MUSIC_FACE_CACHE = (); 3374 %ext::player_env::MUSIC_FACE_CACHE = ();
3308 3375
3309 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3376 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3310 3377
3311 warn "loading facedata from $path\n"; 3378 trace "loading facedata from $path\n";
3312 3379
3313 my $facedata;
3314 0 < aio_load $path, $facedata 3380 0 < aio_load $path, my $facedata
3315 or die "$path: $!"; 3381 or die "$path: $!";
3316 3382
3317 $facedata = Coro::Storable::thaw $facedata; 3383 $facedata = Coro::Storable::thaw $facedata;
3318 3384
3319 $facedata->{version} == 2 3385 $facedata->{version} == 2
… …
3350 3416
3351 if (my $smooth = cf::face::find $info->{smooth}) { 3417 if (my $smooth = cf::face::find $info->{smooth}) {
3352 cf::face::set_smooth $idx, $smooth; 3418 cf::face::set_smooth $idx, $smooth;
3353 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3419 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3354 } else { 3420 } else {
3355 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3421 error "smooth face '$info->{smooth}' not found for face '$face'";
3356 } 3422 }
3357 3423
3358 cf::cede_to_tick; 3424 cf::cede_to_tick;
3359 } 3425 }
3360 } 3426 }
… …
3378 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3444 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3379 3445
3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3446 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3381 cf::face::set_type $idx, $info->{type}; 3447 cf::face::set_type $idx, $info->{type};
3382 } else { 3448 } else {
3383 $RESOURCE{$name} = $info; 3449 $RESOURCE{$name} = $info; # unused
3384 } 3450 }
3385 3451
3386 cf::cede_to_tick; 3452 cf::cede_to_tick;
3387 } 3453 }
3388 } 3454 }
3389 3455
3390 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3456 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3391 3457
3392 1 3458 1
3393} 3459}
3394
3395cf::global->attach (on_resource_update => sub {
3396 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3397 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3398
3399 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3400 my $sound = $soundconf->{compat}[$_]
3401 or next;
3402
3403 my $face = cf::face::find "sound/$sound->[1]";
3404 cf::sound::set $sound->[0] => $face;
3405 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3406 }
3407
3408 while (my ($k, $v) = each %{$soundconf->{event}}) {
3409 my $face = cf::face::find "sound/$v";
3410 cf::sound::set $k => $face;
3411 }
3412 }
3413});
3414 3460
3415register_exticmd fx_want => sub { 3461register_exticmd fx_want => sub {
3416 my ($ns, $want) = @_; 3462 my ($ns, $want) = @_;
3417 3463
3418 while (my ($k, $v) = each %$want) { 3464 while (my ($k, $v) = each %$want) {
… …
3457sub reload_treasures { 3503sub reload_treasures {
3458 load_resource_file "$DATADIR/treasures" 3504 load_resource_file "$DATADIR/treasures"
3459 or die "unable to load treasurelists\n"; 3505 or die "unable to load treasurelists\n";
3460} 3506}
3461 3507
3508sub reload_sound {
3509 trace "loading sound config from $DATADIR/sound\n";
3510
3511 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3512 or die "$DATADIR/sound $!";
3513
3514 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3515
3516 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3517 my $sound = $soundconf->{compat}[$_]
3518 or next;
3519
3520 my $face = cf::face::find "sound/$sound->[1]";
3521 cf::sound::set $sound->[0] => $face;
3522 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3523 }
3524
3525 while (my ($k, $v) = each %{$soundconf->{event}}) {
3526 my $face = cf::face::find "sound/$v";
3527 cf::sound::set $k => $face;
3528 }
3529}
3530
3462sub reload_resources { 3531sub reload_resources {
3463 warn "reloading resource files...\n"; 3532 trace "reloading resource files...\n";
3464 3533
3534 reload_exp_table;
3535 reload_materials;
3465 reload_facedata; 3536 reload_facedata;
3537 reload_sound;
3466 reload_archetypes; 3538 reload_archetypes;
3467 reload_regions; 3539 reload_regions;
3468 reload_treasures; 3540 reload_treasures;
3469 3541
3470 warn "finished reloading resource files\n"; 3542 trace "finished reloading resource files\n";
3471} 3543}
3472 3544
3473sub reload_config { 3545sub reload_config {
3474 warn "reloading config file...\n"; 3546 trace "reloading config file...\n";
3475 3547
3476 open my $fh, "<:utf8", "$CONFDIR/config" 3548 0 < aio_load "$CONFDIR/config", my $config
3477 or return; 3549 or die "$CONFDIR/config: $!";
3478 3550
3479 local $/; 3551 utf8::decode $config;
3552
3553 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3480 *CFG = YAML::XS::Load scalar <$fh>; 3554 *CFG = YAML::XS::Load $config;
3481 3555
3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3556 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3483 3557
3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3558 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3485 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3559 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3486 3560
3487 if (exists $CFG{mlockall}) { 3561 if (exists $CFG{mlockall}) {
… …
3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3563 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3490 and die "WARNING: m(un)lockall failed: $!\n"; 3564 and die "WARNING: m(un)lockall failed: $!\n";
3491 }; 3565 };
3492 warn $@ if $@; 3566 warn $@ if $@;
3493 } 3567 }
3494
3495 warn "finished reloading resource files\n";
3496} 3568}
3497 3569
3498sub pidfile() { 3570sub pidfile() {
3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3571 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3500 or die "$PIDFILE: $!"; 3572 or die "$PIDFILE: $!";
… …
3513 seek $fh, 0, 0; 3585 seek $fh, 0, 0;
3514 print $fh $$; 3586 print $fh $$;
3515} 3587}
3516 3588
3517sub main_loop { 3589sub main_loop {
3518 warn "EV::loop starting\n"; 3590 trace "EV::loop starting\n";
3519 if (1) { 3591 if (1) {
3520 EV::loop; 3592 EV::loop;
3521 } 3593 }
3522 warn "EV::loop returned\n"; 3594 trace "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP; 3595 goto &main_loop unless $REALLY_UNLOOP;
3524} 3596}
3525 3597
3526sub main { 3598sub main {
3527 cf::init_globals; # initialise logging 3599 cf::init_globals; # initialise logging
3528 3600
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3601 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3602 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3603 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3604 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533
3534 cf::init_experience;
3535 cf::init_anim;
3536 cf::init_attackmess;
3537 cf::init_dynamic;
3538 3605
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3606 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540 3607
3541 # we must not ever block the main coroutine 3608 # we must not ever block the main coroutine
3542 local $Coro::idle = sub { 3609 local $Coro::idle = sub {
… …
3548 }; 3615 };
3549 3616
3550 evthread_start IO::AIO::poll_fileno; 3617 evthread_start IO::AIO::poll_fileno;
3551 3618
3552 cf::sync_job { 3619 cf::sync_job {
3620 cf::incloader::init ();
3621
3622 cf::init_anim;
3623 cf::init_attackmess;
3624 cf::init_dynamic;
3625
3553 cf::load_settings; 3626 cf::load_settings;
3554 cf::load_materials;
3555 3627
3556 reload_resources; 3628 reload_resources;
3557 reload_config; 3629 reload_config;
3558 db_init; 3630 db_init;
3559 3631
… …
3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3646 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575 3647
3576 (pop @POST_INIT)->(0) while @POST_INIT; 3648 (pop @POST_INIT)->(0) while @POST_INIT;
3577 }; 3649 };
3578 3650
3651 cf::object::thawer::errors_are_fatal 0;
3652 info "parse errors in files are no longer fatal from this point on.\n";
3653
3654 my $free_main; $free_main = EV::idle sub {
3655 undef $free_main;
3656 undef &main; # free gobs of memory :)
3657 };
3658
3579 main_loop; 3659 goto &main_loop;
3580} 3660}
3581 3661
3582############################################################################# 3662#############################################################################
3583# initialisation and cleanup 3663# initialisation and cleanup
3584 3664
3585# install some emergency cleanup handlers 3665# install some emergency cleanup handlers
3586BEGIN { 3666BEGIN {
3587 our %SIGWATCHER = (); 3667 our %SIGWATCHER = ();
3588 for my $signal (qw(INT HUP TERM)) { 3668 for my $signal (qw(INT HUP TERM)) {
3589 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3669 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3590 cf::cleanup "SIG$signal"; 3670 cf::cleanup "SIG$signal";
3591 }; 3671 };
3592 } 3672 }
3593} 3673}
3594 3674
3595sub write_runtime_sync { 3675sub write_runtime_sync {
3596 my $t0 = EV::time; 3676 my $t0 = AE::time;
3597 3677
3598 # first touch the runtime file to show we are still running: 3678 # first touch the runtime file to show we are still running:
3599 # the fsync below can take a very very long time. 3679 # the fsync below can take a very very long time.
3600 3680
3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3681 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
… …
3623 or return; 3703 or return;
3624 3704
3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3705 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3626 and return; 3706 and return;
3627 3707
3628 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 3708 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3629 3709
3630 1 3710 1
3631} 3711}
3632 3712
3633our $uuid_lock; 3713our $uuid_lock;
… …
3645 or return; 3725 or return;
3646 3726
3647 my $value = uuid_seq uuid_cur; 3727 my $value = uuid_seq uuid_cur;
3648 3728
3649 unless ($value) { 3729 unless ($value) {
3650 warn "cowardly refusing to write zero uuid value!\n"; 3730 info "cowardly refusing to write zero uuid value!\n";
3651 return; 3731 return;
3652 } 3732 }
3653 3733
3654 my $value = uuid_str $value + $uuid_skip; 3734 my $value = uuid_str $value + $uuid_skip;
3655 $uuid_skip = 0; 3735 $uuid_skip = 0;
… …
3665 or return; 3745 or return;
3666 3746
3667 aio_rename "$uuid~", $uuid 3747 aio_rename "$uuid~", $uuid
3668 and return; 3748 and return;
3669 3749
3670 warn "uuid file written ($value).\n"; 3750 trace "uuid file written ($value).\n";
3671 3751
3672 1 3752 1
3673 3753
3674} 3754}
3675 3755
… …
3681} 3761}
3682 3762
3683sub emergency_save() { 3763sub emergency_save() {
3684 my $freeze_guard = cf::freeze_mainloop; 3764 my $freeze_guard = cf::freeze_mainloop;
3685 3765
3686 warn "emergency_perl_save: enter\n"; 3766 info "emergency_perl_save: enter\n";
3767
3768 # this is a trade-off: we want to be very quick here, so
3769 # save all maps without fsync, and later call a global sync
3770 # (which in turn might be very very slow)
3771 local $USE_FSYNC = 0;
3687 3772
3688 cf::sync_job { 3773 cf::sync_job {
3689 # this is a trade-off: we want to be very quick here, so 3774 cf::write_runtime_sync; # external watchdog should not bark
3690 # save all maps without fsync, and later call a global sync
3691 # (which in turn might be very very slow)
3692 local $USE_FSYNC = 0;
3693 3775
3694 # use a peculiar iteration method to avoid tripping on perl 3776 # use a peculiar iteration method to avoid tripping on perl
3695 # refcount bugs in for. also avoids problems with players 3777 # refcount bugs in for. also avoids problems with players
3696 # and maps saved/destroyed asynchronously. 3778 # and maps saved/destroyed asynchronously.
3697 warn "emergency_perl_save: begin player save\n"; 3779 info "emergency_perl_save: begin player save\n";
3698 for my $login (keys %cf::PLAYER) { 3780 for my $login (keys %cf::PLAYER) {
3699 my $pl = $cf::PLAYER{$login} or next; 3781 my $pl = $cf::PLAYER{$login} or next;
3700 $pl->valid or next; 3782 $pl->valid or next;
3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3783 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3702 $pl->save; 3784 $pl->save;
3703 } 3785 }
3704 warn "emergency_perl_save: end player save\n"; 3786 info "emergency_perl_save: end player save\n";
3705 3787
3788 cf::write_runtime_sync; # external watchdog should not bark
3789
3706 warn "emergency_perl_save: begin map save\n"; 3790 info "emergency_perl_save: begin map save\n";
3707 for my $path (keys %cf::MAP) { 3791 for my $path (keys %cf::MAP) {
3708 my $map = $cf::MAP{$path} or next; 3792 my $map = $cf::MAP{$path} or next;
3709 $map->valid or next; 3793 $map->valid or next;
3710 $map->save; 3794 $map->save;
3711 } 3795 }
3712 warn "emergency_perl_save: end map save\n"; 3796 info "emergency_perl_save: end map save\n";
3713 3797
3798 cf::write_runtime_sync; # external watchdog should not bark
3799
3714 warn "emergency_perl_save: begin database checkpoint\n"; 3800 info "emergency_perl_save: begin database checkpoint\n";
3715 BDB::db_env_txn_checkpoint $DB_ENV; 3801 BDB::db_env_txn_checkpoint $DB_ENV;
3716 warn "emergency_perl_save: end database checkpoint\n"; 3802 info "emergency_perl_save: end database checkpoint\n";
3717 3803
3718 warn "emergency_perl_save: begin write uuid\n"; 3804 info "emergency_perl_save: begin write uuid\n";
3719 write_uuid_sync 1; 3805 write_uuid_sync 1;
3720 warn "emergency_perl_save: end write uuid\n"; 3806 info "emergency_perl_save: end write uuid\n";
3807
3808 cf::write_runtime_sync; # external watchdog should not bark
3809
3810 trace "emergency_perl_save: syncing database to disk";
3811 BDB::db_env_txn_checkpoint $DB_ENV;
3812
3813 info "emergency_perl_save: starting sync\n";
3814 IO::AIO::aio_sync sub {
3815 info "emergency_perl_save: finished sync\n";
3816 };
3817
3818 cf::write_runtime_sync; # external watchdog should not bark
3819
3820 trace "emergency_perl_save: flushing outstanding aio requests";
3821 while (IO::AIO::nreqs || BDB::nreqs) {
3822 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3823 }
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3721 }; 3826 };
3722 3827
3723 warn "emergency_perl_save: starting sync()\n";
3724 IO::AIO::aio_sync sub {
3725 warn "emergency_perl_save: finished sync()\n";
3726 };
3727
3728 warn "emergency_perl_save: leave\n"; 3828 info "emergency_perl_save: leave\n";
3729} 3829}
3730 3830
3731sub post_cleanup { 3831sub post_cleanup {
3732 my ($make_core) = @_; 3832 my ($make_core) = @_;
3733 3833
3834 IO::AIO::flush;
3835
3734 warn Carp::longmess "post_cleanup backtrace" 3836 error Carp::longmess "post_cleanup backtrace"
3735 if $make_core; 3837 if $make_core;
3736 3838
3737 my $fh = pidfile; 3839 my $fh = pidfile;
3738 unlink $PIDFILE if <$fh> == $$; 3840 unlink $PIDFILE if <$fh> == $$;
3739} 3841}
… …
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3861 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) { 3862 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"}; 3863 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3864# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 } 3865 }
3764 warn "cleared package $pkg\n";#d#
3765} 3866}
3766 3867
3767sub do_reload_perl() { 3868sub do_reload_perl() {
3768 # can/must only be called in main 3869 # can/must only be called in main
3769 if ($Coro::current != $Coro::main) { 3870 unless (in_main) {
3770 warn "can only reload from main coroutine"; 3871 error "can only reload from main coroutine";
3771 return; 3872 return;
3772 } 3873 }
3773 3874
3774 return if $RELOAD++; 3875 return if $RELOAD++;
3775 3876
3776 my $t1 = EV::time; 3877 my $t1 = AE::time;
3777 3878
3778 while ($RELOAD) { 3879 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl";
3779 warn "reloading..."; 3881 info "reloading...";
3780 3882
3781 warn "entering sync_job"; 3883 trace "entering sync_job";
3782 3884
3783 cf::sync_job { 3885 cf::sync_job {
3784 cf::write_runtime_sync; # external watchdog should not bark
3785 cf::emergency_save; 3886 #cf::emergency_save;
3786 cf::write_runtime_sync; # external watchdog should not bark
3787 3887
3788 warn "syncing database to disk";
3789 BDB::db_env_txn_checkpoint $DB_ENV;
3790
3791 # if anything goes wrong in here, we should simply crash as we already saved
3792
3793 warn "flushing outstanding aio requests";
3794 while (IO::AIO::nreqs || BDB::nreqs) {
3795 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3796 }
3797
3798 warn "cancelling all extension coros"; 3888 trace "cancelling all extension coros";
3799 $_->cancel for values %EXT_CORO; 3889 $_->cancel for values %EXT_CORO;
3800 %EXT_CORO = (); 3890 %EXT_CORO = ();
3801 3891
3802 warn "removing commands"; 3892 trace "removing commands";
3803 %COMMAND = (); 3893 %COMMAND = ();
3804 3894
3805 warn "removing ext/exti commands"; 3895 trace "removing ext/exti commands";
3806 %EXTCMD = (); 3896 %EXTCMD = ();
3807 %EXTICMD = (); 3897 %EXTICMD = ();
3808 3898
3809 warn "unloading/nuking all extensions"; 3899 trace "unloading/nuking all extensions";
3810 for my $pkg (@EXTS) { 3900 for my $pkg (@EXTS) {
3811 warn "... unloading $pkg"; 3901 trace "... unloading $pkg";
3812 3902
3813 if (my $cb = $pkg->can ("unload")) { 3903 if (my $cb = $pkg->can ("unload")) {
3814 eval { 3904 eval {
3815 $cb->($pkg); 3905 $cb->($pkg);
3816 1 3906 1
3817 } or warn "$pkg unloaded, but with errors: $@"; 3907 } or error "$pkg unloaded, but with errors: $@";
3818 } 3908 }
3819 3909
3820 warn "... clearing $pkg"; 3910 trace "... clearing $pkg";
3821 clear_package $pkg; 3911 clear_package $pkg;
3822 } 3912 }
3823 3913
3824 warn "unloading all perl modules loaded from $LIBDIR"; 3914 trace "unloading all perl modules loaded from $LIBDIR";
3825 while (my ($k, $v) = each %INC) { 3915 while (my ($k, $v) = each %INC) {
3826 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3916 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3827 3917
3828 warn "... unloading $k"; 3918 trace "... unloading $k";
3829 delete $INC{$k}; 3919 delete $INC{$k};
3830 3920
3831 $k =~ s/\.pm$//; 3921 $k =~ s/\.pm$//;
3832 $k =~ s/\//::/g; 3922 $k =~ s/\//::/g;
3833 3923
… …
3836 } 3926 }
3837 3927
3838 clear_package $k; 3928 clear_package $k;
3839 } 3929 }
3840 3930
3841 warn "getting rid of safe::, as good as possible"; 3931 trace "getting rid of safe::, as good as possible";
3842 clear_package "safe::$_" 3932 clear_package "safe::$_"
3843 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3933 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3844 3934
3845 warn "unloading cf.pm \"a bit\""; 3935 trace "unloading cf.pm \"a bit\"";
3846 delete $INC{"cf.pm"}; 3936 delete $INC{"cf.pm"};
3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3937 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3848 3938
3849 # don't, removes xs symbols, too, 3939 # don't, removes xs symbols, too,
3850 # and global variables created in xs 3940 # and global variables created in xs
3851 #clear_package __PACKAGE__; 3941 #clear_package __PACKAGE__;
3852 3942
3853 warn "unload completed, starting to reload now"; 3943 info "unload completed, starting to reload now";
3854 3944
3855 warn "reloading cf.pm"; 3945 trace "reloading cf.pm";
3856 require cf; 3946 require cf;
3857 cf::_connect_to_perl_1; 3947 cf::_connect_to_perl_1;
3858 3948
3859 warn "loading config and database again"; 3949 trace "loading config and database again";
3860 cf::reload_config; 3950 cf::reload_config;
3861 3951
3862 warn "loading extensions"; 3952 trace "loading extensions";
3863 cf::load_extensions; 3953 cf::load_extensions;
3864 3954
3865 if ($REATTACH_ON_RELOAD) { 3955 if ($REATTACH_ON_RELOAD) {
3866 warn "reattaching attachments to objects/players"; 3956 trace "reattaching attachments to objects/players";
3867 _global_reattach; # objects, sockets 3957 _global_reattach; # objects, sockets
3868 warn "reattaching attachments to maps"; 3958 trace "reattaching attachments to maps";
3869 reattach $_ for values %MAP; 3959 reattach $_ for values %MAP;
3870 warn "reattaching attachments to players"; 3960 trace "reattaching attachments to players";
3871 reattach $_ for values %PLAYER; 3961 reattach $_ for values %PLAYER;
3872 } 3962 }
3873 3963
3874 warn "running post_init jobs"; 3964 trace "running post_init jobs";
3875 (pop @POST_INIT)->(1) while @POST_INIT; 3965 (pop @POST_INIT)->(1) while @POST_INIT;
3876 3966
3877 warn "leaving sync_job"; 3967 trace "leaving sync_job";
3878 3968
3879 1 3969 1
3880 } or do { 3970 } or do {
3881 warn $@; 3971 error $@;
3882 cf::cleanup "error while reloading, exiting."; 3972 cf::cleanup "error while reloading, exiting.";
3883 }; 3973 };
3884 3974
3885 warn "reloaded"; 3975 info "reloaded";
3886 --$RELOAD; 3976 --$RELOAD;
3887 } 3977 }
3888 3978
3889 $t1 = EV::time - $t1; 3979 $t1 = AE::time - $t1;
3890 warn "reload completed in ${t1}s\n"; 3980 info "reload completed in ${t1}s\n";
3891}; 3981};
3892 3982
3893our $RELOAD_WATCHER; # used only during reload 3983our $RELOAD_WATCHER; # used only during reload
3894 3984
3895sub reload_perl() { 3985sub reload_perl() {
… …
3897 # coro crashes during coro_state_free->destroy here. 3987 # coro crashes during coro_state_free->destroy here.
3898 3988
3899 $RELOAD_WATCHER ||= cf::async { 3989 $RELOAD_WATCHER ||= cf::async {
3900 Coro::AIO::aio_wait cache_extensions; 3990 Coro::AIO::aio_wait cache_extensions;
3901 3991
3902 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3992 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3903 do_reload_perl; 3993 do_reload_perl;
3904 undef $RELOAD_WATCHER; 3994 undef $RELOAD_WATCHER;
3905 }; 3995 };
3906 }; 3996 };
3907} 3997}
… …
3916 reload_perl; 4006 reload_perl;
3917 }; 4007 };
3918 } 4008 }
3919}; 4009};
3920 4010
3921unshift @INC, $LIBDIR; 4011#############################################################################
3922 4012
3923my $bug_warning = 0; 4013my $bug_warning = 0;
3924 4014
3925our @WAIT_FOR_TICK; 4015our @WAIT_FOR_TICK;
3926our @WAIT_FOR_TICK_BEGIN; 4016our @WAIT_FOR_TICK_BEGIN;
3927 4017
3928sub wait_for_tick { 4018sub wait_for_tick() {
3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4019 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3930 4020
3931 my $signal = new Coro::Signal; 4021 my $signal = new Coro::Signal;
3932 push @WAIT_FOR_TICK, $signal; 4022 push @WAIT_FOR_TICK, $signal;
3933 $signal->wait; 4023 $signal->wait;
3934} 4024}
3935 4025
3936sub wait_for_tick_begin { 4026sub wait_for_tick_begin() {
3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4027 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3938 4028
3939 my $signal = new Coro::Signal; 4029 my $signal = new Coro::Signal;
3940 push @WAIT_FOR_TICK_BEGIN, $signal; 4030 push @WAIT_FOR_TICK_BEGIN, $signal;
3941 $signal->wait; 4031 $signal->wait;
… …
3948 return; 4038 return;
3949 } 4039 }
3950 4040
3951 cf::server_tick; # one server iteration 4041 cf::server_tick; # one server iteration
3952 4042
3953 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4043 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3954 4044
3955 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4045 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4046 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3957 Coro::async_pool { 4047 Coro::async_pool {
3958 $Coro::current->{desc} = "runtime saver"; 4048 $Coro::current->{desc} = "runtime saver";
3959 write_runtime_sync 4049 write_runtime_sync
3960 or warn "ERROR: unable to write runtime file: $!"; 4050 or error "ERROR: unable to write runtime file: $!";
3961 }; 4051 };
3962 } 4052 }
3963 4053
3964 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3965 $sig->send; 4055 $sig->send;
… …
3973 4063
3974 if (0) { 4064 if (0) {
3975 if ($NEXT_TICK) { 4065 if ($NEXT_TICK) {
3976 my $jitter = $TICK_START - $NEXT_TICK; 4066 my $jitter = $TICK_START - $NEXT_TICK;
3977 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4067 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3978 warn "jitter $JITTER\n";#d# 4068 debug "jitter $JITTER\n";#d#
3979 } 4069 }
3980 } 4070 }
3981} 4071}
3982 4072
3983{ 4073{

Diff Legend

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