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.200 by root, Mon Jan 29 17:57:22 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3 (); 13use Coro 3.5 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
82mkdir cf::localdir . "/" . cf::tmpdir; 82mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 83mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 84mkdir $RANDOM_MAPS;
85 85
86our $EMERGENCY_POSITION; 86our $EMERGENCY_POSITION;
87
88sub cf::map::normalise;
87 89
88############################################################################# 90#############################################################################
89 91
90=head2 GLOBAL VARIABLES 92=head2 GLOBAL VARIABLES
91 93
… …
349 my $runtime = cf::localdir . "/runtime"; 351 my $runtime = cf::localdir . "/runtime";
350 352
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 354 or return;
353 355
356 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 357 # 10 is the runtime save interval, for a monotonic clock
358 # 60 allows for the watchdog to kill the server.
359
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 360 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 361 and return;
357 362
358 aio_fsync $fh 363 aio_fsync $fh
359 and return; 364 and return;
… …
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';
… …
765 } 776 }
766 } else { 777 } else {
767 aio_unlink $filename; 778 aio_unlink $filename;
768 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
769 } 780 }
781
782 #d##TODO# nuke non .map-files if exist
783 if ($filename =~ s/\.map$//) {
784 aio_unlink $filename;
785 aio_unlink "$filename.pst";
786 }
770 } 787 }
771} 788}
772 789
773sub object_freezer_as_string { 790sub object_freezer_as_string {
774 my ($rdata, $objs) = @_; 791 my ($rdata, $objs) = @_;
… …
780 797
781sub object_thawer_load { 798sub object_thawer_load {
782 my ($filename) = @_; 799 my ($filename) = @_;
783 800
784 my ($data, $av); 801 my ($data, $av);
802
803 #d#TODO remove .map if file does not exist
804 aio_stat $filename and $filename =~ s/\.map$//;
785 805
786 (aio_load $filename, $data) >= 0 806 (aio_load $filename, $data) >= 0
787 or return; 807 or return;
788 808
789 unless (aio_stat "$filename.pst") { 809 unless (aio_stat "$filename.pst") {
… …
951 971
952sub exists($) { 972sub exists($) {
953 my ($login) = @_; 973 my ($login) = @_;
954 974
955 $cf::PLAYER{$login} 975 $cf::PLAYER{$login}
956 or cf::sync_job { !aio_stat $login } 976 or cf::sync_job { !aio_stat path $login }
957} 977}
958 978
959sub find($) { 979sub find($) {
960 return $cf::PLAYER{$_[0]} || do { 980 return $cf::PLAYER{$_[0]} || do {
961 my $login = $_[0]; 981 my $login = $_[0];
… …
1069 for (@$files) { 1089 for (@$files) {
1070 utf8::decode $_; 1090 utf8::decode $_;
1071 next if /\.(?:pl|pst)$/; 1091 next if /\.(?:pl|pst)$/;
1072 next unless /^$PATH_SEP/o; 1092 next unless /^$PATH_SEP/o;
1073 1093
1074 s/\.map$//;
1075 push @paths, "~" . $pl->ob->name . "/" . $_; 1094 push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_;
1076 } 1095 }
1077 1096
1078 \@paths 1097 \@paths
1079} 1098}
1080 1099
… …
1107 1126
1108use Fcntl; 1127use Fcntl;
1109use Coro::AIO; 1128use Coro::AIO;
1110 1129
1111use overload 1130use overload
1112 '""' => \&as_string; 1131 '""' => \&as_string,
1132 fallback => 1;
1113 1133
1114our $MAX_RESET = 3600; 1134our $MAX_RESET = 3600;
1115our $DEFAULT_RESET = 3000; 1135our $DEFAULT_RESET = 3000;
1116 1136
1117sub generate_random_map { 1137sub generate_random_map {
1118 my ($self, $rmp) = @_; 1138 my ($self, $rmp) = @_;
1119
1120 # mit "rum" bekleckern, nicht 1139 # mit "rum" bekleckern, nicht
1121 $self->_create_random_map ( 1140 $self->_create_random_map (
1122 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1141 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1123 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1142 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1124 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1143 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1131 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1150 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1132 (cf::region::find $rmp->{region}), $rmp->{custom} 1151 (cf::region::find $rmp->{region}), $rmp->{custom}
1133 ) 1152 )
1134} 1153}
1135 1154
1155=item cf::map->register ($regex, $prio)
1156
1157Register a handler for the map path matching the given regex at the
1158givne priority (higher is better, built-in handlers have priority 0, the
1159default).
1160
1161=cut
1162
1136sub register { 1163sub register {
1137 my (undef, $regex) = @_; 1164 my (undef, $regex, $prio) = @_;
1138 my $pkg = caller; 1165 my $pkg = caller;
1139 1166
1140 no strict; 1167 no strict;
1141 push @{"$pkg\::ISA"}, __PACKAGE__; 1168 push @{"$pkg\::ISA"}, __PACKAGE__;
1142 1169
1143 $EXT_MAP{$pkg} = qr<$regex>; 1170 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1144} 1171}
1145 1172
1146# also paths starting with '/' 1173# also paths starting with '/'
1147$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1174$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1175
1176sub thawer_merge {
1177 my ($self, $merge) = @_;
1178
1179 # we have to keep some variables in memory intact
1180 local $self->{path};
1181 local $self->{load_path};
1182 local $self->{deny_save};
1183 local $self->{deny_reset};
1184
1185 $self->SUPER::thawer_merge ($merge);
1186}
1148 1187
1149sub normalise { 1188sub normalise {
1150 my ($path, $base) = @_; 1189 my ($path, $base) = @_;
1190
1191 $path = "$path"; # make sure its a string
1192
1193 $path =~ s/\.map$//;
1151 1194
1152 # map plan: 1195 # map plan:
1153 # 1196 #
1154 # /! non-realised random map exit (special hack!) 1197 # /! non-realised random map exit (special hack!)
1155 # {... are special paths that are not being touched 1198 # {... are special paths that are not being touched
… …
1183 1226
1184 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1227 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1185 1228
1186 $path = normalise $path, $base; 1229 $path = normalise $path, $base;
1187 1230
1188 for my $pkg (keys %EXT_MAP) { 1231 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1189 if ($path =~ $EXT_MAP{$pkg}) { 1232 if ($path =~ $EXT_MAP{$pkg}[1]) {
1190 my $self = bless cf::map::new, $pkg; 1233 my $self = bless cf::map::new, $pkg;
1191 $self->{path} = $path; $self->path ($path); 1234 $self->{path} = $path; $self->path ($path);
1192 $self->init; # pass $1 etc. 1235 $self->init; # pass $1 etc.
1193 return $self; 1236 return $self;
1194 } 1237 }
1195 } 1238 }
1196 1239
1197 Carp::carp "unable to resolve path '$path'."; 1240 Carp::carp "unable to resolve path '$path' (base '$base').";
1198 () 1241 ()
1199} 1242}
1200 1243
1201sub init { 1244sub init {
1202 my ($self) = @_; 1245 my ($self) = @_;
… …
1217 1260
1218# the original (read-only) location 1261# the original (read-only) location
1219sub load_path { 1262sub load_path {
1220 my ($self) = @_; 1263 my ($self) = @_;
1221 1264
1222 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1265 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1223} 1266}
1224 1267
1225# the temporary/swap location 1268# the temporary/swap location
1226sub save_path { 1269sub save_path {
1227 my ($self) = @_; 1270 my ($self) = @_;
1228 1271
1229 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1272 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1230 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1273 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1231} 1274}
1232 1275
1233# the unique path, undef == no special unique path 1276# the unique path, undef == no special unique path
1234sub uniq_path { 1277sub uniq_path {
1235 my ($self) = @_; 1278 my ($self) = @_;
… …
1249 1292
1250sub unlink_save { 1293sub unlink_save {
1251 my ($self) = @_; 1294 my ($self) = @_;
1252 1295
1253 utf8::encode (my $save = $self->save_path); 1296 utf8::encode (my $save = $self->save_path);
1254 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1297 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1255 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1298 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1299
1300 #d#TODO remove .map and also nuke
1301 $save =~ s/\.map// or return;#d#
1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1303 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1256} 1304}
1257 1305
1258sub load_header_from($) { 1306sub load_header_from($) {
1259 my ($self, $path) = @_; 1307 my ($self, $path) = @_;
1260 1308
1261 utf8::encode $path; 1309 utf8::encode $path;
1262 aio_open $path, O_RDONLY, 0 1310 #aio_open $path, O_RDONLY, 0
1263 or return; 1311 # or return;
1264 1312
1265 $self->_load_header ($path) 1313 $self->_load_header ($path)
1266 or return; 1314 or return;
1267 1315
1268 $self->{load_path} = $path; 1316 $self->{load_path} = $path;
1269 1317
1270 1 1318 1
1271} 1319}
1272 1320
1273sub load_orig { 1321sub load_header_orig {
1274 my ($self) = @_; 1322 my ($self) = @_;
1275 1323
1276 $self->load_header_from ($self->load_path) 1324 $self->load_header_from ($self->load_path)
1277} 1325}
1278 1326
1279sub load_temp { 1327sub load_header_temp {
1280 my ($self) = @_; 1328 my ($self) = @_;
1281 1329
1282 $self->load_header_from ($self->save_path) 1330 $self->load_header_from ($self->save_path)
1331}
1332
1333sub prepare_temp {
1334 my ($self) = @_;
1335
1336 $self->last_access ((delete $self->{last_access})
1337 || $cf::RUNTIME); #d#
1338 # safety
1339 $self->{instantiate_time} = $cf::RUNTIME
1340 if $self->{instantiate_time} > $cf::RUNTIME;
1341}
1342
1343sub prepare_orig {
1344 my ($self) = @_;
1345
1346 $self->{load_original} = 1;
1347 $self->{instantiate_time} = $cf::RUNTIME;
1348 $self->last_access ($cf::RUNTIME);
1349 $self->instantiate;
1283} 1350}
1284 1351
1285sub load_header { 1352sub load_header {
1286 my ($self) = @_; 1353 my ($self) = @_;
1287 1354
1288 if ($self->load_temp) { 1355 if ($self->load_header_temp) {
1289 $self->last_access ((delete $self->{last_access}) 1356 $self->prepare_temp;
1290 || $cf::RUNTIME); #d#
1291 # safety
1292 $self->{instantiate_time} = $cf::RUNTIME
1293 if $self->{instantiate_time} > $cf::RUNTIME;
1294 } else { 1357 } else {
1295 $self->load_orig 1358 $self->load_header_orig
1296 or return; 1359 or return;
1297 1360 $self->prepare_orig;
1298 $self->{load_original} = 1;
1299 $self->{instantiate_time} = $cf::RUNTIME;
1300 $self->last_access ($cf::RUNTIME);
1301 $self->instantiate;
1302 } 1361 }
1303 1362
1304 1 1363 1
1305} 1364}
1306 1365
… …
1320 $map->{last_save} = $cf::RUNTIME; 1379 $map->{last_save} = $cf::RUNTIME;
1321 1380
1322 $map->load_header 1381 $map->load_header
1323 or return; 1382 or return;
1324 1383
1325 if ($map->should_reset) { 1384 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1385 # doing this can freeze the server in a sync job, obviously
1386 #$cf::WAIT_FOR_TICK->wait;
1326 $map->reset; 1387 $map->reset;
1327 undef $guard; 1388 undef $guard;
1328 $map = find $path 1389 return find $path;
1329 or return;
1330 } 1390 }
1331 1391
1332 $cf::MAP{$path} = $map 1392 $cf::MAP{$path} = $map
1333 } 1393 }
1334} 1394}
1395
1396sub pre_load { }
1397sub post_load { }
1335 1398
1336sub load { 1399sub load {
1337 my ($self) = @_; 1400 my ($self) = @_;
1338 1401
1402 local $self->{deny_reset} = 1; # loading can take a long time
1403
1339 my $path = $self->{path}; 1404 my $path = $self->{path};
1340 my $guard = cf::lock_acquire "map_load:$path"; 1405 my $guard = cf::lock_acquire "map_load:$path";
1341 1406
1342 return if $self->in_memory != cf::MAP_SWAPPED; 1407 return if $self->in_memory != cf::MAP_SWAPPED;
1343 1408
1344 $self->in_memory (cf::MAP_LOADING); 1409 $self->in_memory (cf::MAP_LOADING);
1345 1410
1346 $self->alloc; 1411 $self->alloc;
1412
1413 $self->pre_load;
1414
1347 $self->_load_objects ($self->{load_path}, 1) 1415 $self->_load_objects ($self->{load_path}, 1)
1348 or return; 1416 or return;
1349 1417
1350 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1418 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1351 if delete $self->{load_original}; 1419 if delete $self->{load_original};
… …
1373 unless $self->difficulty; 1441 unless $self->difficulty;
1374 Coro::cede; 1442 Coro::cede;
1375 $self->activate; 1443 $self->activate;
1376 } 1444 }
1377 1445
1446 $self->post_load;
1447
1378 $self->in_memory (cf::MAP_IN_MEMORY); 1448 $self->in_memory (cf::MAP_IN_MEMORY);
1379} 1449}
1380 1450
1381sub customise_for { 1451sub customise_for {
1382 my ($self, $ob) = @_; 1452 my ($self, $ob) = @_;
… …
1422 1492
1423 cf::sync_job { $map->load }; 1493 cf::sync_job { $map->load };
1424} 1494}
1425 1495
1426our %MAP_PREFETCH; 1496our %MAP_PREFETCH;
1427our $MAP_PREFETCHER = Coro::async { 1497our $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 1498
1440sub find_async { 1499sub find_async {
1441 my ($path, $origin) = @_; 1500 my ($path, $origin) = @_;
1442 1501
1443 $path = normalise $path, $origin && $origin->{path}; 1502 $path = normalise $path, $origin && $origin->{path};
1444 1503
1445 if (my $map = $cf::MAP{$path}) { 1504 if (my $map = $cf::MAP{$path}) {
1446 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1505 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1447 } 1506 }
1448 1507
1449 $MAP_PREFETCH{$path} = 0; 1508 undef $MAP_PREFETCH{$path};
1509 $MAP_PREFETCHER ||= cf::async {
1510 while (%MAP_PREFETCH) {
1511 for my $path (keys %MAP_PREFETCH) {
1512 my $map = find $path
1513 or next;
1514 $map->load;
1515
1516 delete $MAP_PREFETCH{$path};
1517 }
1518 }
1519 undef $MAP_PREFETCHER;
1520 };
1450 $MAP_PREFETCHER->ready; 1521 $MAP_PREFETCHER->prio (6);
1451 1522
1452 () 1523 ()
1453} 1524}
1454 1525
1455sub save { 1526sub save {
… …
1515 my ($self) = @_; 1586 my ($self) = @_;
1516 1587
1517 $self->reset_at <= $cf::RUNTIME 1588 $self->reset_at <= $cf::RUNTIME
1518} 1589}
1519 1590
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 { 1591sub reset {
1535 my ($self) = @_; 1592 my ($self) = @_;
1536 1593
1537 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1594 my $lock = cf::lock_acquire "map_data:$self->{path}";
1538 1595
… …
1555my $nuke_counter = "aaaa"; 1612my $nuke_counter = "aaaa";
1556 1613
1557sub nuke { 1614sub nuke {
1558 my ($self) = @_; 1615 my ($self) = @_;
1559 1616
1617 delete $cf::MAP{$self->path};
1618
1619 $self->unlink_save;
1620
1621 bless $self, "cf::map";
1622 delete $self->{deny_reset};
1560 $self->{deny_save} = 1; 1623 $self->{deny_save} = 1;
1561 $self->reset_timeout (1); 1624 $self->reset_timeout (1);
1562 $self->rename ("{nuke}/" . ($nuke_counter++)); 1625 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1626
1627 $cf::MAP{$self->path} = $self;
1628
1563 $self->reset; # polite request, might not happen 1629 $self->reset; # polite request, might not happen
1564} 1630}
1565 1631
1566=item cf::map::unique_maps 1632=item cf::map::unique_maps
1567 1633
… …
1579 for (@$files) { 1645 for (@$files) {
1580 utf8::decode $_; 1646 utf8::decode $_;
1581 next if /\.pst$/; 1647 next if /\.pst$/;
1582 next unless /^$PATH_SEP/o; 1648 next unless /^$PATH_SEP/o;
1583 1649
1584 s/\.map$//; 1650 push @paths, cf::map::normalise $_;
1585 push @paths, $_;
1586 } 1651 }
1587 1652
1588 \@paths 1653 \@paths
1589} 1654}
1590 1655
… …
1684=cut 1749=cut
1685 1750
1686sub link_map { 1751sub link_map {
1687 unless ($LINK_MAP) { 1752 unless ($LINK_MAP) {
1688 $LINK_MAP = cf::map::find "{link}" 1753 $LINK_MAP = cf::map::find "{link}"
1689 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1754 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1690 $LINK_MAP->load; 1755 $LINK_MAP->load;
1691 } 1756 }
1692 1757
1693 $LINK_MAP 1758 $LINK_MAP
1694} 1759}
… …
1701 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1766 return if UNIVERSAL::isa $self->map, "ext::map_link";
1702 1767
1703 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1768 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1704 if $self->map; 1769 if $self->map;
1705 1770
1706 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1771 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1707} 1772}
1708 1773
1709sub cf::object::player::leave_link { 1774sub cf::object::player::leave_link {
1710 my ($self, $map, $x, $y) = @_; 1775 my ($self, $map, $x, $y) = @_;
1711 1776
… …
1778 my ($self, $path, $x, $y) = @_; 1843 my ($self, $path, $x, $y) = @_;
1779 1844
1780 $self->enter_link; 1845 $self->enter_link;
1781 1846
1782 (async { 1847 (async {
1848 my $map = eval {
1783 my $map = cf::map::find $path; 1849 my $map = cf::map::find $path;
1784 $map = $map->customise_for ($self) if $map; 1850 $map = $map->customise_for ($self) if $map;
1785 1851 $map
1786# warn "entering ", $map->path, " at ($x, $y)\n" 1852 } or
1787# if $map;
1788
1789 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1853 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1790 1854
1791 $self->leave_link ($map, $x, $y); 1855 $self->leave_link ($map, $x, $y);
1792 })->prio (1); 1856 })->prio (1);
1793} 1857}
1794 1858
… …
1798 1862
1799sub parse_random_map_params { 1863sub parse_random_map_params {
1800 my ($spec) = @_; 1864 my ($spec) = @_;
1801 1865
1802 my $rmp = { # defaults 1866 my $rmp = { # defaults
1803 xsize => 10, 1867 xsize => (cf::rndm 15, 40),
1804 ysize => 10, 1868 ysize => (cf::rndm 15, 40),
1869 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1870 #layout => string,
1805 }; 1871 };
1806 1872
1807 for (split /\n/, $spec) { 1873 for (split /\n/, $spec) {
1808 my ($k, $v) = split /\s+/, $_, 2; 1874 my ($k, $v) = split /\s+/, $_, 2;
1809 1875
… …
1813 $rmp 1879 $rmp
1814} 1880}
1815 1881
1816sub prepare_random_map { 1882sub prepare_random_map {
1817 my ($exit) = @_; 1883 my ($exit) = @_;
1884
1885 my $guard = cf::lock_acquire "exit_prepare:$exit";
1818 1886
1819 # all this does is basically replace the /! path by 1887 # all this does is basically replace the /! path by
1820 # a new random map path (?random/...) with a seed 1888 # a new random map path (?random/...) with a seed
1821 # that depends on the exit object 1889 # that depends on the exit object
1822 1890
1823 my $rmp = parse_random_map_params $exit->msg; 1891 my $rmp = parse_random_map_params $exit->msg;
1824 1892
1825 if ($exit->map) { 1893 if ($exit->map) {
1826 $rmp->{region} = $exit->map->region_name; 1894 $rmp->{region} = $exit->region->name;
1827 $rmp->{origin_map} = $exit->map->path; 1895 $rmp->{origin_map} = $exit->map->path;
1828 $rmp->{origin_x} = $exit->x; 1896 $rmp->{origin_x} = $exit->x;
1829 $rmp->{origin_y} = $exit->y; 1897 $rmp->{origin_y} = $exit->y;
1830 } 1898 }
1831 1899
1832 $rmp->{random_seed} ||= $exit->random_seed; 1900 $rmp->{random_seed} ||= $exit->random_seed;
1833 1901
1834 my $data = cf::to_json $rmp; 1902 my $data = cf::to_json $rmp;
1835 my $md5 = Digest::MD5::md5_hex $data; 1903 my $md5 = Digest::MD5::md5_hex $data;
1904 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1836 1905
1837 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1906 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1838 aio_write $fh, 0, (length $data), $data, 0; 1907 aio_write $fh, 0, (length $data), $data, 0;
1908 undef $fh;
1909 aio_rename "$meta~", $meta;
1839 1910
1840 $exit->slaying ("?random/$md5"); 1911 $exit->slaying ("?random/$md5");
1841 $exit->msg (undef); 1912 $exit->msg (undef);
1842 } 1913 }
1843} 1914}
1844 1915
1845sub cf::object::player::enter_exit { 1916sub cf::object::player::enter_exit {
1846 my ($self, $exit) = @_; 1917 my ($self, $exit) = @_;
1847 1918
1848 return unless $self->type == cf::PLAYER; 1919 return unless $self->type == cf::PLAYER;
1920
1921 if ($exit->slaying eq "/!") {
1922 #TODO: this should de-fi-ni-te-ly not be a sync-job
1923 cf::sync_job { prepare_random_map $exit };
1924 }
1925
1926 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1927 my $hp = $exit->stats->hp;
1928 my $sp = $exit->stats->sp;
1849 1929
1850 $self->enter_link; 1930 $self->enter_link;
1851 1931
1852 (async { 1932 (async {
1853 $self->deactivate_recursive; # just to be sure 1933 $self->deactivate_recursive; # just to be sure
1854 unless (eval { 1934 unless (eval {
1855 prepare_random_map $exit 1935 $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 1936
1861 1; 1937 1;
1862 }) { 1938 }) {
1863 $self->message ("Something went wrong deep within the crossfire server. " 1939 $self->message ("Something went wrong deep within the crossfire server. "
1864 . "I'll try to bring you back to the map you were before. " 1940 . "I'll try to bring you back to the map you were before. "
… …
2153 sub db_sync() { 2229 sub db_sync() {
2154 db_save if $dirty; 2230 db_save if $dirty;
2155 undef $dirty; 2231 undef $dirty;
2156 } 2232 }
2157 2233
2158 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2234 my $idle = Event->idle (
2159 db_sync; 2235 reentrant => 0,
2236 min => 10,
2237 max => 20,
2238 repeat => 0,
2239 data => WF_AUTOCANCEL,
2240 cb => \&db_sync,
2160 }); 2241 );
2161 2242
2162 sub db_dirty() { 2243 sub db_dirty() {
2163 $dirty = 1; 2244 $dirty = 1;
2164 $idle->start; 2245 $idle->start;
2165 } 2246 }
… …
2213 2294
2214sub main { 2295sub main {
2215 # we must not ever block the main coroutine 2296 # we must not ever block the main coroutine
2216 local $Coro::idle = sub { 2297 local $Coro::idle = sub {
2217 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2298 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2299 (async {
2218 async { Event::one_event }; 2300 Event::one_event;
2301 })->prio (Coro::PRIO_MAX);
2219 }; 2302 };
2220 2303
2221 cfg_load; 2304 cfg_load;
2222 db_load; 2305 db_load;
2223 load_extensions; 2306 load_extensions;
2307
2308 $TICK_WATCHER->start;
2224 Event::loop; 2309 Event::loop;
2225} 2310}
2226 2311
2227############################################################################# 2312#############################################################################
2228# initialisation and cleanup 2313# initialisation and cleanup
2229 2314
2230# install some emergency cleanup handlers 2315# install some emergency cleanup handlers
2231BEGIN { 2316BEGIN {
2232 for my $signal (qw(INT HUP TERM)) { 2317 for my $signal (qw(INT HUP TERM)) {
2233 Event->signal ( 2318 Event->signal (
2319 reentrant => 0,
2234 data => WF_AUTOCANCEL, 2320 data => WF_AUTOCANCEL,
2235 signal => $signal, 2321 signal => $signal,
2322 prio => 0,
2236 cb => sub { 2323 cb => sub {
2237 cf::cleanup "SIG$signal"; 2324 cf::cleanup "SIG$signal";
2238 }, 2325 },
2239 ); 2326 );
2240 } 2327 }
2241} 2328}
… …
2270} 2357}
2271 2358
2272sub reload() { 2359sub reload() {
2273 # can/must only be called in main 2360 # can/must only be called in main
2274 if ($Coro::current != $Coro::main) { 2361 if ($Coro::current != $Coro::main) {
2275 warn "can only reload from main coroutine\n"; 2362 warn "can only reload from main coroutine";
2276 return; 2363 return;
2277 } 2364 }
2278 2365
2279 warn "reloading..."; 2366 warn "reloading...";
2280 2367
2281 warn "freezing server"; 2368 warn "cancelling server ticker";
2282 my $guard = freeze_mainloop; 2369 $TICK_WATCHER->cancel;
2370
2283 cf::emergency_save; 2371 cf::emergency_save;
2284
2285 warn "sync database to disk";
2286 cf::db_sync;
2287 IO::AIO::flush;
2288 2372
2289 eval { 2373 eval {
2290 # if anything goes wrong in here, we should simply crash as we already saved 2374 # if anything goes wrong in here, we should simply crash as we already saved
2291 2375
2376 warn "syncing database to disk";
2377 cf::db_sync;
2378
2292 warn "cancel all watchers"; 2379 warn "cancelling all WF_AUTOCANCEL watchers";
2293 for (Event::all_watchers) { 2380 for (Event::all_watchers) {
2294 $_->cancel if $_->data & WF_AUTOCANCEL; 2381 $_->cancel if $_->data & WF_AUTOCANCEL;
2295 } 2382 }
2296 2383
2384 warn "flushing outstanding aio requests";
2385 for (;;) {
2386 IO::AIO::flush;
2387 Coro::cede;
2388 last unless IO::AIO::nreqs;
2389 warn "iterate...";
2390 }
2391
2297 warn "cancel all extension coros"; 2392 warn "cancelling all extension coros";
2298 $_->cancel for values %EXT_CORO; 2393 $_->cancel for values %EXT_CORO;
2299 %EXT_CORO = (); 2394 %EXT_CORO = ();
2300 2395
2301 warn "remove commands"; 2396 warn "removing commands";
2302 %COMMAND = (); 2397 %COMMAND = ();
2303 2398
2304 warn "remove ext commands"; 2399 warn "removing ext commands";
2305 %EXTCMD = (); 2400 %EXTCMD = ();
2306 2401
2307 warn "unload/nuke all extensions"; 2402 warn "unloading/nuking all extensions";
2308 for my $pkg (@EXTS) { 2403 for my $pkg (@EXTS) {
2309 warn "... unloading $pkg"; 2404 warn "... unloading $pkg";
2310 2405
2311 if (my $cb = $pkg->can ("unload")) { 2406 if (my $cb = $pkg->can ("unload")) {
2312 eval { 2407 eval {
… …
2317 2412
2318 warn "... nuking $pkg"; 2413 warn "... nuking $pkg";
2319 Symbol::delete_package $pkg; 2414 Symbol::delete_package $pkg;
2320 } 2415 }
2321 2416
2322 warn "unload all perl modules loaded from $LIBDIR"; 2417 warn "unloading all perl modules loaded from $LIBDIR";
2323 while (my ($k, $v) = each %INC) { 2418 while (my ($k, $v) = each %INC) {
2324 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2419 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2325 2420
2326 warn "removing <$k>"; 2421 warn "... unloading $k";
2327 delete $INC{$k}; 2422 delete $INC{$k};
2328 2423
2329 $k =~ s/\.pm$//; 2424 $k =~ s/\.pm$//;
2330 $k =~ s/\//::/g; 2425 $k =~ s/\//::/g;
2331 2426
… …
2334 } 2429 }
2335 2430
2336 Symbol::delete_package $k; 2431 Symbol::delete_package $k;
2337 } 2432 }
2338 2433
2339 warn "get rid of safe::, as good as possible"; 2434 warn "getting rid of safe::, as good as possible";
2340 Symbol::delete_package "safe::$_" 2435 Symbol::delete_package "safe::$_"
2341 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2436 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2342 2437
2343 warn "unload cf.pm \"a bit\""; 2438 warn "unloading cf.pm \"a bit\"";
2344 delete $INC{"cf.pm"}; 2439 delete $INC{"cf.pm"};
2345 2440
2346 # don't, removes xs symbols, too, 2441 # don't, removes xs symbols, too,
2347 # and global variables created in xs 2442 # and global variables created in xs
2348 #Symbol::delete_package __PACKAGE__; 2443 #Symbol::delete_package __PACKAGE__;
2349 2444
2445 warn "unload completed, starting to reload now";
2446
2350 warn "reloading cf.pm"; 2447 warn "reloading cf.pm";
2351 require cf; 2448 require cf;
2352 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2449 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2353 2450
2354 warn "load config and database again"; 2451 warn "loading config and database again";
2355 cf::cfg_load; 2452 cf::cfg_load;
2356 cf::db_load; 2453 cf::db_load;
2357 2454
2358 warn "load extensions"; 2455 warn "loading extensions";
2359 cf::load_extensions; 2456 cf::load_extensions;
2360 2457
2361 warn "reattach attachments to objects/players"; 2458 warn "reattaching attachments to objects/players";
2362 _global_reattach; 2459 _global_reattach;
2363 warn "reattach attachments to maps"; 2460 warn "reattaching attachments to maps";
2364 reattach $_ for values %MAP; 2461 reattach $_ for values %MAP;
2462
2463 warn "restarting server ticker";
2464
2465 $TICK_WATCHER->start;
2365 }; 2466 };
2366 2467
2367 if ($@) { 2468 if ($@) {
2368 warn $@; 2469 warn $@;
2369 warn "error while reloading, exiting."; 2470 warn "error while reloading, exiting.";
… …
2371 } 2472 }
2372 2473
2373 warn "reloaded"; 2474 warn "reloaded";
2374}; 2475};
2375 2476
2477our $RELOAD_WATCHER; # used only during reload
2478
2376register_command "reload" => sub { 2479register_command "reload" => sub {
2377 my ($who, $arg) = @_; 2480 my ($who, $arg) = @_;
2378 2481
2379 if ($who->flag (FLAG_WIZ)) { 2482 if ($who->flag (FLAG_WIZ)) {
2380 $who->message ("start of reload."); 2483 $who->message ("reloading server.");
2484
2485 # doing reload synchronously and two reloads happen back-to-back,
2486 # coro crashes during coro_state_free->destroy here.
2487
2488 $RELOAD_WATCHER ||= Event->timer (
2489 reentrant => 0,
2490 after => 0,
2491 data => WF_AUTOCANCEL,
2492 cb => sub {
2381 reload; 2493 reload;
2382 $who->message ("end of reload."); 2494 undef $RELOAD_WATCHER;
2495 },
2496 );
2383 } 2497 }
2384}; 2498};
2385 2499
2386unshift @INC, $LIBDIR; 2500unshift @INC, $LIBDIR;
2501
2502my $bug_warning = 0;
2387 2503
2388$TICK_WATCHER = Event->timer ( 2504$TICK_WATCHER = Event->timer (
2389 reentrant => 0, 2505 reentrant => 0,
2506 parked => 1,
2390 prio => 0, 2507 prio => 0,
2391 at => $NEXT_TICK || $TICK, 2508 at => $NEXT_TICK || $TICK,
2392 data => WF_AUTOCANCEL, 2509 data => WF_AUTOCANCEL,
2393 cb => sub { 2510 cb => sub {
2511 if ($Coro::current != $Coro::main) {
2512 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2513 unless ++$bug_warning > 10;
2514 return;
2515 }
2516
2394 $NOW = Event::time; 2517 $NOW = Event::time;
2395 2518
2396 cf::server_tick; # one server iteration 2519 cf::server_tick; # one server iteration
2397 $RUNTIME += $TICK; 2520 $RUNTIME += $TICK;
2398 $NEXT_TICK += $TICK; 2521 $NEXT_TICK += $TICK;
2399 2522
2400 $WAIT_FOR_TICK->broadcast; 2523 $WAIT_FOR_TICK->broadcast;
2401 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2524 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2525
2526 Event::sweep;
2527 Coro::cede_notself;
2528
2529# my $AFTER = Event::time;
2530# warn $AFTER - $NOW;#d#
2402 2531
2403 # if we are delayed by four ticks or more, skip them all 2532 # if we are delayed by four ticks or more, skip them all
2404 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2533 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2405 2534
2406 $TICK_WATCHER->at ($NEXT_TICK); 2535 $TICK_WATCHER->at ($NEXT_TICK);
2407 $TICK_WATCHER->start; 2536 $TICK_WATCHER->start;
2408 }, 2537 },
2409); 2538);
2410 2539
2411IO::AIO::max_poll_time $TICK * 0.2; 2540IO::AIO::max_poll_time $TICK * 0.1;
2412 2541
2542undef $Coro::AIO::WATCHER;
2413$AIO_POLL_WATCHER = Event->io ( 2543$AIO_POLL_WATCHER = Event->io (
2544 reentrant => 0,
2414 fd => IO::AIO::poll_fileno, 2545 fd => IO::AIO::poll_fileno,
2415 poll => 'r', 2546 poll => 'r',
2416 prio => 5, 2547 prio => 6,
2417 data => WF_AUTOCANCEL, 2548 data => WF_AUTOCANCEL,
2418 cb => \&IO::AIO::poll_cb, 2549 cb => \&IO::AIO::poll_cb,
2419); 2550);
2420 2551
2421$WRITE_RUNTIME_WATCHER = Event->timer ( 2552$WRITE_RUNTIME_WATCHER = Event->timer (
2553 reentrant => 0,
2422 data => WF_AUTOCANCEL, 2554 data => WF_AUTOCANCEL,
2423 after => 0, 2555 after => 1,
2424 interval => 10, 2556 interval => 10,
2425 cb => sub { 2557 prio => 6, # keep it lowest so it acts like a watchdog
2426 (Coro::unblock_sub { 2558 cb => Coro::unblock_sub {
2427 write_runtime 2559 write_runtime
2428 or warn "ERROR: unable to write runtime file: $!"; 2560 or warn "ERROR: unable to write runtime file: $!";
2429 })->();
2430 }, 2561 },
2431); 2562);
2432 2563
2433END { cf::emergency_save } 2564END { cf::emergency_save }
2434 2565

Diff Legend

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