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

Diff Legend

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