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.177 by root, Sun Jan 14 22:54:18 2007 UTC vs.
Revision 1.188 by root, Sat Jan 20 23:30:16 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];
… …
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 }
… …
1287 $self->{load_path} = $path; 1297 $self->{load_path} = $path;
1288 1298
1289 1 1299 1
1290} 1300}
1291 1301
1292sub load_orig { 1302sub load_header_orig {
1293 my ($self) = @_; 1303 my ($self) = @_;
1294 1304
1295 $self->load_header_from ($self->load_path) 1305 $self->load_header_from ($self->load_path)
1296} 1306}
1297 1307
1298sub load_temp { 1308sub load_header_temp {
1299 my ($self) = @_; 1309 my ($self) = @_;
1300 1310
1301 $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;
1302} 1331}
1303 1332
1304sub load_header { 1333sub load_header {
1305 my ($self) = @_; 1334 my ($self) = @_;
1306 1335
1307 if ($self->load_temp) { 1336 if ($self->load_header_temp) {
1308 $self->last_access ((delete $self->{last_access}) 1337 $self->prepare_temp;
1309 || $cf::RUNTIME); #d#
1310 # safety
1311 $self->{instantiate_time} = $cf::RUNTIME
1312 if $self->{instantiate_time} > $cf::RUNTIME;
1313 } else { 1338 } else {
1314 $self->load_orig 1339 $self->load_header_orig
1315 or return; 1340 or return;
1316 1341 $self->prepare_orig;
1317 $self->{load_original} = 1;
1318 $self->{instantiate_time} = $cf::RUNTIME;
1319 $self->last_access ($cf::RUNTIME);
1320 $self->instantiate;
1321 } 1342 }
1322 1343
1323 1 1344 1
1324} 1345}
1325 1346
… …
1340 1361
1341 $map->load_header 1362 $map->load_header
1342 or return; 1363 or return;
1343 1364
1344 if ($map->should_reset) { 1365 if ($map->should_reset) {
1366 # doing this can freeze the server in a sync job, obviously
1345 $cf::WAIT_FOR_TICK->wait; 1367 #$cf::WAIT_FOR_TICK->wait;
1346 $map->reset; 1368 $map->reset;
1347 undef $guard; 1369 undef $guard;
1348 $map = find $path 1370 $map = find $path
1349 or return; 1371 or return;
1350 } 1372 }
1351 1373
1352 $cf::MAP{$path} = $map 1374 $cf::MAP{$path} = $map
1353 } 1375 }
1354} 1376}
1355 1377
1378sub pre_load { }
1379sub post_load { }
1380
1356sub load { 1381sub load {
1357 my ($self) = @_; 1382 my ($self) = @_;
1358 1383
1359 my $path = $self->{path}; 1384 my $path = $self->{path};
1360 my $guard = cf::lock_acquire "map_load:$path"; 1385 my $guard = cf::lock_acquire "map_load:$path";
… …
1362 return if $self->in_memory != cf::MAP_SWAPPED; 1387 return if $self->in_memory != cf::MAP_SWAPPED;
1363 1388
1364 $self->in_memory (cf::MAP_LOADING); 1389 $self->in_memory (cf::MAP_LOADING);
1365 1390
1366 $self->alloc; 1391 $self->alloc;
1392
1393 $self->pre_load;
1394
1367 $self->_load_objects ($self->{load_path}, 1) 1395 $self->_load_objects ($self->{load_path}, 1)
1368 or return; 1396 or return;
1369 1397
1370 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1398 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1371 if delete $self->{load_original}; 1399 if delete $self->{load_original};
… …
1393 unless $self->difficulty; 1421 unless $self->difficulty;
1394 Coro::cede; 1422 Coro::cede;
1395 $self->activate; 1423 $self->activate;
1396 } 1424 }
1397 1425
1426 $self->post_load;
1427
1398 $self->in_memory (cf::MAP_IN_MEMORY); 1428 $self->in_memory (cf::MAP_IN_MEMORY);
1399} 1429}
1400 1430
1401sub customise_for { 1431sub customise_for {
1402 my ($self, $ob) = @_; 1432 my ($self, $ob) = @_;
… …
1442 1472
1443 cf::sync_job { $map->load }; 1473 cf::sync_job { $map->load };
1444} 1474}
1445 1475
1446our %MAP_PREFETCH; 1476our %MAP_PREFETCH;
1447our $MAP_PREFETCHER = Coro::async { 1477our $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 1478
1460sub find_async { 1479sub find_async {
1461 my ($path, $origin) = @_; 1480 my ($path, $origin) = @_;
1462 1481
1463 $path = normalise $path, $origin && $origin->{path}; 1482 $path = normalise $path, $origin && $origin->{path};
1464 1483
1465 if (my $map = $cf::MAP{$path}) { 1484 if (my $map = $cf::MAP{$path}) {
1466 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1485 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1467 } 1486 }
1468 1487
1469 $MAP_PREFETCH{$path} = 0; 1488 undef $MAP_PREFETCH{$path};
1470 $MAP_PREFETCHER->ready; 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 };
1471 1501
1472 () 1502 ()
1473} 1503}
1474 1504
1475sub save { 1505sub save {
… …
1813 1843
1814sub parse_random_map_params { 1844sub parse_random_map_params {
1815 my ($spec) = @_; 1845 my ($spec) = @_;
1816 1846
1817 my $rmp = { # defaults 1847 my $rmp = { # defaults
1818 xsize => 10, 1848 xsize => (cf::rndm 15, 40),
1819 ysize => 10, 1849 ysize => (cf::rndm 15, 40),
1850 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1851 #layout => string,
1820 }; 1852 };
1821 1853
1822 for (split /\n/, $spec) { 1854 for (split /\n/, $spec) {
1823 my ($k, $v) = split /\s+/, $_, 2; 1855 my ($k, $v) = split /\s+/, $_, 2;
1824 1856
… …
1828 $rmp 1860 $rmp
1829} 1861}
1830 1862
1831sub prepare_random_map { 1863sub prepare_random_map {
1832 my ($exit) = @_; 1864 my ($exit) = @_;
1865
1866 my $guard = cf::lock_acquire "exit_prepare:$exit";
1833 1867
1834 # all this does is basically replace the /! path by 1868 # all this does is basically replace the /! path by
1835 # a new random map path (?random/...) with a seed 1869 # a new random map path (?random/...) with a seed
1836 # that depends on the exit object 1870 # that depends on the exit object
1837 1871
… …
2171 sub db_sync() { 2205 sub db_sync() {
2172 db_save if $dirty; 2206 db_save if $dirty;
2173 undef $dirty; 2207 undef $dirty;
2174 } 2208 }
2175 2209
2176 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2210 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2177 db_sync; 2211 db_sync;
2178 }); 2212 });
2179 2213
2180 sub db_dirty() { 2214 sub db_dirty() {
2181 $dirty = 1; 2215 $dirty = 1;
… …
2239 }; 2273 };
2240 2274
2241 cfg_load; 2275 cfg_load;
2242 db_load; 2276 db_load;
2243 load_extensions; 2277 load_extensions;
2278
2279 $TICK_WATCHER->start;
2244 Event::loop; 2280 Event::loop;
2245} 2281}
2246 2282
2247############################################################################# 2283#############################################################################
2248# initialisation and cleanup 2284# initialisation and cleanup
… …
2290} 2326}
2291 2327
2292sub reload() { 2328sub reload() {
2293 # can/must only be called in main 2329 # can/must only be called in main
2294 if ($Coro::current != $Coro::main) { 2330 if ($Coro::current != $Coro::main) {
2295 warn "can only reload from main coroutine\n"; 2331 warn "can only reload from main coroutine";
2296 return; 2332 return;
2297 } 2333 }
2298 2334
2299 warn "reloading..."; 2335 warn "reloading...";
2300 2336
2301 warn "freezing server"; 2337 warn "cancelling server ticker";
2302 my $guard = freeze_mainloop; 2338 $TICK_WATCHER->cancel;
2339
2303 cf::emergency_save; 2340 cf::emergency_save;
2304
2305 warn "sync database to disk";
2306 cf::db_sync;
2307 IO::AIO::flush;
2308 2341
2309 eval { 2342 eval {
2310 # if anything goes wrong in here, we should simply crash as we already saved 2343 # if anything goes wrong in here, we should simply crash as we already saved
2311 2344
2345 warn "syncing database to disk";
2346 cf::db_sync;
2347
2312 warn "cancel all watchers"; 2348 warn "cancelling all WF_AUTOCANCEL watchers";
2313 for (Event::all_watchers) { 2349 for (Event::all_watchers) {
2314 $_->cancel if $_->data & WF_AUTOCANCEL; 2350 $_->cancel if $_->data & WF_AUTOCANCEL;
2315 } 2351 }
2316 2352
2353 warn "flushing outstanding aio requests";
2354 for (;;) {
2355 IO::AIO::flush;
2356 Coro::cede;
2357 last unless IO::AIO::nreqs;
2358 warn "iterate...";
2359 }
2360
2317 warn "cancel all extension coros"; 2361 warn "cancelling all extension coros";
2318 $_->cancel for values %EXT_CORO; 2362 $_->cancel for values %EXT_CORO;
2319 %EXT_CORO = (); 2363 %EXT_CORO = ();
2320 2364
2321 warn "remove commands"; 2365 warn "removing commands";
2322 %COMMAND = (); 2366 %COMMAND = ();
2323 2367
2324 warn "remove ext commands"; 2368 warn "removing ext commands";
2325 %EXTCMD = (); 2369 %EXTCMD = ();
2326 2370
2327 warn "unload/nuke all extensions"; 2371 warn "unloading/nuking all extensions";
2328 for my $pkg (@EXTS) { 2372 for my $pkg (@EXTS) {
2329 warn "... unloading $pkg"; 2373 warn "... unloading $pkg";
2330 2374
2331 if (my $cb = $pkg->can ("unload")) { 2375 if (my $cb = $pkg->can ("unload")) {
2332 eval { 2376 eval {
… …
2337 2381
2338 warn "... nuking $pkg"; 2382 warn "... nuking $pkg";
2339 Symbol::delete_package $pkg; 2383 Symbol::delete_package $pkg;
2340 } 2384 }
2341 2385
2342 warn "unload all perl modules loaded from $LIBDIR"; 2386 warn "unloading all perl modules loaded from $LIBDIR";
2343 while (my ($k, $v) = each %INC) { 2387 while (my ($k, $v) = each %INC) {
2344 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2388 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2345 2389
2346 warn "removing <$k>"; 2390 warn "... unloading $k";
2347 delete $INC{$k}; 2391 delete $INC{$k};
2348 2392
2349 $k =~ s/\.pm$//; 2393 $k =~ s/\.pm$//;
2350 $k =~ s/\//::/g; 2394 $k =~ s/\//::/g;
2351 2395
… …
2354 } 2398 }
2355 2399
2356 Symbol::delete_package $k; 2400 Symbol::delete_package $k;
2357 } 2401 }
2358 2402
2359 warn "get rid of safe::, as good as possible"; 2403 warn "getting rid of safe::, as good as possible";
2360 Symbol::delete_package "safe::$_" 2404 Symbol::delete_package "safe::$_"
2361 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2405 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2362 2406
2363 warn "unload cf.pm \"a bit\""; 2407 warn "unloading cf.pm \"a bit\"";
2364 delete $INC{"cf.pm"}; 2408 delete $INC{"cf.pm"};
2365 2409
2366 # don't, removes xs symbols, too, 2410 # don't, removes xs symbols, too,
2367 # and global variables created in xs 2411 # and global variables created in xs
2368 #Symbol::delete_package __PACKAGE__; 2412 #Symbol::delete_package __PACKAGE__;
2369 2413
2414 warn "unload completed, starting to reload now";
2415
2370 warn "reloading cf.pm"; 2416 warn "reloading cf.pm";
2371 require cf; 2417 require cf;
2372 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2418 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2373 2419
2374 warn "load config and database again"; 2420 warn "loading config and database again";
2375 cf::cfg_load; 2421 cf::cfg_load;
2376 cf::db_load; 2422 cf::db_load;
2377 2423
2378 warn "load extensions"; 2424 warn "loading extensions";
2379 cf::load_extensions; 2425 cf::load_extensions;
2380 2426
2381 warn "reattach attachments to objects/players"; 2427 warn "reattaching attachments to objects/players";
2382 _global_reattach; 2428 _global_reattach;
2383 warn "reattach attachments to maps"; 2429 warn "reattaching attachments to maps";
2384 reattach $_ for values %MAP; 2430 reattach $_ for values %MAP;
2431
2432 warn "restarting server ticker";
2433
2434 $TICK_WATCHER->start;
2385 }; 2435 };
2386 2436
2387 if ($@) { 2437 if ($@) {
2388 warn $@; 2438 warn $@;
2389 warn "error while reloading, exiting."; 2439 warn "error while reloading, exiting.";
… …
2411 } 2461 }
2412}; 2462};
2413 2463
2414unshift @INC, $LIBDIR; 2464unshift @INC, $LIBDIR;
2415 2465
2466my $bug_warning = 0;
2467
2416$TICK_WATCHER = Event->timer ( 2468$TICK_WATCHER = Event->timer (
2417 reentrant => 0, 2469 reentrant => 0,
2470 parked => 1,
2418 prio => 0, 2471 prio => 0,
2419 at => $NEXT_TICK || $TICK, 2472 at => $NEXT_TICK || $TICK,
2420 data => WF_AUTOCANCEL, 2473 data => WF_AUTOCANCEL,
2421 cb => sub { 2474 cb => sub {
2475 if ($Coro::current != $Coro::main) {
2476 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2477 unless ++$bug_warning > 10;
2478 return;
2479 }
2480
2422 $NOW = Event::time; 2481 $NOW = Event::time;
2423 2482
2424 cf::server_tick; # one server iteration 2483 cf::server_tick; # one server iteration
2425 $RUNTIME += $TICK; 2484 $RUNTIME += $TICK;
2426 $NEXT_TICK += $TICK; 2485 $NEXT_TICK += $TICK;
… …
2446 cb => \&IO::AIO::poll_cb, 2505 cb => \&IO::AIO::poll_cb,
2447); 2506);
2448 2507
2449$WRITE_RUNTIME_WATCHER = Event->timer ( 2508$WRITE_RUNTIME_WATCHER = Event->timer (
2450 data => WF_AUTOCANCEL, 2509 data => WF_AUTOCANCEL,
2451 after => 0, 2510 after => 1,
2452 interval => 10, 2511 interval => 10,
2453 cb => sub { 2512 prio => 6, # keep it lowest so it acts like a watchdog
2454 (Coro::unblock_sub { 2513 cb => Coro::unblock_sub {
2455 write_runtime 2514 write_runtime
2456 or warn "ERROR: unable to write runtime file: $!"; 2515 or warn "ERROR: unable to write runtime file: $!";
2457 })->();
2458 }, 2516 },
2459); 2517);
2460 2518
2461END { cf::emergency_save } 2519END { cf::emergency_save }
2462 2520

Diff Legend

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