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.173 by root, Sun Jan 14 18:00:34 2007 UTC vs.
Revision 1.187 by root, Sat Jan 20 21:06:52 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];
… …
1121our $MAX_RESET = 3600; 1124our $MAX_RESET = 3600;
1122our $DEFAULT_RESET = 3000; 1125our $DEFAULT_RESET = 3000;
1123 1126
1124sub generate_random_map { 1127sub generate_random_map {
1125 my ($self, $rmp) = @_; 1128 my ($self, $rmp) = @_;
1126
1127 # mit "rum" bekleckern, nicht 1129 # mit "rum" bekleckern, nicht
1128 $self->_create_random_map ( 1130 $self->_create_random_map (
1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1131 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1132 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1133 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1139 (cf::region::find $rmp->{region}), $rmp->{custom} 1141 (cf::region::find $rmp->{region}), $rmp->{custom}
1140 ) 1142 )
1141} 1143}
1142 1144
1145=item cf::map->register ($regex, $prio)
1146
1147Register a handler for the map path matching the given regex at the
1148givne priority (higher is better, built-in handlers have priority 0, the
1149default).
1150
1151=cut
1152
1143sub register { 1153sub register {
1144 my (undef, $regex) = @_; 1154 my (undef, $regex, $prio) = @_;
1145 my $pkg = caller; 1155 my $pkg = caller;
1146 1156
1147 no strict; 1157 no strict;
1148 push @{"$pkg\::ISA"}, __PACKAGE__; 1158 push @{"$pkg\::ISA"}, __PACKAGE__;
1149 1159
1150 $EXT_MAP{$pkg} = qr<$regex>; 1160 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1151} 1161}
1152 1162
1153# also paths starting with '/' 1163# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1164$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1155 1165
1156sub thawer_merge { 1166sub thawer_merge {
1157 my ($self, $merge) = @_; 1167 my ($self, $merge) = @_;
1158 1168
1159 # we have to keep some variables in memory intact 1169 # we have to keep some variables in memory intact
… …
1202 1212
1203 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1213 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1204 1214
1205 $path = normalise $path, $base; 1215 $path = normalise $path, $base;
1206 1216
1207 for my $pkg (keys %EXT_MAP) { 1217 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1208 if ($path =~ $EXT_MAP{$pkg}) { 1218 if ($path =~ $EXT_MAP{$pkg}[1]) {
1209 my $self = bless cf::map::new, $pkg; 1219 my $self = bless cf::map::new, $pkg;
1210 $self->{path} = $path; $self->path ($path); 1220 $self->{path} = $path; $self->path ($path);
1211 $self->init; # pass $1 etc. 1221 $self->init; # pass $1 etc.
1212 return $self; 1222 return $self;
1213 } 1223 }
… …
1340 1350
1341 $map->load_header 1351 $map->load_header
1342 or return; 1352 or return;
1343 1353
1344 if ($map->should_reset) { 1354 if ($map->should_reset) {
1355 # doing this can freeze the server in a sync job, obviously
1345 $cf::WAIT_FOR_TICK->wait; 1356 #$cf::WAIT_FOR_TICK->wait;
1346 $map->reset; 1357 $map->reset;
1347 undef $guard; 1358 undef $guard;
1348 $map = find $path 1359 $map = find $path
1349 or return; 1360 or return;
1350 } 1361 }
… …
1442 1453
1443 cf::sync_job { $map->load }; 1454 cf::sync_job { $map->load };
1444} 1455}
1445 1456
1446our %MAP_PREFETCH; 1457our %MAP_PREFETCH;
1447our $MAP_PREFETCHER = Coro::async { 1458our $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 1459
1460sub find_async { 1460sub find_async {
1461 my ($path, $origin) = @_; 1461 my ($path, $origin) = @_;
1462 1462
1463 $path = normalise $path, $origin && $origin->{path}; 1463 $path = normalise $path, $origin && $origin->{path};
1464 1464
1465 if (my $map = $cf::MAP{$path}) { 1465 if (my $map = $cf::MAP{$path}) {
1466 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1466 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1467 } 1467 }
1468 1468
1469 $MAP_PREFETCH{$path} = 0; 1469 undef $MAP_PREFETCH{$path};
1470 $MAP_PREFETCHER->ready; 1470 $MAP_PREFETCHER ||= cf::async {
1471 while (%MAP_PREFETCH) {
1472 for my $path (keys %MAP_PREFETCH) {
1473 my $map = find $path
1474 or next;
1475 $map->load;
1476
1477 delete $MAP_PREFETCH{$path};
1478 }
1479 }
1480 undef $MAP_PREFETCHER;
1481 };
1471 1482
1472 () 1483 ()
1473} 1484}
1474 1485
1475sub save { 1486sub save {
… …
1535 my ($self) = @_; 1546 my ($self) = @_;
1536 1547
1537 $self->reset_at <= $cf::RUNTIME 1548 $self->reset_at <= $cf::RUNTIME
1538} 1549}
1539 1550
1540sub rename {
1541 my ($self, $new_path) = @_;
1542
1543 normalise $new_path;
1544
1545 $self->unlink_save;
1546
1547 delete $cf::MAP{$self->path};
1548 $self->{path} = $new_path; $self->path ($self->{path});
1549 $cf::MAP{$self->path} = $self;
1550
1551 $self->save;
1552}
1553
1554sub reset { 1551sub reset {
1555 my ($self) = @_; 1552 my ($self) = @_;
1556 1553
1557 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1554 my $lock = cf::lock_acquire "map_data:$self->{path}";
1558 1555
… …
1575my $nuke_counter = "aaaa"; 1572my $nuke_counter = "aaaa";
1576 1573
1577sub nuke { 1574sub nuke {
1578 my ($self) = @_; 1575 my ($self) = @_;
1579 1576
1577 delete $cf::MAP{$self->path};
1578
1579 $self->unlink_save;
1580
1581 bless $self, "cf::map";
1582 delete $self->{deny_reset};
1580 $self->{deny_save} = 1; 1583 $self->{deny_save} = 1;
1581 $self->reset_timeout (1); 1584 $self->reset_timeout (1);
1582 $self->rename ("{nuke}/" . ($nuke_counter++)); 1585 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1586
1587 $cf::MAP{$self->path} = $self;
1588
1583 $self->reset; # polite request, might not happen 1589 $self->reset; # polite request, might not happen
1584} 1590}
1585 1591
1586=item cf::map::unique_maps 1592=item cf::map::unique_maps
1587 1593
… …
1818 1824
1819sub parse_random_map_params { 1825sub parse_random_map_params {
1820 my ($spec) = @_; 1826 my ($spec) = @_;
1821 1827
1822 my $rmp = { # defaults 1828 my $rmp = { # defaults
1823 xsize => 10, 1829 xsize => (cf::rndm 15, 40),
1824 ysize => 10, 1830 ysize => (cf::rndm 15, 40),
1831 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1832 #layout => string,
1825 }; 1833 };
1826 1834
1827 for (split /\n/, $spec) { 1835 for (split /\n/, $spec) {
1828 my ($k, $v) = split /\s+/, $_, 2; 1836 my ($k, $v) = split /\s+/, $_, 2;
1829 1837
… …
1833 $rmp 1841 $rmp
1834} 1842}
1835 1843
1836sub prepare_random_map { 1844sub prepare_random_map {
1837 my ($exit) = @_; 1845 my ($exit) = @_;
1846
1847 my $guard = cf::lock_acquire "exit_prepare:$exit";
1838 1848
1839 # all this does is basically replace the /! path by 1849 # all this does is basically replace the /! path by
1840 # a new random map path (?random/...) with a seed 1850 # a new random map path (?random/...) with a seed
1841 # that depends on the exit object 1851 # that depends on the exit object
1842 1852
… …
1851 1861
1852 $rmp->{random_seed} ||= $exit->random_seed; 1862 $rmp->{random_seed} ||= $exit->random_seed;
1853 1863
1854 my $data = cf::to_json $rmp; 1864 my $data = cf::to_json $rmp;
1855 my $md5 = Digest::MD5::md5_hex $data; 1865 my $md5 = Digest::MD5::md5_hex $data;
1866 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1856 1867
1857 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1868 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1858 aio_write $fh, 0, (length $data), $data, 0; 1869 aio_write $fh, 0, (length $data), $data, 0;
1870 undef $fh;
1871 aio_rename "$meta~", $meta;
1859 1872
1860 $exit->slaying ("?random/$md5"); 1873 $exit->slaying ("?random/$md5");
1861 $exit->msg (undef); 1874 $exit->msg (undef);
1862 } 1875 }
1863} 1876}
… …
2173 sub db_sync() { 2186 sub db_sync() {
2174 db_save if $dirty; 2187 db_save if $dirty;
2175 undef $dirty; 2188 undef $dirty;
2176 } 2189 }
2177 2190
2178 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2191 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2179 db_sync; 2192 db_sync;
2180 }); 2193 });
2181 2194
2182 sub db_dirty() { 2195 sub db_dirty() {
2183 $dirty = 1; 2196 $dirty = 1;
… …
2233 2246
2234sub main { 2247sub main {
2235 # we must not ever block the main coroutine 2248 # we must not ever block the main coroutine
2236 local $Coro::idle = sub { 2249 local $Coro::idle = sub {
2237 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2250 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2251 (async {
2238 async { Event::one_event }; 2252 Event::one_event;
2253 })->prio (Coro::PRIO_MAX);
2239 }; 2254 };
2240 2255
2241 cfg_load; 2256 cfg_load;
2242 db_load; 2257 db_load;
2243 load_extensions; 2258 load_extensions;
2259
2260 $TICK_WATCHER->start;
2244 Event::loop; 2261 Event::loop;
2245} 2262}
2246 2263
2247############################################################################# 2264#############################################################################
2248# initialisation and cleanup 2265# initialisation and cleanup
… …
2290} 2307}
2291 2308
2292sub reload() { 2309sub reload() {
2293 # can/must only be called in main 2310 # can/must only be called in main
2294 if ($Coro::current != $Coro::main) { 2311 if ($Coro::current != $Coro::main) {
2295 warn "can only reload from main coroutine\n"; 2312 warn "can only reload from main coroutine";
2296 return; 2313 return;
2297 } 2314 }
2298 2315
2299 warn "reloading..."; 2316 warn "reloading...";
2300 2317
2301 warn "freezing server"; 2318 warn "cancelling server ticker";
2302 my $guard = freeze_mainloop; 2319 $TICK_WATCHER->cancel;
2320
2303 cf::emergency_save; 2321 cf::emergency_save;
2304
2305 warn "sync database to disk";
2306 cf::db_sync;
2307 IO::AIO::flush;
2308 2322
2309 eval { 2323 eval {
2310 # if anything goes wrong in here, we should simply crash as we already saved 2324 # if anything goes wrong in here, we should simply crash as we already saved
2311 2325
2326 warn "syncing database to disk";
2327 cf::db_sync;
2328
2312 warn "cancel all watchers"; 2329 warn "cancelling all WF_AUTOCANCEL watchers";
2313 for (Event::all_watchers) { 2330 for (Event::all_watchers) {
2314 $_->cancel if $_->data & WF_AUTOCANCEL; 2331 $_->cancel if $_->data & WF_AUTOCANCEL;
2315 } 2332 }
2316 2333
2334 warn "flushing outstanding aio requests";
2335 for (;;) {
2336 IO::AIO::flush;
2337 Coro::cede;
2338 last unless IO::AIO::nreqs;
2339 warn "iterate...";
2340 }
2341
2317 warn "cancel all extension coros"; 2342 warn "cancelling all extension coros";
2318 $_->cancel for values %EXT_CORO; 2343 $_->cancel for values %EXT_CORO;
2319 %EXT_CORO = (); 2344 %EXT_CORO = ();
2320 2345
2321 warn "remove commands"; 2346 warn "removing commands";
2322 %COMMAND = (); 2347 %COMMAND = ();
2323 2348
2324 warn "remove ext commands"; 2349 warn "removing ext commands";
2325 %EXTCMD = (); 2350 %EXTCMD = ();
2326 2351
2327 warn "unload/nuke all extensions"; 2352 warn "unloading/nuking all extensions";
2328 for my $pkg (@EXTS) { 2353 for my $pkg (@EXTS) {
2329 warn "... unloading $pkg"; 2354 warn "... unloading $pkg";
2330 2355
2331 if (my $cb = $pkg->can ("unload")) { 2356 if (my $cb = $pkg->can ("unload")) {
2332 eval { 2357 eval {
… …
2337 2362
2338 warn "... nuking $pkg"; 2363 warn "... nuking $pkg";
2339 Symbol::delete_package $pkg; 2364 Symbol::delete_package $pkg;
2340 } 2365 }
2341 2366
2342 warn "unload all perl modules loaded from $LIBDIR"; 2367 warn "unloading all perl modules loaded from $LIBDIR";
2343 while (my ($k, $v) = each %INC) { 2368 while (my ($k, $v) = each %INC) {
2344 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2369 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2345 2370
2346 warn "removing <$k>"; 2371 warn "... unloading $k";
2347 delete $INC{$k}; 2372 delete $INC{$k};
2348 2373
2349 $k =~ s/\.pm$//; 2374 $k =~ s/\.pm$//;
2350 $k =~ s/\//::/g; 2375 $k =~ s/\//::/g;
2351 2376
… …
2354 } 2379 }
2355 2380
2356 Symbol::delete_package $k; 2381 Symbol::delete_package $k;
2357 } 2382 }
2358 2383
2359 warn "get rid of safe::, as good as possible"; 2384 warn "getting rid of safe::, as good as possible";
2360 Symbol::delete_package "safe::$_" 2385 Symbol::delete_package "safe::$_"
2361 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2386 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2362 2387
2363 warn "unload cf.pm \"a bit\""; 2388 warn "unloading cf.pm \"a bit\"";
2364 delete $INC{"cf.pm"}; 2389 delete $INC{"cf.pm"};
2365 2390
2366 # don't, removes xs symbols, too, 2391 # don't, removes xs symbols, too,
2367 # and global variables created in xs 2392 # and global variables created in xs
2368 #Symbol::delete_package __PACKAGE__; 2393 #Symbol::delete_package __PACKAGE__;
2369 2394
2395 warn "unload completed, starting to reload now";
2396
2370 warn "reloading cf.pm"; 2397 warn "reloading cf.pm";
2371 require cf; 2398 require cf;
2372 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2399 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2373 2400
2374 warn "load config and database again"; 2401 warn "loading config and database again";
2375 cf::cfg_load; 2402 cf::cfg_load;
2376 cf::db_load; 2403 cf::db_load;
2377 2404
2378 warn "load extensions"; 2405 warn "loading extensions";
2379 cf::load_extensions; 2406 cf::load_extensions;
2380 2407
2381 warn "reattach attachments to objects/players"; 2408 warn "reattaching attachments to objects/players";
2382 _global_reattach; 2409 _global_reattach;
2383 warn "reattach attachments to maps"; 2410 warn "reattaching attachments to maps";
2384 reattach $_ for values %MAP; 2411 reattach $_ for values %MAP;
2412
2413 warn "restarting server ticker";
2414
2415 $TICK_WATCHER->start;
2385 }; 2416 };
2386 2417
2387 if ($@) { 2418 if ($@) {
2388 warn $@; 2419 warn $@;
2389 warn "error while reloading, exiting."; 2420 warn "error while reloading, exiting.";
… …
2391 } 2422 }
2392 2423
2393 warn "reloaded"; 2424 warn "reloaded";
2394}; 2425};
2395 2426
2427our $RELOAD_WATCHER; # used only during reload
2428
2396register_command "reload" => sub { 2429register_command "reload" => sub {
2397 my ($who, $arg) = @_; 2430 my ($who, $arg) = @_;
2398 2431
2399 if ($who->flag (FLAG_WIZ)) { 2432 if ($who->flag (FLAG_WIZ)) {
2400 $who->message ("start of reload."); 2433 $who->message ("reloading server.");
2434
2435 # doing reload synchronously and two reloads happen back-to-back,
2436 # coro crashes during coro_state_free->destroy here.
2437
2438 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2401 reload; 2439 reload;
2402 $who->message ("end of reload."); 2440 undef $RELOAD_WATCHER;
2441 });
2403 } 2442 }
2404}; 2443};
2405 2444
2406unshift @INC, $LIBDIR; 2445unshift @INC, $LIBDIR;
2446
2447my $bug_warning = 0;
2407 2448
2408$TICK_WATCHER = Event->timer ( 2449$TICK_WATCHER = Event->timer (
2409 reentrant => 0, 2450 reentrant => 0,
2451 parked => 1,
2410 prio => 0, 2452 prio => 0,
2411 at => $NEXT_TICK || $TICK, 2453 at => $NEXT_TICK || $TICK,
2412 data => WF_AUTOCANCEL, 2454 data => WF_AUTOCANCEL,
2413 cb => sub { 2455 cb => sub {
2456 if ($Coro::current != $Coro::main) {
2457 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2458 unless ++$bug_warning > 10;
2459 return;
2460 }
2461
2414 $NOW = Event::time; 2462 $NOW = Event::time;
2415 2463
2416 cf::server_tick; # one server iteration 2464 cf::server_tick; # one server iteration
2417 $RUNTIME += $TICK; 2465 $RUNTIME += $TICK;
2418 $NEXT_TICK += $TICK; 2466 $NEXT_TICK += $TICK;
… …
2438 cb => \&IO::AIO::poll_cb, 2486 cb => \&IO::AIO::poll_cb,
2439); 2487);
2440 2488
2441$WRITE_RUNTIME_WATCHER = Event->timer ( 2489$WRITE_RUNTIME_WATCHER = Event->timer (
2442 data => WF_AUTOCANCEL, 2490 data => WF_AUTOCANCEL,
2443 after => 0, 2491 after => 1,
2444 interval => 10, 2492 interval => 10,
2445 cb => sub { 2493 prio => 6, # keep it lowest so it acts like a watchdog
2446 (Coro::unblock_sub { 2494 cb => Coro::unblock_sub {
2447 write_runtime 2495 write_runtime
2448 or warn "ERROR: unable to write runtime file: $!"; 2496 or warn "ERROR: unable to write runtime file: $!";
2449 })->();
2450 }, 2497 },
2451); 2498);
2452 2499
2453END { cf::emergency_save } 2500END { cf::emergency_save }
2454 2501

Diff Legend

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