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.181 by root, Fri Jan 19 15:29:52 2007 UTC vs.
Revision 1.184 by root, Fri Jan 19 22:47:57 2007 UTC

… …
1441 1441
1442 cf::sync_job { $map->load }; 1442 cf::sync_job { $map->load };
1443} 1443}
1444 1444
1445our %MAP_PREFETCH; 1445our %MAP_PREFETCH;
1446our $MAP_PREFETCHER = Coro::async { 1446our $MAP_PREFETCHER = undef;
1447 while () {
1448 for my $path (keys %MAP_PREFETCH) {
1449 my $map = find $path
1450 or next;
1451 $map->load;
1452
1453 delete $MAP_PREFETCH{$path};
1454 }
1455 Coro::schedule;
1456 }
1457};
1458 1447
1459sub find_async { 1448sub find_async {
1460 my ($path, $origin) = @_; 1449 my ($path, $origin) = @_;
1461 1450
1462 $path = normalise $path, $origin && $origin->{path}; 1451 $path = normalise $path, $origin && $origin->{path};
1463 1452
1464 if (my $map = $cf::MAP{$path}) { 1453 if (my $map = $cf::MAP{$path}) {
1465 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1454 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1466 } 1455 }
1467 1456
1468 $MAP_PREFETCH{$path} = 0; 1457 undef $MAP_PREFETCH{$path};
1469 $MAP_PREFETCHER->ready; 1458 $MAP_PREFETCHER ||= cf::async {
1459 while (%MAP_PREFETCH) {
1460 for my $path (keys %MAP_PREFETCH) {
1461 my $map = find $path
1462 or next;
1463 $map->load;
1464
1465 delete $MAP_PREFETCH{$path};
1466 }
1467 }
1468 undef $MAP_PREFETCHER;
1469 };
1470 1470
1471 () 1471 ()
1472} 1472}
1473 1473
1474sub save { 1474sub save {
… …
1815 1815
1816 my $rmp = { # defaults 1816 my $rmp = { # defaults
1817 xsize => (cf::rndm 15, 40), 1817 xsize => (cf::rndm 15, 40),
1818 ysize => (cf::rndm 15, 40), 1818 ysize => (cf::rndm 15, 40),
1819 symmetry => (cf::rndm 1, cf::SYMMETRY_XY), 1819 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1820 #layout => string 1820 #layout => string,
1821 }; 1821 };
1822 1822
1823 for (split /\n/, $spec) { 1823 for (split /\n/, $spec) {
1824 my ($k, $v) = split /\s+/, $_, 2; 1824 my ($k, $v) = split /\s+/, $_, 2;
1825 1825
… …
2174 sub db_sync() { 2174 sub db_sync() {
2175 db_save if $dirty; 2175 db_save if $dirty;
2176 undef $dirty; 2176 undef $dirty;
2177 } 2177 }
2178 2178
2179 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2179 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2180 db_sync; 2180 db_sync;
2181 }); 2181 });
2182 2182
2183 sub db_dirty() { 2183 sub db_dirty() {
2184 $dirty = 1; 2184 $dirty = 1;
… …
2242 }; 2242 };
2243 2243
2244 cfg_load; 2244 cfg_load;
2245 db_load; 2245 db_load;
2246 load_extensions; 2246 load_extensions;
2247
2248 $TICK_WATCHER->start;
2247 Event::loop; 2249 Event::loop;
2248} 2250}
2249 2251
2250############################################################################# 2252#############################################################################
2251# initialisation and cleanup 2253# initialisation and cleanup
… …
2293} 2295}
2294 2296
2295sub reload() { 2297sub reload() {
2296 # can/must only be called in main 2298 # can/must only be called in main
2297 if ($Coro::current != $Coro::main) { 2299 if ($Coro::current != $Coro::main) {
2298 warn "can only reload from main coroutine\n"; 2300 warn "can only reload from main coroutine";
2299 return; 2301 return;
2300 } 2302 }
2301 2303
2302 warn "reloading..."; 2304 warn "reloading...";
2303 2305
2304 warn "freezing server"; 2306 warn "cancelling server ticker";
2305 my $guard = freeze_mainloop; 2307 $TICK_WATCHER->cancel;
2308
2306 cf::emergency_save; 2309 cf::emergency_save;
2307
2308 warn "sync database to disk";
2309 cf::db_sync;
2310 IO::AIO::flush;
2311 2310
2312 eval { 2311 eval {
2313 # if anything goes wrong in here, we should simply crash as we already saved 2312 # if anything goes wrong in here, we should simply crash as we already saved
2314 2313
2314 warn "syncing database to disk";
2315 cf::db_sync;
2316
2315 warn "cancel all watchers"; 2317 warn "cancelling all WF_AUTOCANCEL watchers";
2316 for (Event::all_watchers) { 2318 for (Event::all_watchers) {
2317 $_->cancel if $_->data & WF_AUTOCANCEL; 2319 $_->cancel if $_->data & WF_AUTOCANCEL;
2318 } 2320 }
2319 2321
2322 warn "flushing outstanding aio requests";
2323 for (;;) {
2324 IO::AIO::flush;
2325 Coro::cede;
2326 last unless IO::AIO::nreqs;
2327 warn "iterate...";
2328 }
2329
2320 warn "cancel all extension coros"; 2330 warn "cancelling all extension coros";
2321 $_->cancel for values %EXT_CORO; 2331 $_->cancel for values %EXT_CORO;
2322 %EXT_CORO = (); 2332 %EXT_CORO = ();
2323 2333
2324 warn "remove commands"; 2334 warn "removing commands";
2325 %COMMAND = (); 2335 %COMMAND = ();
2326 2336
2327 warn "remove ext commands"; 2337 warn "removing ext commands";
2328 %EXTCMD = (); 2338 %EXTCMD = ();
2329 2339
2330 warn "unload/nuke all extensions"; 2340 warn "unloading/nuking all extensions";
2331 for my $pkg (@EXTS) { 2341 for my $pkg (@EXTS) {
2332 warn "... unloading $pkg"; 2342 warn "... unloading $pkg";
2333 2343
2334 if (my $cb = $pkg->can ("unload")) { 2344 if (my $cb = $pkg->can ("unload")) {
2335 eval { 2345 eval {
… …
2340 2350
2341 warn "... nuking $pkg"; 2351 warn "... nuking $pkg";
2342 Symbol::delete_package $pkg; 2352 Symbol::delete_package $pkg;
2343 } 2353 }
2344 2354
2345 warn "unload all perl modules loaded from $LIBDIR"; 2355 warn "unloading all perl modules loaded from $LIBDIR";
2346 while (my ($k, $v) = each %INC) { 2356 while (my ($k, $v) = each %INC) {
2347 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2357 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2348 2358
2349 warn "removing <$k>"; 2359 warn "... unloading $k";
2350 delete $INC{$k}; 2360 delete $INC{$k};
2351 2361
2352 $k =~ s/\.pm$//; 2362 $k =~ s/\.pm$//;
2353 $k =~ s/\//::/g; 2363 $k =~ s/\//::/g;
2354 2364
… …
2357 } 2367 }
2358 2368
2359 Symbol::delete_package $k; 2369 Symbol::delete_package $k;
2360 } 2370 }
2361 2371
2362 warn "get rid of safe::, as good as possible"; 2372 warn "getting rid of safe::, as good as possible";
2363 Symbol::delete_package "safe::$_" 2373 Symbol::delete_package "safe::$_"
2364 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2374 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2365 2375
2366 warn "unload cf.pm \"a bit\""; 2376 warn "unloading cf.pm \"a bit\"";
2367 delete $INC{"cf.pm"}; 2377 delete $INC{"cf.pm"};
2368 2378
2369 # don't, removes xs symbols, too, 2379 # don't, removes xs symbols, too,
2370 # and global variables created in xs 2380 # and global variables created in xs
2371 #Symbol::delete_package __PACKAGE__; 2381 #Symbol::delete_package __PACKAGE__;
2372 2382
2383 warn "unload completed, starting to reload now";
2384
2373 warn "reloading cf.pm"; 2385 warn "reloading cf.pm";
2374 require cf; 2386 require cf;
2375 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2387 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2376 2388
2377 warn "load config and database again"; 2389 warn "loading config and database again";
2378 cf::cfg_load; 2390 cf::cfg_load;
2379 cf::db_load; 2391 cf::db_load;
2380 2392
2381 warn "load extensions"; 2393 warn "loading extensions";
2382 cf::load_extensions; 2394 cf::load_extensions;
2383 2395
2384 warn "reattach attachments to objects/players"; 2396 warn "reattaching attachments to objects/players";
2385 _global_reattach; 2397 _global_reattach;
2386 warn "reattach attachments to maps"; 2398 warn "reattaching attachments to maps";
2387 reattach $_ for values %MAP; 2399 reattach $_ for values %MAP;
2400
2401 warn "restarting server ticker";
2402
2403 $TICK_WATCHER->start;
2388 }; 2404 };
2389 2405
2390 if ($@) { 2406 if ($@) {
2391 warn $@; 2407 warn $@;
2392 warn "error while reloading, exiting."; 2408 warn "error while reloading, exiting.";
… …
2414 } 2430 }
2415}; 2431};
2416 2432
2417unshift @INC, $LIBDIR; 2433unshift @INC, $LIBDIR;
2418 2434
2435my $bug_warning = 0;
2436
2419$TICK_WATCHER = Event->timer ( 2437$TICK_WATCHER = Event->timer (
2420 reentrant => 0, 2438 reentrant => 0,
2439 parked => 1,
2421 prio => 0, 2440 prio => 0,
2422 at => $NEXT_TICK || $TICK, 2441 at => $NEXT_TICK || $TICK,
2423 data => WF_AUTOCANCEL, 2442 data => WF_AUTOCANCEL,
2424 cb => sub { 2443 cb => sub {
2444 if ($Coro::current != $Coro::main) {
2445 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2446 unless ++$bug_warning > 10;
2447 return;
2448 }
2449
2425 $NOW = Event::time; 2450 $NOW = Event::time;
2426 2451
2427 cf::server_tick; # one server iteration 2452 cf::server_tick; # one server iteration
2428 $RUNTIME += $TICK; 2453 $RUNTIME += $TICK;
2429 $NEXT_TICK += $TICK; 2454 $NEXT_TICK += $TICK;
… …
2449 cb => \&IO::AIO::poll_cb, 2474 cb => \&IO::AIO::poll_cb,
2450); 2475);
2451 2476
2452$WRITE_RUNTIME_WATCHER = Event->timer ( 2477$WRITE_RUNTIME_WATCHER = Event->timer (
2453 data => WF_AUTOCANCEL, 2478 data => WF_AUTOCANCEL,
2454 after => 0, 2479 after => 1,
2455 interval => 10, 2480 interval => 10,
2456 cb => sub { 2481 cb => Coro::unblock_sub {
2457 (Coro::unblock_sub {
2458 write_runtime 2482 write_runtime
2459 or warn "ERROR: unable to write runtime file: $!"; 2483 or warn "ERROR: unable to write runtime file: $!";
2460 })->();
2461 }, 2484 },
2462); 2485);
2463 2486
2464END { cf::emergency_save } 2487END { cf::emergency_save }
2465 2488

Diff Legend

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