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.504 by root, Sat Jan 30 23:50:16 2010 UTC vs.
Revision 1.544 by root, Thu May 6 21:58:07 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;
1402 } 1434 }
1403 1435
1436 my $pass = 0;
1404 my %done; 1437 my %done;
1405 while (%todo) { 1438 while (%todo) {
1406 my $progress; 1439 my $progress;
1407 1440
1441 ++$pass;
1442
1443 ext:
1408 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1409 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1410 goto skip 1446 next ext
1411 unless exists $done{$_}; 1447 unless exists $done{$_};
1412 } 1448 }
1413 1449
1414 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1415 1451
1416 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1417 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1418 : "$v->{base}: extension inactive.\n";
1419 1456
1420 if (exists $v->{meta}{mandatory}) {
1421 warn $msg;
1422 cf::cleanup "mandatory extension failed to load, exiting."; 1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1423 } 1458 if exists $v->{meta}{mandatory};
1424 1459
1425 warn $msg; 1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1461 delete $todo{$k};
1462 } else {
1463 $done{$k} = delete $todo{$k};
1464 push @EXTS, $v->{pkg};
1465 $progress = 1;
1466
1467 info "$v->{base}: extension inactive.\n"
1468 unless $active;
1426 } 1469 }
1427
1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431 } 1470 }
1432 1471
1433 skip: 1472 unless ($progress) {
1434 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1473 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1435 unless $progress; 1474
1475 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory};
1478 }
1479 }
1436 } 1480 }
1437 }; 1481 };
1438} 1482}
1439 1483
1440############################################################################# 1484#############################################################################
… …
1524 $cf::PLAYER{$login} = $pl 1568 $cf::PLAYER{$login} = $pl
1525 } 1569 }
1526 } 1570 }
1527} 1571}
1528 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
1529sub save($) { 1586sub save($) {
1530 my ($pl) = @_; 1587 my ($pl) = @_;
1531 1588
1532 return if $pl->{deny_save}; 1589 return if $pl->{deny_save};
1533 1590
… …
1538 1595
1539 aio_mkdir playerdir $pl, 0770; 1596 aio_mkdir playerdir $pl, 0770;
1540 $pl->{last_save} = $cf::RUNTIME; 1597 $pl->{last_save} = $cf::RUNTIME;
1541 1598
1542 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];
1543 1603
1544 $pl->save_pl ($path); 1604 $pl->save_pl ($path);
1545 cf::cede_to_tick; 1605 cf::cede_to_tick;
1546} 1606}
1547 1607
… …
1584 $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
1585 1645
1586 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1587 $pl->deactivate; 1647 $pl->deactivate;
1588 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;
1589 $pl->ob->check_score;
1590 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1591 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1592 1651
1593 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1594 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1649 \@logins 1708 \@logins
1650} 1709}
1651 1710
1652=item $player->maps 1711=item $player->maps
1653 1712
1713=item cf::player::maps $login
1714
1654Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1655player. May block. 1716player. May block.
1656 1717
1657=cut 1718=cut
1658 1719
… …
1720=cut 1781=cut
1721 1782
1722sub find_by_path($) { 1783sub find_by_path($) {
1723 my ($path) = @_; 1784 my ($path) = @_;
1724 1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1787
1725 my ($match, $specificity); 1788 my ($match, $specificity);
1726 1789
1727 for my $region (list) { 1790 for my $region (list) {
1728 if ($region->{match} && $path =~ $region->{match}) { 1791 if ($region->{match} && $path =~ $region->{match}) {
1729 ($match, $specificity) = ($region, $region->specificity) 1792 ($match, $specificity) = ($region, $region->specificity)
… …
1760 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
1761 1824
1762 # mit "rum" bekleckern, nicht 1825 # mit "rum" bekleckern, nicht
1763 $self->_create_random_map ( 1826 $self->_create_random_map (
1764 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1765 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1766 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1767 $rmp->{exit_on_final_map}, 1830 $rmp->{exit_on_final_map},
1768 $rmp->{xsize}, $rmp->{ysize}, 1831 $rmp->{xsize}, $rmp->{ysize},
1769 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1770 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1785 1848
1786sub register { 1849sub register {
1787 my (undef, $regex, $prio) = @_; 1850 my (undef, $regex, $prio) = @_;
1788 my $pkg = caller; 1851 my $pkg = caller;
1789 1852
1790 no strict;
1791 push @{"$pkg\::ISA"}, __PACKAGE__; 1853 push @{"$pkg\::ISA"}, __PACKAGE__;
1792 1854
1793 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1855 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1794} 1856}
1795 1857
1796# also paths starting with '/' 1858# also paths starting with '/'
1797$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1859$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1798 1860
1799sub thawer_merge { 1861sub thawer_merge {
1800 my ($self, $merge) = @_; 1862 my ($self, $merge) = @_;
1801 1863
1802 # we have to keep some variables in memory intact 1864 # we have to keep some variables in memory intact
… …
1807} 1869}
1808 1870
1809sub normalise { 1871sub normalise {
1810 my ($path, $base) = @_; 1872 my ($path, $base) = @_;
1811 1873
1812 $path = "$path"; # make sure its a string 1874 $path = "$path"; # make sure it's a string
1813 1875
1814 $path =~ s/\.map$//; 1876 $path =~ s/\.map$//;
1815 1877
1816 # map plan: 1878 # map plan:
1817 # 1879 #
… …
1856 $self->init; # pass $1 etc. 1918 $self->init; # pass $1 etc.
1857 return $self; 1919 return $self;
1858 } 1920 }
1859 } 1921 }
1860 1922
1861 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1923 Carp::cluck "unable to resolve path '$path' (base '$base')";
1862 () 1924 ()
1863} 1925}
1864 1926
1865sub init { 1927sub init {
1866 my ($self) = @_; 1928 my ($self) = @_;
… …
1988} 2050}
1989 2051
1990sub find; 2052sub find;
1991sub find { 2053sub find {
1992 my ($path, $origin) = @_; 2054 my ($path, $origin) = @_;
2055
2056 cf::cede_to_tick;
1993 2057
1994 $path = normalise $path, $origin && $origin->path; 2058 $path = normalise $path, $origin && $origin->path;
1995 2059
1996 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2060 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997 my $guard2 = cf::lock_acquire "map_find:$path"; 2061 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2084 } 2148 }
2085 2149
2086 $self->post_load; 2150 $self->post_load;
2087} 2151}
2088 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
2089sub customise_for { 2156sub customise_for {
2090 my ($self, $ob) = @_; 2157 my ($self, $ob) = @_;
2091 2158
2092 return find "~" . $ob->name . "/" . $self->{path} 2159 return find "~" . $ob->name . "/" . $self->{path}
2093 if $self->per_player; 2160 if $self->per_player;
… …
2109 or next; 2176 or next;
2110 $neigh = find $neigh, $map 2177 $neigh = find $neigh, $map
2111 or next; 2178 or next;
2112 $neigh->load; 2179 $neigh->load;
2113 2180
2181 # now find the diagonal neighbours
2114 push @neigh, 2182 push @neigh,
2115 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2183 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2116 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2184 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2117 } 2185 }
2118 2186
… …
2125} 2193}
2126 2194
2127sub find_sync { 2195sub find_sync {
2128 my ($path, $origin) = @_; 2196 my ($path, $origin) = @_;
2129 2197
2130 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
2131} 2202}
2132 2203
2133sub do_load_sync { 2204sub do_load_sync {
2134 my ($map) = @_; 2205 my ($map) = @_;
2135 2206
2136 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2207 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2137 if $Coro::current == $Coro::main; 2208 if $Coro::current == $Coro::main;
2138 2209
2139 cf::sync_job { $map->load }; 2210 $map->load;
2140} 2211}
2141 2212
2142our %MAP_PREFETCH; 2213our %MAP_PREFETCH;
2143our $MAP_PREFETCHER = undef; 2214our $MAP_PREFETCHER = undef;
2144 2215
… …
2170 $MAP_PREFETCHER->prio (6); 2241 $MAP_PREFETCHER->prio (6);
2171 2242
2172 () 2243 ()
2173} 2244}
2174 2245
2246# common code, used by both ->save and ->swapout
2175sub save { 2247sub _save {
2176 my ($self) = @_; 2248 my ($self) = @_;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2249
2180 $self->{last_save} = $cf::RUNTIME; 2250 $self->{last_save} = $cf::RUNTIME;
2181 2251
2182 return unless $self->dirty; 2252 return unless $self->dirty;
2183 2253
… …
2203 } else { 2273 } else {
2204 $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);
2205 } 2275 }
2206} 2276}
2207 2277
2278sub save {
2279 my ($self) = @_;
2280
2281 my $lock = cf::lock_acquire "map_data:$self->{path}";
2282
2283 $self->_save;
2284}
2285
2208sub swap_out { 2286sub swap_out {
2209 my ($self) = @_; 2287 my ($self) = @_;
2210 2288
2211 # save first because save cedes
2212 $self->save;
2213
2214 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2289 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215 2290
2216 return if $self->players;
2217 return if $self->in_memory != cf::MAP_ACTIVE; 2291 return if $self->in_memory != cf::MAP_ACTIVE;
2218 return if $self->{deny_save}; 2292 return if $self->{deny_save};
2293 return if $self->players;
2219 2294
2295 # first deactivate the map and "unlink" it from the core
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
2220 $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};
2221 2345
2222 $self->deactivate; 2346 $self->deactivate;
2223 $_->clear_links_to ($self) for values %cf::MAP; 2347 $_->clear_links_to ($self) for values %cf::MAP;
2224 $self->clear; 2348 $self->clear;
2225}
2226
2227sub reset_at {
2228 my ($self) = @_;
2229
2230 # TODO: safety, remove and allow resettable per-player maps
2231 return 1e99 if $self->{deny_reset};
2232
2233 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2234 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2235
2236 $time + $to
2237}
2238
2239sub should_reset {
2240 my ($self) = @_;
2241
2242 $self->reset_at <= $cf::RUNTIME
2243}
2244
2245sub reset {
2246 my ($self) = @_;
2247
2248 my $lock = cf::lock_acquire "map_data:$self->{path}";
2249
2250 return if $self->players;
2251
2252 warn "resetting map ", $self->path, "\n";
2253
2254 $self->in_memory (cf::MAP_SWAPPED);
2255
2256 # need to save uniques path
2257 unless ($self->{deny_save}) {
2258 my $uniq = $self->uniq_path; utf8::encode $uniq;
2259
2260 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2261 if $uniq;
2262 }
2263
2264 delete $cf::MAP{$self->path};
2265
2266 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP;
2268 $self->clear;
2269 2349
2270 $self->unlink_save; 2350 $self->unlink_save;
2271 $self->destroy; 2351 $self->destroy;
2272} 2352}
2273 2353
… …
2281 2361
2282 delete $cf::MAP{$self->path}; 2362 delete $cf::MAP{$self->path};
2283 2363
2284 $self->unlink_save; 2364 $self->unlink_save;
2285 2365
2286 bless $self, "cf::map"; 2366 bless $self, "cf::map::wrap";
2287 delete $self->{deny_reset}; 2367 delete $self->{deny_reset};
2288 $self->{deny_save} = 1; 2368 $self->{deny_save} = 1;
2289 $self->reset_timeout (1); 2369 $self->reset_timeout (1);
2290 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2370 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2291 2371
… …
2521 2601
2522Freezes 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}>).
2523 2603
2524The 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.
2525for 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,
2526though, 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
2527map. 2607map.
2528 2608
2529Will never block. 2609Will never block.
2530 2610
2531=item $player_object->leave_link ($map, $x, $y) 2611=item $player_object->leave_link ($map, $x, $y)
… …
2552sub cf::object::player::enter_link { 2632sub cf::object::player::enter_link {
2553 my ($self) = @_; 2633 my ($self) = @_;
2554 2634
2555 $self->deactivate_recursive; 2635 $self->deactivate_recursive;
2556 2636
2637 ++$self->{_link_recursion};
2638
2557 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2639 return if UNIVERSAL::isa $self->map, "ext::map_link";
2558 2640
2559 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2641 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2560 if $self->map && $self->map->{path} ne "{link}"; 2642 if $self->map && $self->map->{path} ne "{link}";
2561 2643
2562 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2644 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2563} 2645}
2564 2646
2565sub cf::object::player::leave_link { 2647sub cf::object::player::leave_link {
2566 my ($self, $map, $x, $y) = @_; 2648 my ($self, $map, $x, $y) = @_;
2567 2649
… …
2592 $map->load_neighbours; 2674 $map->load_neighbours;
2593 2675
2594 return unless $self->contr->active; 2676 return unless $self->contr->active;
2595 2677
2596 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2678 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2597 $self->enter_map ($map, $x, $y); 2679 if ($self->enter_map ($map, $x, $y)) {
2598 2680 # entering was successful
2681 delete $self->{_link_recursion};
2599 # only activate afterwards, to support waiting in hooks 2682 # only activate afterwards, to support waiting in hooks
2600 $self->activate_recursive; 2683 $self->activate_recursive;
2601} 2684 }
2602 2685
2686}
2687
2603=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)]])
2604 2689
2605Moves 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
2606her, loading and preparing them map, calling the provided $check callback 2691her, loading and preparing them map, calling the provided $check callback
2607that 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
2608the 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
… …
2615 2700
2616our $GOTOGEN; 2701our $GOTOGEN;
2617 2702
2618sub cf::object::player::goto { 2703sub cf::object::player::goto {
2619 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 }
2620 2711
2621 # 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
2622 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2713 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2623 2714
2624 $self->enter_link; 2715 $self->enter_link;
… …
2648 my $map = eval { 2739 my $map = eval {
2649 my $map = defined $path ? cf::map::find $path : undef; 2740 my $map = defined $path ? cf::map::find $path : undef;
2650 2741
2651 if ($map) { 2742 if ($map) {
2652 $map = $map->customise_for ($self); 2743 $map = $map->customise_for ($self);
2653 $map = $check->($map) if $check && $map; 2744 $map = $check->($map, $x, $y, $self) if $check && $map;
2654 } else { 2745 } else {
2655 $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);
2656 } 2747 }
2657 2748
2658 $map 2749 $map
… …
2666 if ($gen == $self->{_goto_generation}) { 2757 if ($gen == $self->{_goto_generation}) {
2667 delete $self->{_goto_generation}; 2758 delete $self->{_goto_generation};
2668 $self->leave_link ($map, $x, $y); 2759 $self->leave_link ($map, $x, $y);
2669 } 2760 }
2670 2761
2671 $done->() if $done; 2762 $done->($self) if $done;
2672 })->prio (1); 2763 })->prio (1);
2673} 2764}
2674 2765
2675=item $player_object->enter_exit ($exit_object) 2766=item $player_object->enter_exit ($exit_object)
2676 2767
… …
2769 $self->message ("Something went wrong deep within the deliantra server. " 2860 $self->message ("Something went wrong deep within the deliantra server. "
2770 . "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. "
2771 . "Please report this to the dungeon master!", 2862 . "Please report this to the dungeon master!",
2772 cf::NDI_UNIQUE | cf::NDI_RED); 2863 cf::NDI_UNIQUE | cf::NDI_RED);
2773 2864
2774 warn "ERROR in enter_exit: $@"; 2865 error "ERROR in enter_exit: $@";
2775 $self->leave_link; 2866 $self->leave_link;
2776 } 2867 }
2777 })->prio (1); 2868 })->prio (1);
2778} 2869}
2779 2870
… …
3092 3183
3093 $ns->ext_reply ($reply, @reply) 3184 $ns->ext_reply ($reply, @reply)
3094 if $reply; 3185 if $reply;
3095 3186
3096 } else { 3187 } else {
3097 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";
3098 } 3189 }
3099 3190
3100 cf::override; 3191 cf::override;
3101 }, 3192 },
3102); 3193);
… …
3122 3213
3123 $coro 3214 $coro
3124} 3215}
3125 3216
3126cf::client->attach ( 3217cf::client->attach (
3127 on_destroy => sub { 3218 on_client_destroy => sub {
3128 my ($ns) = @_; 3219 my ($ns) = @_;
3129 3220
3130 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3221 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3131 }, 3222 },
3132); 3223);
… …
3183 decrease split destroy change_exp value msg lore send_msg)], 3274 decrease split destroy change_exp value msg lore send_msg)],
3184 ["cf::object::player" => qw(player)], 3275 ["cf::object::player" => qw(player)],
3185 ["cf::player" => qw(peaceful send_msg)], 3276 ["cf::player" => qw(peaceful send_msg)],
3186 ["cf::map" => qw(trigger)], 3277 ["cf::map" => qw(trigger)],
3187) { 3278) {
3188 no strict 'refs';
3189 my ($pkg, @funs) = @$_; 3279 my ($pkg, @funs) = @$_;
3190 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3280 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3191 for @funs; 3281 for @funs;
3192} 3282}
3193 3283
… …
3232 local @cf::_safe_eval_args = values %vars; 3322 local @cf::_safe_eval_args = values %vars;
3233 @res = wantarray ? eval eval : scalar eval $eval; 3323 @res = wantarray ? eval eval : scalar eval $eval;
3234 } 3324 }
3235 3325
3236 if ($@) { 3326 if ($@) {
3237 warn "$@"; 3327 warn "$@",
3238 warn "while executing safe code '$code'\n"; 3328 "while executing safe code '$code'\n",
3239 warn "with arguments " . (join " ", %vars) . "\n"; 3329 "with arguments " . (join " ", %vars) . "\n";
3240 } 3330 }
3241 3331
3242 wantarray ? @res : $res[0] 3332 wantarray ? @res : $res[0]
3243} 3333}
3244 3334
… …
3278 # for this (global event?) 3368 # for this (global event?)
3279 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3280 3370
3281 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3371 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3282 3372
3283 warn "loading facedata from $path\n"; 3373 trace "loading facedata from $path\n";
3284 3374
3285 my $facedata; 3375 my $facedata;
3286 0 < aio_load $path, $facedata 3376 0 < aio_load $path, $facedata
3287 or die "$path: $!"; 3377 or die "$path: $!";
3288 3378
… …
3322 3412
3323 if (my $smooth = cf::face::find $info->{smooth}) { 3413 if (my $smooth = cf::face::find $info->{smooth}) {
3324 cf::face::set_smooth $idx, $smooth; 3414 cf::face::set_smooth $idx, $smooth;
3325 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3415 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3326 } else { 3416 } else {
3327 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3417 error "smooth face '$info->{smooth}' not found for face '$face'";
3328 } 3418 }
3329 3419
3330 cf::cede_to_tick; 3420 cf::cede_to_tick;
3331 } 3421 }
3332 } 3422 }
… …
3350 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3440 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3351 3441
3352 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3353 cf::face::set_type $idx, $info->{type}; 3443 cf::face::set_type $idx, $info->{type};
3354 } else { 3444 } else {
3355 $RESOURCE{$name} = $info; 3445 $RESOURCE{$name} = $info; # unused
3356 } 3446 }
3357 3447
3358 cf::cede_to_tick; 3448 cf::cede_to_tick;
3359 } 3449 }
3360 } 3450 }
3361 3451
3362 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3452 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3363 3453
3364 1 3454 1
3365} 3455}
3366
3367cf::global->attach (on_resource_update => sub {
3368 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3369 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3370
3371 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3372 my $sound = $soundconf->{compat}[$_]
3373 or next;
3374
3375 my $face = cf::face::find "sound/$sound->[1]";
3376 cf::sound::set $sound->[0] => $face;
3377 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3378 }
3379
3380 while (my ($k, $v) = each %{$soundconf->{event}}) {
3381 my $face = cf::face::find "sound/$v";
3382 cf::sound::set $k => $face;
3383 }
3384 }
3385});
3386 3456
3387register_exticmd fx_want => sub { 3457register_exticmd fx_want => sub {
3388 my ($ns, $want) = @_; 3458 my ($ns, $want) = @_;
3389 3459
3390 while (my ($k, $v) = each %$want) { 3460 while (my ($k, $v) = each %$want) {
… …
3429sub reload_treasures { 3499sub reload_treasures {
3430 load_resource_file "$DATADIR/treasures" 3500 load_resource_file "$DATADIR/treasures"
3431 or die "unable to load treasurelists\n"; 3501 or die "unable to load treasurelists\n";
3432} 3502}
3433 3503
3504sub reload_exp {
3505 cf::init_experience;
3506}
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
3434sub reload_resources { 3531sub reload_resources {
3435 warn "reloading resource files...\n"; 3532 trace "reloading resource files...\n";
3436 3533
3534 reload_exp;
3437 reload_facedata; 3535 reload_facedata;
3536 reload_sound;
3438 reload_archetypes; 3537 reload_archetypes;
3439 reload_regions; 3538 reload_regions;
3440 reload_treasures; 3539 reload_treasures;
3441 3540
3442 warn "finished reloading resource files\n"; 3541 trace "finished reloading resource files\n";
3443} 3542}
3444 3543
3445sub reload_config { 3544sub reload_config {
3446 warn "reloading config file...\n"; 3545 trace "reloading config file...\n";
3447 3546
3448 open my $fh, "<:utf8", "$CONFDIR/config" 3547 open my $fh, "<:utf8", "$CONFDIR/config"
3449 or return; 3548 or return;
3450 3549
3451 local $/; 3550 local $/;
3452 *CFG = YAML::XS::Load scalar <$fh>; 3551 *CFG = YAML::XS::Load scalar <$fh>;
3453 3552
3454 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3553 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3455 3554
3456 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3555 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3457 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3556 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3458 3557
3459 if (exists $CFG{mlockall}) { 3558 if (exists $CFG{mlockall}) {
… …
3462 and die "WARNING: m(un)lockall failed: $!\n"; 3561 and die "WARNING: m(un)lockall failed: $!\n";
3463 }; 3562 };
3464 warn $@ if $@; 3563 warn $@ if $@;
3465 } 3564 }
3466 3565
3467 warn "finished reloading resource files\n"; 3566 trace "finished reloading resource files\n";
3468} 3567}
3469 3568
3470sub pidfile() { 3569sub pidfile() {
3471 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3570 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3472 or die "$PIDFILE: $!"; 3571 or die "$PIDFILE: $!";
… …
3485 seek $fh, 0, 0; 3584 seek $fh, 0, 0;
3486 print $fh $$; 3585 print $fh $$;
3487} 3586}
3488 3587
3489sub main_loop { 3588sub main_loop {
3490 warn "EV::loop starting\n"; 3589 trace "EV::loop starting\n";
3491 if (1) { 3590 if (1) {
3492 EV::loop; 3591 EV::loop;
3493 } 3592 }
3494 warn "EV::loop returned\n"; 3593 trace "EV::loop returned\n";
3495 goto &main_loop unless $REALLY_UNLOOP; 3594 goto &main_loop unless $REALLY_UNLOOP;
3496} 3595}
3497 3596
3498sub main { 3597sub main {
3499 cf::init_globals; # initialise logging 3598 cf::init_globals; # initialise logging
3500 3599
3501 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3600 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3502 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3601 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3503 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3602 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3504 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3603 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3505
3506 cf::init_experience;
3507 cf::init_anim;
3508 cf::init_attackmess;
3509 cf::init_dynamic;
3510 3604
3511 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3605 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3512 3606
3513 # we must not ever block the main coroutine 3607 # we must not ever block the main coroutine
3514 local $Coro::idle = sub { 3608 local $Coro::idle = sub {
… …
3520 }; 3614 };
3521 3615
3522 evthread_start IO::AIO::poll_fileno; 3616 evthread_start IO::AIO::poll_fileno;
3523 3617
3524 cf::sync_job { 3618 cf::sync_job {
3619 cf::incloader::init ();
3620
3621 cf::init_anim;
3622 cf::init_attackmess;
3623 cf::init_dynamic;
3624
3525 cf::load_settings; 3625 cf::load_settings;
3526 cf::load_materials; 3626 cf::load_materials;
3527 3627
3528 reload_resources; 3628 reload_resources;
3529 reload_config; 3629 reload_config;
3530 db_init; 3630 db_init;
3531 3631
3532 cf::init_uuid; 3632 cf::init_uuid;
3533 cf::init_signals; 3633 cf::init_signals;
3534 cf::init_commands;
3535 cf::init_skills; 3634 cf::init_skills;
3536 3635
3537 cf::init_beforeplay; 3636 cf::init_beforeplay;
3538 3637
3539 atomic; 3638 atomic;
… …
3547 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};
3548 3647
3549 (pop @POST_INIT)->(0) while @POST_INIT; 3648 (pop @POST_INIT)->(0) while @POST_INIT;
3550 }; 3649 };
3551 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
3552 main_loop; 3659 goto &main_loop;
3553} 3660}
3554 3661
3555############################################################################# 3662#############################################################################
3556# initialisation and cleanup 3663# initialisation and cleanup
3557 3664
3558# install some emergency cleanup handlers 3665# install some emergency cleanup handlers
3559BEGIN { 3666BEGIN {
3560 our %SIGWATCHER = (); 3667 our %SIGWATCHER = ();
3561 for my $signal (qw(INT HUP TERM)) { 3668 for my $signal (qw(INT HUP TERM)) {
3562 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3669 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3563 cf::cleanup "SIG$signal"; 3670 cf::cleanup "SIG$signal";
3564 }; 3671 };
3565 } 3672 }
3566} 3673}
3567 3674
3568sub write_runtime_sync { 3675sub write_runtime_sync {
3676 my $t0 = AE::time;
3677
3569 # first touch the runtime file to show we are still running: 3678 # first touch the runtime file to show we are still running:
3570 # the fsync below can take a very very long time. 3679 # the fsync below can take a very very long time.
3571 3680
3572 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3681 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3573 3682
3574 my $guard = cf::lock_acquire "write_runtime"; 3683 my $guard = cf::lock_acquire "write_runtime";
3575 3684
3576 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3685 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3577 or return; 3686 or return;
3578 3687
3579 my $value = $cf::RUNTIME + 90 + 10; 3688 my $value = $cf::RUNTIME + 90 + 10;
3580 # 10 is the runtime save interval, for a monotonic clock 3689 # 10 is the runtime save interval, for a monotonic clock
3581 # 60 allows for the watchdog to kill the server. 3690 # 60 allows for the watchdog to kill the server.
… …
3594 or return; 3703 or return;
3595 3704
3596 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3705 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3597 and return; 3706 and return;
3598 3707
3599 warn "runtime file written.\n"; 3708 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3600 3709
3601 1 3710 1
3602} 3711}
3603 3712
3604our $uuid_lock; 3713our $uuid_lock;
… …
3616 or return; 3725 or return;
3617 3726
3618 my $value = uuid_seq uuid_cur; 3727 my $value = uuid_seq uuid_cur;
3619 3728
3620 unless ($value) { 3729 unless ($value) {
3621 warn "cowardly refusing to write zero uuid value!\n"; 3730 info "cowardly refusing to write zero uuid value!\n";
3622 return; 3731 return;
3623 } 3732 }
3624 3733
3625 my $value = uuid_str $value + $uuid_skip; 3734 my $value = uuid_str $value + $uuid_skip;
3626 $uuid_skip = 0; 3735 $uuid_skip = 0;
… …
3636 or return; 3745 or return;
3637 3746
3638 aio_rename "$uuid~", $uuid 3747 aio_rename "$uuid~", $uuid
3639 and return; 3748 and return;
3640 3749
3641 warn "uuid file written ($value).\n"; 3750 trace "uuid file written ($value).\n";
3642 3751
3643 1 3752 1
3644 3753
3645} 3754}
3646 3755
… …
3652} 3761}
3653 3762
3654sub emergency_save() { 3763sub emergency_save() {
3655 my $freeze_guard = cf::freeze_mainloop; 3764 my $freeze_guard = cf::freeze_mainloop;
3656 3765
3657 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;
3658 3772
3659 cf::sync_job { 3773 cf::sync_job {
3660 # this is a trade-off: we want to be very quick here, so 3774 cf::write_runtime_sync; # external watchdog should not bark
3661 # save all maps without fsync, and later call a global sync
3662 # (which in turn might be very very slow)
3663 local $USE_FSYNC = 0;
3664 3775
3665 # use a peculiar iteration method to avoid tripping on perl 3776 # use a peculiar iteration method to avoid tripping on perl
3666 # refcount bugs in for. also avoids problems with players 3777 # refcount bugs in for. also avoids problems with players
3667 # and maps saved/destroyed asynchronously. 3778 # and maps saved/destroyed asynchronously.
3668 warn "emergency_perl_save: begin player save\n"; 3779 info "emergency_perl_save: begin player save\n";
3669 for my $login (keys %cf::PLAYER) { 3780 for my $login (keys %cf::PLAYER) {
3670 my $pl = $cf::PLAYER{$login} or next; 3781 my $pl = $cf::PLAYER{$login} or next;
3671 $pl->valid or next; 3782 $pl->valid or next;
3672 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3783 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3673 $pl->save; 3784 $pl->save;
3674 } 3785 }
3675 warn "emergency_perl_save: end player save\n"; 3786 info "emergency_perl_save: end player save\n";
3676 3787
3788 cf::write_runtime_sync; # external watchdog should not bark
3789
3677 warn "emergency_perl_save: begin map save\n"; 3790 info "emergency_perl_save: begin map save\n";
3678 for my $path (keys %cf::MAP) { 3791 for my $path (keys %cf::MAP) {
3679 my $map = $cf::MAP{$path} or next; 3792 my $map = $cf::MAP{$path} or next;
3680 $map->valid or next; 3793 $map->valid or next;
3681 $map->save; 3794 $map->save;
3682 } 3795 }
3683 warn "emergency_perl_save: end map save\n"; 3796 info "emergency_perl_save: end map save\n";
3684 3797
3798 cf::write_runtime_sync; # external watchdog should not bark
3799
3685 warn "emergency_perl_save: begin database checkpoint\n"; 3800 info "emergency_perl_save: begin database checkpoint\n";
3686 BDB::db_env_txn_checkpoint $DB_ENV; 3801 BDB::db_env_txn_checkpoint $DB_ENV;
3687 warn "emergency_perl_save: end database checkpoint\n"; 3802 info "emergency_perl_save: end database checkpoint\n";
3688 3803
3689 warn "emergency_perl_save: begin write uuid\n"; 3804 info "emergency_perl_save: begin write uuid\n";
3690 write_uuid_sync 1; 3805 write_uuid_sync 1;
3691 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
3692 }; 3826 };
3693 3827
3694 warn "emergency_perl_save: starting sync()\n";
3695 IO::AIO::aio_sync sub {
3696 warn "emergency_perl_save: finished sync()\n";
3697 };
3698
3699 warn "emergency_perl_save: leave\n"; 3828 info "emergency_perl_save: leave\n";
3700} 3829}
3701 3830
3702sub post_cleanup { 3831sub post_cleanup {
3703 my ($make_core) = @_; 3832 my ($make_core) = @_;
3704 3833
3834 IO::AIO::flush;
3835
3705 warn Carp::longmess "post_cleanup backtrace" 3836 error Carp::longmess "post_cleanup backtrace"
3706 if $make_core; 3837 if $make_core;
3707 3838
3708 my $fh = pidfile; 3839 my $fh = pidfile;
3709 unlink $PIDFILE if <$fh> == $$; 3840 unlink $PIDFILE if <$fh> == $$;
3710} 3841}
… …
3730 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3861 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3731 for my $name (keys %$leaf_symtab) { 3862 for my $name (keys %$leaf_symtab) {
3732 _gv_clear *{"$pkg$name"}; 3863 _gv_clear *{"$pkg$name"};
3733# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3864# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3734 } 3865 }
3735 warn "cleared package $pkg\n";#d#
3736} 3866}
3737 3867
3738sub do_reload_perl() { 3868sub do_reload_perl() {
3739 # can/must only be called in main 3869 # can/must only be called in main
3740 if ($Coro::current != $Coro::main) { 3870 unless (in_main) {
3741 warn "can only reload from main coroutine"; 3871 error "can only reload from main coroutine";
3742 return; 3872 return;
3743 } 3873 }
3744 3874
3745 return if $RELOAD++; 3875 return if $RELOAD++;
3746 3876
3747 my $t1 = EV::time; 3877 my $t1 = AE::time;
3748 3878
3749 while ($RELOAD) { 3879 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl";
3750 warn "reloading..."; 3881 info "reloading...";
3751 3882
3752 warn "entering sync_job"; 3883 trace "entering sync_job";
3753 3884
3754 cf::sync_job { 3885 cf::sync_job {
3755 cf::write_runtime_sync; # external watchdog should not bark
3756 cf::emergency_save; 3886 #cf::emergency_save;
3757 cf::write_runtime_sync; # external watchdog should not bark
3758 3887
3759 warn "syncing database to disk";
3760 BDB::db_env_txn_checkpoint $DB_ENV;
3761
3762 # if anything goes wrong in here, we should simply crash as we already saved
3763
3764 warn "flushing outstanding aio requests";
3765 while (IO::AIO::nreqs || BDB::nreqs) {
3766 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3767 }
3768
3769 warn "cancelling all extension coros"; 3888 trace "cancelling all extension coros";
3770 $_->cancel for values %EXT_CORO; 3889 $_->cancel for values %EXT_CORO;
3771 %EXT_CORO = (); 3890 %EXT_CORO = ();
3772 3891
3773 warn "removing commands"; 3892 trace "removing commands";
3774 %COMMAND = (); 3893 %COMMAND = ();
3775 3894
3776 warn "removing ext/exti commands"; 3895 trace "removing ext/exti commands";
3777 %EXTCMD = (); 3896 %EXTCMD = ();
3778 %EXTICMD = (); 3897 %EXTICMD = ();
3779 3898
3780 warn "unloading/nuking all extensions"; 3899 trace "unloading/nuking all extensions";
3781 for my $pkg (@EXTS) { 3900 for my $pkg (@EXTS) {
3782 warn "... unloading $pkg"; 3901 trace "... unloading $pkg";
3783 3902
3784 if (my $cb = $pkg->can ("unload")) { 3903 if (my $cb = $pkg->can ("unload")) {
3785 eval { 3904 eval {
3786 $cb->($pkg); 3905 $cb->($pkg);
3787 1 3906 1
3788 } or warn "$pkg unloaded, but with errors: $@"; 3907 } or error "$pkg unloaded, but with errors: $@";
3789 } 3908 }
3790 3909
3791 warn "... clearing $pkg"; 3910 trace "... clearing $pkg";
3792 clear_package $pkg; 3911 clear_package $pkg;
3793 } 3912 }
3794 3913
3795 warn "unloading all perl modules loaded from $LIBDIR"; 3914 trace "unloading all perl modules loaded from $LIBDIR";
3796 while (my ($k, $v) = each %INC) { 3915 while (my ($k, $v) = each %INC) {
3797 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3916 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3798 3917
3799 warn "... unloading $k"; 3918 trace "... unloading $k";
3800 delete $INC{$k}; 3919 delete $INC{$k};
3801 3920
3802 $k =~ s/\.pm$//; 3921 $k =~ s/\.pm$//;
3803 $k =~ s/\//::/g; 3922 $k =~ s/\//::/g;
3804 3923
… …
3807 } 3926 }
3808 3927
3809 clear_package $k; 3928 clear_package $k;
3810 } 3929 }
3811 3930
3812 warn "getting rid of safe::, as good as possible"; 3931 trace "getting rid of safe::, as good as possible";
3813 clear_package "safe::$_" 3932 clear_package "safe::$_"
3814 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);
3815 3934
3816 warn "unloading cf.pm \"a bit\""; 3935 trace "unloading cf.pm \"a bit\"";
3817 delete $INC{"cf.pm"}; 3936 delete $INC{"cf.pm"};
3818 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3937 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3819 3938
3820 # don't, removes xs symbols, too, 3939 # don't, removes xs symbols, too,
3821 # and global variables created in xs 3940 # and global variables created in xs
3822 #clear_package __PACKAGE__; 3941 #clear_package __PACKAGE__;
3823 3942
3824 warn "unload completed, starting to reload now"; 3943 info "unload completed, starting to reload now";
3825 3944
3826 warn "reloading cf.pm"; 3945 trace "reloading cf.pm";
3827 require cf; 3946 require cf;
3828 cf::_connect_to_perl_1; 3947 cf::_connect_to_perl_1;
3829 3948
3830 warn "loading config and database again"; 3949 trace "loading config and database again";
3831 cf::reload_config; 3950 cf::reload_config;
3832 3951
3833 warn "loading extensions"; 3952 trace "loading extensions";
3834 cf::load_extensions; 3953 cf::load_extensions;
3835 3954
3836 if ($REATTACH_ON_RELOAD) { 3955 if ($REATTACH_ON_RELOAD) {
3837 warn "reattaching attachments to objects/players"; 3956 trace "reattaching attachments to objects/players";
3838 _global_reattach; # objects, sockets 3957 _global_reattach; # objects, sockets
3839 warn "reattaching attachments to maps"; 3958 trace "reattaching attachments to maps";
3840 reattach $_ for values %MAP; 3959 reattach $_ for values %MAP;
3841 warn "reattaching attachments to players"; 3960 trace "reattaching attachments to players";
3842 reattach $_ for values %PLAYER; 3961 reattach $_ for values %PLAYER;
3843 } 3962 }
3844 3963
3845 warn "running post_init jobs"; 3964 trace "running post_init jobs";
3846 (pop @POST_INIT)->(1) while @POST_INIT; 3965 (pop @POST_INIT)->(1) while @POST_INIT;
3847 3966
3848 warn "leaving sync_job"; 3967 trace "leaving sync_job";
3849 3968
3850 1 3969 1
3851 } or do { 3970 } or do {
3852 warn $@; 3971 error $@;
3853 cf::cleanup "error while reloading, exiting."; 3972 cf::cleanup "error while reloading, exiting.";
3854 }; 3973 };
3855 3974
3856 warn "reloaded"; 3975 info "reloaded";
3857 --$RELOAD; 3976 --$RELOAD;
3858 } 3977 }
3859 3978
3860 $t1 = EV::time - $t1; 3979 $t1 = AE::time - $t1;
3861 warn "reload completed in ${t1}s\n"; 3980 info "reload completed in ${t1}s\n";
3862}; 3981};
3863 3982
3864our $RELOAD_WATCHER; # used only during reload 3983our $RELOAD_WATCHER; # used only during reload
3865 3984
3866sub reload_perl() { 3985sub reload_perl() {
… …
3868 # coro crashes during coro_state_free->destroy here. 3987 # coro crashes during coro_state_free->destroy here.
3869 3988
3870 $RELOAD_WATCHER ||= cf::async { 3989 $RELOAD_WATCHER ||= cf::async {
3871 Coro::AIO::aio_wait cache_extensions; 3990 Coro::AIO::aio_wait cache_extensions;
3872 3991
3873 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3992 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3874 do_reload_perl; 3993 do_reload_perl;
3875 undef $RELOAD_WATCHER; 3994 undef $RELOAD_WATCHER;
3876 }; 3995 };
3877 }; 3996 };
3878} 3997}
… …
3887 reload_perl; 4006 reload_perl;
3888 }; 4007 };
3889 } 4008 }
3890}; 4009};
3891 4010
3892unshift @INC, $LIBDIR; 4011#############################################################################
3893 4012
3894my $bug_warning = 0; 4013my $bug_warning = 0;
3895 4014
3896our @WAIT_FOR_TICK; 4015our @WAIT_FOR_TICK;
3897our @WAIT_FOR_TICK_BEGIN; 4016our @WAIT_FOR_TICK_BEGIN;
… …
3919 return; 4038 return;
3920 } 4039 }
3921 4040
3922 cf::server_tick; # one server iteration 4041 cf::server_tick; # one server iteration
3923 4042
3924 #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#
3925 4044
3926 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4045 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3927 $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.;
3928 Coro::async_pool { 4047 Coro::async_pool {
3929 $Coro::current->{desc} = "runtime saver"; 4048 $Coro::current->{desc} = "runtime saver";
3930 write_runtime_sync 4049 write_runtime_sync
3931 or warn "ERROR: unable to write runtime file: $!"; 4050 or error "ERROR: unable to write runtime file: $!";
3932 }; 4051 };
3933 } 4052 }
3934 4053
3935 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3936 $sig->send; 4055 $sig->send;
… …
3944 4063
3945 if (0) { 4064 if (0) {
3946 if ($NEXT_TICK) { 4065 if ($NEXT_TICK) {
3947 my $jitter = $TICK_START - $NEXT_TICK; 4066 my $jitter = $TICK_START - $NEXT_TICK;
3948 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4067 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3949 warn "jitter $JITTER\n";#d# 4068 debug "jitter $JITTER\n";#d#
3950 } 4069 }
3951 } 4070 }
3952} 4071}
3953 4072
3954{ 4073{

Diff Legend

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