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.518 by root, Fri Apr 16 02:21:26 2010 UTC vs.
Revision 1.534 by root, Thu Apr 29 08:13:51 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 112
113our $OUTPUT_RATE_MIN = 4000; 113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 100000; 114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
115 118
116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118our $NEXT_TICK; 121our $NEXT_TICK;
119our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
165 168
166our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
167 170
168sub cf::map::normalise; 171sub cf::map::normalise;
169 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
170############################################################################# 177#############################################################################
171 178
172%REFLECT = (); 179%REFLECT = ();
173for (@REFLECT) { 180for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
… …
245 252
246=back 253=back
247 254
248=cut 255=cut
249 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
250$Coro::State::WARNHOOK = sub { 263$Coro::State::WARNHOOK = sub {
251 my $msg = join "", @_; 264 my $msg = join "", @_;
252 265
253 $msg .= "\n" 266 $msg .= "\n"
254 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
255 268
256 $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;
257 270
258 LOG llevError, $msg; 271 LOG llevWarn, $msg;
259}; 272};
260 273
261$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
262 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
263 276
264 warn Carp::longmess $_[0]; 277 error Carp::longmess $_[0];
265 278
266 if ($Coro::current == $Coro::main) {#d# 279 if (in_main) {#d#
267 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
268 return;#d# 281 return;#d#
269 }#d# 282 }#d#
270 283
271 # kill coroutine otherwise 284 # kill coroutine otherwise
272 Coro::terminate 285 Coro::terminate
… …
505=cut 518=cut
506 519
507sub sync_job(&) { 520sub sync_job(&) {
508 my ($job) = @_; 521 my ($job) = @_;
509 522
510 if ($Coro::current == $Coro::main) { 523 if (in_main) {
511 my $time = AE::time; 524 my $time = AE::time;
512 525
513 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
514 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
515 528
516 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
517 530
518 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
519 532
520 my $busy = 1; 533 my $busy = 1;
521 my @res; 534 my @res;
522 535
523 (async { 536 (async {
524 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
525 @res = eval { $job->() }; 538 @res = eval { $job->() };
526 warn $@ if $@; 539 error $@ if $@;
527 undef $busy; 540 undef $busy;
528 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
529 542
530 while ($busy) { 543 while ($busy) {
531 if (Coro::nready) { 544 if (Coro::nready) {
… …
644within each server. 657within each server.
645 658
646=cut 659=cut
647 660
648sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
649 my ($name) = @_; 665 my ($name) = @_;
650 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
651 667
652 eval { 668 eval {
653 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
… …
663} 679}
664 680
665our $DB; 681our $DB;
666 682
667sub db_init { 683sub db_init {
668 cf::sync_job {
669 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
670 };
671} 685}
672 686
673sub db_get($$) { 687sub db_get($$) {
674 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
675 689
676 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
677 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
678 694
679 $! ? () 695 $! ? ()
680 : $data 696 : $data
681 }
682} 697}
683 698
684sub db_put($$$) { 699sub db_put($$$) {
685 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
686 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
742 757
743 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
744 my $data = $process->(\@data); 759 my $data = $process->(\@data);
745 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
746 761
747 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
748 763
749 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
750 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
751 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
752 767
… …
762 777
763=cut 778=cut
764 779
765sub datalog($@) { 780sub datalog($@) {
766 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
767 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
768} 783}
769 784
770=back 785=back
771 786
772=cut 787=cut
… …
967 982
968 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
969 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
970 985
971 } elsif (ref $type) { 986 } elsif (ref $type) {
972 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
973 988
974 } else { 989 } else {
975 shift @arg; 990 shift @arg;
976 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
977 } 992 }
978 } 993 }
979} 994}
980 995
981sub _object_attach { 996sub _object_attach {
… …
991 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
992 } 1007 }
993 1008
994 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
995 } else { 1010 } else {
996 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
997 } 1012 }
998 1013
999 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
1000} 1015}
1001 1016
… …
1060 1075
1061 for (@$callbacks) { 1076 for (@$callbacks) {
1062 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
1063 1078
1064 if ($@) { 1079 if ($@) {
1065 warn "$@";
1066 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1067 override; 1081 override;
1068 } 1082 }
1069 1083
1070 return 1 if $override; 1084 return 1 if $override;
1071 } 1085 }
… …
1150 for (@$attach) { 1164 for (@$attach) {
1151 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1152 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1153 } 1167 }
1154 } else { 1168 } else {
1155 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1156 } 1170 }
1157 } 1171 }
1158} 1172}
1159 1173
1160cf::attachable->attach ( 1174cf::attachable->attach (
… …
1187 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1188 1202
1189 sync_job { 1203 sync_job {
1190 if (length $$rdata) { 1204 if (length $$rdata) {
1191 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1192 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1193 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1194 1209
1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1196 aio_chmod $fh, SAVE_MODE; 1211 aio_chmod $fh, SAVE_MODE;
1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1198 if ($cf::USE_FSYNC) { 1213 if ($cf::USE_FSYNC) {
… …
1220 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1221 1236
1222 $filename =~ s%/[^/]+$%%; 1237 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC; 1238 aio_pathsync $filename if $cf::USE_FSYNC;
1224 } else { 1239 } else {
1225 warn "unable to save objects: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1226 } 1241 }
1227 } else { 1242 } else {
1228 aio_unlink $filename; 1243 aio_unlink $filename;
1229 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1230 } 1245 }
… …
1254 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1255 $av = $st->{objs}; 1270 $av = $st->{objs};
1256 } 1271 }
1257 1272
1258 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1259 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1260 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1261 1277
1262 ($data, $av) 1278 ($data, $av)
1263} 1279}
1264 1280
1265=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
… …
1357 1373
1358 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1359 if $reply; 1375 if $reply;
1360 1376
1361 } else { 1377 } else {
1362 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1363 } 1379 }
1364 1380
1365 cf::override; 1381 cf::override;
1366 }, 1382 },
1367); 1383);
… …
1378 1394
1379 $grp 1395 $grp
1380} 1396}
1381 1397
1382sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1383 cf::sync_job { 1401 cf::sync_job {
1384 my %todo; 1402 my %todo;
1385 1403
1386 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1387 next unless -r $path; 1405 next unless -r $path;
… …
1427 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1428 next ext 1446 next ext
1429 unless exists $done{$_}; 1447 unless exists $done{$_};
1430 } 1448 }
1431 1449
1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1433 1451
1434 my $active = eval $v->{source}; 1452 my $active = eval $v->{source};
1435 1453
1436 if (length $@) { 1454 if (length $@) {
1437 warn "$v->{path}: $@\n"; 1455 error "$v->{path}: $@\n";
1438 1456
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1440 if exists $v->{meta}{mandatory}; 1458 if exists $v->{meta}{mandatory};
1459
1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1461 delete $todo{$k};
1441 } else { 1462 } else {
1442 $done{$k} = delete $todo{$k}; 1463 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg}; 1464 push @EXTS, $v->{pkg};
1444 $progress = 1; 1465 $progress = 1;
1445 1466
1446 warn "$v->{base}: extension inactive.\n" 1467 info "$v->{base}: extension inactive.\n"
1447 unless $active; 1468 unless $active;
1448 } 1469 }
1449 } 1470 }
1450 1471
1451 unless ($progress) { 1472 unless ($progress) {
… …
1623 $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
1624 1645
1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1626 $pl->deactivate; 1647 $pl->deactivate;
1627 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;
1628 $pl->ob->check_score;
1629 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1630 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1631 1651
1632 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1633 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1688 \@logins 1708 \@logins
1689} 1709}
1690 1710
1691=item $player->maps 1711=item $player->maps
1692 1712
1713=item cf::player::maps $login
1714
1693Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1694player. May block. 1716player. May block.
1695 1717
1696=cut 1718=cut
1697 1719
… …
1758 1780
1759=cut 1781=cut
1760 1782
1761sub find_by_path($) { 1783sub find_by_path($) {
1762 my ($path) = @_; 1784 my ($path) = @_;
1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1763 1787
1764 my ($match, $specificity); 1788 my ($match, $specificity);
1765 1789
1766 for my $region (list) { 1790 for my $region (list) {
1767 if ($region->{match} && $path =~ $region->{match}) { 1791 if ($region->{match} && $path =~ $region->{match}) {
… …
1831 1855
1832 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1833} 1857}
1834 1858
1835# also paths starting with '/' 1859# also paths starting with '/'
1836$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1837 1861
1838sub thawer_merge { 1862sub thawer_merge {
1839 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1840 1864
1841 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
… …
2151 or next; 2175 or next;
2152 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2153 or next; 2177 or next;
2154 $neigh->load; 2178 $neigh->load;
2155 2179
2180 # now find the diagonal neighbours
2156 push @neigh, 2181 push @neigh,
2157 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2158 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2159 } 2184 }
2160 2185
… …
2167} 2192}
2168 2193
2169sub find_sync { 2194sub find_sync {
2170 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2171 2196
2172 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
2173} 2201}
2174 2202
2175sub do_load_sync { 2203sub do_load_sync {
2176 my ($map) = @_; 2204 my ($map) = @_;
2177 2205
2178 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2179 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2180 2208
2181 cf::sync_job { $map->load }; 2209 $map->load;
2182} 2210}
2183 2211
2184our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2185our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2186 2214
… …
2298 2326
2299 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2300 2328
2301 return if $self->players; 2329 return if $self->players;
2302 2330
2303 warn "resetting map ", $self->path, "\n"; 2331 cf::trace "resetting map ", $self->path, "\n";
2304 2332
2305 $self->in_memory (cf::MAP_SWAPPED); 2333 $self->in_memory (cf::MAP_SWAPPED);
2306 2334
2307 # need to save uniques path 2335 # need to save uniques path
2308 unless ($self->{deny_save}) { 2336 unless ($self->{deny_save}) {
… …
2332 2360
2333 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2334 2362
2335 $self->unlink_save; 2363 $self->unlink_save;
2336 2364
2337 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2338 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2339 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2340 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2341 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2342 2370
… …
2572 2600
2573Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2574 2602
2575The player should be reasonably safe there for short amounts of time (e.g. 2603The player should be reasonably safe there for short amounts of time (e.g.
2576for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2577though, as the palyer cannot control the character while it is on the link 2605though, as the player cannot control the character while it is on the link
2578map. 2606map.
2579 2607
2580Will never block. 2608Will never block.
2581 2609
2582=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
… …
2603sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2604 my ($self) = @_; 2632 my ($self) = @_;
2605 2633
2606 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2607 2635
2636 ++$self->{_link_recursion};
2637
2608 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2609 2639
2610 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2611 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2612 2642
2613 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2614} 2644}
2615 2645
2616sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2617 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2618 2648
… …
2643 $map->load_neighbours; 2673 $map->load_neighbours;
2644 2674
2645 return unless $self->contr->active; 2675 return unless $self->contr->active;
2646 2676
2647 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2648 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2649 2679 # entering was successful
2680 delete $self->{_link_recursion};
2650 # only activate afterwards, to support waiting in hooks 2681 # only activate afterwards, to support waiting in hooks
2651 $self->activate_recursive; 2682 $self->activate_recursive;
2652} 2683 }
2653 2684
2685}
2686
2654=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2655 2688
2656Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2657her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2658that has to return the map if sucecssful, and then unfreezes the player on 2691that has to return the map if sucecssful, and then unfreezes the player on
2659the new (success) or old (failed) map position. In either case, $done will 2692the new (success) or old (failed) map position. In either case, $done will
… …
2666 2699
2667our $GOTOGEN; 2700our $GOTOGEN;
2668 2701
2669sub cf::object::player::goto { 2702sub cf::object::player::goto {
2670 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2671 2710
2672 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
2673 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2674 2713
2675 $self->enter_link; 2714 $self->enter_link;
… …
2699 my $map = eval { 2738 my $map = eval {
2700 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2701 2740
2702 if ($map) { 2741 if ($map) {
2703 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2704 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2705 } else { 2744 } else {
2706 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2707 } 2746 }
2708 2747
2709 $map 2748 $map
… …
2717 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2718 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2719 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2720 } 2759 }
2721 2760
2722 $done->() if $done; 2761 $done->($self) if $done;
2723 })->prio (1); 2762 })->prio (1);
2724} 2763}
2725 2764
2726=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2727 2766
… …
2820 $self->message ("Something went wrong deep within the deliantra server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2821 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2822 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2823 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2824 2863
2825 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2826 $self->leave_link; 2865 $self->leave_link;
2827 } 2866 }
2828 })->prio (1); 2867 })->prio (1);
2829} 2868}
2830 2869
… …
3143 3182
3144 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
3145 if $reply; 3184 if $reply;
3146 3185
3147 } else { 3186 } else {
3148 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3149 } 3188 }
3150 3189
3151 cf::override; 3190 cf::override;
3152 }, 3191 },
3153); 3192);
… …
3283 local @cf::_safe_eval_args = values %vars; 3322 local @cf::_safe_eval_args = values %vars;
3284 @res = wantarray ? eval eval : scalar eval $eval; 3323 @res = wantarray ? eval eval : scalar eval $eval;
3285 } 3324 }
3286 3325
3287 if ($@) { 3326 if ($@) {
3288 warn "$@"; 3327 warn "$@",
3289 warn "while executing safe code '$code'\n"; 3328 "while executing safe code '$code'\n",
3290 warn "with arguments " . (join " ", %vars) . "\n"; 3329 "with arguments " . (join " ", %vars) . "\n";
3291 } 3330 }
3292 3331
3293 wantarray ? @res : $res[0] 3332 wantarray ? @res : $res[0]
3294} 3333}
3295 3334
… …
3329 # for this (global event?) 3368 # for this (global event?)
3330 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3331 3370
3332 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3371 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3333 3372
3334 warn "loading facedata from $path\n"; 3373 trace "loading facedata from $path\n";
3335 3374
3336 my $facedata; 3375 my $facedata;
3337 0 < aio_load $path, $facedata 3376 0 < aio_load $path, $facedata
3338 or die "$path: $!"; 3377 or die "$path: $!";
3339 3378
… …
3373 3412
3374 if (my $smooth = cf::face::find $info->{smooth}) { 3413 if (my $smooth = cf::face::find $info->{smooth}) {
3375 cf::face::set_smooth $idx, $smooth; 3414 cf::face::set_smooth $idx, $smooth;
3376 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3415 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3377 } else { 3416 } else {
3378 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3417 error "smooth face '$info->{smooth}' not found for face '$face'";
3379 } 3418 }
3380 3419
3381 cf::cede_to_tick; 3420 cf::cede_to_tick;
3382 } 3421 }
3383 } 3422 }
… …
3401 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3440 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3402 3441
3403 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3404 cf::face::set_type $idx, $info->{type}; 3443 cf::face::set_type $idx, $info->{type};
3405 } else { 3444 } else {
3406 $RESOURCE{$name} = $info; 3445 $RESOURCE{$name} = $info; # unused
3407 } 3446 }
3408 3447
3409 cf::cede_to_tick; 3448 cf::cede_to_tick;
3410 } 3449 }
3411 } 3450 }
3412 3451
3413 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3452 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3414 3453
3415 1 3454 1
3416} 3455}
3417
3418cf::global->attach (on_resource_update => sub {
3419 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3420 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3421
3422 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3423 my $sound = $soundconf->{compat}[$_]
3424 or next;
3425
3426 my $face = cf::face::find "sound/$sound->[1]";
3427 cf::sound::set $sound->[0] => $face;
3428 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3429 }
3430
3431 while (my ($k, $v) = each %{$soundconf->{event}}) {
3432 my $face = cf::face::find "sound/$v";
3433 cf::sound::set $k => $face;
3434 }
3435 }
3436});
3437 3456
3438register_exticmd fx_want => sub { 3457register_exticmd fx_want => sub {
3439 my ($ns, $want) = @_; 3458 my ($ns, $want) = @_;
3440 3459
3441 while (my ($k, $v) = each %$want) { 3460 while (my ($k, $v) = each %$want) {
… …
3480sub reload_treasures { 3499sub reload_treasures {
3481 load_resource_file "$DATADIR/treasures" 3500 load_resource_file "$DATADIR/treasures"
3482 or die "unable to load treasurelists\n"; 3501 or die "unable to load treasurelists\n";
3483} 3502}
3484 3503
3504sub reload_sound {
3505 trace "loading sound config from $DATADIR/sound\n";
3506
3507 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3508 or die "$DATADIR/sound $!";
3509
3510 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3511
3512 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3513 my $sound = $soundconf->{compat}[$_]
3514 or next;
3515
3516 my $face = cf::face::find "sound/$sound->[1]";
3517 cf::sound::set $sound->[0] => $face;
3518 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3519 }
3520
3521 while (my ($k, $v) = each %{$soundconf->{event}}) {
3522 my $face = cf::face::find "sound/$v";
3523 cf::sound::set $k => $face;
3524 }
3525}
3526
3485sub reload_resources { 3527sub reload_resources {
3486 warn "reloading resource files...\n"; 3528 trace "reloading resource files...\n";
3487 3529
3488 reload_facedata; 3530 reload_facedata;
3531 reload_sound;
3489 reload_archetypes; 3532 reload_archetypes;
3490 reload_regions; 3533 reload_regions;
3491 reload_treasures; 3534 reload_treasures;
3492 3535
3493 warn "finished reloading resource files\n"; 3536 trace "finished reloading resource files\n";
3494} 3537}
3495 3538
3496sub reload_config { 3539sub reload_config {
3497 warn "reloading config file...\n"; 3540 trace "reloading config file...\n";
3498 3541
3499 open my $fh, "<:utf8", "$CONFDIR/config" 3542 open my $fh, "<:utf8", "$CONFDIR/config"
3500 or return; 3543 or return;
3501 3544
3502 local $/; 3545 local $/;
3503 *CFG = YAML::XS::Load scalar <$fh>; 3546 *CFG = YAML::XS::Load scalar <$fh>;
3504 3547
3505 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3548 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3506 3549
3507 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3550 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3508 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3551 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3509 3552
3510 if (exists $CFG{mlockall}) { 3553 if (exists $CFG{mlockall}) {
… …
3513 and die "WARNING: m(un)lockall failed: $!\n"; 3556 and die "WARNING: m(un)lockall failed: $!\n";
3514 }; 3557 };
3515 warn $@ if $@; 3558 warn $@ if $@;
3516 } 3559 }
3517 3560
3518 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3519} 3562}
3520 3563
3521sub pidfile() { 3564sub pidfile() {
3522 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3565 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3523 or die "$PIDFILE: $!"; 3566 or die "$PIDFILE: $!";
… …
3536 seek $fh, 0, 0; 3579 seek $fh, 0, 0;
3537 print $fh $$; 3580 print $fh $$;
3538} 3581}
3539 3582
3540sub main_loop { 3583sub main_loop {
3541 warn "EV::loop starting\n"; 3584 trace "EV::loop starting\n";
3542 if (1) { 3585 if (1) {
3543 EV::loop; 3586 EV::loop;
3544 } 3587 }
3545 warn "EV::loop returned\n"; 3588 trace "EV::loop returned\n";
3546 goto &main_loop unless $REALLY_UNLOOP; 3589 goto &main_loop unless $REALLY_UNLOOP;
3547} 3590}
3548 3591
3549sub main { 3592sub main {
3550 cf::init_globals; # initialise logging 3593 cf::init_globals; # initialise logging
… …
3598 3641
3599 (pop @POST_INIT)->(0) while @POST_INIT; 3642 (pop @POST_INIT)->(0) while @POST_INIT;
3600 }; 3643 };
3601 3644
3602 cf::object::thawer::errors_are_fatal 0; 3645 cf::object::thawer::errors_are_fatal 0;
3603 warn "parse errors in files are no longer fatal from this point on.\n"; 3646 info "parse errors in files are no longer fatal from this point on.\n";
3604 3647
3605 main_loop; 3648 main_loop;
3606} 3649}
3607 3650
3608############################################################################# 3651#############################################################################
… …
3649 or return; 3692 or return;
3650 3693
3651 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3694 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3652 and return; 3695 and return;
3653 3696
3654 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3697 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3655 3698
3656 1 3699 1
3657} 3700}
3658 3701
3659our $uuid_lock; 3702our $uuid_lock;
… …
3671 or return; 3714 or return;
3672 3715
3673 my $value = uuid_seq uuid_cur; 3716 my $value = uuid_seq uuid_cur;
3674 3717
3675 unless ($value) { 3718 unless ($value) {
3676 warn "cowardly refusing to write zero uuid value!\n"; 3719 info "cowardly refusing to write zero uuid value!\n";
3677 return; 3720 return;
3678 } 3721 }
3679 3722
3680 my $value = uuid_str $value + $uuid_skip; 3723 my $value = uuid_str $value + $uuid_skip;
3681 $uuid_skip = 0; 3724 $uuid_skip = 0;
… …
3691 or return; 3734 or return;
3692 3735
3693 aio_rename "$uuid~", $uuid 3736 aio_rename "$uuid~", $uuid
3694 and return; 3737 and return;
3695 3738
3696 warn "uuid file written ($value).\n"; 3739 trace "uuid file written ($value).\n";
3697 3740
3698 1 3741 1
3699 3742
3700} 3743}
3701 3744
… …
3707} 3750}
3708 3751
3709sub emergency_save() { 3752sub emergency_save() {
3710 my $freeze_guard = cf::freeze_mainloop; 3753 my $freeze_guard = cf::freeze_mainloop;
3711 3754
3712 warn "emergency_perl_save: enter\n"; 3755 info "emergency_perl_save: enter\n";
3756
3757 # this is a trade-off: we want to be very quick here, so
3758 # save all maps without fsync, and later call a global sync
3759 # (which in turn might be very very slow)
3760 local $USE_FSYNC = 0;
3713 3761
3714 cf::sync_job { 3762 cf::sync_job {
3715 # this is a trade-off: we want to be very quick here, so
3716 # save all maps without fsync, and later call a global sync
3717 # (which in turn might be very very slow)
3718 local $USE_FSYNC = 0;
3719
3720 # use a peculiar iteration method to avoid tripping on perl 3763 # use a peculiar iteration method to avoid tripping on perl
3721 # refcount bugs in for. also avoids problems with players 3764 # refcount bugs in for. also avoids problems with players
3722 # and maps saved/destroyed asynchronously. 3765 # and maps saved/destroyed asynchronously.
3723 warn "emergency_perl_save: begin player save\n"; 3766 info "emergency_perl_save: begin player save\n";
3724 for my $login (keys %cf::PLAYER) { 3767 for my $login (keys %cf::PLAYER) {
3725 my $pl = $cf::PLAYER{$login} or next; 3768 my $pl = $cf::PLAYER{$login} or next;
3726 $pl->valid or next; 3769 $pl->valid or next;
3727 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3770 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3728 $pl->save; 3771 $pl->save;
3729 } 3772 }
3730 warn "emergency_perl_save: end player save\n"; 3773 info "emergency_perl_save: end player save\n";
3731 3774
3732 warn "emergency_perl_save: begin map save\n"; 3775 info "emergency_perl_save: begin map save\n";
3733 for my $path (keys %cf::MAP) { 3776 for my $path (keys %cf::MAP) {
3734 my $map = $cf::MAP{$path} or next; 3777 my $map = $cf::MAP{$path} or next;
3735 $map->valid or next; 3778 $map->valid or next;
3736 $map->save; 3779 $map->save;
3737 } 3780 }
3738 warn "emergency_perl_save: end map save\n"; 3781 info "emergency_perl_save: end map save\n";
3739 3782
3740 warn "emergency_perl_save: begin database checkpoint\n"; 3783 info "emergency_perl_save: begin database checkpoint\n";
3741 BDB::db_env_txn_checkpoint $DB_ENV; 3784 BDB::db_env_txn_checkpoint $DB_ENV;
3742 warn "emergency_perl_save: end database checkpoint\n"; 3785 info "emergency_perl_save: end database checkpoint\n";
3743 3786
3744 warn "emergency_perl_save: begin write uuid\n"; 3787 info "emergency_perl_save: begin write uuid\n";
3745 write_uuid_sync 1; 3788 write_uuid_sync 1;
3746 warn "emergency_perl_save: end write uuid\n"; 3789 info "emergency_perl_save: end write uuid\n";
3747 }; 3790 };
3748 3791
3749 warn "emergency_perl_save: starting sync()\n"; 3792 info "emergency_perl_save: starting sync()\n";
3750 IO::AIO::aio_sync sub { 3793 IO::AIO::aio_sync sub {
3751 warn "emergency_perl_save: finished sync()\n"; 3794 info "emergency_perl_save: finished sync()\n";
3752 }; 3795 };
3753 3796
3754 warn "emergency_perl_save: leave\n"; 3797 info "emergency_perl_save: leave\n";
3755} 3798}
3756 3799
3757sub post_cleanup { 3800sub post_cleanup {
3758 my ($make_core) = @_; 3801 my ($make_core) = @_;
3759 3802
3760 warn Carp::longmess "post_cleanup backtrace" 3803 error Carp::longmess "post_cleanup backtrace"
3761 if $make_core; 3804 if $make_core;
3762 3805
3763 my $fh = pidfile; 3806 my $fh = pidfile;
3764 unlink $PIDFILE if <$fh> == $$; 3807 unlink $PIDFILE if <$fh> == $$;
3765} 3808}
… …
3785 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3828 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3786 for my $name (keys %$leaf_symtab) { 3829 for my $name (keys %$leaf_symtab) {
3787 _gv_clear *{"$pkg$name"}; 3830 _gv_clear *{"$pkg$name"};
3788# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3831# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3789 } 3832 }
3790 warn "cleared package $pkg\n";#d#
3791} 3833}
3792 3834
3793sub do_reload_perl() { 3835sub do_reload_perl() {
3794 # can/must only be called in main 3836 # can/must only be called in main
3795 if ($Coro::current != $Coro::main) { 3837 if (in_main) {
3796 warn "can only reload from main coroutine"; 3838 error "can only reload from main coroutine";
3797 return; 3839 return;
3798 } 3840 }
3799 3841
3800 return if $RELOAD++; 3842 return if $RELOAD++;
3801 3843
3802 my $t1 = AE::time; 3844 my $t1 = AE::time;
3803 3845
3804 while ($RELOAD) { 3846 while ($RELOAD) {
3805 warn "reloading..."; 3847 info "reloading...";
3806 3848
3807 warn "entering sync_job"; 3849 trace "entering sync_job";
3808 3850
3809 cf::sync_job { 3851 cf::sync_job {
3810 cf::write_runtime_sync; # external watchdog should not bark 3852 cf::write_runtime_sync; # external watchdog should not bark
3811 cf::emergency_save; 3853 cf::emergency_save;
3812 cf::write_runtime_sync; # external watchdog should not bark 3854 cf::write_runtime_sync; # external watchdog should not bark
3813 3855
3814 warn "syncing database to disk"; 3856 trace "syncing database to disk";
3815 BDB::db_env_txn_checkpoint $DB_ENV; 3857 BDB::db_env_txn_checkpoint $DB_ENV;
3816 3858
3817 # if anything goes wrong in here, we should simply crash as we already saved 3859 # if anything goes wrong in here, we should simply crash as we already saved
3818 3860
3819 warn "flushing outstanding aio requests"; 3861 trace "flushing outstanding aio requests";
3820 while (IO::AIO::nreqs || BDB::nreqs) { 3862 while (IO::AIO::nreqs || BDB::nreqs) {
3821 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3863 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3822 } 3864 }
3823 3865
3824 warn "cancelling all extension coros"; 3866 trace "cancelling all extension coros";
3825 $_->cancel for values %EXT_CORO; 3867 $_->cancel for values %EXT_CORO;
3826 %EXT_CORO = (); 3868 %EXT_CORO = ();
3827 3869
3828 warn "removing commands"; 3870 trace "removing commands";
3829 %COMMAND = (); 3871 %COMMAND = ();
3830 3872
3831 warn "removing ext/exti commands"; 3873 trace "removing ext/exti commands";
3832 %EXTCMD = (); 3874 %EXTCMD = ();
3833 %EXTICMD = (); 3875 %EXTICMD = ();
3834 3876
3835 warn "unloading/nuking all extensions"; 3877 trace "unloading/nuking all extensions";
3836 for my $pkg (@EXTS) { 3878 for my $pkg (@EXTS) {
3837 warn "... unloading $pkg"; 3879 trace "... unloading $pkg";
3838 3880
3839 if (my $cb = $pkg->can ("unload")) { 3881 if (my $cb = $pkg->can ("unload")) {
3840 eval { 3882 eval {
3841 $cb->($pkg); 3883 $cb->($pkg);
3842 1 3884 1
3843 } or warn "$pkg unloaded, but with errors: $@"; 3885 } or error "$pkg unloaded, but with errors: $@";
3844 } 3886 }
3845 3887
3846 warn "... clearing $pkg"; 3888 trace "... clearing $pkg";
3847 clear_package $pkg; 3889 clear_package $pkg;
3848 } 3890 }
3849 3891
3850 warn "unloading all perl modules loaded from $LIBDIR"; 3892 trace "unloading all perl modules loaded from $LIBDIR";
3851 while (my ($k, $v) = each %INC) { 3893 while (my ($k, $v) = each %INC) {
3852 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3894 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3853 3895
3854 warn "... unloading $k"; 3896 trace "... unloading $k";
3855 delete $INC{$k}; 3897 delete $INC{$k};
3856 3898
3857 $k =~ s/\.pm$//; 3899 $k =~ s/\.pm$//;
3858 $k =~ s/\//::/g; 3900 $k =~ s/\//::/g;
3859 3901
… …
3862 } 3904 }
3863 3905
3864 clear_package $k; 3906 clear_package $k;
3865 } 3907 }
3866 3908
3867 warn "getting rid of safe::, as good as possible"; 3909 trace "getting rid of safe::, as good as possible";
3868 clear_package "safe::$_" 3910 clear_package "safe::$_"
3869 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3911 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3870 3912
3871 warn "unloading cf.pm \"a bit\""; 3913 trace "unloading cf.pm \"a bit\"";
3872 delete $INC{"cf.pm"}; 3914 delete $INC{"cf.pm"};
3873 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3915 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3874 3916
3875 # don't, removes xs symbols, too, 3917 # don't, removes xs symbols, too,
3876 # and global variables created in xs 3918 # and global variables created in xs
3877 #clear_package __PACKAGE__; 3919 #clear_package __PACKAGE__;
3878 3920
3879 warn "unload completed, starting to reload now"; 3921 info "unload completed, starting to reload now";
3880 3922
3881 warn "reloading cf.pm"; 3923 trace "reloading cf.pm";
3882 require cf; 3924 require cf;
3883 cf::_connect_to_perl_1; 3925 cf::_connect_to_perl_1;
3884 3926
3885 warn "loading config and database again"; 3927 trace "loading config and database again";
3886 cf::reload_config; 3928 cf::reload_config;
3887 3929
3888 warn "loading extensions"; 3930 trace "loading extensions";
3889 cf::load_extensions; 3931 cf::load_extensions;
3890 3932
3891 if ($REATTACH_ON_RELOAD) { 3933 if ($REATTACH_ON_RELOAD) {
3892 warn "reattaching attachments to objects/players"; 3934 trace "reattaching attachments to objects/players";
3893 _global_reattach; # objects, sockets 3935 _global_reattach; # objects, sockets
3894 warn "reattaching attachments to maps"; 3936 trace "reattaching attachments to maps";
3895 reattach $_ for values %MAP; 3937 reattach $_ for values %MAP;
3896 warn "reattaching attachments to players"; 3938 trace "reattaching attachments to players";
3897 reattach $_ for values %PLAYER; 3939 reattach $_ for values %PLAYER;
3898 } 3940 }
3899 3941
3900 warn "running post_init jobs"; 3942 trace "running post_init jobs";
3901 (pop @POST_INIT)->(1) while @POST_INIT; 3943 (pop @POST_INIT)->(1) while @POST_INIT;
3902 3944
3903 warn "leaving sync_job"; 3945 trace "leaving sync_job";
3904 3946
3905 1 3947 1
3906 } or do { 3948 } or do {
3907 warn $@; 3949 error $@;
3908 cf::cleanup "error while reloading, exiting."; 3950 cf::cleanup "error while reloading, exiting.";
3909 }; 3951 };
3910 3952
3911 warn "reloaded"; 3953 info "reloaded";
3912 --$RELOAD; 3954 --$RELOAD;
3913 } 3955 }
3914 3956
3915 $t1 = AE::time - $t1; 3957 $t1 = AE::time - $t1;
3916 warn "reload completed in ${t1}s\n"; 3958 info "reload completed in ${t1}s\n";
3917}; 3959};
3918 3960
3919our $RELOAD_WATCHER; # used only during reload 3961our $RELOAD_WATCHER; # used only during reload
3920 3962
3921sub reload_perl() { 3963sub reload_perl() {
… …
3981 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4023 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3982 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4024 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3983 Coro::async_pool { 4025 Coro::async_pool {
3984 $Coro::current->{desc} = "runtime saver"; 4026 $Coro::current->{desc} = "runtime saver";
3985 write_runtime_sync 4027 write_runtime_sync
3986 or warn "ERROR: unable to write runtime file: $!"; 4028 or error "ERROR: unable to write runtime file: $!";
3987 }; 4029 };
3988 } 4030 }
3989 4031
3990 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4032 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3991 $sig->send; 4033 $sig->send;
… …
3999 4041
4000 if (0) { 4042 if (0) {
4001 if ($NEXT_TICK) { 4043 if ($NEXT_TICK) {
4002 my $jitter = $TICK_START - $NEXT_TICK; 4044 my $jitter = $TICK_START - $NEXT_TICK;
4003 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4045 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4004 warn "jitter $JITTER\n";#d# 4046 debug "jitter $JITTER\n";#d#
4005 } 4047 }
4006 } 4048 }
4007} 4049}
4008 4050
4009{ 4051{

Diff Legend

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