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.186 by root, Sat Jan 20 01:12:39 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
… …
1078 for (@$files) { 1080 for (@$files) {
1079 utf8::decode $_; 1081 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1082 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1083 next unless /^$PATH_SEP/o;
1082 1084
1083 s/\.map$//;
1084 push @paths, "~" . $pl->ob->name . "/" . $_; 1085 push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_;
1085 } 1086 }
1086 1087
1087 \@paths 1088 \@paths
1088} 1089}
1089 1090
… …
1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1141 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1141 (cf::region::find $rmp->{region}), $rmp->{custom} 1142 (cf::region::find $rmp->{region}), $rmp->{custom}
1142 ) 1143 )
1143} 1144}
1144 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
1145sub register { 1154sub register {
1146 my (undef, $regex) = @_; 1155 my (undef, $regex, $prio) = @_;
1147 my $pkg = caller; 1156 my $pkg = caller;
1148 1157
1149 no strict; 1158 no strict;
1150 push @{"$pkg\::ISA"}, __PACKAGE__; 1159 push @{"$pkg\::ISA"}, __PACKAGE__;
1151 1160
1152 $EXT_MAP{$pkg} = qr<$regex>; 1161 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1153} 1162}
1154 1163
1155# also paths starting with '/' 1164# also paths starting with '/'
1156$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1165$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1157 1166
1158sub thawer_merge { 1167sub thawer_merge {
1159 my ($self, $merge) = @_; 1168 my ($self, $merge) = @_;
1160 1169
1161 # we have to keep some variables in memory intact 1170 # we have to keep some variables in memory intact
… …
1167 $self->SUPER::thawer_merge ($merge); 1176 $self->SUPER::thawer_merge ($merge);
1168} 1177}
1169 1178
1170sub normalise { 1179sub normalise {
1171 my ($path, $base) = @_; 1180 my ($path, $base) = @_;
1181
1182 $path = "$path"; # make sure its a string
1183
1184 $path =~ s/\.map$//;
1172 1185
1173 # map plan: 1186 # map plan:
1174 # 1187 #
1175 # /! non-realised random map exit (special hack!) 1188 # /! non-realised random map exit (special hack!)
1176 # {... are special paths that are not being touched 1189 # {... are special paths that are not being touched
… …
1204 1217
1205 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
1206 1219
1207 $path = normalise $path, $base; 1220 $path = normalise $path, $base;
1208 1221
1209 for my $pkg (keys %EXT_MAP) { 1222 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1210 if ($path =~ $EXT_MAP{$pkg}) { 1223 if ($path =~ $EXT_MAP{$pkg}[1]) {
1211 my $self = bless cf::map::new, $pkg; 1224 my $self = bless cf::map::new, $pkg;
1212 $self->{path} = $path; $self->path ($path); 1225 $self->{path} = $path; $self->path ($path);
1213 $self->init; # pass $1 etc. 1226 $self->init; # pass $1 etc.
1214 return $self; 1227 return $self;
1215 } 1228 }
1216 } 1229 }
1217 1230
1218 Carp::carp "unable to resolve path '$path'."; 1231 Carp::carp "unable to resolve path '$path' (base '$base').";
1219 () 1232 ()
1220} 1233}
1221 1234
1222sub init { 1235sub init {
1223 my ($self) = @_; 1236 my ($self) = @_;
… …
1289 $self->{load_path} = $path; 1302 $self->{load_path} = $path;
1290 1303
1291 1 1304 1
1292} 1305}
1293 1306
1294sub load_orig { 1307sub load_header_orig {
1295 my ($self) = @_; 1308 my ($self) = @_;
1296 1309
1297 $self->load_header_from ($self->load_path) 1310 $self->load_header_from ($self->load_path)
1298} 1311}
1299 1312
1300sub load_temp { 1313sub load_header_temp {
1301 my ($self) = @_; 1314 my ($self) = @_;
1302 1315
1303 $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;
1304} 1336}
1305 1337
1306sub load_header { 1338sub load_header {
1307 my ($self) = @_; 1339 my ($self) = @_;
1308 1340
1309 if ($self->load_temp) { 1341 if ($self->load_header_temp) {
1310 $self->last_access ((delete $self->{last_access}) 1342 $self->prepare_temp;
1311 || $cf::RUNTIME); #d#
1312 # safety
1313 $self->{instantiate_time} = $cf::RUNTIME
1314 if $self->{instantiate_time} > $cf::RUNTIME;
1315 } else { 1343 } else {
1316 $self->load_orig 1344 $self->load_header_orig
1317 or return; 1345 or return;
1318 1346 $self->prepare_orig;
1319 $self->{load_original} = 1;
1320 $self->{instantiate_time} = $cf::RUNTIME;
1321 $self->last_access ($cf::RUNTIME);
1322 $self->instantiate;
1323 } 1347 }
1324 1348
1325 1 1349 1
1326} 1350}
1327 1351
… …
1341 $map->{last_save} = $cf::RUNTIME; 1365 $map->{last_save} = $cf::RUNTIME;
1342 1366
1343 $map->load_header 1367 $map->load_header
1344 or return; 1368 or return;
1345 1369
1346 if ($map->should_reset) { 1370 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1347 # doing this can freeze the server in a sync job, obviously 1371 # doing this can freeze the server in a sync job, obviously
1348 #$cf::WAIT_FOR_TICK->wait; 1372 #$cf::WAIT_FOR_TICK->wait;
1349 $map->reset; 1373 $map->reset;
1350 undef $guard; 1374 undef $guard;
1351 $map = find $path 1375 return find $path;
1352 or return;
1353 } 1376 }
1354 1377
1355 $cf::MAP{$path} = $map 1378 $cf::MAP{$path} = $map
1356 } 1379 }
1357} 1380}
1381
1382sub pre_load { }
1383sub post_load { }
1358 1384
1359sub load { 1385sub load {
1360 my ($self) = @_; 1386 my ($self) = @_;
1361 1387
1388 local $self->{deny_reset} = 1; # loading can take a long time
1389
1362 my $path = $self->{path}; 1390 my $path = $self->{path};
1363 my $guard = cf::lock_acquire "map_load:$path"; 1391 my $guard = cf::lock_acquire "map_load:$path";
1364 1392
1365 return if $self->in_memory != cf::MAP_SWAPPED; 1393 return if $self->in_memory != cf::MAP_SWAPPED;
1366 1394
1367 $self->in_memory (cf::MAP_LOADING); 1395 $self->in_memory (cf::MAP_LOADING);
1368 1396
1369 $self->alloc; 1397 $self->alloc;
1398
1399 $self->pre_load;
1400
1370 $self->_load_objects ($self->{load_path}, 1) 1401 $self->_load_objects ($self->{load_path}, 1)
1371 or return; 1402 or return;
1372 1403
1373 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1404 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1374 if delete $self->{load_original}; 1405 if delete $self->{load_original};
… …
1396 unless $self->difficulty; 1427 unless $self->difficulty;
1397 Coro::cede; 1428 Coro::cede;
1398 $self->activate; 1429 $self->activate;
1399 } 1430 }
1400 1431
1432 $self->post_load;
1433
1401 $self->in_memory (cf::MAP_IN_MEMORY); 1434 $self->in_memory (cf::MAP_IN_MEMORY);
1402} 1435}
1403 1436
1404sub customise_for { 1437sub customise_for {
1405 my ($self, $ob) = @_; 1438 my ($self, $ob) = @_;
… …
1469 delete $MAP_PREFETCH{$path}; 1502 delete $MAP_PREFETCH{$path};
1470 } 1503 }
1471 } 1504 }
1472 undef $MAP_PREFETCHER; 1505 undef $MAP_PREFETCHER;
1473 }; 1506 };
1507 $MAP_PREFETCHER->prio (6);
1474 1508
1475 () 1509 ()
1476} 1510}
1477 1511
1478sub save { 1512sub save {
… …
1597 for (@$files) { 1631 for (@$files) {
1598 utf8::decode $_; 1632 utf8::decode $_;
1599 next if /\.pst$/; 1633 next if /\.pst$/;
1600 next unless /^$PATH_SEP/o; 1634 next unless /^$PATH_SEP/o;
1601 1635
1602 s/\.map$//; 1636 push @paths, cf::map::normalise $_;
1603 push @paths, $_;
1604 } 1637 }
1605 1638
1606 \@paths 1639 \@paths
1607} 1640}
1608 1641
… …
1702=cut 1735=cut
1703 1736
1704sub link_map { 1737sub link_map {
1705 unless ($LINK_MAP) { 1738 unless ($LINK_MAP) {
1706 $LINK_MAP = cf::map::find "{link}" 1739 $LINK_MAP = cf::map::find "{link}"
1707 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1740 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1708 $LINK_MAP->load; 1741 $LINK_MAP->load;
1709 } 1742 }
1710 1743
1711 $LINK_MAP 1744 $LINK_MAP
1712} 1745}
… …
1719 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1752 return if UNIVERSAL::isa $self->map, "ext::map_link";
1720 1753
1721 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1754 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1722 if $self->map; 1755 if $self->map;
1723 1756
1724 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1757 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1725} 1758}
1726 1759
1727sub cf::object::player::leave_link { 1760sub cf::object::player::leave_link {
1728 my ($self, $map, $x, $y) = @_; 1761 my ($self, $map, $x, $y) = @_;
1729 1762
… …
1796 my ($self, $path, $x, $y) = @_; 1829 my ($self, $path, $x, $y) = @_;
1797 1830
1798 $self->enter_link; 1831 $self->enter_link;
1799 1832
1800 (async { 1833 (async {
1834 my $map = eval {
1801 my $map = cf::map::find $path; 1835 my $map = cf::map::find $path;
1802 $map = $map->customise_for ($self) if $map; 1836 $map = $map->customise_for ($self) if $map;
1803 1837 $map
1804# warn "entering ", $map->path, " at ($x, $y)\n" 1838 } or
1805# if $map;
1806
1807 $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);
1808 1840
1809 $self->leave_link ($map, $x, $y); 1841 $self->leave_link ($map, $x, $y);
1810 })->prio (1); 1842 })->prio (1);
1811} 1843}
1812 1844
… …
1843 # that depends on the exit object 1875 # that depends on the exit object
1844 1876
1845 my $rmp = parse_random_map_params $exit->msg; 1877 my $rmp = parse_random_map_params $exit->msg;
1846 1878
1847 if ($exit->map) { 1879 if ($exit->map) {
1848 $rmp->{region} = $exit->map->region_name; 1880 $rmp->{region} = $exit->region->name;
1849 $rmp->{origin_map} = $exit->map->path; 1881 $rmp->{origin_map} = $exit->map->path;
1850 $rmp->{origin_x} = $exit->x; 1882 $rmp->{origin_x} = $exit->x;
1851 $rmp->{origin_y} = $exit->y; 1883 $rmp->{origin_y} = $exit->y;
1852 } 1884 }
1853 1885
… …
1870sub cf::object::player::enter_exit { 1902sub cf::object::player::enter_exit {
1871 my ($self, $exit) = @_; 1903 my ($self, $exit) = @_;
1872 1904
1873 return unless $self->type == cf::PLAYER; 1905 return unless $self->type == cf::PLAYER;
1874 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
1875 $self->enter_link; 1916 $self->enter_link;
1876 1917
1877 (async { 1918 (async {
1878 $self->deactivate_recursive; # just to be sure 1919 $self->deactivate_recursive; # just to be sure
1879 unless (eval { 1920 unless (eval {
1880 prepare_random_map $exit 1921 $self->goto ($slaying, $hp, $sp);
1881 if $exit->slaying eq "/!";
1882
1883 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1884 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1885 1922
1886 1; 1923 1;
1887 }) { 1924 }) {
1888 $self->message ("Something went wrong deep within the crossfire server. " 1925 $self->message ("Something went wrong deep within the crossfire server. "
1889 . "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. "
… …
2178 sub db_sync() { 2215 sub db_sync() {
2179 db_save if $dirty; 2216 db_save if $dirty;
2180 undef $dirty; 2217 undef $dirty;
2181 } 2218 }
2182 2219
2183 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2220 my $idle = Event->idle (
2184 db_sync; 2221 reentrant => 0,
2222 min => 10,
2223 max => 20,
2224 repeat => 0,
2225 data => WF_AUTOCANCEL,
2226 cb => \&db_sync,
2185 }); 2227 );
2186 2228
2187 sub db_dirty() { 2229 sub db_dirty() {
2188 $dirty = 1; 2230 $dirty = 1;
2189 $idle->start; 2231 $idle->start;
2190 } 2232 }
… …
2258 2300
2259# install some emergency cleanup handlers 2301# install some emergency cleanup handlers
2260BEGIN { 2302BEGIN {
2261 for my $signal (qw(INT HUP TERM)) { 2303 for my $signal (qw(INT HUP TERM)) {
2262 Event->signal ( 2304 Event->signal (
2305 reentrant => 0,
2263 data => WF_AUTOCANCEL, 2306 data => WF_AUTOCANCEL,
2264 signal => $signal, 2307 signal => $signal,
2308 prio => 0,
2265 cb => sub { 2309 cb => sub {
2266 cf::cleanup "SIG$signal"; 2310 cf::cleanup "SIG$signal";
2267 }, 2311 },
2268 ); 2312 );
2269 } 2313 }
2270} 2314}
… …
2425 $who->message ("reloading server."); 2469 $who->message ("reloading server.");
2426 2470
2427 # doing reload synchronously and two reloads happen back-to-back, 2471 # doing reload synchronously and two reloads happen back-to-back,
2428 # coro crashes during coro_state_free->destroy here. 2472 # coro crashes during coro_state_free->destroy here.
2429 2473
2430 $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 {
2431 reload; 2479 reload;
2432 undef $RELOAD_WATCHER; 2480 undef $RELOAD_WATCHER;
2481 },
2433 }); 2482 );
2434 } 2483 }
2435}; 2484};
2436 2485
2437unshift @INC, $LIBDIR; 2486unshift @INC, $LIBDIR;
2438 2487
… …
2458 $NEXT_TICK += $TICK; 2507 $NEXT_TICK += $TICK;
2459 2508
2460 $WAIT_FOR_TICK->broadcast; 2509 $WAIT_FOR_TICK->broadcast;
2461 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2510 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2462 2511
2512 Event::sweep;
2513 Coro::cede_notself;
2514
2515# my $AFTER = Event::time;
2516# warn $AFTER - $NOW;#d#
2517
2463 # 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
2464 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2519 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2465 2520
2466 $TICK_WATCHER->at ($NEXT_TICK); 2521 $TICK_WATCHER->at ($NEXT_TICK);
2467 $TICK_WATCHER->start; 2522 $TICK_WATCHER->start;
2468 }, 2523 },
2469); 2524);
2470 2525
2471IO::AIO::max_poll_time $TICK * 0.2; 2526IO::AIO::max_poll_time $TICK * 0.1;
2472 2527
2528undef $Coro::AIO::WATCHER;
2473$AIO_POLL_WATCHER = Event->io ( 2529$AIO_POLL_WATCHER = Event->io (
2530 reentrant => 0,
2474 fd => IO::AIO::poll_fileno, 2531 fd => IO::AIO::poll_fileno,
2475 poll => 'r', 2532 poll => 'r',
2476 prio => 5, 2533 prio => 6,
2477 data => WF_AUTOCANCEL, 2534 data => WF_AUTOCANCEL,
2478 cb => \&IO::AIO::poll_cb, 2535 cb => \&IO::AIO::poll_cb,
2479); 2536);
2480 2537
2481$WRITE_RUNTIME_WATCHER = Event->timer ( 2538$WRITE_RUNTIME_WATCHER = Event->timer (
2539 reentrant => 0,
2482 data => WF_AUTOCANCEL, 2540 data => WF_AUTOCANCEL,
2483 after => 1, 2541 after => 1,
2484 interval => 10, 2542 interval => 10,
2485 prio => 6, # keep it lowest so it acts like a watchdog 2543 prio => 6, # keep it lowest so it acts like a watchdog
2486 cb => Coro::unblock_sub { 2544 cb => Coro::unblock_sub {
2487 write_runtime 2545 write_runtime
2488 or warn "ERROR: unable to write runtime file: $!"; 2546 or warn "ERROR: unable to write runtime file: $!";
2489 }, 2547 },
2490); 2548);
2491 2549

Diff Legend

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