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.195 by root, Fri Jan 26 20:59:57 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;
… …
1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1141 (cf::region::find $rmp->{region}), $rmp->{custom} 1141 (cf::region::find $rmp->{region}), $rmp->{custom}
1142 ) 1142 )
1143} 1143}
1144 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
1145sub register { 1153sub register {
1146 my (undef, $regex) = @_; 1154 my (undef, $regex, $prio) = @_;
1147 my $pkg = caller; 1155 my $pkg = caller;
1148 1156
1149 no strict; 1157 no strict;
1150 push @{"$pkg\::ISA"}, __PACKAGE__; 1158 push @{"$pkg\::ISA"}, __PACKAGE__;
1151 1159
1152 $EXT_MAP{$pkg} = qr<$regex>; 1160 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1153} 1161}
1154 1162
1155# also paths starting with '/' 1163# also paths starting with '/'
1156$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1164$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1157 1165
1158sub thawer_merge { 1166sub thawer_merge {
1159 my ($self, $merge) = @_; 1167 my ($self, $merge) = @_;
1160 1168
1161 # we have to keep some variables in memory intact 1169 # we have to keep some variables in memory intact
… …
1167 $self->SUPER::thawer_merge ($merge); 1175 $self->SUPER::thawer_merge ($merge);
1168} 1176}
1169 1177
1170sub normalise { 1178sub normalise {
1171 my ($path, $base) = @_; 1179 my ($path, $base) = @_;
1180
1181 $path = "$path"; # make sure its a string
1172 1182
1173 # map plan: 1183 # map plan:
1174 # 1184 #
1175 # /! non-realised random map exit (special hack!) 1185 # /! non-realised random map exit (special hack!)
1176 # {... are special paths that are not being touched 1186 # {... are special paths that are not being touched
… …
1204 1214
1205 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1215 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1206 1216
1207 $path = normalise $path, $base; 1217 $path = normalise $path, $base;
1208 1218
1209 for my $pkg (keys %EXT_MAP) { 1219 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1210 if ($path =~ $EXT_MAP{$pkg}) { 1220 if ($path =~ $EXT_MAP{$pkg}[1]) {
1211 my $self = bless cf::map::new, $pkg; 1221 my $self = bless cf::map::new, $pkg;
1212 $self->{path} = $path; $self->path ($path); 1222 $self->{path} = $path; $self->path ($path);
1213 $self->init; # pass $1 etc. 1223 $self->init; # pass $1 etc.
1214 return $self; 1224 return $self;
1215 } 1225 }
1216 } 1226 }
1217 1227
1218 Carp::carp "unable to resolve path '$path'."; 1228 Carp::carp "unable to resolve path '$path' (base '$base').";
1219 () 1229 ()
1220} 1230}
1221 1231
1222sub init { 1232sub init {
1223 my ($self) = @_; 1233 my ($self) = @_;
… …
1289 $self->{load_path} = $path; 1299 $self->{load_path} = $path;
1290 1300
1291 1 1301 1
1292} 1302}
1293 1303
1294sub load_orig { 1304sub load_header_orig {
1295 my ($self) = @_; 1305 my ($self) = @_;
1296 1306
1297 $self->load_header_from ($self->load_path) 1307 $self->load_header_from ($self->load_path)
1298} 1308}
1299 1309
1300sub load_temp { 1310sub load_header_temp {
1301 my ($self) = @_; 1311 my ($self) = @_;
1302 1312
1303 $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;
1304} 1333}
1305 1334
1306sub load_header { 1335sub load_header {
1307 my ($self) = @_; 1336 my ($self) = @_;
1308 1337
1309 if ($self->load_temp) { 1338 if ($self->load_header_temp) {
1310 $self->last_access ((delete $self->{last_access}) 1339 $self->prepare_temp;
1311 || $cf::RUNTIME); #d#
1312 # safety
1313 $self->{instantiate_time} = $cf::RUNTIME
1314 if $self->{instantiate_time} > $cf::RUNTIME;
1315 } else { 1340 } else {
1316 $self->load_orig 1341 $self->load_header_orig
1317 or return; 1342 or return;
1318 1343 $self->prepare_orig;
1319 $self->{load_original} = 1;
1320 $self->{instantiate_time} = $cf::RUNTIME;
1321 $self->last_access ($cf::RUNTIME);
1322 $self->instantiate;
1323 } 1344 }
1324 1345
1325 1 1346 1
1326} 1347}
1327 1348
… …
1341 $map->{last_save} = $cf::RUNTIME; 1362 $map->{last_save} = $cf::RUNTIME;
1342 1363
1343 $map->load_header 1364 $map->load_header
1344 or return; 1365 or return;
1345 1366
1346 if ($map->should_reset) { 1367 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1347 # doing this can freeze the server in a sync job, obviously 1368 # doing this can freeze the server in a sync job, obviously
1348 #$cf::WAIT_FOR_TICK->wait; 1369 #$cf::WAIT_FOR_TICK->wait;
1349 $map->reset; 1370 $map->reset;
1350 undef $guard; 1371 undef $guard;
1351 $map = find $path 1372 return find $path;
1352 or return;
1353 } 1373 }
1354 1374
1355 $cf::MAP{$path} = $map 1375 $cf::MAP{$path} = $map
1356 } 1376 }
1357} 1377}
1378
1379sub pre_load { }
1380sub post_load { }
1358 1381
1359sub load { 1382sub load {
1360 my ($self) = @_; 1383 my ($self) = @_;
1361 1384
1362 my $path = $self->{path}; 1385 my $path = $self->{path};
… …
1365 return if $self->in_memory != cf::MAP_SWAPPED; 1388 return if $self->in_memory != cf::MAP_SWAPPED;
1366 1389
1367 $self->in_memory (cf::MAP_LOADING); 1390 $self->in_memory (cf::MAP_LOADING);
1368 1391
1369 $self->alloc; 1392 $self->alloc;
1393
1394 $self->pre_load;
1395
1370 $self->_load_objects ($self->{load_path}, 1) 1396 $self->_load_objects ($self->{load_path}, 1)
1371 or return; 1397 or return;
1372 1398
1373 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1399 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1374 if delete $self->{load_original}; 1400 if delete $self->{load_original};
… …
1396 unless $self->difficulty; 1422 unless $self->difficulty;
1397 Coro::cede; 1423 Coro::cede;
1398 $self->activate; 1424 $self->activate;
1399 } 1425 }
1400 1426
1427 $self->post_load;
1428
1401 $self->in_memory (cf::MAP_IN_MEMORY); 1429 $self->in_memory (cf::MAP_IN_MEMORY);
1402} 1430}
1403 1431
1404sub customise_for { 1432sub customise_for {
1405 my ($self, $ob) = @_; 1433 my ($self, $ob) = @_;
… …
1469 delete $MAP_PREFETCH{$path}; 1497 delete $MAP_PREFETCH{$path};
1470 } 1498 }
1471 } 1499 }
1472 undef $MAP_PREFETCHER; 1500 undef $MAP_PREFETCHER;
1473 }; 1501 };
1502 $MAP_PREFETCHER->prio (6);
1474 1503
1475 () 1504 ()
1476} 1505}
1477 1506
1478sub save { 1507sub save {
… …
1719 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1748 return if UNIVERSAL::isa $self->map, "ext::map_link";
1720 1749
1721 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1750 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1722 if $self->map; 1751 if $self->map;
1723 1752
1724 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1753 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1725} 1754}
1726 1755
1727sub cf::object::player::leave_link { 1756sub cf::object::player::leave_link {
1728 my ($self, $map, $x, $y) = @_; 1757 my ($self, $map, $x, $y) = @_;
1729 1758
… …
1870sub cf::object::player::enter_exit { 1899sub cf::object::player::enter_exit {
1871 my ($self, $exit) = @_; 1900 my ($self, $exit) = @_;
1872 1901
1873 return unless $self->type == cf::PLAYER; 1902 return unless $self->type == cf::PLAYER;
1874 1903
1904 if ($exit->slaying eq "/!") {
1905 #TODO: this should de-fi-ni-te-ly not be a sync-job
1906 cf::sync_job { prepare_random_map $exit };
1907 }
1908
1909 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1910 my $hp = $exit->stats->hp;
1911 my $sp = $exit->stats->sp;
1912
1875 $self->enter_link; 1913 $self->enter_link;
1876 1914
1877 (async { 1915 (async {
1878 $self->deactivate_recursive; # just to be sure 1916 $self->deactivate_recursive; # just to be sure
1879 unless (eval { 1917 unless (eval {
1880 prepare_random_map $exit 1918 $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 1919
1886 1; 1920 1;
1887 }) { 1921 }) {
1888 $self->message ("Something went wrong deep within the crossfire server. " 1922 $self->message ("Something went wrong deep within the crossfire server. "
1889 . "I'll try to bring you back to the map you were before. " 1923 . "I'll try to bring you back to the map you were before. "
… …
2178 sub db_sync() { 2212 sub db_sync() {
2179 db_save if $dirty; 2213 db_save if $dirty;
2180 undef $dirty; 2214 undef $dirty;
2181 } 2215 }
2182 2216
2183 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2217 my $idle = Event->idle (
2184 db_sync; 2218 reentrant => 0,
2219 min => 10,
2220 max => 20,
2221 repeat => 0,
2222 data => WF_AUTOCANCEL,
2223 cb => \&db_sync,
2185 }); 2224 );
2186 2225
2187 sub db_dirty() { 2226 sub db_dirty() {
2188 $dirty = 1; 2227 $dirty = 1;
2189 $idle->start; 2228 $idle->start;
2190 } 2229 }
… …
2258 2297
2259# install some emergency cleanup handlers 2298# install some emergency cleanup handlers
2260BEGIN { 2299BEGIN {
2261 for my $signal (qw(INT HUP TERM)) { 2300 for my $signal (qw(INT HUP TERM)) {
2262 Event->signal ( 2301 Event->signal (
2302 reentrant => 0,
2263 data => WF_AUTOCANCEL, 2303 data => WF_AUTOCANCEL,
2264 signal => $signal, 2304 signal => $signal,
2305 prio => 0,
2265 cb => sub { 2306 cb => sub {
2266 cf::cleanup "SIG$signal"; 2307 cf::cleanup "SIG$signal";
2267 }, 2308 },
2268 ); 2309 );
2269 } 2310 }
2270} 2311}
… …
2425 $who->message ("reloading server."); 2466 $who->message ("reloading server.");
2426 2467
2427 # doing reload synchronously and two reloads happen back-to-back, 2468 # doing reload synchronously and two reloads happen back-to-back,
2428 # coro crashes during coro_state_free->destroy here. 2469 # coro crashes during coro_state_free->destroy here.
2429 2470
2430 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2471 $RELOAD_WATCHER ||= Event->timer (
2472 reentrant => 0,
2473 after => 0,
2474 data => WF_AUTOCANCEL,
2475 cb => sub {
2431 reload; 2476 reload;
2432 undef $RELOAD_WATCHER; 2477 undef $RELOAD_WATCHER;
2478 },
2433 }); 2479 );
2434 } 2480 }
2435}; 2481};
2436 2482
2437unshift @INC, $LIBDIR; 2483unshift @INC, $LIBDIR;
2438 2484
… …
2458 $NEXT_TICK += $TICK; 2504 $NEXT_TICK += $TICK;
2459 2505
2460 $WAIT_FOR_TICK->broadcast; 2506 $WAIT_FOR_TICK->broadcast;
2461 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2507 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2462 2508
2509 Event::sweep;
2510 Coro::cede_notself;
2511
2512# my $AFTER = Event::time;
2513# warn $AFTER - $NOW;#d#
2514
2463 # if we are delayed by four ticks or more, skip them all 2515 # if we are delayed by four ticks or more, skip them all
2464 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2516 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2465 2517
2466 $TICK_WATCHER->at ($NEXT_TICK); 2518 $TICK_WATCHER->at ($NEXT_TICK);
2467 $TICK_WATCHER->start; 2519 $TICK_WATCHER->start;
2468 }, 2520 },
2469); 2521);
2470 2522
2471IO::AIO::max_poll_time $TICK * 0.2; 2523IO::AIO::max_poll_time $TICK * 0.1;
2472 2524
2525undef $Coro::AIO::WATCHER;
2473$AIO_POLL_WATCHER = Event->io ( 2526$AIO_POLL_WATCHER = Event->io (
2527 reentrant => 0,
2474 fd => IO::AIO::poll_fileno, 2528 fd => IO::AIO::poll_fileno,
2475 poll => 'r', 2529 poll => 'r',
2476 prio => 5, 2530 prio => 6,
2477 data => WF_AUTOCANCEL, 2531 data => WF_AUTOCANCEL,
2478 cb => \&IO::AIO::poll_cb, 2532 cb => \&IO::AIO::poll_cb,
2479); 2533);
2480 2534
2481$WRITE_RUNTIME_WATCHER = Event->timer ( 2535$WRITE_RUNTIME_WATCHER = Event->timer (
2536 reentrant => 0,
2482 data => WF_AUTOCANCEL, 2537 data => WF_AUTOCANCEL,
2483 after => 1, 2538 after => 1,
2484 interval => 10, 2539 interval => 10,
2485 prio => 6, # keep it lowest so it acts like a watchdog 2540 prio => 6, # keep it lowest so it acts like a watchdog
2486 cb => Coro::unblock_sub { 2541 cb => Coro::unblock_sub {
2487 write_runtime 2542 write_runtime
2488 or warn "ERROR: unable to write runtime file: $!"; 2543 or warn "ERROR: unable to write runtime file: $!";
2489 }, 2544 },
2490); 2545);
2491 2546

Diff Legend

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