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

Diff Legend

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