ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.168 by root, Sun Jan 14 00:37:14 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;
… …
503our @CB_TYPE = (); # registry for type (cf-object class) based events 503our @CB_TYPE = (); # registry for type (cf-object class) based events
504our @CB_MAP = (); 504our @CB_MAP = ();
505 505
506my %attachment; 506my %attachment;
507 507
508sub cf::attachable::thawer_merge {
509 # simply override everything except _meta
510 local $_[0]{_meta};
511 %{$_[0]} = %{$_[1]};
512}
513
508sub _attach_cb($$$$) { 514sub _attach_cb($$$$) {
509 my ($registry, $event, $prio, $cb) = @_; 515 my ($registry, $event, $prio, $cb) = @_;
510 516
511 use sort 'stable'; 517 use sort 'stable';
512 518
… …
683# object support 689# object support
684 690
685sub reattach { 691sub reattach {
686 # basically do the same as instantiate, without calling instantiate 692 # basically do the same as instantiate, without calling instantiate
687 my ($obj) = @_; 693 my ($obj) = @_;
694
695 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
688 696
689 my $registry = $obj->registry; 697 my $registry = $obj->registry;
690 698
691 @$registry = (); 699 @$registry = ();
692 700
… …
949 957
950sub exists($) { 958sub exists($) {
951 my ($login) = @_; 959 my ($login) = @_;
952 960
953 $cf::PLAYER{$login} 961 $cf::PLAYER{$login}
954 or cf::sync_job { !aio_stat $login } 962 or cf::sync_job { !aio_stat path $login }
955} 963}
956 964
957sub find($) { 965sub find($) {
958 return $cf::PLAYER{$_[0]} || do { 966 return $cf::PLAYER{$_[0]} || do {
959 my $login = $_[0]; 967 my $login = $_[0];
… …
1105 1113
1106use Fcntl; 1114use Fcntl;
1107use Coro::AIO; 1115use Coro::AIO;
1108 1116
1109use overload 1117use overload
1110 '""' => \&as_string; 1118 '""' => \&as_string,
1119 fallback => 1;
1111 1120
1112our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1113our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1114 1123
1115sub generate_random_map { 1124sub generate_random_map {
1116 my ($self, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1117
1118 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1119 $self->_create_random_map ( 1127 $self->_create_random_map (
1120 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1121 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1122 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1142} 1150}
1143 1151
1144# also paths starting with '/' 1152# also paths starting with '/'
1145$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1153$EXT_MAP{"cf::map"} = qr{^(?=/)};
1146 1154
1155sub thawer_merge {
1156 my ($self, $merge) = @_;
1157
1158 # we have to keep some variables in memory intact
1159 local $self->{path};
1160 local $self->{load_path};
1161 local $self->{deny_save};
1162 local $self->{deny_reset};
1163
1164 $self->SUPER::thawer_merge ($merge);
1165}
1166
1147sub normalise { 1167sub normalise {
1148 my ($path, $base) = @_; 1168 my ($path, $base) = @_;
1149 1169
1150 # map plan: 1170 # map plan:
1151 # 1171 #
… …
1247 1267
1248sub unlink_save { 1268sub unlink_save {
1249 my ($self) = @_; 1269 my ($self) = @_;
1250 1270
1251 utf8::encode (my $save = $self->save_path); 1271 utf8::encode (my $save = $self->save_path);
1252 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1272 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1253 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1254} 1274}
1255 1275
1256sub load_header_from($) { 1276sub load_header_from($) {
1257 my ($self, $path) = @_; 1277 my ($self, $path) = @_;
1258 1278
… …
1319 1339
1320 $map->load_header 1340 $map->load_header
1321 or return; 1341 or return;
1322 1342
1323 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;
1324 $map->reset; 1346 $map->reset;
1325 undef $guard; 1347 undef $guard;
1326 $map = find $path 1348 $map = find $path
1327 or return; 1349 or return;
1328 } 1350 }
… …
1420 1442
1421 cf::sync_job { $map->load }; 1443 cf::sync_job { $map->load };
1422} 1444}
1423 1445
1424our %MAP_PREFETCH; 1446our %MAP_PREFETCH;
1425our $MAP_PREFETCHER = Coro::async { 1447our $MAP_PREFETCHER = undef;
1426 while () {
1427 for my $path (keys %MAP_PREFETCH) {
1428 my $map = find $path
1429 or next;
1430 $map->load;
1431
1432 delete $MAP_PREFETCH{$path};
1433 }
1434 Coro::schedule;
1435 }
1436};
1437 1448
1438sub find_async { 1449sub find_async {
1439 my ($path, $origin) = @_; 1450 my ($path, $origin) = @_;
1440 1451
1441 $path = normalise $path, $origin && $origin->{path}; 1452 $path = normalise $path, $origin && $origin->{path};
1442 1453
1443 if (my $map = $cf::MAP{$path}) { 1454 if (my $map = $cf::MAP{$path}) {
1444 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1455 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1445 } 1456 }
1446 1457
1447 $MAP_PREFETCH{$path} = 0; 1458 undef $MAP_PREFETCH{$path};
1448 $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 };
1449 1471
1450 () 1472 ()
1451} 1473}
1452 1474
1453sub save { 1475sub save {
… …
1498 1520
1499sub reset_at { 1521sub reset_at {
1500 my ($self) = @_; 1522 my ($self) = @_;
1501 1523
1502 # TODO: safety, remove and allow resettable per-player maps 1524 # TODO: safety, remove and allow resettable per-player maps
1503 return 1e99 if $self->isa ("ext::map_per_player"); 1525 return 1e99 if $self->isa ("ext::map_per_player");#d#
1504 return 1e99 if $self->{deny_reset}; 1526 return 1e99 if $self->{deny_reset};
1505 1527
1506 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1528 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1507 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1529 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1508 1530
… …
1513 my ($self) = @_; 1535 my ($self) = @_;
1514 1536
1515 $self->reset_at <= $cf::RUNTIME 1537 $self->reset_at <= $cf::RUNTIME
1516} 1538}
1517 1539
1518sub rename {
1519 my ($self, $new_path) = @_;
1520
1521 normalise $new_path;
1522
1523 $self->unlink_save;
1524
1525 delete $cf::MAP{$self->path};
1526 $self->{path} = $new_path; $self->path ($self->{path});
1527 $cf::MAP{$self->path} = $self;
1528
1529 $self->save;
1530}
1531
1532sub reset { 1540sub reset {
1533 my ($self) = @_; 1541 my ($self) = @_;
1534 1542
1535 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1543 my $lock = cf::lock_acquire "map_data:$self->{path}";
1536 1544
… …
1553my $nuke_counter = "aaaa"; 1561my $nuke_counter = "aaaa";
1554 1562
1555sub nuke { 1563sub nuke {
1556 my ($self) = @_; 1564 my ($self) = @_;
1557 1565
1566 delete $cf::MAP{$self->path};
1567
1568 $self->unlink_save;
1569
1570 bless $self, "cf::map";
1571 delete $self->{deny_reset};
1558 $self->{deny_save} = 1; 1572 $self->{deny_save} = 1;
1559 $self->reset_timeout (1); 1573 $self->reset_timeout (1);
1560 $self->rename ("{nuke}/" . ($nuke_counter++)); 1574 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1575
1576 $cf::MAP{$self->path} = $self;
1577
1561 $self->reset; # polite request, might not happen 1578 $self->reset; # polite request, might not happen
1562} 1579}
1563 1580
1564=item cf::map::unique_maps 1581=item cf::map::unique_maps
1565 1582
… …
1796 1813
1797sub parse_random_map_params { 1814sub parse_random_map_params {
1798 my ($spec) = @_; 1815 my ($spec) = @_;
1799 1816
1800 my $rmp = { # defaults 1817 my $rmp = { # defaults
1801 xsize => 10, 1818 xsize => (cf::rndm 15, 40),
1802 ysize => 10, 1819 ysize => (cf::rndm 15, 40),
1820 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1821 #layout => string,
1803 }; 1822 };
1804 1823
1805 for (split /\n/, $spec) { 1824 for (split /\n/, $spec) {
1806 my ($k, $v) = split /\s+/, $_, 2; 1825 my ($k, $v) = split /\s+/, $_, 2;
1807 1826
… …
1811 $rmp 1830 $rmp
1812} 1831}
1813 1832
1814sub prepare_random_map { 1833sub prepare_random_map {
1815 my ($exit) = @_; 1834 my ($exit) = @_;
1835
1836 my $guard = cf::lock_acquire "exit_prepare:$exit";
1816 1837
1817 # all this does is basically replace the /! path by 1838 # all this does is basically replace the /! path by
1818 # a new random map path (?random/...) with a seed 1839 # a new random map path (?random/...) with a seed
1819 # that depends on the exit object 1840 # that depends on the exit object
1820 1841
… …
1829 1850
1830 $rmp->{random_seed} ||= $exit->random_seed; 1851 $rmp->{random_seed} ||= $exit->random_seed;
1831 1852
1832 my $data = cf::to_json $rmp; 1853 my $data = cf::to_json $rmp;
1833 my $md5 = Digest::MD5::md5_hex $data; 1854 my $md5 = Digest::MD5::md5_hex $data;
1855 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1834 1856
1835 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) {
1836 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;
1837 1861
1838 $exit->slaying ("?random/$md5"); 1862 $exit->slaying ("?random/$md5");
1839 $exit->msg (undef); 1863 $exit->msg (undef);
1840 } 1864 }
1841} 1865}
… …
2151 sub db_sync() { 2175 sub db_sync() {
2152 db_save if $dirty; 2176 db_save if $dirty;
2153 undef $dirty; 2177 undef $dirty;
2154 } 2178 }
2155 2179
2156 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 {
2157 db_sync; 2181 db_sync;
2158 }); 2182 });
2159 2183
2160 sub db_dirty() { 2184 sub db_dirty() {
2161 $dirty = 1; 2185 $dirty = 1;
… …
2211 2235
2212sub main { 2236sub main {
2213 # we must not ever block the main coroutine 2237 # we must not ever block the main coroutine
2214 local $Coro::idle = sub { 2238 local $Coro::idle = sub {
2215 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 {
2216 async { Event::one_event }; 2241 Event::one_event;
2242 })->prio (Coro::PRIO_MAX);
2217 }; 2243 };
2218 2244
2219 cfg_load; 2245 cfg_load;
2220 db_load; 2246 db_load;
2221 load_extensions; 2247 load_extensions;
2248
2249 $TICK_WATCHER->start;
2222 Event::loop; 2250 Event::loop;
2223} 2251}
2224 2252
2225############################################################################# 2253#############################################################################
2226# initialisation and cleanup 2254# initialisation and cleanup
… …
2268} 2296}
2269 2297
2270sub reload() { 2298sub reload() {
2271 # can/must only be called in main 2299 # can/must only be called in main
2272 if ($Coro::current != $Coro::main) { 2300 if ($Coro::current != $Coro::main) {
2273 warn "can only reload from main coroutine\n"; 2301 warn "can only reload from main coroutine";
2274 return; 2302 return;
2275 } 2303 }
2276 2304
2277 warn "reloading..."; 2305 warn "reloading...";
2278 2306
2279 warn "freezing server"; 2307 warn "cancelling server ticker";
2280 my $guard = freeze_mainloop; 2308 $TICK_WATCHER->cancel;
2309
2281 cf::emergency_save; 2310 cf::emergency_save;
2282
2283 warn "sync database to disk";
2284 cf::db_sync;
2285 IO::AIO::flush;
2286 2311
2287 eval { 2312 eval {
2288 # 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
2289 2314
2315 warn "syncing database to disk";
2316 cf::db_sync;
2317
2290 warn "cancel all watchers"; 2318 warn "cancelling all WF_AUTOCANCEL watchers";
2291 for (Event::all_watchers) { 2319 for (Event::all_watchers) {
2292 $_->cancel if $_->data & WF_AUTOCANCEL; 2320 $_->cancel if $_->data & WF_AUTOCANCEL;
2293 } 2321 }
2294 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
2295 warn "cancel all extension coros"; 2331 warn "cancelling all extension coros";
2296 $_->cancel for values %EXT_CORO; 2332 $_->cancel for values %EXT_CORO;
2297 %EXT_CORO = (); 2333 %EXT_CORO = ();
2298 2334
2299 warn "remove commands"; 2335 warn "removing commands";
2300 %COMMAND = (); 2336 %COMMAND = ();
2301 2337
2302 warn "remove ext commands"; 2338 warn "removing ext commands";
2303 %EXTCMD = (); 2339 %EXTCMD = ();
2304 2340
2305 warn "unload/nuke all extensions"; 2341 warn "unloading/nuking all extensions";
2306 for my $pkg (@EXTS) { 2342 for my $pkg (@EXTS) {
2307 warn "... unloading $pkg"; 2343 warn "... unloading $pkg";
2308 2344
2309 if (my $cb = $pkg->can ("unload")) { 2345 if (my $cb = $pkg->can ("unload")) {
2310 eval { 2346 eval {
… …
2315 2351
2316 warn "... nuking $pkg"; 2352 warn "... nuking $pkg";
2317 Symbol::delete_package $pkg; 2353 Symbol::delete_package $pkg;
2318 } 2354 }
2319 2355
2320 warn "unload all perl modules loaded from $LIBDIR"; 2356 warn "unloading all perl modules loaded from $LIBDIR";
2321 while (my ($k, $v) = each %INC) { 2357 while (my ($k, $v) = each %INC) {
2322 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2358 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2323 2359
2324 warn "removing <$k>"; 2360 warn "... unloading $k";
2325 delete $INC{$k}; 2361 delete $INC{$k};
2326 2362
2327 $k =~ s/\.pm$//; 2363 $k =~ s/\.pm$//;
2328 $k =~ s/\//::/g; 2364 $k =~ s/\//::/g;
2329 2365
… …
2332 } 2368 }
2333 2369
2334 Symbol::delete_package $k; 2370 Symbol::delete_package $k;
2335 } 2371 }
2336 2372
2337 warn "get rid of safe::, as good as possible"; 2373 warn "getting rid of safe::, as good as possible";
2338 Symbol::delete_package "safe::$_" 2374 Symbol::delete_package "safe::$_"
2339 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);
2340 2376
2341 warn "unload cf.pm \"a bit\""; 2377 warn "unloading cf.pm \"a bit\"";
2342 delete $INC{"cf.pm"}; 2378 delete $INC{"cf.pm"};
2343 2379
2344 # don't, removes xs symbols, too, 2380 # don't, removes xs symbols, too,
2345 # and global variables created in xs 2381 # and global variables created in xs
2346 #Symbol::delete_package __PACKAGE__; 2382 #Symbol::delete_package __PACKAGE__;
2347 2383
2384 warn "unload completed, starting to reload now";
2385
2348 warn "reloading cf.pm"; 2386 warn "reloading cf.pm";
2349 require cf; 2387 require cf;
2350 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2351 2389
2352 warn "load config and database again"; 2390 warn "loading config and database again";
2353 cf::cfg_load; 2391 cf::cfg_load;
2354 cf::db_load; 2392 cf::db_load;
2355 2393
2356 warn "load extensions"; 2394 warn "loading extensions";
2357 cf::load_extensions; 2395 cf::load_extensions;
2358 2396
2359 warn "reattach attachments to objects/players"; 2397 warn "reattaching attachments to objects/players";
2360 _global_reattach; 2398 _global_reattach;
2361 warn "reattach attachments to maps"; 2399 warn "reattaching attachments to maps";
2362 reattach $_ for values %MAP; 2400 reattach $_ for values %MAP;
2401
2402 warn "restarting server ticker";
2403
2404 $TICK_WATCHER->start;
2363 }; 2405 };
2364 2406
2365 if ($@) { 2407 if ($@) {
2366 warn $@; 2408 warn $@;
2367 warn "error while reloading, exiting."; 2409 warn "error while reloading, exiting.";
… …
2369 } 2411 }
2370 2412
2371 warn "reloaded"; 2413 warn "reloaded";
2372}; 2414};
2373 2415
2416our $RELOAD_WATCHER; # used only during reload
2417
2374register_command "reload" => sub { 2418register_command "reload" => sub {
2375 my ($who, $arg) = @_; 2419 my ($who, $arg) = @_;
2376 2420
2377 if ($who->flag (FLAG_WIZ)) { 2421 if ($who->flag (FLAG_WIZ)) {
2378 $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 {
2379 reload; 2428 reload;
2380 $who->message ("end of reload."); 2429 undef $RELOAD_WATCHER;
2430 });
2381 } 2431 }
2382}; 2432};
2383 2433
2384unshift @INC, $LIBDIR; 2434unshift @INC, $LIBDIR;
2435
2436my $bug_warning = 0;
2385 2437
2386$TICK_WATCHER = Event->timer ( 2438$TICK_WATCHER = Event->timer (
2387 reentrant => 0, 2439 reentrant => 0,
2440 parked => 1,
2388 prio => 0, 2441 prio => 0,
2389 at => $NEXT_TICK || $TICK, 2442 at => $NEXT_TICK || $TICK,
2390 data => WF_AUTOCANCEL, 2443 data => WF_AUTOCANCEL,
2391 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
2392 $NOW = Event::time; 2451 $NOW = Event::time;
2393 2452
2394 cf::server_tick; # one server iteration 2453 cf::server_tick; # one server iteration
2395 $RUNTIME += $TICK; 2454 $RUNTIME += $TICK;
2396 $NEXT_TICK += $TICK; 2455 $NEXT_TICK += $TICK;
… …
2416 cb => \&IO::AIO::poll_cb, 2475 cb => \&IO::AIO::poll_cb,
2417); 2476);
2418 2477
2419$WRITE_RUNTIME_WATCHER = Event->timer ( 2478$WRITE_RUNTIME_WATCHER = Event->timer (
2420 data => WF_AUTOCANCEL, 2479 data => WF_AUTOCANCEL,
2421 after => 0, 2480 after => 1,
2422 interval => 10, 2481 interval => 10,
2423 cb => sub { 2482 cb => Coro::unblock_sub {
2424 (Coro::unblock_sub {
2425 write_runtime 2483 write_runtime
2426 or warn "ERROR: unable to write runtime file: $!"; 2484 or warn "ERROR: unable to write runtime file: $!";
2427 })->();
2428 }, 2485 },
2429); 2486);
2430 2487
2431END { cf::emergency_save } 2488END { cf::emergency_save }
2432 2489

Diff Legend

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