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

Diff Legend

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