ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.184 by root, Fri Jan 19 22:47:57 2007 UTC vs.
Revision 1.222 by root, Tue Mar 6 03:06:00 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
366 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 367 # 10 is the runtime save interval, for a monotonic clock
368 # 60 allows for the watchdog to kill the server.
369
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 370 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 371 and return;
357 372
373 # always fsync - this file is important
358 aio_fsync $fh 374 aio_fsync $fh
359 and return; 375 and return;
360 376
361 close $fh 377 close $fh
362 or return; 378 or return;
… …
747 $filename, length $$rdata, scalar @$objs; 763 $filename, length $$rdata, scalar @$objs;
748 764
749 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 765 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
750 chmod SAVE_MODE, $fh; 766 chmod SAVE_MODE, $fh;
751 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 767 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
752 aio_fsync $fh; 768 aio_fsync $fh if $cf::USE_FSYNC;
753 close $fh; 769 close $fh;
754 770
755 if (@$objs) { 771 if (@$objs) {
756 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) {
757 chmod SAVE_MODE, $fh; 773 chmod SAVE_MODE, $fh;
758 my $data = Storable::nfreeze { version => 1, objs => $objs }; 774 my $data = Storable::nfreeze { version => 1, objs => $objs };
759 aio_write $fh, 0, (length $data), $data, 0; 775 aio_write $fh, 0, (length $data), $data, 0;
760 aio_fsync $fh; 776 aio_fsync $fh if $cf::USE_FSYNC;
761 close $fh; 777 close $fh;
762 aio_rename "$filename.pst~", "$filename.pst"; 778 aio_rename "$filename.pst~", "$filename.pst";
763 } 779 }
764 } else { 780 } else {
765 aio_unlink "$filename.pst"; 781 aio_unlink "$filename.pst";
… …
1014=cut 1030=cut
1015 1031
1016sub quit_character { 1032sub quit_character {
1017 my ($pl) = @_; 1033 my ($pl) = @_;
1018 1034
1035 my $name = $pl->ob->name;
1036
1019 $pl->{deny_save} = 1; 1037 $pl->{deny_save} = 1;
1020 $pl->password ("*"); # this should lock out the player until we nuked the dir 1038 $pl->password ("*"); # this should lock out the player until we nuked the dir
1021 1039
1022 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1040 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1023 $pl->deactivate; 1041 $pl->deactivate;
… …
1027 my $path = playerdir $pl; 1045 my $path = playerdir $pl;
1028 my $temp = "$path~$cf::RUNTIME~deleting~"; 1046 my $temp = "$path~$cf::RUNTIME~deleting~";
1029 aio_rename $path, $temp; 1047 aio_rename $path, $temp;
1030 delete $cf::PLAYER{$pl->ob->name}; 1048 delete $cf::PLAYER{$pl->ob->name};
1031 $pl->destroy; 1049 $pl->destroy;
1050
1051 my $prefix = qr<^~\Q$name\E/>;
1052
1053 # nuke player maps
1054 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1055
1032 IO::AIO::aio_rmtree $temp; 1056 IO::AIO::aio_rmtree $temp;
1057}
1058
1059=item $pl->kick
1060
1061Kicks a player out of the game. This destroys the connection.
1062
1063=cut
1064
1065sub kick {
1066 my ($pl, $kicker) = @_;
1067
1068 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1069 $pl->killer ("kicked");
1070 $pl->ns->destroy;
1033} 1071}
1034 1072
1035=item cf::player::list_logins 1073=item cf::player::list_logins
1036 1074
1037Returns am arrayref of all valid playernames in the system, can take a 1075Returns am arrayref of all valid playernames in the system, can take a
… …
1065=cut 1103=cut
1066 1104
1067sub maps($) { 1105sub maps($) {
1068 my ($pl) = @_; 1106 my ($pl) = @_;
1069 1107
1108 $pl = ref $pl ? $pl->ob->name : $pl;
1109
1070 my $files = aio_readdir playerdir $pl 1110 my $files = aio_readdir playerdir $pl
1071 or return; 1111 or return;
1072 1112
1073 my @paths; 1113 my @paths;
1074 1114
1075 for (@$files) { 1115 for (@$files) {
1076 utf8::decode $_; 1116 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1117 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1118 next unless /^$PATH_SEP/o;
1079 1119
1080 s/\.map$//; 1120 push @paths, cf::map::normalise "~$pl/$_";
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 } 1121 }
1083 1122
1084 \@paths 1123 \@paths
1085} 1124}
1086 1125
… …
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1176 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1177 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1178 )
1140} 1179}
1141 1180
1181=item cf::map->register ($regex, $prio)
1182
1183Register a handler for the map path matching the given regex at the
1184givne priority (higher is better, built-in handlers have priority 0, the
1185default).
1186
1187=cut
1188
1142sub register { 1189sub register {
1143 my (undef, $regex) = @_; 1190 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1191 my $pkg = caller;
1145 1192
1146 no strict; 1193 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1194 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1195
1149 $EXT_MAP{$pkg} = qr<$regex>; 1196 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1197}
1151 1198
1152# also paths starting with '/' 1199# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1200$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1201
1155sub thawer_merge { 1202sub thawer_merge {
1156 my ($self, $merge) = @_; 1203 my ($self, $merge) = @_;
1157 1204
1158 # we have to keep some variables in memory intact 1205 # we have to keep some variables in memory intact
… …
1164 $self->SUPER::thawer_merge ($merge); 1211 $self->SUPER::thawer_merge ($merge);
1165} 1212}
1166 1213
1167sub normalise { 1214sub normalise {
1168 my ($path, $base) = @_; 1215 my ($path, $base) = @_;
1216
1217 $path = "$path"; # make sure its a string
1218
1219 $path =~ s/\.map$//;
1169 1220
1170 # map plan: 1221 # map plan:
1171 # 1222 #
1172 # /! non-realised random map exit (special hack!) 1223 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched 1224 # {... are special paths that are not being touched
… …
1201 1252
1202 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1253 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1203 1254
1204 $path = normalise $path, $base; 1255 $path = normalise $path, $base;
1205 1256
1206 for my $pkg (keys %EXT_MAP) { 1257 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1258 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1259 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1260 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1261 $self->init; # pass $1 etc.
1211 return $self; 1262 return $self;
1212 } 1263 }
1213 } 1264 }
1214 1265
1215 Carp::carp "unable to resolve path '$path'."; 1266 Carp::carp "unable to resolve path '$path' (base '$base').";
1216 () 1267 ()
1217} 1268}
1218 1269
1219sub init { 1270sub init {
1220 my ($self) = @_; 1271 my ($self) = @_;
… …
1235 1286
1236# the original (read-only) location 1287# the original (read-only) location
1237sub load_path { 1288sub load_path {
1238 my ($self) = @_; 1289 my ($self) = @_;
1239 1290
1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1291 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1241} 1292}
1242 1293
1243# the temporary/swap location 1294# the temporary/swap location
1244sub save_path { 1295sub save_path {
1245 my ($self) = @_; 1296 my ($self) = @_;
1246 1297
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1298 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1299 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1249} 1300}
1250 1301
1251# the unique path, undef == no special unique path 1302# the unique path, undef == no special unique path
1252sub uniq_path { 1303sub uniq_path {
1253 my ($self) = @_; 1304 my ($self) = @_;
… …
1275 1326
1276sub load_header_from($) { 1327sub load_header_from($) {
1277 my ($self, $path) = @_; 1328 my ($self, $path) = @_;
1278 1329
1279 utf8::encode $path; 1330 utf8::encode $path;
1280 aio_open $path, O_RDONLY, 0 1331 #aio_open $path, O_RDONLY, 0
1281 or return; 1332 # or return;
1282 1333
1283 $self->_load_header ($path) 1334 $self->_load_header ($path)
1284 or return; 1335 or return;
1285 1336
1286 $self->{load_path} = $path; 1337 $self->{load_path} = $path;
1287 1338
1288 1 1339 1
1289} 1340}
1290 1341
1291sub load_orig { 1342sub load_header_orig {
1292 my ($self) = @_; 1343 my ($self) = @_;
1293 1344
1294 $self->load_header_from ($self->load_path) 1345 $self->load_header_from ($self->load_path)
1295} 1346}
1296 1347
1297sub load_temp { 1348sub load_header_temp {
1298 my ($self) = @_; 1349 my ($self) = @_;
1299 1350
1300 $self->load_header_from ($self->save_path) 1351 $self->load_header_from ($self->save_path)
1352}
1353
1354sub prepare_temp {
1355 my ($self) = @_;
1356
1357 $self->last_access ((delete $self->{last_access})
1358 || $cf::RUNTIME); #d#
1359 # safety
1360 $self->{instantiate_time} = $cf::RUNTIME
1361 if $self->{instantiate_time} > $cf::RUNTIME;
1362}
1363
1364sub prepare_orig {
1365 my ($self) = @_;
1366
1367 $self->{load_original} = 1;
1368 $self->{instantiate_time} = $cf::RUNTIME;
1369 $self->last_access ($cf::RUNTIME);
1370 $self->instantiate;
1301} 1371}
1302 1372
1303sub load_header { 1373sub load_header {
1304 my ($self) = @_; 1374 my ($self) = @_;
1305 1375
1306 if ($self->load_temp) { 1376 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1377 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1378 } else {
1313 $self->load_orig 1379 $self->load_header_orig
1314 or return; 1380 or return;
1315 1381 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1382 }
1321 1383
1322 1 1384 1
1323} 1385}
1324 1386
… …
1338 $map->{last_save} = $cf::RUNTIME; 1400 $map->{last_save} = $cf::RUNTIME;
1339 1401
1340 $map->load_header 1402 $map->load_header
1341 or return; 1403 or return;
1342 1404
1343 if ($map->should_reset) { 1405 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1406 # doing this can freeze the server in a sync job, obviously
1344 $cf::WAIT_FOR_TICK->wait; 1407 #$cf::WAIT_FOR_TICK->wait;
1345 $map->reset; 1408 $map->reset;
1346 undef $guard; 1409 undef $guard;
1347 $map = find $path 1410 return find $path;
1348 or return;
1349 } 1411 }
1350 1412
1351 $cf::MAP{$path} = $map 1413 $cf::MAP{$path} = $map
1352 } 1414 }
1353} 1415}
1416
1417sub pre_load { }
1418sub post_load { }
1354 1419
1355sub load { 1420sub load {
1356 my ($self) = @_; 1421 my ($self) = @_;
1357 1422
1423 local $self->{deny_reset} = 1; # loading can take a long time
1424
1358 my $path = $self->{path}; 1425 my $path = $self->{path};
1359 my $guard = cf::lock_acquire "map_load:$path"; 1426 my $guard = cf::lock_acquire "map_load:$path";
1360 1427
1361 return if $self->in_memory != cf::MAP_SWAPPED; 1428 return if $self->in_memory != cf::MAP_SWAPPED;
1362 1429
1363 $self->in_memory (cf::MAP_LOADING); 1430 $self->in_memory (cf::MAP_LOADING);
1364 1431
1365 $self->alloc; 1432 $self->alloc;
1433
1434 $self->pre_load;
1435
1366 $self->_load_objects ($self->{load_path}, 1) 1436 $self->_load_objects ($self->{load_path}, 1)
1367 or return; 1437 or return;
1368 1438
1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1439 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1370 if delete $self->{load_original}; 1440 if delete $self->{load_original};
… …
1392 unless $self->difficulty; 1462 unless $self->difficulty;
1393 Coro::cede; 1463 Coro::cede;
1394 $self->activate; 1464 $self->activate;
1395 } 1465 }
1396 1466
1467 $self->post_load;
1468
1397 $self->in_memory (cf::MAP_IN_MEMORY); 1469 $self->in_memory (cf::MAP_IN_MEMORY);
1398} 1470}
1399 1471
1400sub customise_for { 1472sub customise_for {
1401 my ($self, $ob) = @_; 1473 my ($self, $ob) = @_;
… …
1465 delete $MAP_PREFETCH{$path}; 1537 delete $MAP_PREFETCH{$path};
1466 } 1538 }
1467 } 1539 }
1468 undef $MAP_PREFETCHER; 1540 undef $MAP_PREFETCHER;
1469 }; 1541 };
1542 $MAP_PREFETCHER->prio (6);
1470 1543
1471 () 1544 ()
1472} 1545}
1473 1546
1474sub save { 1547sub save {
… …
1544 return if $self->players; 1617 return if $self->players;
1545 return if $self->isa ("ext::map_per_player");#d# 1618 return if $self->isa ("ext::map_per_player");#d#
1546 1619
1547 warn "resetting map ", $self->path;#d# 1620 warn "resetting map ", $self->path;#d#
1548 1621
1622 $self->in_memory (cf::MAP_SWAPPED);
1623
1624 # need to save uniques path
1625 unless ($self->{deny_save}) {
1626 my $uniq = $self->uniq_path; utf8::encode $uniq;
1627
1628 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1629 if $uniq;
1630 }
1631
1549 delete $cf::MAP{$self->path}; 1632 delete $cf::MAP{$self->path};
1550 1633
1551 $self->in_memory (cf::MAP_SWAPPED);
1552 $self->clear; 1634 $self->clear;
1553 1635
1554 $_->clear_links_to ($self) for values %cf::MAP; 1636 $_->clear_links_to ($self) for values %cf::MAP;
1555 1637
1556 $self->unlink_save; 1638 $self->unlink_save;
… …
1593 for (@$files) { 1675 for (@$files) {
1594 utf8::decode $_; 1676 utf8::decode $_;
1595 next if /\.pst$/; 1677 next if /\.pst$/;
1596 next unless /^$PATH_SEP/o; 1678 next unless /^$PATH_SEP/o;
1597 1679
1598 s/\.map$//; 1680 push @paths, cf::map::normalise $_;
1599 push @paths, $_;
1600 } 1681 }
1601 1682
1602 \@paths 1683 \@paths
1603} 1684}
1604 1685
… …
1698=cut 1779=cut
1699 1780
1700sub link_map { 1781sub link_map {
1701 unless ($LINK_MAP) { 1782 unless ($LINK_MAP) {
1702 $LINK_MAP = cf::map::find "{link}" 1783 $LINK_MAP = cf::map::find "{link}"
1703 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1784 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1704 $LINK_MAP->load; 1785 $LINK_MAP->load;
1705 } 1786 }
1706 1787
1707 $LINK_MAP 1788 $LINK_MAP
1708} 1789}
… …
1715 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1796 return if UNIVERSAL::isa $self->map, "ext::map_link";
1716 1797
1717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1798 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1718 if $self->map; 1799 if $self->map;
1719 1800
1720 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1801 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1721} 1802}
1722 1803
1723sub cf::object::player::leave_link { 1804sub cf::object::player::leave_link {
1724 my ($self, $map, $x, $y) = @_; 1805 my ($self, $map, $x, $y) = @_;
1725 1806
… …
1747 $map->load; 1828 $map->load;
1748 $map->load_diag; 1829 $map->load_diag;
1749 1830
1750 return unless $self->contr->active; 1831 return unless $self->contr->active;
1751 $self->activate_recursive; 1832 $self->activate_recursive;
1833
1834 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1752 $self->enter_map ($map, $x, $y); 1835 $self->enter_map ($map, $x, $y);
1753} 1836}
1754 1837
1755cf::player->attach ( 1838cf::player->attach (
1756 on_logout => sub { 1839 on_logout => sub {
… …
1769 # try to abort aborted map switching on player login :) 1852 # try to abort aborted map switching on player login :)
1770 # should happen only on crashes 1853 # should happen only on crashes
1771 if ($pl->ob->{_link_pos}) { 1854 if ($pl->ob->{_link_pos}) {
1772 $pl->ob->enter_link; 1855 $pl->ob->enter_link;
1773 (async { 1856 (async {
1774 # we need this sleep as the login has a concurrent enter_exit running
1775 # and this sleep increases chances of the player not ending up in scorn
1776 $pl->ob->reply (undef, 1857 $pl->ob->reply (undef,
1777 "There was an internal problem at your last logout, " 1858 "There was an internal problem at your last logout, "
1778 . "the server will try to bring you to your intended destination in a second.", 1859 . "the server will try to bring you to your intended destination in a second.",
1779 cf::NDI_RED); 1860 cf::NDI_RED);
1861 # we need this sleep as the login has a concurrent enter_exit running
1862 # and this sleep increases chances of the player not ending up in scorn
1780 Coro::Timer::sleep 1; 1863 Coro::Timer::sleep 1;
1781 $pl->ob->leave_link; 1864 $pl->ob->leave_link;
1782 })->prio (2); 1865 })->prio (2);
1783 } 1866 }
1784 }, 1867 },
… …
1792 my ($self, $path, $x, $y) = @_; 1875 my ($self, $path, $x, $y) = @_;
1793 1876
1794 $self->enter_link; 1877 $self->enter_link;
1795 1878
1796 (async { 1879 (async {
1880 my $map = eval {
1797 my $map = cf::map::find $path; 1881 my $map = cf::map::find $path;
1798 $map = $map->customise_for ($self) if $map; 1882 $map = $map->customise_for ($self) if $map;
1799 1883 $map
1800# warn "entering ", $map->path, " at ($x, $y)\n" 1884 } or
1801# if $map;
1802
1803 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1885 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1804 1886
1805 $self->leave_link ($map, $x, $y); 1887 $self->leave_link ($map, $x, $y);
1806 })->prio (1); 1888 })->prio (1);
1807} 1889}
1808 1890
… …
1839 # that depends on the exit object 1921 # that depends on the exit object
1840 1922
1841 my $rmp = parse_random_map_params $exit->msg; 1923 my $rmp = parse_random_map_params $exit->msg;
1842 1924
1843 if ($exit->map) { 1925 if ($exit->map) {
1844 $rmp->{region} = $exit->map->region_name; 1926 $rmp->{region} = $exit->region->name;
1845 $rmp->{origin_map} = $exit->map->path; 1927 $rmp->{origin_map} = $exit->map->path;
1846 $rmp->{origin_x} = $exit->x; 1928 $rmp->{origin_x} = $exit->x;
1847 $rmp->{origin_y} = $exit->y; 1929 $rmp->{origin_y} = $exit->y;
1848 } 1930 }
1849 1931
… …
1866sub cf::object::player::enter_exit { 1948sub cf::object::player::enter_exit {
1867 my ($self, $exit) = @_; 1949 my ($self, $exit) = @_;
1868 1950
1869 return unless $self->type == cf::PLAYER; 1951 return unless $self->type == cf::PLAYER;
1870 1952
1953 if ($exit->slaying eq "/!") {
1954 #TODO: this should de-fi-ni-te-ly not be a sync-job
1955 cf::sync_job { prepare_random_map $exit };
1956 }
1957
1958 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1959 my $hp = $exit->stats->hp;
1960 my $sp = $exit->stats->sp;
1961
1871 $self->enter_link; 1962 $self->enter_link;
1872 1963
1873 (async { 1964 (async {
1874 $self->deactivate_recursive; # just to be sure 1965 $self->deactivate_recursive; # just to be sure
1875 unless (eval { 1966 unless (eval {
1876 prepare_random_map $exit 1967 $self->goto ($slaying, $hp, $sp);
1877 if $exit->slaying eq "/!";
1878
1879 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1880 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1881 1968
1882 1; 1969 1;
1883 }) { 1970 }) {
1884 $self->message ("Something went wrong deep within the crossfire server. " 1971 $self->message ("Something went wrong deep within the crossfire server. "
1885 . "I'll try to bring you back to the map you were before. " 1972 . "I'll try to bring you back to the map you were before. "
… …
1946 # get handled first 2033 # get handled first
1947 my $queue = delete $ns->{query_queue} 2034 my $queue = delete $ns->{query_queue}
1948 or return; # be conservative, not sure how that can happen, but we saw a crash here 2035 or return; # be conservative, not sure how that can happen, but we saw a crash here
1949 2036
1950 (shift @$queue)->[1]->($msg); 2037 (shift @$queue)->[1]->($msg);
2038 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1951 2039
1952 push @{ $ns->{query_queue} }, @$queue; 2040 push @{ $ns->{query_queue} }, @$queue;
1953 2041
1954 if (@{ $ns->{query_queue} } == @$queue) { 2042 if (@{ $ns->{query_queue} } == @$queue) {
1955 if (@$queue) { 2043 if (@$queue) {
… …
2116The parameter C<$family> should best start with the name of the extension 2204The parameter C<$family> should best start with the name of the extension
2117using it, it should be unique. 2205using it, it should be unique.
2118 2206
2119=over 4 2207=over 4
2120 2208
2121=item $hashref = cf::db_get $family
2122
2123Return a hashref for use by the extension C<$family>, which can be
2124modified. After modifications, you have to call C<cf::db_dirty> or
2125C<cf::db_sync>.
2126
2127=item $value = cf::db_get $family => $key 2209=item $value = cf::db_get $family => $key
2128 2210
2129Returns a single value from the database 2211Returns a single value from the database.
2130
2131=item cf::db_put $family => $hashref
2132
2133Stores the given family hashref into the database. Updates are delayed, if
2134you want the data to be synced to disk immediately, use C<cf::db_sync>.
2135 2212
2136=item cf::db_put $family => $key => $value 2213=item cf::db_put $family => $key => $value
2137 2214
2138Stores the given C<$value> in the family hash. Updates are delayed, if you 2215Stores the given C<$value> in the family.
2139want the data to be synced to disk immediately, use C<cf::db_sync>.
2140
2141=item cf::db_dirty
2142
2143Marks the database as dirty, to be updated at a later time.
2144
2145=item cf::db_sync
2146
2147Immediately write the database to disk I<if it is dirty>.
2148 2216
2149=cut 2217=cut
2150 2218
2151our $DB; 2219our $DB;
2152 2220
2153{ 2221sub db_init {
2222 unless ($DB) {
2223 $DB = BDB::db_create $DB_ENV;
2224
2225 cf::sync_job {
2226 eval {
2227 $DB->set_flags (BDB::CHKSUM);
2228
2229 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2230 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2231 cf::cleanup "db_open(db): $!" if $!;
2232 };
2233 cf::cleanup "db_open(db): $@" if $@;
2234 };
2235
2154 my $path = cf::localdir . "/database.pst"; 2236 my $path = cf::localdir . "/database.pst";
2237 if (stat $path) {
2238 cf::sync_job {
2239 my $pst = Storable::retrieve $path;
2155 2240
2156 sub db_load() { 2241 cf::db_put (board => data => $pst->{board});
2157 $DB = stat $path ? Storable::retrieve $path : { }; 2242 cf::db_put (guildrules => data => $pst->{guildrules});
2158 } 2243 cf::db_put (rent => balance => $pst->{rent}{balance});
2244 BDB::db_env_txn_checkpoint $DB_ENV;
2159 2245
2160 my $pid; 2246 unlink $path;
2161
2162 sub db_save() {
2163 waitpid $pid, 0 if $pid;
2164 if (0 == ($pid = fork)) {
2165 $DB->{_meta}{version} = 1;
2166 Storable::nstore $DB, "$path~";
2167 rename "$path~", $path;
2168 cf::_exit 0 if defined $pid;
2169 } 2247 };
2170 }
2171
2172 my $dirty;
2173
2174 sub db_sync() {
2175 db_save if $dirty;
2176 undef $dirty;
2177 }
2178
2179 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2180 db_sync;
2181 });
2182
2183 sub db_dirty() {
2184 $dirty = 1;
2185 $idle->start;
2186 }
2187
2188 sub db_get($;$) {
2189 @_ >= 2
2190 ? $DB->{$_[0]}{$_[1]}
2191 : ($DB->{$_[0]} ||= { })
2192 }
2193
2194 sub db_put($$;$) {
2195 if (@_ >= 3) {
2196 $DB->{$_[0]}{$_[1]} = $_[2];
2197 } else {
2198 $DB->{$_[0]} = $_[1];
2199 }
2200 db_dirty;
2201 }
2202
2203 cf::global->attach (
2204 prio => 10000,
2205 on_cleanup => sub {
2206 db_sync;
2207 }, 2248 }
2208 ); 2249 }
2250}
2251
2252sub db_get($$) {
2253 my $key = "$_[0]/$_[1]";
2254
2255 cf::sync_job {
2256 BDB::db_get $DB, undef, $key, my $data;
2257
2258 $! ? ()
2259 : Compress::LZF::sthaw $data
2260 }
2261}
2262
2263sub db_put($$$) {
2264 BDB::dbreq_pri 4;
2265 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2209} 2266}
2210 2267
2211############################################################################# 2268#############################################################################
2212# the server's main() 2269# the server's init and main functions
2270
2271sub init_resources {
2272 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2273 or die "unable to load regions file\n";#d#
2274}
2213 2275
2214sub cfg_load { 2276sub cfg_load {
2215 open my $fh, "<:utf8", cf::confdir . "/config" 2277 open my $fh, "<:utf8", cf::confdir . "/config"
2216 or return; 2278 or return;
2217 2279
… …
2228 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2290 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2229 and die "WARNING: m(un)lockall failed: $!\n"; 2291 and die "WARNING: m(un)lockall failed: $!\n";
2230 }; 2292 };
2231 warn $@ if $@; 2293 warn $@ if $@;
2232 } 2294 }
2295}
2296
2297sub init {
2298 init_resources;
2233} 2299}
2234 2300
2235sub main { 2301sub main {
2236 # we must not ever block the main coroutine 2302 # we must not ever block the main coroutine
2237 local $Coro::idle = sub { 2303 local $Coro::idle = sub {
… …
2240 Event::one_event; 2306 Event::one_event;
2241 })->prio (Coro::PRIO_MAX); 2307 })->prio (Coro::PRIO_MAX);
2242 }; 2308 };
2243 2309
2244 cfg_load; 2310 cfg_load;
2245 db_load; 2311 db_init;
2246 load_extensions; 2312 load_extensions;
2247 2313
2248 $TICK_WATCHER->start; 2314 $TICK_WATCHER->start;
2249 Event::loop; 2315 Event::loop;
2250} 2316}
… …
2254 2320
2255# install some emergency cleanup handlers 2321# install some emergency cleanup handlers
2256BEGIN { 2322BEGIN {
2257 for my $signal (qw(INT HUP TERM)) { 2323 for my $signal (qw(INT HUP TERM)) {
2258 Event->signal ( 2324 Event->signal (
2325 reentrant => 0,
2259 data => WF_AUTOCANCEL, 2326 data => WF_AUTOCANCEL,
2260 signal => $signal, 2327 signal => $signal,
2328 prio => 0,
2261 cb => sub { 2329 cb => sub {
2262 cf::cleanup "SIG$signal"; 2330 cf::cleanup "SIG$signal";
2263 }, 2331 },
2264 ); 2332 );
2265 } 2333 }
2266} 2334}
… …
2287 my $map = $cf::MAP{$path} or next; 2355 my $map = $cf::MAP{$path} or next;
2288 $map->valid or next; 2356 $map->valid or next;
2289 $map->save; 2357 $map->save;
2290 } 2358 }
2291 warn "end emergency map save\n"; 2359 warn "end emergency map save\n";
2360
2361 warn "begin emergency database checkpoint\n";
2362 BDB::db_env_txn_checkpoint $DB_ENV;
2363 warn "end emergency database checkpoint\n";
2292 }; 2364 };
2293 2365
2294 warn "leave emergency perl save\n"; 2366 warn "leave emergency perl save\n";
2367}
2368
2369sub post_cleanup {
2370 my ($make_core) = @_;
2371
2372 warn Carp::longmess "post_cleanup backtrace"
2373 if $make_core;
2295} 2374}
2296 2375
2297sub reload() { 2376sub reload() {
2298 # can/must only be called in main 2377 # can/must only be called in main
2299 if ($Coro::current != $Coro::main) { 2378 if ($Coro::current != $Coro::main) {
… …
2301 return; 2380 return;
2302 } 2381 }
2303 2382
2304 warn "reloading..."; 2383 warn "reloading...";
2305 2384
2306 warn "cancelling server ticker"; 2385 warn "entering sync_job";
2307 $TICK_WATCHER->cancel;
2308 2386
2387 cf::sync_job {
2388 cf::write_runtime; # external watchdog should not bark
2309 cf::emergency_save; 2389 cf::emergency_save;
2390 cf::write_runtime; # external watchdog should not bark
2310 2391
2311 eval { 2392 warn "syncing database to disk";
2393 BDB::db_env_txn_checkpoint $DB_ENV;
2394
2312 # if anything goes wrong in here, we should simply crash as we already saved 2395 # if anything goes wrong in here, we should simply crash as we already saved
2313
2314 warn "syncing database to disk";
2315 cf::db_sync;
2316 2396
2317 warn "cancelling all WF_AUTOCANCEL watchers"; 2397 warn "cancelling all WF_AUTOCANCEL watchers";
2318 for (Event::all_watchers) { 2398 for (Event::all_watchers) {
2319 $_->cancel if $_->data & WF_AUTOCANCEL; 2399 $_->cancel if $_->data & WF_AUTOCANCEL;
2320 } 2400 }
2321 2401
2322 warn "flushing outstanding aio requests"; 2402 warn "flushing outstanding aio requests";
2323 for (;;) { 2403 for (;;) {
2404 BDB::flush;
2324 IO::AIO::flush; 2405 IO::AIO::flush;
2325 Coro::cede; 2406 Coro::cede;
2326 last unless IO::AIO::nreqs; 2407 last unless IO::AIO::nreqs || BDB::nreqs;
2327 warn "iterate..."; 2408 warn "iterate...";
2328 } 2409 }
2329 2410
2330 warn "cancelling all extension coros"; 2411 warn "cancelling all extension coros";
2331 $_->cancel for values %EXT_CORO; 2412 $_->cancel for values %EXT_CORO;
… …
2386 require cf; 2467 require cf;
2387 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2468 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2388 2469
2389 warn "loading config and database again"; 2470 warn "loading config and database again";
2390 cf::cfg_load; 2471 cf::cfg_load;
2391 cf::db_load;
2392 2472
2393 warn "loading extensions"; 2473 warn "loading extensions";
2394 cf::load_extensions; 2474 cf::load_extensions;
2395 2475
2396 warn "reattaching attachments to objects/players"; 2476 warn "reattaching attachments to objects/players";
2397 _global_reattach; 2477 _global_reattach; # objects, sockets
2398 warn "reattaching attachments to maps"; 2478 warn "reattaching attachments to maps";
2399 reattach $_ for values %MAP; 2479 reattach $_ for values %MAP;
2480 warn "reattaching attachments to players";
2481 reattach $_ for values %PLAYER;
2400 2482
2401 warn "restarting server ticker"; 2483 warn "loading reloadable resources";
2484 init_resources;
2402 2485
2403 $TICK_WATCHER->start; 2486 warn "leaving sync_job";
2404 };
2405 2487
2406 if ($@) { 2488 1
2489 } or do {
2407 warn $@; 2490 warn $@;
2408 warn "error while reloading, exiting."; 2491 warn "error while reloading, exiting.";
2409 exit 1; 2492 exit 1;
2410 } 2493 };
2411 2494
2412 warn "reloaded"; 2495 warn "reloaded";
2413}; 2496};
2414 2497
2415our $RELOAD_WATCHER; # used only during reload 2498our $RELOAD_WATCHER; # used only during reload
… …
2421 $who->message ("reloading server."); 2504 $who->message ("reloading server.");
2422 2505
2423 # doing reload synchronously and two reloads happen back-to-back, 2506 # doing reload synchronously and two reloads happen back-to-back,
2424 # coro crashes during coro_state_free->destroy here. 2507 # coro crashes during coro_state_free->destroy here.
2425 2508
2426 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2509 $RELOAD_WATCHER ||= Event->timer (
2510 reentrant => 0,
2511 after => 0,
2512 data => WF_AUTOCANCEL,
2513 cb => sub {
2427 reload; 2514 reload;
2428 undef $RELOAD_WATCHER; 2515 undef $RELOAD_WATCHER;
2516 },
2429 }); 2517 );
2430 } 2518 }
2431}; 2519};
2432 2520
2433unshift @INC, $LIBDIR; 2521unshift @INC, $LIBDIR;
2434 2522
… …
2451 2539
2452 cf::server_tick; # one server iteration 2540 cf::server_tick; # one server iteration
2453 $RUNTIME += $TICK; 2541 $RUNTIME += $TICK;
2454 $NEXT_TICK += $TICK; 2542 $NEXT_TICK += $TICK;
2455 2543
2544 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2545 $NEXT_RUNTIME_WRITE = $NOW + 10;
2546 Coro::async_pool {
2547 write_runtime
2548 or warn "ERROR: unable to write runtime file: $!";
2549 };
2550 }
2551
2456 $WAIT_FOR_TICK->broadcast; 2552 $WAIT_FOR_TICK->broadcast;
2457 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2553 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2554
2555# my $AFTER = Event::time;
2556# warn $AFTER - $NOW;#d#
2458 2557
2459 # if we are delayed by four ticks or more, skip them all 2558 # if we are delayed by four ticks or more, skip them all
2460 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2559 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2461 2560
2462 $TICK_WATCHER->at ($NEXT_TICK); 2561 $TICK_WATCHER->at ($NEXT_TICK);
2463 $TICK_WATCHER->start; 2562 $TICK_WATCHER->start;
2464 }, 2563 },
2465); 2564);
2466 2565
2566{
2567 BDB::max_poll_time $TICK * 0.1;
2568 $BDB_POLL_WATCHER = Event->io (
2569 reentrant => 0,
2570 fd => BDB::poll_fileno,
2571 poll => 'r',
2572 prio => 0,
2573 data => WF_AUTOCANCEL,
2574 cb => \&BDB::poll_cb,
2575 );
2576 BDB::min_parallel 8;
2577
2578 BDB::set_sync_prepare {
2579 my $status;
2580 my $current = $Coro::current;
2581 (
2582 sub {
2583 $status = $!;
2584 $current->ready; undef $current;
2585 },
2586 sub {
2587 Coro::schedule while defined $current;
2588 $! = $status;
2589 },
2590 )
2591 };
2592
2593 unless ($DB_ENV) {
2594 $DB_ENV = BDB::db_env_create;
2595
2596 cf::sync_job {
2597 eval {
2598 BDB::db_env_open
2599 $DB_ENV,
2600 $BDB_ENV_DIR,
2601 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2602 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2603 0666;
2604
2605 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2606
2607 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2608 $DB_ENV->set_lk_detect;
2609 };
2610
2611 cf::cleanup "db_env_open(db): $@" if $@;
2612 };
2613 }
2614}
2615
2616{
2617 IO::AIO::min_parallel 8;
2618
2619 undef $Coro::AIO::WATCHER;
2467IO::AIO::max_poll_time $TICK * 0.2; 2620 IO::AIO::max_poll_time $TICK * 0.1;
2468
2469$AIO_POLL_WATCHER = Event->io ( 2621 $AIO_POLL_WATCHER = Event->io (
2470 fd => IO::AIO::poll_fileno, 2622 reentrant => 0,
2471 poll => 'r',
2472 prio => 5,
2473 data => WF_AUTOCANCEL,
2474 cb => \&IO::AIO::poll_cb,
2475);
2476
2477$WRITE_RUNTIME_WATCHER = Event->timer (
2478 data => WF_AUTOCANCEL, 2623 data => WF_AUTOCANCEL,
2479 after => 1, 2624 fd => IO::AIO::poll_fileno,
2480 interval => 10, 2625 poll => 'r',
2481 cb => Coro::unblock_sub { 2626 prio => 6,
2482 write_runtime 2627 cb => \&IO::AIO::poll_cb,
2483 or warn "ERROR: unable to write runtime file: $!"; 2628 );
2484 }, 2629}
2485);
2486 2630
2487END { cf::emergency_save } 2631END { cf::emergency_save }
2488 2632
24891 26331
2490 2634

Diff Legend

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