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.171 by root, Sun Jan 14 12:24:48 2007 UTC vs.
Revision 1.186 by root, Sat Jan 20 01:12:39 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3 (); 13use Coro 3.4 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
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];
… …
1113 1116
1114use Fcntl; 1117use Fcntl;
1115use Coro::AIO; 1118use Coro::AIO;
1116 1119
1117use overload 1120use overload
1118 '""' => \&as_string; 1121 '""' => \&as_string,
1122 fallback => 1;
1119 1123
1120our $MAX_RESET = 3600; 1124our $MAX_RESET = 3600;
1121our $DEFAULT_RESET = 3000; 1125our $DEFAULT_RESET = 3000;
1122 1126
1123sub generate_random_map { 1127sub generate_random_map {
1124 my ($self, $rmp) = @_; 1128 my ($self, $rmp) = @_;
1125
1126 # mit "rum" bekleckern, nicht 1129 # mit "rum" bekleckern, nicht
1127 $self->_create_random_map ( 1130 $self->_create_random_map (
1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1131 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1132 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1133 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1151 1154
1152# also paths starting with '/' 1155# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1156$EXT_MAP{"cf::map"} = qr{^(?=/)};
1154 1157
1155sub thawer_merge { 1158sub thawer_merge {
1159 my ($self, $merge) = @_;
1160
1156 # we have to keep some variables in memory intact 1161 # we have to keep some variables in memory intact
1157 local $_[0]{path}; 1162 local $self->{path};
1163 local $self->{load_path};
1158 local $_[0]{deny_save}; 1164 local $self->{deny_save};
1159 local $_[0]{deny_reset}; 1165 local $self->{deny_reset};
1160 1166
1161 $_[0]->SUPER::thawer_merge ($_[1]); 1167 $self->SUPER::thawer_merge ($merge);
1162} 1168}
1163 1169
1164sub normalise { 1170sub normalise {
1165 my ($path, $base) = @_; 1171 my ($path, $base) = @_;
1166 1172
… …
1336 1342
1337 $map->load_header 1343 $map->load_header
1338 or return; 1344 or return;
1339 1345
1340 if ($map->should_reset) { 1346 if ($map->should_reset) {
1347 # doing this can freeze the server in a sync job, obviously
1341 $cf::WAIT_FOR_TICK->wait; 1348 #$cf::WAIT_FOR_TICK->wait;
1342 $map->reset; 1349 $map->reset;
1343 undef $guard; 1350 undef $guard;
1344 $map = find $path 1351 $map = find $path
1345 or return; 1352 or return;
1346 } 1353 }
… …
1438 1445
1439 cf::sync_job { $map->load }; 1446 cf::sync_job { $map->load };
1440} 1447}
1441 1448
1442our %MAP_PREFETCH; 1449our %MAP_PREFETCH;
1443our $MAP_PREFETCHER = Coro::async { 1450our $MAP_PREFETCHER = undef;
1444 while () {
1445 for my $path (keys %MAP_PREFETCH) {
1446 my $map = find $path
1447 or next;
1448 $map->load;
1449
1450 delete $MAP_PREFETCH{$path};
1451 }
1452 Coro::schedule;
1453 }
1454};
1455 1451
1456sub find_async { 1452sub find_async {
1457 my ($path, $origin) = @_; 1453 my ($path, $origin) = @_;
1458 1454
1459 $path = normalise $path, $origin && $origin->{path}; 1455 $path = normalise $path, $origin && $origin->{path};
1460 1456
1461 if (my $map = $cf::MAP{$path}) { 1457 if (my $map = $cf::MAP{$path}) {
1462 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1458 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1463 } 1459 }
1464 1460
1465 $MAP_PREFETCH{$path} = 0; 1461 undef $MAP_PREFETCH{$path};
1466 $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 };
1467 1474
1468 () 1475 ()
1469} 1476}
1470 1477
1471sub save { 1478sub save {
… …
1531 my ($self) = @_; 1538 my ($self) = @_;
1532 1539
1533 $self->reset_at <= $cf::RUNTIME 1540 $self->reset_at <= $cf::RUNTIME
1534} 1541}
1535 1542
1536sub rename {
1537 my ($self, $new_path) = @_;
1538
1539 normalise $new_path;
1540
1541 $self->unlink_save;
1542
1543 delete $cf::MAP{$self->path};
1544 $self->{path} = $new_path; $self->path ($self->{path});
1545 $cf::MAP{$self->path} = $self;
1546
1547 $self->save;
1548}
1549
1550sub reset { 1543sub reset {
1551 my ($self) = @_; 1544 my ($self) = @_;
1552 1545
1553 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1546 my $lock = cf::lock_acquire "map_data:$self->{path}";
1554 1547
… …
1571my $nuke_counter = "aaaa"; 1564my $nuke_counter = "aaaa";
1572 1565
1573sub nuke { 1566sub nuke {
1574 my ($self) = @_; 1567 my ($self) = @_;
1575 1568
1569 delete $cf::MAP{$self->path};
1570
1571 $self->unlink_save;
1572
1573 bless $self, "cf::map";
1574 delete $self->{deny_reset};
1576 $self->{deny_save} = 1; 1575 $self->{deny_save} = 1;
1577 $self->reset_timeout (1); 1576 $self->reset_timeout (1);
1578 $self->rename ("{nuke}/" . ($nuke_counter++)); 1577 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1578
1579 $cf::MAP{$self->path} = $self;
1580
1579 $self->reset; # polite request, might not happen 1581 $self->reset; # polite request, might not happen
1580} 1582}
1581 1583
1582=item cf::map::unique_maps 1584=item cf::map::unique_maps
1583 1585
… …
1814 1816
1815sub parse_random_map_params { 1817sub parse_random_map_params {
1816 my ($spec) = @_; 1818 my ($spec) = @_;
1817 1819
1818 my $rmp = { # defaults 1820 my $rmp = { # defaults
1819 xsize => 10, 1821 xsize => (cf::rndm 15, 40),
1820 ysize => 10, 1822 ysize => (cf::rndm 15, 40),
1823 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1824 #layout => string,
1821 }; 1825 };
1822 1826
1823 for (split /\n/, $spec) { 1827 for (split /\n/, $spec) {
1824 my ($k, $v) = split /\s+/, $_, 2; 1828 my ($k, $v) = split /\s+/, $_, 2;
1825 1829
… …
1829 $rmp 1833 $rmp
1830} 1834}
1831 1835
1832sub prepare_random_map { 1836sub prepare_random_map {
1833 my ($exit) = @_; 1837 my ($exit) = @_;
1838
1839 my $guard = cf::lock_acquire "exit_prepare:$exit";
1834 1840
1835 # all this does is basically replace the /! path by 1841 # all this does is basically replace the /! path by
1836 # a new random map path (?random/...) with a seed 1842 # a new random map path (?random/...) with a seed
1837 # that depends on the exit object 1843 # that depends on the exit object
1838 1844
… …
1847 1853
1848 $rmp->{random_seed} ||= $exit->random_seed; 1854 $rmp->{random_seed} ||= $exit->random_seed;
1849 1855
1850 my $data = cf::to_json $rmp; 1856 my $data = cf::to_json $rmp;
1851 my $md5 = Digest::MD5::md5_hex $data; 1857 my $md5 = Digest::MD5::md5_hex $data;
1858 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1852 1859
1853 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1860 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1854 aio_write $fh, 0, (length $data), $data, 0; 1861 aio_write $fh, 0, (length $data), $data, 0;
1862 undef $fh;
1863 aio_rename "$meta~", $meta;
1855 1864
1856 $exit->slaying ("?random/$md5"); 1865 $exit->slaying ("?random/$md5");
1857 $exit->msg (undef); 1866 $exit->msg (undef);
1858 } 1867 }
1859} 1868}
… …
2169 sub db_sync() { 2178 sub db_sync() {
2170 db_save if $dirty; 2179 db_save if $dirty;
2171 undef $dirty; 2180 undef $dirty;
2172 } 2181 }
2173 2182
2174 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 {
2175 db_sync; 2184 db_sync;
2176 }); 2185 });
2177 2186
2178 sub db_dirty() { 2187 sub db_dirty() {
2179 $dirty = 1; 2188 $dirty = 1;
… …
2229 2238
2230sub main { 2239sub main {
2231 # we must not ever block the main coroutine 2240 # we must not ever block the main coroutine
2232 local $Coro::idle = sub { 2241 local $Coro::idle = sub {
2233 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2242 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2243 (async {
2234 async { Event::one_event }; 2244 Event::one_event;
2245 })->prio (Coro::PRIO_MAX);
2235 }; 2246 };
2236 2247
2237 cfg_load; 2248 cfg_load;
2238 db_load; 2249 db_load;
2239 load_extensions; 2250 load_extensions;
2251
2252 $TICK_WATCHER->start;
2240 Event::loop; 2253 Event::loop;
2241} 2254}
2242 2255
2243############################################################################# 2256#############################################################################
2244# initialisation and cleanup 2257# initialisation and cleanup
… …
2286} 2299}
2287 2300
2288sub reload() { 2301sub reload() {
2289 # can/must only be called in main 2302 # can/must only be called in main
2290 if ($Coro::current != $Coro::main) { 2303 if ($Coro::current != $Coro::main) {
2291 warn "can only reload from main coroutine\n"; 2304 warn "can only reload from main coroutine";
2292 return; 2305 return;
2293 } 2306 }
2294 2307
2295 warn "reloading..."; 2308 warn "reloading...";
2296 2309
2297 warn "freezing server"; 2310 warn "cancelling server ticker";
2298 my $guard = freeze_mainloop; 2311 $TICK_WATCHER->cancel;
2312
2299 cf::emergency_save; 2313 cf::emergency_save;
2300
2301 warn "sync database to disk";
2302 cf::db_sync;
2303 IO::AIO::flush;
2304 2314
2305 eval { 2315 eval {
2306 # 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
2307 2317
2318 warn "syncing database to disk";
2319 cf::db_sync;
2320
2308 warn "cancel all watchers"; 2321 warn "cancelling all WF_AUTOCANCEL watchers";
2309 for (Event::all_watchers) { 2322 for (Event::all_watchers) {
2310 $_->cancel if $_->data & WF_AUTOCANCEL; 2323 $_->cancel if $_->data & WF_AUTOCANCEL;
2311 } 2324 }
2312 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
2313 warn "cancel all extension coros"; 2334 warn "cancelling all extension coros";
2314 $_->cancel for values %EXT_CORO; 2335 $_->cancel for values %EXT_CORO;
2315 %EXT_CORO = (); 2336 %EXT_CORO = ();
2316 2337
2317 warn "remove commands"; 2338 warn "removing commands";
2318 %COMMAND = (); 2339 %COMMAND = ();
2319 2340
2320 warn "remove ext commands"; 2341 warn "removing ext commands";
2321 %EXTCMD = (); 2342 %EXTCMD = ();
2322 2343
2323 warn "unload/nuke all extensions"; 2344 warn "unloading/nuking all extensions";
2324 for my $pkg (@EXTS) { 2345 for my $pkg (@EXTS) {
2325 warn "... unloading $pkg"; 2346 warn "... unloading $pkg";
2326 2347
2327 if (my $cb = $pkg->can ("unload")) { 2348 if (my $cb = $pkg->can ("unload")) {
2328 eval { 2349 eval {
… …
2333 2354
2334 warn "... nuking $pkg"; 2355 warn "... nuking $pkg";
2335 Symbol::delete_package $pkg; 2356 Symbol::delete_package $pkg;
2336 } 2357 }
2337 2358
2338 warn "unload all perl modules loaded from $LIBDIR"; 2359 warn "unloading all perl modules loaded from $LIBDIR";
2339 while (my ($k, $v) = each %INC) { 2360 while (my ($k, $v) = each %INC) {
2340 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2361 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2341 2362
2342 warn "removing <$k>"; 2363 warn "... unloading $k";
2343 delete $INC{$k}; 2364 delete $INC{$k};
2344 2365
2345 $k =~ s/\.pm$//; 2366 $k =~ s/\.pm$//;
2346 $k =~ s/\//::/g; 2367 $k =~ s/\//::/g;
2347 2368
… …
2350 } 2371 }
2351 2372
2352 Symbol::delete_package $k; 2373 Symbol::delete_package $k;
2353 } 2374 }
2354 2375
2355 warn "get rid of safe::, as good as possible"; 2376 warn "getting rid of safe::, as good as possible";
2356 Symbol::delete_package "safe::$_" 2377 Symbol::delete_package "safe::$_"
2357 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);
2358 2379
2359 warn "unload cf.pm \"a bit\""; 2380 warn "unloading cf.pm \"a bit\"";
2360 delete $INC{"cf.pm"}; 2381 delete $INC{"cf.pm"};
2361 2382
2362 # don't, removes xs symbols, too, 2383 # don't, removes xs symbols, too,
2363 # and global variables created in xs 2384 # and global variables created in xs
2364 #Symbol::delete_package __PACKAGE__; 2385 #Symbol::delete_package __PACKAGE__;
2365 2386
2387 warn "unload completed, starting to reload now";
2388
2366 warn "reloading cf.pm"; 2389 warn "reloading cf.pm";
2367 require cf; 2390 require cf;
2368 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2369 2392
2370 warn "load config and database again"; 2393 warn "loading config and database again";
2371 cf::cfg_load; 2394 cf::cfg_load;
2372 cf::db_load; 2395 cf::db_load;
2373 2396
2374 warn "load extensions"; 2397 warn "loading extensions";
2375 cf::load_extensions; 2398 cf::load_extensions;
2376 2399
2377 warn "reattach attachments to objects/players"; 2400 warn "reattaching attachments to objects/players";
2378 _global_reattach; 2401 _global_reattach;
2379 warn "reattach attachments to maps"; 2402 warn "reattaching attachments to maps";
2380 reattach $_ for values %MAP; 2403 reattach $_ for values %MAP;
2404
2405 warn "restarting server ticker";
2406
2407 $TICK_WATCHER->start;
2381 }; 2408 };
2382 2409
2383 if ($@) { 2410 if ($@) {
2384 warn $@; 2411 warn $@;
2385 warn "error while reloading, exiting."; 2412 warn "error while reloading, exiting.";
… …
2387 } 2414 }
2388 2415
2389 warn "reloaded"; 2416 warn "reloaded";
2390}; 2417};
2391 2418
2419our $RELOAD_WATCHER; # used only during reload
2420
2392register_command "reload" => sub { 2421register_command "reload" => sub {
2393 my ($who, $arg) = @_; 2422 my ($who, $arg) = @_;
2394 2423
2395 if ($who->flag (FLAG_WIZ)) { 2424 if ($who->flag (FLAG_WIZ)) {
2396 $who->message ("start of reload."); 2425 $who->message ("reloading server.");
2426
2427 # doing reload synchronously and two reloads happen back-to-back,
2428 # coro crashes during coro_state_free->destroy here.
2429
2430 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2397 reload; 2431 reload;
2398 $who->message ("end of reload."); 2432 undef $RELOAD_WATCHER;
2433 });
2399 } 2434 }
2400}; 2435};
2401 2436
2402unshift @INC, $LIBDIR; 2437unshift @INC, $LIBDIR;
2438
2439my $bug_warning = 0;
2403 2440
2404$TICK_WATCHER = Event->timer ( 2441$TICK_WATCHER = Event->timer (
2405 reentrant => 0, 2442 reentrant => 0,
2443 parked => 1,
2406 prio => 0, 2444 prio => 0,
2407 at => $NEXT_TICK || $TICK, 2445 at => $NEXT_TICK || $TICK,
2408 data => WF_AUTOCANCEL, 2446 data => WF_AUTOCANCEL,
2409 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
2410 $NOW = Event::time; 2454 $NOW = Event::time;
2411 2455
2412 cf::server_tick; # one server iteration 2456 cf::server_tick; # one server iteration
2413 $RUNTIME += $TICK; 2457 $RUNTIME += $TICK;
2414 $NEXT_TICK += $TICK; 2458 $NEXT_TICK += $TICK;
… …
2434 cb => \&IO::AIO::poll_cb, 2478 cb => \&IO::AIO::poll_cb,
2435); 2479);
2436 2480
2437$WRITE_RUNTIME_WATCHER = Event->timer ( 2481$WRITE_RUNTIME_WATCHER = Event->timer (
2438 data => WF_AUTOCANCEL, 2482 data => WF_AUTOCANCEL,
2439 after => 0, 2483 after => 1,
2440 interval => 10, 2484 interval => 10,
2441 cb => sub { 2485 prio => 6, # keep it lowest so it acts like a watchdog
2442 (Coro::unblock_sub { 2486 cb => Coro::unblock_sub {
2443 write_runtime 2487 write_runtime
2444 or warn "ERROR: unable to write runtime file: $!"; 2488 or warn "ERROR: unable to write runtime file: $!";
2445 })->();
2446 }, 2489 },
2447); 2490);
2448 2491
2449END { cf::emergency_save } 2492END { cf::emergency_save }
2450 2493

Diff Legend

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