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.169 by root, Sun Jan 14 01:09:46 2007 UTC vs.
Revision 1.199 by root, Mon Jan 29 14:46:01 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;
… …
502our @CB_CLIENT = (); 507our @CB_CLIENT = ();
503our @CB_TYPE = (); # registry for type (cf-object class) based events 508our @CB_TYPE = (); # registry for type (cf-object class) based events
504our @CB_MAP = (); 509our @CB_MAP = ();
505 510
506my %attachment; 511my %attachment;
512
513sub cf::attachable::thawer_merge {
514 # simply override everything except _meta
515 local $_[0]{_meta};
516 %{$_[0]} = %{$_[1]};
517}
507 518
508sub _attach_cb($$$$) { 519sub _attach_cb($$$$) {
509 my ($registry, $event, $prio, $cb) = @_; 520 my ($registry, $event, $prio, $cb) = @_;
510 521
511 use sort 'stable'; 522 use sort 'stable';
… …
951 962
952sub exists($) { 963sub exists($) {
953 my ($login) = @_; 964 my ($login) = @_;
954 965
955 $cf::PLAYER{$login} 966 $cf::PLAYER{$login}
956 or cf::sync_job { !aio_stat $login } 967 or cf::sync_job { !aio_stat path $login }
957} 968}
958 969
959sub find($) { 970sub find($) {
960 return $cf::PLAYER{$_[0]} || do { 971 return $cf::PLAYER{$_[0]} || do {
961 my $login = $_[0]; 972 my $login = $_[0];
… …
1069 for (@$files) { 1080 for (@$files) {
1070 utf8::decode $_; 1081 utf8::decode $_;
1071 next if /\.(?:pl|pst)$/; 1082 next if /\.(?:pl|pst)$/;
1072 next unless /^$PATH_SEP/o; 1083 next unless /^$PATH_SEP/o;
1073 1084
1074 s/\.map$//;
1075 push @paths, "~" . $pl->ob->name . "/" . $_; 1085 push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_;
1076 } 1086 }
1077 1087
1078 \@paths 1088 \@paths
1079} 1089}
1080 1090
… …
1107 1117
1108use Fcntl; 1118use Fcntl;
1109use Coro::AIO; 1119use Coro::AIO;
1110 1120
1111use overload 1121use overload
1112 '""' => \&as_string; 1122 '""' => \&as_string,
1123 fallback => 1;
1113 1124
1114our $MAX_RESET = 3600; 1125our $MAX_RESET = 3600;
1115our $DEFAULT_RESET = 3000; 1126our $DEFAULT_RESET = 3000;
1116 1127
1117sub generate_random_map { 1128sub generate_random_map {
1118 my ($self, $rmp) = @_; 1129 my ($self, $rmp) = @_;
1119
1120 # mit "rum" bekleckern, nicht 1130 # mit "rum" bekleckern, nicht
1121 $self->_create_random_map ( 1131 $self->_create_random_map (
1122 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1132 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1123 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1133 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1124 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1134 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1131 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1141 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1132 (cf::region::find $rmp->{region}), $rmp->{custom} 1142 (cf::region::find $rmp->{region}), $rmp->{custom}
1133 ) 1143 )
1134} 1144}
1135 1145
1146=item cf::map->register ($regex, $prio)
1147
1148Register a handler for the map path matching the given regex at the
1149givne priority (higher is better, built-in handlers have priority 0, the
1150default).
1151
1152=cut
1153
1136sub register { 1154sub register {
1137 my (undef, $regex) = @_; 1155 my (undef, $regex, $prio) = @_;
1138 my $pkg = caller; 1156 my $pkg = caller;
1139 1157
1140 no strict; 1158 no strict;
1141 push @{"$pkg\::ISA"}, __PACKAGE__; 1159 push @{"$pkg\::ISA"}, __PACKAGE__;
1142 1160
1143 $EXT_MAP{$pkg} = qr<$regex>; 1161 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1144} 1162}
1145 1163
1146# also paths starting with '/' 1164# also paths starting with '/'
1147$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1165$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1166
1167sub thawer_merge {
1168 my ($self, $merge) = @_;
1169
1170 # we have to keep some variables in memory intact
1171 local $self->{path};
1172 local $self->{load_path};
1173 local $self->{deny_save};
1174 local $self->{deny_reset};
1175
1176 $self->SUPER::thawer_merge ($merge);
1177}
1148 1178
1149sub normalise { 1179sub normalise {
1150 my ($path, $base) = @_; 1180 my ($path, $base) = @_;
1181
1182 $path = "$path"; # make sure its a string
1183
1184 $path =~ s/\.map$//;
1151 1185
1152 # map plan: 1186 # map plan:
1153 # 1187 #
1154 # /! non-realised random map exit (special hack!) 1188 # /! non-realised random map exit (special hack!)
1155 # {... are special paths that are not being touched 1189 # {... are special paths that are not being touched
… …
1183 1217
1184 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1218 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1185 1219
1186 $path = normalise $path, $base; 1220 $path = normalise $path, $base;
1187 1221
1188 for my $pkg (keys %EXT_MAP) { 1222 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1189 if ($path =~ $EXT_MAP{$pkg}) { 1223 if ($path =~ $EXT_MAP{$pkg}[1]) {
1190 my $self = bless cf::map::new, $pkg; 1224 my $self = bless cf::map::new, $pkg;
1191 $self->{path} = $path; $self->path ($path); 1225 $self->{path} = $path; $self->path ($path);
1192 $self->init; # pass $1 etc. 1226 $self->init; # pass $1 etc.
1193 return $self; 1227 return $self;
1194 } 1228 }
1195 } 1229 }
1196 1230
1197 Carp::carp "unable to resolve path '$path'."; 1231 Carp::carp "unable to resolve path '$path' (base '$base').";
1198 () 1232 ()
1199} 1233}
1200 1234
1201sub init { 1235sub init {
1202 my ($self) = @_; 1236 my ($self) = @_;
… …
1249 1283
1250sub unlink_save { 1284sub unlink_save {
1251 my ($self) = @_; 1285 my ($self) = @_;
1252 1286
1253 utf8::encode (my $save = $self->save_path); 1287 utf8::encode (my $save = $self->save_path);
1254 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1288 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1255 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1289 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1256} 1290}
1257 1291
1258sub load_header_from($) { 1292sub load_header_from($) {
1259 my ($self, $path) = @_; 1293 my ($self, $path) = @_;
1260 1294
… …
1268 $self->{load_path} = $path; 1302 $self->{load_path} = $path;
1269 1303
1270 1 1304 1
1271} 1305}
1272 1306
1273sub load_orig { 1307sub load_header_orig {
1274 my ($self) = @_; 1308 my ($self) = @_;
1275 1309
1276 $self->load_header_from ($self->load_path) 1310 $self->load_header_from ($self->load_path)
1277} 1311}
1278 1312
1279sub load_temp { 1313sub load_header_temp {
1280 my ($self) = @_; 1314 my ($self) = @_;
1281 1315
1282 $self->load_header_from ($self->save_path) 1316 $self->load_header_from ($self->save_path)
1317}
1318
1319sub prepare_temp {
1320 my ($self) = @_;
1321
1322 $self->last_access ((delete $self->{last_access})
1323 || $cf::RUNTIME); #d#
1324 # safety
1325 $self->{instantiate_time} = $cf::RUNTIME
1326 if $self->{instantiate_time} > $cf::RUNTIME;
1327}
1328
1329sub prepare_orig {
1330 my ($self) = @_;
1331
1332 $self->{load_original} = 1;
1333 $self->{instantiate_time} = $cf::RUNTIME;
1334 $self->last_access ($cf::RUNTIME);
1335 $self->instantiate;
1283} 1336}
1284 1337
1285sub load_header { 1338sub load_header {
1286 my ($self) = @_; 1339 my ($self) = @_;
1287 1340
1288 if ($self->load_temp) { 1341 if ($self->load_header_temp) {
1289 $self->last_access ((delete $self->{last_access}) 1342 $self->prepare_temp;
1290 || $cf::RUNTIME); #d#
1291 # safety
1292 $self->{instantiate_time} = $cf::RUNTIME
1293 if $self->{instantiate_time} > $cf::RUNTIME;
1294 } else { 1343 } else {
1295 $self->load_orig 1344 $self->load_header_orig
1296 or return; 1345 or return;
1297 1346 $self->prepare_orig;
1298 $self->{load_original} = 1;
1299 $self->{instantiate_time} = $cf::RUNTIME;
1300 $self->last_access ($cf::RUNTIME);
1301 $self->instantiate;
1302 } 1347 }
1303 1348
1304 1 1349 1
1305} 1350}
1306 1351
… …
1320 $map->{last_save} = $cf::RUNTIME; 1365 $map->{last_save} = $cf::RUNTIME;
1321 1366
1322 $map->load_header 1367 $map->load_header
1323 or return; 1368 or return;
1324 1369
1325 if ($map->should_reset) { 1370 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1371 # doing this can freeze the server in a sync job, obviously
1372 #$cf::WAIT_FOR_TICK->wait;
1326 $map->reset; 1373 $map->reset;
1327 undef $guard; 1374 undef $guard;
1328 $map = find $path 1375 return find $path;
1329 or return;
1330 } 1376 }
1331 1377
1332 $cf::MAP{$path} = $map 1378 $cf::MAP{$path} = $map
1333 } 1379 }
1334} 1380}
1381
1382sub pre_load { }
1383sub post_load { }
1335 1384
1336sub load { 1385sub load {
1337 my ($self) = @_; 1386 my ($self) = @_;
1338 1387
1388 local $self->{deny_reset} = 1; # loading can take a long time
1389
1339 my $path = $self->{path}; 1390 my $path = $self->{path};
1340 my $guard = cf::lock_acquire "map_load:$path"; 1391 my $guard = cf::lock_acquire "map_load:$path";
1341 1392
1342 return if $self->in_memory != cf::MAP_SWAPPED; 1393 return if $self->in_memory != cf::MAP_SWAPPED;
1343 1394
1344 $self->in_memory (cf::MAP_LOADING); 1395 $self->in_memory (cf::MAP_LOADING);
1345 1396
1346 $self->alloc; 1397 $self->alloc;
1398
1399 $self->pre_load;
1400
1347 $self->_load_objects ($self->{load_path}, 1) 1401 $self->_load_objects ($self->{load_path}, 1)
1348 or return; 1402 or return;
1349 1403
1350 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1404 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1351 if delete $self->{load_original}; 1405 if delete $self->{load_original};
… …
1373 unless $self->difficulty; 1427 unless $self->difficulty;
1374 Coro::cede; 1428 Coro::cede;
1375 $self->activate; 1429 $self->activate;
1376 } 1430 }
1377 1431
1432 $self->post_load;
1433
1378 $self->in_memory (cf::MAP_IN_MEMORY); 1434 $self->in_memory (cf::MAP_IN_MEMORY);
1379} 1435}
1380 1436
1381sub customise_for { 1437sub customise_for {
1382 my ($self, $ob) = @_; 1438 my ($self, $ob) = @_;
… …
1422 1478
1423 cf::sync_job { $map->load }; 1479 cf::sync_job { $map->load };
1424} 1480}
1425 1481
1426our %MAP_PREFETCH; 1482our %MAP_PREFETCH;
1427our $MAP_PREFETCHER = Coro::async { 1483our $MAP_PREFETCHER = undef;
1428 while () {
1429 for my $path (keys %MAP_PREFETCH) {
1430 my $map = find $path
1431 or next;
1432 $map->load;
1433
1434 delete $MAP_PREFETCH{$path};
1435 }
1436 Coro::schedule;
1437 }
1438};
1439 1484
1440sub find_async { 1485sub find_async {
1441 my ($path, $origin) = @_; 1486 my ($path, $origin) = @_;
1442 1487
1443 $path = normalise $path, $origin && $origin->{path}; 1488 $path = normalise $path, $origin && $origin->{path};
1444 1489
1445 if (my $map = $cf::MAP{$path}) { 1490 if (my $map = $cf::MAP{$path}) {
1446 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1491 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1447 } 1492 }
1448 1493
1449 $MAP_PREFETCH{$path} = 0; 1494 undef $MAP_PREFETCH{$path};
1495 $MAP_PREFETCHER ||= cf::async {
1496 while (%MAP_PREFETCH) {
1497 for my $path (keys %MAP_PREFETCH) {
1498 my $map = find $path
1499 or next;
1500 $map->load;
1501
1502 delete $MAP_PREFETCH{$path};
1503 }
1504 }
1505 undef $MAP_PREFETCHER;
1506 };
1450 $MAP_PREFETCHER->ready; 1507 $MAP_PREFETCHER->prio (6);
1451 1508
1452 () 1509 ()
1453} 1510}
1454 1511
1455sub save { 1512sub save {
… …
1515 my ($self) = @_; 1572 my ($self) = @_;
1516 1573
1517 $self->reset_at <= $cf::RUNTIME 1574 $self->reset_at <= $cf::RUNTIME
1518} 1575}
1519 1576
1520sub rename {
1521 my ($self, $new_path) = @_;
1522
1523 normalise $new_path;
1524
1525 $self->unlink_save;
1526
1527 delete $cf::MAP{$self->path};
1528 $self->{path} = $new_path; $self->path ($self->{path});
1529 $cf::MAP{$self->path} = $self;
1530
1531 $self->save;
1532}
1533
1534sub reset { 1577sub reset {
1535 my ($self) = @_; 1578 my ($self) = @_;
1536 1579
1537 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1580 my $lock = cf::lock_acquire "map_data:$self->{path}";
1538 1581
… …
1555my $nuke_counter = "aaaa"; 1598my $nuke_counter = "aaaa";
1556 1599
1557sub nuke { 1600sub nuke {
1558 my ($self) = @_; 1601 my ($self) = @_;
1559 1602
1603 delete $cf::MAP{$self->path};
1604
1605 $self->unlink_save;
1606
1607 bless $self, "cf::map";
1608 delete $self->{deny_reset};
1560 $self->{deny_save} = 1; 1609 $self->{deny_save} = 1;
1561 $self->reset_timeout (1); 1610 $self->reset_timeout (1);
1562 $self->rename ("{nuke}/" . ($nuke_counter++)); 1611 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1612
1613 $cf::MAP{$self->path} = $self;
1614
1563 $self->reset; # polite request, might not happen 1615 $self->reset; # polite request, might not happen
1564} 1616}
1565 1617
1566=item cf::map::unique_maps 1618=item cf::map::unique_maps
1567 1619
… …
1579 for (@$files) { 1631 for (@$files) {
1580 utf8::decode $_; 1632 utf8::decode $_;
1581 next if /\.pst$/; 1633 next if /\.pst$/;
1582 next unless /^$PATH_SEP/o; 1634 next unless /^$PATH_SEP/o;
1583 1635
1584 s/\.map$//; 1636 push @paths, cf::map::normalise $_;
1585 push @paths, $_;
1586 } 1637 }
1587 1638
1588 \@paths 1639 \@paths
1589} 1640}
1590 1641
… …
1684=cut 1735=cut
1685 1736
1686sub link_map { 1737sub link_map {
1687 unless ($LINK_MAP) { 1738 unless ($LINK_MAP) {
1688 $LINK_MAP = cf::map::find "{link}" 1739 $LINK_MAP = cf::map::find "{link}"
1689 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1740 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1690 $LINK_MAP->load; 1741 $LINK_MAP->load;
1691 } 1742 }
1692 1743
1693 $LINK_MAP 1744 $LINK_MAP
1694} 1745}
… …
1701 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1752 return if UNIVERSAL::isa $self->map, "ext::map_link";
1702 1753
1703 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1754 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1704 if $self->map; 1755 if $self->map;
1705 1756
1706 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1757 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1707} 1758}
1708 1759
1709sub cf::object::player::leave_link { 1760sub cf::object::player::leave_link {
1710 my ($self, $map, $x, $y) = @_; 1761 my ($self, $map, $x, $y) = @_;
1711 1762
… …
1778 my ($self, $path, $x, $y) = @_; 1829 my ($self, $path, $x, $y) = @_;
1779 1830
1780 $self->enter_link; 1831 $self->enter_link;
1781 1832
1782 (async { 1833 (async {
1834 my $map = eval {
1783 my $map = cf::map::find $path; 1835 my $map = cf::map::find $path;
1784 $map = $map->customise_for ($self) if $map; 1836 $map = $map->customise_for ($self) if $map;
1785 1837 $map
1786# warn "entering ", $map->path, " at ($x, $y)\n" 1838 } or
1787# if $map;
1788
1789 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1839 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1790 1840
1791 $self->leave_link ($map, $x, $y); 1841 $self->leave_link ($map, $x, $y);
1792 })->prio (1); 1842 })->prio (1);
1793} 1843}
1794 1844
… …
1798 1848
1799sub parse_random_map_params { 1849sub parse_random_map_params {
1800 my ($spec) = @_; 1850 my ($spec) = @_;
1801 1851
1802 my $rmp = { # defaults 1852 my $rmp = { # defaults
1803 xsize => 10, 1853 xsize => (cf::rndm 15, 40),
1804 ysize => 10, 1854 ysize => (cf::rndm 15, 40),
1855 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1856 #layout => string,
1805 }; 1857 };
1806 1858
1807 for (split /\n/, $spec) { 1859 for (split /\n/, $spec) {
1808 my ($k, $v) = split /\s+/, $_, 2; 1860 my ($k, $v) = split /\s+/, $_, 2;
1809 1861
… …
1813 $rmp 1865 $rmp
1814} 1866}
1815 1867
1816sub prepare_random_map { 1868sub prepare_random_map {
1817 my ($exit) = @_; 1869 my ($exit) = @_;
1870
1871 my $guard = cf::lock_acquire "exit_prepare:$exit";
1818 1872
1819 # all this does is basically replace the /! path by 1873 # all this does is basically replace the /! path by
1820 # a new random map path (?random/...) with a seed 1874 # a new random map path (?random/...) with a seed
1821 # that depends on the exit object 1875 # that depends on the exit object
1822 1876
1823 my $rmp = parse_random_map_params $exit->msg; 1877 my $rmp = parse_random_map_params $exit->msg;
1824 1878
1825 if ($exit->map) { 1879 if ($exit->map) {
1826 $rmp->{region} = $exit->map->region_name; 1880 $rmp->{region} = $exit->region->name;
1827 $rmp->{origin_map} = $exit->map->path; 1881 $rmp->{origin_map} = $exit->map->path;
1828 $rmp->{origin_x} = $exit->x; 1882 $rmp->{origin_x} = $exit->x;
1829 $rmp->{origin_y} = $exit->y; 1883 $rmp->{origin_y} = $exit->y;
1830 } 1884 }
1831 1885
1832 $rmp->{random_seed} ||= $exit->random_seed; 1886 $rmp->{random_seed} ||= $exit->random_seed;
1833 1887
1834 my $data = cf::to_json $rmp; 1888 my $data = cf::to_json $rmp;
1835 my $md5 = Digest::MD5::md5_hex $data; 1889 my $md5 = Digest::MD5::md5_hex $data;
1890 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1836 1891
1837 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1892 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1838 aio_write $fh, 0, (length $data), $data, 0; 1893 aio_write $fh, 0, (length $data), $data, 0;
1894 undef $fh;
1895 aio_rename "$meta~", $meta;
1839 1896
1840 $exit->slaying ("?random/$md5"); 1897 $exit->slaying ("?random/$md5");
1841 $exit->msg (undef); 1898 $exit->msg (undef);
1842 } 1899 }
1843} 1900}
1844 1901
1845sub cf::object::player::enter_exit { 1902sub cf::object::player::enter_exit {
1846 my ($self, $exit) = @_; 1903 my ($self, $exit) = @_;
1847 1904
1848 return unless $self->type == cf::PLAYER; 1905 return unless $self->type == cf::PLAYER;
1906
1907 if ($exit->slaying eq "/!") {
1908 #TODO: this should de-fi-ni-te-ly not be a sync-job
1909 cf::sync_job { prepare_random_map $exit };
1910 }
1911
1912 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1913 my $hp = $exit->stats->hp;
1914 my $sp = $exit->stats->sp;
1849 1915
1850 $self->enter_link; 1916 $self->enter_link;
1851 1917
1852 (async { 1918 (async {
1853 $self->deactivate_recursive; # just to be sure 1919 $self->deactivate_recursive; # just to be sure
1854 unless (eval { 1920 unless (eval {
1855 prepare_random_map $exit 1921 $self->goto ($slaying, $hp, $sp);
1856 if $exit->slaying eq "/!";
1857
1858 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1859 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1860 1922
1861 1; 1923 1;
1862 }) { 1924 }) {
1863 $self->message ("Something went wrong deep within the crossfire server. " 1925 $self->message ("Something went wrong deep within the crossfire server. "
1864 . "I'll try to bring you back to the map you were before. " 1926 . "I'll try to bring you back to the map you were before. "
… …
2153 sub db_sync() { 2215 sub db_sync() {
2154 db_save if $dirty; 2216 db_save if $dirty;
2155 undef $dirty; 2217 undef $dirty;
2156 } 2218 }
2157 2219
2158 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2220 my $idle = Event->idle (
2159 db_sync; 2221 reentrant => 0,
2222 min => 10,
2223 max => 20,
2224 repeat => 0,
2225 data => WF_AUTOCANCEL,
2226 cb => \&db_sync,
2160 }); 2227 );
2161 2228
2162 sub db_dirty() { 2229 sub db_dirty() {
2163 $dirty = 1; 2230 $dirty = 1;
2164 $idle->start; 2231 $idle->start;
2165 } 2232 }
… …
2213 2280
2214sub main { 2281sub main {
2215 # we must not ever block the main coroutine 2282 # we must not ever block the main coroutine
2216 local $Coro::idle = sub { 2283 local $Coro::idle = sub {
2217 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2284 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2285 (async {
2218 async { Event::one_event }; 2286 Event::one_event;
2287 })->prio (Coro::PRIO_MAX);
2219 }; 2288 };
2220 2289
2221 cfg_load; 2290 cfg_load;
2222 db_load; 2291 db_load;
2223 load_extensions; 2292 load_extensions;
2293
2294 $TICK_WATCHER->start;
2224 Event::loop; 2295 Event::loop;
2225} 2296}
2226 2297
2227############################################################################# 2298#############################################################################
2228# initialisation and cleanup 2299# initialisation and cleanup
2229 2300
2230# install some emergency cleanup handlers 2301# install some emergency cleanup handlers
2231BEGIN { 2302BEGIN {
2232 for my $signal (qw(INT HUP TERM)) { 2303 for my $signal (qw(INT HUP TERM)) {
2233 Event->signal ( 2304 Event->signal (
2305 reentrant => 0,
2234 data => WF_AUTOCANCEL, 2306 data => WF_AUTOCANCEL,
2235 signal => $signal, 2307 signal => $signal,
2308 prio => 0,
2236 cb => sub { 2309 cb => sub {
2237 cf::cleanup "SIG$signal"; 2310 cf::cleanup "SIG$signal";
2238 }, 2311 },
2239 ); 2312 );
2240 } 2313 }
2241} 2314}
… …
2270} 2343}
2271 2344
2272sub reload() { 2345sub reload() {
2273 # can/must only be called in main 2346 # can/must only be called in main
2274 if ($Coro::current != $Coro::main) { 2347 if ($Coro::current != $Coro::main) {
2275 warn "can only reload from main coroutine\n"; 2348 warn "can only reload from main coroutine";
2276 return; 2349 return;
2277 } 2350 }
2278 2351
2279 warn "reloading..."; 2352 warn "reloading...";
2280 2353
2281 warn "freezing server"; 2354 warn "cancelling server ticker";
2282 my $guard = freeze_mainloop; 2355 $TICK_WATCHER->cancel;
2356
2283 cf::emergency_save; 2357 cf::emergency_save;
2284
2285 warn "sync database to disk";
2286 cf::db_sync;
2287 IO::AIO::flush;
2288 2358
2289 eval { 2359 eval {
2290 # if anything goes wrong in here, we should simply crash as we already saved 2360 # if anything goes wrong in here, we should simply crash as we already saved
2291 2361
2362 warn "syncing database to disk";
2363 cf::db_sync;
2364
2292 warn "cancel all watchers"; 2365 warn "cancelling all WF_AUTOCANCEL watchers";
2293 for (Event::all_watchers) { 2366 for (Event::all_watchers) {
2294 $_->cancel if $_->data & WF_AUTOCANCEL; 2367 $_->cancel if $_->data & WF_AUTOCANCEL;
2295 } 2368 }
2296 2369
2370 warn "flushing outstanding aio requests";
2371 for (;;) {
2372 IO::AIO::flush;
2373 Coro::cede;
2374 last unless IO::AIO::nreqs;
2375 warn "iterate...";
2376 }
2377
2297 warn "cancel all extension coros"; 2378 warn "cancelling all extension coros";
2298 $_->cancel for values %EXT_CORO; 2379 $_->cancel for values %EXT_CORO;
2299 %EXT_CORO = (); 2380 %EXT_CORO = ();
2300 2381
2301 warn "remove commands"; 2382 warn "removing commands";
2302 %COMMAND = (); 2383 %COMMAND = ();
2303 2384
2304 warn "remove ext commands"; 2385 warn "removing ext commands";
2305 %EXTCMD = (); 2386 %EXTCMD = ();
2306 2387
2307 warn "unload/nuke all extensions"; 2388 warn "unloading/nuking all extensions";
2308 for my $pkg (@EXTS) { 2389 for my $pkg (@EXTS) {
2309 warn "... unloading $pkg"; 2390 warn "... unloading $pkg";
2310 2391
2311 if (my $cb = $pkg->can ("unload")) { 2392 if (my $cb = $pkg->can ("unload")) {
2312 eval { 2393 eval {
… …
2317 2398
2318 warn "... nuking $pkg"; 2399 warn "... nuking $pkg";
2319 Symbol::delete_package $pkg; 2400 Symbol::delete_package $pkg;
2320 } 2401 }
2321 2402
2322 warn "unload all perl modules loaded from $LIBDIR"; 2403 warn "unloading all perl modules loaded from $LIBDIR";
2323 while (my ($k, $v) = each %INC) { 2404 while (my ($k, $v) = each %INC) {
2324 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2405 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2325 2406
2326 warn "removing <$k>"; 2407 warn "... unloading $k";
2327 delete $INC{$k}; 2408 delete $INC{$k};
2328 2409
2329 $k =~ s/\.pm$//; 2410 $k =~ s/\.pm$//;
2330 $k =~ s/\//::/g; 2411 $k =~ s/\//::/g;
2331 2412
… …
2334 } 2415 }
2335 2416
2336 Symbol::delete_package $k; 2417 Symbol::delete_package $k;
2337 } 2418 }
2338 2419
2339 warn "get rid of safe::, as good as possible"; 2420 warn "getting rid of safe::, as good as possible";
2340 Symbol::delete_package "safe::$_" 2421 Symbol::delete_package "safe::$_"
2341 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2422 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2342 2423
2343 warn "unload cf.pm \"a bit\""; 2424 warn "unloading cf.pm \"a bit\"";
2344 delete $INC{"cf.pm"}; 2425 delete $INC{"cf.pm"};
2345 2426
2346 # don't, removes xs symbols, too, 2427 # don't, removes xs symbols, too,
2347 # and global variables created in xs 2428 # and global variables created in xs
2348 #Symbol::delete_package __PACKAGE__; 2429 #Symbol::delete_package __PACKAGE__;
2349 2430
2431 warn "unload completed, starting to reload now";
2432
2350 warn "reloading cf.pm"; 2433 warn "reloading cf.pm";
2351 require cf; 2434 require cf;
2352 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2435 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2353 2436
2354 warn "load config and database again"; 2437 warn "loading config and database again";
2355 cf::cfg_load; 2438 cf::cfg_load;
2356 cf::db_load; 2439 cf::db_load;
2357 2440
2358 warn "load extensions"; 2441 warn "loading extensions";
2359 cf::load_extensions; 2442 cf::load_extensions;
2360 2443
2361 warn "reattach attachments to objects/players"; 2444 warn "reattaching attachments to objects/players";
2362 _global_reattach; 2445 _global_reattach;
2363 warn "reattach attachments to maps"; 2446 warn "reattaching attachments to maps";
2364 reattach $_ for values %MAP; 2447 reattach $_ for values %MAP;
2448
2449 warn "restarting server ticker";
2450
2451 $TICK_WATCHER->start;
2365 }; 2452 };
2366 2453
2367 if ($@) { 2454 if ($@) {
2368 warn $@; 2455 warn $@;
2369 warn "error while reloading, exiting."; 2456 warn "error while reloading, exiting.";
… …
2371 } 2458 }
2372 2459
2373 warn "reloaded"; 2460 warn "reloaded";
2374}; 2461};
2375 2462
2463our $RELOAD_WATCHER; # used only during reload
2464
2376register_command "reload" => sub { 2465register_command "reload" => sub {
2377 my ($who, $arg) = @_; 2466 my ($who, $arg) = @_;
2378 2467
2379 if ($who->flag (FLAG_WIZ)) { 2468 if ($who->flag (FLAG_WIZ)) {
2380 $who->message ("start of reload."); 2469 $who->message ("reloading server.");
2470
2471 # doing reload synchronously and two reloads happen back-to-back,
2472 # coro crashes during coro_state_free->destroy here.
2473
2474 $RELOAD_WATCHER ||= Event->timer (
2475 reentrant => 0,
2476 after => 0,
2477 data => WF_AUTOCANCEL,
2478 cb => sub {
2381 reload; 2479 reload;
2382 $who->message ("end of reload."); 2480 undef $RELOAD_WATCHER;
2481 },
2482 );
2383 } 2483 }
2384}; 2484};
2385 2485
2386unshift @INC, $LIBDIR; 2486unshift @INC, $LIBDIR;
2487
2488my $bug_warning = 0;
2387 2489
2388$TICK_WATCHER = Event->timer ( 2490$TICK_WATCHER = Event->timer (
2389 reentrant => 0, 2491 reentrant => 0,
2492 parked => 1,
2390 prio => 0, 2493 prio => 0,
2391 at => $NEXT_TICK || $TICK, 2494 at => $NEXT_TICK || $TICK,
2392 data => WF_AUTOCANCEL, 2495 data => WF_AUTOCANCEL,
2393 cb => sub { 2496 cb => sub {
2497 if ($Coro::current != $Coro::main) {
2498 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2499 unless ++$bug_warning > 10;
2500 return;
2501 }
2502
2394 $NOW = Event::time; 2503 $NOW = Event::time;
2395 2504
2396 cf::server_tick; # one server iteration 2505 cf::server_tick; # one server iteration
2397 $RUNTIME += $TICK; 2506 $RUNTIME += $TICK;
2398 $NEXT_TICK += $TICK; 2507 $NEXT_TICK += $TICK;
2399 2508
2400 $WAIT_FOR_TICK->broadcast; 2509 $WAIT_FOR_TICK->broadcast;
2401 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2510 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2511
2512 Event::sweep;
2513 Coro::cede_notself;
2514
2515# my $AFTER = Event::time;
2516# warn $AFTER - $NOW;#d#
2402 2517
2403 # if we are delayed by four ticks or more, skip them all 2518 # if we are delayed by four ticks or more, skip them all
2404 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2519 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2405 2520
2406 $TICK_WATCHER->at ($NEXT_TICK); 2521 $TICK_WATCHER->at ($NEXT_TICK);
2407 $TICK_WATCHER->start; 2522 $TICK_WATCHER->start;
2408 }, 2523 },
2409); 2524);
2410 2525
2411IO::AIO::max_poll_time $TICK * 0.2; 2526IO::AIO::max_poll_time $TICK * 0.1;
2412 2527
2528undef $Coro::AIO::WATCHER;
2413$AIO_POLL_WATCHER = Event->io ( 2529$AIO_POLL_WATCHER = Event->io (
2530 reentrant => 0,
2414 fd => IO::AIO::poll_fileno, 2531 fd => IO::AIO::poll_fileno,
2415 poll => 'r', 2532 poll => 'r',
2416 prio => 5, 2533 prio => 6,
2417 data => WF_AUTOCANCEL, 2534 data => WF_AUTOCANCEL,
2418 cb => \&IO::AIO::poll_cb, 2535 cb => \&IO::AIO::poll_cb,
2419); 2536);
2420 2537
2421$WRITE_RUNTIME_WATCHER = Event->timer ( 2538$WRITE_RUNTIME_WATCHER = Event->timer (
2539 reentrant => 0,
2422 data => WF_AUTOCANCEL, 2540 data => WF_AUTOCANCEL,
2423 after => 0, 2541 after => 1,
2424 interval => 10, 2542 interval => 10,
2425 cb => sub { 2543 prio => 6, # keep it lowest so it acts like a watchdog
2426 (Coro::unblock_sub { 2544 cb => Coro::unblock_sub {
2427 write_runtime 2545 write_runtime
2428 or warn "ERROR: unable to write runtime file: $!"; 2546 or warn "ERROR: unable to write runtime file: $!";
2429 })->();
2430 }, 2547 },
2431); 2548);
2432 2549
2433END { cf::emergency_save } 2550END { cf::emergency_save }
2434 2551

Diff Legend

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