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

Diff Legend

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