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

Diff Legend

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