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.187 by root, Sat Jan 20 21:06:52 2007 UTC vs.
Revision 1.198 by root, Sun Jan 28 01:58:37 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.4 (); 13use Coro 3.5 ();
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;
… …
1176} 1176}
1177 1177
1178sub normalise { 1178sub normalise {
1179 my ($path, $base) = @_; 1179 my ($path, $base) = @_;
1180 1180
1181 $path = "$path"; # make sure its a string
1182
1181 # map plan: 1183 # map plan:
1182 # 1184 #
1183 # /! non-realised random map exit (special hack!) 1185 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched 1186 # {... are special paths that are not being touched
1185 # ?xxx/... are special absolute paths 1187 # ?xxx/... are special absolute paths
… …
1221 $self->init; # pass $1 etc. 1223 $self->init; # pass $1 etc.
1222 return $self; 1224 return $self;
1223 } 1225 }
1224 } 1226 }
1225 1227
1226 Carp::carp "unable to resolve path '$path'."; 1228 Carp::carp "unable to resolve path '$path' (base '$base').";
1227 () 1229 ()
1228} 1230}
1229 1231
1230sub init { 1232sub init {
1231 my ($self) = @_; 1233 my ($self) = @_;
… …
1297 $self->{load_path} = $path; 1299 $self->{load_path} = $path;
1298 1300
1299 1 1301 1
1300} 1302}
1301 1303
1302sub load_orig { 1304sub load_header_orig {
1303 my ($self) = @_; 1305 my ($self) = @_;
1304 1306
1305 $self->load_header_from ($self->load_path) 1307 $self->load_header_from ($self->load_path)
1306} 1308}
1307 1309
1308sub load_temp { 1310sub load_header_temp {
1309 my ($self) = @_; 1311 my ($self) = @_;
1310 1312
1311 $self->load_header_from ($self->save_path) 1313 $self->load_header_from ($self->save_path)
1314}
1315
1316sub prepare_temp {
1317 my ($self) = @_;
1318
1319 $self->last_access ((delete $self->{last_access})
1320 || $cf::RUNTIME); #d#
1321 # safety
1322 $self->{instantiate_time} = $cf::RUNTIME
1323 if $self->{instantiate_time} > $cf::RUNTIME;
1324}
1325
1326sub prepare_orig {
1327 my ($self) = @_;
1328
1329 $self->{load_original} = 1;
1330 $self->{instantiate_time} = $cf::RUNTIME;
1331 $self->last_access ($cf::RUNTIME);
1332 $self->instantiate;
1312} 1333}
1313 1334
1314sub load_header { 1335sub load_header {
1315 my ($self) = @_; 1336 my ($self) = @_;
1316 1337
1317 if ($self->load_temp) { 1338 if ($self->load_header_temp) {
1318 $self->last_access ((delete $self->{last_access}) 1339 $self->prepare_temp;
1319 || $cf::RUNTIME); #d#
1320 # safety
1321 $self->{instantiate_time} = $cf::RUNTIME
1322 if $self->{instantiate_time} > $cf::RUNTIME;
1323 } else { 1340 } else {
1324 $self->load_orig 1341 $self->load_header_orig
1325 or return; 1342 or return;
1326 1343 $self->prepare_orig;
1327 $self->{load_original} = 1;
1328 $self->{instantiate_time} = $cf::RUNTIME;
1329 $self->last_access ($cf::RUNTIME);
1330 $self->instantiate;
1331 } 1344 }
1332 1345
1333 1 1346 1
1334} 1347}
1335 1348
… …
1349 $map->{last_save} = $cf::RUNTIME; 1362 $map->{last_save} = $cf::RUNTIME;
1350 1363
1351 $map->load_header 1364 $map->load_header
1352 or return; 1365 or return;
1353 1366
1354 if ($map->should_reset) { 1367 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1355 # doing this can freeze the server in a sync job, obviously 1368 # doing this can freeze the server in a sync job, obviously
1356 #$cf::WAIT_FOR_TICK->wait; 1369 #$cf::WAIT_FOR_TICK->wait;
1357 $map->reset; 1370 $map->reset;
1358 undef $guard; 1371 undef $guard;
1359 $map = find $path 1372 return find $path;
1360 or return;
1361 } 1373 }
1362 1374
1363 $cf::MAP{$path} = $map 1375 $cf::MAP{$path} = $map
1364 } 1376 }
1365} 1377}
1378
1379sub pre_load { }
1380sub post_load { }
1366 1381
1367sub load { 1382sub load {
1368 my ($self) = @_; 1383 my ($self) = @_;
1369 1384
1385 local $self->{deny_reset} = 1; # loading can take a long time
1386
1370 my $path = $self->{path}; 1387 my $path = $self->{path};
1371 my $guard = cf::lock_acquire "map_load:$path"; 1388 my $guard = cf::lock_acquire "map_load:$path";
1372 1389
1373 return if $self->in_memory != cf::MAP_SWAPPED; 1390 return if $self->in_memory != cf::MAP_SWAPPED;
1374 1391
1375 $self->in_memory (cf::MAP_LOADING); 1392 $self->in_memory (cf::MAP_LOADING);
1376 1393
1377 $self->alloc; 1394 $self->alloc;
1395
1396 $self->pre_load;
1397
1378 $self->_load_objects ($self->{load_path}, 1) 1398 $self->_load_objects ($self->{load_path}, 1)
1379 or return; 1399 or return;
1380 1400
1381 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1401 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1382 if delete $self->{load_original}; 1402 if delete $self->{load_original};
… …
1404 unless $self->difficulty; 1424 unless $self->difficulty;
1405 Coro::cede; 1425 Coro::cede;
1406 $self->activate; 1426 $self->activate;
1407 } 1427 }
1408 1428
1429 $self->post_load;
1430
1409 $self->in_memory (cf::MAP_IN_MEMORY); 1431 $self->in_memory (cf::MAP_IN_MEMORY);
1410} 1432}
1411 1433
1412sub customise_for { 1434sub customise_for {
1413 my ($self, $ob) = @_; 1435 my ($self, $ob) = @_;
… …
1477 delete $MAP_PREFETCH{$path}; 1499 delete $MAP_PREFETCH{$path};
1478 } 1500 }
1479 } 1501 }
1480 undef $MAP_PREFETCHER; 1502 undef $MAP_PREFETCHER;
1481 }; 1503 };
1504 $MAP_PREFETCHER->prio (6);
1482 1505
1483 () 1506 ()
1484} 1507}
1485 1508
1486sub save { 1509sub save {
… …
1710=cut 1733=cut
1711 1734
1712sub link_map { 1735sub link_map {
1713 unless ($LINK_MAP) { 1736 unless ($LINK_MAP) {
1714 $LINK_MAP = cf::map::find "{link}" 1737 $LINK_MAP = cf::map::find "{link}"
1715 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1738 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1716 $LINK_MAP->load; 1739 $LINK_MAP->load;
1717 } 1740 }
1718 1741
1719 $LINK_MAP 1742 $LINK_MAP
1720} 1743}
… …
1727 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1750 return if UNIVERSAL::isa $self->map, "ext::map_link";
1728 1751
1729 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1752 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1730 if $self->map; 1753 if $self->map;
1731 1754
1732 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1755 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1733} 1756}
1734 1757
1735sub cf::object::player::leave_link { 1758sub cf::object::player::leave_link {
1736 my ($self, $map, $x, $y) = @_; 1759 my ($self, $map, $x, $y) = @_;
1737 1760
… …
1804 my ($self, $path, $x, $y) = @_; 1827 my ($self, $path, $x, $y) = @_;
1805 1828
1806 $self->enter_link; 1829 $self->enter_link;
1807 1830
1808 (async { 1831 (async {
1832 my $map = eval {
1809 my $map = cf::map::find $path; 1833 my $map = cf::map::find $path;
1810 $map = $map->customise_for ($self) if $map; 1834 $map = $map->customise_for ($self) if $map;
1811 1835 $map
1812# warn "entering ", $map->path, " at ($x, $y)\n" 1836 } or
1813# if $map;
1814
1815 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1837 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1816 1838
1817 $self->leave_link ($map, $x, $y); 1839 $self->leave_link ($map, $x, $y);
1818 })->prio (1); 1840 })->prio (1);
1819} 1841}
1820 1842
… …
1851 # that depends on the exit object 1873 # that depends on the exit object
1852 1874
1853 my $rmp = parse_random_map_params $exit->msg; 1875 my $rmp = parse_random_map_params $exit->msg;
1854 1876
1855 if ($exit->map) { 1877 if ($exit->map) {
1856 $rmp->{region} = $exit->map->region_name; 1878 $rmp->{region} = $exit->region->name;
1857 $rmp->{origin_map} = $exit->map->path; 1879 $rmp->{origin_map} = $exit->map->path;
1858 $rmp->{origin_x} = $exit->x; 1880 $rmp->{origin_x} = $exit->x;
1859 $rmp->{origin_y} = $exit->y; 1881 $rmp->{origin_y} = $exit->y;
1860 } 1882 }
1861 1883
… …
1878sub cf::object::player::enter_exit { 1900sub cf::object::player::enter_exit {
1879 my ($self, $exit) = @_; 1901 my ($self, $exit) = @_;
1880 1902
1881 return unless $self->type == cf::PLAYER; 1903 return unless $self->type == cf::PLAYER;
1882 1904
1905 if ($exit->slaying eq "/!") {
1906 #TODO: this should de-fi-ni-te-ly not be a sync-job
1907 cf::sync_job { prepare_random_map $exit };
1908 }
1909
1910 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1911 my $hp = $exit->stats->hp;
1912 my $sp = $exit->stats->sp;
1913
1883 $self->enter_link; 1914 $self->enter_link;
1884 1915
1885 (async { 1916 (async {
1886 $self->deactivate_recursive; # just to be sure 1917 $self->deactivate_recursive; # just to be sure
1887 unless (eval { 1918 unless (eval {
1888 prepare_random_map $exit 1919 $self->goto ($slaying, $hp, $sp);
1889 if $exit->slaying eq "/!";
1890
1891 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1892 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1893 1920
1894 1; 1921 1;
1895 }) { 1922 }) {
1896 $self->message ("Something went wrong deep within the crossfire server. " 1923 $self->message ("Something went wrong deep within the crossfire server. "
1897 . "I'll try to bring you back to the map you were before. " 1924 . "I'll try to bring you back to the map you were before. "
… …
2186 sub db_sync() { 2213 sub db_sync() {
2187 db_save if $dirty; 2214 db_save if $dirty;
2188 undef $dirty; 2215 undef $dirty;
2189 } 2216 }
2190 2217
2191 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2218 my $idle = Event->idle (
2192 db_sync; 2219 reentrant => 0,
2220 min => 10,
2221 max => 20,
2222 repeat => 0,
2223 data => WF_AUTOCANCEL,
2224 cb => \&db_sync,
2193 }); 2225 );
2194 2226
2195 sub db_dirty() { 2227 sub db_dirty() {
2196 $dirty = 1; 2228 $dirty = 1;
2197 $idle->start; 2229 $idle->start;
2198 } 2230 }
… …
2266 2298
2267# install some emergency cleanup handlers 2299# install some emergency cleanup handlers
2268BEGIN { 2300BEGIN {
2269 for my $signal (qw(INT HUP TERM)) { 2301 for my $signal (qw(INT HUP TERM)) {
2270 Event->signal ( 2302 Event->signal (
2303 reentrant => 0,
2271 data => WF_AUTOCANCEL, 2304 data => WF_AUTOCANCEL,
2272 signal => $signal, 2305 signal => $signal,
2306 prio => 0,
2273 cb => sub { 2307 cb => sub {
2274 cf::cleanup "SIG$signal"; 2308 cf::cleanup "SIG$signal";
2275 }, 2309 },
2276 ); 2310 );
2277 } 2311 }
2278} 2312}
… …
2433 $who->message ("reloading server."); 2467 $who->message ("reloading server.");
2434 2468
2435 # doing reload synchronously and two reloads happen back-to-back, 2469 # doing reload synchronously and two reloads happen back-to-back,
2436 # coro crashes during coro_state_free->destroy here. 2470 # coro crashes during coro_state_free->destroy here.
2437 2471
2438 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2472 $RELOAD_WATCHER ||= Event->timer (
2473 reentrant => 0,
2474 after => 0,
2475 data => WF_AUTOCANCEL,
2476 cb => sub {
2439 reload; 2477 reload;
2440 undef $RELOAD_WATCHER; 2478 undef $RELOAD_WATCHER;
2479 },
2441 }); 2480 );
2442 } 2481 }
2443}; 2482};
2444 2483
2445unshift @INC, $LIBDIR; 2484unshift @INC, $LIBDIR;
2446 2485
… …
2466 $NEXT_TICK += $TICK; 2505 $NEXT_TICK += $TICK;
2467 2506
2468 $WAIT_FOR_TICK->broadcast; 2507 $WAIT_FOR_TICK->broadcast;
2469 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2508 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2470 2509
2510 Event::sweep;
2511 Coro::cede_notself;
2512
2513# my $AFTER = Event::time;
2514# warn $AFTER - $NOW;#d#
2515
2471 # if we are delayed by four ticks or more, skip them all 2516 # if we are delayed by four ticks or more, skip them all
2472 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2517 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2473 2518
2474 $TICK_WATCHER->at ($NEXT_TICK); 2519 $TICK_WATCHER->at ($NEXT_TICK);
2475 $TICK_WATCHER->start; 2520 $TICK_WATCHER->start;
2476 }, 2521 },
2477); 2522);
2478 2523
2479IO::AIO::max_poll_time $TICK * 0.2; 2524IO::AIO::max_poll_time $TICK * 0.1;
2480 2525
2526undef $Coro::AIO::WATCHER;
2481$AIO_POLL_WATCHER = Event->io ( 2527$AIO_POLL_WATCHER = Event->io (
2528 reentrant => 0,
2482 fd => IO::AIO::poll_fileno, 2529 fd => IO::AIO::poll_fileno,
2483 poll => 'r', 2530 poll => 'r',
2484 prio => 5, 2531 prio => 6,
2485 data => WF_AUTOCANCEL, 2532 data => WF_AUTOCANCEL,
2486 cb => \&IO::AIO::poll_cb, 2533 cb => \&IO::AIO::poll_cb,
2487); 2534);
2488 2535
2489$WRITE_RUNTIME_WATCHER = Event->timer ( 2536$WRITE_RUNTIME_WATCHER = Event->timer (
2537 reentrant => 0,
2490 data => WF_AUTOCANCEL, 2538 data => WF_AUTOCANCEL,
2491 after => 1, 2539 after => 1,
2492 interval => 10, 2540 interval => 10,
2493 prio => 6, # keep it lowest so it acts like a watchdog 2541 prio => 6, # keep it lowest so it acts like a watchdog
2494 cb => Coro::unblock_sub { 2542 cb => Coro::unblock_sub {
2495 write_runtime 2543 write_runtime
2496 or warn "ERROR: unable to write runtime file: $!"; 2544 or warn "ERROR: unable to write runtime file: $!";
2497 }, 2545 },
2498); 2546);
2499 2547

Diff Legend

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