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.186 by root, Sat Jan 20 01:12:39 2007 UTC vs.
Revision 1.216 by root, Thu Feb 15 14:30:21 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 }
… …
356 # 60 allows for the watchdog to kill the server. 366 # 60 allows for the watchdog to kill the server.
357 367
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 368 (aio_write $fh, 0, (length $value), $value, 0) <= 0
359 and return; 369 and return;
360 370
371 # always fsync - this file is important
361 aio_fsync $fh 372 aio_fsync $fh
362 and return; 373 and return;
363 374
364 close $fh 375 close $fh
365 or return; 376 or return;
… …
750 $filename, length $$rdata, scalar @$objs; 761 $filename, length $$rdata, scalar @$objs;
751 762
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 763 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 764 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 765 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 766 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 767 close $fh;
757 768
758 if (@$objs) { 769 if (@$objs) {
759 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) {
760 chmod SAVE_MODE, $fh; 771 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 772 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 773 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 774 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 775 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 776 aio_rename "$filename.pst~", "$filename.pst";
766 } 777 }
767 } else { 778 } else {
768 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
… …
1068=cut 1079=cut
1069 1080
1070sub maps($) { 1081sub maps($) {
1071 my ($pl) = @_; 1082 my ($pl) = @_;
1072 1083
1084 $pl = ref $pl ? $pl->ob->name : $pl;
1085
1073 my $files = aio_readdir playerdir $pl 1086 my $files = aio_readdir playerdir $pl
1074 or return; 1087 or return;
1075 1088
1076 my @paths; 1089 my @paths;
1077 1090
1078 for (@$files) { 1091 for (@$files) {
1079 utf8::decode $_; 1092 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1093 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1094 next unless /^$PATH_SEP/o;
1082 1095
1083 s/\.map$//; 1096 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1097 }
1086 1098
1087 \@paths 1099 \@paths
1088} 1100}
1089 1101
… …
1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1152 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1141 (cf::region::find $rmp->{region}), $rmp->{custom} 1153 (cf::region::find $rmp->{region}), $rmp->{custom}
1142 ) 1154 )
1143} 1155}
1144 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
1145sub register { 1165sub register {
1146 my (undef, $regex) = @_; 1166 my (undef, $regex, $prio) = @_;
1147 my $pkg = caller; 1167 my $pkg = caller;
1148 1168
1149 no strict; 1169 no strict;
1150 push @{"$pkg\::ISA"}, __PACKAGE__; 1170 push @{"$pkg\::ISA"}, __PACKAGE__;
1151 1171
1152 $EXT_MAP{$pkg} = qr<$regex>; 1172 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1153} 1173}
1154 1174
1155# also paths starting with '/' 1175# also paths starting with '/'
1156$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1176$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1157 1177
1158sub thawer_merge { 1178sub thawer_merge {
1159 my ($self, $merge) = @_; 1179 my ($self, $merge) = @_;
1160 1180
1161 # we have to keep some variables in memory intact 1181 # we have to keep some variables in memory intact
… …
1167 $self->SUPER::thawer_merge ($merge); 1187 $self->SUPER::thawer_merge ($merge);
1168} 1188}
1169 1189
1170sub normalise { 1190sub normalise {
1171 my ($path, $base) = @_; 1191 my ($path, $base) = @_;
1192
1193 $path = "$path"; # make sure its a string
1194
1195 $path =~ s/\.map$//;
1172 1196
1173 # map plan: 1197 # map plan:
1174 # 1198 #
1175 # /! non-realised random map exit (special hack!) 1199 # /! non-realised random map exit (special hack!)
1176 # {... are special paths that are not being touched 1200 # {... are special paths that are not being touched
… …
1204 1228
1205 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
1206 1230
1207 $path = normalise $path, $base; 1231 $path = normalise $path, $base;
1208 1232
1209 for my $pkg (keys %EXT_MAP) { 1233 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1210 if ($path =~ $EXT_MAP{$pkg}) { 1234 if ($path =~ $EXT_MAP{$pkg}[1]) {
1211 my $self = bless cf::map::new, $pkg; 1235 my $self = bless cf::map::new, $pkg;
1212 $self->{path} = $path; $self->path ($path); 1236 $self->{path} = $path; $self->path ($path);
1213 $self->init; # pass $1 etc. 1237 $self->init; # pass $1 etc.
1214 return $self; 1238 return $self;
1215 } 1239 }
1216 } 1240 }
1217 1241
1218 Carp::carp "unable to resolve path '$path'."; 1242 Carp::carp "unable to resolve path '$path' (base '$base').";
1219 () 1243 ()
1220} 1244}
1221 1245
1222sub init { 1246sub init {
1223 my ($self) = @_; 1247 my ($self) = @_;
… …
1238 1262
1239# the original (read-only) location 1263# the original (read-only) location
1240sub load_path { 1264sub load_path {
1241 my ($self) = @_; 1265 my ($self) = @_;
1242 1266
1243 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1267 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1244} 1268}
1245 1269
1246# the temporary/swap location 1270# the temporary/swap location
1247sub save_path { 1271sub save_path {
1248 my ($self) = @_; 1272 my ($self) = @_;
1249 1273
1250 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1274 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1251 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1275 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1252} 1276}
1253 1277
1254# the unique path, undef == no special unique path 1278# the unique path, undef == no special unique path
1255sub uniq_path { 1279sub uniq_path {
1256 my ($self) = @_; 1280 my ($self) = @_;
… …
1278 1302
1279sub load_header_from($) { 1303sub load_header_from($) {
1280 my ($self, $path) = @_; 1304 my ($self, $path) = @_;
1281 1305
1282 utf8::encode $path; 1306 utf8::encode $path;
1283 aio_open $path, O_RDONLY, 0 1307 #aio_open $path, O_RDONLY, 0
1284 or return; 1308 # or return;
1285 1309
1286 $self->_load_header ($path) 1310 $self->_load_header ($path)
1287 or return; 1311 or return;
1288 1312
1289 $self->{load_path} = $path; 1313 $self->{load_path} = $path;
1290 1314
1291 1 1315 1
1292} 1316}
1293 1317
1294sub load_orig { 1318sub load_header_orig {
1295 my ($self) = @_; 1319 my ($self) = @_;
1296 1320
1297 $self->load_header_from ($self->load_path) 1321 $self->load_header_from ($self->load_path)
1298} 1322}
1299 1323
1300sub load_temp { 1324sub load_header_temp {
1301 my ($self) = @_; 1325 my ($self) = @_;
1302 1326
1303 $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;
1304} 1347}
1305 1348
1306sub load_header { 1349sub load_header {
1307 my ($self) = @_; 1350 my ($self) = @_;
1308 1351
1309 if ($self->load_temp) { 1352 if ($self->load_header_temp) {
1310 $self->last_access ((delete $self->{last_access}) 1353 $self->prepare_temp;
1311 || $cf::RUNTIME); #d#
1312 # safety
1313 $self->{instantiate_time} = $cf::RUNTIME
1314 if $self->{instantiate_time} > $cf::RUNTIME;
1315 } else { 1354 } else {
1316 $self->load_orig 1355 $self->load_header_orig
1317 or return; 1356 or return;
1318 1357 $self->prepare_orig;
1319 $self->{load_original} = 1;
1320 $self->{instantiate_time} = $cf::RUNTIME;
1321 $self->last_access ($cf::RUNTIME);
1322 $self->instantiate;
1323 } 1358 }
1324 1359
1325 1 1360 1
1326} 1361}
1327 1362
… …
1341 $map->{last_save} = $cf::RUNTIME; 1376 $map->{last_save} = $cf::RUNTIME;
1342 1377
1343 $map->load_header 1378 $map->load_header
1344 or return; 1379 or return;
1345 1380
1346 if ($map->should_reset) { 1381 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1347 # doing this can freeze the server in a sync job, obviously 1382 # doing this can freeze the server in a sync job, obviously
1348 #$cf::WAIT_FOR_TICK->wait; 1383 #$cf::WAIT_FOR_TICK->wait;
1349 $map->reset; 1384 $map->reset;
1350 undef $guard; 1385 undef $guard;
1351 $map = find $path 1386 return find $path;
1352 or return;
1353 } 1387 }
1354 1388
1355 $cf::MAP{$path} = $map 1389 $cf::MAP{$path} = $map
1356 } 1390 }
1357} 1391}
1392
1393sub pre_load { }
1394sub post_load { }
1358 1395
1359sub load { 1396sub load {
1360 my ($self) = @_; 1397 my ($self) = @_;
1361 1398
1399 local $self->{deny_reset} = 1; # loading can take a long time
1400
1362 my $path = $self->{path}; 1401 my $path = $self->{path};
1363 my $guard = cf::lock_acquire "map_load:$path"; 1402 my $guard = cf::lock_acquire "map_load:$path";
1364 1403
1365 return if $self->in_memory != cf::MAP_SWAPPED; 1404 return if $self->in_memory != cf::MAP_SWAPPED;
1366 1405
1367 $self->in_memory (cf::MAP_LOADING); 1406 $self->in_memory (cf::MAP_LOADING);
1368 1407
1369 $self->alloc; 1408 $self->alloc;
1409
1410 $self->pre_load;
1411
1370 $self->_load_objects ($self->{load_path}, 1) 1412 $self->_load_objects ($self->{load_path}, 1)
1371 or return; 1413 or return;
1372 1414
1373 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1415 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1374 if delete $self->{load_original}; 1416 if delete $self->{load_original};
… …
1396 unless $self->difficulty; 1438 unless $self->difficulty;
1397 Coro::cede; 1439 Coro::cede;
1398 $self->activate; 1440 $self->activate;
1399 } 1441 }
1400 1442
1443 $self->post_load;
1444
1401 $self->in_memory (cf::MAP_IN_MEMORY); 1445 $self->in_memory (cf::MAP_IN_MEMORY);
1402} 1446}
1403 1447
1404sub customise_for { 1448sub customise_for {
1405 my ($self, $ob) = @_; 1449 my ($self, $ob) = @_;
… …
1469 delete $MAP_PREFETCH{$path}; 1513 delete $MAP_PREFETCH{$path};
1470 } 1514 }
1471 } 1515 }
1472 undef $MAP_PREFETCHER; 1516 undef $MAP_PREFETCHER;
1473 }; 1517 };
1518 $MAP_PREFETCHER->prio (6);
1474 1519
1475 () 1520 ()
1476} 1521}
1477 1522
1478sub save { 1523sub save {
… …
1548 return if $self->players; 1593 return if $self->players;
1549 return if $self->isa ("ext::map_per_player");#d# 1594 return if $self->isa ("ext::map_per_player");#d#
1550 1595
1551 warn "resetting map ", $self->path;#d# 1596 warn "resetting map ", $self->path;#d#
1552 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
1553 delete $cf::MAP{$self->path}; 1608 delete $cf::MAP{$self->path};
1554 1609
1555 $self->in_memory (cf::MAP_SWAPPED);
1556 $self->clear; 1610 $self->clear;
1557 1611
1558 $_->clear_links_to ($self) for values %cf::MAP; 1612 $_->clear_links_to ($self) for values %cf::MAP;
1559 1613
1560 $self->unlink_save; 1614 $self->unlink_save;
… …
1597 for (@$files) { 1651 for (@$files) {
1598 utf8::decode $_; 1652 utf8::decode $_;
1599 next if /\.pst$/; 1653 next if /\.pst$/;
1600 next unless /^$PATH_SEP/o; 1654 next unless /^$PATH_SEP/o;
1601 1655
1602 s/\.map$//; 1656 push @paths, cf::map::normalise $_;
1603 push @paths, $_;
1604 } 1657 }
1605 1658
1606 \@paths 1659 \@paths
1607} 1660}
1608 1661
… …
1702=cut 1755=cut
1703 1756
1704sub link_map { 1757sub link_map {
1705 unless ($LINK_MAP) { 1758 unless ($LINK_MAP) {
1706 $LINK_MAP = cf::map::find "{link}" 1759 $LINK_MAP = cf::map::find "{link}"
1707 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1760 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1708 $LINK_MAP->load; 1761 $LINK_MAP->load;
1709 } 1762 }
1710 1763
1711 $LINK_MAP 1764 $LINK_MAP
1712} 1765}
… …
1719 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1772 return if UNIVERSAL::isa $self->map, "ext::map_link";
1720 1773
1721 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1774 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1722 if $self->map; 1775 if $self->map;
1723 1776
1724 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1777 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1725} 1778}
1726 1779
1727sub cf::object::player::leave_link { 1780sub cf::object::player::leave_link {
1728 my ($self, $map, $x, $y) = @_; 1781 my ($self, $map, $x, $y) = @_;
1729 1782
… …
1751 $map->load; 1804 $map->load;
1752 $map->load_diag; 1805 $map->load_diag;
1753 1806
1754 return unless $self->contr->active; 1807 return unless $self->contr->active;
1755 $self->activate_recursive; 1808 $self->activate_recursive;
1809
1810 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1756 $self->enter_map ($map, $x, $y); 1811 $self->enter_map ($map, $x, $y);
1757} 1812}
1758 1813
1759cf::player->attach ( 1814cf::player->attach (
1760 on_logout => sub { 1815 on_logout => sub {
… …
1773 # try to abort aborted map switching on player login :) 1828 # try to abort aborted map switching on player login :)
1774 # should happen only on crashes 1829 # should happen only on crashes
1775 if ($pl->ob->{_link_pos}) { 1830 if ($pl->ob->{_link_pos}) {
1776 $pl->ob->enter_link; 1831 $pl->ob->enter_link;
1777 (async { 1832 (async {
1778 # we need this sleep as the login has a concurrent enter_exit running
1779 # and this sleep increases chances of the player not ending up in scorn
1780 $pl->ob->reply (undef, 1833 $pl->ob->reply (undef,
1781 "There was an internal problem at your last logout, " 1834 "There was an internal problem at your last logout, "
1782 . "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.",
1783 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
1784 Coro::Timer::sleep 1; 1839 Coro::Timer::sleep 1;
1785 $pl->ob->leave_link; 1840 $pl->ob->leave_link;
1786 })->prio (2); 1841 })->prio (2);
1787 } 1842 }
1788 }, 1843 },
… …
1796 my ($self, $path, $x, $y) = @_; 1851 my ($self, $path, $x, $y) = @_;
1797 1852
1798 $self->enter_link; 1853 $self->enter_link;
1799 1854
1800 (async { 1855 (async {
1856 my $map = eval {
1801 my $map = cf::map::find $path; 1857 my $map = cf::map::find $path;
1802 $map = $map->customise_for ($self) if $map; 1858 $map = $map->customise_for ($self) if $map;
1803 1859 $map
1804# warn "entering ", $map->path, " at ($x, $y)\n" 1860 } or
1805# if $map;
1806
1807 $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);
1808 1862
1809 $self->leave_link ($map, $x, $y); 1863 $self->leave_link ($map, $x, $y);
1810 })->prio (1); 1864 })->prio (1);
1811} 1865}
1812 1866
… …
1843 # that depends on the exit object 1897 # that depends on the exit object
1844 1898
1845 my $rmp = parse_random_map_params $exit->msg; 1899 my $rmp = parse_random_map_params $exit->msg;
1846 1900
1847 if ($exit->map) { 1901 if ($exit->map) {
1848 $rmp->{region} = $exit->map->region_name; 1902 $rmp->{region} = $exit->region->name;
1849 $rmp->{origin_map} = $exit->map->path; 1903 $rmp->{origin_map} = $exit->map->path;
1850 $rmp->{origin_x} = $exit->x; 1904 $rmp->{origin_x} = $exit->x;
1851 $rmp->{origin_y} = $exit->y; 1905 $rmp->{origin_y} = $exit->y;
1852 } 1906 }
1853 1907
… …
1870sub cf::object::player::enter_exit { 1924sub cf::object::player::enter_exit {
1871 my ($self, $exit) = @_; 1925 my ($self, $exit) = @_;
1872 1926
1873 return unless $self->type == cf::PLAYER; 1927 return unless $self->type == cf::PLAYER;
1874 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
1875 $self->enter_link; 1938 $self->enter_link;
1876 1939
1877 (async { 1940 (async {
1878 $self->deactivate_recursive; # just to be sure 1941 $self->deactivate_recursive; # just to be sure
1879 unless (eval { 1942 unless (eval {
1880 prepare_random_map $exit 1943 $self->goto ($slaying, $hp, $sp);
1881 if $exit->slaying eq "/!";
1882
1883 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1884 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1885 1944
1886 1; 1945 1;
1887 }) { 1946 }) {
1888 $self->message ("Something went wrong deep within the crossfire server. " 1947 $self->message ("Something went wrong deep within the crossfire server. "
1889 . "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. "
… …
1950 # get handled first 2009 # get handled first
1951 my $queue = delete $ns->{query_queue} 2010 my $queue = delete $ns->{query_queue}
1952 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
1953 2012
1954 (shift @$queue)->[1]->($msg); 2013 (shift @$queue)->[1]->($msg);
2014 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1955 2015
1956 push @{ $ns->{query_queue} }, @$queue; 2016 push @{ $ns->{query_queue} }, @$queue;
1957 2017
1958 if (@{ $ns->{query_queue} } == @$queue) { 2018 if (@{ $ns->{query_queue} } == @$queue) {
1959 if (@$queue) { 2019 if (@$queue) {
… …
2120The 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
2121using it, it should be unique. 2181using it, it should be unique.
2122 2182
2123=over 4 2183=over 4
2124 2184
2125=item $hashref = cf::db_get $family
2126
2127Return a hashref for use by the extension C<$family>, which can be
2128modified. After modifications, you have to call C<cf::db_dirty> or
2129C<cf::db_sync>.
2130
2131=item $value = cf::db_get $family => $key 2185=item $value = cf::db_get $family => $key
2132 2186
2133Returns a single value from the database 2187Returns a single value from the database.
2134
2135=item cf::db_put $family => $hashref
2136
2137Stores the given family hashref into the database. Updates are delayed, if
2138you want the data to be synced to disk immediately, use C<cf::db_sync>.
2139 2188
2140=item cf::db_put $family => $key => $value 2189=item cf::db_put $family => $key => $value
2141 2190
2142Stores the given C<$value> in the family hash. Updates are delayed, if you 2191Stores the given C<$value> in the family.
2143want the data to be synced to disk immediately, use C<cf::db_sync>.
2144
2145=item cf::db_dirty
2146
2147Marks the database as dirty, to be updated at a later time.
2148
2149=item cf::db_sync
2150
2151Immediately write the database to disk I<if it is dirty>.
2152 2192
2153=cut 2193=cut
2154 2194
2155our $DB; 2195our $DB;
2156 2196
2157{ 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
2158 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;
2159 2216
2160 sub db_load() { 2217 cf::db_put (board => data => $pst->{board});
2161 $DB = stat $path ? Storable::retrieve $path : { }; 2218 cf::db_put (guildrules => data => $pst->{guildrules});
2162 } 2219 cf::db_put (rent => balance => $pst->{rent}{balance});
2220 BDB::db_env_txn_checkpoint $DB_ENV;
2163 2221
2164 my $pid; 2222 unlink $path;
2165
2166 sub db_save() {
2167 waitpid $pid, 0 if $pid;
2168 if (0 == ($pid = fork)) {
2169 $DB->{_meta}{version} = 1;
2170 Storable::nstore $DB, "$path~";
2171 rename "$path~", $path;
2172 cf::_exit 0 if defined $pid;
2173 } 2223 };
2174 }
2175
2176 my $dirty;
2177
2178 sub db_sync() {
2179 db_save if $dirty;
2180 undef $dirty;
2181 }
2182
2183 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2184 db_sync;
2185 });
2186
2187 sub db_dirty() {
2188 $dirty = 1;
2189 $idle->start;
2190 }
2191
2192 sub db_get($;$) {
2193 @_ >= 2
2194 ? $DB->{$_[0]}{$_[1]}
2195 : ($DB->{$_[0]} ||= { })
2196 }
2197
2198 sub db_put($$;$) {
2199 if (@_ >= 3) {
2200 $DB->{$_[0]}{$_[1]} = $_[2];
2201 } else {
2202 $DB->{$_[0]} = $_[1];
2203 }
2204 db_dirty;
2205 }
2206
2207 cf::global->attach (
2208 prio => 10000,
2209 on_cleanup => sub {
2210 db_sync;
2211 }, 2224 }
2212 ); 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 { };
2213} 2242}
2214 2243
2215############################################################################# 2244#############################################################################
2216# the server's main() 2245# the server's init and main functions
2246
2247sub load_resources {
2248 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2249 or die "unable to load regions file\n";#d#
2250}
2217 2251
2218sub cfg_load { 2252sub cfg_load {
2219 open my $fh, "<:utf8", cf::confdir . "/config" 2253 open my $fh, "<:utf8", cf::confdir . "/config"
2220 or return; 2254 or return;
2221 2255
… …
2232 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2266 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2233 and die "WARNING: m(un)lockall failed: $!\n"; 2267 and die "WARNING: m(un)lockall failed: $!\n";
2234 }; 2268 };
2235 warn $@ if $@; 2269 warn $@ if $@;
2236 } 2270 }
2271}
2272
2273sub init {
2274 load_resources;
2237} 2275}
2238 2276
2239sub main { 2277sub main {
2240 # we must not ever block the main coroutine 2278 # we must not ever block the main coroutine
2241 local $Coro::idle = sub { 2279 local $Coro::idle = sub {
… …
2244 Event::one_event; 2282 Event::one_event;
2245 })->prio (Coro::PRIO_MAX); 2283 })->prio (Coro::PRIO_MAX);
2246 }; 2284 };
2247 2285
2248 cfg_load; 2286 cfg_load;
2249 db_load; 2287 db_init;
2250 load_extensions; 2288 load_extensions;
2251 2289
2252 $TICK_WATCHER->start; 2290 $TICK_WATCHER->start;
2253 Event::loop; 2291 Event::loop;
2254} 2292}
… …
2258 2296
2259# install some emergency cleanup handlers 2297# install some emergency cleanup handlers
2260BEGIN { 2298BEGIN {
2261 for my $signal (qw(INT HUP TERM)) { 2299 for my $signal (qw(INT HUP TERM)) {
2262 Event->signal ( 2300 Event->signal (
2301 reentrant => 0,
2263 data => WF_AUTOCANCEL, 2302 data => WF_AUTOCANCEL,
2264 signal => $signal, 2303 signal => $signal,
2304 prio => 0,
2265 cb => sub { 2305 cb => sub {
2266 cf::cleanup "SIG$signal"; 2306 cf::cleanup "SIG$signal";
2267 }, 2307 },
2268 ); 2308 );
2269 } 2309 }
2270} 2310}
… …
2291 my $map = $cf::MAP{$path} or next; 2331 my $map = $cf::MAP{$path} or next;
2292 $map->valid or next; 2332 $map->valid or next;
2293 $map->save; 2333 $map->save;
2294 } 2334 }
2295 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";
2296 }; 2340 };
2297 2341
2298 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;
2299} 2350}
2300 2351
2301sub reload() { 2352sub reload() {
2302 # can/must only be called in main 2353 # can/must only be called in main
2303 if ($Coro::current != $Coro::main) { 2354 if ($Coro::current != $Coro::main) {
… …
2305 return; 2356 return;
2306 } 2357 }
2307 2358
2308 warn "reloading..."; 2359 warn "reloading...";
2309 2360
2310 warn "cancelling server ticker"; 2361 warn "entering sync_job";
2311 $TICK_WATCHER->cancel;
2312 2362
2363 cf::sync_job {
2364 cf::write_runtime; # external watchdog should not bark
2313 cf::emergency_save; 2365 cf::emergency_save;
2366 cf::write_runtime; # external watchdog should not bark
2314 2367
2315 eval { 2368 warn "syncing database to disk";
2369 BDB::db_env_txn_checkpoint $DB_ENV;
2370
2316 # 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
2317
2318 warn "syncing database to disk";
2319 cf::db_sync;
2320 2372
2321 warn "cancelling all WF_AUTOCANCEL watchers"; 2373 warn "cancelling all WF_AUTOCANCEL watchers";
2322 for (Event::all_watchers) { 2374 for (Event::all_watchers) {
2323 $_->cancel if $_->data & WF_AUTOCANCEL; 2375 $_->cancel if $_->data & WF_AUTOCANCEL;
2324 } 2376 }
2325 2377
2326 warn "flushing outstanding aio requests"; 2378 warn "flushing outstanding aio requests";
2327 for (;;) { 2379 for (;;) {
2380 BDB::flush;
2328 IO::AIO::flush; 2381 IO::AIO::flush;
2329 Coro::cede; 2382 Coro::cede;
2330 last unless IO::AIO::nreqs; 2383 last unless IO::AIO::nreqs || BDB::nreqs;
2331 warn "iterate..."; 2384 warn "iterate...";
2332 } 2385 }
2333 2386
2334 warn "cancelling all extension coros"; 2387 warn "cancelling all extension coros";
2335 $_->cancel for values %EXT_CORO; 2388 $_->cancel for values %EXT_CORO;
… …
2390 require cf; 2443 require cf;
2391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2444 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2392 2445
2393 warn "loading config and database again"; 2446 warn "loading config and database again";
2394 cf::cfg_load; 2447 cf::cfg_load;
2395 cf::db_load;
2396 2448
2397 warn "loading extensions"; 2449 warn "loading extensions";
2398 cf::load_extensions; 2450 cf::load_extensions;
2399 2451
2400 warn "reattaching attachments to objects/players"; 2452 warn "reattaching attachments to objects/players";
2401 _global_reattach; 2453 _global_reattach;
2402 warn "reattaching attachments to maps"; 2454 warn "reattaching attachments to maps";
2403 reattach $_ for values %MAP; 2455 reattach $_ for values %MAP;
2404 2456
2405 warn "restarting server ticker"; 2457 warn "loading reloadable resources";
2458 load_resources;
2406 2459
2407 $TICK_WATCHER->start; 2460 warn "leaving sync_job";
2408 };
2409 2461
2410 if ($@) { 2462 1
2463 } or do {
2411 warn $@; 2464 warn $@;
2412 warn "error while reloading, exiting."; 2465 warn "error while reloading, exiting.";
2413 exit 1; 2466 exit 1;
2414 } 2467 };
2415 2468
2416 warn "reloaded"; 2469 warn "reloaded";
2417}; 2470};
2418 2471
2419our $RELOAD_WATCHER; # used only during reload 2472our $RELOAD_WATCHER; # used only during reload
… …
2425 $who->message ("reloading server."); 2478 $who->message ("reloading server.");
2426 2479
2427 # doing reload synchronously and two reloads happen back-to-back, 2480 # doing reload synchronously and two reloads happen back-to-back,
2428 # coro crashes during coro_state_free->destroy here. 2481 # coro crashes during coro_state_free->destroy here.
2429 2482
2430 $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 {
2431 reload; 2488 reload;
2432 undef $RELOAD_WATCHER; 2489 undef $RELOAD_WATCHER;
2490 },
2433 }); 2491 );
2434 } 2492 }
2435}; 2493};
2436 2494
2437unshift @INC, $LIBDIR; 2495unshift @INC, $LIBDIR;
2438 2496
… …
2455 2513
2456 cf::server_tick; # one server iteration 2514 cf::server_tick; # one server iteration
2457 $RUNTIME += $TICK; 2515 $RUNTIME += $TICK;
2458 $NEXT_TICK += $TICK; 2516 $NEXT_TICK += $TICK;
2459 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
2526
2460 $WAIT_FOR_TICK->broadcast; 2527 $WAIT_FOR_TICK->broadcast;
2461 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2528 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2529
2530# my $AFTER = Event::time;
2531# warn $AFTER - $NOW;#d#
2462 2532
2463 # if we are delayed by four ticks or more, skip them all 2533 # if we are delayed by four ticks or more, skip them all
2464 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2534 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2465 2535
2466 $TICK_WATCHER->at ($NEXT_TICK); 2536 $TICK_WATCHER->at ($NEXT_TICK);
2467 $TICK_WATCHER->start; 2537 $TICK_WATCHER->start;
2468 }, 2538 },
2469); 2539);
2470 2540
2541{
2542 BDB::max_poll_time $TICK * 0.1;
2543 $BDB_POLL_WATCHER = Event->io (
2544 reentrant => 0,
2545 fd => BDB::poll_fileno,
2546 poll => 'r',
2547 prio => 0,
2548 data => WF_AUTOCANCEL,
2549 cb => \&BDB::poll_cb,
2550 );
2551 BDB::min_parallel 8;
2552
2553 BDB::set_sync_prepare {
2554 my $status;
2555 my $current = $Coro::current;
2556 (
2557 sub {
2558 $status = $!;
2559 $current->ready; undef $current;
2560 },
2561 sub {
2562 Coro::schedule while defined $current;
2563 $! = $status;
2564 },
2565 )
2566 };
2567
2568 unless ($DB_ENV) {
2569 $DB_ENV = BDB::db_env_create;
2570
2571 cf::sync_job {
2572 eval {
2573 BDB::db_env_open
2574 $DB_ENV,
2575 $BDB_ENV_DIR,
2576 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2577 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2578 0666;
2579
2580 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2581
2582 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2583 $DB_ENV->set_lk_detect;
2584 };
2585
2586 cf::cleanup "db_env_open(db): $@" if $@;
2587 };
2588 }
2589}
2590
2591{
2592 IO::AIO::min_parallel 8;
2593
2594 undef $Coro::AIO::WATCHER;
2471IO::AIO::max_poll_time $TICK * 0.2; 2595 IO::AIO::max_poll_time $TICK * 0.1;
2472
2473$AIO_POLL_WATCHER = Event->io ( 2596 $AIO_POLL_WATCHER = Event->io (
2474 fd => IO::AIO::poll_fileno, 2597 reentrant => 0,
2475 poll => 'r',
2476 prio => 5,
2477 data => WF_AUTOCANCEL,
2478 cb => \&IO::AIO::poll_cb,
2479);
2480
2481$WRITE_RUNTIME_WATCHER = Event->timer (
2482 data => WF_AUTOCANCEL, 2598 data => WF_AUTOCANCEL,
2483 after => 1, 2599 fd => IO::AIO::poll_fileno,
2484 interval => 10, 2600 poll => 'r',
2485 prio => 6, # keep it lowest so it acts like a watchdog 2601 prio => 6,
2486 cb => Coro::unblock_sub { 2602 cb => \&IO::AIO::poll_cb,
2487 write_runtime 2603 );
2488 or warn "ERROR: unable to write runtime file: $!"; 2604}
2489 },
2490);
2491 2605
2492END { cf::emergency_save } 2606END { cf::emergency_save }
2493 2607
24941 26081
2495 2609

Diff Legend

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