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

Diff Legend

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