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.170 by root, Sun Jan 14 02:00:37 2007 UTC vs.
Revision 1.185 by root, Fri Jan 19 23:32: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;
… …
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];
… …
1113 1113
1114use Fcntl; 1114use Fcntl;
1115use Coro::AIO; 1115use Coro::AIO;
1116 1116
1117use overload 1117use overload
1118 '""' => \&as_string; 1118 '""' => \&as_string,
1119 fallback => 1;
1119 1120
1120our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1121our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1122 1123
1123sub generate_random_map { 1124sub generate_random_map {
1124 my ($self, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1125
1126 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1127 $self->_create_random_map ( 1127 $self->_create_random_map (
1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1151 1151
1152# also paths starting with '/' 1152# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1153$EXT_MAP{"cf::map"} = qr{^(?=/)};
1154 1154
1155sub thawer_merge { 1155sub thawer_merge {
1156 my ($self, $merge) = @_;
1157
1156 # we have to keep some variables in memory intact 1158 # we have to keep some variables in memory intact
1157 local $_[0]{path}; 1159 local $self->{path};
1160 local $self->{load_path};
1158 local $_[0]{deny_save}; 1161 local $self->{deny_save};
1159 local $_[0]{deny_reset}; 1162 local $self->{deny_reset};
1160 1163
1161 $_[0]->SUPER::thawer_merge ($_[1]); 1164 $self->SUPER::thawer_merge ($merge);
1162} 1165}
1163 1166
1164sub normalise { 1167sub normalise {
1165 my ($path, $base) = @_; 1168 my ($path, $base) = @_;
1166 1169
… …
1336 1339
1337 $map->load_header 1340 $map->load_header
1338 or return; 1341 or return;
1339 1342
1340 if ($map->should_reset) { 1343 if ($map->should_reset) {
1344 # doing this can freeze the server in a sync job, obviously
1345 #$cf::WAIT_FOR_TICK->wait;
1341 $map->reset; 1346 $map->reset;
1342 undef $guard; 1347 undef $guard;
1343 $map = find $path 1348 $map = find $path
1344 or return; 1349 or return;
1345 } 1350 }
… …
1437 1442
1438 cf::sync_job { $map->load }; 1443 cf::sync_job { $map->load };
1439} 1444}
1440 1445
1441our %MAP_PREFETCH; 1446our %MAP_PREFETCH;
1442our $MAP_PREFETCHER = Coro::async { 1447our $MAP_PREFETCHER = undef;
1443 while () {
1444 for my $path (keys %MAP_PREFETCH) {
1445 my $map = find $path
1446 or next;
1447 $map->load;
1448
1449 delete $MAP_PREFETCH{$path};
1450 }
1451 Coro::schedule;
1452 }
1453};
1454 1448
1455sub find_async { 1449sub find_async {
1456 my ($path, $origin) = @_; 1450 my ($path, $origin) = @_;
1457 1451
1458 $path = normalise $path, $origin && $origin->{path}; 1452 $path = normalise $path, $origin && $origin->{path};
1459 1453
1460 if (my $map = $cf::MAP{$path}) { 1454 if (my $map = $cf::MAP{$path}) {
1461 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1455 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1462 } 1456 }
1463 1457
1464 $MAP_PREFETCH{$path} = 0; 1458 undef $MAP_PREFETCH{$path};
1465 $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 };
1466 1471
1467 () 1472 ()
1468} 1473}
1469 1474
1470sub save { 1475sub save {
… …
1530 my ($self) = @_; 1535 my ($self) = @_;
1531 1536
1532 $self->reset_at <= $cf::RUNTIME 1537 $self->reset_at <= $cf::RUNTIME
1533} 1538}
1534 1539
1535sub rename {
1536 my ($self, $new_path) = @_;
1537
1538 normalise $new_path;
1539
1540 $self->unlink_save;
1541
1542 delete $cf::MAP{$self->path};
1543 $self->{path} = $new_path; $self->path ($self->{path});
1544 $cf::MAP{$self->path} = $self;
1545
1546 $self->save;
1547}
1548
1549sub reset { 1540sub reset {
1550 my ($self) = @_; 1541 my ($self) = @_;
1551 1542
1552 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1543 my $lock = cf::lock_acquire "map_data:$self->{path}";
1553 1544
… …
1570my $nuke_counter = "aaaa"; 1561my $nuke_counter = "aaaa";
1571 1562
1572sub nuke { 1563sub nuke {
1573 my ($self) = @_; 1564 my ($self) = @_;
1574 1565
1566 delete $cf::MAP{$self->path};
1567
1568 $self->unlink_save;
1569
1570 bless $self, "cf::map";
1571 delete $self->{deny_reset};
1575 $self->{deny_save} = 1; 1572 $self->{deny_save} = 1;
1576 $self->reset_timeout (1); 1573 $self->reset_timeout (1);
1577 $self->rename ("{nuke}/" . ($nuke_counter++)); 1574 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1575
1576 $cf::MAP{$self->path} = $self;
1577
1578 $self->reset; # polite request, might not happen 1578 $self->reset; # polite request, might not happen
1579} 1579}
1580 1580
1581=item cf::map::unique_maps 1581=item cf::map::unique_maps
1582 1582
… …
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;
… …
2228 2235
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#
2240 (async {
2233 async { Event::one_event }; 2241 Event::one_event;
2242 })->prio (Coro::PRIO_MAX);
2234 }; 2243 };
2235 2244
2236 cfg_load; 2245 cfg_load;
2237 db_load; 2246 db_load;
2238 load_extensions; 2247 load_extensions;
2248
2249 $TICK_WATCHER->start;
2239 Event::loop; 2250 Event::loop;
2240} 2251}
2241 2252
2242############################################################################# 2253#############################################################################
2243# initialisation and cleanup 2254# initialisation and cleanup
… …
2285} 2296}
2286 2297
2287sub reload() { 2298sub reload() {
2288 # can/must only be called in main 2299 # can/must only be called in main
2289 if ($Coro::current != $Coro::main) { 2300 if ($Coro::current != $Coro::main) {
2290 warn "can only reload from main coroutine\n"; 2301 warn "can only reload from main coroutine";
2291 return; 2302 return;
2292 } 2303 }
2293 2304
2294 warn "reloading..."; 2305 warn "reloading...";
2295 2306
2296 warn "freezing server"; 2307 warn "cancelling server ticker";
2297 my $guard = freeze_mainloop; 2308 $TICK_WATCHER->cancel;
2309
2298 cf::emergency_save; 2310 cf::emergency_save;
2299
2300 warn "sync database to disk";
2301 cf::db_sync;
2302 IO::AIO::flush;
2303 2311
2304 eval { 2312 eval {
2305 # 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
2306 2314
2315 warn "syncing database to disk";
2316 cf::db_sync;
2317
2307 warn "cancel all watchers"; 2318 warn "cancelling all WF_AUTOCANCEL watchers";
2308 for (Event::all_watchers) { 2319 for (Event::all_watchers) {
2309 $_->cancel if $_->data & WF_AUTOCANCEL; 2320 $_->cancel if $_->data & WF_AUTOCANCEL;
2310 } 2321 }
2311 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
2312 warn "cancel all extension coros"; 2331 warn "cancelling all extension coros";
2313 $_->cancel for values %EXT_CORO; 2332 $_->cancel for values %EXT_CORO;
2314 %EXT_CORO = (); 2333 %EXT_CORO = ();
2315 2334
2316 warn "remove commands"; 2335 warn "removing commands";
2317 %COMMAND = (); 2336 %COMMAND = ();
2318 2337
2319 warn "remove ext commands"; 2338 warn "removing ext commands";
2320 %EXTCMD = (); 2339 %EXTCMD = ();
2321 2340
2322 warn "unload/nuke all extensions"; 2341 warn "unloading/nuking all extensions";
2323 for my $pkg (@EXTS) { 2342 for my $pkg (@EXTS) {
2324 warn "... unloading $pkg"; 2343 warn "... unloading $pkg";
2325 2344
2326 if (my $cb = $pkg->can ("unload")) { 2345 if (my $cb = $pkg->can ("unload")) {
2327 eval { 2346 eval {
… …
2332 2351
2333 warn "... nuking $pkg"; 2352 warn "... nuking $pkg";
2334 Symbol::delete_package $pkg; 2353 Symbol::delete_package $pkg;
2335 } 2354 }
2336 2355
2337 warn "unload all perl modules loaded from $LIBDIR"; 2356 warn "unloading all perl modules loaded from $LIBDIR";
2338 while (my ($k, $v) = each %INC) { 2357 while (my ($k, $v) = each %INC) {
2339 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2358 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2340 2359
2341 warn "removing <$k>"; 2360 warn "... unloading $k";
2342 delete $INC{$k}; 2361 delete $INC{$k};
2343 2362
2344 $k =~ s/\.pm$//; 2363 $k =~ s/\.pm$//;
2345 $k =~ s/\//::/g; 2364 $k =~ s/\//::/g;
2346 2365
… …
2349 } 2368 }
2350 2369
2351 Symbol::delete_package $k; 2370 Symbol::delete_package $k;
2352 } 2371 }
2353 2372
2354 warn "get rid of safe::, as good as possible"; 2373 warn "getting rid of safe::, as good as possible";
2355 Symbol::delete_package "safe::$_" 2374 Symbol::delete_package "safe::$_"
2356 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);
2357 2376
2358 warn "unload cf.pm \"a bit\""; 2377 warn "unloading cf.pm \"a bit\"";
2359 delete $INC{"cf.pm"}; 2378 delete $INC{"cf.pm"};
2360 2379
2361 # don't, removes xs symbols, too, 2380 # don't, removes xs symbols, too,
2362 # and global variables created in xs 2381 # and global variables created in xs
2363 #Symbol::delete_package __PACKAGE__; 2382 #Symbol::delete_package __PACKAGE__;
2364 2383
2384 warn "unload completed, starting to reload now";
2385
2365 warn "reloading cf.pm"; 2386 warn "reloading cf.pm";
2366 require cf; 2387 require cf;
2367 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2368 2389
2369 warn "load config and database again"; 2390 warn "loading config and database again";
2370 cf::cfg_load; 2391 cf::cfg_load;
2371 cf::db_load; 2392 cf::db_load;
2372 2393
2373 warn "load extensions"; 2394 warn "loading extensions";
2374 cf::load_extensions; 2395 cf::load_extensions;
2375 2396
2376 warn "reattach attachments to objects/players"; 2397 warn "reattaching attachments to objects/players";
2377 _global_reattach; 2398 _global_reattach;
2378 warn "reattach attachments to maps"; 2399 warn "reattaching attachments to maps";
2379 reattach $_ for values %MAP; 2400 reattach $_ for values %MAP;
2401
2402 warn "restarting server ticker";
2403
2404 $TICK_WATCHER->start;
2380 }; 2405 };
2381 2406
2382 if ($@) { 2407 if ($@) {
2383 warn $@; 2408 warn $@;
2384 warn "error while reloading, exiting."; 2409 warn "error while reloading, exiting.";
… …
2386 } 2411 }
2387 2412
2388 warn "reloaded"; 2413 warn "reloaded";
2389}; 2414};
2390 2415
2416our $RELOAD_WATCHER; # used only during reload
2417
2391register_command "reload" => sub { 2418register_command "reload" => sub {
2392 my ($who, $arg) = @_; 2419 my ($who, $arg) = @_;
2393 2420
2394 if ($who->flag (FLAG_WIZ)) { 2421 if ($who->flag (FLAG_WIZ)) {
2395 $who->message ("start of reload."); 2422 $who->message ("reloading server.");
2423
2424 # doing reload synchronously and two reloads happen back-to-back,
2425 # coro crashes during coro_state_free->destroy here.
2426
2427 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2396 reload; 2428 reload;
2397 $who->message ("end of reload."); 2429 undef $RELOAD_WATCHER;
2430 });
2398 } 2431 }
2399}; 2432};
2400 2433
2401unshift @INC, $LIBDIR; 2434unshift @INC, $LIBDIR;
2435
2436my $bug_warning = 0;
2402 2437
2403$TICK_WATCHER = Event->timer ( 2438$TICK_WATCHER = Event->timer (
2404 reentrant => 0, 2439 reentrant => 0,
2440 parked => 1,
2405 prio => 0, 2441 prio => 0,
2406 at => $NEXT_TICK || $TICK, 2442 at => $NEXT_TICK || $TICK,
2407 data => WF_AUTOCANCEL, 2443 data => WF_AUTOCANCEL,
2408 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
2409 $NOW = Event::time; 2451 $NOW = Event::time;
2410 2452
2411 cf::server_tick; # one server iteration 2453 cf::server_tick; # one server iteration
2412 $RUNTIME += $TICK; 2454 $RUNTIME += $TICK;
2413 $NEXT_TICK += $TICK; 2455 $NEXT_TICK += $TICK;
… …
2433 cb => \&IO::AIO::poll_cb, 2475 cb => \&IO::AIO::poll_cb,
2434); 2476);
2435 2477
2436$WRITE_RUNTIME_WATCHER = Event->timer ( 2478$WRITE_RUNTIME_WATCHER = Event->timer (
2437 data => WF_AUTOCANCEL, 2479 data => WF_AUTOCANCEL,
2438 after => 0, 2480 after => 1,
2439 interval => 10, 2481 interval => 10,
2440 cb => sub { 2482 cb => Coro::unblock_sub {
2441 (Coro::unblock_sub {
2442 write_runtime 2483 write_runtime
2443 or warn "ERROR: unable to write runtime file: $!"; 2484 or warn "ERROR: unable to write runtime file: $!";
2444 })->();
2445 }, 2485 },
2446); 2486);
2447 2487
2448END { cf::emergency_save } 2488END { cf::emergency_save }
2449 2489

Diff Legend

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