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.512 by root, Sun Apr 11 04:52:07 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) = @_;
… …
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) {
… …
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
… …
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;
… …
1413 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext 1444 next ext
1415 unless exists $done{$_}; 1445 unless exists $done{$_};
1416 } 1446 }
1417 1447
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419 1449
1420 my $active = eval $v->{source}; 1450 my $active = eval $v->{source};
1421 1451
1422 if (length $@) { 1452 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1453 error "$v->{path}: $@\n";
1424 1454
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1455 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1456 if exists $v->{meta}{mandatory};
1457
1458 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1459 delete $todo{$k};
1427 } else { 1460 } else {
1428 $done{$k} = delete $todo{$k}; 1461 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1462 push @EXTS, $v->{pkg};
1430 $progress = 1; 1463 $progress = 1;
1431 1464
1432 warn "$v->{base}: extension inactive.\n" 1465 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1466 unless $active;
1434 } 1467 }
1435 } 1468 }
1436 1469
1437 unless ($progress) { 1470 unless ($progress) {
… …
1609 $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
1610 1643
1611 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1644 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1612 $pl->deactivate; 1645 $pl->deactivate;
1613 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;
1614 $pl->ob->check_score;
1615 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1647 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1616 $pl->ns->destroy if $pl->ns; 1648 $pl->ns->destroy if $pl->ns;
1617 1649
1618 my $path = playerdir $pl; 1650 my $path = playerdir $pl;
1619 my $temp = "$path~$cf::RUNTIME~deleting~"; 1651 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1674 \@logins 1706 \@logins
1675} 1707}
1676 1708
1677=item $player->maps 1709=item $player->maps
1678 1710
1711=item cf::player::maps $login
1712
1679Returns an arrayref of map paths that are private for this 1713Returns an arrayref of map paths that are private for this
1680player. May block. 1714player. May block.
1681 1715
1682=cut 1716=cut
1683 1717
… …
1744 1778
1745=cut 1779=cut
1746 1780
1747sub find_by_path($) { 1781sub find_by_path($) {
1748 my ($path) = @_; 1782 my ($path) = @_;
1783
1784 $path =~ s/^~[^\/]*//; # skip ~login
1749 1785
1750 my ($match, $specificity); 1786 my ($match, $specificity);
1751 1787
1752 for my $region (list) { 1788 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1789 if ($region->{match} && $path =~ $region->{match}) {
… …
1817 1853
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 1855}
1820 1856
1821# also paths starting with '/' 1857# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 1859
1824sub thawer_merge { 1860sub thawer_merge {
1825 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1826 1862
1827 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
… …
2137 or next; 2173 or next;
2138 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
2139 or next; 2175 or next;
2140 $neigh->load; 2176 $neigh->load;
2141 2177
2178 # now find the diagonal neighbours
2142 push @neigh, 2179 push @neigh,
2143 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2144 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2145 } 2182 }
2146 2183
… …
2198 $MAP_PREFETCHER->prio (6); 2235 $MAP_PREFETCHER->prio (6);
2199 2236
2200 () 2237 ()
2201} 2238}
2202 2239
2240# common code, used by both ->save and ->swapout
2203sub save { 2241sub _save {
2204 my ($self) = @_; 2242 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2243
2208 $self->{last_save} = $cf::RUNTIME; 2244 $self->{last_save} = $cf::RUNTIME;
2209 2245
2210 return unless $self->dirty; 2246 return unless $self->dirty;
2211 2247
… …
2231 } else { 2267 } else {
2232 $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);
2233 } 2269 }
2234} 2270}
2235 2271
2272sub save {
2273 my ($self) = @_;
2274
2275 my $lock = cf::lock_acquire "map_data:$self->{path}";
2276
2277 $self->_save;
2278}
2279
2236sub swap_out { 2280sub swap_out {
2237 my ($self) = @_; 2281 my ($self) = @_;
2238 2282
2239 # save first because save cedes
2240 $self->save;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2283 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243 2284
2244 return if $self->players;
2245 return if $self->in_memory != cf::MAP_ACTIVE; 2285 return if $self->in_memory != cf::MAP_ACTIVE;
2246 return if $self->{deny_save}; 2286 return if $self->{deny_save};
2287 return if $self->players;
2247 2288
2289 # first deactivate the map and "unlink" it from the core
2290 $self->deactivate;
2291 $_->clear_links_to ($self) for values %cf::MAP;
2248 $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};
2249 2339
2250 $self->deactivate; 2340 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP; 2341 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear; 2342 $self->clear;
2253}
2254
2255sub reset_at {
2256 my ($self) = @_;
2257
2258 # TODO: safety, remove and allow resettable per-player maps
2259 return 1e99 if $self->{deny_reset};
2260
2261 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2262 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2263
2264 $time + $to
2265}
2266
2267sub should_reset {
2268 my ($self) = @_;
2269
2270 $self->reset_at <= $cf::RUNTIME
2271}
2272
2273sub reset {
2274 my ($self) = @_;
2275
2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2277
2278 return if $self->players;
2279
2280 warn "resetting map ", $self->path, "\n";
2281
2282 $self->in_memory (cf::MAP_SWAPPED);
2283
2284 # need to save uniques path
2285 unless ($self->{deny_save}) {
2286 my $uniq = $self->uniq_path; utf8::encode $uniq;
2287
2288 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2289 if $uniq;
2290 }
2291
2292 delete $cf::MAP{$self->path};
2293
2294 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP;
2296 $self->clear;
2297 2343
2298 $self->unlink_save; 2344 $self->unlink_save;
2299 $self->destroy; 2345 $self->destroy;
2300} 2346}
2301 2347
… …
2309 2355
2310 delete $cf::MAP{$self->path}; 2356 delete $cf::MAP{$self->path};
2311 2357
2312 $self->unlink_save; 2358 $self->unlink_save;
2313 2359
2314 bless $self, "cf::map"; 2360 bless $self, "cf::map::wrap";
2315 delete $self->{deny_reset}; 2361 delete $self->{deny_reset};
2316 $self->{deny_save} = 1; 2362 $self->{deny_save} = 1;
2317 $self->reset_timeout (1); 2363 $self->reset_timeout (1);
2318 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2364 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2319 2365
… …
2549 2595
2550Freezes 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}>).
2551 2597
2552The 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.
2553for 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,
2554though, 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
2555map. 2601map.
2556 2602
2557Will never block. 2603Will never block.
2558 2604
2559=item $player_object->leave_link ($map, $x, $y) 2605=item $player_object->leave_link ($map, $x, $y)
… …
2580sub cf::object::player::enter_link { 2626sub cf::object::player::enter_link {
2581 my ($self) = @_; 2627 my ($self) = @_;
2582 2628
2583 $self->deactivate_recursive; 2629 $self->deactivate_recursive;
2584 2630
2631 ++$self->{_link_recursion};
2632
2585 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2633 return if UNIVERSAL::isa $self->map, "ext::map_link";
2586 2634
2587 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2635 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2588 if $self->map && $self->map->{path} ne "{link}"; 2636 if $self->map && $self->map->{path} ne "{link}";
2589 2637
2590 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2638 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2591} 2639}
2592 2640
2593sub cf::object::player::leave_link { 2641sub cf::object::player::leave_link {
2594 my ($self, $map, $x, $y) = @_; 2642 my ($self, $map, $x, $y) = @_;
2595 2643
… …
2620 $map->load_neighbours; 2668 $map->load_neighbours;
2621 2669
2622 return unless $self->contr->active; 2670 return unless $self->contr->active;
2623 2671
2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2672 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2625 $self->enter_map ($map, $x, $y); 2673 if ($self->enter_map ($map, $x, $y)) {
2626 2674 # entering was successful
2675 delete $self->{_link_recursion};
2627 # only activate afterwards, to support waiting in hooks 2676 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive; 2677 $self->activate_recursive;
2629} 2678 }
2630 2679
2680}
2681
2631=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)]])
2632 2683
2633Moves 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
2634her, loading and preparing them map, calling the provided $check callback 2685her, loading and preparing them map, calling the provided $check callback
2635that 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
2636the 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
… …
2643 2694
2644our $GOTOGEN; 2695our $GOTOGEN;
2645 2696
2646sub cf::object::player::goto { 2697sub cf::object::player::goto {
2647 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 }
2648 2705
2649 # 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
2650 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2707 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2651 2708
2652 $self->enter_link; 2709 $self->enter_link;
… …
2676 my $map = eval { 2733 my $map = eval {
2677 my $map = defined $path ? cf::map::find $path : undef; 2734 my $map = defined $path ? cf::map::find $path : undef;
2678 2735
2679 if ($map) { 2736 if ($map) {
2680 $map = $map->customise_for ($self); 2737 $map = $map->customise_for ($self);
2681 $map = $check->($map) if $check && $map; 2738 $map = $check->($map, $x, $y, $self) if $check && $map;
2682 } else { 2739 } else {
2683 $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);
2684 } 2741 }
2685 2742
2686 $map 2743 $map
… …
2694 if ($gen == $self->{_goto_generation}) { 2751 if ($gen == $self->{_goto_generation}) {
2695 delete $self->{_goto_generation}; 2752 delete $self->{_goto_generation};
2696 $self->leave_link ($map, $x, $y); 2753 $self->leave_link ($map, $x, $y);
2697 } 2754 }
2698 2755
2699 $done->() if $done; 2756 $done->($self) if $done;
2700 })->prio (1); 2757 })->prio (1);
2701} 2758}
2702 2759
2703=item $player_object->enter_exit ($exit_object) 2760=item $player_object->enter_exit ($exit_object)
2704 2761
… …
2797 $self->message ("Something went wrong deep within the deliantra server. " 2854 $self->message ("Something went wrong deep within the deliantra server. "
2798 . "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. "
2799 . "Please report this to the dungeon master!", 2856 . "Please report this to the dungeon master!",
2800 cf::NDI_UNIQUE | cf::NDI_RED); 2857 cf::NDI_UNIQUE | cf::NDI_RED);
2801 2858
2802 warn "ERROR in enter_exit: $@"; 2859 error "ERROR in enter_exit: $@";
2803 $self->leave_link; 2860 $self->leave_link;
2804 } 2861 }
2805 })->prio (1); 2862 })->prio (1);
2806} 2863}
2807 2864
… …
3120 3177
3121 $ns->ext_reply ($reply, @reply) 3178 $ns->ext_reply ($reply, @reply)
3122 if $reply; 3179 if $reply;
3123 3180
3124 } else { 3181 } else {
3125 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";
3126 } 3183 }
3127 3184
3128 cf::override; 3185 cf::override;
3129 }, 3186 },
3130); 3187);
… …
3260 local @cf::_safe_eval_args = values %vars; 3317 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval; 3318 @res = wantarray ? eval eval : scalar eval $eval;
3262 } 3319 }
3263 3320
3264 if ($@) { 3321 if ($@) {
3265 warn "$@"; 3322 warn "$@",
3266 warn "while executing safe code '$code'\n"; 3323 "while executing safe code '$code'\n",
3267 warn "with arguments " . (join " ", %vars) . "\n"; 3324 "with arguments " . (join " ", %vars) . "\n";
3268 } 3325 }
3269 3326
3270 wantarray ? @res : $res[0] 3327 wantarray ? @res : $res[0]
3271} 3328}
3272 3329
… …
3306 # for this (global event?) 3363 # for this (global event?)
3307 %ext::player_env::MUSIC_FACE_CACHE = (); 3364 %ext::player_env::MUSIC_FACE_CACHE = ();
3308 3365
3309 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3366 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3310 3367
3311 warn "loading facedata from $path\n"; 3368 trace "loading facedata from $path\n";
3312 3369
3313 my $facedata; 3370 my $facedata;
3314 0 < aio_load $path, $facedata 3371 0 < aio_load $path, $facedata
3315 or die "$path: $!"; 3372 or die "$path: $!";
3316 3373
… …
3350 3407
3351 if (my $smooth = cf::face::find $info->{smooth}) { 3408 if (my $smooth = cf::face::find $info->{smooth}) {
3352 cf::face::set_smooth $idx, $smooth; 3409 cf::face::set_smooth $idx, $smooth;
3353 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3410 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3354 } else { 3411 } else {
3355 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3412 error "smooth face '$info->{smooth}' not found for face '$face'";
3356 } 3413 }
3357 3414
3358 cf::cede_to_tick; 3415 cf::cede_to_tick;
3359 } 3416 }
3360 } 3417 }
… …
3378 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3435 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3379 3436
3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3437 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3381 cf::face::set_type $idx, $info->{type}; 3438 cf::face::set_type $idx, $info->{type};
3382 } else { 3439 } else {
3383 $RESOURCE{$name} = $info; 3440 $RESOURCE{$name} = $info; # unused
3384 } 3441 }
3385 3442
3386 cf::cede_to_tick; 3443 cf::cede_to_tick;
3387 } 3444 }
3388 } 3445 }
3389 3446
3390 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3447 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3391 3448
3392 1 3449 1
3393} 3450}
3394
3395cf::global->attach (on_resource_update => sub {
3396 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3397 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3398
3399 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3400 my $sound = $soundconf->{compat}[$_]
3401 or next;
3402
3403 my $face = cf::face::find "sound/$sound->[1]";
3404 cf::sound::set $sound->[0] => $face;
3405 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3406 }
3407
3408 while (my ($k, $v) = each %{$soundconf->{event}}) {
3409 my $face = cf::face::find "sound/$v";
3410 cf::sound::set $k => $face;
3411 }
3412 }
3413});
3414 3451
3415register_exticmd fx_want => sub { 3452register_exticmd fx_want => sub {
3416 my ($ns, $want) = @_; 3453 my ($ns, $want) = @_;
3417 3454
3418 while (my ($k, $v) = each %$want) { 3455 while (my ($k, $v) = each %$want) {
… …
3457sub reload_treasures { 3494sub reload_treasures {
3458 load_resource_file "$DATADIR/treasures" 3495 load_resource_file "$DATADIR/treasures"
3459 or die "unable to load treasurelists\n"; 3496 or die "unable to load treasurelists\n";
3460} 3497}
3461 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
3462sub reload_resources { 3522sub reload_resources {
3463 warn "reloading resource files...\n"; 3523 trace "reloading resource files...\n";
3464 3524
3465 reload_facedata; 3525 reload_facedata;
3526 reload_sound;
3466 reload_archetypes; 3527 reload_archetypes;
3467 reload_regions; 3528 reload_regions;
3468 reload_treasures; 3529 reload_treasures;
3469 3530
3470 warn "finished reloading resource files\n"; 3531 trace "finished reloading resource files\n";
3471} 3532}
3472 3533
3473sub reload_config { 3534sub reload_config {
3474 warn "reloading config file...\n"; 3535 trace "reloading config file...\n";
3475 3536
3476 open my $fh, "<:utf8", "$CONFDIR/config" 3537 open my $fh, "<:utf8", "$CONFDIR/config"
3477 or return; 3538 or return;
3478 3539
3479 local $/; 3540 local $/;
3480 *CFG = YAML::XS::Load scalar <$fh>; 3541 *CFG = YAML::XS::Load scalar <$fh>;
3481 3542
3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3543 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3483 3544
3484 $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};
3485 $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};
3486 3547
3487 if (exists $CFG{mlockall}) { 3548 if (exists $CFG{mlockall}) {
… …
3490 and die "WARNING: m(un)lockall failed: $!\n"; 3551 and die "WARNING: m(un)lockall failed: $!\n";
3491 }; 3552 };
3492 warn $@ if $@; 3553 warn $@ if $@;
3493 } 3554 }
3494 3555
3495 warn "finished reloading resource files\n"; 3556 trace "finished reloading resource files\n";
3496} 3557}
3497 3558
3498sub pidfile() { 3559sub pidfile() {
3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3560 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3500 or die "$PIDFILE: $!"; 3561 or die "$PIDFILE: $!";
… …
3513 seek $fh, 0, 0; 3574 seek $fh, 0, 0;
3514 print $fh $$; 3575 print $fh $$;
3515} 3576}
3516 3577
3517sub main_loop { 3578sub main_loop {
3518 warn "EV::loop starting\n"; 3579 trace "EV::loop starting\n";
3519 if (1) { 3580 if (1) {
3520 EV::loop; 3581 EV::loop;
3521 } 3582 }
3522 warn "EV::loop returned\n"; 3583 trace "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP; 3584 goto &main_loop unless $REALLY_UNLOOP;
3524} 3585}
3525 3586
3526sub main { 3587sub main {
3527 cf::init_globals; # initialise logging 3588 cf::init_globals; # initialise logging
3528 3589
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3590 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 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.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3592 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3593 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533
3534 cf::init_experience;
3535 cf::init_anim;
3536 cf::init_attackmess;
3537 cf::init_dynamic;
3538 3594
3539 $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
3540 3596
3541 # we must not ever block the main coroutine 3597 # we must not ever block the main coroutine
3542 local $Coro::idle = sub { 3598 local $Coro::idle = sub {
… …
3548 }; 3604 };
3549 3605
3550 evthread_start IO::AIO::poll_fileno; 3606 evthread_start IO::AIO::poll_fileno;
3551 3607
3552 cf::sync_job { 3608 cf::sync_job {
3609 cf::init_experience;
3610 cf::init_anim;
3611 cf::init_attackmess;
3612 cf::init_dynamic;
3613
3553 cf::load_settings; 3614 cf::load_settings;
3554 cf::load_materials; 3615 cf::load_materials;
3555 3616
3556 reload_resources; 3617 reload_resources;
3557 reload_config; 3618 reload_config;
… …
3573 use POSIX (); 3634 use POSIX ();
3574 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};
3575 3636
3576 (pop @POST_INIT)->(0) while @POST_INIT; 3637 (pop @POST_INIT)->(0) while @POST_INIT;
3577 }; 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";
3578 3642
3579 main_loop; 3643 main_loop;
3580} 3644}
3581 3645
3582############################################################################# 3646#############################################################################
… …
3623 or return; 3687 or return;
3624 3688
3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3689 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3626 and return; 3690 and return;
3627 3691
3628 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3692 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3629 3693
3630 1 3694 1
3631} 3695}
3632 3696
3633our $uuid_lock; 3697our $uuid_lock;
… …
3645 or return; 3709 or return;
3646 3710
3647 my $value = uuid_seq uuid_cur; 3711 my $value = uuid_seq uuid_cur;
3648 3712
3649 unless ($value) { 3713 unless ($value) {
3650 warn "cowardly refusing to write zero uuid value!\n"; 3714 info "cowardly refusing to write zero uuid value!\n";
3651 return; 3715 return;
3652 } 3716 }
3653 3717
3654 my $value = uuid_str $value + $uuid_skip; 3718 my $value = uuid_str $value + $uuid_skip;
3655 $uuid_skip = 0; 3719 $uuid_skip = 0;
… …
3665 or return; 3729 or return;
3666 3730
3667 aio_rename "$uuid~", $uuid 3731 aio_rename "$uuid~", $uuid
3668 and return; 3732 and return;
3669 3733
3670 warn "uuid file written ($value).\n"; 3734 trace "uuid file written ($value).\n";
3671 3735
3672 1 3736 1
3673 3737
3674} 3738}
3675 3739
… …
3681} 3745}
3682 3746
3683sub emergency_save() { 3747sub emergency_save() {
3684 my $freeze_guard = cf::freeze_mainloop; 3748 my $freeze_guard = cf::freeze_mainloop;
3685 3749
3686 warn "emergency_perl_save: enter\n"; 3750 info "emergency_perl_save: enter\n";
3687 3751
3688 cf::sync_job { 3752 cf::sync_job {
3689 # 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
3690 # save all maps without fsync, and later call a global sync 3754 # save all maps without fsync, and later call a global sync
3691 # (which in turn might be very very slow) 3755 # (which in turn might be very very slow)
3692 local $USE_FSYNC = 0; 3756 local $USE_FSYNC = 0;
3693 3757
3694 # use a peculiar iteration method to avoid tripping on perl 3758 # use a peculiar iteration method to avoid tripping on perl
3695 # refcount bugs in for. also avoids problems with players 3759 # refcount bugs in for. also avoids problems with players
3696 # and maps saved/destroyed asynchronously. 3760 # and maps saved/destroyed asynchronously.
3697 warn "emergency_perl_save: begin player save\n"; 3761 info "emergency_perl_save: begin player save\n";
3698 for my $login (keys %cf::PLAYER) { 3762 for my $login (keys %cf::PLAYER) {
3699 my $pl = $cf::PLAYER{$login} or next; 3763 my $pl = $cf::PLAYER{$login} or next;
3700 $pl->valid or next; 3764 $pl->valid or next;
3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3765 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3702 $pl->save; 3766 $pl->save;
3703 } 3767 }
3704 warn "emergency_perl_save: end player save\n"; 3768 info "emergency_perl_save: end player save\n";
3705 3769
3706 warn "emergency_perl_save: begin map save\n"; 3770 info "emergency_perl_save: begin map save\n";
3707 for my $path (keys %cf::MAP) { 3771 for my $path (keys %cf::MAP) {
3708 my $map = $cf::MAP{$path} or next; 3772 my $map = $cf::MAP{$path} or next;
3709 $map->valid or next; 3773 $map->valid or next;
3710 $map->save; 3774 $map->save;
3711 } 3775 }
3712 warn "emergency_perl_save: end map save\n"; 3776 info "emergency_perl_save: end map save\n";
3713 3777
3714 warn "emergency_perl_save: begin database checkpoint\n"; 3778 info "emergency_perl_save: begin database checkpoint\n";
3715 BDB::db_env_txn_checkpoint $DB_ENV; 3779 BDB::db_env_txn_checkpoint $DB_ENV;
3716 warn "emergency_perl_save: end database checkpoint\n"; 3780 info "emergency_perl_save: end database checkpoint\n";
3717 3781
3718 warn "emergency_perl_save: begin write uuid\n"; 3782 info "emergency_perl_save: begin write uuid\n";
3719 write_uuid_sync 1; 3783 write_uuid_sync 1;
3720 warn "emergency_perl_save: end write uuid\n"; 3784 info "emergency_perl_save: end write uuid\n";
3721 }; 3785 };
3722 3786
3723 warn "emergency_perl_save: starting sync()\n"; 3787 info "emergency_perl_save: starting sync()\n";
3724 IO::AIO::aio_sync sub { 3788 IO::AIO::aio_sync sub {
3725 warn "emergency_perl_save: finished sync()\n"; 3789 info "emergency_perl_save: finished sync()\n";
3726 }; 3790 };
3727 3791
3728 warn "emergency_perl_save: leave\n"; 3792 info "emergency_perl_save: leave\n";
3729} 3793}
3730 3794
3731sub post_cleanup { 3795sub post_cleanup {
3732 my ($make_core) = @_; 3796 my ($make_core) = @_;
3733 3797
3734 warn Carp::longmess "post_cleanup backtrace" 3798 error Carp::longmess "post_cleanup backtrace"
3735 if $make_core; 3799 if $make_core;
3736 3800
3737 my $fh = pidfile; 3801 my $fh = pidfile;
3738 unlink $PIDFILE if <$fh> == $$; 3802 unlink $PIDFILE if <$fh> == $$;
3739} 3803}
… …
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3823 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) { 3824 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"}; 3825 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3826# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 } 3827 }
3764 warn "cleared package $pkg\n";#d#
3765} 3828}
3766 3829
3767sub do_reload_perl() { 3830sub do_reload_perl() {
3768 # can/must only be called in main 3831 # can/must only be called in main
3769 if ($Coro::current != $Coro::main) { 3832 if (in_main) {
3770 warn "can only reload from main coroutine"; 3833 error "can only reload from main coroutine";
3771 return; 3834 return;
3772 } 3835 }
3773 3836
3774 return if $RELOAD++; 3837 return if $RELOAD++;
3775 3838
3776 my $t1 = AE::time; 3839 my $t1 = AE::time;
3777 3840
3778 while ($RELOAD) { 3841 while ($RELOAD) {
3779 warn "reloading..."; 3842 info "reloading...";
3780 3843
3781 warn "entering sync_job"; 3844 trace "entering sync_job";
3782 3845
3783 cf::sync_job { 3846 cf::sync_job {
3784 cf::write_runtime_sync; # external watchdog should not bark 3847 cf::write_runtime_sync; # external watchdog should not bark
3785 cf::emergency_save; 3848 cf::emergency_save;
3786 cf::write_runtime_sync; # external watchdog should not bark 3849 cf::write_runtime_sync; # external watchdog should not bark
3787 3850
3788 warn "syncing database to disk"; 3851 trace "syncing database to disk";
3789 BDB::db_env_txn_checkpoint $DB_ENV; 3852 BDB::db_env_txn_checkpoint $DB_ENV;
3790 3853
3791 # 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
3792 3855
3793 warn "flushing outstanding aio requests"; 3856 trace "flushing outstanding aio requests";
3794 while (IO::AIO::nreqs || BDB::nreqs) { 3857 while (IO::AIO::nreqs || BDB::nreqs) {
3795 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
3796 } 3859 }
3797 3860
3798 warn "cancelling all extension coros"; 3861 trace "cancelling all extension coros";
3799 $_->cancel for values %EXT_CORO; 3862 $_->cancel for values %EXT_CORO;
3800 %EXT_CORO = (); 3863 %EXT_CORO = ();
3801 3864
3802 warn "removing commands"; 3865 trace "removing commands";
3803 %COMMAND = (); 3866 %COMMAND = ();
3804 3867
3805 warn "removing ext/exti commands"; 3868 trace "removing ext/exti commands";
3806 %EXTCMD = (); 3869 %EXTCMD = ();
3807 %EXTICMD = (); 3870 %EXTICMD = ();
3808 3871
3809 warn "unloading/nuking all extensions"; 3872 trace "unloading/nuking all extensions";
3810 for my $pkg (@EXTS) { 3873 for my $pkg (@EXTS) {
3811 warn "... unloading $pkg"; 3874 trace "... unloading $pkg";
3812 3875
3813 if (my $cb = $pkg->can ("unload")) { 3876 if (my $cb = $pkg->can ("unload")) {
3814 eval { 3877 eval {
3815 $cb->($pkg); 3878 $cb->($pkg);
3816 1 3879 1
3817 } or warn "$pkg unloaded, but with errors: $@"; 3880 } or error "$pkg unloaded, but with errors: $@";
3818 } 3881 }
3819 3882
3820 warn "... clearing $pkg"; 3883 trace "... clearing $pkg";
3821 clear_package $pkg; 3884 clear_package $pkg;
3822 } 3885 }
3823 3886
3824 warn "unloading all perl modules loaded from $LIBDIR"; 3887 trace "unloading all perl modules loaded from $LIBDIR";
3825 while (my ($k, $v) = each %INC) { 3888 while (my ($k, $v) = each %INC) {
3826 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3827 3890
3828 warn "... unloading $k"; 3891 trace "... unloading $k";
3829 delete $INC{$k}; 3892 delete $INC{$k};
3830 3893
3831 $k =~ s/\.pm$//; 3894 $k =~ s/\.pm$//;
3832 $k =~ s/\//::/g; 3895 $k =~ s/\//::/g;
3833 3896
… …
3836 } 3899 }
3837 3900
3838 clear_package $k; 3901 clear_package $k;
3839 } 3902 }
3840 3903
3841 warn "getting rid of safe::, as good as possible"; 3904 trace "getting rid of safe::, as good as possible";
3842 clear_package "safe::$_" 3905 clear_package "safe::$_"
3843 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);
3844 3907
3845 warn "unloading cf.pm \"a bit\""; 3908 trace "unloading cf.pm \"a bit\"";
3846 delete $INC{"cf.pm"}; 3909 delete $INC{"cf.pm"};
3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3910 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3848 3911
3849 # don't, removes xs symbols, too, 3912 # don't, removes xs symbols, too,
3850 # and global variables created in xs 3913 # and global variables created in xs
3851 #clear_package __PACKAGE__; 3914 #clear_package __PACKAGE__;
3852 3915
3853 warn "unload completed, starting to reload now"; 3916 info "unload completed, starting to reload now";
3854 3917
3855 warn "reloading cf.pm"; 3918 trace "reloading cf.pm";
3856 require cf; 3919 require cf;
3857 cf::_connect_to_perl_1; 3920 cf::_connect_to_perl_1;
3858 3921
3859 warn "loading config and database again"; 3922 trace "loading config and database again";
3860 cf::reload_config; 3923 cf::reload_config;
3861 3924
3862 warn "loading extensions"; 3925 trace "loading extensions";
3863 cf::load_extensions; 3926 cf::load_extensions;
3864 3927
3865 if ($REATTACH_ON_RELOAD) { 3928 if ($REATTACH_ON_RELOAD) {
3866 warn "reattaching attachments to objects/players"; 3929 trace "reattaching attachments to objects/players";
3867 _global_reattach; # objects, sockets 3930 _global_reattach; # objects, sockets
3868 warn "reattaching attachments to maps"; 3931 trace "reattaching attachments to maps";
3869 reattach $_ for values %MAP; 3932 reattach $_ for values %MAP;
3870 warn "reattaching attachments to players"; 3933 trace "reattaching attachments to players";
3871 reattach $_ for values %PLAYER; 3934 reattach $_ for values %PLAYER;
3872 } 3935 }
3873 3936
3874 warn "running post_init jobs"; 3937 trace "running post_init jobs";
3875 (pop @POST_INIT)->(1) while @POST_INIT; 3938 (pop @POST_INIT)->(1) while @POST_INIT;
3876 3939
3877 warn "leaving sync_job"; 3940 trace "leaving sync_job";
3878 3941
3879 1 3942 1
3880 } or do { 3943 } or do {
3881 warn $@; 3944 error $@;
3882 cf::cleanup "error while reloading, exiting."; 3945 cf::cleanup "error while reloading, exiting.";
3883 }; 3946 };
3884 3947
3885 warn "reloaded"; 3948 info "reloaded";
3886 --$RELOAD; 3949 --$RELOAD;
3887 } 3950 }
3888 3951
3889 $t1 = AE::time - $t1; 3952 $t1 = AE::time - $t1;
3890 warn "reload completed in ${t1}s\n"; 3953 info "reload completed in ${t1}s\n";
3891}; 3954};
3892 3955
3893our $RELOAD_WATCHER; # used only during reload 3956our $RELOAD_WATCHER; # used only during reload
3894 3957
3895sub reload_perl() { 3958sub reload_perl() {
… …
3955 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4018 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3956 $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.;
3957 Coro::async_pool { 4020 Coro::async_pool {
3958 $Coro::current->{desc} = "runtime saver"; 4021 $Coro::current->{desc} = "runtime saver";
3959 write_runtime_sync 4022 write_runtime_sync
3960 or warn "ERROR: unable to write runtime file: $!"; 4023 or error "ERROR: unable to write runtime file: $!";
3961 }; 4024 };
3962 } 4025 }
3963 4026
3964 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4027 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3965 $sig->send; 4028 $sig->send;
… …
3973 4036
3974 if (0) { 4037 if (0) {
3975 if ($NEXT_TICK) { 4038 if ($NEXT_TICK) {
3976 my $jitter = $TICK_START - $NEXT_TICK; 4039 my $jitter = $TICK_START - $NEXT_TICK;
3977 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4040 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3978 warn "jitter $JITTER\n";#d# 4041 debug "jitter $JITTER\n";#d#
3979 } 4042 }
3980 } 4043 }
3981} 4044}
3982 4045
3983{ 4046{
… …
3993 $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;
3994 $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;
3995 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4058 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3996 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4059 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3997 4060
4061 (Coro::async { # async to keep sync_job from complaining
3998 cf::sync_job { 4062 cf::sync_job {
3999 eval { 4063 eval {
4000 BDB::db_env_open 4064 BDB::db_env_open
4001 $DB_ENV, 4065 $DB_ENV,
4002 $BDBDIR, 4066 $BDBDIR,
4003 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
4004 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4068 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
4005 0666; 4069 0666;
4006 4070
4007 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 $@;
4008 }; 4075 };
4009 4076 })->join;
4010 cf::cleanup "db_env_open(db): $@" if $@;
4011 };
4012 } 4077 }
4013 4078
4014 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub { 4079 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4015 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 { };
4016 }; 4081 };

Diff Legend

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