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.509 by root, Mon Apr 5 03:22:25 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) {
… …
1533 $cf::PLAYER{$login} = $pl 1573 $cf::PLAYER{$login} = $pl
1534 } 1574 }
1535 } 1575 }
1536} 1576}
1537 1577
1578cf::player->attach (
1579 on_load => sub {
1580 my ($pl, $path) = @_;
1581
1582 # restore slots saved in save, below
1583 my $slots = delete $pl->{_slots};
1584
1585 $pl->ob->current_weapon ($slots->[0]);
1586 $pl->combat_ob ($slots->[1]);
1587 $pl->ranged_ob ($slots->[2]);
1588 },
1589);
1590
1538sub save($) { 1591sub save($) {
1539 my ($pl) = @_; 1592 my ($pl) = @_;
1540 1593
1541 return if $pl->{deny_save}; 1594 return if $pl->{deny_save};
1542 1595
… …
1547 1600
1548 aio_mkdir playerdir $pl, 0770; 1601 aio_mkdir playerdir $pl, 0770;
1549 $pl->{last_save} = $cf::RUNTIME; 1602 $pl->{last_save} = $cf::RUNTIME;
1550 1603
1551 cf::get_slot 0.01; 1604 cf::get_slot 0.01;
1605
1606 # save slots, to be restored later
1607 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1552 1608
1553 $pl->save_pl ($path); 1609 $pl->save_pl ($path);
1554 cf::cede_to_tick; 1610 cf::cede_to_tick;
1555} 1611}
1556 1612
… …
1593 $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
1594 1650
1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1651 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1596 $pl->deactivate; 1652 $pl->deactivate;
1597 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;
1598 $pl->ob->check_score;
1599 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1654 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1600 $pl->ns->destroy if $pl->ns; 1655 $pl->ns->destroy if $pl->ns;
1601 1656
1602 my $path = playerdir $pl; 1657 my $path = playerdir $pl;
1603 my $temp = "$path~$cf::RUNTIME~deleting~"; 1658 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1658 \@logins 1713 \@logins
1659} 1714}
1660 1715
1661=item $player->maps 1716=item $player->maps
1662 1717
1718=item cf::player::maps $login
1719
1663Returns an arrayref of map paths that are private for this 1720Returns an arrayref of map paths that are private for this
1664player. May block. 1721player. May block.
1665 1722
1666=cut 1723=cut
1667 1724
… …
1728 1785
1729=cut 1786=cut
1730 1787
1731sub find_by_path($) { 1788sub find_by_path($) {
1732 my ($path) = @_; 1789 my ($path) = @_;
1790
1791 $path =~ s/^~[^\/]*//; # skip ~login
1733 1792
1734 my ($match, $specificity); 1793 my ($match, $specificity);
1735 1794
1736 for my $region (list) { 1795 for my $region (list) {
1737 if ($region->{match} && $path =~ $region->{match}) { 1796 if ($region->{match} && $path =~ $region->{match}) {
… …
1794 1853
1795sub register { 1854sub register {
1796 my (undef, $regex, $prio) = @_; 1855 my (undef, $regex, $prio) = @_;
1797 my $pkg = caller; 1856 my $pkg = caller;
1798 1857
1799 no strict;
1800 push @{"$pkg\::ISA"}, __PACKAGE__; 1858 push @{"$pkg\::ISA"}, __PACKAGE__;
1801 1859
1802 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1860 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1803} 1861}
1804 1862
1805# also paths starting with '/' 1863# also paths starting with '/'
1806$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1864$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1807 1865
1808sub thawer_merge { 1866sub thawer_merge {
1809 my ($self, $merge) = @_; 1867 my ($self, $merge) = @_;
1810 1868
1811 # we have to keep some variables in memory intact 1869 # we have to keep some variables in memory intact
… …
1816} 1874}
1817 1875
1818sub normalise { 1876sub normalise {
1819 my ($path, $base) = @_; 1877 my ($path, $base) = @_;
1820 1878
1821 $path = "$path"; # make sure its a string 1879 $path = "$path"; # make sure it's a string
1822 1880
1823 $path =~ s/\.map$//; 1881 $path =~ s/\.map$//;
1824 1882
1825 # map plan: 1883 # map plan:
1826 # 1884 #
… …
1865 $self->init; # pass $1 etc. 1923 $self->init; # pass $1 etc.
1866 return $self; 1924 return $self;
1867 } 1925 }
1868 } 1926 }
1869 1927
1870 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1928 Carp::cluck "unable to resolve path '$path' (base '$base')";
1871 () 1929 ()
1872} 1930}
1873 1931
1874sub init { 1932sub init {
1875 my ($self) = @_; 1933 my ($self) = @_;
… …
1997} 2055}
1998 2056
1999sub find; 2057sub find;
2000sub find { 2058sub find {
2001 my ($path, $origin) = @_; 2059 my ($path, $origin) = @_;
2060
2061 cf::cede_to_tick;
2002 2062
2003 $path = normalise $path, $origin && $origin->path; 2063 $path = normalise $path, $origin && $origin->path;
2004 2064
2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2065 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2006 my $guard2 = cf::lock_acquire "map_find:$path"; 2066 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2121 or next; 2181 or next;
2122 $neigh = find $neigh, $map 2182 $neigh = find $neigh, $map
2123 or next; 2183 or next;
2124 $neigh->load; 2184 $neigh->load;
2125 2185
2186 # now find the diagonal neighbours
2126 push @neigh, 2187 push @neigh,
2127 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2188 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2128 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2189 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2129 } 2190 }
2130 2191
… …
2137} 2198}
2138 2199
2139sub find_sync { 2200sub find_sync {
2140 my ($path, $origin) = @_; 2201 my ($path, $origin) = @_;
2141 2202
2142 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
2143} 2207}
2144 2208
2145sub do_load_sync { 2209sub do_load_sync {
2146 my ($map) = @_; 2210 my ($map) = @_;
2147 2211
2148 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2212 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2149 if $Coro::current == $Coro::main; 2213 if $Coro::current == $Coro::main;
2150 2214
2151 cf::sync_job { $map->load }; 2215 $map->load;
2152} 2216}
2153 2217
2154our %MAP_PREFETCH; 2218our %MAP_PREFETCH;
2155our $MAP_PREFETCHER = undef; 2219our $MAP_PREFETCHER = undef;
2156 2220
… …
2182 $MAP_PREFETCHER->prio (6); 2246 $MAP_PREFETCHER->prio (6);
2183 2247
2184 () 2248 ()
2185} 2249}
2186 2250
2251# common code, used by both ->save and ->swapout
2187sub save { 2252sub _save {
2188 my ($self) = @_; 2253 my ($self) = @_;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2254
2192 $self->{last_save} = $cf::RUNTIME; 2255 $self->{last_save} = $cf::RUNTIME;
2193 2256
2194 return unless $self->dirty; 2257 return unless $self->dirty;
2195 2258
… …
2215 } else { 2278 } else {
2216 $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);
2217 } 2280 }
2218} 2281}
2219 2282
2283sub save {
2284 my ($self) = @_;
2285
2286 my $lock = cf::lock_acquire "map_data:$self->{path}";
2287
2288 $self->_save;
2289}
2290
2220sub swap_out { 2291sub swap_out {
2221 my ($self) = @_; 2292 my ($self) = @_;
2222 2293
2223 # save first because save cedes
2224 $self->save;
2225
2226 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2294 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227 2295
2228 return if $self->players;
2229 return if $self->in_memory != cf::MAP_ACTIVE; 2296 return if $self->in_memory != cf::MAP_ACTIVE;
2230 return if $self->{deny_save}; 2297 return if $self->{deny_save};
2298 return if $self->players;
2231 2299
2300 # first deactivate the map and "unlink" it from the core
2301 $self->deactivate;
2302 $_->clear_links_to ($self) for values %cf::MAP;
2232 $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};
2233 2350
2234 $self->deactivate; 2351 $self->deactivate;
2235 $_->clear_links_to ($self) for values %cf::MAP; 2352 $_->clear_links_to ($self) for values %cf::MAP;
2236 $self->clear; 2353 $self->clear;
2237}
2238
2239sub reset_at {
2240 my ($self) = @_;
2241
2242 # TODO: safety, remove and allow resettable per-player maps
2243 return 1e99 if $self->{deny_reset};
2244
2245 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2246 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2247
2248 $time + $to
2249}
2250
2251sub should_reset {
2252 my ($self) = @_;
2253
2254 $self->reset_at <= $cf::RUNTIME
2255}
2256
2257sub reset {
2258 my ($self) = @_;
2259
2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261
2262 return if $self->players;
2263
2264 warn "resetting map ", $self->path, "\n";
2265
2266 $self->in_memory (cf::MAP_SWAPPED);
2267
2268 # need to save uniques path
2269 unless ($self->{deny_save}) {
2270 my $uniq = $self->uniq_path; utf8::encode $uniq;
2271
2272 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2273 if $uniq;
2274 }
2275
2276 delete $cf::MAP{$self->path};
2277
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->clear;
2281 2354
2282 $self->unlink_save; 2355 $self->unlink_save;
2283 $self->destroy; 2356 $self->destroy;
2284} 2357}
2285 2358
… …
2293 2366
2294 delete $cf::MAP{$self->path}; 2367 delete $cf::MAP{$self->path};
2295 2368
2296 $self->unlink_save; 2369 $self->unlink_save;
2297 2370
2298 bless $self, "cf::map"; 2371 bless $self, "cf::map::wrap";
2299 delete $self->{deny_reset}; 2372 delete $self->{deny_reset};
2300 $self->{deny_save} = 1; 2373 $self->{deny_save} = 1;
2301 $self->reset_timeout (1); 2374 $self->reset_timeout (1);
2302 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2375 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2303 2376
… …
2533 2606
2534Freezes 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}>).
2535 2608
2536The 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.
2537for 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,
2538though, 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
2539map. 2612map.
2540 2613
2541Will never block. 2614Will never block.
2542 2615
2543=item $player_object->leave_link ($map, $x, $y) 2616=item $player_object->leave_link ($map, $x, $y)
… …
2564sub cf::object::player::enter_link { 2637sub cf::object::player::enter_link {
2565 my ($self) = @_; 2638 my ($self) = @_;
2566 2639
2567 $self->deactivate_recursive; 2640 $self->deactivate_recursive;
2568 2641
2642 ++$self->{_link_recursion};
2643
2569 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2644 return if UNIVERSAL::isa $self->map, "ext::map_link";
2570 2645
2571 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2646 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2572 if $self->map && $self->map->{path} ne "{link}"; 2647 if $self->map && $self->map->{path} ne "{link}";
2573 2648
2574 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2649 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2575} 2650}
2576 2651
2577sub cf::object::player::leave_link { 2652sub cf::object::player::leave_link {
2578 my ($self, $map, $x, $y) = @_; 2653 my ($self, $map, $x, $y) = @_;
2579 2654
… …
2604 $map->load_neighbours; 2679 $map->load_neighbours;
2605 2680
2606 return unless $self->contr->active; 2681 return unless $self->contr->active;
2607 2682
2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2683 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609 $self->enter_map ($map, $x, $y); 2684 if ($self->enter_map ($map, $x, $y)) {
2610 2685 # entering was successful
2686 delete $self->{_link_recursion};
2611 # only activate afterwards, to support waiting in hooks 2687 # only activate afterwards, to support waiting in hooks
2612 $self->activate_recursive; 2688 $self->activate_recursive;
2613} 2689 }
2614 2690
2691}
2692
2615=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)]])
2616 2694
2617Moves 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
2618her, loading and preparing them map, calling the provided $check callback 2696her, loading and preparing them map, calling the provided $check callback
2619that 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
2620the 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
… …
2627 2705
2628our $GOTOGEN; 2706our $GOTOGEN;
2629 2707
2630sub cf::object::player::goto { 2708sub cf::object::player::goto {
2631 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 }
2632 2716
2633 # 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
2634 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2718 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2635 2719
2636 $self->enter_link; 2720 $self->enter_link;
… …
2660 my $map = eval { 2744 my $map = eval {
2661 my $map = defined $path ? cf::map::find $path : undef; 2745 my $map = defined $path ? cf::map::find $path : undef;
2662 2746
2663 if ($map) { 2747 if ($map) {
2664 $map = $map->customise_for ($self); 2748 $map = $map->customise_for ($self);
2665 $map = $check->($map) if $check && $map; 2749 $map = $check->($map, $x, $y, $self) if $check && $map;
2666 } else { 2750 } else {
2667 $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);
2668 } 2752 }
2669 2753
2670 $map 2754 $map
… …
2678 if ($gen == $self->{_goto_generation}) { 2762 if ($gen == $self->{_goto_generation}) {
2679 delete $self->{_goto_generation}; 2763 delete $self->{_goto_generation};
2680 $self->leave_link ($map, $x, $y); 2764 $self->leave_link ($map, $x, $y);
2681 } 2765 }
2682 2766
2683 $done->() if $done; 2767 $done->($self) if $done;
2684 })->prio (1); 2768 })->prio (1);
2685} 2769}
2686 2770
2687=item $player_object->enter_exit ($exit_object) 2771=item $player_object->enter_exit ($exit_object)
2688 2772
… …
2781 $self->message ("Something went wrong deep within the deliantra server. " 2865 $self->message ("Something went wrong deep within the deliantra server. "
2782 . "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. "
2783 . "Please report this to the dungeon master!", 2867 . "Please report this to the dungeon master!",
2784 cf::NDI_UNIQUE | cf::NDI_RED); 2868 cf::NDI_UNIQUE | cf::NDI_RED);
2785 2869
2786 warn "ERROR in enter_exit: $@"; 2870 error "ERROR in enter_exit: $@";
2787 $self->leave_link; 2871 $self->leave_link;
2788 } 2872 }
2789 })->prio (1); 2873 })->prio (1);
2790} 2874}
2791 2875
… …
3104 3188
3105 $ns->ext_reply ($reply, @reply) 3189 $ns->ext_reply ($reply, @reply)
3106 if $reply; 3190 if $reply;
3107 3191
3108 } else { 3192 } else {
3109 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";
3110 } 3194 }
3111 3195
3112 cf::override; 3196 cf::override;
3113 }, 3197 },
3114); 3198);
… …
3195 decrease split destroy change_exp value msg lore send_msg)], 3279 decrease split destroy change_exp value msg lore send_msg)],
3196 ["cf::object::player" => qw(player)], 3280 ["cf::object::player" => qw(player)],
3197 ["cf::player" => qw(peaceful send_msg)], 3281 ["cf::player" => qw(peaceful send_msg)],
3198 ["cf::map" => qw(trigger)], 3282 ["cf::map" => qw(trigger)],
3199) { 3283) {
3200 no strict 'refs';
3201 my ($pkg, @funs) = @$_; 3284 my ($pkg, @funs) = @$_;
3202 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3285 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3203 for @funs; 3286 for @funs;
3204} 3287}
3205 3288
… …
3244 local @cf::_safe_eval_args = values %vars; 3327 local @cf::_safe_eval_args = values %vars;
3245 @res = wantarray ? eval eval : scalar eval $eval; 3328 @res = wantarray ? eval eval : scalar eval $eval;
3246 } 3329 }
3247 3330
3248 if ($@) { 3331 if ($@) {
3249 warn "$@"; 3332 warn "$@",
3250 warn "while executing safe code '$code'\n"; 3333 "while executing safe code '$code'\n",
3251 warn "with arguments " . (join " ", %vars) . "\n"; 3334 "with arguments " . (join " ", %vars) . "\n";
3252 } 3335 }
3253 3336
3254 wantarray ? @res : $res[0] 3337 wantarray ? @res : $res[0]
3255} 3338}
3256 3339
… …
3290 # for this (global event?) 3373 # for this (global event?)
3291 %ext::player_env::MUSIC_FACE_CACHE = (); 3374 %ext::player_env::MUSIC_FACE_CACHE = ();
3292 3375
3293 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3376 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3294 3377
3295 warn "loading facedata from $path\n"; 3378 trace "loading facedata from $path\n";
3296 3379
3297 my $facedata;
3298 0 < aio_load $path, $facedata 3380 0 < aio_load $path, my $facedata
3299 or die "$path: $!"; 3381 or die "$path: $!";
3300 3382
3301 $facedata = Coro::Storable::thaw $facedata; 3383 $facedata = Coro::Storable::thaw $facedata;
3302 3384
3303 $facedata->{version} == 2 3385 $facedata->{version} == 2
… …
3334 3416
3335 if (my $smooth = cf::face::find $info->{smooth}) { 3417 if (my $smooth = cf::face::find $info->{smooth}) {
3336 cf::face::set_smooth $idx, $smooth; 3418 cf::face::set_smooth $idx, $smooth;
3337 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3419 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3338 } else { 3420 } else {
3339 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3421 error "smooth face '$info->{smooth}' not found for face '$face'";
3340 } 3422 }
3341 3423
3342 cf::cede_to_tick; 3424 cf::cede_to_tick;
3343 } 3425 }
3344 } 3426 }
… …
3362 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3444 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3363 3445
3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3446 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3365 cf::face::set_type $idx, $info->{type}; 3447 cf::face::set_type $idx, $info->{type};
3366 } else { 3448 } else {
3367 $RESOURCE{$name} = $info; 3449 $RESOURCE{$name} = $info; # unused
3368 } 3450 }
3369 3451
3370 cf::cede_to_tick; 3452 cf::cede_to_tick;
3371 } 3453 }
3372 } 3454 }
3373 3455
3374 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3456 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3375 3457
3376 1 3458 1
3377} 3459}
3378
3379cf::global->attach (on_resource_update => sub {
3380 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3381 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3382
3383 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3384 my $sound = $soundconf->{compat}[$_]
3385 or next;
3386
3387 my $face = cf::face::find "sound/$sound->[1]";
3388 cf::sound::set $sound->[0] => $face;
3389 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3390 }
3391
3392 while (my ($k, $v) = each %{$soundconf->{event}}) {
3393 my $face = cf::face::find "sound/$v";
3394 cf::sound::set $k => $face;
3395 }
3396 }
3397});
3398 3460
3399register_exticmd fx_want => sub { 3461register_exticmd fx_want => sub {
3400 my ($ns, $want) = @_; 3462 my ($ns, $want) = @_;
3401 3463
3402 while (my ($k, $v) = each %$want) { 3464 while (my ($k, $v) = each %$want) {
… …
3441sub reload_treasures { 3503sub reload_treasures {
3442 load_resource_file "$DATADIR/treasures" 3504 load_resource_file "$DATADIR/treasures"
3443 or die "unable to load treasurelists\n"; 3505 or die "unable to load treasurelists\n";
3444} 3506}
3445 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
3446sub reload_resources { 3531sub reload_resources {
3447 warn "reloading resource files...\n"; 3532 trace "reloading resource files...\n";
3448 3533
3534 reload_exp_table;
3535 reload_materials;
3449 reload_facedata; 3536 reload_facedata;
3537 reload_sound;
3450 reload_archetypes; 3538 reload_archetypes;
3451 reload_regions; 3539 reload_regions;
3452 reload_treasures; 3540 reload_treasures;
3453 3541
3454 warn "finished reloading resource files\n"; 3542 trace "finished reloading resource files\n";
3455} 3543}
3456 3544
3457sub reload_config { 3545sub reload_config {
3458 warn "reloading config file...\n"; 3546 trace "reloading config file...\n";
3459 3547
3460 open my $fh, "<:utf8", "$CONFDIR/config" 3548 0 < aio_load "$CONFDIR/config", my $config
3461 or return; 3549 or die "$CONFDIR/config: $!";
3462 3550
3463 local $/; 3551 utf8::decode $config;
3552
3553 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3464 *CFG = YAML::XS::Load scalar <$fh>; 3554 *CFG = YAML::XS::Load $config;
3465 3555
3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3556 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3467 3557
3468 $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};
3469 $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};
3470 3560
3471 if (exists $CFG{mlockall}) { 3561 if (exists $CFG{mlockall}) {
… …
3473 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3563 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3474 and die "WARNING: m(un)lockall failed: $!\n"; 3564 and die "WARNING: m(un)lockall failed: $!\n";
3475 }; 3565 };
3476 warn $@ if $@; 3566 warn $@ if $@;
3477 } 3567 }
3478
3479 warn "finished reloading resource files\n";
3480} 3568}
3481 3569
3482sub pidfile() { 3570sub pidfile() {
3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3571 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3484 or die "$PIDFILE: $!"; 3572 or die "$PIDFILE: $!";
… …
3497 seek $fh, 0, 0; 3585 seek $fh, 0, 0;
3498 print $fh $$; 3586 print $fh $$;
3499} 3587}
3500 3588
3501sub main_loop { 3589sub main_loop {
3502 warn "EV::loop starting\n"; 3590 trace "EV::loop starting\n";
3503 if (1) { 3591 if (1) {
3504 EV::loop; 3592 EV::loop;
3505 } 3593 }
3506 warn "EV::loop returned\n"; 3594 trace "EV::loop returned\n";
3507 goto &main_loop unless $REALLY_UNLOOP; 3595 goto &main_loop unless $REALLY_UNLOOP;
3508} 3596}
3509 3597
3510sub main { 3598sub main {
3511 cf::init_globals; # initialise logging 3599 cf::init_globals; # initialise logging
3512 3600
3513 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3601 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3514 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.";
3515 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3603 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3516 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3604 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3517
3518 cf::init_experience;
3519 cf::init_anim;
3520 cf::init_attackmess;
3521 cf::init_dynamic;
3522 3605
3523 $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
3524 3607
3525 # we must not ever block the main coroutine 3608 # we must not ever block the main coroutine
3526 local $Coro::idle = sub { 3609 local $Coro::idle = sub {
… …
3532 }; 3615 };
3533 3616
3534 evthread_start IO::AIO::poll_fileno; 3617 evthread_start IO::AIO::poll_fileno;
3535 3618
3536 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
3537 cf::load_settings; 3626 cf::load_settings;
3538 cf::load_materials;
3539 3627
3540 reload_resources; 3628 reload_resources;
3541 reload_config; 3629 reload_config;
3542 db_init; 3630 db_init;
3543 3631
3544 cf::init_uuid; 3632 cf::init_uuid;
3545 cf::init_signals; 3633 cf::init_signals;
3546 cf::init_commands;
3547 cf::init_skills; 3634 cf::init_skills;
3548 3635
3549 cf::init_beforeplay; 3636 cf::init_beforeplay;
3550 3637
3551 atomic; 3638 atomic;
… …
3559 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};
3560 3647
3561 (pop @POST_INIT)->(0) while @POST_INIT; 3648 (pop @POST_INIT)->(0) while @POST_INIT;
3562 }; 3649 };
3563 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
3564 main_loop; 3659 goto &main_loop;
3565} 3660}
3566 3661
3567############################################################################# 3662#############################################################################
3568# initialisation and cleanup 3663# initialisation and cleanup
3569 3664
3570# install some emergency cleanup handlers 3665# install some emergency cleanup handlers
3571BEGIN { 3666BEGIN {
3572 our %SIGWATCHER = (); 3667 our %SIGWATCHER = ();
3573 for my $signal (qw(INT HUP TERM)) { 3668 for my $signal (qw(INT HUP TERM)) {
3574 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3669 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3575 cf::cleanup "SIG$signal"; 3670 cf::cleanup "SIG$signal";
3576 }; 3671 };
3577 } 3672 }
3578} 3673}
3579 3674
3580sub write_runtime_sync { 3675sub write_runtime_sync {
3581 my $t0 = EV::time; 3676 my $t0 = AE::time;
3582 3677
3583 # first touch the runtime file to show we are still running: 3678 # first touch the runtime file to show we are still running:
3584 # the fsync below can take a very very long time. 3679 # the fsync below can take a very very long time.
3585 3680
3586 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3681 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
… …
3608 or return; 3703 or return;
3609 3704
3610 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3705 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3611 and return; 3706 and return;
3612 3707
3613 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 3708 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3614 3709
3615 1 3710 1
3616} 3711}
3617 3712
3618our $uuid_lock; 3713our $uuid_lock;
… …
3630 or return; 3725 or return;
3631 3726
3632 my $value = uuid_seq uuid_cur; 3727 my $value = uuid_seq uuid_cur;
3633 3728
3634 unless ($value) { 3729 unless ($value) {
3635 warn "cowardly refusing to write zero uuid value!\n"; 3730 info "cowardly refusing to write zero uuid value!\n";
3636 return; 3731 return;
3637 } 3732 }
3638 3733
3639 my $value = uuid_str $value + $uuid_skip; 3734 my $value = uuid_str $value + $uuid_skip;
3640 $uuid_skip = 0; 3735 $uuid_skip = 0;
… …
3650 or return; 3745 or return;
3651 3746
3652 aio_rename "$uuid~", $uuid 3747 aio_rename "$uuid~", $uuid
3653 and return; 3748 and return;
3654 3749
3655 warn "uuid file written ($value).\n"; 3750 trace "uuid file written ($value).\n";
3656 3751
3657 1 3752 1
3658 3753
3659} 3754}
3660 3755
… …
3666} 3761}
3667 3762
3668sub emergency_save() { 3763sub emergency_save() {
3669 my $freeze_guard = cf::freeze_mainloop; 3764 my $freeze_guard = cf::freeze_mainloop;
3670 3765
3671 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;
3672 3772
3673 cf::sync_job { 3773 cf::sync_job {
3674 # this is a trade-off: we want to be very quick here, so 3774 cf::write_runtime_sync; # external watchdog should not bark
3675 # save all maps without fsync, and later call a global sync
3676 # (which in turn might be very very slow)
3677 local $USE_FSYNC = 0;
3678 3775
3679 # use a peculiar iteration method to avoid tripping on perl 3776 # use a peculiar iteration method to avoid tripping on perl
3680 # refcount bugs in for. also avoids problems with players 3777 # refcount bugs in for. also avoids problems with players
3681 # and maps saved/destroyed asynchronously. 3778 # and maps saved/destroyed asynchronously.
3682 warn "emergency_perl_save: begin player save\n"; 3779 info "emergency_perl_save: begin player save\n";
3683 for my $login (keys %cf::PLAYER) { 3780 for my $login (keys %cf::PLAYER) {
3684 my $pl = $cf::PLAYER{$login} or next; 3781 my $pl = $cf::PLAYER{$login} or next;
3685 $pl->valid or next; 3782 $pl->valid or next;
3686 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3783 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3687 $pl->save; 3784 $pl->save;
3688 } 3785 }
3689 warn "emergency_perl_save: end player save\n"; 3786 info "emergency_perl_save: end player save\n";
3690 3787
3788 cf::write_runtime_sync; # external watchdog should not bark
3789
3691 warn "emergency_perl_save: begin map save\n"; 3790 info "emergency_perl_save: begin map save\n";
3692 for my $path (keys %cf::MAP) { 3791 for my $path (keys %cf::MAP) {
3693 my $map = $cf::MAP{$path} or next; 3792 my $map = $cf::MAP{$path} or next;
3694 $map->valid or next; 3793 $map->valid or next;
3695 $map->save; 3794 $map->save;
3696 } 3795 }
3697 warn "emergency_perl_save: end map save\n"; 3796 info "emergency_perl_save: end map save\n";
3698 3797
3798 cf::write_runtime_sync; # external watchdog should not bark
3799
3699 warn "emergency_perl_save: begin database checkpoint\n"; 3800 info "emergency_perl_save: begin database checkpoint\n";
3700 BDB::db_env_txn_checkpoint $DB_ENV; 3801 BDB::db_env_txn_checkpoint $DB_ENV;
3701 warn "emergency_perl_save: end database checkpoint\n"; 3802 info "emergency_perl_save: end database checkpoint\n";
3702 3803
3703 warn "emergency_perl_save: begin write uuid\n"; 3804 info "emergency_perl_save: begin write uuid\n";
3704 write_uuid_sync 1; 3805 write_uuid_sync 1;
3705 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
3706 }; 3826 };
3707 3827
3708 warn "emergency_perl_save: starting sync()\n";
3709 IO::AIO::aio_sync sub {
3710 warn "emergency_perl_save: finished sync()\n";
3711 };
3712
3713 warn "emergency_perl_save: leave\n"; 3828 info "emergency_perl_save: leave\n";
3714} 3829}
3715 3830
3716sub post_cleanup { 3831sub post_cleanup {
3717 my ($make_core) = @_; 3832 my ($make_core) = @_;
3718 3833
3834 IO::AIO::flush;
3835
3719 warn Carp::longmess "post_cleanup backtrace" 3836 error Carp::longmess "post_cleanup backtrace"
3720 if $make_core; 3837 if $make_core;
3721 3838
3722 my $fh = pidfile; 3839 my $fh = pidfile;
3723 unlink $PIDFILE if <$fh> == $$; 3840 unlink $PIDFILE if <$fh> == $$;
3724} 3841}
… …
3744 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3861 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3745 for my $name (keys %$leaf_symtab) { 3862 for my $name (keys %$leaf_symtab) {
3746 _gv_clear *{"$pkg$name"}; 3863 _gv_clear *{"$pkg$name"};
3747# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3864# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3748 } 3865 }
3749 warn "cleared package $pkg\n";#d#
3750} 3866}
3751 3867
3752sub do_reload_perl() { 3868sub do_reload_perl() {
3753 # can/must only be called in main 3869 # can/must only be called in main
3754 if ($Coro::current != $Coro::main) { 3870 unless (in_main) {
3755 warn "can only reload from main coroutine"; 3871 error "can only reload from main coroutine";
3756 return; 3872 return;
3757 } 3873 }
3758 3874
3759 return if $RELOAD++; 3875 return if $RELOAD++;
3760 3876
3761 my $t1 = EV::time; 3877 my $t1 = AE::time;
3762 3878
3763 while ($RELOAD) { 3879 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl";
3764 warn "reloading..."; 3881 info "reloading...";
3765 3882
3766 warn "entering sync_job"; 3883 trace "entering sync_job";
3767 3884
3768 cf::sync_job { 3885 cf::sync_job {
3769 cf::write_runtime_sync; # external watchdog should not bark
3770 cf::emergency_save; 3886 #cf::emergency_save;
3771 cf::write_runtime_sync; # external watchdog should not bark
3772 3887
3773 warn "syncing database to disk";
3774 BDB::db_env_txn_checkpoint $DB_ENV;
3775
3776 # if anything goes wrong in here, we should simply crash as we already saved
3777
3778 warn "flushing outstanding aio requests";
3779 while (IO::AIO::nreqs || BDB::nreqs) {
3780 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3781 }
3782
3783 warn "cancelling all extension coros"; 3888 trace "cancelling all extension coros";
3784 $_->cancel for values %EXT_CORO; 3889 $_->cancel for values %EXT_CORO;
3785 %EXT_CORO = (); 3890 %EXT_CORO = ();
3786 3891
3787 warn "removing commands"; 3892 trace "removing commands";
3788 %COMMAND = (); 3893 %COMMAND = ();
3789 3894
3790 warn "removing ext/exti commands"; 3895 trace "removing ext/exti commands";
3791 %EXTCMD = (); 3896 %EXTCMD = ();
3792 %EXTICMD = (); 3897 %EXTICMD = ();
3793 3898
3794 warn "unloading/nuking all extensions"; 3899 trace "unloading/nuking all extensions";
3795 for my $pkg (@EXTS) { 3900 for my $pkg (@EXTS) {
3796 warn "... unloading $pkg"; 3901 trace "... unloading $pkg";
3797 3902
3798 if (my $cb = $pkg->can ("unload")) { 3903 if (my $cb = $pkg->can ("unload")) {
3799 eval { 3904 eval {
3800 $cb->($pkg); 3905 $cb->($pkg);
3801 1 3906 1
3802 } or warn "$pkg unloaded, but with errors: $@"; 3907 } or error "$pkg unloaded, but with errors: $@";
3803 } 3908 }
3804 3909
3805 warn "... clearing $pkg"; 3910 trace "... clearing $pkg";
3806 clear_package $pkg; 3911 clear_package $pkg;
3807 } 3912 }
3808 3913
3809 warn "unloading all perl modules loaded from $LIBDIR"; 3914 trace "unloading all perl modules loaded from $LIBDIR";
3810 while (my ($k, $v) = each %INC) { 3915 while (my ($k, $v) = each %INC) {
3811 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3916 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3812 3917
3813 warn "... unloading $k"; 3918 trace "... unloading $k";
3814 delete $INC{$k}; 3919 delete $INC{$k};
3815 3920
3816 $k =~ s/\.pm$//; 3921 $k =~ s/\.pm$//;
3817 $k =~ s/\//::/g; 3922 $k =~ s/\//::/g;
3818 3923
… …
3821 } 3926 }
3822 3927
3823 clear_package $k; 3928 clear_package $k;
3824 } 3929 }
3825 3930
3826 warn "getting rid of safe::, as good as possible"; 3931 trace "getting rid of safe::, as good as possible";
3827 clear_package "safe::$_" 3932 clear_package "safe::$_"
3828 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);
3829 3934
3830 warn "unloading cf.pm \"a bit\""; 3935 trace "unloading cf.pm \"a bit\"";
3831 delete $INC{"cf.pm"}; 3936 delete $INC{"cf.pm"};
3832 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3937 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3833 3938
3834 # don't, removes xs symbols, too, 3939 # don't, removes xs symbols, too,
3835 # and global variables created in xs 3940 # and global variables created in xs
3836 #clear_package __PACKAGE__; 3941 #clear_package __PACKAGE__;
3837 3942
3838 warn "unload completed, starting to reload now"; 3943 info "unload completed, starting to reload now";
3839 3944
3840 warn "reloading cf.pm"; 3945 trace "reloading cf.pm";
3841 require cf; 3946 require cf;
3842 cf::_connect_to_perl_1; 3947 cf::_connect_to_perl_1;
3843 3948
3844 warn "loading config and database again"; 3949 trace "loading config and database again";
3845 cf::reload_config; 3950 cf::reload_config;
3846 3951
3847 warn "loading extensions"; 3952 trace "loading extensions";
3848 cf::load_extensions; 3953 cf::load_extensions;
3849 3954
3850 if ($REATTACH_ON_RELOAD) { 3955 if ($REATTACH_ON_RELOAD) {
3851 warn "reattaching attachments to objects/players"; 3956 trace "reattaching attachments to objects/players";
3852 _global_reattach; # objects, sockets 3957 _global_reattach; # objects, sockets
3853 warn "reattaching attachments to maps"; 3958 trace "reattaching attachments to maps";
3854 reattach $_ for values %MAP; 3959 reattach $_ for values %MAP;
3855 warn "reattaching attachments to players"; 3960 trace "reattaching attachments to players";
3856 reattach $_ for values %PLAYER; 3961 reattach $_ for values %PLAYER;
3857 } 3962 }
3858 3963
3859 warn "running post_init jobs"; 3964 trace "running post_init jobs";
3860 (pop @POST_INIT)->(1) while @POST_INIT; 3965 (pop @POST_INIT)->(1) while @POST_INIT;
3861 3966
3862 warn "leaving sync_job"; 3967 trace "leaving sync_job";
3863 3968
3864 1 3969 1
3865 } or do { 3970 } or do {
3866 warn $@; 3971 error $@;
3867 cf::cleanup "error while reloading, exiting."; 3972 cf::cleanup "error while reloading, exiting.";
3868 }; 3973 };
3869 3974
3870 warn "reloaded"; 3975 info "reloaded";
3871 --$RELOAD; 3976 --$RELOAD;
3872 } 3977 }
3873 3978
3874 $t1 = EV::time - $t1; 3979 $t1 = AE::time - $t1;
3875 warn "reload completed in ${t1}s\n"; 3980 info "reload completed in ${t1}s\n";
3876}; 3981};
3877 3982
3878our $RELOAD_WATCHER; # used only during reload 3983our $RELOAD_WATCHER; # used only during reload
3879 3984
3880sub reload_perl() { 3985sub reload_perl() {
… …
3882 # coro crashes during coro_state_free->destroy here. 3987 # coro crashes during coro_state_free->destroy here.
3883 3988
3884 $RELOAD_WATCHER ||= cf::async { 3989 $RELOAD_WATCHER ||= cf::async {
3885 Coro::AIO::aio_wait cache_extensions; 3990 Coro::AIO::aio_wait cache_extensions;
3886 3991
3887 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3992 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3888 do_reload_perl; 3993 do_reload_perl;
3889 undef $RELOAD_WATCHER; 3994 undef $RELOAD_WATCHER;
3890 }; 3995 };
3891 }; 3996 };
3892} 3997}
… …
3901 reload_perl; 4006 reload_perl;
3902 }; 4007 };
3903 } 4008 }
3904}; 4009};
3905 4010
3906unshift @INC, $LIBDIR; 4011#############################################################################
3907 4012
3908my $bug_warning = 0; 4013my $bug_warning = 0;
3909 4014
3910our @WAIT_FOR_TICK; 4015our @WAIT_FOR_TICK;
3911our @WAIT_FOR_TICK_BEGIN; 4016our @WAIT_FOR_TICK_BEGIN;
3912 4017
3913sub wait_for_tick { 4018sub wait_for_tick() {
3914 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4019 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3915 4020
3916 my $signal = new Coro::Signal; 4021 my $signal = new Coro::Signal;
3917 push @WAIT_FOR_TICK, $signal; 4022 push @WAIT_FOR_TICK, $signal;
3918 $signal->wait; 4023 $signal->wait;
3919} 4024}
3920 4025
3921sub wait_for_tick_begin { 4026sub wait_for_tick_begin() {
3922 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4027 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3923 4028
3924 my $signal = new Coro::Signal; 4029 my $signal = new Coro::Signal;
3925 push @WAIT_FOR_TICK_BEGIN, $signal; 4030 push @WAIT_FOR_TICK_BEGIN, $signal;
3926 $signal->wait; 4031 $signal->wait;
… …
3933 return; 4038 return;
3934 } 4039 }
3935 4040
3936 cf::server_tick; # one server iteration 4041 cf::server_tick; # one server iteration
3937 4042
3938 #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#
3939 4044
3940 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4045 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3941 $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.;
3942 Coro::async_pool { 4047 Coro::async_pool {
3943 $Coro::current->{desc} = "runtime saver"; 4048 $Coro::current->{desc} = "runtime saver";
3944 write_runtime_sync 4049 write_runtime_sync
3945 or warn "ERROR: unable to write runtime file: $!"; 4050 or error "ERROR: unable to write runtime file: $!";
3946 }; 4051 };
3947 } 4052 }
3948 4053
3949 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3950 $sig->send; 4055 $sig->send;
… …
3958 4063
3959 if (0) { 4064 if (0) {
3960 if ($NEXT_TICK) { 4065 if ($NEXT_TICK) {
3961 my $jitter = $TICK_START - $NEXT_TICK; 4066 my $jitter = $TICK_START - $NEXT_TICK;
3962 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4067 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3963 warn "jitter $JITTER\n";#d# 4068 debug "jitter $JITTER\n";#d#
3964 } 4069 }
3965 } 4070 }
3966} 4071}
3967 4072
3968{ 4073{

Diff Legend

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