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.185 by root, Fri Jan 19 23:32:52 2007 UTC vs.
Revision 1.199 by root, Mon Jan 29 14:46:01 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;
… …
82mkdir cf::localdir . "/" . cf::tmpdir; 82mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 83mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 84mkdir $RANDOM_MAPS;
85 85
86our $EMERGENCY_POSITION; 86our $EMERGENCY_POSITION;
87
88sub cf::map::normalise;
87 89
88############################################################################# 90#############################################################################
89 91
90=head2 GLOBAL VARIABLES 92=head2 GLOBAL VARIABLES
91 93
… …
349 my $runtime = cf::localdir . "/runtime"; 351 my $runtime = cf::localdir . "/runtime";
350 352
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 354 or return;
353 355
356 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 357 # 10 is the runtime save interval, for a monotonic clock
358 # 60 allows for the watchdog to kill the server.
359
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 360 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 361 and return;
357 362
358 aio_fsync $fh 363 aio_fsync $fh
359 and return; 364 and return;
… …
1075 for (@$files) { 1080 for (@$files) {
1076 utf8::decode $_; 1081 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1082 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1083 next unless /^$PATH_SEP/o;
1079 1084
1080 s/\.map$//;
1081 push @paths, "~" . $pl->ob->name . "/" . $_; 1085 push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_;
1082 } 1086 }
1083 1087
1084 \@paths 1088 \@paths
1085} 1089}
1086 1090
… …
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1141 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1142 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1143 )
1140} 1144}
1141 1145
1146=item cf::map->register ($regex, $prio)
1147
1148Register a handler for the map path matching the given regex at the
1149givne priority (higher is better, built-in handlers have priority 0, the
1150default).
1151
1152=cut
1153
1142sub register { 1154sub register {
1143 my (undef, $regex) = @_; 1155 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1156 my $pkg = caller;
1145 1157
1146 no strict; 1158 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1159 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1160
1149 $EXT_MAP{$pkg} = qr<$regex>; 1161 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1162}
1151 1163
1152# also paths starting with '/' 1164# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1165$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1166
1155sub thawer_merge { 1167sub thawer_merge {
1156 my ($self, $merge) = @_; 1168 my ($self, $merge) = @_;
1157 1169
1158 # we have to keep some variables in memory intact 1170 # we have to keep some variables in memory intact
… …
1164 $self->SUPER::thawer_merge ($merge); 1176 $self->SUPER::thawer_merge ($merge);
1165} 1177}
1166 1178
1167sub normalise { 1179sub normalise {
1168 my ($path, $base) = @_; 1180 my ($path, $base) = @_;
1181
1182 $path = "$path"; # make sure its a string
1183
1184 $path =~ s/\.map$//;
1169 1185
1170 # map plan: 1186 # map plan:
1171 # 1187 #
1172 # /! non-realised random map exit (special hack!) 1188 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched 1189 # {... are special paths that are not being touched
… …
1201 1217
1202 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1218 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1203 1219
1204 $path = normalise $path, $base; 1220 $path = normalise $path, $base;
1205 1221
1206 for my $pkg (keys %EXT_MAP) { 1222 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1223 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1224 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1225 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1226 $self->init; # pass $1 etc.
1211 return $self; 1227 return $self;
1212 } 1228 }
1213 } 1229 }
1214 1230
1215 Carp::carp "unable to resolve path '$path'."; 1231 Carp::carp "unable to resolve path '$path' (base '$base').";
1216 () 1232 ()
1217} 1233}
1218 1234
1219sub init { 1235sub init {
1220 my ($self) = @_; 1236 my ($self) = @_;
… …
1286 $self->{load_path} = $path; 1302 $self->{load_path} = $path;
1287 1303
1288 1 1304 1
1289} 1305}
1290 1306
1291sub load_orig { 1307sub load_header_orig {
1292 my ($self) = @_; 1308 my ($self) = @_;
1293 1309
1294 $self->load_header_from ($self->load_path) 1310 $self->load_header_from ($self->load_path)
1295} 1311}
1296 1312
1297sub load_temp { 1313sub load_header_temp {
1298 my ($self) = @_; 1314 my ($self) = @_;
1299 1315
1300 $self->load_header_from ($self->save_path) 1316 $self->load_header_from ($self->save_path)
1317}
1318
1319sub prepare_temp {
1320 my ($self) = @_;
1321
1322 $self->last_access ((delete $self->{last_access})
1323 || $cf::RUNTIME); #d#
1324 # safety
1325 $self->{instantiate_time} = $cf::RUNTIME
1326 if $self->{instantiate_time} > $cf::RUNTIME;
1327}
1328
1329sub prepare_orig {
1330 my ($self) = @_;
1331
1332 $self->{load_original} = 1;
1333 $self->{instantiate_time} = $cf::RUNTIME;
1334 $self->last_access ($cf::RUNTIME);
1335 $self->instantiate;
1301} 1336}
1302 1337
1303sub load_header { 1338sub load_header {
1304 my ($self) = @_; 1339 my ($self) = @_;
1305 1340
1306 if ($self->load_temp) { 1341 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1342 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1343 } else {
1313 $self->load_orig 1344 $self->load_header_orig
1314 or return; 1345 or return;
1315 1346 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1347 }
1321 1348
1322 1 1349 1
1323} 1350}
1324 1351
… …
1338 $map->{last_save} = $cf::RUNTIME; 1365 $map->{last_save} = $cf::RUNTIME;
1339 1366
1340 $map->load_header 1367 $map->load_header
1341 or return; 1368 or return;
1342 1369
1343 if ($map->should_reset) { 1370 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1344 # doing this can freeze the server in a sync job, obviously 1371 # doing this can freeze the server in a sync job, obviously
1345 #$cf::WAIT_FOR_TICK->wait; 1372 #$cf::WAIT_FOR_TICK->wait;
1346 $map->reset; 1373 $map->reset;
1347 undef $guard; 1374 undef $guard;
1348 $map = find $path 1375 return find $path;
1349 or return;
1350 } 1376 }
1351 1377
1352 $cf::MAP{$path} = $map 1378 $cf::MAP{$path} = $map
1353 } 1379 }
1354} 1380}
1381
1382sub pre_load { }
1383sub post_load { }
1355 1384
1356sub load { 1385sub load {
1357 my ($self) = @_; 1386 my ($self) = @_;
1358 1387
1388 local $self->{deny_reset} = 1; # loading can take a long time
1389
1359 my $path = $self->{path}; 1390 my $path = $self->{path};
1360 my $guard = cf::lock_acquire "map_load:$path"; 1391 my $guard = cf::lock_acquire "map_load:$path";
1361 1392
1362 return if $self->in_memory != cf::MAP_SWAPPED; 1393 return if $self->in_memory != cf::MAP_SWAPPED;
1363 1394
1364 $self->in_memory (cf::MAP_LOADING); 1395 $self->in_memory (cf::MAP_LOADING);
1365 1396
1366 $self->alloc; 1397 $self->alloc;
1398
1399 $self->pre_load;
1400
1367 $self->_load_objects ($self->{load_path}, 1) 1401 $self->_load_objects ($self->{load_path}, 1)
1368 or return; 1402 or return;
1369 1403
1370 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1404 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1371 if delete $self->{load_original}; 1405 if delete $self->{load_original};
… …
1393 unless $self->difficulty; 1427 unless $self->difficulty;
1394 Coro::cede; 1428 Coro::cede;
1395 $self->activate; 1429 $self->activate;
1396 } 1430 }
1397 1431
1432 $self->post_load;
1433
1398 $self->in_memory (cf::MAP_IN_MEMORY); 1434 $self->in_memory (cf::MAP_IN_MEMORY);
1399} 1435}
1400 1436
1401sub customise_for { 1437sub customise_for {
1402 my ($self, $ob) = @_; 1438 my ($self, $ob) = @_;
… …
1466 delete $MAP_PREFETCH{$path}; 1502 delete $MAP_PREFETCH{$path};
1467 } 1503 }
1468 } 1504 }
1469 undef $MAP_PREFETCHER; 1505 undef $MAP_PREFETCHER;
1470 }; 1506 };
1507 $MAP_PREFETCHER->prio (6);
1471 1508
1472 () 1509 ()
1473} 1510}
1474 1511
1475sub save { 1512sub save {
… …
1594 for (@$files) { 1631 for (@$files) {
1595 utf8::decode $_; 1632 utf8::decode $_;
1596 next if /\.pst$/; 1633 next if /\.pst$/;
1597 next unless /^$PATH_SEP/o; 1634 next unless /^$PATH_SEP/o;
1598 1635
1599 s/\.map$//; 1636 push @paths, cf::map::normalise $_;
1600 push @paths, $_;
1601 } 1637 }
1602 1638
1603 \@paths 1639 \@paths
1604} 1640}
1605 1641
… …
1699=cut 1735=cut
1700 1736
1701sub link_map { 1737sub link_map {
1702 unless ($LINK_MAP) { 1738 unless ($LINK_MAP) {
1703 $LINK_MAP = cf::map::find "{link}" 1739 $LINK_MAP = cf::map::find "{link}"
1704 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1740 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1705 $LINK_MAP->load; 1741 $LINK_MAP->load;
1706 } 1742 }
1707 1743
1708 $LINK_MAP 1744 $LINK_MAP
1709} 1745}
… …
1716 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1752 return if UNIVERSAL::isa $self->map, "ext::map_link";
1717 1753
1718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1754 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1719 if $self->map; 1755 if $self->map;
1720 1756
1721 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1757 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1722} 1758}
1723 1759
1724sub cf::object::player::leave_link { 1760sub cf::object::player::leave_link {
1725 my ($self, $map, $x, $y) = @_; 1761 my ($self, $map, $x, $y) = @_;
1726 1762
… …
1793 my ($self, $path, $x, $y) = @_; 1829 my ($self, $path, $x, $y) = @_;
1794 1830
1795 $self->enter_link; 1831 $self->enter_link;
1796 1832
1797 (async { 1833 (async {
1834 my $map = eval {
1798 my $map = cf::map::find $path; 1835 my $map = cf::map::find $path;
1799 $map = $map->customise_for ($self) if $map; 1836 $map = $map->customise_for ($self) if $map;
1800 1837 $map
1801# warn "entering ", $map->path, " at ($x, $y)\n" 1838 } or
1802# if $map;
1803
1804 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1839 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1805 1840
1806 $self->leave_link ($map, $x, $y); 1841 $self->leave_link ($map, $x, $y);
1807 })->prio (1); 1842 })->prio (1);
1808} 1843}
1809 1844
… …
1840 # that depends on the exit object 1875 # that depends on the exit object
1841 1876
1842 my $rmp = parse_random_map_params $exit->msg; 1877 my $rmp = parse_random_map_params $exit->msg;
1843 1878
1844 if ($exit->map) { 1879 if ($exit->map) {
1845 $rmp->{region} = $exit->map->region_name; 1880 $rmp->{region} = $exit->region->name;
1846 $rmp->{origin_map} = $exit->map->path; 1881 $rmp->{origin_map} = $exit->map->path;
1847 $rmp->{origin_x} = $exit->x; 1882 $rmp->{origin_x} = $exit->x;
1848 $rmp->{origin_y} = $exit->y; 1883 $rmp->{origin_y} = $exit->y;
1849 } 1884 }
1850 1885
… …
1867sub cf::object::player::enter_exit { 1902sub cf::object::player::enter_exit {
1868 my ($self, $exit) = @_; 1903 my ($self, $exit) = @_;
1869 1904
1870 return unless $self->type == cf::PLAYER; 1905 return unless $self->type == cf::PLAYER;
1871 1906
1907 if ($exit->slaying eq "/!") {
1908 #TODO: this should de-fi-ni-te-ly not be a sync-job
1909 cf::sync_job { prepare_random_map $exit };
1910 }
1911
1912 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1913 my $hp = $exit->stats->hp;
1914 my $sp = $exit->stats->sp;
1915
1872 $self->enter_link; 1916 $self->enter_link;
1873 1917
1874 (async { 1918 (async {
1875 $self->deactivate_recursive; # just to be sure 1919 $self->deactivate_recursive; # just to be sure
1876 unless (eval { 1920 unless (eval {
1877 prepare_random_map $exit 1921 $self->goto ($slaying, $hp, $sp);
1878 if $exit->slaying eq "/!";
1879
1880 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1881 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1882 1922
1883 1; 1923 1;
1884 }) { 1924 }) {
1885 $self->message ("Something went wrong deep within the crossfire server. " 1925 $self->message ("Something went wrong deep within the crossfire server. "
1886 . "I'll try to bring you back to the map you were before. " 1926 . "I'll try to bring you back to the map you were before. "
… …
2175 sub db_sync() { 2215 sub db_sync() {
2176 db_save if $dirty; 2216 db_save if $dirty;
2177 undef $dirty; 2217 undef $dirty;
2178 } 2218 }
2179 2219
2180 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2220 my $idle = Event->idle (
2181 db_sync; 2221 reentrant => 0,
2222 min => 10,
2223 max => 20,
2224 repeat => 0,
2225 data => WF_AUTOCANCEL,
2226 cb => \&db_sync,
2182 }); 2227 );
2183 2228
2184 sub db_dirty() { 2229 sub db_dirty() {
2185 $dirty = 1; 2230 $dirty = 1;
2186 $idle->start; 2231 $idle->start;
2187 } 2232 }
… …
2255 2300
2256# install some emergency cleanup handlers 2301# install some emergency cleanup handlers
2257BEGIN { 2302BEGIN {
2258 for my $signal (qw(INT HUP TERM)) { 2303 for my $signal (qw(INT HUP TERM)) {
2259 Event->signal ( 2304 Event->signal (
2305 reentrant => 0,
2260 data => WF_AUTOCANCEL, 2306 data => WF_AUTOCANCEL,
2261 signal => $signal, 2307 signal => $signal,
2308 prio => 0,
2262 cb => sub { 2309 cb => sub {
2263 cf::cleanup "SIG$signal"; 2310 cf::cleanup "SIG$signal";
2264 }, 2311 },
2265 ); 2312 );
2266 } 2313 }
2267} 2314}
… …
2422 $who->message ("reloading server."); 2469 $who->message ("reloading server.");
2423 2470
2424 # doing reload synchronously and two reloads happen back-to-back, 2471 # doing reload synchronously and two reloads happen back-to-back,
2425 # coro crashes during coro_state_free->destroy here. 2472 # coro crashes during coro_state_free->destroy here.
2426 2473
2427 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2474 $RELOAD_WATCHER ||= Event->timer (
2475 reentrant => 0,
2476 after => 0,
2477 data => WF_AUTOCANCEL,
2478 cb => sub {
2428 reload; 2479 reload;
2429 undef $RELOAD_WATCHER; 2480 undef $RELOAD_WATCHER;
2481 },
2430 }); 2482 );
2431 } 2483 }
2432}; 2484};
2433 2485
2434unshift @INC, $LIBDIR; 2486unshift @INC, $LIBDIR;
2435 2487
… …
2455 $NEXT_TICK += $TICK; 2507 $NEXT_TICK += $TICK;
2456 2508
2457 $WAIT_FOR_TICK->broadcast; 2509 $WAIT_FOR_TICK->broadcast;
2458 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2510 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2459 2511
2512 Event::sweep;
2513 Coro::cede_notself;
2514
2515# my $AFTER = Event::time;
2516# warn $AFTER - $NOW;#d#
2517
2460 # if we are delayed by four ticks or more, skip them all 2518 # if we are delayed by four ticks or more, skip them all
2461 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2519 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2462 2520
2463 $TICK_WATCHER->at ($NEXT_TICK); 2521 $TICK_WATCHER->at ($NEXT_TICK);
2464 $TICK_WATCHER->start; 2522 $TICK_WATCHER->start;
2465 }, 2523 },
2466); 2524);
2467 2525
2468IO::AIO::max_poll_time $TICK * 0.2; 2526IO::AIO::max_poll_time $TICK * 0.1;
2469 2527
2528undef $Coro::AIO::WATCHER;
2470$AIO_POLL_WATCHER = Event->io ( 2529$AIO_POLL_WATCHER = Event->io (
2530 reentrant => 0,
2471 fd => IO::AIO::poll_fileno, 2531 fd => IO::AIO::poll_fileno,
2472 poll => 'r', 2532 poll => 'r',
2473 prio => 5, 2533 prio => 6,
2474 data => WF_AUTOCANCEL, 2534 data => WF_AUTOCANCEL,
2475 cb => \&IO::AIO::poll_cb, 2535 cb => \&IO::AIO::poll_cb,
2476); 2536);
2477 2537
2478$WRITE_RUNTIME_WATCHER = Event->timer ( 2538$WRITE_RUNTIME_WATCHER = Event->timer (
2539 reentrant => 0,
2479 data => WF_AUTOCANCEL, 2540 data => WF_AUTOCANCEL,
2480 after => 1, 2541 after => 1,
2481 interval => 10, 2542 interval => 10,
2543 prio => 6, # keep it lowest so it acts like a watchdog
2482 cb => Coro::unblock_sub { 2544 cb => Coro::unblock_sub {
2483 write_runtime 2545 write_runtime
2484 or warn "ERROR: unable to write runtime file: $!"; 2546 or warn "ERROR: unable to write runtime file: $!";
2485 }, 2547 },
2486); 2548);
2487 2549

Diff Legend

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