ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.179 by root, Thu Jan 18 20:39:00 2007 UTC vs.
Revision 1.185 by root, Fri Jan 19 23:32:52 2007 UTC

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

Diff Legend

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