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.175 by root, Sun Jan 14 21:20:51 2007 UTC vs.
Revision 1.183 by root, Fri Jan 19 19:42:37 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];
… …
1121our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1122our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1123 1123
1124sub generate_random_map { 1124sub generate_random_map {
1125 my ($self, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1126
1127 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1128 $self->_create_random_map ( 1127 $self->_create_random_map (
1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1442 1441
1443 cf::sync_job { $map->load }; 1442 cf::sync_job { $map->load };
1444} 1443}
1445 1444
1446our %MAP_PREFETCH; 1445our %MAP_PREFETCH;
1447our $MAP_PREFETCHER = Coro::async { 1446our $MAP_PREFETCHER = undef;
1448 while () {
1449 for my $path (keys %MAP_PREFETCH) {
1450 my $map = find $path
1451 or next;
1452 $map->load;
1453
1454 delete $MAP_PREFETCH{$path};
1455 }
1456 Coro::schedule;
1457 }
1458};
1459 1447
1460sub find_async { 1448sub find_async {
1461 my ($path, $origin) = @_; 1449 my ($path, $origin) = @_;
1462 1450
1463 $path = normalise $path, $origin && $origin->{path}; 1451 $path = normalise $path, $origin && $origin->{path};
1464 1452
1465 if (my $map = $cf::MAP{$path}) { 1453 if (my $map = $cf::MAP{$path}) {
1466 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1454 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1467 } 1455 }
1468 1456
1469 $MAP_PREFETCH{$path} = 0; 1457 undef $MAP_PREFETCH{$path};
1470 $MAP_PREFETCHER->ready; 1458 $MAP_PREFETCHER ||= cf::async {
1459 while (%MAP_PREFETCH) {
1460 for my $path (keys %MAP_PREFETCH) {
1461 warn "prefetching $path...\n";#d#
1462 my $map = find $path
1463 or next;
1464 $map->load;
1465
1466 delete $MAP_PREFETCH{$path};
1467 }
1468 }
1469 undef $MAP_PREFETCHER;
1470 };
1471 1471
1472 () 1472 ()
1473} 1473}
1474 1474
1475sub save { 1475sub save {
… …
1813 1813
1814sub parse_random_map_params { 1814sub parse_random_map_params {
1815 my ($spec) = @_; 1815 my ($spec) = @_;
1816 1816
1817 my $rmp = { # defaults 1817 my $rmp = { # defaults
1818 xsize => 10, 1818 xsize => (cf::rndm 15, 40),
1819 ysize => 10, 1819 ysize => (cf::rndm 15, 40),
1820 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1821 #layout => string,
1820 }; 1822 };
1821 1823
1822 for (split /\n/, $spec) { 1824 for (split /\n/, $spec) {
1823 my ($k, $v) = split /\s+/, $_, 2; 1825 my ($k, $v) = split /\s+/, $_, 2;
1824 1826
… …
1828 $rmp 1830 $rmp
1829} 1831}
1830 1832
1831sub prepare_random_map { 1833sub prepare_random_map {
1832 my ($exit) = @_; 1834 my ($exit) = @_;
1835
1836 my $guard = cf::lock_acquire "exit_prepare:$exit";
1833 1837
1834 # all this does is basically replace the /! path by 1838 # all this does is basically replace the /! path by
1835 # a new random map path (?random/...) with a seed 1839 # a new random map path (?random/...) with a seed
1836 # that depends on the exit object 1840 # that depends on the exit object
1837 1841
… …
1846 1850
1847 $rmp->{random_seed} ||= $exit->random_seed; 1851 $rmp->{random_seed} ||= $exit->random_seed;
1848 1852
1849 my $data = cf::to_json $rmp; 1853 my $data = cf::to_json $rmp;
1850 my $md5 = Digest::MD5::md5_hex $data; 1854 my $md5 = Digest::MD5::md5_hex $data;
1855 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1851 1856
1852 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1857 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1853 aio_write $fh, 0, (length $data), $data, 0; 1858 aio_write $fh, 0, (length $data), $data, 0;
1859 undef $fh;
1860 aio_rename "$meta~", $meta;
1854 1861
1855 $exit->slaying ("?random/$md5"); 1862 $exit->slaying ("?random/$md5");
1856 $exit->msg (undef); 1863 $exit->msg (undef);
1857 } 1864 }
1858} 1865}
… …
2168 sub db_sync() { 2175 sub db_sync() {
2169 db_save if $dirty; 2176 db_save if $dirty;
2170 undef $dirty; 2177 undef $dirty;
2171 } 2178 }
2172 2179
2173 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 {
2174 db_sync; 2181 db_sync;
2175 }); 2182 });
2176 2183
2177 sub db_dirty() { 2184 sub db_dirty() {
2178 $dirty = 1; 2185 $dirty = 1;
… …
2229sub main { 2236sub main {
2230 # we must not ever block the main coroutine 2237 # we must not ever block the main coroutine
2231 local $Coro::idle = sub { 2238 local $Coro::idle = sub {
2232 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2239 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2233 (async { 2240 (async {
2234 warn "BP1\n";#d#
2235 Event::one_event; 2241 Event::one_event;
2236 warn "BP2\n";#d#
2237 })->prio (Coro::PRIO_MAX); 2242 })->prio (Coro::PRIO_MAX);
2238 }; 2243 };
2239 2244
2240 cfg_load; 2245 cfg_load;
2241 db_load; 2246 db_load;
2242 load_extensions; 2247 load_extensions;
2248
2249 $TICK_WATCHER->start;
2243 Event::loop; 2250 Event::loop;
2244} 2251}
2245 2252
2246############################################################################# 2253#############################################################################
2247# initialisation and cleanup 2254# initialisation and cleanup
… …
2289} 2296}
2290 2297
2291sub reload() { 2298sub reload() {
2292 # can/must only be called in main 2299 # can/must only be called in main
2293 if ($Coro::current != $Coro::main) { 2300 if ($Coro::current != $Coro::main) {
2294 warn "can only reload from main coroutine\n"; 2301 warn "can only reload from main coroutine";
2295 return; 2302 return;
2296 } 2303 }
2297 2304
2298 warn "reloading..."; 2305 warn "reloading...";
2299 2306
2300 warn "freezing server"; 2307 warn "cancelling server ticker";
2301 my $guard = freeze_mainloop; 2308 $TICK_WATCHER->cancel;
2309
2302 cf::emergency_save; 2310 cf::emergency_save;
2303
2304 warn "sync database to disk";
2305 cf::db_sync;
2306 IO::AIO::flush;
2307 2311
2308 eval { 2312 eval {
2309 # 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
2310 2314
2315 warn "syncing database to disk";
2316 cf::db_sync;
2317
2311 warn "cancel all watchers"; 2318 warn "cancelling all WF_AUTOCANCEL watchers";
2312 for (Event::all_watchers) { 2319 for (Event::all_watchers) {
2313 $_->cancel if $_->data & WF_AUTOCANCEL; 2320 $_->cancel if $_->data & WF_AUTOCANCEL;
2314 } 2321 }
2315 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
2316 warn "cancel all extension coros"; 2331 warn "cancelling all extension coros";
2317 $_->cancel for values %EXT_CORO; 2332 $_->cancel for values %EXT_CORO;
2318 %EXT_CORO = (); 2333 %EXT_CORO = ();
2319 2334
2320 warn "remove commands"; 2335 warn "removing commands";
2321 %COMMAND = (); 2336 %COMMAND = ();
2322 2337
2323 warn "remove ext commands"; 2338 warn "removing ext commands";
2324 %EXTCMD = (); 2339 %EXTCMD = ();
2325 2340
2326 warn "unload/nuke all extensions"; 2341 warn "unloading/nuking all extensions";
2327 for my $pkg (@EXTS) { 2342 for my $pkg (@EXTS) {
2328 warn "... unloading $pkg"; 2343 warn "... unloading $pkg";
2329 2344
2330 if (my $cb = $pkg->can ("unload")) { 2345 if (my $cb = $pkg->can ("unload")) {
2331 eval { 2346 eval {
… …
2336 2351
2337 warn "... nuking $pkg"; 2352 warn "... nuking $pkg";
2338 Symbol::delete_package $pkg; 2353 Symbol::delete_package $pkg;
2339 } 2354 }
2340 2355
2341 warn "unload all perl modules loaded from $LIBDIR"; 2356 warn "unloading all perl modules loaded from $LIBDIR";
2342 while (my ($k, $v) = each %INC) { 2357 while (my ($k, $v) = each %INC) {
2343 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2358 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2344 2359
2345 warn "removing <$k>"; 2360 warn "... unloading $k";
2346 delete $INC{$k}; 2361 delete $INC{$k};
2347 2362
2348 $k =~ s/\.pm$//; 2363 $k =~ s/\.pm$//;
2349 $k =~ s/\//::/g; 2364 $k =~ s/\//::/g;
2350 2365
… …
2353 } 2368 }
2354 2369
2355 Symbol::delete_package $k; 2370 Symbol::delete_package $k;
2356 } 2371 }
2357 2372
2358 warn "get rid of safe::, as good as possible"; 2373 warn "getting rid of safe::, as good as possible";
2359 Symbol::delete_package "safe::$_" 2374 Symbol::delete_package "safe::$_"
2360 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);
2361 2376
2362 warn "unload cf.pm \"a bit\""; 2377 warn "unloading cf.pm \"a bit\"";
2363 delete $INC{"cf.pm"}; 2378 delete $INC{"cf.pm"};
2364 2379
2365 # don't, removes xs symbols, too, 2380 # don't, removes xs symbols, too,
2366 # and global variables created in xs 2381 # and global variables created in xs
2367 #Symbol::delete_package __PACKAGE__; 2382 #Symbol::delete_package __PACKAGE__;
2368 2383
2384 warn "unload completed, starting to reload now";
2385
2369 warn "reloading cf.pm"; 2386 warn "reloading cf.pm";
2370 require cf; 2387 require cf;
2371 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2372 2389
2373 warn "load config and database again"; 2390 warn "loading config and database again";
2374 cf::cfg_load; 2391 cf::cfg_load;
2375 cf::db_load; 2392 cf::db_load;
2376 2393
2377 warn "load extensions"; 2394 warn "loading extensions";
2378 cf::load_extensions; 2395 cf::load_extensions;
2379 2396
2380 warn "reattach attachments to objects/players"; 2397 warn "reattaching attachments to objects/players";
2381 _global_reattach; 2398 _global_reattach;
2382 warn "reattach attachments to maps"; 2399 warn "reattaching attachments to maps";
2383 reattach $_ for values %MAP; 2400 reattach $_ for values %MAP;
2401
2402 warn "restarting server ticker";
2403
2404 $TICK_WATCHER->start;
2384 }; 2405 };
2385 2406
2386 if ($@) { 2407 if ($@) {
2387 warn $@; 2408 warn $@;
2388 warn "error while reloading, exiting."; 2409 warn "error while reloading, exiting.";
… …
2410 } 2431 }
2411}; 2432};
2412 2433
2413unshift @INC, $LIBDIR; 2434unshift @INC, $LIBDIR;
2414 2435
2436my $bug_warning = 0;
2437
2415$TICK_WATCHER = Event->timer ( 2438$TICK_WATCHER = Event->timer (
2416 reentrant => 0, 2439 reentrant => 0,
2440 parked => 1,
2417 prio => 0, 2441 prio => 0,
2418 at => $NEXT_TICK || $TICK, 2442 at => $NEXT_TICK || $TICK,
2419 data => WF_AUTOCANCEL, 2443 data => WF_AUTOCANCEL,
2420 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
2421 $NOW = Event::time; 2451 $NOW = Event::time;
2422 2452
2423 cf::server_tick; # one server iteration 2453 cf::server_tick; # one server iteration
2424 $RUNTIME += $TICK; 2454 $RUNTIME += $TICK;
2425 $NEXT_TICK += $TICK; 2455 $NEXT_TICK += $TICK;
… …
2445 cb => \&IO::AIO::poll_cb, 2475 cb => \&IO::AIO::poll_cb,
2446); 2476);
2447 2477
2448$WRITE_RUNTIME_WATCHER = Event->timer ( 2478$WRITE_RUNTIME_WATCHER = Event->timer (
2449 data => WF_AUTOCANCEL, 2479 data => WF_AUTOCANCEL,
2450 after => 0, 2480 after => 1,
2451 interval => 10, 2481 interval => 10,
2452 cb => sub { 2482 cb => Coro::unblock_sub {
2453 (Coro::unblock_sub {
2454 write_runtime 2483 write_runtime
2455 or warn "ERROR: unable to write runtime file: $!"; 2484 or warn "ERROR: unable to write runtime file: $!";
2456 })->();
2457 }, 2485 },
2458); 2486);
2459 2487
2460END { cf::emergency_save } 2488END { cf::emergency_save }
2461 2489

Diff Legend

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