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.512 by root, Sun Apr 11 04:52:07 2010 UTC vs.
Revision 1.548 by root, Mon May 10 21:40:22 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
… …
336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337 358
338sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
339sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
340 361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
341=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
342 375
343Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
345 378
346The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
347is a reload or not. 380is a reload or not.
348 381
349=cut 382=cut
350 383
351sub post_init(&) { 384sub post_init(&) {
… …
396} 429}
397 430
398=item cf::periodic $interval, $cb 431=item cf::periodic $interval, $cb
399 432
400Like EV::periodic, but randomly selects a starting point so that the actions 433Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 434get spread over time.
402 435
403=cut 436=cut
404 437
405sub periodic($$) { 438sub periodic($$) {
406 my ($interval, $cb) = @_; 439 my ($interval, $cb) = @_;
… …
502=cut 535=cut
503 536
504sub sync_job(&) { 537sub sync_job(&) {
505 my ($job) = @_; 538 my ($job) = @_;
506 539
507 if ($Coro::current == $Coro::main) { 540 if (in_main) {
508 my $time = AE::time; 541 my $time = AE::time;
509 542
510 # this is the main coro, too bad, we have to block 543 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 544 # till the operation succeeds, freezing the server :/
512 545
513 LOG llevError, Carp::longmess "sync job";#d# 546 #LOG llevError, Carp::longmess "sync job";#d#
514 547
515 my $freeze_guard = freeze_mainloop; 548 my $freeze_guard = freeze_mainloop;
516 549
517 my $busy = 1; 550 my $busy = 1;
518 my @res; 551 my @res;
519 552
520 (async { 553 (async {
521 $Coro::current->desc ("sync job coro"); 554 $Coro::current->desc ("sync job coro");
522 @res = eval { $job->() }; 555 @res = eval { $job->() };
523 warn $@ if $@; 556 error $@ if $@;
524 undef $busy; 557 undef $busy;
525 })->prio (Coro::PRIO_MAX); 558 })->prio (Coro::PRIO_MAX);
526 559
527 while ($busy) { 560 while ($busy) {
528 if (Coro::nready) { 561 if (Coro::nready) {
… …
562 $EXT_CORO{$coro+0} = $coro; 595 $EXT_CORO{$coro+0} = $coro;
563 596
564 $coro 597 $coro
565} 598}
566 599
567=item fork_call { }, $args 600=item fork_call { }, @args
568 601
569Executes the given code block with the given arguments in a seperate 602Executes the given code block with the given arguments in a seperate
570process, returning the results. Everything must be serialisable with 603process, returning the results. Everything must be serialisable with
571Coro::Storable. May, of course, block. Note that the executed sub may 604Coro::Storable. May, of course, block. Note that the executed sub may
572never block itself or use any form of event handling. 605never block itself or use any form of event handling.
573 606
574=cut 607=cut
575 608
609sub post_fork {
610 reset_signals;
611}
612
576sub fork_call(&@) { 613sub fork_call(&@) {
577 my ($cb, @args) = @_; 614 my ($cb, @args) = @_;
578 615
579 # we seemingly have to make a local copy of the whole thing, 616 # we seemingly have to make a local copy of the whole thing,
580 # otherwise perl prematurely frees the stuff :/ 617 # otherwise perl prematurely frees the stuff :/
581 # TODO: investigate and fix (likely this will be rather laborious) 618 # TODO: investigate and fix (likely this will be rather laborious)
582 619
583 my @res = Coro::Util::fork_eval { 620 my @res = Coro::Util::fork_eval {
584 reset_signals; 621 cf::post_fork;
585 &$cb 622 &$cb
586 }, @args; 623 } @args;
587 624
588 wantarray ? @res : $res[-1] 625 wantarray ? @res : $res[-1]
626}
627
628sub objinfo {
629 (
630 "counter value" => cf::object::object_count,
631 "objects created" => cf::object::create_count,
632 "objects destroyed" => cf::object::destroy_count,
633 "freelist size" => cf::object::free_count,
634 "allocated objects" => cf::object::objects_size,
635 "active objects" => cf::object::actives_size,
636 )
589} 637}
590 638
591=item $coin = coin_from_name $name 639=item $coin = coin_from_name $name
592 640
593=cut 641=cut
… …
630within each server. 678within each server.
631 679
632=cut 680=cut
633 681
634sub db_table($) { 682sub db_table($) {
683 cf::error "db_get called from main context"
684 if $Coro::current == $Coro::main;
685
635 my ($name) = @_; 686 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV; 687 my $db = BDB::db_create $DB_ENV;
637 688
638 eval { 689 eval {
639 $db->set_flags (BDB::CHKSUM); 690 $db->set_flags (BDB::CHKSUM);
… …
649} 700}
650 701
651our $DB; 702our $DB;
652 703
653sub db_init { 704sub db_init {
654 cf::sync_job {
655 $DB ||= db_table "db"; 705 $DB ||= db_table "db";
656 };
657} 706}
658 707
659sub db_get($$) { 708sub db_get($$) {
660 my $key = "$_[0]/$_[1]"; 709 my $key = "$_[0]/$_[1]";
661 710
662 cf::sync_job { 711 cf::error "db_get called from main context"
712 if $Coro::current == $Coro::main;
713
663 BDB::db_get $DB, undef, $key, my $data; 714 BDB::db_get $DB, undef, $key, my $data;
664 715
665 $! ? () 716 $! ? ()
666 : $data 717 : $data
667 }
668} 718}
669 719
670sub db_put($$$) { 720sub db_put($$$) {
671 BDB::dbreq_pri 4; 721 BDB::dbreq_pri 4;
672 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 722 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
728 778
729 my $t1 = Time::HiRes::time; 779 my $t1 = Time::HiRes::time;
730 my $data = $process->(\@data); 780 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time; 781 my $t2 = Time::HiRes::time;
732 782
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 783 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734 784
735 db_put cache => "$id/data", $data; 785 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5; 786 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta; 787 db_put cache => "$id/meta", $meta;
738 788
… …
748 798
749=cut 799=cut
750 800
751sub datalog($@) { 801sub datalog($@) {
752 my ($type, %kv) = @_; 802 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 803 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754} 804}
755 805
756=back 806=back
757 807
758=cut 808=cut
… …
953 1003
954 } elsif (exists $cb_id{$type}) { 1004 } elsif (exists $cb_id{$type}) {
955 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1005 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956 1006
957 } elsif (ref $type) { 1007 } elsif (ref $type) {
958 warn "attaching objects not supported, ignoring.\n"; 1008 error "attaching objects not supported, ignoring.\n";
959 1009
960 } else { 1010 } else {
961 shift @arg; 1011 shift @arg;
962 warn "attach argument '$type' not supported, ignoring.\n"; 1012 error "attach argument '$type' not supported, ignoring.\n";
963 } 1013 }
964 } 1014 }
965} 1015}
966 1016
967sub _object_attach { 1017sub _object_attach {
… …
977 _attach $registry, $klass, @attach; 1027 _attach $registry, $klass, @attach;
978 } 1028 }
979 1029
980 $obj->{$name} = \%arg; 1030 $obj->{$name} = \%arg;
981 } else { 1031 } else {
982 warn "object uses attachment '$name' which is not available, postponing.\n"; 1032 info "object uses attachment '$name' which is not available, postponing.\n";
983 } 1033 }
984 1034
985 $obj->{_attachment}{$name} = undef; 1035 $obj->{_attachment}{$name} = undef;
986} 1036}
987 1037
… …
1046 1096
1047 for (@$callbacks) { 1097 for (@$callbacks) {
1048 eval { &{$_->[1]} }; 1098 eval { &{$_->[1]} };
1049 1099
1050 if ($@) { 1100 if ($@) {
1051 warn "$@";
1052 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1101 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053 override; 1102 override;
1054 } 1103 }
1055 1104
1056 return 1 if $override; 1105 return 1 if $override;
1057 } 1106 }
… …
1136 for (@$attach) { 1185 for (@$attach) {
1137 my ($klass, @attach) = @$_; 1186 my ($klass, @attach) = @$_;
1138 _attach $registry, $klass, @attach; 1187 _attach $registry, $klass, @attach;
1139 } 1188 }
1140 } else { 1189 } else {
1141 warn "object uses attachment '$name' that is not available, postponing.\n"; 1190 info "object uses attachment '$name' that is not available, postponing.\n";
1142 } 1191 }
1143 } 1192 }
1144} 1193}
1145 1194
1146cf::attachable->attach ( 1195cf::attachable->attach (
… …
1173 my ($filename, $rdata, $objs) = @_; 1222 my ($filename, $rdata, $objs) = @_;
1174 1223
1175 sync_job { 1224 sync_job {
1176 if (length $$rdata) { 1225 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1226 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1227 trace sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1228 $decname, length $$rdata, scalar @$objs
1229 if $VERBOSE_IO;
1180 1230
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1231 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1232 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1233 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1234 if ($cf::USE_FSYNC) {
… …
1206 aio_rename "$filename~", $filename; 1256 aio_rename "$filename~", $filename;
1207 1257
1208 $filename =~ s%/[^/]+$%%; 1258 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC; 1259 aio_pathsync $filename if $cf::USE_FSYNC;
1210 } else { 1260 } else {
1211 warn "unable to save objects: $filename~: $!\n"; 1261 error "unable to save objects: $filename~: $!\n";
1212 } 1262 }
1213 } else { 1263 } else {
1214 aio_unlink $filename; 1264 aio_unlink $filename;
1215 aio_unlink "$filename.pst"; 1265 aio_unlink "$filename.pst";
1216 } 1266 }
… …
1240 my $st = eval { Coro::Storable::thaw $av }; 1290 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs}; 1291 $av = $st->{objs};
1242 } 1292 }
1243 1293
1244 utf8::decode (my $decname = $filename); 1294 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1295 trace sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1296 $decname, length $data, scalar @{$av || []}
1297 if $VERBOSE_IO;
1247 1298
1248 ($data, $av) 1299 ($data, $av)
1249} 1300}
1250 1301
1251=head2 COMMAND CALLBACKS 1302=head2 COMMAND CALLBACKS
… …
1343 1394
1344 $pl->ext_reply ($reply, @reply) 1395 $pl->ext_reply ($reply, @reply)
1345 if $reply; 1396 if $reply;
1346 1397
1347 } else { 1398 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1399 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1400 }
1350 1401
1351 cf::override; 1402 cf::override;
1352 }, 1403 },
1353); 1404);
… …
1364 1415
1365 $grp 1416 $grp
1366} 1417}
1367 1418
1368sub load_extensions { 1419sub load_extensions {
1420 info "loading extensions...";
1421
1369 cf::sync_job { 1422 cf::sync_job {
1370 my %todo; 1423 my %todo;
1371 1424
1372 for my $path (<$LIBDIR/*.ext>) { 1425 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1426 next unless -r $path;
… …
1391 1444
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1445 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1446 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394 1447
1395 $ext{source} = 1448 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1449 "package $pkg; use common::sense;\n"
1397 . "#line 1 \"$path\"\n{\n" 1450 . "#line 1 \"$path\"\n{\n"
1398 . $source 1451 . $source
1399 . "\n};\n1"; 1452 . "\n};\n1";
1400 1453
1401 $todo{$base} = \%ext; 1454 $todo{$base} = \%ext;
… …
1413 for (split /,\s*/, $v->{meta}{depends}) { 1466 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext 1467 next ext
1415 unless exists $done{$_}; 1468 unless exists $done{$_};
1416 } 1469 }
1417 1470
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1471 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419 1472
1420 my $active = eval $v->{source}; 1473 my $active = eval $v->{source};
1421 1474
1422 if (length $@) { 1475 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1476 error "$v->{path}: $@\n";
1424 1477
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1478 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1479 if exists $v->{meta}{mandatory};
1480
1481 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1482 delete $todo{$k};
1427 } else { 1483 } else {
1428 $done{$k} = delete $todo{$k}; 1484 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1485 push @EXTS, $v->{pkg};
1430 $progress = 1; 1486 $progress = 1;
1431 1487
1432 warn "$v->{base}: extension inactive.\n" 1488 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1489 unless $active;
1434 } 1490 }
1435 } 1491 }
1436 1492
1437 unless ($progress) { 1493 unless ($progress) {
… …
1608 $pl->{deny_save} = 1; 1664 $pl->{deny_save} = 1;
1609 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1665 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1610 1666
1611 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1612 $pl->deactivate; 1668 $pl->deactivate;
1669
1613 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1670 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1614 $pl->ob->check_score; 1671 ext::highscore::check ($pl->ob);
1672
1615 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1673 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1616 $pl->ns->destroy if $pl->ns; 1674 $pl->ns->destroy if $pl->ns;
1617 1675
1618 my $path = playerdir $pl; 1676 my $path = playerdir $pl;
1619 my $temp = "$path~$cf::RUNTIME~deleting~"; 1677 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1674 \@logins 1732 \@logins
1675} 1733}
1676 1734
1677=item $player->maps 1735=item $player->maps
1678 1736
1737=item cf::player::maps $login
1738
1679Returns an arrayref of map paths that are private for this 1739Returns an arrayref of map paths that are private for this
1680player. May block. 1740player. May block.
1681 1741
1682=cut 1742=cut
1683 1743
… …
1744 1804
1745=cut 1805=cut
1746 1806
1747sub find_by_path($) { 1807sub find_by_path($) {
1748 my ($path) = @_; 1808 my ($path) = @_;
1809
1810 $path =~ s/^~[^\/]*//; # skip ~login
1749 1811
1750 my ($match, $specificity); 1812 my ($match, $specificity);
1751 1813
1752 for my $region (list) { 1814 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1815 if ($region->{match} && $path =~ $region->{match}) {
… …
1810 1872
1811sub register { 1873sub register {
1812 my (undef, $regex, $prio) = @_; 1874 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 1875 my $pkg = caller;
1814 1876
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 1877 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 1878
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1879 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 1880}
1820 1881
1821# also paths starting with '/' 1882# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1883$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 1884
1824sub thawer_merge { 1885sub thawer_merge {
1825 my ($self, $merge) = @_; 1886 my ($self, $merge) = @_;
1826 1887
1827 # we have to keep some variables in memory intact 1888 # we have to keep some variables in memory intact
… …
1832} 1893}
1833 1894
1834sub normalise { 1895sub normalise {
1835 my ($path, $base) = @_; 1896 my ($path, $base) = @_;
1836 1897
1837 $path = "$path"; # make sure its a string 1898 $path = "$path"; # make sure it's a string
1838 1899
1839 $path =~ s/\.map$//; 1900 $path =~ s/\.map$//;
1840 1901
1841 # map plan: 1902 # map plan:
1842 # 1903 #
… …
1881 $self->init; # pass $1 etc. 1942 $self->init; # pass $1 etc.
1882 return $self; 1943 return $self;
1883 } 1944 }
1884 } 1945 }
1885 1946
1886 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1947 Carp::cluck "unable to resolve path '$path' (base '$base')";
1887 () 1948 ()
1888} 1949}
1889 1950
1890sub init { 1951sub init {
1891 my ($self) = @_; 1952 my ($self) = @_;
… …
2013} 2074}
2014 2075
2015sub find; 2076sub find;
2016sub find { 2077sub find {
2017 my ($path, $origin) = @_; 2078 my ($path, $origin) = @_;
2079
2080 cf::cede_to_tick;
2018 2081
2019 $path = normalise $path, $origin && $origin->path; 2082 $path = normalise $path, $origin && $origin->path;
2020 2083
2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2022 my $guard2 = cf::lock_acquire "map_find:$path"; 2085 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2137 or next; 2200 or next;
2138 $neigh = find $neigh, $map 2201 $neigh = find $neigh, $map
2139 or next; 2202 or next;
2140 $neigh->load; 2203 $neigh->load;
2141 2204
2205 # now find the diagonal neighbours
2142 push @neigh, 2206 push @neigh,
2143 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2207 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2144 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2208 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2145 } 2209 }
2146 2210
… …
2153} 2217}
2154 2218
2155sub find_sync { 2219sub find_sync {
2156 my ($path, $origin) = @_; 2220 my ($path, $origin) = @_;
2157 2221
2158 cf::sync_job { find $path, $origin } 2222 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2223 if $Coro::current == $Coro::main;
2224
2225 find $path, $origin
2159} 2226}
2160 2227
2161sub do_load_sync { 2228sub do_load_sync {
2162 my ($map) = @_; 2229 my ($map) = @_;
2163 2230
2164 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2165 if $Coro::current == $Coro::main; 2232 if $Coro::current == $Coro::main;
2166 2233
2167 cf::sync_job { $map->load }; 2234 $map->load;
2168} 2235}
2169 2236
2170our %MAP_PREFETCH; 2237our %MAP_PREFETCH;
2171our $MAP_PREFETCHER = undef; 2238our $MAP_PREFETCHER = undef;
2172 2239
… …
2198 $MAP_PREFETCHER->prio (6); 2265 $MAP_PREFETCHER->prio (6);
2199 2266
2200 () 2267 ()
2201} 2268}
2202 2269
2270# common code, used by both ->save and ->swapout
2203sub save { 2271sub _save {
2204 my ($self) = @_; 2272 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2273
2208 $self->{last_save} = $cf::RUNTIME; 2274 $self->{last_save} = $cf::RUNTIME;
2209 2275
2210 return unless $self->dirty; 2276 return unless $self->dirty;
2211 2277
… …
2231 } else { 2297 } else {
2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2298 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2233 } 2299 }
2234} 2300}
2235 2301
2302sub save {
2303 my ($self) = @_;
2304
2305 my $lock = cf::lock_acquire "map_data:$self->{path}";
2306
2307 $self->_save;
2308}
2309
2236sub swap_out { 2310sub swap_out {
2237 my ($self) = @_; 2311 my ($self) = @_;
2238 2312
2239 # save first because save cedes
2240 $self->save;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243 2314
2244 return if $self->players;
2245 return if $self->in_memory != cf::MAP_ACTIVE; 2315 return if $self->in_memory != cf::MAP_ACTIVE;
2246 return if $self->{deny_save}; 2316 return if $self->{deny_save};
2317 return if $self->players;
2247 2318
2319 # first deactivate the map and "unlink" it from the core
2320 $self->deactivate;
2321 $_->clear_links_to ($self) for values %cf::MAP;
2248 $self->in_memory (cf::MAP_SWAPPED); 2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # then atomically save
2325 $self->_save;
2326
2327 # then free the map
2328 $self->clear;
2329}
2330
2331sub reset_at {
2332 my ($self) = @_;
2333
2334 # TODO: safety, remove and allow resettable per-player maps
2335 return 1e99 if $self->{deny_reset};
2336
2337 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2338 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2339
2340 $time + $to
2341}
2342
2343sub should_reset {
2344 my ($self) = @_;
2345
2346 $self->reset_at <= $cf::RUNTIME
2347}
2348
2349sub reset {
2350 my ($self) = @_;
2351
2352 my $lock = cf::lock_acquire "map_data:$self->{path}";
2353
2354 return if $self->players;
2355
2356 cf::trace "resetting map ", $self->path, "\n";
2357
2358 $self->in_memory (cf::MAP_SWAPPED);
2359
2360 # need to save uniques path
2361 unless ($self->{deny_save}) {
2362 my $uniq = $self->uniq_path; utf8::encode $uniq;
2363
2364 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2365 if $uniq;
2366 }
2367
2368 delete $cf::MAP{$self->path};
2249 2369
2250 $self->deactivate; 2370 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP; 2371 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear; 2372 $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 2373
2298 $self->unlink_save; 2374 $self->unlink_save;
2299 $self->destroy; 2375 $self->destroy;
2300} 2376}
2301 2377
… …
2309 2385
2310 delete $cf::MAP{$self->path}; 2386 delete $cf::MAP{$self->path};
2311 2387
2312 $self->unlink_save; 2388 $self->unlink_save;
2313 2389
2314 bless $self, "cf::map"; 2390 bless $self, "cf::map::wrap";
2315 delete $self->{deny_reset}; 2391 delete $self->{deny_reset};
2316 $self->{deny_save} = 1; 2392 $self->{deny_save} = 1;
2317 $self->reset_timeout (1); 2393 $self->reset_timeout (1);
2318 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2394 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2319 2395
… …
2549 2625
2550Freezes the player and moves him/her to a special map (C<{link}>). 2626Freezes the player and moves him/her to a special map (C<{link}>).
2551 2627
2552The player should be reasonably safe there for short amounts of time (e.g. 2628The player should be reasonably safe there for short amounts of time (e.g.
2553for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2629for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2554though, as the palyer cannot control the character while it is on the link 2630though, as the player cannot control the character while it is on the link
2555map. 2631map.
2556 2632
2557Will never block. 2633Will never block.
2558 2634
2559=item $player_object->leave_link ($map, $x, $y) 2635=item $player_object->leave_link ($map, $x, $y)
… …
2580sub cf::object::player::enter_link { 2656sub cf::object::player::enter_link {
2581 my ($self) = @_; 2657 my ($self) = @_;
2582 2658
2583 $self->deactivate_recursive; 2659 $self->deactivate_recursive;
2584 2660
2661 ++$self->{_link_recursion};
2662
2585 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2663 return if UNIVERSAL::isa $self->map, "ext::map_link";
2586 2664
2587 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2665 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2588 if $self->map && $self->map->{path} ne "{link}"; 2666 if $self->map && $self->map->{path} ne "{link}";
2589 2667
2590 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2668 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2591} 2669}
2592 2670
2593sub cf::object::player::leave_link { 2671sub cf::object::player::leave_link {
2594 my ($self, $map, $x, $y) = @_; 2672 my ($self, $map, $x, $y) = @_;
2595 2673
… …
2620 $map->load_neighbours; 2698 $map->load_neighbours;
2621 2699
2622 return unless $self->contr->active; 2700 return unless $self->contr->active;
2623 2701
2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2702 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2625 $self->enter_map ($map, $x, $y); 2703 if ($self->enter_map ($map, $x, $y)) {
2626 2704 # entering was successful
2705 delete $self->{_link_recursion};
2627 # only activate afterwards, to support waiting in hooks 2706 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive; 2707 $self->activate_recursive;
2629} 2708 }
2630 2709
2710}
2711
2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2712=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2632 2713
2633Moves the player to the given map-path and coordinates by first freezing 2714Moves the player to the given map-path and coordinates by first freezing
2634her, loading and preparing them map, calling the provided $check callback 2715her, loading and preparing them map, calling the provided $check callback
2635that has to return the map if sucecssful, and then unfreezes the player on 2716that has to return the map if sucecssful, and then unfreezes the player on
2636the new (success) or old (failed) map position. In either case, $done will 2717the new (success) or old (failed) map position. In either case, $done will
… …
2643 2724
2644our $GOTOGEN; 2725our $GOTOGEN;
2645 2726
2646sub cf::object::player::goto { 2727sub cf::object::player::goto {
2647 my ($self, $path, $x, $y, $check, $done) = @_; 2728 my ($self, $path, $x, $y, $check, $done) = @_;
2729
2730 if ($self->{_link_recursion} >= $MAX_LINKS) {
2731 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2732 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2733 ($path, $x, $y) = @$EMERGENCY_POSITION;
2734 }
2648 2735
2649 # do generation counting so two concurrent goto's will be executed in-order 2736 # do generation counting so two concurrent goto's will be executed in-order
2650 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2737 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2651 2738
2652 $self->enter_link; 2739 $self->enter_link;
… …
2676 my $map = eval { 2763 my $map = eval {
2677 my $map = defined $path ? cf::map::find $path : undef; 2764 my $map = defined $path ? cf::map::find $path : undef;
2678 2765
2679 if ($map) { 2766 if ($map) {
2680 $map = $map->customise_for ($self); 2767 $map = $map->customise_for ($self);
2681 $map = $check->($map) if $check && $map; 2768 $map = $check->($map, $x, $y, $self) if $check && $map;
2682 } else { 2769 } else {
2683 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2770 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2684 } 2771 }
2685 2772
2686 $map 2773 $map
… …
2694 if ($gen == $self->{_goto_generation}) { 2781 if ($gen == $self->{_goto_generation}) {
2695 delete $self->{_goto_generation}; 2782 delete $self->{_goto_generation};
2696 $self->leave_link ($map, $x, $y); 2783 $self->leave_link ($map, $x, $y);
2697 } 2784 }
2698 2785
2699 $done->() if $done; 2786 $done->($self) if $done;
2700 })->prio (1); 2787 })->prio (1);
2701} 2788}
2702 2789
2703=item $player_object->enter_exit ($exit_object) 2790=item $player_object->enter_exit ($exit_object)
2704 2791
… …
2797 $self->message ("Something went wrong deep within the deliantra server. " 2884 $self->message ("Something went wrong deep within the deliantra server. "
2798 . "I'll try to bring you back to the map you were before. " 2885 . "I'll try to bring you back to the map you were before. "
2799 . "Please report this to the dungeon master!", 2886 . "Please report this to the dungeon master!",
2800 cf::NDI_UNIQUE | cf::NDI_RED); 2887 cf::NDI_UNIQUE | cf::NDI_RED);
2801 2888
2802 warn "ERROR in enter_exit: $@"; 2889 error "ERROR in enter_exit: $@";
2803 $self->leave_link; 2890 $self->leave_link;
2804 } 2891 }
2805 })->prio (1); 2892 })->prio (1);
2806} 2893}
2807 2894
… …
3120 3207
3121 $ns->ext_reply ($reply, @reply) 3208 $ns->ext_reply ($reply, @reply)
3122 if $reply; 3209 if $reply;
3123 3210
3124 } else { 3211 } else {
3125 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3212 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3126 } 3213 }
3127 3214
3128 cf::override; 3215 cf::override;
3129 }, 3216 },
3130); 3217);
… …
3211 decrease split destroy change_exp value msg lore send_msg)], 3298 decrease split destroy change_exp value msg lore send_msg)],
3212 ["cf::object::player" => qw(player)], 3299 ["cf::object::player" => qw(player)],
3213 ["cf::player" => qw(peaceful send_msg)], 3300 ["cf::player" => qw(peaceful send_msg)],
3214 ["cf::map" => qw(trigger)], 3301 ["cf::map" => qw(trigger)],
3215) { 3302) {
3216 no strict 'refs';
3217 my ($pkg, @funs) = @$_; 3303 my ($pkg, @funs) = @$_;
3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3304 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3219 for @funs; 3305 for @funs;
3220} 3306}
3221 3307
… …
3260 local @cf::_safe_eval_args = values %vars; 3346 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval; 3347 @res = wantarray ? eval eval : scalar eval $eval;
3262 } 3348 }
3263 3349
3264 if ($@) { 3350 if ($@) {
3265 warn "$@"; 3351 warn "$@",
3266 warn "while executing safe code '$code'\n"; 3352 "while executing safe code '$code'\n",
3267 warn "with arguments " . (join " ", %vars) . "\n"; 3353 "with arguments " . (join " ", %vars) . "\n";
3268 } 3354 }
3269 3355
3270 wantarray ? @res : $res[0] 3356 wantarray ? @res : $res[0]
3271} 3357}
3272 3358
… …
3306 # for this (global event?) 3392 # for this (global event?)
3307 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3308 3394
3309 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3395 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3310 3396
3311 warn "loading facedata from $path\n"; 3397 trace "loading facedata from $path\n";
3312 3398
3313 my $facedata;
3314 0 < aio_load $path, $facedata 3399 0 < aio_load $path, my $facedata
3315 or die "$path: $!"; 3400 or die "$path: $!";
3316 3401
3317 $facedata = Coro::Storable::thaw $facedata; 3402 $facedata = Coro::Storable::thaw $facedata;
3318 3403
3319 $facedata->{version} == 2 3404 $facedata->{version} == 2
… …
3350 3435
3351 if (my $smooth = cf::face::find $info->{smooth}) { 3436 if (my $smooth = cf::face::find $info->{smooth}) {
3352 cf::face::set_smooth $idx, $smooth; 3437 cf::face::set_smooth $idx, $smooth;
3353 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3438 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3354 } else { 3439 } else {
3355 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3440 error "smooth face '$info->{smooth}' not found for face '$face'";
3356 } 3441 }
3357 3442
3358 cf::cede_to_tick; 3443 cf::cede_to_tick;
3359 } 3444 }
3360 } 3445 }
… …
3378 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3463 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3379 3464
3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3465 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3381 cf::face::set_type $idx, $info->{type}; 3466 cf::face::set_type $idx, $info->{type};
3382 } else { 3467 } else {
3383 $RESOURCE{$name} = $info; 3468 $RESOURCE{$name} = $info; # unused
3384 } 3469 }
3385 3470
3386 cf::cede_to_tick; 3471 cf::cede_to_tick;
3387 } 3472 }
3388 } 3473 }
3389 3474
3390 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3475 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3391 3476
3392 1 3477 1
3393} 3478}
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 3479
3415register_exticmd fx_want => sub { 3480register_exticmd fx_want => sub {
3416 my ($ns, $want) = @_; 3481 my ($ns, $want) = @_;
3417 3482
3418 while (my ($k, $v) = each %$want) { 3483 while (my ($k, $v) = each %$want) {
… …
3457sub reload_treasures { 3522sub reload_treasures {
3458 load_resource_file "$DATADIR/treasures" 3523 load_resource_file "$DATADIR/treasures"
3459 or die "unable to load treasurelists\n"; 3524 or die "unable to load treasurelists\n";
3460} 3525}
3461 3526
3527sub reload_sound {
3528 trace "loading sound config from $DATADIR/sound\n";
3529
3530 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3531 or die "$DATADIR/sound $!";
3532
3533 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3534
3535 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3536 my $sound = $soundconf->{compat}[$_]
3537 or next;
3538
3539 my $face = cf::face::find "sound/$sound->[1]";
3540 cf::sound::set $sound->[0] => $face;
3541 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3542 }
3543
3544 while (my ($k, $v) = each %{$soundconf->{event}}) {
3545 my $face = cf::face::find "sound/$v";
3546 cf::sound::set $k => $face;
3547 }
3548}
3549
3462sub reload_resources { 3550sub reload_resources {
3463 warn "reloading resource files...\n"; 3551 trace "reloading resource files...\n";
3464 3552
3553 reload_exp_table;
3554 reload_materials;
3465 reload_facedata; 3555 reload_facedata;
3556 reload_sound;
3466 reload_archetypes; 3557 reload_archetypes;
3467 reload_regions; 3558 reload_regions;
3468 reload_treasures; 3559 reload_treasures;
3469 3560
3470 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3471} 3562}
3472 3563
3473sub reload_config { 3564sub reload_config {
3474 warn "reloading config file...\n"; 3565 trace "reloading config file...\n";
3475 3566
3476 open my $fh, "<:utf8", "$CONFDIR/config" 3567 0 < aio_load "$CONFDIR/config", my $config
3477 or return; 3568 or die "$CONFDIR/config: $!";
3478 3569
3479 local $/; 3570 utf8::decode $config;
3480 *CFG = YAML::XS::Load scalar <$fh>; 3571 *CFG = yaml_load $config;
3481 3572
3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3483 3574
3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3575 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3485 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3576 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3486 3577
3487 if (exists $CFG{mlockall}) { 3578 if (exists $CFG{mlockall}) {
… …
3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3580 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3490 and die "WARNING: m(un)lockall failed: $!\n"; 3581 and die "WARNING: m(un)lockall failed: $!\n";
3491 }; 3582 };
3492 warn $@ if $@; 3583 warn $@ if $@;
3493 } 3584 }
3494
3495 warn "finished reloading resource files\n";
3496} 3585}
3497 3586
3498sub pidfile() { 3587sub pidfile() {
3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3588 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3500 or die "$PIDFILE: $!"; 3589 or die "$PIDFILE: $!";
… …
3513 seek $fh, 0, 0; 3602 seek $fh, 0, 0;
3514 print $fh $$; 3603 print $fh $$;
3515} 3604}
3516 3605
3517sub main_loop { 3606sub main_loop {
3518 warn "EV::loop starting\n"; 3607 trace "EV::loop starting\n";
3519 if (1) { 3608 if (1) {
3520 EV::loop; 3609 EV::loop;
3521 } 3610 }
3522 warn "EV::loop returned\n"; 3611 trace "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP; 3612 goto &main_loop unless $REALLY_UNLOOP;
3524} 3613}
3525 3614
3526sub main { 3615sub main {
3527 cf::init_globals; # initialise logging 3616 cf::init_globals; # initialise logging
3528 3617
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3618 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3619 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3620 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3621 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 3622
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3623 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540 3624
3541 # we must not ever block the main coroutine 3625 # we must not ever block the main coroutine
3542 local $Coro::idle = sub { 3626 local $Coro::idle = sub {
… …
3548 }; 3632 };
3549 3633
3550 evthread_start IO::AIO::poll_fileno; 3634 evthread_start IO::AIO::poll_fileno;
3551 3635
3552 cf::sync_job { 3636 cf::sync_job {
3637 cf::incloader::init ();
3638
3639 cf::init_anim;
3640 cf::init_attackmess;
3641 cf::init_dynamic;
3642
3553 cf::load_settings; 3643 cf::load_settings;
3554 cf::load_materials;
3555 3644
3556 reload_resources; 3645 reload_resources;
3557 reload_config; 3646 reload_config;
3558 db_init; 3647 db_init;
3559 3648
… …
3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3663 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575 3664
3576 (pop @POST_INIT)->(0) while @POST_INIT; 3665 (pop @POST_INIT)->(0) while @POST_INIT;
3577 }; 3666 };
3578 3667
3668 cf::object::thawer::errors_are_fatal 0;
3669 info "parse errors in files are no longer fatal from this point on.\n";
3670
3671 my $free_main; $free_main = EV::idle sub {
3672 undef $free_main;
3673 undef &main; # free gobs of memory :)
3674 };
3675
3579 main_loop; 3676 goto &main_loop;
3580} 3677}
3581 3678
3582############################################################################# 3679#############################################################################
3583# initialisation and cleanup 3680# initialisation and cleanup
3584 3681
… …
3623 or return; 3720 or return;
3624 3721
3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3722 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3626 and return; 3723 and return;
3627 3724
3628 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3725 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3629 3726
3630 1 3727 1
3631} 3728}
3632 3729
3633our $uuid_lock; 3730our $uuid_lock;
… …
3645 or return; 3742 or return;
3646 3743
3647 my $value = uuid_seq uuid_cur; 3744 my $value = uuid_seq uuid_cur;
3648 3745
3649 unless ($value) { 3746 unless ($value) {
3650 warn "cowardly refusing to write zero uuid value!\n"; 3747 info "cowardly refusing to write zero uuid value!\n";
3651 return; 3748 return;
3652 } 3749 }
3653 3750
3654 my $value = uuid_str $value + $uuid_skip; 3751 my $value = uuid_str $value + $uuid_skip;
3655 $uuid_skip = 0; 3752 $uuid_skip = 0;
… …
3665 or return; 3762 or return;
3666 3763
3667 aio_rename "$uuid~", $uuid 3764 aio_rename "$uuid~", $uuid
3668 and return; 3765 and return;
3669 3766
3670 warn "uuid file written ($value).\n"; 3767 trace "uuid file written ($value).\n";
3671 3768
3672 1 3769 1
3673 3770
3674} 3771}
3675 3772
… …
3681} 3778}
3682 3779
3683sub emergency_save() { 3780sub emergency_save() {
3684 my $freeze_guard = cf::freeze_mainloop; 3781 my $freeze_guard = cf::freeze_mainloop;
3685 3782
3686 warn "emergency_perl_save: enter\n"; 3783 info "emergency_perl_save: enter\n";
3784
3785 # this is a trade-off: we want to be very quick here, so
3786 # save all maps without fsync, and later call a global sync
3787 # (which in turn might be very very slow)
3788 local $USE_FSYNC = 0;
3687 3789
3688 cf::sync_job { 3790 cf::sync_job {
3689 # this is a trade-off: we want to be very quick here, so 3791 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 3792
3694 # use a peculiar iteration method to avoid tripping on perl 3793 # use a peculiar iteration method to avoid tripping on perl
3695 # refcount bugs in for. also avoids problems with players 3794 # refcount bugs in for. also avoids problems with players
3696 # and maps saved/destroyed asynchronously. 3795 # and maps saved/destroyed asynchronously.
3697 warn "emergency_perl_save: begin player save\n"; 3796 info "emergency_perl_save: begin player save\n";
3698 for my $login (keys %cf::PLAYER) { 3797 for my $login (keys %cf::PLAYER) {
3699 my $pl = $cf::PLAYER{$login} or next; 3798 my $pl = $cf::PLAYER{$login} or next;
3700 $pl->valid or next; 3799 $pl->valid or next;
3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3800 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3702 $pl->save; 3801 $pl->save;
3703 } 3802 }
3704 warn "emergency_perl_save: end player save\n"; 3803 info "emergency_perl_save: end player save\n";
3705 3804
3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3706 warn "emergency_perl_save: begin map save\n"; 3807 info "emergency_perl_save: begin map save\n";
3707 for my $path (keys %cf::MAP) { 3808 for my $path (keys %cf::MAP) {
3708 my $map = $cf::MAP{$path} or next; 3809 my $map = $cf::MAP{$path} or next;
3709 $map->valid or next; 3810 $map->valid or next;
3710 $map->save; 3811 $map->save;
3711 } 3812 }
3712 warn "emergency_perl_save: end map save\n"; 3813 info "emergency_perl_save: end map save\n";
3713 3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3714 warn "emergency_perl_save: begin database checkpoint\n"; 3817 info "emergency_perl_save: begin database checkpoint\n";
3715 BDB::db_env_txn_checkpoint $DB_ENV; 3818 BDB::db_env_txn_checkpoint $DB_ENV;
3716 warn "emergency_perl_save: end database checkpoint\n"; 3819 info "emergency_perl_save: end database checkpoint\n";
3717 3820
3718 warn "emergency_perl_save: begin write uuid\n"; 3821 info "emergency_perl_save: begin write uuid\n";
3719 write_uuid_sync 1; 3822 write_uuid_sync 1;
3720 warn "emergency_perl_save: end write uuid\n"; 3823 info "emergency_perl_save: end write uuid\n";
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: syncing database to disk";
3828 BDB::db_env_txn_checkpoint $DB_ENV;
3829
3830 info "emergency_perl_save: starting sync\n";
3831 IO::AIO::aio_sync sub {
3832 info "emergency_perl_save: finished sync\n";
3833 };
3834
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3837 trace "emergency_perl_save: flushing outstanding aio requests";
3838 while (IO::AIO::nreqs || BDB::nreqs) {
3839 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3840 }
3841
3842 cf::write_runtime_sync; # external watchdog should not bark
3721 }; 3843 };
3722 3844
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"; 3845 info "emergency_perl_save: leave\n";
3729} 3846}
3730 3847
3731sub post_cleanup { 3848sub post_cleanup {
3732 my ($make_core) = @_; 3849 my ($make_core) = @_;
3733 3850
3851 IO::AIO::flush;
3852
3734 warn Carp::longmess "post_cleanup backtrace" 3853 error Carp::longmess "post_cleanup backtrace"
3735 if $make_core; 3854 if $make_core;
3736 3855
3737 my $fh = pidfile; 3856 my $fh = pidfile;
3738 unlink $PIDFILE if <$fh> == $$; 3857 unlink $PIDFILE if <$fh> == $$;
3739} 3858}
… …
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3878 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) { 3879 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"}; 3880 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3881# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 } 3882 }
3764 warn "cleared package $pkg\n";#d#
3765} 3883}
3766 3884
3767sub do_reload_perl() { 3885sub do_reload_perl() {
3768 # can/must only be called in main 3886 # can/must only be called in main
3769 if ($Coro::current != $Coro::main) { 3887 unless (in_main) {
3770 warn "can only reload from main coroutine"; 3888 error "can only reload from main coroutine";
3771 return; 3889 return;
3772 } 3890 }
3773 3891
3774 return if $RELOAD++; 3892 return if $RELOAD++;
3775 3893
3776 my $t1 = AE::time; 3894 my $t1 = AE::time;
3777 3895
3778 while ($RELOAD) { 3896 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl";
3779 warn "reloading..."; 3898 info "reloading...";
3780 3899
3781 warn "entering sync_job"; 3900 trace "entering sync_job";
3782 3901
3783 cf::sync_job { 3902 cf::sync_job {
3784 cf::write_runtime_sync; # external watchdog should not bark
3785 cf::emergency_save; 3903 #cf::emergency_save;
3786 cf::write_runtime_sync; # external watchdog should not bark
3787 3904
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"; 3905 trace "cancelling all extension coros";
3799 $_->cancel for values %EXT_CORO; 3906 $_->cancel for values %EXT_CORO;
3800 %EXT_CORO = (); 3907 %EXT_CORO = ();
3801 3908
3802 warn "removing commands"; 3909 trace "removing commands";
3803 %COMMAND = (); 3910 %COMMAND = ();
3804 3911
3805 warn "removing ext/exti commands"; 3912 trace "removing ext/exti commands";
3806 %EXTCMD = (); 3913 %EXTCMD = ();
3807 %EXTICMD = (); 3914 %EXTICMD = ();
3808 3915
3809 warn "unloading/nuking all extensions"; 3916 trace "unloading/nuking all extensions";
3810 for my $pkg (@EXTS) { 3917 for my $pkg (@EXTS) {
3811 warn "... unloading $pkg"; 3918 trace "... unloading $pkg";
3812 3919
3813 if (my $cb = $pkg->can ("unload")) { 3920 if (my $cb = $pkg->can ("unload")) {
3814 eval { 3921 eval {
3815 $cb->($pkg); 3922 $cb->($pkg);
3816 1 3923 1
3817 } or warn "$pkg unloaded, but with errors: $@"; 3924 } or error "$pkg unloaded, but with errors: $@";
3818 } 3925 }
3819 3926
3820 warn "... clearing $pkg"; 3927 trace "... clearing $pkg";
3821 clear_package $pkg; 3928 clear_package $pkg;
3822 } 3929 }
3823 3930
3824 warn "unloading all perl modules loaded from $LIBDIR"; 3931 trace "unloading all perl modules loaded from $LIBDIR";
3825 while (my ($k, $v) = each %INC) { 3932 while (my ($k, $v) = each %INC) {
3826 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3827 3934
3828 warn "... unloading $k"; 3935 trace "... unloading $k";
3829 delete $INC{$k}; 3936 delete $INC{$k};
3830 3937
3831 $k =~ s/\.pm$//; 3938 $k =~ s/\.pm$//;
3832 $k =~ s/\//::/g; 3939 $k =~ s/\//::/g;
3833 3940
… …
3836 } 3943 }
3837 3944
3838 clear_package $k; 3945 clear_package $k;
3839 } 3946 }
3840 3947
3841 warn "getting rid of safe::, as good as possible"; 3948 trace "getting rid of safe::, as good as possible";
3842 clear_package "safe::$_" 3949 clear_package "safe::$_"
3843 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3950 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3844 3951
3845 warn "unloading cf.pm \"a bit\""; 3952 trace "unloading cf.pm \"a bit\"";
3846 delete $INC{"cf.pm"}; 3953 delete $INC{"cf.pm"};
3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3848 3955
3849 # don't, removes xs symbols, too, 3956 # don't, removes xs symbols, too,
3850 # and global variables created in xs 3957 # and global variables created in xs
3851 #clear_package __PACKAGE__; 3958 #clear_package __PACKAGE__;
3852 3959
3853 warn "unload completed, starting to reload now"; 3960 info "unload completed, starting to reload now";
3854 3961
3855 warn "reloading cf.pm"; 3962 trace "reloading cf.pm";
3856 require cf; 3963 require cf;
3857 cf::_connect_to_perl_1; 3964 cf::_connect_to_perl_1;
3858 3965
3859 warn "loading config and database again"; 3966 trace "loading config and database again";
3860 cf::reload_config; 3967 cf::reload_config;
3861 3968
3862 warn "loading extensions"; 3969 trace "loading extensions";
3863 cf::load_extensions; 3970 cf::load_extensions;
3864 3971
3865 if ($REATTACH_ON_RELOAD) { 3972 if ($REATTACH_ON_RELOAD) {
3866 warn "reattaching attachments to objects/players"; 3973 trace "reattaching attachments to objects/players";
3867 _global_reattach; # objects, sockets 3974 _global_reattach; # objects, sockets
3868 warn "reattaching attachments to maps"; 3975 trace "reattaching attachments to maps";
3869 reattach $_ for values %MAP; 3976 reattach $_ for values %MAP;
3870 warn "reattaching attachments to players"; 3977 trace "reattaching attachments to players";
3871 reattach $_ for values %PLAYER; 3978 reattach $_ for values %PLAYER;
3872 } 3979 }
3873 3980
3874 warn "running post_init jobs"; 3981 trace "running post_init jobs";
3875 (pop @POST_INIT)->(1) while @POST_INIT; 3982 (pop @POST_INIT)->(1) while @POST_INIT;
3876 3983
3877 warn "leaving sync_job"; 3984 trace "leaving sync_job";
3878 3985
3879 1 3986 1
3880 } or do { 3987 } or do {
3881 warn $@; 3988 error $@;
3882 cf::cleanup "error while reloading, exiting."; 3989 cf::cleanup "error while reloading, exiting.";
3883 }; 3990 };
3884 3991
3885 warn "reloaded"; 3992 info "reloaded";
3886 --$RELOAD; 3993 --$RELOAD;
3887 } 3994 }
3888 3995
3889 $t1 = AE::time - $t1; 3996 $t1 = AE::time - $t1;
3890 warn "reload completed in ${t1}s\n"; 3997 info "reload completed in ${t1}s\n";
3891}; 3998};
3892 3999
3893our $RELOAD_WATCHER; # used only during reload 4000our $RELOAD_WATCHER; # used only during reload
3894 4001
3895sub reload_perl() { 4002sub reload_perl() {
… …
3916 reload_perl; 4023 reload_perl;
3917 }; 4024 };
3918 } 4025 }
3919}; 4026};
3920 4027
3921unshift @INC, $LIBDIR; 4028#############################################################################
3922 4029
3923my $bug_warning = 0; 4030my $bug_warning = 0;
3924 4031
3925our @WAIT_FOR_TICK; 4032our @WAIT_FOR_TICK;
3926our @WAIT_FOR_TICK_BEGIN; 4033our @WAIT_FOR_TICK_BEGIN;
3927 4034
3928sub wait_for_tick { 4035sub wait_for_tick() {
3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3930 4037
3931 my $signal = new Coro::Signal; 4038 my $signal = new Coro::Signal;
3932 push @WAIT_FOR_TICK, $signal; 4039 push @WAIT_FOR_TICK, $signal;
3933 $signal->wait; 4040 $signal->wait;
3934} 4041}
3935 4042
3936sub wait_for_tick_begin { 4043sub wait_for_tick_begin() {
3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3938 4045
3939 my $signal = new Coro::Signal; 4046 my $signal = new Coro::Signal;
3940 push @WAIT_FOR_TICK_BEGIN, $signal; 4047 push @WAIT_FOR_TICK_BEGIN, $signal;
3941 $signal->wait; 4048 $signal->wait;
… …
3955 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4062 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4063 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3957 Coro::async_pool { 4064 Coro::async_pool {
3958 $Coro::current->{desc} = "runtime saver"; 4065 $Coro::current->{desc} = "runtime saver";
3959 write_runtime_sync 4066 write_runtime_sync
3960 or warn "ERROR: unable to write runtime file: $!"; 4067 or error "ERROR: unable to write runtime file: $!";
3961 }; 4068 };
3962 } 4069 }
3963 4070
3964 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3965 $sig->send; 4072 $sig->send;
… …
3973 4080
3974 if (0) { 4081 if (0) {
3975 if ($NEXT_TICK) { 4082 if ($NEXT_TICK) {
3976 my $jitter = $TICK_START - $NEXT_TICK; 4083 my $jitter = $TICK_START - $NEXT_TICK;
3977 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4084 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3978 warn "jitter $JITTER\n";#d# 4085 debug "jitter $JITTER\n";#d#
3979 } 4086 }
3980 } 4087 }
3981} 4088}
3982 4089
3983{ 4090{

Diff Legend

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