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.179 by root, Thu Jan 18 20:39:00 2007 UTC vs.
Revision 1.191 by root, Tue Jan 23 01:05:18 2007 UTC

… …
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];
… …
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 }
… …
1286 $self->{load_path} = $path; 1297 $self->{load_path} = $path;
1287 1298
1288 1 1299 1
1289} 1300}
1290 1301
1291sub load_orig { 1302sub load_header_orig {
1292 my ($self) = @_; 1303 my ($self) = @_;
1293 1304
1294 $self->load_header_from ($self->load_path) 1305 $self->load_header_from ($self->load_path)
1295} 1306}
1296 1307
1297sub load_temp { 1308sub load_header_temp {
1298 my ($self) = @_; 1309 my ($self) = @_;
1299 1310
1300 $self->load_header_from ($self->save_path) 1311 $self->load_header_from ($self->save_path)
1312}
1313
1314sub prepare_temp {
1315 my ($self) = @_;
1316
1317 $self->last_access ((delete $self->{last_access})
1318 || $cf::RUNTIME); #d#
1319 # safety
1320 $self->{instantiate_time} = $cf::RUNTIME
1321 if $self->{instantiate_time} > $cf::RUNTIME;
1322}
1323
1324sub prepare_orig {
1325 my ($self) = @_;
1326
1327 $self->{load_original} = 1;
1328 $self->{instantiate_time} = $cf::RUNTIME;
1329 $self->last_access ($cf::RUNTIME);
1330 $self->instantiate;
1301} 1331}
1302 1332
1303sub load_header { 1333sub load_header {
1304 my ($self) = @_; 1334 my ($self) = @_;
1305 1335
1306 if ($self->load_temp) { 1336 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1337 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1338 } else {
1313 $self->load_orig 1339 $self->load_header_orig
1314 or return; 1340 or return;
1315 1341 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1342 }
1321 1343
1322 1 1344 1
1323} 1345}
1324 1346
… …
1339 1361
1340 $map->load_header 1362 $map->load_header
1341 or return; 1363 or return;
1342 1364
1343 if ($map->should_reset) { 1365 if ($map->should_reset) {
1366 # doing this can freeze the server in a sync job, obviously
1344 $cf::WAIT_FOR_TICK->wait; 1367 #$cf::WAIT_FOR_TICK->wait;
1345 $map->reset; 1368 $map->reset;
1346 undef $guard; 1369 undef $guard;
1347 $map = find $path 1370 $map = find $path
1348 or return; 1371 or return;
1349 } 1372 }
1350 1373
1351 $cf::MAP{$path} = $map 1374 $cf::MAP{$path} = $map
1352 } 1375 }
1353} 1376}
1354 1377
1378sub pre_load { }
1379sub post_load { }
1380
1355sub load { 1381sub load {
1356 my ($self) = @_; 1382 my ($self) = @_;
1357 1383
1358 my $path = $self->{path}; 1384 my $path = $self->{path};
1359 my $guard = cf::lock_acquire "map_load:$path"; 1385 my $guard = cf::lock_acquire "map_load:$path";
… …
1361 return if $self->in_memory != cf::MAP_SWAPPED; 1387 return if $self->in_memory != cf::MAP_SWAPPED;
1362 1388
1363 $self->in_memory (cf::MAP_LOADING); 1389 $self->in_memory (cf::MAP_LOADING);
1364 1390
1365 $self->alloc; 1391 $self->alloc;
1392
1393 $self->pre_load;
1394
1366 $self->_load_objects ($self->{load_path}, 1) 1395 $self->_load_objects ($self->{load_path}, 1)
1367 or return; 1396 or return;
1368 1397
1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1398 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1370 if delete $self->{load_original}; 1399 if delete $self->{load_original};
… …
1392 unless $self->difficulty; 1421 unless $self->difficulty;
1393 Coro::cede; 1422 Coro::cede;
1394 $self->activate; 1423 $self->activate;
1395 } 1424 }
1396 1425
1426 $self->post_load;
1427
1397 $self->in_memory (cf::MAP_IN_MEMORY); 1428 $self->in_memory (cf::MAP_IN_MEMORY);
1398} 1429}
1399 1430
1400sub customise_for { 1431sub customise_for {
1401 my ($self, $ob) = @_; 1432 my ($self, $ob) = @_;
… …
1441 1472
1442 cf::sync_job { $map->load }; 1473 cf::sync_job { $map->load };
1443} 1474}
1444 1475
1445our %MAP_PREFETCH; 1476our %MAP_PREFETCH;
1446our $MAP_PREFETCHER = Coro::async { 1477our $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 1478
1459sub find_async { 1479sub find_async {
1460 my ($path, $origin) = @_; 1480 my ($path, $origin) = @_;
1461 1481
1462 $path = normalise $path, $origin && $origin->{path}; 1482 $path = normalise $path, $origin && $origin->{path};
1463 1483
1464 if (my $map = $cf::MAP{$path}) { 1484 if (my $map = $cf::MAP{$path}) {
1465 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1485 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1466 } 1486 }
1467 1487
1468 $MAP_PREFETCH{$path} = 0; 1488 undef $MAP_PREFETCH{$path};
1489 $MAP_PREFETCHER ||= cf::async {
1490 while (%MAP_PREFETCH) {
1491 for my $path (keys %MAP_PREFETCH) {
1492 my $map = find $path
1493 or next;
1494 $map->load;
1495
1496 delete $MAP_PREFETCH{$path};
1497 }
1498 }
1499 undef $MAP_PREFETCHER;
1500 };
1469 $MAP_PREFETCHER->ready; 1501 $MAP_PREFETCHER->prio (6);
1470 1502
1471 () 1503 ()
1472} 1504}
1473 1505
1474sub save { 1506sub save {
… …
1812 1844
1813sub parse_random_map_params { 1845sub parse_random_map_params {
1814 my ($spec) = @_; 1846 my ($spec) = @_;
1815 1847
1816 my $rmp = { # defaults 1848 my $rmp = { # defaults
1817 xsize => -1, 1849 xsize => (cf::rndm 15, 40),
1818 ysize => -1, 1850 ysize => (cf::rndm 15, 40),
1851 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1852 #layout => string,
1819 }; 1853 };
1820 1854
1821 for (split /\n/, $spec) { 1855 for (split /\n/, $spec) {
1822 my ($k, $v) = split /\s+/, $_, 2; 1856 my ($k, $v) = split /\s+/, $_, 2;
1823 1857
… …
2172 sub db_sync() { 2206 sub db_sync() {
2173 db_save if $dirty; 2207 db_save if $dirty;
2174 undef $dirty; 2208 undef $dirty;
2175 } 2209 }
2176 2210
2177 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2211 my $idle = Event->idle (
2178 db_sync; 2212 reentrant => 0,
2213 min => 10,
2214 max => 20,
2215 repeat => 0,
2216 data => WF_AUTOCANCEL,
2217 cb => \&db_sync,
2179 }); 2218 );
2180 2219
2181 sub db_dirty() { 2220 sub db_dirty() {
2182 $dirty = 1; 2221 $dirty = 1;
2183 $idle->start; 2222 $idle->start;
2184 } 2223 }
… …
2240 }; 2279 };
2241 2280
2242 cfg_load; 2281 cfg_load;
2243 db_load; 2282 db_load;
2244 load_extensions; 2283 load_extensions;
2284
2285 $TICK_WATCHER->start;
2245 Event::loop; 2286 Event::loop;
2246} 2287}
2247 2288
2248############################################################################# 2289#############################################################################
2249# initialisation and cleanup 2290# initialisation and cleanup
2250 2291
2251# install some emergency cleanup handlers 2292# install some emergency cleanup handlers
2252BEGIN { 2293BEGIN {
2253 for my $signal (qw(INT HUP TERM)) { 2294 for my $signal (qw(INT HUP TERM)) {
2254 Event->signal ( 2295 Event->signal (
2296 reentrant => 0,
2255 data => WF_AUTOCANCEL, 2297 data => WF_AUTOCANCEL,
2256 signal => $signal, 2298 signal => $signal,
2299 prio => 0,
2257 cb => sub { 2300 cb => sub {
2258 cf::cleanup "SIG$signal"; 2301 cf::cleanup "SIG$signal";
2259 }, 2302 },
2260 ); 2303 );
2261 } 2304 }
2262} 2305}
… …
2291} 2334}
2292 2335
2293sub reload() { 2336sub reload() {
2294 # can/must only be called in main 2337 # can/must only be called in main
2295 if ($Coro::current != $Coro::main) { 2338 if ($Coro::current != $Coro::main) {
2296 warn "can only reload from main coroutine\n"; 2339 warn "can only reload from main coroutine";
2297 return; 2340 return;
2298 } 2341 }
2299 2342
2300 warn "reloading..."; 2343 warn "reloading...";
2301 2344
2302 warn "freezing server"; 2345 warn "cancelling server ticker";
2303 my $guard = freeze_mainloop; 2346 $TICK_WATCHER->cancel;
2347
2304 cf::emergency_save; 2348 cf::emergency_save;
2305
2306 warn "sync database to disk";
2307 cf::db_sync;
2308 IO::AIO::flush;
2309 2349
2310 eval { 2350 eval {
2311 # if anything goes wrong in here, we should simply crash as we already saved 2351 # if anything goes wrong in here, we should simply crash as we already saved
2312 2352
2353 warn "syncing database to disk";
2354 cf::db_sync;
2355
2313 warn "cancel all watchers"; 2356 warn "cancelling all WF_AUTOCANCEL watchers";
2314 for (Event::all_watchers) { 2357 for (Event::all_watchers) {
2315 $_->cancel if $_->data & WF_AUTOCANCEL; 2358 $_->cancel if $_->data & WF_AUTOCANCEL;
2316 } 2359 }
2317 2360
2361 warn "flushing outstanding aio requests";
2362 for (;;) {
2363 IO::AIO::flush;
2364 Coro::cede;
2365 last unless IO::AIO::nreqs;
2366 warn "iterate...";
2367 }
2368
2318 warn "cancel all extension coros"; 2369 warn "cancelling all extension coros";
2319 $_->cancel for values %EXT_CORO; 2370 $_->cancel for values %EXT_CORO;
2320 %EXT_CORO = (); 2371 %EXT_CORO = ();
2321 2372
2322 warn "remove commands"; 2373 warn "removing commands";
2323 %COMMAND = (); 2374 %COMMAND = ();
2324 2375
2325 warn "remove ext commands"; 2376 warn "removing ext commands";
2326 %EXTCMD = (); 2377 %EXTCMD = ();
2327 2378
2328 warn "unload/nuke all extensions"; 2379 warn "unloading/nuking all extensions";
2329 for my $pkg (@EXTS) { 2380 for my $pkg (@EXTS) {
2330 warn "... unloading $pkg"; 2381 warn "... unloading $pkg";
2331 2382
2332 if (my $cb = $pkg->can ("unload")) { 2383 if (my $cb = $pkg->can ("unload")) {
2333 eval { 2384 eval {
… …
2338 2389
2339 warn "... nuking $pkg"; 2390 warn "... nuking $pkg";
2340 Symbol::delete_package $pkg; 2391 Symbol::delete_package $pkg;
2341 } 2392 }
2342 2393
2343 warn "unload all perl modules loaded from $LIBDIR"; 2394 warn "unloading all perl modules loaded from $LIBDIR";
2344 while (my ($k, $v) = each %INC) { 2395 while (my ($k, $v) = each %INC) {
2345 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2396 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2346 2397
2347 warn "removing <$k>"; 2398 warn "... unloading $k";
2348 delete $INC{$k}; 2399 delete $INC{$k};
2349 2400
2350 $k =~ s/\.pm$//; 2401 $k =~ s/\.pm$//;
2351 $k =~ s/\//::/g; 2402 $k =~ s/\//::/g;
2352 2403
… …
2355 } 2406 }
2356 2407
2357 Symbol::delete_package $k; 2408 Symbol::delete_package $k;
2358 } 2409 }
2359 2410
2360 warn "get rid of safe::, as good as possible"; 2411 warn "getting rid of safe::, as good as possible";
2361 Symbol::delete_package "safe::$_" 2412 Symbol::delete_package "safe::$_"
2362 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2413 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2363 2414
2364 warn "unload cf.pm \"a bit\""; 2415 warn "unloading cf.pm \"a bit\"";
2365 delete $INC{"cf.pm"}; 2416 delete $INC{"cf.pm"};
2366 2417
2367 # don't, removes xs symbols, too, 2418 # don't, removes xs symbols, too,
2368 # and global variables created in xs 2419 # and global variables created in xs
2369 #Symbol::delete_package __PACKAGE__; 2420 #Symbol::delete_package __PACKAGE__;
2370 2421
2422 warn "unload completed, starting to reload now";
2423
2371 warn "reloading cf.pm"; 2424 warn "reloading cf.pm";
2372 require cf; 2425 require cf;
2373 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2426 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2374 2427
2375 warn "load config and database again"; 2428 warn "loading config and database again";
2376 cf::cfg_load; 2429 cf::cfg_load;
2377 cf::db_load; 2430 cf::db_load;
2378 2431
2379 warn "load extensions"; 2432 warn "loading extensions";
2380 cf::load_extensions; 2433 cf::load_extensions;
2381 2434
2382 warn "reattach attachments to objects/players"; 2435 warn "reattaching attachments to objects/players";
2383 _global_reattach; 2436 _global_reattach;
2384 warn "reattach attachments to maps"; 2437 warn "reattaching attachments to maps";
2385 reattach $_ for values %MAP; 2438 reattach $_ for values %MAP;
2439
2440 warn "restarting server ticker";
2441
2442 $TICK_WATCHER->start;
2386 }; 2443 };
2387 2444
2388 if ($@) { 2445 if ($@) {
2389 warn $@; 2446 warn $@;
2390 warn "error while reloading, exiting."; 2447 warn "error while reloading, exiting.";
… …
2403 $who->message ("reloading server."); 2460 $who->message ("reloading server.");
2404 2461
2405 # doing reload synchronously and two reloads happen back-to-back, 2462 # doing reload synchronously and two reloads happen back-to-back,
2406 # coro crashes during coro_state_free->destroy here. 2463 # coro crashes during coro_state_free->destroy here.
2407 2464
2408 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2465 $RELOAD_WATCHER ||= Event->timer (
2466 reentrant => 0,
2467 after => 0,
2468 data => WF_AUTOCANCEL,
2469 cb => sub {
2409 reload; 2470 reload;
2410 undef $RELOAD_WATCHER; 2471 undef $RELOAD_WATCHER;
2472 },
2411 }); 2473 );
2412 } 2474 }
2413}; 2475};
2414 2476
2415unshift @INC, $LIBDIR; 2477unshift @INC, $LIBDIR;
2478
2479my $bug_warning = 0;
2416 2480
2417$TICK_WATCHER = Event->timer ( 2481$TICK_WATCHER = Event->timer (
2418 reentrant => 0, 2482 reentrant => 0,
2483 parked => 1,
2419 prio => 0, 2484 prio => 0,
2420 at => $NEXT_TICK || $TICK, 2485 at => $NEXT_TICK || $TICK,
2421 data => WF_AUTOCANCEL, 2486 data => WF_AUTOCANCEL,
2422 cb => sub { 2487 cb => sub {
2488 if ($Coro::current != $Coro::main) {
2489 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2490 unless ++$bug_warning > 10;
2491 return;
2492 }
2493
2423 $NOW = Event::time; 2494 $NOW = Event::time;
2424 2495
2425 cf::server_tick; # one server iteration 2496 cf::server_tick; # one server iteration
2426 $RUNTIME += $TICK; 2497 $RUNTIME += $TICK;
2427 $NEXT_TICK += $TICK; 2498 $NEXT_TICK += $TICK;
2428 2499
2429 $WAIT_FOR_TICK->broadcast; 2500 $WAIT_FOR_TICK->broadcast;
2430 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2501 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2502
2503 Event::sweep;
2504 Coro::cede_notself;
2505
2506# my $AFTER = Event::time;
2507# warn $AFTER - $NOW;#d#
2431 2508
2432 # if we are delayed by four ticks or more, skip them all 2509 # if we are delayed by four ticks or more, skip them all
2433 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2510 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2434 2511
2435 $TICK_WATCHER->at ($NEXT_TICK); 2512 $TICK_WATCHER->at ($NEXT_TICK);
2436 $TICK_WATCHER->start; 2513 $TICK_WATCHER->start;
2437 }, 2514 },
2438); 2515);
2439 2516
2440IO::AIO::max_poll_time $TICK * 0.2; 2517IO::AIO::max_poll_time $TICK * 0.1;
2441 2518
2519undef $Coro::AIO::WATCHER;
2442$AIO_POLL_WATCHER = Event->io ( 2520$AIO_POLL_WATCHER = Event->io (
2521 reentrant => 0,
2443 fd => IO::AIO::poll_fileno, 2522 fd => IO::AIO::poll_fileno,
2444 poll => 'r', 2523 poll => 'r',
2445 prio => 5, 2524 prio => 6,
2446 data => WF_AUTOCANCEL, 2525 data => WF_AUTOCANCEL,
2447 cb => \&IO::AIO::poll_cb, 2526 cb => \&IO::AIO::poll_cb,
2448); 2527);
2449 2528
2450$WRITE_RUNTIME_WATCHER = Event->timer ( 2529$WRITE_RUNTIME_WATCHER = Event->timer (
2530 reentrant => 0,
2451 data => WF_AUTOCANCEL, 2531 data => WF_AUTOCANCEL,
2452 after => 0, 2532 after => 1,
2453 interval => 10, 2533 interval => 10,
2454 cb => sub { 2534 prio => 6, # keep it lowest so it acts like a watchdog
2455 (Coro::unblock_sub { 2535 cb => Coro::unblock_sub {
2456 write_runtime 2536 write_runtime
2457 or warn "ERROR: unable to write runtime file: $!"; 2537 or warn "ERROR: unable to write runtime file: $!";
2458 })->();
2459 }, 2538 },
2460); 2539);
2461 2540
2462END { cf::emergency_save } 2541END { cf::emergency_save }
2463 2542

Diff Legend

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