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.173 by root, Sun Jan 14 18:00:34 2007 UTC vs.
Revision 1.203 by root, Thu Feb 1 19:40:42 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.3 (); 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;
… …
771 } 776 }
772 } else { 777 } else {
773 aio_unlink $filename; 778 aio_unlink $filename;
774 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
775 } 780 }
781
782 #d##TODO# nuke non .map-files if exist
783 if ($filename =~ s/\.map$//) {
784 aio_unlink $filename;
785 aio_unlink "$filename.pst";
786 }
776 } 787 }
777} 788}
778 789
779sub object_freezer_as_string { 790sub object_freezer_as_string {
780 my ($rdata, $objs) = @_; 791 my ($rdata, $objs) = @_;
… …
786 797
787sub object_thawer_load { 798sub object_thawer_load {
788 my ($filename) = @_; 799 my ($filename) = @_;
789 800
790 my ($data, $av); 801 my ($data, $av);
802
803 #d#TODO remove .map if file does not exist
804 aio_stat $filename and $filename =~ s/\.map$//;
791 805
792 (aio_load $filename, $data) >= 0 806 (aio_load $filename, $data) >= 0
793 or return; 807 or return;
794 808
795 unless (aio_stat "$filename.pst") { 809 unless (aio_stat "$filename.pst") {
… …
957 971
958sub exists($) { 972sub exists($) {
959 my ($login) = @_; 973 my ($login) = @_;
960 974
961 $cf::PLAYER{$login} 975 $cf::PLAYER{$login}
962 or cf::sync_job { !aio_stat $login } 976 or cf::sync_job { !aio_stat path $login }
963} 977}
964 978
965sub find($) { 979sub find($) {
966 return $cf::PLAYER{$_[0]} || do { 980 return $cf::PLAYER{$_[0]} || do {
967 my $login = $_[0]; 981 my $login = $_[0];
… …
1065=cut 1079=cut
1066 1080
1067sub maps($) { 1081sub maps($) {
1068 my ($pl) = @_; 1082 my ($pl) = @_;
1069 1083
1084 $pl = ref $pl ? $pl->ob->name : $pl;
1085
1070 my $files = aio_readdir playerdir $pl 1086 my $files = aio_readdir playerdir $pl
1071 or return; 1087 or return;
1072 1088
1073 my @paths; 1089 my @paths;
1074 1090
1075 for (@$files) { 1091 for (@$files) {
1076 utf8::decode $_; 1092 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1093 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1094 next unless /^$PATH_SEP/o;
1079 1095
1080 s/\.map$//; 1096 push @paths, cf::map::normalise "~$pl/$_";
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 } 1097 }
1083 1098
1084 \@paths 1099 \@paths
1085} 1100}
1086 1101
… …
1121our $MAX_RESET = 3600; 1136our $MAX_RESET = 3600;
1122our $DEFAULT_RESET = 3000; 1137our $DEFAULT_RESET = 3000;
1123 1138
1124sub generate_random_map { 1139sub generate_random_map {
1125 my ($self, $rmp) = @_; 1140 my ($self, $rmp) = @_;
1126
1127 # mit "rum" bekleckern, nicht 1141 # mit "rum" bekleckern, nicht
1128 $self->_create_random_map ( 1142 $self->_create_random_map (
1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1143 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1144 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1145 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1152 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1139 (cf::region::find $rmp->{region}), $rmp->{custom} 1153 (cf::region::find $rmp->{region}), $rmp->{custom}
1140 ) 1154 )
1141} 1155}
1142 1156
1157=item cf::map->register ($regex, $prio)
1158
1159Register a handler for the map path matching the given regex at the
1160givne priority (higher is better, built-in handlers have priority 0, the
1161default).
1162
1163=cut
1164
1143sub register { 1165sub register {
1144 my (undef, $regex) = @_; 1166 my (undef, $regex, $prio) = @_;
1145 my $pkg = caller; 1167 my $pkg = caller;
1146 1168
1147 no strict; 1169 no strict;
1148 push @{"$pkg\::ISA"}, __PACKAGE__; 1170 push @{"$pkg\::ISA"}, __PACKAGE__;
1149 1171
1150 $EXT_MAP{$pkg} = qr<$regex>; 1172 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1151} 1173}
1152 1174
1153# also paths starting with '/' 1175# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1176$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1155 1177
1156sub thawer_merge { 1178sub thawer_merge {
1157 my ($self, $merge) = @_; 1179 my ($self, $merge) = @_;
1158 1180
1159 # we have to keep some variables in memory intact 1181 # we have to keep some variables in memory intact
… …
1165 $self->SUPER::thawer_merge ($merge); 1187 $self->SUPER::thawer_merge ($merge);
1166} 1188}
1167 1189
1168sub normalise { 1190sub normalise {
1169 my ($path, $base) = @_; 1191 my ($path, $base) = @_;
1192
1193 $path = "$path"; # make sure its a string
1194
1195 $path =~ s/\.map$//;
1170 1196
1171 # map plan: 1197 # map plan:
1172 # 1198 #
1173 # /! non-realised random map exit (special hack!) 1199 # /! non-realised random map exit (special hack!)
1174 # {... are special paths that are not being touched 1200 # {... are special paths that are not being touched
… …
1202 1228
1203 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1229 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1204 1230
1205 $path = normalise $path, $base; 1231 $path = normalise $path, $base;
1206 1232
1207 for my $pkg (keys %EXT_MAP) { 1233 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1208 if ($path =~ $EXT_MAP{$pkg}) { 1234 if ($path =~ $EXT_MAP{$pkg}[1]) {
1209 my $self = bless cf::map::new, $pkg; 1235 my $self = bless cf::map::new, $pkg;
1210 $self->{path} = $path; $self->path ($path); 1236 $self->{path} = $path; $self->path ($path);
1211 $self->init; # pass $1 etc. 1237 $self->init; # pass $1 etc.
1212 return $self; 1238 return $self;
1213 } 1239 }
1214 } 1240 }
1215 1241
1216 Carp::carp "unable to resolve path '$path'."; 1242 Carp::carp "unable to resolve path '$path' (base '$base').";
1217 () 1243 ()
1218} 1244}
1219 1245
1220sub init { 1246sub init {
1221 my ($self) = @_; 1247 my ($self) = @_;
… …
1236 1262
1237# the original (read-only) location 1263# the original (read-only) location
1238sub load_path { 1264sub load_path {
1239 my ($self) = @_; 1265 my ($self) = @_;
1240 1266
1241 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1267 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1242} 1268}
1243 1269
1244# the temporary/swap location 1270# the temporary/swap location
1245sub save_path { 1271sub save_path {
1246 my ($self) = @_; 1272 my ($self) = @_;
1247 1273
1248 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1274 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1249 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1275 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1250} 1276}
1251 1277
1252# the unique path, undef == no special unique path 1278# the unique path, undef == no special unique path
1253sub uniq_path { 1279sub uniq_path {
1254 my ($self) = @_; 1280 my ($self) = @_;
… …
1270 my ($self) = @_; 1296 my ($self) = @_;
1271 1297
1272 utf8::encode (my $save = $self->save_path); 1298 utf8::encode (my $save = $self->save_path);
1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1299 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1274 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1300 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1301
1302 #d#TODO remove .map and also nuke
1303 $save =~ s/\.map// or return;#d#
1304 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1305 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1275} 1306}
1276 1307
1277sub load_header_from($) { 1308sub load_header_from($) {
1278 my ($self, $path) = @_; 1309 my ($self, $path) = @_;
1279 1310
1280 utf8::encode $path; 1311 utf8::encode $path;
1281 aio_open $path, O_RDONLY, 0 1312 #aio_open $path, O_RDONLY, 0
1282 or return; 1313 # or return;
1283 1314
1284 $self->_load_header ($path) 1315 $self->_load_header ($path)
1285 or return; 1316 or return;
1286 1317
1287 $self->{load_path} = $path; 1318 $self->{load_path} = $path;
1288 1319
1289 1 1320 1
1290} 1321}
1291 1322
1292sub load_orig { 1323sub load_header_orig {
1293 my ($self) = @_; 1324 my ($self) = @_;
1294 1325
1295 $self->load_header_from ($self->load_path) 1326 $self->load_header_from ($self->load_path)
1296} 1327}
1297 1328
1298sub load_temp { 1329sub load_header_temp {
1299 my ($self) = @_; 1330 my ($self) = @_;
1300 1331
1301 $self->load_header_from ($self->save_path) 1332 $self->load_header_from ($self->save_path)
1333}
1334
1335sub prepare_temp {
1336 my ($self) = @_;
1337
1338 $self->last_access ((delete $self->{last_access})
1339 || $cf::RUNTIME); #d#
1340 # safety
1341 $self->{instantiate_time} = $cf::RUNTIME
1342 if $self->{instantiate_time} > $cf::RUNTIME;
1343}
1344
1345sub prepare_orig {
1346 my ($self) = @_;
1347
1348 $self->{load_original} = 1;
1349 $self->{instantiate_time} = $cf::RUNTIME;
1350 $self->last_access ($cf::RUNTIME);
1351 $self->instantiate;
1302} 1352}
1303 1353
1304sub load_header { 1354sub load_header {
1305 my ($self) = @_; 1355 my ($self) = @_;
1306 1356
1307 if ($self->load_temp) { 1357 if ($self->load_header_temp) {
1308 $self->last_access ((delete $self->{last_access}) 1358 $self->prepare_temp;
1309 || $cf::RUNTIME); #d#
1310 # safety
1311 $self->{instantiate_time} = $cf::RUNTIME
1312 if $self->{instantiate_time} > $cf::RUNTIME;
1313 } else { 1359 } else {
1314 $self->load_orig 1360 $self->load_header_orig
1315 or return; 1361 or return;
1316 1362 $self->prepare_orig;
1317 $self->{load_original} = 1;
1318 $self->{instantiate_time} = $cf::RUNTIME;
1319 $self->last_access ($cf::RUNTIME);
1320 $self->instantiate;
1321 } 1363 }
1322 1364
1323 1 1365 1
1324} 1366}
1325 1367
… …
1339 $map->{last_save} = $cf::RUNTIME; 1381 $map->{last_save} = $cf::RUNTIME;
1340 1382
1341 $map->load_header 1383 $map->load_header
1342 or return; 1384 or return;
1343 1385
1344 if ($map->should_reset) { 1386 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1387 # doing this can freeze the server in a sync job, obviously
1345 $cf::WAIT_FOR_TICK->wait; 1388 #$cf::WAIT_FOR_TICK->wait;
1346 $map->reset; 1389 $map->reset;
1347 undef $guard; 1390 undef $guard;
1348 $map = find $path 1391 return find $path;
1349 or return;
1350 } 1392 }
1351 1393
1352 $cf::MAP{$path} = $map 1394 $cf::MAP{$path} = $map
1353 } 1395 }
1354} 1396}
1397
1398sub pre_load { }
1399sub post_load { }
1355 1400
1356sub load { 1401sub load {
1357 my ($self) = @_; 1402 my ($self) = @_;
1358 1403
1404 local $self->{deny_reset} = 1; # loading can take a long time
1405
1359 my $path = $self->{path}; 1406 my $path = $self->{path};
1360 my $guard = cf::lock_acquire "map_load:$path"; 1407 my $guard = cf::lock_acquire "map_load:$path";
1361 1408
1362 return if $self->in_memory != cf::MAP_SWAPPED; 1409 return if $self->in_memory != cf::MAP_SWAPPED;
1363 1410
1364 $self->in_memory (cf::MAP_LOADING); 1411 $self->in_memory (cf::MAP_LOADING);
1365 1412
1366 $self->alloc; 1413 $self->alloc;
1414
1415 $self->pre_load;
1416
1367 $self->_load_objects ($self->{load_path}, 1) 1417 $self->_load_objects ($self->{load_path}, 1)
1368 or return; 1418 or return;
1369 1419
1370 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1420 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1371 if delete $self->{load_original}; 1421 if delete $self->{load_original};
… …
1393 unless $self->difficulty; 1443 unless $self->difficulty;
1394 Coro::cede; 1444 Coro::cede;
1395 $self->activate; 1445 $self->activate;
1396 } 1446 }
1397 1447
1448 $self->post_load;
1449
1398 $self->in_memory (cf::MAP_IN_MEMORY); 1450 $self->in_memory (cf::MAP_IN_MEMORY);
1399} 1451}
1400 1452
1401sub customise_for { 1453sub customise_for {
1402 my ($self, $ob) = @_; 1454 my ($self, $ob) = @_;
… …
1442 1494
1443 cf::sync_job { $map->load }; 1495 cf::sync_job { $map->load };
1444} 1496}
1445 1497
1446our %MAP_PREFETCH; 1498our %MAP_PREFETCH;
1447our $MAP_PREFETCHER = Coro::async { 1499our $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 1500
1460sub find_async { 1501sub find_async {
1461 my ($path, $origin) = @_; 1502 my ($path, $origin) = @_;
1462 1503
1463 $path = normalise $path, $origin && $origin->{path}; 1504 $path = normalise $path, $origin && $origin->{path};
1464 1505
1465 if (my $map = $cf::MAP{$path}) { 1506 if (my $map = $cf::MAP{$path}) {
1466 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1507 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1467 } 1508 }
1468 1509
1469 $MAP_PREFETCH{$path} = 0; 1510 undef $MAP_PREFETCH{$path};
1511 $MAP_PREFETCHER ||= cf::async {
1512 while (%MAP_PREFETCH) {
1513 for my $path (keys %MAP_PREFETCH) {
1514 my $map = find $path
1515 or next;
1516 $map->load;
1517
1518 delete $MAP_PREFETCH{$path};
1519 }
1520 }
1521 undef $MAP_PREFETCHER;
1522 };
1470 $MAP_PREFETCHER->ready; 1523 $MAP_PREFETCHER->prio (6);
1471 1524
1472 () 1525 ()
1473} 1526}
1474 1527
1475sub save { 1528sub save {
… …
1535 my ($self) = @_; 1588 my ($self) = @_;
1536 1589
1537 $self->reset_at <= $cf::RUNTIME 1590 $self->reset_at <= $cf::RUNTIME
1538} 1591}
1539 1592
1540sub rename {
1541 my ($self, $new_path) = @_;
1542
1543 normalise $new_path;
1544
1545 $self->unlink_save;
1546
1547 delete $cf::MAP{$self->path};
1548 $self->{path} = $new_path; $self->path ($self->{path});
1549 $cf::MAP{$self->path} = $self;
1550
1551 $self->save;
1552}
1553
1554sub reset { 1593sub reset {
1555 my ($self) = @_; 1594 my ($self) = @_;
1556 1595
1557 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1596 my $lock = cf::lock_acquire "map_data:$self->{path}";
1558 1597
… …
1575my $nuke_counter = "aaaa"; 1614my $nuke_counter = "aaaa";
1576 1615
1577sub nuke { 1616sub nuke {
1578 my ($self) = @_; 1617 my ($self) = @_;
1579 1618
1619 delete $cf::MAP{$self->path};
1620
1621 $self->unlink_save;
1622
1623 bless $self, "cf::map";
1624 delete $self->{deny_reset};
1580 $self->{deny_save} = 1; 1625 $self->{deny_save} = 1;
1581 $self->reset_timeout (1); 1626 $self->reset_timeout (1);
1582 $self->rename ("{nuke}/" . ($nuke_counter++)); 1627 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1628
1629 $cf::MAP{$self->path} = $self;
1630
1583 $self->reset; # polite request, might not happen 1631 $self->reset; # polite request, might not happen
1584} 1632}
1585 1633
1586=item cf::map::unique_maps 1634=item cf::map::unique_maps
1587 1635
… …
1599 for (@$files) { 1647 for (@$files) {
1600 utf8::decode $_; 1648 utf8::decode $_;
1601 next if /\.pst$/; 1649 next if /\.pst$/;
1602 next unless /^$PATH_SEP/o; 1650 next unless /^$PATH_SEP/o;
1603 1651
1604 s/\.map$//; 1652 push @paths, cf::map::normalise $_;
1605 push @paths, $_;
1606 } 1653 }
1607 1654
1608 \@paths 1655 \@paths
1609} 1656}
1610 1657
… …
1704=cut 1751=cut
1705 1752
1706sub link_map { 1753sub link_map {
1707 unless ($LINK_MAP) { 1754 unless ($LINK_MAP) {
1708 $LINK_MAP = cf::map::find "{link}" 1755 $LINK_MAP = cf::map::find "{link}"
1709 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1756 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1710 $LINK_MAP->load; 1757 $LINK_MAP->load;
1711 } 1758 }
1712 1759
1713 $LINK_MAP 1760 $LINK_MAP
1714} 1761}
… …
1721 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1768 return if UNIVERSAL::isa $self->map, "ext::map_link";
1722 1769
1723 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1770 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1724 if $self->map; 1771 if $self->map;
1725 1772
1726 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1773 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1727} 1774}
1728 1775
1729sub cf::object::player::leave_link { 1776sub cf::object::player::leave_link {
1730 my ($self, $map, $x, $y) = @_; 1777 my ($self, $map, $x, $y) = @_;
1731 1778
… …
1798 my ($self, $path, $x, $y) = @_; 1845 my ($self, $path, $x, $y) = @_;
1799 1846
1800 $self->enter_link; 1847 $self->enter_link;
1801 1848
1802 (async { 1849 (async {
1850 my $map = eval {
1803 my $map = cf::map::find $path; 1851 my $map = cf::map::find $path;
1804 $map = $map->customise_for ($self) if $map; 1852 $map = $map->customise_for ($self) if $map;
1805 1853 $map
1806# warn "entering ", $map->path, " at ($x, $y)\n" 1854 } or
1807# if $map;
1808
1809 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1855 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1810 1856
1811 $self->leave_link ($map, $x, $y); 1857 $self->leave_link ($map, $x, $y);
1812 })->prio (1); 1858 })->prio (1);
1813} 1859}
1814 1860
… …
1818 1864
1819sub parse_random_map_params { 1865sub parse_random_map_params {
1820 my ($spec) = @_; 1866 my ($spec) = @_;
1821 1867
1822 my $rmp = { # defaults 1868 my $rmp = { # defaults
1823 xsize => 10, 1869 xsize => (cf::rndm 15, 40),
1824 ysize => 10, 1870 ysize => (cf::rndm 15, 40),
1871 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1872 #layout => string,
1825 }; 1873 };
1826 1874
1827 for (split /\n/, $spec) { 1875 for (split /\n/, $spec) {
1828 my ($k, $v) = split /\s+/, $_, 2; 1876 my ($k, $v) = split /\s+/, $_, 2;
1829 1877
… …
1833 $rmp 1881 $rmp
1834} 1882}
1835 1883
1836sub prepare_random_map { 1884sub prepare_random_map {
1837 my ($exit) = @_; 1885 my ($exit) = @_;
1886
1887 my $guard = cf::lock_acquire "exit_prepare:$exit";
1838 1888
1839 # all this does is basically replace the /! path by 1889 # all this does is basically replace the /! path by
1840 # a new random map path (?random/...) with a seed 1890 # a new random map path (?random/...) with a seed
1841 # that depends on the exit object 1891 # that depends on the exit object
1842 1892
1843 my $rmp = parse_random_map_params $exit->msg; 1893 my $rmp = parse_random_map_params $exit->msg;
1844 1894
1845 if ($exit->map) { 1895 if ($exit->map) {
1846 $rmp->{region} = $exit->map->region_name; 1896 $rmp->{region} = $exit->region->name;
1847 $rmp->{origin_map} = $exit->map->path; 1897 $rmp->{origin_map} = $exit->map->path;
1848 $rmp->{origin_x} = $exit->x; 1898 $rmp->{origin_x} = $exit->x;
1849 $rmp->{origin_y} = $exit->y; 1899 $rmp->{origin_y} = $exit->y;
1850 } 1900 }
1851 1901
1852 $rmp->{random_seed} ||= $exit->random_seed; 1902 $rmp->{random_seed} ||= $exit->random_seed;
1853 1903
1854 my $data = cf::to_json $rmp; 1904 my $data = cf::to_json $rmp;
1855 my $md5 = Digest::MD5::md5_hex $data; 1905 my $md5 = Digest::MD5::md5_hex $data;
1906 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1856 1907
1857 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1908 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1858 aio_write $fh, 0, (length $data), $data, 0; 1909 aio_write $fh, 0, (length $data), $data, 0;
1910 undef $fh;
1911 aio_rename "$meta~", $meta;
1859 1912
1860 $exit->slaying ("?random/$md5"); 1913 $exit->slaying ("?random/$md5");
1861 $exit->msg (undef); 1914 $exit->msg (undef);
1862 } 1915 }
1863} 1916}
1864 1917
1865sub cf::object::player::enter_exit { 1918sub cf::object::player::enter_exit {
1866 my ($self, $exit) = @_; 1919 my ($self, $exit) = @_;
1867 1920
1868 return unless $self->type == cf::PLAYER; 1921 return unless $self->type == cf::PLAYER;
1922
1923 if ($exit->slaying eq "/!") {
1924 #TODO: this should de-fi-ni-te-ly not be a sync-job
1925 cf::sync_job { prepare_random_map $exit };
1926 }
1927
1928 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1929 my $hp = $exit->stats->hp;
1930 my $sp = $exit->stats->sp;
1869 1931
1870 $self->enter_link; 1932 $self->enter_link;
1871 1933
1872 (async { 1934 (async {
1873 $self->deactivate_recursive; # just to be sure 1935 $self->deactivate_recursive; # just to be sure
1874 unless (eval { 1936 unless (eval {
1875 prepare_random_map $exit 1937 $self->goto ($slaying, $hp, $sp);
1876 if $exit->slaying eq "/!";
1877
1878 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1879 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1880 1938
1881 1; 1939 1;
1882 }) { 1940 }) {
1883 $self->message ("Something went wrong deep within the crossfire server. " 1941 $self->message ("Something went wrong deep within the crossfire server. "
1884 . "I'll try to bring you back to the map you were before. " 1942 . "I'll try to bring you back to the map you were before. "
… …
1945 # get handled first 2003 # get handled first
1946 my $queue = delete $ns->{query_queue} 2004 my $queue = delete $ns->{query_queue}
1947 or return; # be conservative, not sure how that can happen, but we saw a crash here 2005 or return; # be conservative, not sure how that can happen, but we saw a crash here
1948 2006
1949 (shift @$queue)->[1]->($msg); 2007 (shift @$queue)->[1]->($msg);
2008 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1950 2009
1951 push @{ $ns->{query_queue} }, @$queue; 2010 push @{ $ns->{query_queue} }, @$queue;
1952 2011
1953 if (@{ $ns->{query_queue} } == @$queue) { 2012 if (@{ $ns->{query_queue} } == @$queue) {
1954 if (@$queue) { 2013 if (@$queue) {
… …
2173 sub db_sync() { 2232 sub db_sync() {
2174 db_save if $dirty; 2233 db_save if $dirty;
2175 undef $dirty; 2234 undef $dirty;
2176 } 2235 }
2177 2236
2178 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2237 my $idle = Event->idle (
2179 db_sync; 2238 reentrant => 0,
2239 min => 10,
2240 max => 20,
2241 repeat => 0,
2242 data => WF_AUTOCANCEL,
2243 cb => \&db_sync,
2180 }); 2244 );
2181 2245
2182 sub db_dirty() { 2246 sub db_dirty() {
2183 $dirty = 1; 2247 $dirty = 1;
2184 $idle->start; 2248 $idle->start;
2185 } 2249 }
… …
2206 }, 2270 },
2207 ); 2271 );
2208} 2272}
2209 2273
2210############################################################################# 2274#############################################################################
2211# the server's main() 2275# the server's init and main functions
2276
2277sub load_resources {
2278 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2279 or die "unable to load regions file\n";#d#
2280}
2212 2281
2213sub cfg_load { 2282sub cfg_load {
2214 open my $fh, "<:utf8", cf::confdir . "/config" 2283 open my $fh, "<:utf8", cf::confdir . "/config"
2215 or return; 2284 or return;
2216 2285
… …
2229 }; 2298 };
2230 warn $@ if $@; 2299 warn $@ if $@;
2231 } 2300 }
2232} 2301}
2233 2302
2303sub init {
2304 load_resources;
2305}
2306
2234sub main { 2307sub main {
2235 # we must not ever block the main coroutine 2308 # we must not ever block the main coroutine
2236 local $Coro::idle = sub { 2309 local $Coro::idle = sub {
2237 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2310 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2311 (async {
2238 async { Event::one_event }; 2312 Event::one_event;
2313 })->prio (Coro::PRIO_MAX);
2239 }; 2314 };
2240 2315
2241 cfg_load; 2316 cfg_load;
2242 db_load; 2317 db_load;
2243 load_extensions; 2318 load_extensions;
2319
2320 $TICK_WATCHER->start;
2244 Event::loop; 2321 Event::loop;
2245} 2322}
2246 2323
2247############################################################################# 2324#############################################################################
2248# initialisation and cleanup 2325# initialisation and cleanup
2249 2326
2250# install some emergency cleanup handlers 2327# install some emergency cleanup handlers
2251BEGIN { 2328BEGIN {
2252 for my $signal (qw(INT HUP TERM)) { 2329 for my $signal (qw(INT HUP TERM)) {
2253 Event->signal ( 2330 Event->signal (
2331 reentrant => 0,
2254 data => WF_AUTOCANCEL, 2332 data => WF_AUTOCANCEL,
2255 signal => $signal, 2333 signal => $signal,
2334 prio => 0,
2256 cb => sub { 2335 cb => sub {
2257 cf::cleanup "SIG$signal"; 2336 cf::cleanup "SIG$signal";
2258 }, 2337 },
2259 ); 2338 );
2260 } 2339 }
2261} 2340}
… …
2290} 2369}
2291 2370
2292sub reload() { 2371sub reload() {
2293 # can/must only be called in main 2372 # can/must only be called in main
2294 if ($Coro::current != $Coro::main) { 2373 if ($Coro::current != $Coro::main) {
2295 warn "can only reload from main coroutine\n"; 2374 warn "can only reload from main coroutine";
2296 return; 2375 return;
2297 } 2376 }
2298 2377
2299 warn "reloading..."; 2378 warn "reloading...";
2300 2379
2301 warn "freezing server"; 2380 warn "cancelling server ticker";
2302 my $guard = freeze_mainloop; 2381 $TICK_WATCHER->cancel;
2382
2303 cf::emergency_save; 2383 cf::emergency_save;
2304
2305 warn "sync database to disk";
2306 cf::db_sync;
2307 IO::AIO::flush;
2308 2384
2309 eval { 2385 eval {
2310 # if anything goes wrong in here, we should simply crash as we already saved 2386 # if anything goes wrong in here, we should simply crash as we already saved
2311 2387
2388 warn "syncing database to disk";
2389 cf::db_sync;
2390
2312 warn "cancel all watchers"; 2391 warn "cancelling all WF_AUTOCANCEL watchers";
2313 for (Event::all_watchers) { 2392 for (Event::all_watchers) {
2314 $_->cancel if $_->data & WF_AUTOCANCEL; 2393 $_->cancel if $_->data & WF_AUTOCANCEL;
2315 } 2394 }
2316 2395
2396 warn "flushing outstanding aio requests";
2397 for (;;) {
2398 IO::AIO::flush;
2399 Coro::cede;
2400 last unless IO::AIO::nreqs;
2401 warn "iterate...";
2402 }
2403
2317 warn "cancel all extension coros"; 2404 warn "cancelling all extension coros";
2318 $_->cancel for values %EXT_CORO; 2405 $_->cancel for values %EXT_CORO;
2319 %EXT_CORO = (); 2406 %EXT_CORO = ();
2320 2407
2321 warn "remove commands"; 2408 warn "removing commands";
2322 %COMMAND = (); 2409 %COMMAND = ();
2323 2410
2324 warn "remove ext commands"; 2411 warn "removing ext commands";
2325 %EXTCMD = (); 2412 %EXTCMD = ();
2326 2413
2327 warn "unload/nuke all extensions"; 2414 warn "unloading/nuking all extensions";
2328 for my $pkg (@EXTS) { 2415 for my $pkg (@EXTS) {
2329 warn "... unloading $pkg"; 2416 warn "... unloading $pkg";
2330 2417
2331 if (my $cb = $pkg->can ("unload")) { 2418 if (my $cb = $pkg->can ("unload")) {
2332 eval { 2419 eval {
… …
2337 2424
2338 warn "... nuking $pkg"; 2425 warn "... nuking $pkg";
2339 Symbol::delete_package $pkg; 2426 Symbol::delete_package $pkg;
2340 } 2427 }
2341 2428
2342 warn "unload all perl modules loaded from $LIBDIR"; 2429 warn "unloading all perl modules loaded from $LIBDIR";
2343 while (my ($k, $v) = each %INC) { 2430 while (my ($k, $v) = each %INC) {
2344 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2431 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2345 2432
2346 warn "removing <$k>"; 2433 warn "... unloading $k";
2347 delete $INC{$k}; 2434 delete $INC{$k};
2348 2435
2349 $k =~ s/\.pm$//; 2436 $k =~ s/\.pm$//;
2350 $k =~ s/\//::/g; 2437 $k =~ s/\//::/g;
2351 2438
… …
2354 } 2441 }
2355 2442
2356 Symbol::delete_package $k; 2443 Symbol::delete_package $k;
2357 } 2444 }
2358 2445
2359 warn "get rid of safe::, as good as possible"; 2446 warn "getting rid of safe::, as good as possible";
2360 Symbol::delete_package "safe::$_" 2447 Symbol::delete_package "safe::$_"
2361 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2448 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2362 2449
2363 warn "unload cf.pm \"a bit\""; 2450 warn "unloading cf.pm \"a bit\"";
2364 delete $INC{"cf.pm"}; 2451 delete $INC{"cf.pm"};
2365 2452
2366 # don't, removes xs symbols, too, 2453 # don't, removes xs symbols, too,
2367 # and global variables created in xs 2454 # and global variables created in xs
2368 #Symbol::delete_package __PACKAGE__; 2455 #Symbol::delete_package __PACKAGE__;
2369 2456
2457 warn "unload completed, starting to reload now";
2458
2370 warn "reloading cf.pm"; 2459 warn "reloading cf.pm";
2371 require cf; 2460 require cf;
2372 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2461 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2373 2462
2374 warn "load config and database again"; 2463 warn "loading config and database again";
2375 cf::cfg_load; 2464 cf::cfg_load;
2376 cf::db_load; 2465 cf::db_load;
2377 2466
2378 warn "load extensions"; 2467 warn "loading extensions";
2379 cf::load_extensions; 2468 cf::load_extensions;
2380 2469
2381 warn "reattach attachments to objects/players"; 2470 warn "reattaching attachments to objects/players";
2382 _global_reattach; 2471 _global_reattach;
2383 warn "reattach attachments to maps"; 2472 warn "reattaching attachments to maps";
2384 reattach $_ for values %MAP; 2473 reattach $_ for values %MAP;
2474
2475 warn "loading reloadable resources";
2476 load_resources;
2477
2478 warn "restarting server ticker";
2479
2480 $TICK_WATCHER->start;
2385 }; 2481 };
2386 2482
2387 if ($@) { 2483 if ($@) {
2388 warn $@; 2484 warn $@;
2389 warn "error while reloading, exiting."; 2485 warn "error while reloading, exiting.";
… …
2391 } 2487 }
2392 2488
2393 warn "reloaded"; 2489 warn "reloaded";
2394}; 2490};
2395 2491
2492our $RELOAD_WATCHER; # used only during reload
2493
2396register_command "reload" => sub { 2494register_command "reload" => sub {
2397 my ($who, $arg) = @_; 2495 my ($who, $arg) = @_;
2398 2496
2399 if ($who->flag (FLAG_WIZ)) { 2497 if ($who->flag (FLAG_WIZ)) {
2400 $who->message ("start of reload."); 2498 $who->message ("reloading server.");
2499
2500 # doing reload synchronously and two reloads happen back-to-back,
2501 # coro crashes during coro_state_free->destroy here.
2502
2503 $RELOAD_WATCHER ||= Event->timer (
2504 reentrant => 0,
2505 after => 0,
2506 data => WF_AUTOCANCEL,
2507 cb => sub {
2401 reload; 2508 reload;
2402 $who->message ("end of reload."); 2509 undef $RELOAD_WATCHER;
2510 },
2511 );
2403 } 2512 }
2404}; 2513};
2405 2514
2406unshift @INC, $LIBDIR; 2515unshift @INC, $LIBDIR;
2516
2517my $bug_warning = 0;
2407 2518
2408$TICK_WATCHER = Event->timer ( 2519$TICK_WATCHER = Event->timer (
2409 reentrant => 0, 2520 reentrant => 0,
2521 parked => 1,
2410 prio => 0, 2522 prio => 0,
2411 at => $NEXT_TICK || $TICK, 2523 at => $NEXT_TICK || $TICK,
2412 data => WF_AUTOCANCEL, 2524 data => WF_AUTOCANCEL,
2413 cb => sub { 2525 cb => sub {
2526 if ($Coro::current != $Coro::main) {
2527 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2528 unless ++$bug_warning > 10;
2529 return;
2530 }
2531
2414 $NOW = Event::time; 2532 $NOW = Event::time;
2415 2533
2416 cf::server_tick; # one server iteration 2534 cf::server_tick; # one server iteration
2417 $RUNTIME += $TICK; 2535 $RUNTIME += $TICK;
2418 $NEXT_TICK += $TICK; 2536 $NEXT_TICK += $TICK;
2419 2537
2420 $WAIT_FOR_TICK->broadcast; 2538 $WAIT_FOR_TICK->broadcast;
2421 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2539 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2540
2541 Event::sweep;
2542 Coro::cede_notself;
2543
2544# my $AFTER = Event::time;
2545# warn $AFTER - $NOW;#d#
2422 2546
2423 # if we are delayed by four ticks or more, skip them all 2547 # if we are delayed by four ticks or more, skip them all
2424 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2548 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2425 2549
2426 $TICK_WATCHER->at ($NEXT_TICK); 2550 $TICK_WATCHER->at ($NEXT_TICK);
2427 $TICK_WATCHER->start; 2551 $TICK_WATCHER->start;
2428 }, 2552 },
2429); 2553);
2430 2554
2431IO::AIO::max_poll_time $TICK * 0.2; 2555IO::AIO::max_poll_time $TICK * 0.1;
2432 2556
2557undef $Coro::AIO::WATCHER;
2433$AIO_POLL_WATCHER = Event->io ( 2558$AIO_POLL_WATCHER = Event->io (
2559 reentrant => 0,
2434 fd => IO::AIO::poll_fileno, 2560 fd => IO::AIO::poll_fileno,
2435 poll => 'r', 2561 poll => 'r',
2436 prio => 5, 2562 prio => 6,
2437 data => WF_AUTOCANCEL, 2563 data => WF_AUTOCANCEL,
2438 cb => \&IO::AIO::poll_cb, 2564 cb => \&IO::AIO::poll_cb,
2439); 2565);
2440 2566
2441$WRITE_RUNTIME_WATCHER = Event->timer ( 2567$WRITE_RUNTIME_WATCHER = Event->timer (
2568 reentrant => 0,
2442 data => WF_AUTOCANCEL, 2569 data => WF_AUTOCANCEL,
2443 after => 0, 2570 after => 1,
2444 interval => 10, 2571 interval => 10,
2445 cb => sub { 2572 prio => 6, # keep it lowest so it acts like a watchdog
2446 (Coro::unblock_sub { 2573 cb => Coro::unblock_sub {
2447 write_runtime 2574 write_runtime
2448 or warn "ERROR: unable to write runtime file: $!"; 2575 or warn "ERROR: unable to write runtime file: $!";
2449 })->();
2450 }, 2576 },
2451); 2577);
2452 2578
2453END { cf::emergency_save } 2579END { cf::emergency_save }
2454 2580

Diff Legend

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