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.185 by root, Fri Jan 19 23:32:52 2007 UTC vs.
Revision 1.211 by root, Tue Feb 13 16:23:32 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
… …
48our $TICK_WATCHER; 52our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 53our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 54our $WRITE_RUNTIME_WATCHER;
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
… …
344 356
345 $coro 357 $coro
346} 358}
347 359
348sub write_runtime { 360sub write_runtime {
361 $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1;
362
349 my $runtime = cf::localdir . "/runtime"; 363 my $runtime = cf::localdir . "/runtime";
350 364
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 365 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 366 or return;
353 367
368 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 369 # 10 is the runtime save interval, for a monotonic clock
370 # 60 allows for the watchdog to kill the server.
371
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 372 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 373 and return;
357 374
375 # always fsync - this file is important
358 aio_fsync $fh 376 aio_fsync $fh
359 and return; 377 and return;
360 378
361 close $fh 379 close $fh
362 or return; 380 or return;
… …
747 $filename, length $$rdata, scalar @$objs; 765 $filename, length $$rdata, scalar @$objs;
748 766
749 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 767 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
750 chmod SAVE_MODE, $fh; 768 chmod SAVE_MODE, $fh;
751 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 769 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
752 aio_fsync $fh; 770 aio_fsync $fh if $cf::USE_FSYNC;
753 close $fh; 771 close $fh;
754 772
755 if (@$objs) { 773 if (@$objs) {
756 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 774 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
757 chmod SAVE_MODE, $fh; 775 chmod SAVE_MODE, $fh;
758 my $data = Storable::nfreeze { version => 1, objs => $objs }; 776 my $data = Storable::nfreeze { version => 1, objs => $objs };
759 aio_write $fh, 0, (length $data), $data, 0; 777 aio_write $fh, 0, (length $data), $data, 0;
760 aio_fsync $fh; 778 aio_fsync $fh if $cf::USE_FSYNC;
761 close $fh; 779 close $fh;
762 aio_rename "$filename.pst~", "$filename.pst"; 780 aio_rename "$filename.pst~", "$filename.pst";
763 } 781 }
764 } else { 782 } else {
765 aio_unlink "$filename.pst"; 783 aio_unlink "$filename.pst";
… …
771 } 789 }
772 } else { 790 } else {
773 aio_unlink $filename; 791 aio_unlink $filename;
774 aio_unlink "$filename.pst"; 792 aio_unlink "$filename.pst";
775 } 793 }
794
795 #d##TODO# nuke non .map-files if exist
796 if ($filename =~ s/\.map$//) {
797 aio_unlink $filename;
798 aio_unlink "$filename.pst";
799 }
776 } 800 }
777} 801}
778 802
779sub object_freezer_as_string { 803sub object_freezer_as_string {
780 my ($rdata, $objs) = @_; 804 my ($rdata, $objs) = @_;
… …
786 810
787sub object_thawer_load { 811sub object_thawer_load {
788 my ($filename) = @_; 812 my ($filename) = @_;
789 813
790 my ($data, $av); 814 my ($data, $av);
815
816 #d#TODO remove .map if file does not exist
817 aio_stat $filename and $filename =~ s/\.map$//;
791 818
792 (aio_load $filename, $data) >= 0 819 (aio_load $filename, $data) >= 0
793 or return; 820 or return;
794 821
795 unless (aio_stat "$filename.pst") { 822 unless (aio_stat "$filename.pst") {
… …
1065=cut 1092=cut
1066 1093
1067sub maps($) { 1094sub maps($) {
1068 my ($pl) = @_; 1095 my ($pl) = @_;
1069 1096
1097 $pl = ref $pl ? $pl->ob->name : $pl;
1098
1070 my $files = aio_readdir playerdir $pl 1099 my $files = aio_readdir playerdir $pl
1071 or return; 1100 or return;
1072 1101
1073 my @paths; 1102 my @paths;
1074 1103
1075 for (@$files) { 1104 for (@$files) {
1076 utf8::decode $_; 1105 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1106 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1107 next unless /^$PATH_SEP/o;
1079 1108
1080 s/\.map$//; 1109 push @paths, cf::map::normalise "~$pl/$_";
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 } 1110 }
1083 1111
1084 \@paths 1112 \@paths
1085} 1113}
1086 1114
… …
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1165 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1166 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1167 )
1140} 1168}
1141 1169
1170=item cf::map->register ($regex, $prio)
1171
1172Register a handler for the map path matching the given regex at the
1173givne priority (higher is better, built-in handlers have priority 0, the
1174default).
1175
1176=cut
1177
1142sub register { 1178sub register {
1143 my (undef, $regex) = @_; 1179 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1180 my $pkg = caller;
1145 1181
1146 no strict; 1182 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1183 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1184
1149 $EXT_MAP{$pkg} = qr<$regex>; 1185 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1186}
1151 1187
1152# also paths starting with '/' 1188# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1189$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1190
1155sub thawer_merge { 1191sub thawer_merge {
1156 my ($self, $merge) = @_; 1192 my ($self, $merge) = @_;
1157 1193
1158 # we have to keep some variables in memory intact 1194 # we have to keep some variables in memory intact
… …
1164 $self->SUPER::thawer_merge ($merge); 1200 $self->SUPER::thawer_merge ($merge);
1165} 1201}
1166 1202
1167sub normalise { 1203sub normalise {
1168 my ($path, $base) = @_; 1204 my ($path, $base) = @_;
1205
1206 $path = "$path"; # make sure its a string
1207
1208 $path =~ s/\.map$//;
1169 1209
1170 # map plan: 1210 # map plan:
1171 # 1211 #
1172 # /! non-realised random map exit (special hack!) 1212 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched 1213 # {... are special paths that are not being touched
… …
1201 1241
1202 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1242 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1203 1243
1204 $path = normalise $path, $base; 1244 $path = normalise $path, $base;
1205 1245
1206 for my $pkg (keys %EXT_MAP) { 1246 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1247 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1248 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1249 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1250 $self->init; # pass $1 etc.
1211 return $self; 1251 return $self;
1212 } 1252 }
1213 } 1253 }
1214 1254
1215 Carp::carp "unable to resolve path '$path'."; 1255 Carp::carp "unable to resolve path '$path' (base '$base').";
1216 () 1256 ()
1217} 1257}
1218 1258
1219sub init { 1259sub init {
1220 my ($self) = @_; 1260 my ($self) = @_;
… …
1235 1275
1236# the original (read-only) location 1276# the original (read-only) location
1237sub load_path { 1277sub load_path {
1238 my ($self) = @_; 1278 my ($self) = @_;
1239 1279
1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1280 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1241} 1281}
1242 1282
1243# the temporary/swap location 1283# the temporary/swap location
1244sub save_path { 1284sub save_path {
1245 my ($self) = @_; 1285 my ($self) = @_;
1246 1286
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1287 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1288 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1249} 1289}
1250 1290
1251# the unique path, undef == no special unique path 1291# the unique path, undef == no special unique path
1252sub uniq_path { 1292sub uniq_path {
1253 my ($self) = @_; 1293 my ($self) = @_;
… …
1269 my ($self) = @_; 1309 my ($self) = @_;
1270 1310
1271 utf8::encode (my $save = $self->save_path); 1311 utf8::encode (my $save = $self->save_path);
1272 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1312 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1314
1315 #d#TODO remove .map and also nuke
1316 $save =~ s/\.map// or return;#d#
1317 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1318 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1274} 1319}
1275 1320
1276sub load_header_from($) { 1321sub load_header_from($) {
1277 my ($self, $path) = @_; 1322 my ($self, $path) = @_;
1278 1323
1279 utf8::encode $path; 1324 utf8::encode $path;
1280 aio_open $path, O_RDONLY, 0 1325 #aio_open $path, O_RDONLY, 0
1281 or return; 1326 # or return;
1282 1327
1283 $self->_load_header ($path) 1328 $self->_load_header ($path)
1284 or return; 1329 or return;
1285 1330
1286 $self->{load_path} = $path; 1331 $self->{load_path} = $path;
1287 1332
1288 1 1333 1
1289} 1334}
1290 1335
1291sub load_orig { 1336sub load_header_orig {
1292 my ($self) = @_; 1337 my ($self) = @_;
1293 1338
1294 $self->load_header_from ($self->load_path) 1339 $self->load_header_from ($self->load_path)
1295} 1340}
1296 1341
1297sub load_temp { 1342sub load_header_temp {
1298 my ($self) = @_; 1343 my ($self) = @_;
1299 1344
1300 $self->load_header_from ($self->save_path) 1345 $self->load_header_from ($self->save_path)
1346}
1347
1348sub prepare_temp {
1349 my ($self) = @_;
1350
1351 $self->last_access ((delete $self->{last_access})
1352 || $cf::RUNTIME); #d#
1353 # safety
1354 $self->{instantiate_time} = $cf::RUNTIME
1355 if $self->{instantiate_time} > $cf::RUNTIME;
1356}
1357
1358sub prepare_orig {
1359 my ($self) = @_;
1360
1361 $self->{load_original} = 1;
1362 $self->{instantiate_time} = $cf::RUNTIME;
1363 $self->last_access ($cf::RUNTIME);
1364 $self->instantiate;
1301} 1365}
1302 1366
1303sub load_header { 1367sub load_header {
1304 my ($self) = @_; 1368 my ($self) = @_;
1305 1369
1306 if ($self->load_temp) { 1370 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1371 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1372 } else {
1313 $self->load_orig 1373 $self->load_header_orig
1314 or return; 1374 or return;
1315 1375 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1376 }
1321 1377
1322 1 1378 1
1323} 1379}
1324 1380
… …
1338 $map->{last_save} = $cf::RUNTIME; 1394 $map->{last_save} = $cf::RUNTIME;
1339 1395
1340 $map->load_header 1396 $map->load_header
1341 or return; 1397 or return;
1342 1398
1343 if ($map->should_reset) { 1399 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1344 # doing this can freeze the server in a sync job, obviously 1400 # doing this can freeze the server in a sync job, obviously
1345 #$cf::WAIT_FOR_TICK->wait; 1401 #$cf::WAIT_FOR_TICK->wait;
1346 $map->reset; 1402 $map->reset;
1347 undef $guard; 1403 undef $guard;
1348 $map = find $path 1404 return find $path;
1349 or return;
1350 } 1405 }
1351 1406
1352 $cf::MAP{$path} = $map 1407 $cf::MAP{$path} = $map
1353 } 1408 }
1354} 1409}
1410
1411sub pre_load { }
1412sub post_load { }
1355 1413
1356sub load { 1414sub load {
1357 my ($self) = @_; 1415 my ($self) = @_;
1358 1416
1417 local $self->{deny_reset} = 1; # loading can take a long time
1418
1359 my $path = $self->{path}; 1419 my $path = $self->{path};
1360 my $guard = cf::lock_acquire "map_load:$path"; 1420 my $guard = cf::lock_acquire "map_load:$path";
1361 1421
1362 return if $self->in_memory != cf::MAP_SWAPPED; 1422 return if $self->in_memory != cf::MAP_SWAPPED;
1363 1423
1364 $self->in_memory (cf::MAP_LOADING); 1424 $self->in_memory (cf::MAP_LOADING);
1365 1425
1366 $self->alloc; 1426 $self->alloc;
1427
1428 $self->pre_load;
1429
1367 $self->_load_objects ($self->{load_path}, 1) 1430 $self->_load_objects ($self->{load_path}, 1)
1368 or return; 1431 or return;
1369 1432
1370 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1433 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1371 if delete $self->{load_original}; 1434 if delete $self->{load_original};
… …
1393 unless $self->difficulty; 1456 unless $self->difficulty;
1394 Coro::cede; 1457 Coro::cede;
1395 $self->activate; 1458 $self->activate;
1396 } 1459 }
1397 1460
1461 $self->post_load;
1462
1398 $self->in_memory (cf::MAP_IN_MEMORY); 1463 $self->in_memory (cf::MAP_IN_MEMORY);
1399} 1464}
1400 1465
1401sub customise_for { 1466sub customise_for {
1402 my ($self, $ob) = @_; 1467 my ($self, $ob) = @_;
… …
1466 delete $MAP_PREFETCH{$path}; 1531 delete $MAP_PREFETCH{$path};
1467 } 1532 }
1468 } 1533 }
1469 undef $MAP_PREFETCHER; 1534 undef $MAP_PREFETCHER;
1470 }; 1535 };
1536 $MAP_PREFETCHER->prio (6);
1471 1537
1472 () 1538 ()
1473} 1539}
1474 1540
1475sub save { 1541sub save {
… …
1545 return if $self->players; 1611 return if $self->players;
1546 return if $self->isa ("ext::map_per_player");#d# 1612 return if $self->isa ("ext::map_per_player");#d#
1547 1613
1548 warn "resetting map ", $self->path;#d# 1614 warn "resetting map ", $self->path;#d#
1549 1615
1616 $self->in_memory (cf::MAP_SWAPPED);
1617
1618 # need to save uniques path
1619 unless ($self->{deny_save}) {
1620 my $uniq = $self->uniq_path; utf8::encode $uniq;
1621
1622 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1623 if $uniq;
1624 }
1625
1550 delete $cf::MAP{$self->path}; 1626 delete $cf::MAP{$self->path};
1551 1627
1552 $self->in_memory (cf::MAP_SWAPPED);
1553 $self->clear; 1628 $self->clear;
1554 1629
1555 $_->clear_links_to ($self) for values %cf::MAP; 1630 $_->clear_links_to ($self) for values %cf::MAP;
1556 1631
1557 $self->unlink_save; 1632 $self->unlink_save;
… …
1594 for (@$files) { 1669 for (@$files) {
1595 utf8::decode $_; 1670 utf8::decode $_;
1596 next if /\.pst$/; 1671 next if /\.pst$/;
1597 next unless /^$PATH_SEP/o; 1672 next unless /^$PATH_SEP/o;
1598 1673
1599 s/\.map$//; 1674 push @paths, cf::map::normalise $_;
1600 push @paths, $_;
1601 } 1675 }
1602 1676
1603 \@paths 1677 \@paths
1604} 1678}
1605 1679
… …
1699=cut 1773=cut
1700 1774
1701sub link_map { 1775sub link_map {
1702 unless ($LINK_MAP) { 1776 unless ($LINK_MAP) {
1703 $LINK_MAP = cf::map::find "{link}" 1777 $LINK_MAP = cf::map::find "{link}"
1704 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1778 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1705 $LINK_MAP->load; 1779 $LINK_MAP->load;
1706 } 1780 }
1707 1781
1708 $LINK_MAP 1782 $LINK_MAP
1709} 1783}
… …
1716 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1790 return if UNIVERSAL::isa $self->map, "ext::map_link";
1717 1791
1718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1792 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1719 if $self->map; 1793 if $self->map;
1720 1794
1721 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1795 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1722} 1796}
1723 1797
1724sub cf::object::player::leave_link { 1798sub cf::object::player::leave_link {
1725 my ($self, $map, $x, $y) = @_; 1799 my ($self, $map, $x, $y) = @_;
1726 1800
… …
1793 my ($self, $path, $x, $y) = @_; 1867 my ($self, $path, $x, $y) = @_;
1794 1868
1795 $self->enter_link; 1869 $self->enter_link;
1796 1870
1797 (async { 1871 (async {
1872 my $map = eval {
1798 my $map = cf::map::find $path; 1873 my $map = cf::map::find $path;
1799 $map = $map->customise_for ($self) if $map; 1874 $map = $map->customise_for ($self) if $map;
1800 1875 $map
1801# warn "entering ", $map->path, " at ($x, $y)\n" 1876 } or
1802# if $map;
1803
1804 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1877 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1805 1878
1806 $self->leave_link ($map, $x, $y); 1879 $self->leave_link ($map, $x, $y);
1807 })->prio (1); 1880 })->prio (1);
1808} 1881}
1809 1882
… …
1840 # that depends on the exit object 1913 # that depends on the exit object
1841 1914
1842 my $rmp = parse_random_map_params $exit->msg; 1915 my $rmp = parse_random_map_params $exit->msg;
1843 1916
1844 if ($exit->map) { 1917 if ($exit->map) {
1845 $rmp->{region} = $exit->map->region_name; 1918 $rmp->{region} = $exit->region->name;
1846 $rmp->{origin_map} = $exit->map->path; 1919 $rmp->{origin_map} = $exit->map->path;
1847 $rmp->{origin_x} = $exit->x; 1920 $rmp->{origin_x} = $exit->x;
1848 $rmp->{origin_y} = $exit->y; 1921 $rmp->{origin_y} = $exit->y;
1849 } 1922 }
1850 1923
… …
1867sub cf::object::player::enter_exit { 1940sub cf::object::player::enter_exit {
1868 my ($self, $exit) = @_; 1941 my ($self, $exit) = @_;
1869 1942
1870 return unless $self->type == cf::PLAYER; 1943 return unless $self->type == cf::PLAYER;
1871 1944
1945 if ($exit->slaying eq "/!") {
1946 #TODO: this should de-fi-ni-te-ly not be a sync-job
1947 cf::sync_job { prepare_random_map $exit };
1948 }
1949
1950 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1951 my $hp = $exit->stats->hp;
1952 my $sp = $exit->stats->sp;
1953
1872 $self->enter_link; 1954 $self->enter_link;
1873 1955
1874 (async { 1956 (async {
1875 $self->deactivate_recursive; # just to be sure 1957 $self->deactivate_recursive; # just to be sure
1876 unless (eval { 1958 unless (eval {
1877 prepare_random_map $exit 1959 $self->goto ($slaying, $hp, $sp);
1878 if $exit->slaying eq "/!";
1879
1880 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1881 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1882 1960
1883 1; 1961 1;
1884 }) { 1962 }) {
1885 $self->message ("Something went wrong deep within the crossfire server. " 1963 $self->message ("Something went wrong deep within the crossfire server. "
1886 . "I'll try to bring you back to the map you were before. " 1964 . "I'll try to bring you back to the map you were before. "
… …
1947 # get handled first 2025 # get handled first
1948 my $queue = delete $ns->{query_queue} 2026 my $queue = delete $ns->{query_queue}
1949 or return; # be conservative, not sure how that can happen, but we saw a crash here 2027 or return; # be conservative, not sure how that can happen, but we saw a crash here
1950 2028
1951 (shift @$queue)->[1]->($msg); 2029 (shift @$queue)->[1]->($msg);
2030 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1952 2031
1953 push @{ $ns->{query_queue} }, @$queue; 2032 push @{ $ns->{query_queue} }, @$queue;
1954 2033
1955 if (@{ $ns->{query_queue} } == @$queue) { 2034 if (@{ $ns->{query_queue} } == @$queue) {
1956 if (@$queue) { 2035 if (@$queue) {
… …
2117The parameter C<$family> should best start with the name of the extension 2196The parameter C<$family> should best start with the name of the extension
2118using it, it should be unique. 2197using it, it should be unique.
2119 2198
2120=over 4 2199=over 4
2121 2200
2122=item $hashref = cf::db_get $family
2123
2124Return a hashref for use by the extension C<$family>, which can be
2125modified. After modifications, you have to call C<cf::db_dirty> or
2126C<cf::db_sync>.
2127
2128=item $value = cf::db_get $family => $key 2201=item $value = cf::db_get $family => $key
2129 2202
2130Returns a single value from the database 2203Returns a single value from the database.
2131
2132=item cf::db_put $family => $hashref
2133
2134Stores the given family hashref into the database. Updates are delayed, if
2135you want the data to be synced to disk immediately, use C<cf::db_sync>.
2136 2204
2137=item cf::db_put $family => $key => $value 2205=item cf::db_put $family => $key => $value
2138 2206
2139Stores the given C<$value> in the family hash. Updates are delayed, if you 2207Stores the given C<$value> in the family.
2140want the data to be synced to disk immediately, use C<cf::db_sync>.
2141
2142=item cf::db_dirty
2143
2144Marks the database as dirty, to be updated at a later time.
2145
2146=item cf::db_sync
2147
2148Immediately write the database to disk I<if it is dirty>.
2149 2208
2150=cut 2209=cut
2151 2210
2152our $DB; 2211our $DB;
2153 2212
2154{ 2213sub db_init {
2214 unless ($DB) {
2215 $DB = BDB::db_create $DB_ENV;
2216
2217 cf::sync_job {
2218 eval {
2219 $DB->set_flags (BDB::CHKSUM);
2220
2221 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2222 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2223 cf::cleanup "db_open(db): $!" if $!;
2224 };
2225 cf::cleanup "db_open(db): $@" if $@;
2226 };
2227
2155 my $path = cf::localdir . "/database.pst"; 2228 my $path = cf::localdir . "/database.pst";
2229 if (stat $path) {
2230 cf::sync_job {
2231 my $pst = Storable::retrieve $path;
2156 2232
2157 sub db_load() { 2233 cf::db_put (board => data => $pst->{board});
2158 $DB = stat $path ? Storable::retrieve $path : { }; 2234 cf::db_put (guildrules => data => $pst->{guildrules});
2159 } 2235 cf::db_put (rent => balance => $pst->{rent}{balance});
2236 BDB::db_env_txn_checkpoint $DB_ENV;
2160 2237
2161 my $pid; 2238 unlink $path;
2162
2163 sub db_save() {
2164 waitpid $pid, 0 if $pid;
2165 if (0 == ($pid = fork)) {
2166 $DB->{_meta}{version} = 1;
2167 Storable::nstore $DB, "$path~";
2168 rename "$path~", $path;
2169 cf::_exit 0 if defined $pid;
2170 } 2239 };
2171 }
2172
2173 my $dirty;
2174
2175 sub db_sync() {
2176 db_save if $dirty;
2177 undef $dirty;
2178 }
2179
2180 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2181 db_sync;
2182 });
2183
2184 sub db_dirty() {
2185 $dirty = 1;
2186 $idle->start;
2187 }
2188
2189 sub db_get($;$) {
2190 @_ >= 2
2191 ? $DB->{$_[0]}{$_[1]}
2192 : ($DB->{$_[0]} ||= { })
2193 }
2194
2195 sub db_put($$;$) {
2196 if (@_ >= 3) {
2197 $DB->{$_[0]}{$_[1]} = $_[2];
2198 } else {
2199 $DB->{$_[0]} = $_[1];
2200 }
2201 db_dirty;
2202 }
2203
2204 cf::global->attach (
2205 prio => 10000,
2206 on_cleanup => sub {
2207 db_sync;
2208 }, 2240 }
2209 ); 2241 }
2242}
2243
2244sub db_get($$) {
2245 my $key = "$_[0]/$_[1]";
2246
2247 cf::sync_job {
2248 BDB::db_get $DB, undef, $key, my $data;
2249
2250 $! ? ()
2251 : Compress::LZF::sthaw $data
2252 }
2253}
2254
2255sub db_put($$$) {
2256 BDB::dbreq_pri 4;
2257 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2210} 2258}
2211 2259
2212############################################################################# 2260#############################################################################
2213# the server's main() 2261# the server's init and main functions
2262
2263sub load_resources {
2264 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2265 or die "unable to load regions file\n";#d#
2266}
2214 2267
2215sub cfg_load { 2268sub cfg_load {
2216 open my $fh, "<:utf8", cf::confdir . "/config" 2269 open my $fh, "<:utf8", cf::confdir . "/config"
2217 or return; 2270 or return;
2218 2271
… …
2229 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2282 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2230 and die "WARNING: m(un)lockall failed: $!\n"; 2283 and die "WARNING: m(un)lockall failed: $!\n";
2231 }; 2284 };
2232 warn $@ if $@; 2285 warn $@ if $@;
2233 } 2286 }
2287}
2288
2289sub init {
2290 load_resources;
2234} 2291}
2235 2292
2236sub main { 2293sub main {
2237 # we must not ever block the main coroutine 2294 # we must not ever block the main coroutine
2238 local $Coro::idle = sub { 2295 local $Coro::idle = sub {
… …
2241 Event::one_event; 2298 Event::one_event;
2242 })->prio (Coro::PRIO_MAX); 2299 })->prio (Coro::PRIO_MAX);
2243 }; 2300 };
2244 2301
2245 cfg_load; 2302 cfg_load;
2246 db_load; 2303 db_init;
2247 load_extensions; 2304 load_extensions;
2248 2305
2249 $TICK_WATCHER->start; 2306 $TICK_WATCHER->start;
2250 Event::loop; 2307 Event::loop;
2251} 2308}
… …
2255 2312
2256# install some emergency cleanup handlers 2313# install some emergency cleanup handlers
2257BEGIN { 2314BEGIN {
2258 for my $signal (qw(INT HUP TERM)) { 2315 for my $signal (qw(INT HUP TERM)) {
2259 Event->signal ( 2316 Event->signal (
2317 reentrant => 0,
2260 data => WF_AUTOCANCEL, 2318 data => WF_AUTOCANCEL,
2261 signal => $signal, 2319 signal => $signal,
2320 prio => 0,
2262 cb => sub { 2321 cb => sub {
2263 cf::cleanup "SIG$signal"; 2322 cf::cleanup "SIG$signal";
2264 }, 2323 },
2265 ); 2324 );
2266 } 2325 }
2267} 2326}
… …
2288 my $map = $cf::MAP{$path} or next; 2347 my $map = $cf::MAP{$path} or next;
2289 $map->valid or next; 2348 $map->valid or next;
2290 $map->save; 2349 $map->save;
2291 } 2350 }
2292 warn "end emergency map save\n"; 2351 warn "end emergency map save\n";
2352
2353 warn "begin emergency database checkpoint\n";
2354 BDB::db_env_txn_checkpoint $DB_ENV;
2355 warn "end emergency database checkpoint\n";
2293 }; 2356 };
2294 2357
2295 warn "leave emergency perl save\n"; 2358 warn "leave emergency perl save\n";
2359}
2360
2361sub post_cleanup {
2362 my ($make_core) = @_;
2363
2364 warn Carp::longmess "post_cleanup backtrace"
2365 if $make_core;
2296} 2366}
2297 2367
2298sub reload() { 2368sub reload() {
2299 # can/must only be called in main 2369 # can/must only be called in main
2300 if ($Coro::current != $Coro::main) { 2370 if ($Coro::current != $Coro::main) {
… …
2310 cf::emergency_save; 2380 cf::emergency_save;
2311 2381
2312 eval { 2382 eval {
2313 # if anything goes wrong in here, we should simply crash as we already saved 2383 # if anything goes wrong in here, we should simply crash as we already saved
2314 2384
2315 warn "syncing database to disk";
2316 cf::db_sync;
2317
2318 warn "cancelling all WF_AUTOCANCEL watchers"; 2385 warn "cancelling all WF_AUTOCANCEL watchers";
2319 for (Event::all_watchers) { 2386 for (Event::all_watchers) {
2320 $_->cancel if $_->data & WF_AUTOCANCEL; 2387 $_->cancel if $_->data & WF_AUTOCANCEL;
2321 } 2388 }
2322 2389
2390 warn "syncing database to disk";
2391 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2392
2323 warn "flushing outstanding aio requests"; 2393 warn "flushing outstanding aio requests";
2324 for (;;) { 2394 for (;;) {
2395 BDB::flush;
2325 IO::AIO::flush; 2396 IO::AIO::flush;
2326 Coro::cede; 2397 Coro::cede;
2327 last unless IO::AIO::nreqs; 2398 last unless IO::AIO::nreqs || BDB::nreqs;
2328 warn "iterate..."; 2399 warn "iterate...";
2329 } 2400 }
2330 2401
2331 warn "cancelling all extension coros"; 2402 warn "cancelling all extension coros";
2332 $_->cancel for values %EXT_CORO; 2403 $_->cancel for values %EXT_CORO;
… …
2387 require cf; 2458 require cf;
2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2459 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2389 2460
2390 warn "loading config and database again"; 2461 warn "loading config and database again";
2391 cf::cfg_load; 2462 cf::cfg_load;
2392 cf::db_load;
2393 2463
2394 warn "loading extensions"; 2464 warn "loading extensions";
2395 cf::load_extensions; 2465 cf::load_extensions;
2396 2466
2397 warn "reattaching attachments to objects/players"; 2467 warn "reattaching attachments to objects/players";
2398 _global_reattach; 2468 _global_reattach;
2399 warn "reattaching attachments to maps"; 2469 warn "reattaching attachments to maps";
2400 reattach $_ for values %MAP; 2470 reattach $_ for values %MAP;
2401 2471
2472 warn "loading reloadable resources";
2473 load_resources;
2474
2402 warn "restarting server ticker"; 2475 warn "restarting server ticker";
2403 2476
2404 $TICK_WATCHER->start; 2477 $TICK_WATCHER->start;
2405 }; 2478 };
2406 2479
… …
2422 $who->message ("reloading server."); 2495 $who->message ("reloading server.");
2423 2496
2424 # doing reload synchronously and two reloads happen back-to-back, 2497 # doing reload synchronously and two reloads happen back-to-back,
2425 # coro crashes during coro_state_free->destroy here. 2498 # coro crashes during coro_state_free->destroy here.
2426 2499
2427 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2500 $RELOAD_WATCHER ||= Event->timer (
2501 reentrant => 0,
2502 after => 0,
2503 data => WF_AUTOCANCEL,
2504 cb => sub {
2428 reload; 2505 reload;
2429 undef $RELOAD_WATCHER; 2506 undef $RELOAD_WATCHER;
2507 },
2430 }); 2508 );
2431 } 2509 }
2432}; 2510};
2433 2511
2434unshift @INC, $LIBDIR; 2512unshift @INC, $LIBDIR;
2435 2513
… …
2455 $NEXT_TICK += $TICK; 2533 $NEXT_TICK += $TICK;
2456 2534
2457 $WAIT_FOR_TICK->broadcast; 2535 $WAIT_FOR_TICK->broadcast;
2458 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2536 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2459 2537
2538 Event::sweep;
2539 Coro::cede_notself;
2540
2541# my $AFTER = Event::time;
2542# warn $AFTER - $NOW;#d#
2543
2460 # if we are delayed by four ticks or more, skip them all 2544 # if we are delayed by four ticks or more, skip them all
2461 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2545 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2462 2546
2463 $TICK_WATCHER->at ($NEXT_TICK); 2547 $TICK_WATCHER->at ($NEXT_TICK);
2464 $TICK_WATCHER->start; 2548 $TICK_WATCHER->start;
2465 }, 2549 },
2466); 2550);
2467 2551
2552{
2553 BDB::max_poll_time $TICK * 0.1;
2554 $BDB_POLL_WATCHER = Event->io (
2555 reentrant => 0,
2556 fd => BDB::poll_fileno,
2557 poll => 'r',
2558 prio => 0,
2559 data => WF_AUTOCANCEL,
2560 cb => \&BDB::poll_cb,
2561 );
2562 BDB::min_parallel 8;
2563
2564 BDB::set_sync_prepare {
2565 my $status;
2566 my $current = $Coro::current;
2567 (
2568 sub {
2569 $status = $!;
2570 $current->ready; undef $current;
2571 },
2572 sub {
2573 Coro::schedule while defined $current;
2574 $! = $status;
2575 },
2576 )
2577 };
2578
2579 unless ($DB_ENV) {
2580 $DB_ENV = BDB::db_env_create;
2581
2582 cf::sync_job {
2583 eval {
2584 BDB::db_env_open
2585 $DB_ENV,
2586 $BDB_ENV_DIR,
2587 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2588 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2589 0666;
2590
2591 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2592
2593 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2594 $DB_ENV->set_lk_detect;
2595 };
2596
2597 cf::cleanup "db_env_open(db): $@" if $@;
2598 };
2599 }
2600}
2601
2602{
2603 IO::AIO::min_parallel 8;
2604
2605 undef $Coro::AIO::WATCHER;
2468IO::AIO::max_poll_time $TICK * 0.2; 2606 IO::AIO::max_poll_time $TICK * 0.1;
2469
2470$AIO_POLL_WATCHER = Event->io ( 2607 $AIO_POLL_WATCHER = Event->io (
2608 reentrant => 0,
2471 fd => IO::AIO::poll_fileno, 2609 fd => IO::AIO::poll_fileno,
2472 poll => 'r', 2610 poll => 'r',
2473 prio => 5, 2611 prio => 6,
2474 data => WF_AUTOCANCEL, 2612 data => WF_AUTOCANCEL,
2475 cb => \&IO::AIO::poll_cb, 2613 cb => \&IO::AIO::poll_cb,
2476); 2614 );
2615}
2477 2616
2478$WRITE_RUNTIME_WATCHER = Event->timer ( 2617$WRITE_RUNTIME_WATCHER = Event->timer (
2618 reentrant => 0,
2479 data => WF_AUTOCANCEL, 2619 data => WF_AUTOCANCEL,
2480 after => 1, 2620 after => 1,
2481 interval => 10, 2621 interval => 10,
2622 prio => 6, # keep it lowest so it acts like a watchdog
2482 cb => Coro::unblock_sub { 2623 cb => Coro::unblock_sub {
2483 write_runtime 2624 write_runtime
2484 or warn "ERROR: unable to write runtime file: $!"; 2625 or warn "ERROR: unable to write runtime file: $!";
2485 }, 2626 },
2486); 2627);
2487 2628

Diff Legend

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