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.179 by root, Thu Jan 18 20:39:00 2007 UTC vs.
Revision 1.201 by root, Mon Jan 29 18:15:23 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.4 (); 13use Coro 3.5 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
82mkdir cf::localdir . "/" . cf::tmpdir; 82mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 83mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 84mkdir $RANDOM_MAPS;
85 85
86our $EMERGENCY_POSITION; 86our $EMERGENCY_POSITION;
87
88sub cf::map::normalise;
87 89
88############################################################################# 90#############################################################################
89 91
90=head2 GLOBAL VARIABLES 92=head2 GLOBAL VARIABLES
91 93
… …
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
… …
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 {
… …
1593 for (@$files) { 1647 for (@$files) {
1594 utf8::decode $_; 1648 utf8::decode $_;
1595 next if /\.pst$/; 1649 next if /\.pst$/;
1596 next unless /^$PATH_SEP/o; 1650 next unless /^$PATH_SEP/o;
1597 1651
1598 s/\.map$//; 1652 push @paths, cf::map::normalise $_;
1599 push @paths, $_;
1600 } 1653 }
1601 1654
1602 \@paths 1655 \@paths
1603} 1656}
1604 1657
… …
1698=cut 1751=cut
1699 1752
1700sub link_map { 1753sub link_map {
1701 unless ($LINK_MAP) { 1754 unless ($LINK_MAP) {
1702 $LINK_MAP = cf::map::find "{link}" 1755 $LINK_MAP = cf::map::find "{link}"
1703 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1756 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1704 $LINK_MAP->load; 1757 $LINK_MAP->load;
1705 } 1758 }
1706 1759
1707 $LINK_MAP 1760 $LINK_MAP
1708} 1761}
… …
1715 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1768 return if UNIVERSAL::isa $self->map, "ext::map_link";
1716 1769
1717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1770 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1718 if $self->map; 1771 if $self->map;
1719 1772
1720 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1773 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1721} 1774}
1722 1775
1723sub cf::object::player::leave_link { 1776sub cf::object::player::leave_link {
1724 my ($self, $map, $x, $y) = @_; 1777 my ($self, $map, $x, $y) = @_;
1725 1778
… …
1792 my ($self, $path, $x, $y) = @_; 1845 my ($self, $path, $x, $y) = @_;
1793 1846
1794 $self->enter_link; 1847 $self->enter_link;
1795 1848
1796 (async { 1849 (async {
1850 my $map = eval {
1797 my $map = cf::map::find $path; 1851 my $map = cf::map::find $path;
1798 $map = $map->customise_for ($self) if $map; 1852 $map = $map->customise_for ($self) if $map;
1799 1853 $map
1800# warn "entering ", $map->path, " at ($x, $y)\n" 1854 } or
1801# if $map;
1802
1803 $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);
1804 1856
1805 $self->leave_link ($map, $x, $y); 1857 $self->leave_link ($map, $x, $y);
1806 })->prio (1); 1858 })->prio (1);
1807} 1859}
1808 1860
… …
1812 1864
1813sub parse_random_map_params { 1865sub parse_random_map_params {
1814 my ($spec) = @_; 1866 my ($spec) = @_;
1815 1867
1816 my $rmp = { # defaults 1868 my $rmp = { # defaults
1817 xsize => -1, 1869 xsize => (cf::rndm 15, 40),
1818 ysize => -1, 1870 ysize => (cf::rndm 15, 40),
1871 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1872 #layout => string,
1819 }; 1873 };
1820 1874
1821 for (split /\n/, $spec) { 1875 for (split /\n/, $spec) {
1822 my ($k, $v) = split /\s+/, $_, 2; 1876 my ($k, $v) = split /\s+/, $_, 2;
1823 1877
… …
1837 # that depends on the exit object 1891 # that depends on the exit object
1838 1892
1839 my $rmp = parse_random_map_params $exit->msg; 1893 my $rmp = parse_random_map_params $exit->msg;
1840 1894
1841 if ($exit->map) { 1895 if ($exit->map) {
1842 $rmp->{region} = $exit->map->region_name; 1896 $rmp->{region} = $exit->region->name;
1843 $rmp->{origin_map} = $exit->map->path; 1897 $rmp->{origin_map} = $exit->map->path;
1844 $rmp->{origin_x} = $exit->x; 1898 $rmp->{origin_x} = $exit->x;
1845 $rmp->{origin_y} = $exit->y; 1899 $rmp->{origin_y} = $exit->y;
1846 } 1900 }
1847 1901
… …
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;
1868 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;
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. "
… …
2172 sub db_sync() { 2231 sub db_sync() {
2173 db_save if $dirty; 2232 db_save if $dirty;
2174 undef $dirty; 2233 undef $dirty;
2175 } 2234 }
2176 2235
2177 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2236 my $idle = Event->idle (
2178 db_sync; 2237 reentrant => 0,
2238 min => 10,
2239 max => 20,
2240 repeat => 0,
2241 data => WF_AUTOCANCEL,
2242 cb => \&db_sync,
2179 }); 2243 );
2180 2244
2181 sub db_dirty() { 2245 sub db_dirty() {
2182 $dirty = 1; 2246 $dirty = 1;
2183 $idle->start; 2247 $idle->start;
2184 } 2248 }
… …
2240 }; 2304 };
2241 2305
2242 cfg_load; 2306 cfg_load;
2243 db_load; 2307 db_load;
2244 load_extensions; 2308 load_extensions;
2309
2310 $TICK_WATCHER->start;
2245 Event::loop; 2311 Event::loop;
2246} 2312}
2247 2313
2248############################################################################# 2314#############################################################################
2249# initialisation and cleanup 2315# initialisation and cleanup
2250 2316
2251# install some emergency cleanup handlers 2317# install some emergency cleanup handlers
2252BEGIN { 2318BEGIN {
2253 for my $signal (qw(INT HUP TERM)) { 2319 for my $signal (qw(INT HUP TERM)) {
2254 Event->signal ( 2320 Event->signal (
2321 reentrant => 0,
2255 data => WF_AUTOCANCEL, 2322 data => WF_AUTOCANCEL,
2256 signal => $signal, 2323 signal => $signal,
2324 prio => 0,
2257 cb => sub { 2325 cb => sub {
2258 cf::cleanup "SIG$signal"; 2326 cf::cleanup "SIG$signal";
2259 }, 2327 },
2260 ); 2328 );
2261 } 2329 }
2262} 2330}
… …
2291} 2359}
2292 2360
2293sub reload() { 2361sub reload() {
2294 # can/must only be called in main 2362 # can/must only be called in main
2295 if ($Coro::current != $Coro::main) { 2363 if ($Coro::current != $Coro::main) {
2296 warn "can only reload from main coroutine\n"; 2364 warn "can only reload from main coroutine";
2297 return; 2365 return;
2298 } 2366 }
2299 2367
2300 warn "reloading..."; 2368 warn "reloading...";
2301 2369
2302 warn "freezing server"; 2370 warn "cancelling server ticker";
2303 my $guard = freeze_mainloop; 2371 $TICK_WATCHER->cancel;
2372
2304 cf::emergency_save; 2373 cf::emergency_save;
2305
2306 warn "sync database to disk";
2307 cf::db_sync;
2308 IO::AIO::flush;
2309 2374
2310 eval { 2375 eval {
2311 # if anything goes wrong in here, we should simply crash as we already saved 2376 # if anything goes wrong in here, we should simply crash as we already saved
2312 2377
2378 warn "syncing database to disk";
2379 cf::db_sync;
2380
2313 warn "cancel all watchers"; 2381 warn "cancelling all WF_AUTOCANCEL watchers";
2314 for (Event::all_watchers) { 2382 for (Event::all_watchers) {
2315 $_->cancel if $_->data & WF_AUTOCANCEL; 2383 $_->cancel if $_->data & WF_AUTOCANCEL;
2316 } 2384 }
2317 2385
2386 warn "flushing outstanding aio requests";
2387 for (;;) {
2388 IO::AIO::flush;
2389 Coro::cede;
2390 last unless IO::AIO::nreqs;
2391 warn "iterate...";
2392 }
2393
2318 warn "cancel all extension coros"; 2394 warn "cancelling all extension coros";
2319 $_->cancel for values %EXT_CORO; 2395 $_->cancel for values %EXT_CORO;
2320 %EXT_CORO = (); 2396 %EXT_CORO = ();
2321 2397
2322 warn "remove commands"; 2398 warn "removing commands";
2323 %COMMAND = (); 2399 %COMMAND = ();
2324 2400
2325 warn "remove ext commands"; 2401 warn "removing ext commands";
2326 %EXTCMD = (); 2402 %EXTCMD = ();
2327 2403
2328 warn "unload/nuke all extensions"; 2404 warn "unloading/nuking all extensions";
2329 for my $pkg (@EXTS) { 2405 for my $pkg (@EXTS) {
2330 warn "... unloading $pkg"; 2406 warn "... unloading $pkg";
2331 2407
2332 if (my $cb = $pkg->can ("unload")) { 2408 if (my $cb = $pkg->can ("unload")) {
2333 eval { 2409 eval {
… …
2338 2414
2339 warn "... nuking $pkg"; 2415 warn "... nuking $pkg";
2340 Symbol::delete_package $pkg; 2416 Symbol::delete_package $pkg;
2341 } 2417 }
2342 2418
2343 warn "unload all perl modules loaded from $LIBDIR"; 2419 warn "unloading all perl modules loaded from $LIBDIR";
2344 while (my ($k, $v) = each %INC) { 2420 while (my ($k, $v) = each %INC) {
2345 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2421 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2346 2422
2347 warn "removing <$k>"; 2423 warn "... unloading $k";
2348 delete $INC{$k}; 2424 delete $INC{$k};
2349 2425
2350 $k =~ s/\.pm$//; 2426 $k =~ s/\.pm$//;
2351 $k =~ s/\//::/g; 2427 $k =~ s/\//::/g;
2352 2428
… …
2355 } 2431 }
2356 2432
2357 Symbol::delete_package $k; 2433 Symbol::delete_package $k;
2358 } 2434 }
2359 2435
2360 warn "get rid of safe::, as good as possible"; 2436 warn "getting rid of safe::, as good as possible";
2361 Symbol::delete_package "safe::$_" 2437 Symbol::delete_package "safe::$_"
2362 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2438 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2363 2439
2364 warn "unload cf.pm \"a bit\""; 2440 warn "unloading cf.pm \"a bit\"";
2365 delete $INC{"cf.pm"}; 2441 delete $INC{"cf.pm"};
2366 2442
2367 # don't, removes xs symbols, too, 2443 # don't, removes xs symbols, too,
2368 # and global variables created in xs 2444 # and global variables created in xs
2369 #Symbol::delete_package __PACKAGE__; 2445 #Symbol::delete_package __PACKAGE__;
2370 2446
2447 warn "unload completed, starting to reload now";
2448
2371 warn "reloading cf.pm"; 2449 warn "reloading cf.pm";
2372 require cf; 2450 require cf;
2373 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2451 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2374 2452
2375 warn "load config and database again"; 2453 warn "loading config and database again";
2376 cf::cfg_load; 2454 cf::cfg_load;
2377 cf::db_load; 2455 cf::db_load;
2378 2456
2379 warn "load extensions"; 2457 warn "loading extensions";
2380 cf::load_extensions; 2458 cf::load_extensions;
2381 2459
2382 warn "reattach attachments to objects/players"; 2460 warn "reattaching attachments to objects/players";
2383 _global_reattach; 2461 _global_reattach;
2384 warn "reattach attachments to maps"; 2462 warn "reattaching attachments to maps";
2385 reattach $_ for values %MAP; 2463 reattach $_ for values %MAP;
2464
2465 warn "restarting server ticker";
2466
2467 $TICK_WATCHER->start;
2386 }; 2468 };
2387 2469
2388 if ($@) { 2470 if ($@) {
2389 warn $@; 2471 warn $@;
2390 warn "error while reloading, exiting."; 2472 warn "error while reloading, exiting.";
… …
2403 $who->message ("reloading server."); 2485 $who->message ("reloading server.");
2404 2486
2405 # doing reload synchronously and two reloads happen back-to-back, 2487 # doing reload synchronously and two reloads happen back-to-back,
2406 # coro crashes during coro_state_free->destroy here. 2488 # coro crashes during coro_state_free->destroy here.
2407 2489
2408 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2490 $RELOAD_WATCHER ||= Event->timer (
2491 reentrant => 0,
2492 after => 0,
2493 data => WF_AUTOCANCEL,
2494 cb => sub {
2409 reload; 2495 reload;
2410 undef $RELOAD_WATCHER; 2496 undef $RELOAD_WATCHER;
2497 },
2411 }); 2498 );
2412 } 2499 }
2413}; 2500};
2414 2501
2415unshift @INC, $LIBDIR; 2502unshift @INC, $LIBDIR;
2503
2504my $bug_warning = 0;
2416 2505
2417$TICK_WATCHER = Event->timer ( 2506$TICK_WATCHER = Event->timer (
2418 reentrant => 0, 2507 reentrant => 0,
2508 parked => 1,
2419 prio => 0, 2509 prio => 0,
2420 at => $NEXT_TICK || $TICK, 2510 at => $NEXT_TICK || $TICK,
2421 data => WF_AUTOCANCEL, 2511 data => WF_AUTOCANCEL,
2422 cb => sub { 2512 cb => sub {
2513 if ($Coro::current != $Coro::main) {
2514 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2515 unless ++$bug_warning > 10;
2516 return;
2517 }
2518
2423 $NOW = Event::time; 2519 $NOW = Event::time;
2424 2520
2425 cf::server_tick; # one server iteration 2521 cf::server_tick; # one server iteration
2426 $RUNTIME += $TICK; 2522 $RUNTIME += $TICK;
2427 $NEXT_TICK += $TICK; 2523 $NEXT_TICK += $TICK;
2428 2524
2429 $WAIT_FOR_TICK->broadcast; 2525 $WAIT_FOR_TICK->broadcast;
2430 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2526 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2527
2528 Event::sweep;
2529 Coro::cede_notself;
2530
2531# my $AFTER = Event::time;
2532# warn $AFTER - $NOW;#d#
2431 2533
2432 # if we are delayed by four ticks or more, skip them all 2534 # if we are delayed by four ticks or more, skip them all
2433 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2535 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2434 2536
2435 $TICK_WATCHER->at ($NEXT_TICK); 2537 $TICK_WATCHER->at ($NEXT_TICK);
2436 $TICK_WATCHER->start; 2538 $TICK_WATCHER->start;
2437 }, 2539 },
2438); 2540);
2439 2541
2440IO::AIO::max_poll_time $TICK * 0.2; 2542IO::AIO::max_poll_time $TICK * 0.1;
2441 2543
2544undef $Coro::AIO::WATCHER;
2442$AIO_POLL_WATCHER = Event->io ( 2545$AIO_POLL_WATCHER = Event->io (
2546 reentrant => 0,
2443 fd => IO::AIO::poll_fileno, 2547 fd => IO::AIO::poll_fileno,
2444 poll => 'r', 2548 poll => 'r',
2445 prio => 5, 2549 prio => 6,
2446 data => WF_AUTOCANCEL, 2550 data => WF_AUTOCANCEL,
2447 cb => \&IO::AIO::poll_cb, 2551 cb => \&IO::AIO::poll_cb,
2448); 2552);
2449 2553
2450$WRITE_RUNTIME_WATCHER = Event->timer ( 2554$WRITE_RUNTIME_WATCHER = Event->timer (
2555 reentrant => 0,
2451 data => WF_AUTOCANCEL, 2556 data => WF_AUTOCANCEL,
2452 after => 0, 2557 after => 1,
2453 interval => 10, 2558 interval => 10,
2454 cb => sub { 2559 prio => 6, # keep it lowest so it acts like a watchdog
2455 (Coro::unblock_sub { 2560 cb => Coro::unblock_sub {
2456 write_runtime 2561 write_runtime
2457 or warn "ERROR: unable to write runtime file: $!"; 2562 or warn "ERROR: unable to write runtime file: $!";
2458 })->();
2459 }, 2563 },
2460); 2564);
2461 2565
2462END { cf::emergency_save } 2566END { cf::emergency_save }
2463 2567

Diff Legend

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