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.179 by root, Thu Jan 18 20:39:00 2007 UTC vs.
Revision 1.186 by root, Sat Jan 20 01:12:39 2007 UTC

… …
349 my $runtime = cf::localdir . "/runtime"; 349 my $runtime = cf::localdir . "/runtime";
350 350
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 352 or return;
353 353
354 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 355 # 10 is the runtime save interval, for a monotonic clock
356 # 60 allows for the watchdog to kill the server.
357
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 358 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 359 and return;
357 360
358 aio_fsync $fh 361 aio_fsync $fh
359 and return; 362 and return;
… …
957 960
958sub exists($) { 961sub exists($) {
959 my ($login) = @_; 962 my ($login) = @_;
960 963
961 $cf::PLAYER{$login} 964 $cf::PLAYER{$login}
962 or cf::sync_job { !aio_stat $login } 965 or cf::sync_job { !aio_stat path $login }
963} 966}
964 967
965sub find($) { 968sub find($) {
966 return $cf::PLAYER{$_[0]} || do { 969 return $cf::PLAYER{$_[0]} || do {
967 my $login = $_[0]; 970 my $login = $_[0];
… …
1339 1342
1340 $map->load_header 1343 $map->load_header
1341 or return; 1344 or return;
1342 1345
1343 if ($map->should_reset) { 1346 if ($map->should_reset) {
1347 # doing this can freeze the server in a sync job, obviously
1344 $cf::WAIT_FOR_TICK->wait; 1348 #$cf::WAIT_FOR_TICK->wait;
1345 $map->reset; 1349 $map->reset;
1346 undef $guard; 1350 undef $guard;
1347 $map = find $path 1351 $map = find $path
1348 or return; 1352 or return;
1349 } 1353 }
… …
1441 1445
1442 cf::sync_job { $map->load }; 1446 cf::sync_job { $map->load };
1443} 1447}
1444 1448
1445our %MAP_PREFETCH; 1449our %MAP_PREFETCH;
1446our $MAP_PREFETCHER = Coro::async { 1450our $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 1451
1459sub find_async { 1452sub find_async {
1460 my ($path, $origin) = @_; 1453 my ($path, $origin) = @_;
1461 1454
1462 $path = normalise $path, $origin && $origin->{path}; 1455 $path = normalise $path, $origin && $origin->{path};
1463 1456
1464 if (my $map = $cf::MAP{$path}) { 1457 if (my $map = $cf::MAP{$path}) {
1465 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1458 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1466 } 1459 }
1467 1460
1468 $MAP_PREFETCH{$path} = 0; 1461 undef $MAP_PREFETCH{$path};
1469 $MAP_PREFETCHER->ready; 1462 $MAP_PREFETCHER ||= cf::async {
1463 while (%MAP_PREFETCH) {
1464 for my $path (keys %MAP_PREFETCH) {
1465 my $map = find $path
1466 or next;
1467 $map->load;
1468
1469 delete $MAP_PREFETCH{$path};
1470 }
1471 }
1472 undef $MAP_PREFETCHER;
1473 };
1470 1474
1471 () 1475 ()
1472} 1476}
1473 1477
1474sub save { 1478sub save {
… …
1812 1816
1813sub parse_random_map_params { 1817sub parse_random_map_params {
1814 my ($spec) = @_; 1818 my ($spec) = @_;
1815 1819
1816 my $rmp = { # defaults 1820 my $rmp = { # defaults
1817 xsize => -1, 1821 xsize => (cf::rndm 15, 40),
1818 ysize => -1, 1822 ysize => (cf::rndm 15, 40),
1823 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1824 #layout => string,
1819 }; 1825 };
1820 1826
1821 for (split /\n/, $spec) { 1827 for (split /\n/, $spec) {
1822 my ($k, $v) = split /\s+/, $_, 2; 1828 my ($k, $v) = split /\s+/, $_, 2;
1823 1829
… …
2172 sub db_sync() { 2178 sub db_sync() {
2173 db_save if $dirty; 2179 db_save if $dirty;
2174 undef $dirty; 2180 undef $dirty;
2175 } 2181 }
2176 2182
2177 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2183 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2178 db_sync; 2184 db_sync;
2179 }); 2185 });
2180 2186
2181 sub db_dirty() { 2187 sub db_dirty() {
2182 $dirty = 1; 2188 $dirty = 1;
… …
2240 }; 2246 };
2241 2247
2242 cfg_load; 2248 cfg_load;
2243 db_load; 2249 db_load;
2244 load_extensions; 2250 load_extensions;
2251
2252 $TICK_WATCHER->start;
2245 Event::loop; 2253 Event::loop;
2246} 2254}
2247 2255
2248############################################################################# 2256#############################################################################
2249# initialisation and cleanup 2257# initialisation and cleanup
… …
2291} 2299}
2292 2300
2293sub reload() { 2301sub reload() {
2294 # can/must only be called in main 2302 # can/must only be called in main
2295 if ($Coro::current != $Coro::main) { 2303 if ($Coro::current != $Coro::main) {
2296 warn "can only reload from main coroutine\n"; 2304 warn "can only reload from main coroutine";
2297 return; 2305 return;
2298 } 2306 }
2299 2307
2300 warn "reloading..."; 2308 warn "reloading...";
2301 2309
2302 warn "freezing server"; 2310 warn "cancelling server ticker";
2303 my $guard = freeze_mainloop; 2311 $TICK_WATCHER->cancel;
2312
2304 cf::emergency_save; 2313 cf::emergency_save;
2305
2306 warn "sync database to disk";
2307 cf::db_sync;
2308 IO::AIO::flush;
2309 2314
2310 eval { 2315 eval {
2311 # if anything goes wrong in here, we should simply crash as we already saved 2316 # if anything goes wrong in here, we should simply crash as we already saved
2312 2317
2318 warn "syncing database to disk";
2319 cf::db_sync;
2320
2313 warn "cancel all watchers"; 2321 warn "cancelling all WF_AUTOCANCEL watchers";
2314 for (Event::all_watchers) { 2322 for (Event::all_watchers) {
2315 $_->cancel if $_->data & WF_AUTOCANCEL; 2323 $_->cancel if $_->data & WF_AUTOCANCEL;
2316 } 2324 }
2317 2325
2326 warn "flushing outstanding aio requests";
2327 for (;;) {
2328 IO::AIO::flush;
2329 Coro::cede;
2330 last unless IO::AIO::nreqs;
2331 warn "iterate...";
2332 }
2333
2318 warn "cancel all extension coros"; 2334 warn "cancelling all extension coros";
2319 $_->cancel for values %EXT_CORO; 2335 $_->cancel for values %EXT_CORO;
2320 %EXT_CORO = (); 2336 %EXT_CORO = ();
2321 2337
2322 warn "remove commands"; 2338 warn "removing commands";
2323 %COMMAND = (); 2339 %COMMAND = ();
2324 2340
2325 warn "remove ext commands"; 2341 warn "removing ext commands";
2326 %EXTCMD = (); 2342 %EXTCMD = ();
2327 2343
2328 warn "unload/nuke all extensions"; 2344 warn "unloading/nuking all extensions";
2329 for my $pkg (@EXTS) { 2345 for my $pkg (@EXTS) {
2330 warn "... unloading $pkg"; 2346 warn "... unloading $pkg";
2331 2347
2332 if (my $cb = $pkg->can ("unload")) { 2348 if (my $cb = $pkg->can ("unload")) {
2333 eval { 2349 eval {
… …
2338 2354
2339 warn "... nuking $pkg"; 2355 warn "... nuking $pkg";
2340 Symbol::delete_package $pkg; 2356 Symbol::delete_package $pkg;
2341 } 2357 }
2342 2358
2343 warn "unload all perl modules loaded from $LIBDIR"; 2359 warn "unloading all perl modules loaded from $LIBDIR";
2344 while (my ($k, $v) = each %INC) { 2360 while (my ($k, $v) = each %INC) {
2345 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2361 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2346 2362
2347 warn "removing <$k>"; 2363 warn "... unloading $k";
2348 delete $INC{$k}; 2364 delete $INC{$k};
2349 2365
2350 $k =~ s/\.pm$//; 2366 $k =~ s/\.pm$//;
2351 $k =~ s/\//::/g; 2367 $k =~ s/\//::/g;
2352 2368
… …
2355 } 2371 }
2356 2372
2357 Symbol::delete_package $k; 2373 Symbol::delete_package $k;
2358 } 2374 }
2359 2375
2360 warn "get rid of safe::, as good as possible"; 2376 warn "getting rid of safe::, as good as possible";
2361 Symbol::delete_package "safe::$_" 2377 Symbol::delete_package "safe::$_"
2362 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2378 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2363 2379
2364 warn "unload cf.pm \"a bit\""; 2380 warn "unloading cf.pm \"a bit\"";
2365 delete $INC{"cf.pm"}; 2381 delete $INC{"cf.pm"};
2366 2382
2367 # don't, removes xs symbols, too, 2383 # don't, removes xs symbols, too,
2368 # and global variables created in xs 2384 # and global variables created in xs
2369 #Symbol::delete_package __PACKAGE__; 2385 #Symbol::delete_package __PACKAGE__;
2370 2386
2387 warn "unload completed, starting to reload now";
2388
2371 warn "reloading cf.pm"; 2389 warn "reloading cf.pm";
2372 require cf; 2390 require cf;
2373 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2374 2392
2375 warn "load config and database again"; 2393 warn "loading config and database again";
2376 cf::cfg_load; 2394 cf::cfg_load;
2377 cf::db_load; 2395 cf::db_load;
2378 2396
2379 warn "load extensions"; 2397 warn "loading extensions";
2380 cf::load_extensions; 2398 cf::load_extensions;
2381 2399
2382 warn "reattach attachments to objects/players"; 2400 warn "reattaching attachments to objects/players";
2383 _global_reattach; 2401 _global_reattach;
2384 warn "reattach attachments to maps"; 2402 warn "reattaching attachments to maps";
2385 reattach $_ for values %MAP; 2403 reattach $_ for values %MAP;
2404
2405 warn "restarting server ticker";
2406
2407 $TICK_WATCHER->start;
2386 }; 2408 };
2387 2409
2388 if ($@) { 2410 if ($@) {
2389 warn $@; 2411 warn $@;
2390 warn "error while reloading, exiting."; 2412 warn "error while reloading, exiting.";
… …
2412 } 2434 }
2413}; 2435};
2414 2436
2415unshift @INC, $LIBDIR; 2437unshift @INC, $LIBDIR;
2416 2438
2439my $bug_warning = 0;
2440
2417$TICK_WATCHER = Event->timer ( 2441$TICK_WATCHER = Event->timer (
2418 reentrant => 0, 2442 reentrant => 0,
2443 parked => 1,
2419 prio => 0, 2444 prio => 0,
2420 at => $NEXT_TICK || $TICK, 2445 at => $NEXT_TICK || $TICK,
2421 data => WF_AUTOCANCEL, 2446 data => WF_AUTOCANCEL,
2422 cb => sub { 2447 cb => sub {
2448 if ($Coro::current != $Coro::main) {
2449 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2450 unless ++$bug_warning > 10;
2451 return;
2452 }
2453
2423 $NOW = Event::time; 2454 $NOW = Event::time;
2424 2455
2425 cf::server_tick; # one server iteration 2456 cf::server_tick; # one server iteration
2426 $RUNTIME += $TICK; 2457 $RUNTIME += $TICK;
2427 $NEXT_TICK += $TICK; 2458 $NEXT_TICK += $TICK;
… …
2447 cb => \&IO::AIO::poll_cb, 2478 cb => \&IO::AIO::poll_cb,
2448); 2479);
2449 2480
2450$WRITE_RUNTIME_WATCHER = Event->timer ( 2481$WRITE_RUNTIME_WATCHER = Event->timer (
2451 data => WF_AUTOCANCEL, 2482 data => WF_AUTOCANCEL,
2452 after => 0, 2483 after => 1,
2453 interval => 10, 2484 interval => 10,
2454 cb => sub { 2485 prio => 6, # keep it lowest so it acts like a watchdog
2455 (Coro::unblock_sub { 2486 cb => Coro::unblock_sub {
2456 write_runtime 2487 write_runtime
2457 or warn "ERROR: unable to write runtime file: $!"; 2488 or warn "ERROR: unable to write runtime file: $!";
2458 })->();
2459 }, 2489 },
2460); 2490);
2461 2491
2462END { cf::emergency_save } 2492END { cf::emergency_save }
2463 2493

Diff Legend

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