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.184 by root, Fri Jan 19 22:47:57 2007 UTC vs.
Revision 1.218 by root, Sat Feb 17 01:58:55 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.4 (); 13use Coro 3.5 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use BDB ();
20use Data::Dumper; 21use Data::Dumper;
21use Digest::MD5; 22use Digest::MD5;
22use Fcntl; 23use Fcntl;
23use IO::AIO 2.32 (); 24use IO::AIO 2.32 ();
24use YAML::Syck (); 25use YAML::Syck ();
25use Time::HiRes; 26use Time::HiRes;
27use Compress::LZF;
28
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
26 30
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 31use Event; $Event::Eval = 1; # no idea why this is required, but it is
28 32
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 34
… …
45our $LIBDIR = datadir . "/ext"; 49our $LIBDIR = datadir . "/ext";
46 50
47our $TICK = MAX_TIME * 1e-6; 51our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 52our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 53our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 54our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 55our $NEXT_TICK;
52our $NOW; 56our $NOW;
57our $USE_FSYNC = 1; # use fsync to write maps - default off
58
59our $BDB_POLL_WATCHER;
60our $DB_ENV;
53 61
54our %CFG; 62our %CFG;
55 63
56our $UPTIME; $UPTIME ||= time; 64our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 65our $RUNTIME;
58 66
59our %PLAYER; # all users 67our %PLAYER; # all users
60our %MAP; # all maps 68our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 69our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 70our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db";
63 72
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 75
67# used to convert map paths into valid unix filenames by replacing / by ∕ 76# used to convert map paths into valid unix filenames by replacing / by ∕
… …
80mkdir cf::localdir; 89mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 90mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 91mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 92mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
85 95
86our $EMERGENCY_POSITION; 96our $EMERGENCY_POSITION;
97
98sub cf::map::normalise;
87 99
88############################################################################# 100#############################################################################
89 101
90=head2 GLOBAL VARIABLES 102=head2 GLOBAL VARIABLES
91 103
… …
261sub freeze_mainloop { 273sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 274 return unless $TICK_WATCHER->is_active;
263 275
264 my $guard = Coro::guard { 276 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 277 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 278 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 279 $TICK_WATCHER->stop;
270 $guard 280 $guard
271} 281}
272 282
273=item cf::async { BLOCK } 283=item cf::async { BLOCK }
… …
349 my $runtime = cf::localdir . "/runtime"; 359 my $runtime = cf::localdir . "/runtime";
350 360
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 362 or return;
353 363
364 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 365 # 10 is the runtime save interval, for a monotonic clock
366 # 60 allows for the watchdog to kill the server.
367
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 368 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 369 and return;
357 370
371 # always fsync - this file is important
358 aio_fsync $fh 372 aio_fsync $fh
359 and return; 373 and return;
360 374
361 close $fh 375 close $fh
362 or return; 376 or return;
… …
747 $filename, length $$rdata, scalar @$objs; 761 $filename, length $$rdata, scalar @$objs;
748 762
749 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 763 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
750 chmod SAVE_MODE, $fh; 764 chmod SAVE_MODE, $fh;
751 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 765 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
752 aio_fsync $fh; 766 aio_fsync $fh if $cf::USE_FSYNC;
753 close $fh; 767 close $fh;
754 768
755 if (@$objs) { 769 if (@$objs) {
756 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 770 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
757 chmod SAVE_MODE, $fh; 771 chmod SAVE_MODE, $fh;
758 my $data = Storable::nfreeze { version => 1, objs => $objs }; 772 my $data = Storable::nfreeze { version => 1, objs => $objs };
759 aio_write $fh, 0, (length $data), $data, 0; 773 aio_write $fh, 0, (length $data), $data, 0;
760 aio_fsync $fh; 774 aio_fsync $fh if $cf::USE_FSYNC;
761 close $fh; 775 close $fh;
762 aio_rename "$filename.pst~", "$filename.pst"; 776 aio_rename "$filename.pst~", "$filename.pst";
763 } 777 }
764 } else { 778 } else {
765 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
… …
1065=cut 1079=cut
1066 1080
1067sub maps($) { 1081sub maps($) {
1068 my ($pl) = @_; 1082 my ($pl) = @_;
1069 1083
1084 $pl = ref $pl ? $pl->ob->name : $pl;
1085
1070 my $files = aio_readdir playerdir $pl 1086 my $files = aio_readdir playerdir $pl
1071 or return; 1087 or return;
1072 1088
1073 my @paths; 1089 my @paths;
1074 1090
1075 for (@$files) { 1091 for (@$files) {
1076 utf8::decode $_; 1092 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1093 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1094 next unless /^$PATH_SEP/o;
1079 1095
1080 s/\.map$//; 1096 push @paths, cf::map::normalise "~$pl/$_";
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 } 1097 }
1083 1098
1084 \@paths 1099 \@paths
1085} 1100}
1086 1101
… …
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1152 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1153 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1154 )
1140} 1155}
1141 1156
1157=item cf::map->register ($regex, $prio)
1158
1159Register a handler for the map path matching the given regex at the
1160givne priority (higher is better, built-in handlers have priority 0, the
1161default).
1162
1163=cut
1164
1142sub register { 1165sub register {
1143 my (undef, $regex) = @_; 1166 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1167 my $pkg = caller;
1145 1168
1146 no strict; 1169 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1170 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1171
1149 $EXT_MAP{$pkg} = qr<$regex>; 1172 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1173}
1151 1174
1152# also paths starting with '/' 1175# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1176$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1177
1155sub thawer_merge { 1178sub thawer_merge {
1156 my ($self, $merge) = @_; 1179 my ($self, $merge) = @_;
1157 1180
1158 # we have to keep some variables in memory intact 1181 # we have to keep some variables in memory intact
… …
1164 $self->SUPER::thawer_merge ($merge); 1187 $self->SUPER::thawer_merge ($merge);
1165} 1188}
1166 1189
1167sub normalise { 1190sub normalise {
1168 my ($path, $base) = @_; 1191 my ($path, $base) = @_;
1192
1193 $path = "$path"; # make sure its a string
1194
1195 $path =~ s/\.map$//;
1169 1196
1170 # map plan: 1197 # map plan:
1171 # 1198 #
1172 # /! non-realised random map exit (special hack!) 1199 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched 1200 # {... are special paths that are not being touched
… …
1201 1228
1202 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1229 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1203 1230
1204 $path = normalise $path, $base; 1231 $path = normalise $path, $base;
1205 1232
1206 for my $pkg (keys %EXT_MAP) { 1233 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1234 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1235 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1236 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1237 $self->init; # pass $1 etc.
1211 return $self; 1238 return $self;
1212 } 1239 }
1213 } 1240 }
1214 1241
1215 Carp::carp "unable to resolve path '$path'."; 1242 Carp::carp "unable to resolve path '$path' (base '$base').";
1216 () 1243 ()
1217} 1244}
1218 1245
1219sub init { 1246sub init {
1220 my ($self) = @_; 1247 my ($self) = @_;
… …
1235 1262
1236# the original (read-only) location 1263# the original (read-only) location
1237sub load_path { 1264sub load_path {
1238 my ($self) = @_; 1265 my ($self) = @_;
1239 1266
1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1267 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1241} 1268}
1242 1269
1243# the temporary/swap location 1270# the temporary/swap location
1244sub save_path { 1271sub save_path {
1245 my ($self) = @_; 1272 my ($self) = @_;
1246 1273
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1274 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1275 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1249} 1276}
1250 1277
1251# the unique path, undef == no special unique path 1278# the unique path, undef == no special unique path
1252sub uniq_path { 1279sub uniq_path {
1253 my ($self) = @_; 1280 my ($self) = @_;
… …
1275 1302
1276sub load_header_from($) { 1303sub load_header_from($) {
1277 my ($self, $path) = @_; 1304 my ($self, $path) = @_;
1278 1305
1279 utf8::encode $path; 1306 utf8::encode $path;
1280 aio_open $path, O_RDONLY, 0 1307 #aio_open $path, O_RDONLY, 0
1281 or return; 1308 # or return;
1282 1309
1283 $self->_load_header ($path) 1310 $self->_load_header ($path)
1284 or return; 1311 or return;
1285 1312
1286 $self->{load_path} = $path; 1313 $self->{load_path} = $path;
1287 1314
1288 1 1315 1
1289} 1316}
1290 1317
1291sub load_orig { 1318sub load_header_orig {
1292 my ($self) = @_; 1319 my ($self) = @_;
1293 1320
1294 $self->load_header_from ($self->load_path) 1321 $self->load_header_from ($self->load_path)
1295} 1322}
1296 1323
1297sub load_temp { 1324sub load_header_temp {
1298 my ($self) = @_; 1325 my ($self) = @_;
1299 1326
1300 $self->load_header_from ($self->save_path) 1327 $self->load_header_from ($self->save_path)
1328}
1329
1330sub prepare_temp {
1331 my ($self) = @_;
1332
1333 $self->last_access ((delete $self->{last_access})
1334 || $cf::RUNTIME); #d#
1335 # safety
1336 $self->{instantiate_time} = $cf::RUNTIME
1337 if $self->{instantiate_time} > $cf::RUNTIME;
1338}
1339
1340sub prepare_orig {
1341 my ($self) = @_;
1342
1343 $self->{load_original} = 1;
1344 $self->{instantiate_time} = $cf::RUNTIME;
1345 $self->last_access ($cf::RUNTIME);
1346 $self->instantiate;
1301} 1347}
1302 1348
1303sub load_header { 1349sub load_header {
1304 my ($self) = @_; 1350 my ($self) = @_;
1305 1351
1306 if ($self->load_temp) { 1352 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1353 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1354 } else {
1313 $self->load_orig 1355 $self->load_header_orig
1314 or return; 1356 or return;
1315 1357 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1358 }
1321 1359
1322 1 1360 1
1323} 1361}
1324 1362
… …
1338 $map->{last_save} = $cf::RUNTIME; 1376 $map->{last_save} = $cf::RUNTIME;
1339 1377
1340 $map->load_header 1378 $map->load_header
1341 or return; 1379 or return;
1342 1380
1343 if ($map->should_reset) { 1381 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1382 # doing this can freeze the server in a sync job, obviously
1344 $cf::WAIT_FOR_TICK->wait; 1383 #$cf::WAIT_FOR_TICK->wait;
1345 $map->reset; 1384 $map->reset;
1346 undef $guard; 1385 undef $guard;
1347 $map = find $path 1386 return find $path;
1348 or return;
1349 } 1387 }
1350 1388
1351 $cf::MAP{$path} = $map 1389 $cf::MAP{$path} = $map
1352 } 1390 }
1353} 1391}
1392
1393sub pre_load { }
1394sub post_load { }
1354 1395
1355sub load { 1396sub load {
1356 my ($self) = @_; 1397 my ($self) = @_;
1357 1398
1399 local $self->{deny_reset} = 1; # loading can take a long time
1400
1358 my $path = $self->{path}; 1401 my $path = $self->{path};
1359 my $guard = cf::lock_acquire "map_load:$path"; 1402 my $guard = cf::lock_acquire "map_load:$path";
1360 1403
1361 return if $self->in_memory != cf::MAP_SWAPPED; 1404 return if $self->in_memory != cf::MAP_SWAPPED;
1362 1405
1363 $self->in_memory (cf::MAP_LOADING); 1406 $self->in_memory (cf::MAP_LOADING);
1364 1407
1365 $self->alloc; 1408 $self->alloc;
1409
1410 $self->pre_load;
1411
1366 $self->_load_objects ($self->{load_path}, 1) 1412 $self->_load_objects ($self->{load_path}, 1)
1367 or return; 1413 or return;
1368 1414
1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1415 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1370 if delete $self->{load_original}; 1416 if delete $self->{load_original};
… …
1392 unless $self->difficulty; 1438 unless $self->difficulty;
1393 Coro::cede; 1439 Coro::cede;
1394 $self->activate; 1440 $self->activate;
1395 } 1441 }
1396 1442
1443 $self->post_load;
1444
1397 $self->in_memory (cf::MAP_IN_MEMORY); 1445 $self->in_memory (cf::MAP_IN_MEMORY);
1398} 1446}
1399 1447
1400sub customise_for { 1448sub customise_for {
1401 my ($self, $ob) = @_; 1449 my ($self, $ob) = @_;
… …
1465 delete $MAP_PREFETCH{$path}; 1513 delete $MAP_PREFETCH{$path};
1466 } 1514 }
1467 } 1515 }
1468 undef $MAP_PREFETCHER; 1516 undef $MAP_PREFETCHER;
1469 }; 1517 };
1518 $MAP_PREFETCHER->prio (6);
1470 1519
1471 () 1520 ()
1472} 1521}
1473 1522
1474sub save { 1523sub save {
… …
1544 return if $self->players; 1593 return if $self->players;
1545 return if $self->isa ("ext::map_per_player");#d# 1594 return if $self->isa ("ext::map_per_player");#d#
1546 1595
1547 warn "resetting map ", $self->path;#d# 1596 warn "resetting map ", $self->path;#d#
1548 1597
1598 $self->in_memory (cf::MAP_SWAPPED);
1599
1600 # need to save uniques path
1601 unless ($self->{deny_save}) {
1602 my $uniq = $self->uniq_path; utf8::encode $uniq;
1603
1604 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1605 if $uniq;
1606 }
1607
1549 delete $cf::MAP{$self->path}; 1608 delete $cf::MAP{$self->path};
1550 1609
1551 $self->in_memory (cf::MAP_SWAPPED);
1552 $self->clear; 1610 $self->clear;
1553 1611
1554 $_->clear_links_to ($self) for values %cf::MAP; 1612 $_->clear_links_to ($self) for values %cf::MAP;
1555 1613
1556 $self->unlink_save; 1614 $self->unlink_save;
… …
1593 for (@$files) { 1651 for (@$files) {
1594 utf8::decode $_; 1652 utf8::decode $_;
1595 next if /\.pst$/; 1653 next if /\.pst$/;
1596 next unless /^$PATH_SEP/o; 1654 next unless /^$PATH_SEP/o;
1597 1655
1598 s/\.map$//; 1656 push @paths, cf::map::normalise $_;
1599 push @paths, $_;
1600 } 1657 }
1601 1658
1602 \@paths 1659 \@paths
1603} 1660}
1604 1661
… …
1698=cut 1755=cut
1699 1756
1700sub link_map { 1757sub link_map {
1701 unless ($LINK_MAP) { 1758 unless ($LINK_MAP) {
1702 $LINK_MAP = cf::map::find "{link}" 1759 $LINK_MAP = cf::map::find "{link}"
1703 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1760 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1704 $LINK_MAP->load; 1761 $LINK_MAP->load;
1705 } 1762 }
1706 1763
1707 $LINK_MAP 1764 $LINK_MAP
1708} 1765}
… …
1715 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1772 return if UNIVERSAL::isa $self->map, "ext::map_link";
1716 1773
1717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1774 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1718 if $self->map; 1775 if $self->map;
1719 1776
1720 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1777 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1721} 1778}
1722 1779
1723sub cf::object::player::leave_link { 1780sub cf::object::player::leave_link {
1724 my ($self, $map, $x, $y) = @_; 1781 my ($self, $map, $x, $y) = @_;
1725 1782
… …
1747 $map->load; 1804 $map->load;
1748 $map->load_diag; 1805 $map->load_diag;
1749 1806
1750 return unless $self->contr->active; 1807 return unless $self->contr->active;
1751 $self->activate_recursive; 1808 $self->activate_recursive;
1809
1810 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1752 $self->enter_map ($map, $x, $y); 1811 $self->enter_map ($map, $x, $y);
1753} 1812}
1754 1813
1755cf::player->attach ( 1814cf::player->attach (
1756 on_logout => sub { 1815 on_logout => sub {
… …
1769 # try to abort aborted map switching on player login :) 1828 # try to abort aborted map switching on player login :)
1770 # should happen only on crashes 1829 # should happen only on crashes
1771 if ($pl->ob->{_link_pos}) { 1830 if ($pl->ob->{_link_pos}) {
1772 $pl->ob->enter_link; 1831 $pl->ob->enter_link;
1773 (async { 1832 (async {
1774 # we need this sleep as the login has a concurrent enter_exit running
1775 # and this sleep increases chances of the player not ending up in scorn
1776 $pl->ob->reply (undef, 1833 $pl->ob->reply (undef,
1777 "There was an internal problem at your last logout, " 1834 "There was an internal problem at your last logout, "
1778 . "the server will try to bring you to your intended destination in a second.", 1835 . "the server will try to bring you to your intended destination in a second.",
1779 cf::NDI_RED); 1836 cf::NDI_RED);
1837 # we need this sleep as the login has a concurrent enter_exit running
1838 # and this sleep increases chances of the player not ending up in scorn
1780 Coro::Timer::sleep 1; 1839 Coro::Timer::sleep 1;
1781 $pl->ob->leave_link; 1840 $pl->ob->leave_link;
1782 })->prio (2); 1841 })->prio (2);
1783 } 1842 }
1784 }, 1843 },
… …
1792 my ($self, $path, $x, $y) = @_; 1851 my ($self, $path, $x, $y) = @_;
1793 1852
1794 $self->enter_link; 1853 $self->enter_link;
1795 1854
1796 (async { 1855 (async {
1856 my $map = eval {
1797 my $map = cf::map::find $path; 1857 my $map = cf::map::find $path;
1798 $map = $map->customise_for ($self) if $map; 1858 $map = $map->customise_for ($self) if $map;
1799 1859 $map
1800# warn "entering ", $map->path, " at ($x, $y)\n" 1860 } or
1801# if $map;
1802
1803 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1861 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1804 1862
1805 $self->leave_link ($map, $x, $y); 1863 $self->leave_link ($map, $x, $y);
1806 })->prio (1); 1864 })->prio (1);
1807} 1865}
1808 1866
… …
1839 # that depends on the exit object 1897 # that depends on the exit object
1840 1898
1841 my $rmp = parse_random_map_params $exit->msg; 1899 my $rmp = parse_random_map_params $exit->msg;
1842 1900
1843 if ($exit->map) { 1901 if ($exit->map) {
1844 $rmp->{region} = $exit->map->region_name; 1902 $rmp->{region} = $exit->region->name;
1845 $rmp->{origin_map} = $exit->map->path; 1903 $rmp->{origin_map} = $exit->map->path;
1846 $rmp->{origin_x} = $exit->x; 1904 $rmp->{origin_x} = $exit->x;
1847 $rmp->{origin_y} = $exit->y; 1905 $rmp->{origin_y} = $exit->y;
1848 } 1906 }
1849 1907
… …
1866sub cf::object::player::enter_exit { 1924sub cf::object::player::enter_exit {
1867 my ($self, $exit) = @_; 1925 my ($self, $exit) = @_;
1868 1926
1869 return unless $self->type == cf::PLAYER; 1927 return unless $self->type == cf::PLAYER;
1870 1928
1929 if ($exit->slaying eq "/!") {
1930 #TODO: this should de-fi-ni-te-ly not be a sync-job
1931 cf::sync_job { prepare_random_map $exit };
1932 }
1933
1934 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1935 my $hp = $exit->stats->hp;
1936 my $sp = $exit->stats->sp;
1937
1871 $self->enter_link; 1938 $self->enter_link;
1872 1939
1873 (async { 1940 (async {
1874 $self->deactivate_recursive; # just to be sure 1941 $self->deactivate_recursive; # just to be sure
1875 unless (eval { 1942 unless (eval {
1876 prepare_random_map $exit 1943 $self->goto ($slaying, $hp, $sp);
1877 if $exit->slaying eq "/!";
1878
1879 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1880 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1881 1944
1882 1; 1945 1;
1883 }) { 1946 }) {
1884 $self->message ("Something went wrong deep within the crossfire server. " 1947 $self->message ("Something went wrong deep within the crossfire server. "
1885 . "I'll try to bring you back to the map you were before. " 1948 . "I'll try to bring you back to the map you were before. "
… …
1946 # get handled first 2009 # get handled first
1947 my $queue = delete $ns->{query_queue} 2010 my $queue = delete $ns->{query_queue}
1948 or return; # be conservative, not sure how that can happen, but we saw a crash here 2011 or return; # be conservative, not sure how that can happen, but we saw a crash here
1949 2012
1950 (shift @$queue)->[1]->($msg); 2013 (shift @$queue)->[1]->($msg);
2014 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1951 2015
1952 push @{ $ns->{query_queue} }, @$queue; 2016 push @{ $ns->{query_queue} }, @$queue;
1953 2017
1954 if (@{ $ns->{query_queue} } == @$queue) { 2018 if (@{ $ns->{query_queue} } == @$queue) {
1955 if (@$queue) { 2019 if (@$queue) {
… …
2116The parameter C<$family> should best start with the name of the extension 2180The parameter C<$family> should best start with the name of the extension
2117using it, it should be unique. 2181using it, it should be unique.
2118 2182
2119=over 4 2183=over 4
2120 2184
2121=item $hashref = cf::db_get $family
2122
2123Return a hashref for use by the extension C<$family>, which can be
2124modified. After modifications, you have to call C<cf::db_dirty> or
2125C<cf::db_sync>.
2126
2127=item $value = cf::db_get $family => $key 2185=item $value = cf::db_get $family => $key
2128 2186
2129Returns a single value from the database 2187Returns a single value from the database.
2130
2131=item cf::db_put $family => $hashref
2132
2133Stores the given family hashref into the database. Updates are delayed, if
2134you want the data to be synced to disk immediately, use C<cf::db_sync>.
2135 2188
2136=item cf::db_put $family => $key => $value 2189=item cf::db_put $family => $key => $value
2137 2190
2138Stores the given C<$value> in the family hash. Updates are delayed, if you 2191Stores the given C<$value> in the family.
2139want the data to be synced to disk immediately, use C<cf::db_sync>.
2140
2141=item cf::db_dirty
2142
2143Marks the database as dirty, to be updated at a later time.
2144
2145=item cf::db_sync
2146
2147Immediately write the database to disk I<if it is dirty>.
2148 2192
2149=cut 2193=cut
2150 2194
2151our $DB; 2195our $DB;
2152 2196
2153{ 2197sub db_init {
2198 unless ($DB) {
2199 $DB = BDB::db_create $DB_ENV;
2200
2201 cf::sync_job {
2202 eval {
2203 $DB->set_flags (BDB::CHKSUM);
2204
2205 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2206 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2207 cf::cleanup "db_open(db): $!" if $!;
2208 };
2209 cf::cleanup "db_open(db): $@" if $@;
2210 };
2211
2154 my $path = cf::localdir . "/database.pst"; 2212 my $path = cf::localdir . "/database.pst";
2213 if (stat $path) {
2214 cf::sync_job {
2215 my $pst = Storable::retrieve $path;
2155 2216
2156 sub db_load() { 2217 cf::db_put (board => data => $pst->{board});
2157 $DB = stat $path ? Storable::retrieve $path : { }; 2218 cf::db_put (guildrules => data => $pst->{guildrules});
2158 } 2219 cf::db_put (rent => balance => $pst->{rent}{balance});
2220 BDB::db_env_txn_checkpoint $DB_ENV;
2159 2221
2160 my $pid; 2222 unlink $path;
2161
2162 sub db_save() {
2163 waitpid $pid, 0 if $pid;
2164 if (0 == ($pid = fork)) {
2165 $DB->{_meta}{version} = 1;
2166 Storable::nstore $DB, "$path~";
2167 rename "$path~", $path;
2168 cf::_exit 0 if defined $pid;
2169 } 2223 };
2170 }
2171
2172 my $dirty;
2173
2174 sub db_sync() {
2175 db_save if $dirty;
2176 undef $dirty;
2177 }
2178
2179 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2180 db_sync;
2181 });
2182
2183 sub db_dirty() {
2184 $dirty = 1;
2185 $idle->start;
2186 }
2187
2188 sub db_get($;$) {
2189 @_ >= 2
2190 ? $DB->{$_[0]}{$_[1]}
2191 : ($DB->{$_[0]} ||= { })
2192 }
2193
2194 sub db_put($$;$) {
2195 if (@_ >= 3) {
2196 $DB->{$_[0]}{$_[1]} = $_[2];
2197 } else {
2198 $DB->{$_[0]} = $_[1];
2199 }
2200 db_dirty;
2201 }
2202
2203 cf::global->attach (
2204 prio => 10000,
2205 on_cleanup => sub {
2206 db_sync;
2207 }, 2224 }
2208 ); 2225 }
2226}
2227
2228sub db_get($$) {
2229 my $key = "$_[0]/$_[1]";
2230
2231 cf::sync_job {
2232 BDB::db_get $DB, undef, $key, my $data;
2233
2234 $! ? ()
2235 : Compress::LZF::sthaw $data
2236 }
2237}
2238
2239sub db_put($$$) {
2240 BDB::dbreq_pri 4;
2241 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2209} 2242}
2210 2243
2211############################################################################# 2244#############################################################################
2212# the server's main() 2245# the server's init and main functions
2246
2247sub init_resources {
2248 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2249 or die "unable to load regions file\n";#d#
2250}
2213 2251
2214sub cfg_load { 2252sub cfg_load {
2215 open my $fh, "<:utf8", cf::confdir . "/config" 2253 open my $fh, "<:utf8", cf::confdir . "/config"
2216 or return; 2254 or return;
2217 2255
… …
2228 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2266 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2229 and die "WARNING: m(un)lockall failed: $!\n"; 2267 and die "WARNING: m(un)lockall failed: $!\n";
2230 }; 2268 };
2231 warn $@ if $@; 2269 warn $@ if $@;
2232 } 2270 }
2271}
2272
2273sub init {
2274 init_resources;
2233} 2275}
2234 2276
2235sub main { 2277sub main {
2236 # we must not ever block the main coroutine 2278 # we must not ever block the main coroutine
2237 local $Coro::idle = sub { 2279 local $Coro::idle = sub {
… …
2240 Event::one_event; 2282 Event::one_event;
2241 })->prio (Coro::PRIO_MAX); 2283 })->prio (Coro::PRIO_MAX);
2242 }; 2284 };
2243 2285
2244 cfg_load; 2286 cfg_load;
2245 db_load; 2287 db_init;
2246 load_extensions; 2288 load_extensions;
2247 2289
2248 $TICK_WATCHER->start; 2290 $TICK_WATCHER->start;
2249 Event::loop; 2291 Event::loop;
2250} 2292}
… …
2254 2296
2255# install some emergency cleanup handlers 2297# install some emergency cleanup handlers
2256BEGIN { 2298BEGIN {
2257 for my $signal (qw(INT HUP TERM)) { 2299 for my $signal (qw(INT HUP TERM)) {
2258 Event->signal ( 2300 Event->signal (
2301 reentrant => 0,
2259 data => WF_AUTOCANCEL, 2302 data => WF_AUTOCANCEL,
2260 signal => $signal, 2303 signal => $signal,
2304 prio => 0,
2261 cb => sub { 2305 cb => sub {
2262 cf::cleanup "SIG$signal"; 2306 cf::cleanup "SIG$signal";
2263 }, 2307 },
2264 ); 2308 );
2265 } 2309 }
2266} 2310}
… …
2287 my $map = $cf::MAP{$path} or next; 2331 my $map = $cf::MAP{$path} or next;
2288 $map->valid or next; 2332 $map->valid or next;
2289 $map->save; 2333 $map->save;
2290 } 2334 }
2291 warn "end emergency map save\n"; 2335 warn "end emergency map save\n";
2336
2337 warn "begin emergency database checkpoint\n";
2338 BDB::db_env_txn_checkpoint $DB_ENV;
2339 warn "end emergency database checkpoint\n";
2292 }; 2340 };
2293 2341
2294 warn "leave emergency perl save\n"; 2342 warn "leave emergency perl save\n";
2343}
2344
2345sub post_cleanup {
2346 my ($make_core) = @_;
2347
2348 warn Carp::longmess "post_cleanup backtrace"
2349 if $make_core;
2295} 2350}
2296 2351
2297sub reload() { 2352sub reload() {
2298 # can/must only be called in main 2353 # can/must only be called in main
2299 if ($Coro::current != $Coro::main) { 2354 if ($Coro::current != $Coro::main) {
… …
2301 return; 2356 return;
2302 } 2357 }
2303 2358
2304 warn "reloading..."; 2359 warn "reloading...";
2305 2360
2306 warn "cancelling server ticker"; 2361 warn "entering sync_job";
2307 $TICK_WATCHER->cancel;
2308 2362
2363 cf::sync_job {
2364 cf::write_runtime; # external watchdog should not bark
2309 cf::emergency_save; 2365 cf::emergency_save;
2366 cf::write_runtime; # external watchdog should not bark
2310 2367
2311 eval { 2368 warn "syncing database to disk";
2369 BDB::db_env_txn_checkpoint $DB_ENV;
2370
2312 # if anything goes wrong in here, we should simply crash as we already saved 2371 # if anything goes wrong in here, we should simply crash as we already saved
2313
2314 warn "syncing database to disk";
2315 cf::db_sync;
2316 2372
2317 warn "cancelling all WF_AUTOCANCEL watchers"; 2373 warn "cancelling all WF_AUTOCANCEL watchers";
2318 for (Event::all_watchers) { 2374 for (Event::all_watchers) {
2319 $_->cancel if $_->data & WF_AUTOCANCEL; 2375 $_->cancel if $_->data & WF_AUTOCANCEL;
2320 } 2376 }
2321 2377
2322 warn "flushing outstanding aio requests"; 2378 warn "flushing outstanding aio requests";
2323 for (;;) { 2379 for (;;) {
2380 BDB::flush;
2324 IO::AIO::flush; 2381 IO::AIO::flush;
2325 Coro::cede; 2382 Coro::cede;
2326 last unless IO::AIO::nreqs; 2383 last unless IO::AIO::nreqs || BDB::nreqs;
2327 warn "iterate..."; 2384 warn "iterate...";
2328 } 2385 }
2329 2386
2330 warn "cancelling all extension coros"; 2387 warn "cancelling all extension coros";
2331 $_->cancel for values %EXT_CORO; 2388 $_->cancel for values %EXT_CORO;
… …
2386 require cf; 2443 require cf;
2387 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2444 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2388 2445
2389 warn "loading config and database again"; 2446 warn "loading config and database again";
2390 cf::cfg_load; 2447 cf::cfg_load;
2391 cf::db_load;
2392 2448
2393 warn "loading extensions"; 2449 warn "loading extensions";
2394 cf::load_extensions; 2450 cf::load_extensions;
2395 2451
2396 warn "reattaching attachments to objects/players"; 2452 warn "reattaching attachments to objects/players";
2397 _global_reattach; 2453 _global_reattach;
2398 warn "reattaching attachments to maps"; 2454 warn "reattaching attachments to maps";
2399 reattach $_ for values %MAP; 2455 reattach $_ for values %MAP;
2400 2456
2401 warn "restarting server ticker"; 2457 warn "loading reloadable resources";
2458 init_resources;
2402 2459
2403 $TICK_WATCHER->start; 2460 warn "leaving sync_job";
2404 };
2405 2461
2406 if ($@) { 2462 1
2463 } or do {
2407 warn $@; 2464 warn $@;
2408 warn "error while reloading, exiting."; 2465 warn "error while reloading, exiting.";
2409 exit 1; 2466 exit 1;
2410 } 2467 };
2411 2468
2412 warn "reloaded"; 2469 warn "reloaded";
2413}; 2470};
2414 2471
2415our $RELOAD_WATCHER; # used only during reload 2472our $RELOAD_WATCHER; # used only during reload
… …
2421 $who->message ("reloading server."); 2478 $who->message ("reloading server.");
2422 2479
2423 # doing reload synchronously and two reloads happen back-to-back, 2480 # doing reload synchronously and two reloads happen back-to-back,
2424 # coro crashes during coro_state_free->destroy here. 2481 # coro crashes during coro_state_free->destroy here.
2425 2482
2426 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2483 $RELOAD_WATCHER ||= Event->timer (
2484 reentrant => 0,
2485 after => 0,
2486 data => WF_AUTOCANCEL,
2487 cb => sub {
2427 reload; 2488 reload;
2428 undef $RELOAD_WATCHER; 2489 undef $RELOAD_WATCHER;
2490 },
2429 }); 2491 );
2430 } 2492 }
2431}; 2493};
2432 2494
2433unshift @INC, $LIBDIR; 2495unshift @INC, $LIBDIR;
2434 2496
… …
2451 2513
2452 cf::server_tick; # one server iteration 2514 cf::server_tick; # one server iteration
2453 $RUNTIME += $TICK; 2515 $RUNTIME += $TICK;
2454 $NEXT_TICK += $TICK; 2516 $NEXT_TICK += $TICK;
2455 2517
2518 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2519 $NEXT_RUNTIME_WRITE = $NOW + 10;
2520 Coro::async_pool {
2521 write_runtime
2522 or warn "ERROR: unable to write runtime file: $!";
2523 };
2524 }
2525
2456 $WAIT_FOR_TICK->broadcast; 2526 $WAIT_FOR_TICK->broadcast;
2457 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2527 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2528
2529# my $AFTER = Event::time;
2530# warn $AFTER - $NOW;#d#
2458 2531
2459 # 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
2460 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2533 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2461 2534
2462 $TICK_WATCHER->at ($NEXT_TICK); 2535 $TICK_WATCHER->at ($NEXT_TICK);
2463 $TICK_WATCHER->start; 2536 $TICK_WATCHER->start;
2464 }, 2537 },
2465); 2538);
2466 2539
2540{
2541 BDB::max_poll_time $TICK * 0.1;
2542 $BDB_POLL_WATCHER = Event->io (
2543 reentrant => 0,
2544 fd => BDB::poll_fileno,
2545 poll => 'r',
2546 prio => 0,
2547 data => WF_AUTOCANCEL,
2548 cb => \&BDB::poll_cb,
2549 );
2550 BDB::min_parallel 8;
2551
2552 BDB::set_sync_prepare {
2553 my $status;
2554 my $current = $Coro::current;
2555 (
2556 sub {
2557 $status = $!;
2558 $current->ready; undef $current;
2559 },
2560 sub {
2561 Coro::schedule while defined $current;
2562 $! = $status;
2563 },
2564 )
2565 };
2566
2567 unless ($DB_ENV) {
2568 $DB_ENV = BDB::db_env_create;
2569
2570 cf::sync_job {
2571 eval {
2572 BDB::db_env_open
2573 $DB_ENV,
2574 $BDB_ENV_DIR,
2575 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2576 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2577 0666;
2578
2579 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2580
2581 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2582 $DB_ENV->set_lk_detect;
2583 };
2584
2585 cf::cleanup "db_env_open(db): $@" if $@;
2586 };
2587 }
2588}
2589
2590{
2591 IO::AIO::min_parallel 8;
2592
2593 undef $Coro::AIO::WATCHER;
2467IO::AIO::max_poll_time $TICK * 0.2; 2594 IO::AIO::max_poll_time $TICK * 0.1;
2468
2469$AIO_POLL_WATCHER = Event->io ( 2595 $AIO_POLL_WATCHER = Event->io (
2470 fd => IO::AIO::poll_fileno, 2596 reentrant => 0,
2471 poll => 'r',
2472 prio => 5,
2473 data => WF_AUTOCANCEL,
2474 cb => \&IO::AIO::poll_cb,
2475);
2476
2477$WRITE_RUNTIME_WATCHER = Event->timer (
2478 data => WF_AUTOCANCEL, 2597 data => WF_AUTOCANCEL,
2479 after => 1, 2598 fd => IO::AIO::poll_fileno,
2480 interval => 10, 2599 poll => 'r',
2481 cb => Coro::unblock_sub { 2600 prio => 6,
2482 write_runtime 2601 cb => \&IO::AIO::poll_cb,
2483 or warn "ERROR: unable to write runtime file: $!"; 2602 );
2484 }, 2603}
2485);
2486 2604
2487END { cf::emergency_save } 2605END { cf::emergency_save }
2488 2606
24891 26071
2490 2608

Diff Legend

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