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.533 by root, Thu Apr 29 07:59:17 2010 UTC

… …
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
… …
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) = @_;
… …
503 519
504sub sync_job(&) { 520sub sync_job(&) {
505 my ($job) = @_; 521 my ($job) = @_;
506 522
507 if ($Coro::current == $Coro::main) { 523 if ($Coro::current == $Coro::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#
… …
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
… …
728 755
729 my $t1 = Time::HiRes::time; 756 my $t1 = Time::HiRes::time;
730 my $data = $process->(\@data); 757 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time; 758 my $t2 = Time::HiRes::time;
732 759
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 760 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734 761
735 db_put cache => "$id/data", $data; 762 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5; 763 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta; 764 db_put cache => "$id/meta", $meta;
738 765
… …
748 775
749=cut 776=cut
750 777
751sub datalog($@) { 778sub datalog($@) {
752 my ($type, %kv) = @_; 779 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 780 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754} 781}
755 782
756=back 783=back
757 784
758=cut 785=cut
… …
953 980
954 } elsif (exists $cb_id{$type}) { 981 } elsif (exists $cb_id{$type}) {
955 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 982 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956 983
957 } elsif (ref $type) { 984 } elsif (ref $type) {
958 warn "attaching objects not supported, ignoring.\n"; 985 error "attaching objects not supported, ignoring.\n";
959 986
960 } else { 987 } else {
961 shift @arg; 988 shift @arg;
962 warn "attach argument '$type' not supported, ignoring.\n"; 989 error "attach argument '$type' not supported, ignoring.\n";
963 } 990 }
964 } 991 }
965} 992}
966 993
967sub _object_attach { 994sub _object_attach {
… …
977 _attach $registry, $klass, @attach; 1004 _attach $registry, $klass, @attach;
978 } 1005 }
979 1006
980 $obj->{$name} = \%arg; 1007 $obj->{$name} = \%arg;
981 } else { 1008 } else {
982 warn "object uses attachment '$name' which is not available, postponing.\n"; 1009 info "object uses attachment '$name' which is not available, postponing.\n";
983 } 1010 }
984 1011
985 $obj->{_attachment}{$name} = undef; 1012 $obj->{_attachment}{$name} = undef;
986} 1013}
987 1014
… …
1046 1073
1047 for (@$callbacks) { 1074 for (@$callbacks) {
1048 eval { &{$_->[1]} }; 1075 eval { &{$_->[1]} };
1049 1076
1050 if ($@) { 1077 if ($@) {
1051 warn "$@";
1052 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1078 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053 override; 1079 override;
1054 } 1080 }
1055 1081
1056 return 1 if $override; 1082 return 1 if $override;
1057 } 1083 }
… …
1136 for (@$attach) { 1162 for (@$attach) {
1137 my ($klass, @attach) = @$_; 1163 my ($klass, @attach) = @$_;
1138 _attach $registry, $klass, @attach; 1164 _attach $registry, $klass, @attach;
1139 } 1165 }
1140 } else { 1166 } else {
1141 warn "object uses attachment '$name' that is not available, postponing.\n"; 1167 info "object uses attachment '$name' that is not available, postponing.\n";
1142 } 1168 }
1143 } 1169 }
1144} 1170}
1145 1171
1146cf::attachable->attach ( 1172cf::attachable->attach (
… …
1173 my ($filename, $rdata, $objs) = @_; 1199 my ($filename, $rdata, $objs) = @_;
1174 1200
1175 sync_job { 1201 sync_job {
1176 if (length $$rdata) { 1202 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1204 trace sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1205 $decname, length $$rdata, scalar @$objs
1206 if $VERBOSE_IO;
1180 1207
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1208 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1209 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1210 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1211 if ($cf::USE_FSYNC) {
… …
1206 aio_rename "$filename~", $filename; 1233 aio_rename "$filename~", $filename;
1207 1234
1208 $filename =~ s%/[^/]+$%%; 1235 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC; 1236 aio_pathsync $filename if $cf::USE_FSYNC;
1210 } else { 1237 } else {
1211 warn "unable to save objects: $filename~: $!\n"; 1238 error "unable to save objects: $filename~: $!\n";
1212 } 1239 }
1213 } else { 1240 } else {
1214 aio_unlink $filename; 1241 aio_unlink $filename;
1215 aio_unlink "$filename.pst"; 1242 aio_unlink "$filename.pst";
1216 } 1243 }
… …
1240 my $st = eval { Coro::Storable::thaw $av }; 1267 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs}; 1268 $av = $st->{objs};
1242 } 1269 }
1243 1270
1244 utf8::decode (my $decname = $filename); 1271 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1272 trace sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1273 $decname, length $data, scalar @{$av || []}
1274 if $VERBOSE_IO;
1247 1275
1248 ($data, $av) 1276 ($data, $av)
1249} 1277}
1250 1278
1251=head2 COMMAND CALLBACKS 1279=head2 COMMAND CALLBACKS
… …
1310} 1338}
1311 1339
1312use File::Glob (); 1340use File::Glob ();
1313 1341
1314cf::player->attach ( 1342cf::player->attach (
1315 on_command => sub { 1343 on_unknown_command => sub {
1316 my ($pl, $name, $params) = @_; 1344 my ($pl, $name, $params) = @_;
1317 1345
1318 my $cb = $COMMAND{$name} 1346 my $cb = $COMMAND{$name}
1319 or return; 1347 or return;
1320 1348
… …
1343 1371
1344 $pl->ext_reply ($reply, @reply) 1372 $pl->ext_reply ($reply, @reply)
1345 if $reply; 1373 if $reply;
1346 1374
1347 } else { 1375 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1377 }
1350 1378
1351 cf::override; 1379 cf::override;
1352 }, 1380 },
1353); 1381);
… …
1364 1392
1365 $grp 1393 $grp
1366} 1394}
1367 1395
1368sub load_extensions { 1396sub load_extensions {
1397 info "loading extensions...";
1398
1369 cf::sync_job { 1399 cf::sync_job {
1370 my %todo; 1400 my %todo;
1371 1401
1372 for my $path (<$LIBDIR/*.ext>) { 1402 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1403 next unless -r $path;
… …
1399 . "\n};\n1"; 1429 . "\n};\n1";
1400 1430
1401 $todo{$base} = \%ext; 1431 $todo{$base} = \%ext;
1402 } 1432 }
1403 1433
1434 my $pass = 0;
1404 my %done; 1435 my %done;
1405 while (%todo) { 1436 while (%todo) {
1406 my $progress; 1437 my $progress;
1407 1438
1439 ++$pass;
1440
1441 ext:
1408 while (my ($k, $v) = each %todo) { 1442 while (my ($k, $v) = each %todo) {
1409 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1410 goto skip 1444 next ext
1411 unless exists $done{$_}; 1445 unless exists $done{$_};
1412 } 1446 }
1413 1447
1414 warn "... loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1415 1449
1416 unless (eval $v->{source}) { 1450 my $active = eval $v->{source};
1451
1452 if (length $@) {
1417 my $msg = $@ ? "$v->{path}: $@\n" 1453 error "$v->{path}: $@\n";
1418 : "$v->{base}: extension inactive.\n";
1419 1454
1420 if (exists $v->{meta}{mandatory}) {
1421 warn $msg;
1422 cf::cleanup "mandatory extension failed to load, exiting."; 1455 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1423 } 1456 if exists $v->{meta}{mandatory};
1424 1457
1425 warn $msg; 1458 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1459 delete $todo{$k};
1460 } else {
1461 $done{$k} = delete $todo{$k};
1462 push @EXTS, $v->{pkg};
1463 $progress = 1;
1464
1465 info "$v->{base}: extension inactive.\n"
1466 unless $active;
1426 } 1467 }
1427
1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431 } 1468 }
1432 1469
1433 skip: 1470 unless ($progress) {
1434 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1471 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1435 unless $progress; 1472
1473 while (my ($k, $v) = each %todo) {
1474 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1475 if exists $v->{meta}{mandatory};
1476 }
1477 }
1436 } 1478 }
1437 }; 1479 };
1438} 1480}
1439 1481
1440############################################################################# 1482#############################################################################
… …
1524 $cf::PLAYER{$login} = $pl 1566 $cf::PLAYER{$login} = $pl
1525 } 1567 }
1526 } 1568 }
1527} 1569}
1528 1570
1571cf::player->attach (
1572 on_load => sub {
1573 my ($pl, $path) = @_;
1574
1575 # restore slots saved in save, below
1576 my $slots = delete $pl->{_slots};
1577
1578 $pl->ob->current_weapon ($slots->[0]);
1579 $pl->combat_ob ($slots->[1]);
1580 $pl->ranged_ob ($slots->[2]);
1581 },
1582);
1583
1529sub save($) { 1584sub save($) {
1530 my ($pl) = @_; 1585 my ($pl) = @_;
1531 1586
1532 return if $pl->{deny_save}; 1587 return if $pl->{deny_save};
1533 1588
… …
1538 1593
1539 aio_mkdir playerdir $pl, 0770; 1594 aio_mkdir playerdir $pl, 0770;
1540 $pl->{last_save} = $cf::RUNTIME; 1595 $pl->{last_save} = $cf::RUNTIME;
1541 1596
1542 cf::get_slot 0.01; 1597 cf::get_slot 0.01;
1598
1599 # save slots, to be restored later
1600 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1543 1601
1544 $pl->save_pl ($path); 1602 $pl->save_pl ($path);
1545 cf::cede_to_tick; 1603 cf::cede_to_tick;
1546} 1604}
1547 1605
… …
1584 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1642 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1585 1643
1586 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1644 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1587 $pl->deactivate; 1645 $pl->deactivate;
1588 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1646 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1589 $pl->ob->check_score;
1590 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1647 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1591 $pl->ns->destroy if $pl->ns; 1648 $pl->ns->destroy if $pl->ns;
1592 1649
1593 my $path = playerdir $pl; 1650 my $path = playerdir $pl;
1594 my $temp = "$path~$cf::RUNTIME~deleting~"; 1651 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1649 \@logins 1706 \@logins
1650} 1707}
1651 1708
1652=item $player->maps 1709=item $player->maps
1653 1710
1711=item cf::player::maps $login
1712
1654Returns an arrayref of map paths that are private for this 1713Returns an arrayref of map paths that are private for this
1655player. May block. 1714player. May block.
1656 1715
1657=cut 1716=cut
1658 1717
… …
1720=cut 1779=cut
1721 1780
1722sub find_by_path($) { 1781sub find_by_path($) {
1723 my ($path) = @_; 1782 my ($path) = @_;
1724 1783
1784 $path =~ s/^~[^\/]*//; # skip ~login
1785
1725 my ($match, $specificity); 1786 my ($match, $specificity);
1726 1787
1727 for my $region (list) { 1788 for my $region (list) {
1728 if ($region->{match} && $path =~ $region->{match}) { 1789 if ($region->{match} && $path =~ $region->{match}) {
1729 ($match, $specificity) = ($region, $region->specificity) 1790 ($match, $specificity) = ($region, $region->specificity)
… …
1760 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1821 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1761 1822
1762 # mit "rum" bekleckern, nicht 1823 # mit "rum" bekleckern, nicht
1763 $self->_create_random_map ( 1824 $self->_create_random_map (
1764 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1825 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1765 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1826 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1766 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1827 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1767 $rmp->{exit_on_final_map}, 1828 $rmp->{exit_on_final_map},
1768 $rmp->{xsize}, $rmp->{ysize}, 1829 $rmp->{xsize}, $rmp->{ysize},
1769 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1830 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1770 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1831 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1792 1853
1793 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1794} 1855}
1795 1856
1796# also paths starting with '/' 1857# also paths starting with '/'
1797$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1798 1859
1799sub thawer_merge { 1860sub thawer_merge {
1800 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1801 1862
1802 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
… …
2084 } 2145 }
2085 2146
2086 $self->post_load; 2147 $self->post_load;
2087} 2148}
2088 2149
2150# customize the map for a given player, i.e.
2151# return the _real_ map. used by e.g. per-player
2152# maps to change the path to ~playername/mappath
2089sub customise_for { 2153sub customise_for {
2090 my ($self, $ob) = @_; 2154 my ($self, $ob) = @_;
2091 2155
2092 return find "~" . $ob->name . "/" . $self->{path} 2156 return find "~" . $ob->name . "/" . $self->{path}
2093 if $self->per_player; 2157 if $self->per_player;
… …
2109 or next; 2173 or next;
2110 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
2111 or next; 2175 or next;
2112 $neigh->load; 2176 $neigh->load;
2113 2177
2178 # now find the diagonal neighbours
2114 push @neigh, 2179 push @neigh,
2115 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2116 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2117 } 2182 }
2118 2183
… …
2170 $MAP_PREFETCHER->prio (6); 2235 $MAP_PREFETCHER->prio (6);
2171 2236
2172 () 2237 ()
2173} 2238}
2174 2239
2240# common code, used by both ->save and ->swapout
2175sub save { 2241sub _save {
2176 my ($self) = @_; 2242 my ($self) = @_;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2243
2180 $self->{last_save} = $cf::RUNTIME; 2244 $self->{last_save} = $cf::RUNTIME;
2181 2245
2182 return unless $self->dirty; 2246 return unless $self->dirty;
2183 2247
… …
2203 } else { 2267 } else {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2268 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2205 } 2269 }
2206} 2270}
2207 2271
2272sub save {
2273 my ($self) = @_;
2274
2275 my $lock = cf::lock_acquire "map_data:$self->{path}";
2276
2277 $self->_save;
2278}
2279
2208sub swap_out { 2280sub swap_out {
2209 my ($self) = @_; 2281 my ($self) = @_;
2210 2282
2211 # save first because save cedes
2212 $self->save;
2213
2214 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2283 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215 2284
2216 return if $self->players;
2217 return if $self->in_memory != cf::MAP_ACTIVE; 2285 return if $self->in_memory != cf::MAP_ACTIVE;
2218 return if $self->{deny_save}; 2286 return if $self->{deny_save};
2287 return if $self->players;
2219 2288
2289 # first deactivate the map and "unlink" it from the core
2290 $self->deactivate;
2291 $_->clear_links_to ($self) for values %cf::MAP;
2220 $self->in_memory (cf::MAP_SWAPPED); 2292 $self->in_memory (cf::MAP_SWAPPED);
2293
2294 # then atomically save
2295 $self->_save;
2296
2297 # then free the map
2298 $self->clear;
2299}
2300
2301sub reset_at {
2302 my ($self) = @_;
2303
2304 # TODO: safety, remove and allow resettable per-player maps
2305 return 1e99 if $self->{deny_reset};
2306
2307 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2308 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2309
2310 $time + $to
2311}
2312
2313sub should_reset {
2314 my ($self) = @_;
2315
2316 $self->reset_at <= $cf::RUNTIME
2317}
2318
2319sub reset {
2320 my ($self) = @_;
2321
2322 my $lock = cf::lock_acquire "map_data:$self->{path}";
2323
2324 return if $self->players;
2325
2326 cf::trace "resetting map ", $self->path, "\n";
2327
2328 $self->in_memory (cf::MAP_SWAPPED);
2329
2330 # need to save uniques path
2331 unless ($self->{deny_save}) {
2332 my $uniq = $self->uniq_path; utf8::encode $uniq;
2333
2334 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2335 if $uniq;
2336 }
2337
2338 delete $cf::MAP{$self->path};
2221 2339
2222 $self->deactivate; 2340 $self->deactivate;
2223 $_->clear_links_to ($self) for values %cf::MAP; 2341 $_->clear_links_to ($self) for values %cf::MAP;
2224 $self->clear; 2342 $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 2343
2270 $self->unlink_save; 2344 $self->unlink_save;
2271 $self->destroy; 2345 $self->destroy;
2272} 2346}
2273 2347
… …
2281 2355
2282 delete $cf::MAP{$self->path}; 2356 delete $cf::MAP{$self->path};
2283 2357
2284 $self->unlink_save; 2358 $self->unlink_save;
2285 2359
2286 bless $self, "cf::map"; 2360 bless $self, "cf::map::wrap";
2287 delete $self->{deny_reset}; 2361 delete $self->{deny_reset};
2288 $self->{deny_save} = 1; 2362 $self->{deny_save} = 1;
2289 $self->reset_timeout (1); 2363 $self->reset_timeout (1);
2290 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2364 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2291 2365
… …
2521 2595
2522Freezes the player and moves him/her to a special map (C<{link}>). 2596Freezes the player and moves him/her to a special map (C<{link}>).
2523 2597
2524The player should be reasonably safe there for short amounts of time (e.g. 2598The 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, 2599for 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 2600though, as the player cannot control the character while it is on the link
2527map. 2601map.
2528 2602
2529Will never block. 2603Will never block.
2530 2604
2531=item $player_object->leave_link ($map, $x, $y) 2605=item $player_object->leave_link ($map, $x, $y)
… …
2552sub cf::object::player::enter_link { 2626sub cf::object::player::enter_link {
2553 my ($self) = @_; 2627 my ($self) = @_;
2554 2628
2555 $self->deactivate_recursive; 2629 $self->deactivate_recursive;
2556 2630
2631 ++$self->{_link_recursion};
2632
2557 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2633 return if UNIVERSAL::isa $self->map, "ext::map_link";
2558 2634
2559 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2635 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2560 if $self->map && $self->map->{path} ne "{link}"; 2636 if $self->map && $self->map->{path} ne "{link}";
2561 2637
2562 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2638 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2563} 2639}
2564 2640
2565sub cf::object::player::leave_link { 2641sub cf::object::player::leave_link {
2566 my ($self, $map, $x, $y) = @_; 2642 my ($self, $map, $x, $y) = @_;
2567 2643
… …
2592 $map->load_neighbours; 2668 $map->load_neighbours;
2593 2669
2594 return unless $self->contr->active; 2670 return unless $self->contr->active;
2595 2671
2596 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2672 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2597 $self->enter_map ($map, $x, $y); 2673 if ($self->enter_map ($map, $x, $y)) {
2598 2674 # entering was successful
2675 delete $self->{_link_recursion};
2599 # only activate afterwards, to support waiting in hooks 2676 # only activate afterwards, to support waiting in hooks
2600 $self->activate_recursive; 2677 $self->activate_recursive;
2601} 2678 }
2602 2679
2680}
2681
2603=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2682=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2604 2683
2605Moves the player to the given map-path and coordinates by first freezing 2684Moves the player to the given map-path and coordinates by first freezing
2606her, loading and preparing them map, calling the provided $check callback 2685her, loading and preparing them map, calling the provided $check callback
2607that has to return the map if sucecssful, and then unfreezes the player on 2686that 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 2687the new (success) or old (failed) map position. In either case, $done will
… …
2615 2694
2616our $GOTOGEN; 2695our $GOTOGEN;
2617 2696
2618sub cf::object::player::goto { 2697sub cf::object::player::goto {
2619 my ($self, $path, $x, $y, $check, $done) = @_; 2698 my ($self, $path, $x, $y, $check, $done) = @_;
2699
2700 if ($self->{_link_recursion} >= $MAX_LINKS) {
2701 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2702 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2703 ($path, $x, $y) = @$EMERGENCY_POSITION;
2704 }
2620 2705
2621 # do generation counting so two concurrent goto's will be executed in-order 2706 # do generation counting so two concurrent goto's will be executed in-order
2622 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2707 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2623 2708
2624 $self->enter_link; 2709 $self->enter_link;
… …
2648 my $map = eval { 2733 my $map = eval {
2649 my $map = defined $path ? cf::map::find $path : undef; 2734 my $map = defined $path ? cf::map::find $path : undef;
2650 2735
2651 if ($map) { 2736 if ($map) {
2652 $map = $map->customise_for ($self); 2737 $map = $map->customise_for ($self);
2653 $map = $check->($map) if $check && $map; 2738 $map = $check->($map, $x, $y, $self) if $check && $map;
2654 } else { 2739 } else {
2655 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2740 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2656 } 2741 }
2657 2742
2658 $map 2743 $map
… …
2666 if ($gen == $self->{_goto_generation}) { 2751 if ($gen == $self->{_goto_generation}) {
2667 delete $self->{_goto_generation}; 2752 delete $self->{_goto_generation};
2668 $self->leave_link ($map, $x, $y); 2753 $self->leave_link ($map, $x, $y);
2669 } 2754 }
2670 2755
2671 $done->() if $done; 2756 $done->($self) if $done;
2672 })->prio (1); 2757 })->prio (1);
2673} 2758}
2674 2759
2675=item $player_object->enter_exit ($exit_object) 2760=item $player_object->enter_exit ($exit_object)
2676 2761
… …
2769 $self->message ("Something went wrong deep within the deliantra server. " 2854 $self->message ("Something went wrong deep within the deliantra server. "
2770 . "I'll try to bring you back to the map you were before. " 2855 . "I'll try to bring you back to the map you were before. "
2771 . "Please report this to the dungeon master!", 2856 . "Please report this to the dungeon master!",
2772 cf::NDI_UNIQUE | cf::NDI_RED); 2857 cf::NDI_UNIQUE | cf::NDI_RED);
2773 2858
2774 warn "ERROR in enter_exit: $@"; 2859 error "ERROR in enter_exit: $@";
2775 $self->leave_link; 2860 $self->leave_link;
2776 } 2861 }
2777 })->prio (1); 2862 })->prio (1);
2778} 2863}
2779 2864
… …
3092 3177
3093 $ns->ext_reply ($reply, @reply) 3178 $ns->ext_reply ($reply, @reply)
3094 if $reply; 3179 if $reply;
3095 3180
3096 } else { 3181 } else {
3097 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3182 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3098 } 3183 }
3099 3184
3100 cf::override; 3185 cf::override;
3101 }, 3186 },
3102); 3187);
… …
3122 3207
3123 $coro 3208 $coro
3124} 3209}
3125 3210
3126cf::client->attach ( 3211cf::client->attach (
3127 on_destroy => sub { 3212 on_client_destroy => sub {
3128 my ($ns) = @_; 3213 my ($ns) = @_;
3129 3214
3130 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3215 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3131 }, 3216 },
3132); 3217);
… …
3232 local @cf::_safe_eval_args = values %vars; 3317 local @cf::_safe_eval_args = values %vars;
3233 @res = wantarray ? eval eval : scalar eval $eval; 3318 @res = wantarray ? eval eval : scalar eval $eval;
3234 } 3319 }
3235 3320
3236 if ($@) { 3321 if ($@) {
3237 warn "$@"; 3322 warn "$@",
3238 warn "while executing safe code '$code'\n"; 3323 "while executing safe code '$code'\n",
3239 warn "with arguments " . (join " ", %vars) . "\n"; 3324 "with arguments " . (join " ", %vars) . "\n";
3240 } 3325 }
3241 3326
3242 wantarray ? @res : $res[0] 3327 wantarray ? @res : $res[0]
3243} 3328}
3244 3329
… …
3278 # for this (global event?) 3363 # for this (global event?)
3279 %ext::player_env::MUSIC_FACE_CACHE = (); 3364 %ext::player_env::MUSIC_FACE_CACHE = ();
3280 3365
3281 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3366 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3282 3367
3283 warn "loading facedata from $path\n"; 3368 trace "loading facedata from $path\n";
3284 3369
3285 my $facedata; 3370 my $facedata;
3286 0 < aio_load $path, $facedata 3371 0 < aio_load $path, $facedata
3287 or die "$path: $!"; 3372 or die "$path: $!";
3288 3373
… …
3322 3407
3323 if (my $smooth = cf::face::find $info->{smooth}) { 3408 if (my $smooth = cf::face::find $info->{smooth}) {
3324 cf::face::set_smooth $idx, $smooth; 3409 cf::face::set_smooth $idx, $smooth;
3325 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3410 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3326 } else { 3411 } else {
3327 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3412 error "smooth face '$info->{smooth}' not found for face '$face'";
3328 } 3413 }
3329 3414
3330 cf::cede_to_tick; 3415 cf::cede_to_tick;
3331 } 3416 }
3332 } 3417 }
… …
3350 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3435 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3351 3436
3352 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3437 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3353 cf::face::set_type $idx, $info->{type}; 3438 cf::face::set_type $idx, $info->{type};
3354 } else { 3439 } else {
3355 $RESOURCE{$name} = $info; 3440 $RESOURCE{$name} = $info; # unused
3356 } 3441 }
3357 3442
3358 cf::cede_to_tick; 3443 cf::cede_to_tick;
3359 } 3444 }
3360 } 3445 }
3361 3446
3362 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3447 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3363 3448
3364 1 3449 1
3365} 3450}
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 3451
3387register_exticmd fx_want => sub { 3452register_exticmd fx_want => sub {
3388 my ($ns, $want) = @_; 3453 my ($ns, $want) = @_;
3389 3454
3390 while (my ($k, $v) = each %$want) { 3455 while (my ($k, $v) = each %$want) {
… …
3429sub reload_treasures { 3494sub reload_treasures {
3430 load_resource_file "$DATADIR/treasures" 3495 load_resource_file "$DATADIR/treasures"
3431 or die "unable to load treasurelists\n"; 3496 or die "unable to load treasurelists\n";
3432} 3497}
3433 3498
3499sub reload_sound {
3500 trace "loading sound config from $DATADIR/sound\n";
3501
3502 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3503 or die "$DATADIR/sound $!";
3504
3505 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3506
3507 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3508 my $sound = $soundconf->{compat}[$_]
3509 or next;
3510
3511 my $face = cf::face::find "sound/$sound->[1]";
3512 cf::sound::set $sound->[0] => $face;
3513 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3514 }
3515
3516 while (my ($k, $v) = each %{$soundconf->{event}}) {
3517 my $face = cf::face::find "sound/$v";
3518 cf::sound::set $k => $face;
3519 }
3520}
3521
3434sub reload_resources { 3522sub reload_resources {
3435 warn "reloading resource files...\n"; 3523 trace "reloading resource files...\n";
3436 3524
3437 reload_facedata; 3525 reload_facedata;
3526 reload_sound;
3438 reload_archetypes; 3527 reload_archetypes;
3439 reload_regions; 3528 reload_regions;
3440 reload_treasures; 3529 reload_treasures;
3441 3530
3442 warn "finished reloading resource files\n"; 3531 trace "finished reloading resource files\n";
3443} 3532}
3444 3533
3445sub reload_config { 3534sub reload_config {
3446 warn "reloading config file...\n"; 3535 trace "reloading config file...\n";
3447 3536
3448 open my $fh, "<:utf8", "$CONFDIR/config" 3537 open my $fh, "<:utf8", "$CONFDIR/config"
3449 or return; 3538 or return;
3450 3539
3451 local $/; 3540 local $/;
3452 *CFG = YAML::XS::Load scalar <$fh>; 3541 *CFG = YAML::XS::Load scalar <$fh>;
3453 3542
3454 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3543 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3455 3544
3456 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3545 $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}; 3546 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3458 3547
3459 if (exists $CFG{mlockall}) { 3548 if (exists $CFG{mlockall}) {
… …
3462 and die "WARNING: m(un)lockall failed: $!\n"; 3551 and die "WARNING: m(un)lockall failed: $!\n";
3463 }; 3552 };
3464 warn $@ if $@; 3553 warn $@ if $@;
3465 } 3554 }
3466 3555
3467 warn "finished reloading resource files\n"; 3556 trace "finished reloading resource files\n";
3468} 3557}
3469 3558
3470sub pidfile() { 3559sub pidfile() {
3471 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3560 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3472 or die "$PIDFILE: $!"; 3561 or die "$PIDFILE: $!";
… …
3485 seek $fh, 0, 0; 3574 seek $fh, 0, 0;
3486 print $fh $$; 3575 print $fh $$;
3487} 3576}
3488 3577
3489sub main_loop { 3578sub main_loop {
3490 warn "EV::loop starting\n"; 3579 trace "EV::loop starting\n";
3491 if (1) { 3580 if (1) {
3492 EV::loop; 3581 EV::loop;
3493 } 3582 }
3494 warn "EV::loop returned\n"; 3583 trace "EV::loop returned\n";
3495 goto &main_loop unless $REALLY_UNLOOP; 3584 goto &main_loop unless $REALLY_UNLOOP;
3496} 3585}
3497 3586
3498sub main { 3587sub main {
3499 cf::init_globals; # initialise logging 3588 cf::init_globals; # initialise logging
3500 3589
3501 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3590 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3502 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3591 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3503 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3592 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3504 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3593 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 3594
3511 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3595 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3512 3596
3513 # we must not ever block the main coroutine 3597 # we must not ever block the main coroutine
3514 local $Coro::idle = sub { 3598 local $Coro::idle = sub {
… …
3520 }; 3604 };
3521 3605
3522 evthread_start IO::AIO::poll_fileno; 3606 evthread_start IO::AIO::poll_fileno;
3523 3607
3524 cf::sync_job { 3608 cf::sync_job {
3609 cf::init_experience;
3610 cf::init_anim;
3611 cf::init_attackmess;
3612 cf::init_dynamic;
3613
3525 cf::load_settings; 3614 cf::load_settings;
3526 cf::load_materials; 3615 cf::load_materials;
3527 3616
3528 reload_resources; 3617 reload_resources;
3529 reload_config; 3618 reload_config;
3530 db_init; 3619 db_init;
3531 3620
3532 cf::init_uuid; 3621 cf::init_uuid;
3533 cf::init_signals; 3622 cf::init_signals;
3534 cf::init_commands;
3535 cf::init_skills; 3623 cf::init_skills;
3536 3624
3537 cf::init_beforeplay; 3625 cf::init_beforeplay;
3538 3626
3539 atomic; 3627 atomic;
… …
3546 use POSIX (); 3634 use POSIX ();
3547 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3635 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3548 3636
3549 (pop @POST_INIT)->(0) while @POST_INIT; 3637 (pop @POST_INIT)->(0) while @POST_INIT;
3550 }; 3638 };
3639
3640 cf::object::thawer::errors_are_fatal 0;
3641 info "parse errors in files are no longer fatal from this point on.\n";
3551 3642
3552 main_loop; 3643 main_loop;
3553} 3644}
3554 3645
3555############################################################################# 3646#############################################################################
… …
3557 3648
3558# install some emergency cleanup handlers 3649# install some emergency cleanup handlers
3559BEGIN { 3650BEGIN {
3560 our %SIGWATCHER = (); 3651 our %SIGWATCHER = ();
3561 for my $signal (qw(INT HUP TERM)) { 3652 for my $signal (qw(INT HUP TERM)) {
3562 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3653 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3563 cf::cleanup "SIG$signal"; 3654 cf::cleanup "SIG$signal";
3564 }; 3655 };
3565 } 3656 }
3566} 3657}
3567 3658
3568sub write_runtime_sync { 3659sub write_runtime_sync {
3660 my $t0 = AE::time;
3661
3569 # first touch the runtime file to show we are still running: 3662 # first touch the runtime file to show we are still running:
3570 # the fsync below can take a very very long time. 3663 # the fsync below can take a very very long time.
3571 3664
3572 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3665 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3573 3666
3574 my $guard = cf::lock_acquire "write_runtime"; 3667 my $guard = cf::lock_acquire "write_runtime";
3575 3668
3576 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3669 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3577 or return; 3670 or return;
3578 3671
3579 my $value = $cf::RUNTIME + 90 + 10; 3672 my $value = $cf::RUNTIME + 90 + 10;
3580 # 10 is the runtime save interval, for a monotonic clock 3673 # 10 is the runtime save interval, for a monotonic clock
3581 # 60 allows for the watchdog to kill the server. 3674 # 60 allows for the watchdog to kill the server.
… …
3594 or return; 3687 or return;
3595 3688
3596 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3689 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3597 and return; 3690 and return;
3598 3691
3599 warn "runtime file written.\n"; 3692 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3600 3693
3601 1 3694 1
3602} 3695}
3603 3696
3604our $uuid_lock; 3697our $uuid_lock;
… …
3616 or return; 3709 or return;
3617 3710
3618 my $value = uuid_seq uuid_cur; 3711 my $value = uuid_seq uuid_cur;
3619 3712
3620 unless ($value) { 3713 unless ($value) {
3621 warn "cowardly refusing to write zero uuid value!\n"; 3714 info "cowardly refusing to write zero uuid value!\n";
3622 return; 3715 return;
3623 } 3716 }
3624 3717
3625 my $value = uuid_str $value + $uuid_skip; 3718 my $value = uuid_str $value + $uuid_skip;
3626 $uuid_skip = 0; 3719 $uuid_skip = 0;
… …
3636 or return; 3729 or return;
3637 3730
3638 aio_rename "$uuid~", $uuid 3731 aio_rename "$uuid~", $uuid
3639 and return; 3732 and return;
3640 3733
3641 warn "uuid file written ($value).\n"; 3734 trace "uuid file written ($value).\n";
3642 3735
3643 1 3736 1
3644 3737
3645} 3738}
3646 3739
… …
3652} 3745}
3653 3746
3654sub emergency_save() { 3747sub emergency_save() {
3655 my $freeze_guard = cf::freeze_mainloop; 3748 my $freeze_guard = cf::freeze_mainloop;
3656 3749
3657 warn "emergency_perl_save: enter\n"; 3750 info "emergency_perl_save: enter\n";
3658 3751
3659 cf::sync_job { 3752 cf::sync_job {
3660 # this is a trade-off: we want to be very quick here, so 3753 # this is a trade-off: we want to be very quick here, so
3661 # save all maps without fsync, and later call a global sync 3754 # save all maps without fsync, and later call a global sync
3662 # (which in turn might be very very slow) 3755 # (which in turn might be very very slow)
3663 local $USE_FSYNC = 0; 3756 local $USE_FSYNC = 0;
3664 3757
3665 # use a peculiar iteration method to avoid tripping on perl 3758 # use a peculiar iteration method to avoid tripping on perl
3666 # refcount bugs in for. also avoids problems with players 3759 # refcount bugs in for. also avoids problems with players
3667 # and maps saved/destroyed asynchronously. 3760 # and maps saved/destroyed asynchronously.
3668 warn "emergency_perl_save: begin player save\n"; 3761 info "emergency_perl_save: begin player save\n";
3669 for my $login (keys %cf::PLAYER) { 3762 for my $login (keys %cf::PLAYER) {
3670 my $pl = $cf::PLAYER{$login} or next; 3763 my $pl = $cf::PLAYER{$login} or next;
3671 $pl->valid or next; 3764 $pl->valid or next;
3672 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3765 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3673 $pl->save; 3766 $pl->save;
3674 } 3767 }
3675 warn "emergency_perl_save: end player save\n"; 3768 info "emergency_perl_save: end player save\n";
3676 3769
3677 warn "emergency_perl_save: begin map save\n"; 3770 info "emergency_perl_save: begin map save\n";
3678 for my $path (keys %cf::MAP) { 3771 for my $path (keys %cf::MAP) {
3679 my $map = $cf::MAP{$path} or next; 3772 my $map = $cf::MAP{$path} or next;
3680 $map->valid or next; 3773 $map->valid or next;
3681 $map->save; 3774 $map->save;
3682 } 3775 }
3683 warn "emergency_perl_save: end map save\n"; 3776 info "emergency_perl_save: end map save\n";
3684 3777
3685 warn "emergency_perl_save: begin database checkpoint\n"; 3778 info "emergency_perl_save: begin database checkpoint\n";
3686 BDB::db_env_txn_checkpoint $DB_ENV; 3779 BDB::db_env_txn_checkpoint $DB_ENV;
3687 warn "emergency_perl_save: end database checkpoint\n"; 3780 info "emergency_perl_save: end database checkpoint\n";
3688 3781
3689 warn "emergency_perl_save: begin write uuid\n"; 3782 info "emergency_perl_save: begin write uuid\n";
3690 write_uuid_sync 1; 3783 write_uuid_sync 1;
3691 warn "emergency_perl_save: end write uuid\n"; 3784 info "emergency_perl_save: end write uuid\n";
3692 }; 3785 };
3693 3786
3694 warn "emergency_perl_save: starting sync()\n"; 3787 info "emergency_perl_save: starting sync()\n";
3695 IO::AIO::aio_sync sub { 3788 IO::AIO::aio_sync sub {
3696 warn "emergency_perl_save: finished sync()\n"; 3789 info "emergency_perl_save: finished sync()\n";
3697 }; 3790 };
3698 3791
3699 warn "emergency_perl_save: leave\n"; 3792 info "emergency_perl_save: leave\n";
3700} 3793}
3701 3794
3702sub post_cleanup { 3795sub post_cleanup {
3703 my ($make_core) = @_; 3796 my ($make_core) = @_;
3704 3797
3705 warn Carp::longmess "post_cleanup backtrace" 3798 error Carp::longmess "post_cleanup backtrace"
3706 if $make_core; 3799 if $make_core;
3707 3800
3708 my $fh = pidfile; 3801 my $fh = pidfile;
3709 unlink $PIDFILE if <$fh> == $$; 3802 unlink $PIDFILE if <$fh> == $$;
3710} 3803}
… …
3730 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3823 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3731 for my $name (keys %$leaf_symtab) { 3824 for my $name (keys %$leaf_symtab) {
3732 _gv_clear *{"$pkg$name"}; 3825 _gv_clear *{"$pkg$name"};
3733# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3826# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3734 } 3827 }
3735 warn "cleared package $pkg\n";#d#
3736} 3828}
3737 3829
3738sub do_reload_perl() { 3830sub do_reload_perl() {
3739 # can/must only be called in main 3831 # can/must only be called in main
3740 if ($Coro::current != $Coro::main) { 3832 if (in_main) {
3741 warn "can only reload from main coroutine"; 3833 error "can only reload from main coroutine";
3742 return; 3834 return;
3743 } 3835 }
3744 3836
3745 return if $RELOAD++; 3837 return if $RELOAD++;
3746 3838
3747 my $t1 = EV::time; 3839 my $t1 = AE::time;
3748 3840
3749 while ($RELOAD) { 3841 while ($RELOAD) {
3750 warn "reloading..."; 3842 info "reloading...";
3751 3843
3752 warn "entering sync_job"; 3844 trace "entering sync_job";
3753 3845
3754 cf::sync_job { 3846 cf::sync_job {
3755 cf::write_runtime_sync; # external watchdog should not bark 3847 cf::write_runtime_sync; # external watchdog should not bark
3756 cf::emergency_save; 3848 cf::emergency_save;
3757 cf::write_runtime_sync; # external watchdog should not bark 3849 cf::write_runtime_sync; # external watchdog should not bark
3758 3850
3759 warn "syncing database to disk"; 3851 trace "syncing database to disk";
3760 BDB::db_env_txn_checkpoint $DB_ENV; 3852 BDB::db_env_txn_checkpoint $DB_ENV;
3761 3853
3762 # if anything goes wrong in here, we should simply crash as we already saved 3854 # if anything goes wrong in here, we should simply crash as we already saved
3763 3855
3764 warn "flushing outstanding aio requests"; 3856 trace "flushing outstanding aio requests";
3765 while (IO::AIO::nreqs || BDB::nreqs) { 3857 while (IO::AIO::nreqs || BDB::nreqs) {
3766 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3767 } 3859 }
3768 3860
3769 warn "cancelling all extension coros"; 3861 trace "cancelling all extension coros";
3770 $_->cancel for values %EXT_CORO; 3862 $_->cancel for values %EXT_CORO;
3771 %EXT_CORO = (); 3863 %EXT_CORO = ();
3772 3864
3773 warn "removing commands"; 3865 trace "removing commands";
3774 %COMMAND = (); 3866 %COMMAND = ();
3775 3867
3776 warn "removing ext/exti commands"; 3868 trace "removing ext/exti commands";
3777 %EXTCMD = (); 3869 %EXTCMD = ();
3778 %EXTICMD = (); 3870 %EXTICMD = ();
3779 3871
3780 warn "unloading/nuking all extensions"; 3872 trace "unloading/nuking all extensions";
3781 for my $pkg (@EXTS) { 3873 for my $pkg (@EXTS) {
3782 warn "... unloading $pkg"; 3874 trace "... unloading $pkg";
3783 3875
3784 if (my $cb = $pkg->can ("unload")) { 3876 if (my $cb = $pkg->can ("unload")) {
3785 eval { 3877 eval {
3786 $cb->($pkg); 3878 $cb->($pkg);
3787 1 3879 1
3788 } or warn "$pkg unloaded, but with errors: $@"; 3880 } or error "$pkg unloaded, but with errors: $@";
3789 } 3881 }
3790 3882
3791 warn "... clearing $pkg"; 3883 trace "... clearing $pkg";
3792 clear_package $pkg; 3884 clear_package $pkg;
3793 } 3885 }
3794 3886
3795 warn "unloading all perl modules loaded from $LIBDIR"; 3887 trace "unloading all perl modules loaded from $LIBDIR";
3796 while (my ($k, $v) = each %INC) { 3888 while (my ($k, $v) = each %INC) {
3797 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3798 3890
3799 warn "... unloading $k"; 3891 trace "... unloading $k";
3800 delete $INC{$k}; 3892 delete $INC{$k};
3801 3893
3802 $k =~ s/\.pm$//; 3894 $k =~ s/\.pm$//;
3803 $k =~ s/\//::/g; 3895 $k =~ s/\//::/g;
3804 3896
… …
3807 } 3899 }
3808 3900
3809 clear_package $k; 3901 clear_package $k;
3810 } 3902 }
3811 3903
3812 warn "getting rid of safe::, as good as possible"; 3904 trace "getting rid of safe::, as good as possible";
3813 clear_package "safe::$_" 3905 clear_package "safe::$_"
3814 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3906 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3815 3907
3816 warn "unloading cf.pm \"a bit\""; 3908 trace "unloading cf.pm \"a bit\"";
3817 delete $INC{"cf.pm"}; 3909 delete $INC{"cf.pm"};
3818 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3910 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3819 3911
3820 # don't, removes xs symbols, too, 3912 # don't, removes xs symbols, too,
3821 # and global variables created in xs 3913 # and global variables created in xs
3822 #clear_package __PACKAGE__; 3914 #clear_package __PACKAGE__;
3823 3915
3824 warn "unload completed, starting to reload now"; 3916 info "unload completed, starting to reload now";
3825 3917
3826 warn "reloading cf.pm"; 3918 trace "reloading cf.pm";
3827 require cf; 3919 require cf;
3828 cf::_connect_to_perl_1; 3920 cf::_connect_to_perl_1;
3829 3921
3830 warn "loading config and database again"; 3922 trace "loading config and database again";
3831 cf::reload_config; 3923 cf::reload_config;
3832 3924
3833 warn "loading extensions"; 3925 trace "loading extensions";
3834 cf::load_extensions; 3926 cf::load_extensions;
3835 3927
3836 if ($REATTACH_ON_RELOAD) { 3928 if ($REATTACH_ON_RELOAD) {
3837 warn "reattaching attachments to objects/players"; 3929 trace "reattaching attachments to objects/players";
3838 _global_reattach; # objects, sockets 3930 _global_reattach; # objects, sockets
3839 warn "reattaching attachments to maps"; 3931 trace "reattaching attachments to maps";
3840 reattach $_ for values %MAP; 3932 reattach $_ for values %MAP;
3841 warn "reattaching attachments to players"; 3933 trace "reattaching attachments to players";
3842 reattach $_ for values %PLAYER; 3934 reattach $_ for values %PLAYER;
3843 } 3935 }
3844 3936
3845 warn "running post_init jobs"; 3937 trace "running post_init jobs";
3846 (pop @POST_INIT)->(1) while @POST_INIT; 3938 (pop @POST_INIT)->(1) while @POST_INIT;
3847 3939
3848 warn "leaving sync_job"; 3940 trace "leaving sync_job";
3849 3941
3850 1 3942 1
3851 } or do { 3943 } or do {
3852 warn $@; 3944 error $@;
3853 cf::cleanup "error while reloading, exiting."; 3945 cf::cleanup "error while reloading, exiting.";
3854 }; 3946 };
3855 3947
3856 warn "reloaded"; 3948 info "reloaded";
3857 --$RELOAD; 3949 --$RELOAD;
3858 } 3950 }
3859 3951
3860 $t1 = EV::time - $t1; 3952 $t1 = AE::time - $t1;
3861 warn "reload completed in ${t1}s\n"; 3953 info "reload completed in ${t1}s\n";
3862}; 3954};
3863 3955
3864our $RELOAD_WATCHER; # used only during reload 3956our $RELOAD_WATCHER; # used only during reload
3865 3957
3866sub reload_perl() { 3958sub reload_perl() {
… …
3868 # coro crashes during coro_state_free->destroy here. 3960 # coro crashes during coro_state_free->destroy here.
3869 3961
3870 $RELOAD_WATCHER ||= cf::async { 3962 $RELOAD_WATCHER ||= cf::async {
3871 Coro::AIO::aio_wait cache_extensions; 3963 Coro::AIO::aio_wait cache_extensions;
3872 3964
3873 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3965 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3874 do_reload_perl; 3966 do_reload_perl;
3875 undef $RELOAD_WATCHER; 3967 undef $RELOAD_WATCHER;
3876 }; 3968 };
3877 }; 3969 };
3878} 3970}
… …
3919 return; 4011 return;
3920 } 4012 }
3921 4013
3922 cf::server_tick; # one server iteration 4014 cf::server_tick; # one server iteration
3923 4015
3924 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4016 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3925 4017
3926 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4018 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3927 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4019 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3928 Coro::async_pool { 4020 Coro::async_pool {
3929 $Coro::current->{desc} = "runtime saver"; 4021 $Coro::current->{desc} = "runtime saver";
3930 write_runtime_sync 4022 write_runtime_sync
3931 or warn "ERROR: unable to write runtime file: $!"; 4023 or error "ERROR: unable to write runtime file: $!";
3932 }; 4024 };
3933 } 4025 }
3934 4026
3935 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4027 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3936 $sig->send; 4028 $sig->send;
… …
3944 4036
3945 if (0) { 4037 if (0) {
3946 if ($NEXT_TICK) { 4038 if ($NEXT_TICK) {
3947 my $jitter = $TICK_START - $NEXT_TICK; 4039 my $jitter = $TICK_START - $NEXT_TICK;
3948 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4040 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3949 warn "jitter $JITTER\n";#d# 4041 debug "jitter $JITTER\n";#d#
3950 } 4042 }
3951 } 4043 }
3952} 4044}
3953 4045
3954{ 4046{
… …
3964 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4056 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3965 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7; 4057 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3966 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4058 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3967 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4059 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3968 4060
4061 (Coro::async { # async to keep sync_job from complaining
3969 cf::sync_job { 4062 cf::sync_job {
3970 eval { 4063 eval {
3971 BDB::db_env_open 4064 BDB::db_env_open
3972 $DB_ENV, 4065 $DB_ENV,
3973 $BDBDIR, 4066 $BDBDIR,
3974 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4067 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3975 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4068 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3976 0666; 4069 0666;
3977 4070
3978 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4071 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
4072 };
4073
4074 cf::cleanup "db_env_open(db): $@" if $@;
3979 }; 4075 };
3980 4076 })->join;
3981 cf::cleanup "db_env_open(db): $@" if $@;
3982 };
3983 } 4077 }
3984 4078
3985 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub { 4079 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3986 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4080 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3987 }; 4081 };

Diff Legend

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