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.172 by root, Sun Jan 14 13:32:48 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
… …
1113 1128
1114use Fcntl; 1129use Fcntl;
1115use Coro::AIO; 1130use Coro::AIO;
1116 1131
1117use overload 1132use overload
1118 '""' => \&as_string; 1133 '""' => \&as_string,
1134 fallback => 1;
1119 1135
1120our $MAX_RESET = 3600; 1136our $MAX_RESET = 3600;
1121our $DEFAULT_RESET = 3000; 1137our $DEFAULT_RESET = 3000;
1122 1138
1123sub generate_random_map { 1139sub generate_random_map {
1124 my ($self, $rmp) = @_; 1140 my ($self, $rmp) = @_;
1125
1126 # mit "rum" bekleckern, nicht 1141 # mit "rum" bekleckern, nicht
1127 $self->_create_random_map ( 1142 $self->_create_random_map (
1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1143 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1144 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1145 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1152 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1153 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1154 )
1140} 1155}
1141 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
1142sub register { 1165sub register {
1143 my (undef, $regex) = @_; 1166 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1167 my $pkg = caller;
1145 1168
1146 no strict; 1169 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1170 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1171
1149 $EXT_MAP{$pkg} = qr<$regex>; 1172 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1173}
1151 1174
1152# also paths starting with '/' 1175# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1176$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1177
1155sub thawer_merge { 1178sub thawer_merge {
1156 my ($self, $merge) = @_; 1179 my ($self, $merge) = @_;
1157 1180
1158 # we have to keep some variables in memory intact 1181 # we have to keep some variables in memory intact
… …
1164 $self->SUPER::thawer_merge ($merge); 1187 $self->SUPER::thawer_merge ($merge);
1165} 1188}
1166 1189
1167sub normalise { 1190sub normalise {
1168 my ($path, $base) = @_; 1191 my ($path, $base) = @_;
1192
1193 $path = "$path"; # make sure its a string
1194
1195 $path =~ s/\.map$//;
1169 1196
1170 # map plan: 1197 # map plan:
1171 # 1198 #
1172 # /! non-realised random map exit (special hack!) 1199 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched 1200 # {... are special paths that are not being touched
… …
1201 1228
1202 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
1203 1230
1204 $path = normalise $path, $base; 1231 $path = normalise $path, $base;
1205 1232
1206 for my $pkg (keys %EXT_MAP) { 1233 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1234 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1235 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1236 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1237 $self->init; # pass $1 etc.
1211 return $self; 1238 return $self;
1212 } 1239 }
1213 } 1240 }
1214 1241
1215 Carp::carp "unable to resolve path '$path'."; 1242 Carp::carp "unable to resolve path '$path' (base '$base').";
1216 () 1243 ()
1217} 1244}
1218 1245
1219sub init { 1246sub init {
1220 my ($self) = @_; 1247 my ($self) = @_;
… …
1235 1262
1236# the original (read-only) location 1263# the original (read-only) location
1237sub load_path { 1264sub load_path {
1238 my ($self) = @_; 1265 my ($self) = @_;
1239 1266
1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1267 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1241} 1268}
1242 1269
1243# the temporary/swap location 1270# the temporary/swap location
1244sub save_path { 1271sub save_path {
1245 my ($self) = @_; 1272 my ($self) = @_;
1246 1273
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1274 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1275 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1249} 1276}
1250 1277
1251# the unique path, undef == no special unique path 1278# the unique path, undef == no special unique path
1252sub uniq_path { 1279sub uniq_path {
1253 my ($self) = @_; 1280 my ($self) = @_;
… …
1269 my ($self) = @_; 1296 my ($self) = @_;
1270 1297
1271 utf8::encode (my $save = $self->save_path); 1298 utf8::encode (my $save = $self->save_path);
1272 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1299 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1273 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#
1274} 1306}
1275 1307
1276sub load_header_from($) { 1308sub load_header_from($) {
1277 my ($self, $path) = @_; 1309 my ($self, $path) = @_;
1278 1310
1279 utf8::encode $path; 1311 utf8::encode $path;
1280 aio_open $path, O_RDONLY, 0 1312 #aio_open $path, O_RDONLY, 0
1281 or return; 1313 # or return;
1282 1314
1283 $self->_load_header ($path) 1315 $self->_load_header ($path)
1284 or return; 1316 or return;
1285 1317
1286 $self->{load_path} = $path; 1318 $self->{load_path} = $path;
1287 1319
1288 1 1320 1
1289} 1321}
1290 1322
1291sub load_orig { 1323sub load_header_orig {
1292 my ($self) = @_; 1324 my ($self) = @_;
1293 1325
1294 $self->load_header_from ($self->load_path) 1326 $self->load_header_from ($self->load_path)
1295} 1327}
1296 1328
1297sub load_temp { 1329sub load_header_temp {
1298 my ($self) = @_; 1330 my ($self) = @_;
1299 1331
1300 $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;
1301} 1352}
1302 1353
1303sub load_header { 1354sub load_header {
1304 my ($self) = @_; 1355 my ($self) = @_;
1305 1356
1306 if ($self->load_temp) { 1357 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1358 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1359 } else {
1313 $self->load_orig 1360 $self->load_header_orig
1314 or return; 1361 or return;
1315 1362 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1363 }
1321 1364
1322 1 1365 1
1323} 1366}
1324 1367
… …
1338 $map->{last_save} = $cf::RUNTIME; 1381 $map->{last_save} = $cf::RUNTIME;
1339 1382
1340 $map->load_header 1383 $map->load_header
1341 or return; 1384 or return;
1342 1385
1343 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
1344 $cf::WAIT_FOR_TICK->wait; 1388 #$cf::WAIT_FOR_TICK->wait;
1345 $map->reset; 1389 $map->reset;
1346 undef $guard; 1390 undef $guard;
1347 $map = find $path 1391 return find $path;
1348 or return;
1349 } 1392 }
1350 1393
1351 $cf::MAP{$path} = $map 1394 $cf::MAP{$path} = $map
1352 } 1395 }
1353} 1396}
1397
1398sub pre_load { }
1399sub post_load { }
1354 1400
1355sub load { 1401sub load {
1356 my ($self) = @_; 1402 my ($self) = @_;
1357 1403
1404 local $self->{deny_reset} = 1; # loading can take a long time
1405
1358 my $path = $self->{path}; 1406 my $path = $self->{path};
1359 my $guard = cf::lock_acquire "map_load:$path"; 1407 my $guard = cf::lock_acquire "map_load:$path";
1360 1408
1361 return if $self->in_memory != cf::MAP_SWAPPED; 1409 return if $self->in_memory != cf::MAP_SWAPPED;
1362 1410
1363 $self->in_memory (cf::MAP_LOADING); 1411 $self->in_memory (cf::MAP_LOADING);
1364 1412
1365 $self->alloc; 1413 $self->alloc;
1414
1415 $self->pre_load;
1416
1366 $self->_load_objects ($self->{load_path}, 1) 1417 $self->_load_objects ($self->{load_path}, 1)
1367 or return; 1418 or return;
1368 1419
1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1420 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1370 if delete $self->{load_original}; 1421 if delete $self->{load_original};
… …
1392 unless $self->difficulty; 1443 unless $self->difficulty;
1393 Coro::cede; 1444 Coro::cede;
1394 $self->activate; 1445 $self->activate;
1395 } 1446 }
1396 1447
1448 $self->post_load;
1449
1397 $self->in_memory (cf::MAP_IN_MEMORY); 1450 $self->in_memory (cf::MAP_IN_MEMORY);
1398} 1451}
1399 1452
1400sub customise_for { 1453sub customise_for {
1401 my ($self, $ob) = @_; 1454 my ($self, $ob) = @_;
… …
1441 1494
1442 cf::sync_job { $map->load }; 1495 cf::sync_job { $map->load };
1443} 1496}
1444 1497
1445our %MAP_PREFETCH; 1498our %MAP_PREFETCH;
1446our $MAP_PREFETCHER = Coro::async { 1499our $MAP_PREFETCHER = undef;
1447 while () {
1448 for my $path (keys %MAP_PREFETCH) {
1449 my $map = find $path
1450 or next;
1451 $map->load;
1452
1453 delete $MAP_PREFETCH{$path};
1454 }
1455 Coro::schedule;
1456 }
1457};
1458 1500
1459sub find_async { 1501sub find_async {
1460 my ($path, $origin) = @_; 1502 my ($path, $origin) = @_;
1461 1503
1462 $path = normalise $path, $origin && $origin->{path}; 1504 $path = normalise $path, $origin && $origin->{path};
1463 1505
1464 if (my $map = $cf::MAP{$path}) { 1506 if (my $map = $cf::MAP{$path}) {
1465 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1507 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1466 } 1508 }
1467 1509
1468 $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 };
1469 $MAP_PREFETCHER->ready; 1523 $MAP_PREFETCHER->prio (6);
1470 1524
1471 () 1525 ()
1472} 1526}
1473 1527
1474sub save { 1528sub save {
… …
1534 my ($self) = @_; 1588 my ($self) = @_;
1535 1589
1536 $self->reset_at <= $cf::RUNTIME 1590 $self->reset_at <= $cf::RUNTIME
1537} 1591}
1538 1592
1539sub rename {
1540 my ($self, $new_path) = @_;
1541
1542 normalise $new_path;
1543
1544 $self->unlink_save;
1545
1546 delete $cf::MAP{$self->path};
1547 $self->{path} = $new_path; $self->path ($self->{path});
1548 $cf::MAP{$self->path} = $self;
1549
1550 $self->save;
1551}
1552
1553sub reset { 1593sub reset {
1554 my ($self) = @_; 1594 my ($self) = @_;
1555 1595
1556 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1596 my $lock = cf::lock_acquire "map_data:$self->{path}";
1557 1597
… …
1574my $nuke_counter = "aaaa"; 1614my $nuke_counter = "aaaa";
1575 1615
1576sub nuke { 1616sub nuke {
1577 my ($self) = @_; 1617 my ($self) = @_;
1578 1618
1619 delete $cf::MAP{$self->path};
1620
1621 $self->unlink_save;
1622
1623 bless $self, "cf::map";
1624 delete $self->{deny_reset};
1579 $self->{deny_save} = 1; 1625 $self->{deny_save} = 1;
1580 $self->reset_timeout (1); 1626 $self->reset_timeout (1);
1581 $self->rename ("{nuke}/" . ($nuke_counter++)); 1627 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1628
1629 $cf::MAP{$self->path} = $self;
1630
1582 $self->reset; # polite request, might not happen 1631 $self->reset; # polite request, might not happen
1583} 1632}
1584 1633
1585=item cf::map::unique_maps 1634=item cf::map::unique_maps
1586 1635
… …
1598 for (@$files) { 1647 for (@$files) {
1599 utf8::decode $_; 1648 utf8::decode $_;
1600 next if /\.pst$/; 1649 next if /\.pst$/;
1601 next unless /^$PATH_SEP/o; 1650 next unless /^$PATH_SEP/o;
1602 1651
1603 s/\.map$//; 1652 push @paths, cf::map::normalise $_;
1604 push @paths, $_;
1605 } 1653 }
1606 1654
1607 \@paths 1655 \@paths
1608} 1656}
1609 1657
… …
1703=cut 1751=cut
1704 1752
1705sub link_map { 1753sub link_map {
1706 unless ($LINK_MAP) { 1754 unless ($LINK_MAP) {
1707 $LINK_MAP = cf::map::find "{link}" 1755 $LINK_MAP = cf::map::find "{link}"
1708 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1756 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1709 $LINK_MAP->load; 1757 $LINK_MAP->load;
1710 } 1758 }
1711 1759
1712 $LINK_MAP 1760 $LINK_MAP
1713} 1761}
… …
1720 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1768 return if UNIVERSAL::isa $self->map, "ext::map_link";
1721 1769
1722 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1770 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1723 if $self->map; 1771 if $self->map;
1724 1772
1725 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1773 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1726} 1774}
1727 1775
1728sub cf::object::player::leave_link { 1776sub cf::object::player::leave_link {
1729 my ($self, $map, $x, $y) = @_; 1777 my ($self, $map, $x, $y) = @_;
1730 1778
… …
1797 my ($self, $path, $x, $y) = @_; 1845 my ($self, $path, $x, $y) = @_;
1798 1846
1799 $self->enter_link; 1847 $self->enter_link;
1800 1848
1801 (async { 1849 (async {
1850 my $map = eval {
1802 my $map = cf::map::find $path; 1851 my $map = cf::map::find $path;
1803 $map = $map->customise_for ($self) if $map; 1852 $map = $map->customise_for ($self) if $map;
1804 1853 $map
1805# warn "entering ", $map->path, " at ($x, $y)\n" 1854 } or
1806# if $map;
1807
1808 $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);
1809 1856
1810 $self->leave_link ($map, $x, $y); 1857 $self->leave_link ($map, $x, $y);
1811 })->prio (1); 1858 })->prio (1);
1812} 1859}
1813 1860
… …
1817 1864
1818sub parse_random_map_params { 1865sub parse_random_map_params {
1819 my ($spec) = @_; 1866 my ($spec) = @_;
1820 1867
1821 my $rmp = { # defaults 1868 my $rmp = { # defaults
1822 xsize => 10, 1869 xsize => (cf::rndm 15, 40),
1823 ysize => 10, 1870 ysize => (cf::rndm 15, 40),
1871 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1872 #layout => string,
1824 }; 1873 };
1825 1874
1826 for (split /\n/, $spec) { 1875 for (split /\n/, $spec) {
1827 my ($k, $v) = split /\s+/, $_, 2; 1876 my ($k, $v) = split /\s+/, $_, 2;
1828 1877
… …
1832 $rmp 1881 $rmp
1833} 1882}
1834 1883
1835sub prepare_random_map { 1884sub prepare_random_map {
1836 my ($exit) = @_; 1885 my ($exit) = @_;
1886
1887 my $guard = cf::lock_acquire "exit_prepare:$exit";
1837 1888
1838 # all this does is basically replace the /! path by 1889 # all this does is basically replace the /! path by
1839 # a new random map path (?random/...) with a seed 1890 # a new random map path (?random/...) with a seed
1840 # that depends on the exit object 1891 # that depends on the exit object
1841 1892
1842 my $rmp = parse_random_map_params $exit->msg; 1893 my $rmp = parse_random_map_params $exit->msg;
1843 1894
1844 if ($exit->map) { 1895 if ($exit->map) {
1845 $rmp->{region} = $exit->map->region_name; 1896 $rmp->{region} = $exit->region->name;
1846 $rmp->{origin_map} = $exit->map->path; 1897 $rmp->{origin_map} = $exit->map->path;
1847 $rmp->{origin_x} = $exit->x; 1898 $rmp->{origin_x} = $exit->x;
1848 $rmp->{origin_y} = $exit->y; 1899 $rmp->{origin_y} = $exit->y;
1849 } 1900 }
1850 1901
1851 $rmp->{random_seed} ||= $exit->random_seed; 1902 $rmp->{random_seed} ||= $exit->random_seed;
1852 1903
1853 my $data = cf::to_json $rmp; 1904 my $data = cf::to_json $rmp;
1854 my $md5 = Digest::MD5::md5_hex $data; 1905 my $md5 = Digest::MD5::md5_hex $data;
1906 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1855 1907
1856 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) {
1857 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;
1858 1912
1859 $exit->slaying ("?random/$md5"); 1913 $exit->slaying ("?random/$md5");
1860 $exit->msg (undef); 1914 $exit->msg (undef);
1861 } 1915 }
1862} 1916}
1863 1917
1864sub cf::object::player::enter_exit { 1918sub cf::object::player::enter_exit {
1865 my ($self, $exit) = @_; 1919 my ($self, $exit) = @_;
1866 1920
1867 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;
1868 1931
1869 $self->enter_link; 1932 $self->enter_link;
1870 1933
1871 (async { 1934 (async {
1872 $self->deactivate_recursive; # just to be sure 1935 $self->deactivate_recursive; # just to be sure
1873 unless (eval { 1936 unless (eval {
1874 prepare_random_map $exit 1937 $self->goto ($slaying, $hp, $sp);
1875 if $exit->slaying eq "/!";
1876
1877 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1878 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1879 1938
1880 1; 1939 1;
1881 }) { 1940 }) {
1882 $self->message ("Something went wrong deep within the crossfire server. " 1941 $self->message ("Something went wrong deep within the crossfire server. "
1883 . "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. "
… …
1944 # get handled first 2003 # get handled first
1945 my $queue = delete $ns->{query_queue} 2004 my $queue = delete $ns->{query_queue}
1946 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
1947 2006
1948 (shift @$queue)->[1]->($msg); 2007 (shift @$queue)->[1]->($msg);
2008 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1949 2009
1950 push @{ $ns->{query_queue} }, @$queue; 2010 push @{ $ns->{query_queue} }, @$queue;
1951 2011
1952 if (@{ $ns->{query_queue} } == @$queue) { 2012 if (@{ $ns->{query_queue} } == @$queue) {
1953 if (@$queue) { 2013 if (@$queue) {
… …
2172 sub db_sync() { 2232 sub db_sync() {
2173 db_save if $dirty; 2233 db_save if $dirty;
2174 undef $dirty; 2234 undef $dirty;
2175 } 2235 }
2176 2236
2177 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2237 my $idle = Event->idle (
2178 db_sync; 2238 reentrant => 0,
2239 min => 10,
2240 max => 20,
2241 repeat => 0,
2242 data => WF_AUTOCANCEL,
2243 cb => \&db_sync,
2179 }); 2244 );
2180 2245
2181 sub db_dirty() { 2246 sub db_dirty() {
2182 $dirty = 1; 2247 $dirty = 1;
2183 $idle->start; 2248 $idle->start;
2184 } 2249 }
… …
2205 }, 2270 },
2206 ); 2271 );
2207} 2272}
2208 2273
2209############################################################################# 2274#############################################################################
2210# 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}
2211 2281
2212sub cfg_load { 2282sub cfg_load {
2213 open my $fh, "<:utf8", cf::confdir . "/config" 2283 open my $fh, "<:utf8", cf::confdir . "/config"
2214 or return; 2284 or return;
2215 2285
… …
2228 }; 2298 };
2229 warn $@ if $@; 2299 warn $@ if $@;
2230 } 2300 }
2231} 2301}
2232 2302
2303sub init {
2304 load_resources;
2305}
2306
2233sub main { 2307sub main {
2234 # we must not ever block the main coroutine 2308 # we must not ever block the main coroutine
2235 local $Coro::idle = sub { 2309 local $Coro::idle = sub {
2236 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 {
2237 async { Event::one_event }; 2312 Event::one_event;
2313 })->prio (Coro::PRIO_MAX);
2238 }; 2314 };
2239 2315
2240 cfg_load; 2316 cfg_load;
2241 db_load; 2317 db_load;
2242 load_extensions; 2318 load_extensions;
2319
2320 $TICK_WATCHER->start;
2243 Event::loop; 2321 Event::loop;
2244} 2322}
2245 2323
2246############################################################################# 2324#############################################################################
2247# initialisation and cleanup 2325# initialisation and cleanup
2248 2326
2249# install some emergency cleanup handlers 2327# install some emergency cleanup handlers
2250BEGIN { 2328BEGIN {
2251 for my $signal (qw(INT HUP TERM)) { 2329 for my $signal (qw(INT HUP TERM)) {
2252 Event->signal ( 2330 Event->signal (
2331 reentrant => 0,
2253 data => WF_AUTOCANCEL, 2332 data => WF_AUTOCANCEL,
2254 signal => $signal, 2333 signal => $signal,
2334 prio => 0,
2255 cb => sub { 2335 cb => sub {
2256 cf::cleanup "SIG$signal"; 2336 cf::cleanup "SIG$signal";
2257 }, 2337 },
2258 ); 2338 );
2259 } 2339 }
2260} 2340}
… …
2289} 2369}
2290 2370
2291sub reload() { 2371sub reload() {
2292 # can/must only be called in main 2372 # can/must only be called in main
2293 if ($Coro::current != $Coro::main) { 2373 if ($Coro::current != $Coro::main) {
2294 warn "can only reload from main coroutine\n"; 2374 warn "can only reload from main coroutine";
2295 return; 2375 return;
2296 } 2376 }
2297 2377
2298 warn "reloading..."; 2378 warn "reloading...";
2299 2379
2300 warn "freezing server"; 2380 warn "cancelling server ticker";
2301 my $guard = freeze_mainloop; 2381 $TICK_WATCHER->cancel;
2382
2302 cf::emergency_save; 2383 cf::emergency_save;
2303
2304 warn "sync database to disk";
2305 cf::db_sync;
2306 IO::AIO::flush;
2307 2384
2308 eval { 2385 eval {
2309 # 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
2310 2387
2388 warn "syncing database to disk";
2389 cf::db_sync;
2390
2311 warn "cancel all watchers"; 2391 warn "cancelling all WF_AUTOCANCEL watchers";
2312 for (Event::all_watchers) { 2392 for (Event::all_watchers) {
2313 $_->cancel if $_->data & WF_AUTOCANCEL; 2393 $_->cancel if $_->data & WF_AUTOCANCEL;
2314 } 2394 }
2315 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
2316 warn "cancel all extension coros"; 2404 warn "cancelling all extension coros";
2317 $_->cancel for values %EXT_CORO; 2405 $_->cancel for values %EXT_CORO;
2318 %EXT_CORO = (); 2406 %EXT_CORO = ();
2319 2407
2320 warn "remove commands"; 2408 warn "removing commands";
2321 %COMMAND = (); 2409 %COMMAND = ();
2322 2410
2323 warn "remove ext commands"; 2411 warn "removing ext commands";
2324 %EXTCMD = (); 2412 %EXTCMD = ();
2325 2413
2326 warn "unload/nuke all extensions"; 2414 warn "unloading/nuking all extensions";
2327 for my $pkg (@EXTS) { 2415 for my $pkg (@EXTS) {
2328 warn "... unloading $pkg"; 2416 warn "... unloading $pkg";
2329 2417
2330 if (my $cb = $pkg->can ("unload")) { 2418 if (my $cb = $pkg->can ("unload")) {
2331 eval { 2419 eval {
… …
2336 2424
2337 warn "... nuking $pkg"; 2425 warn "... nuking $pkg";
2338 Symbol::delete_package $pkg; 2426 Symbol::delete_package $pkg;
2339 } 2427 }
2340 2428
2341 warn "unload all perl modules loaded from $LIBDIR"; 2429 warn "unloading all perl modules loaded from $LIBDIR";
2342 while (my ($k, $v) = each %INC) { 2430 while (my ($k, $v) = each %INC) {
2343 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2431 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2344 2432
2345 warn "removing <$k>"; 2433 warn "... unloading $k";
2346 delete $INC{$k}; 2434 delete $INC{$k};
2347 2435
2348 $k =~ s/\.pm$//; 2436 $k =~ s/\.pm$//;
2349 $k =~ s/\//::/g; 2437 $k =~ s/\//::/g;
2350 2438
… …
2353 } 2441 }
2354 2442
2355 Symbol::delete_package $k; 2443 Symbol::delete_package $k;
2356 } 2444 }
2357 2445
2358 warn "get rid of safe::, as good as possible"; 2446 warn "getting rid of safe::, as good as possible";
2359 Symbol::delete_package "safe::$_" 2447 Symbol::delete_package "safe::$_"
2360 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);
2361 2449
2362 warn "unload cf.pm \"a bit\""; 2450 warn "unloading cf.pm \"a bit\"";
2363 delete $INC{"cf.pm"}; 2451 delete $INC{"cf.pm"};
2364 2452
2365 # don't, removes xs symbols, too, 2453 # don't, removes xs symbols, too,
2366 # and global variables created in xs 2454 # and global variables created in xs
2367 #Symbol::delete_package __PACKAGE__; 2455 #Symbol::delete_package __PACKAGE__;
2368 2456
2457 warn "unload completed, starting to reload now";
2458
2369 warn "reloading cf.pm"; 2459 warn "reloading cf.pm";
2370 require cf; 2460 require cf;
2371 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2461 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2372 2462
2373 warn "load config and database again"; 2463 warn "loading config and database again";
2374 cf::cfg_load; 2464 cf::cfg_load;
2375 cf::db_load; 2465 cf::db_load;
2376 2466
2377 warn "load extensions"; 2467 warn "loading extensions";
2378 cf::load_extensions; 2468 cf::load_extensions;
2379 2469
2380 warn "reattach attachments to objects/players"; 2470 warn "reattaching attachments to objects/players";
2381 _global_reattach; 2471 _global_reattach;
2382 warn "reattach attachments to maps"; 2472 warn "reattaching attachments to maps";
2383 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;
2384 }; 2481 };
2385 2482
2386 if ($@) { 2483 if ($@) {
2387 warn $@; 2484 warn $@;
2388 warn "error while reloading, exiting."; 2485 warn "error while reloading, exiting.";
… …
2390 } 2487 }
2391 2488
2392 warn "reloaded"; 2489 warn "reloaded";
2393}; 2490};
2394 2491
2492our $RELOAD_WATCHER; # used only during reload
2493
2395register_command "reload" => sub { 2494register_command "reload" => sub {
2396 my ($who, $arg) = @_; 2495 my ($who, $arg) = @_;
2397 2496
2398 if ($who->flag (FLAG_WIZ)) { 2497 if ($who->flag (FLAG_WIZ)) {
2399 $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 {
2400 reload; 2508 reload;
2401 $who->message ("end of reload."); 2509 undef $RELOAD_WATCHER;
2510 },
2511 );
2402 } 2512 }
2403}; 2513};
2404 2514
2405unshift @INC, $LIBDIR; 2515unshift @INC, $LIBDIR;
2516
2517my $bug_warning = 0;
2406 2518
2407$TICK_WATCHER = Event->timer ( 2519$TICK_WATCHER = Event->timer (
2408 reentrant => 0, 2520 reentrant => 0,
2521 parked => 1,
2409 prio => 0, 2522 prio => 0,
2410 at => $NEXT_TICK || $TICK, 2523 at => $NEXT_TICK || $TICK,
2411 data => WF_AUTOCANCEL, 2524 data => WF_AUTOCANCEL,
2412 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
2413 $NOW = Event::time; 2532 $NOW = Event::time;
2414 2533
2415 cf::server_tick; # one server iteration 2534 cf::server_tick; # one server iteration
2416 $RUNTIME += $TICK; 2535 $RUNTIME += $TICK;
2417 $NEXT_TICK += $TICK; 2536 $NEXT_TICK += $TICK;
2418 2537
2419 $WAIT_FOR_TICK->broadcast; 2538 $WAIT_FOR_TICK->broadcast;
2420 $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#
2421 2546
2422 # 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
2423 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2548 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2424 2549
2425 $TICK_WATCHER->at ($NEXT_TICK); 2550 $TICK_WATCHER->at ($NEXT_TICK);
2426 $TICK_WATCHER->start; 2551 $TICK_WATCHER->start;
2427 }, 2552 },
2428); 2553);
2429 2554
2430IO::AIO::max_poll_time $TICK * 0.2; 2555IO::AIO::max_poll_time $TICK * 0.1;
2431 2556
2557undef $Coro::AIO::WATCHER;
2432$AIO_POLL_WATCHER = Event->io ( 2558$AIO_POLL_WATCHER = Event->io (
2559 reentrant => 0,
2433 fd => IO::AIO::poll_fileno, 2560 fd => IO::AIO::poll_fileno,
2434 poll => 'r', 2561 poll => 'r',
2435 prio => 5, 2562 prio => 6,
2436 data => WF_AUTOCANCEL, 2563 data => WF_AUTOCANCEL,
2437 cb => \&IO::AIO::poll_cb, 2564 cb => \&IO::AIO::poll_cb,
2438); 2565);
2439 2566
2440$WRITE_RUNTIME_WATCHER = Event->timer ( 2567$WRITE_RUNTIME_WATCHER = Event->timer (
2568 reentrant => 0,
2441 data => WF_AUTOCANCEL, 2569 data => WF_AUTOCANCEL,
2442 after => 0, 2570 after => 1,
2443 interval => 10, 2571 interval => 10,
2444 cb => sub { 2572 prio => 6, # keep it lowest so it acts like a watchdog
2445 (Coro::unblock_sub { 2573 cb => Coro::unblock_sub {
2446 write_runtime 2574 write_runtime
2447 or warn "ERROR: unable to write runtime file: $!"; 2575 or warn "ERROR: unable to write runtime file: $!";
2448 })->();
2449 }, 2576 },
2450); 2577);
2451 2578
2452END { cf::emergency_save } 2579END { cf::emergency_save }
2453 2580

Diff Legend

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