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.173 by root, Sun Jan 14 18:00:34 2007 UTC vs.
Revision 1.209 by root, Mon Feb 12 01:25:55 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3 (); 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
… …
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";
… …
771 } 787 }
772 } else { 788 } else {
773 aio_unlink $filename; 789 aio_unlink $filename;
774 aio_unlink "$filename.pst"; 790 aio_unlink "$filename.pst";
775 } 791 }
792
793 #d##TODO# nuke non .map-files if exist
794 if ($filename =~ s/\.map$//) {
795 aio_unlink $filename;
796 aio_unlink "$filename.pst";
797 }
776 } 798 }
777} 799}
778 800
779sub object_freezer_as_string { 801sub object_freezer_as_string {
780 my ($rdata, $objs) = @_; 802 my ($rdata, $objs) = @_;
… …
786 808
787sub object_thawer_load { 809sub object_thawer_load {
788 my ($filename) = @_; 810 my ($filename) = @_;
789 811
790 my ($data, $av); 812 my ($data, $av);
813
814 #d#TODO remove .map if file does not exist
815 aio_stat $filename and $filename =~ s/\.map$//;
791 816
792 (aio_load $filename, $data) >= 0 817 (aio_load $filename, $data) >= 0
793 or return; 818 or return;
794 819
795 unless (aio_stat "$filename.pst") { 820 unless (aio_stat "$filename.pst") {
… …
957 982
958sub exists($) { 983sub exists($) {
959 my ($login) = @_; 984 my ($login) = @_;
960 985
961 $cf::PLAYER{$login} 986 $cf::PLAYER{$login}
962 or cf::sync_job { !aio_stat $login } 987 or cf::sync_job { !aio_stat path $login }
963} 988}
964 989
965sub find($) { 990sub find($) {
966 return $cf::PLAYER{$_[0]} || do { 991 return $cf::PLAYER{$_[0]} || do {
967 my $login = $_[0]; 992 my $login = $_[0];
… …
1065=cut 1090=cut
1066 1091
1067sub maps($) { 1092sub maps($) {
1068 my ($pl) = @_; 1093 my ($pl) = @_;
1069 1094
1095 $pl = ref $pl ? $pl->ob->name : $pl;
1096
1070 my $files = aio_readdir playerdir $pl 1097 my $files = aio_readdir playerdir $pl
1071 or return; 1098 or return;
1072 1099
1073 my @paths; 1100 my @paths;
1074 1101
1075 for (@$files) { 1102 for (@$files) {
1076 utf8::decode $_; 1103 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1104 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1105 next unless /^$PATH_SEP/o;
1079 1106
1080 s/\.map$//; 1107 push @paths, cf::map::normalise "~$pl/$_";
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 } 1108 }
1083 1109
1084 \@paths 1110 \@paths
1085} 1111}
1086 1112
… …
1121our $MAX_RESET = 3600; 1147our $MAX_RESET = 3600;
1122our $DEFAULT_RESET = 3000; 1148our $DEFAULT_RESET = 3000;
1123 1149
1124sub generate_random_map { 1150sub generate_random_map {
1125 my ($self, $rmp) = @_; 1151 my ($self, $rmp) = @_;
1126
1127 # mit "rum" bekleckern, nicht 1152 # mit "rum" bekleckern, nicht
1128 $self->_create_random_map ( 1153 $self->_create_random_map (
1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1154 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1155 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1156 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1163 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1139 (cf::region::find $rmp->{region}), $rmp->{custom} 1164 (cf::region::find $rmp->{region}), $rmp->{custom}
1140 ) 1165 )
1141} 1166}
1142 1167
1168=item cf::map->register ($regex, $prio)
1169
1170Register a handler for the map path matching the given regex at the
1171givne priority (higher is better, built-in handlers have priority 0, the
1172default).
1173
1174=cut
1175
1143sub register { 1176sub register {
1144 my (undef, $regex) = @_; 1177 my (undef, $regex, $prio) = @_;
1145 my $pkg = caller; 1178 my $pkg = caller;
1146 1179
1147 no strict; 1180 no strict;
1148 push @{"$pkg\::ISA"}, __PACKAGE__; 1181 push @{"$pkg\::ISA"}, __PACKAGE__;
1149 1182
1150 $EXT_MAP{$pkg} = qr<$regex>; 1183 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1151} 1184}
1152 1185
1153# also paths starting with '/' 1186# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1187$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1155 1188
1156sub thawer_merge { 1189sub thawer_merge {
1157 my ($self, $merge) = @_; 1190 my ($self, $merge) = @_;
1158 1191
1159 # we have to keep some variables in memory intact 1192 # we have to keep some variables in memory intact
… …
1165 $self->SUPER::thawer_merge ($merge); 1198 $self->SUPER::thawer_merge ($merge);
1166} 1199}
1167 1200
1168sub normalise { 1201sub normalise {
1169 my ($path, $base) = @_; 1202 my ($path, $base) = @_;
1203
1204 $path = "$path"; # make sure its a string
1205
1206 $path =~ s/\.map$//;
1170 1207
1171 # map plan: 1208 # map plan:
1172 # 1209 #
1173 # /! non-realised random map exit (special hack!) 1210 # /! non-realised random map exit (special hack!)
1174 # {... are special paths that are not being touched 1211 # {... are special paths that are not being touched
… …
1202 1239
1203 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1240 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1204 1241
1205 $path = normalise $path, $base; 1242 $path = normalise $path, $base;
1206 1243
1207 for my $pkg (keys %EXT_MAP) { 1244 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1208 if ($path =~ $EXT_MAP{$pkg}) { 1245 if ($path =~ $EXT_MAP{$pkg}[1]) {
1209 my $self = bless cf::map::new, $pkg; 1246 my $self = bless cf::map::new, $pkg;
1210 $self->{path} = $path; $self->path ($path); 1247 $self->{path} = $path; $self->path ($path);
1211 $self->init; # pass $1 etc. 1248 $self->init; # pass $1 etc.
1212 return $self; 1249 return $self;
1213 } 1250 }
1214 } 1251 }
1215 1252
1216 Carp::carp "unable to resolve path '$path'."; 1253 Carp::carp "unable to resolve path '$path' (base '$base').";
1217 () 1254 ()
1218} 1255}
1219 1256
1220sub init { 1257sub init {
1221 my ($self) = @_; 1258 my ($self) = @_;
… …
1236 1273
1237# the original (read-only) location 1274# the original (read-only) location
1238sub load_path { 1275sub load_path {
1239 my ($self) = @_; 1276 my ($self) = @_;
1240 1277
1241 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1278 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1242} 1279}
1243 1280
1244# the temporary/swap location 1281# the temporary/swap location
1245sub save_path { 1282sub save_path {
1246 my ($self) = @_; 1283 my ($self) = @_;
1247 1284
1248 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1285 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1249 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1286 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1250} 1287}
1251 1288
1252# the unique path, undef == no special unique path 1289# the unique path, undef == no special unique path
1253sub uniq_path { 1290sub uniq_path {
1254 my ($self) = @_; 1291 my ($self) = @_;
… …
1270 my ($self) = @_; 1307 my ($self) = @_;
1271 1308
1272 utf8::encode (my $save = $self->save_path); 1309 utf8::encode (my $save = $self->save_path);
1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1310 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1274 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1311 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1312
1313 #d#TODO remove .map and also nuke
1314 $save =~ s/\.map// or return;#d#
1315 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1316 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1275} 1317}
1276 1318
1277sub load_header_from($) { 1319sub load_header_from($) {
1278 my ($self, $path) = @_; 1320 my ($self, $path) = @_;
1279 1321
1280 utf8::encode $path; 1322 utf8::encode $path;
1281 aio_open $path, O_RDONLY, 0 1323 #aio_open $path, O_RDONLY, 0
1282 or return; 1324 # or return;
1283 1325
1284 $self->_load_header ($path) 1326 $self->_load_header ($path)
1285 or return; 1327 or return;
1286 1328
1287 $self->{load_path} = $path; 1329 $self->{load_path} = $path;
1288 1330
1289 1 1331 1
1290} 1332}
1291 1333
1292sub load_orig { 1334sub load_header_orig {
1293 my ($self) = @_; 1335 my ($self) = @_;
1294 1336
1295 $self->load_header_from ($self->load_path) 1337 $self->load_header_from ($self->load_path)
1296} 1338}
1297 1339
1298sub load_temp { 1340sub load_header_temp {
1299 my ($self) = @_; 1341 my ($self) = @_;
1300 1342
1301 $self->load_header_from ($self->save_path) 1343 $self->load_header_from ($self->save_path)
1344}
1345
1346sub prepare_temp {
1347 my ($self) = @_;
1348
1349 $self->last_access ((delete $self->{last_access})
1350 || $cf::RUNTIME); #d#
1351 # safety
1352 $self->{instantiate_time} = $cf::RUNTIME
1353 if $self->{instantiate_time} > $cf::RUNTIME;
1354}
1355
1356sub prepare_orig {
1357 my ($self) = @_;
1358
1359 $self->{load_original} = 1;
1360 $self->{instantiate_time} = $cf::RUNTIME;
1361 $self->last_access ($cf::RUNTIME);
1362 $self->instantiate;
1302} 1363}
1303 1364
1304sub load_header { 1365sub load_header {
1305 my ($self) = @_; 1366 my ($self) = @_;
1306 1367
1307 if ($self->load_temp) { 1368 if ($self->load_header_temp) {
1308 $self->last_access ((delete $self->{last_access}) 1369 $self->prepare_temp;
1309 || $cf::RUNTIME); #d#
1310 # safety
1311 $self->{instantiate_time} = $cf::RUNTIME
1312 if $self->{instantiate_time} > $cf::RUNTIME;
1313 } else { 1370 } else {
1314 $self->load_orig 1371 $self->load_header_orig
1315 or return; 1372 or return;
1316 1373 $self->prepare_orig;
1317 $self->{load_original} = 1;
1318 $self->{instantiate_time} = $cf::RUNTIME;
1319 $self->last_access ($cf::RUNTIME);
1320 $self->instantiate;
1321 } 1374 }
1322 1375
1323 1 1376 1
1324} 1377}
1325 1378
… …
1339 $map->{last_save} = $cf::RUNTIME; 1392 $map->{last_save} = $cf::RUNTIME;
1340 1393
1341 $map->load_header 1394 $map->load_header
1342 or return; 1395 or return;
1343 1396
1344 if ($map->should_reset) { 1397 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1398 # doing this can freeze the server in a sync job, obviously
1345 $cf::WAIT_FOR_TICK->wait; 1399 #$cf::WAIT_FOR_TICK->wait;
1346 $map->reset; 1400 $map->reset;
1347 undef $guard; 1401 undef $guard;
1348 $map = find $path 1402 return find $path;
1349 or return;
1350 } 1403 }
1351 1404
1352 $cf::MAP{$path} = $map 1405 $cf::MAP{$path} = $map
1353 } 1406 }
1354} 1407}
1408
1409sub pre_load { }
1410sub post_load { }
1355 1411
1356sub load { 1412sub load {
1357 my ($self) = @_; 1413 my ($self) = @_;
1358 1414
1415 local $self->{deny_reset} = 1; # loading can take a long time
1416
1359 my $path = $self->{path}; 1417 my $path = $self->{path};
1360 my $guard = cf::lock_acquire "map_load:$path"; 1418 my $guard = cf::lock_acquire "map_load:$path";
1361 1419
1362 return if $self->in_memory != cf::MAP_SWAPPED; 1420 return if $self->in_memory != cf::MAP_SWAPPED;
1363 1421
1364 $self->in_memory (cf::MAP_LOADING); 1422 $self->in_memory (cf::MAP_LOADING);
1365 1423
1366 $self->alloc; 1424 $self->alloc;
1425
1426 $self->pre_load;
1427
1367 $self->_load_objects ($self->{load_path}, 1) 1428 $self->_load_objects ($self->{load_path}, 1)
1368 or return; 1429 or return;
1369 1430
1370 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1431 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1371 if delete $self->{load_original}; 1432 if delete $self->{load_original};
… …
1393 unless $self->difficulty; 1454 unless $self->difficulty;
1394 Coro::cede; 1455 Coro::cede;
1395 $self->activate; 1456 $self->activate;
1396 } 1457 }
1397 1458
1459 $self->post_load;
1460
1398 $self->in_memory (cf::MAP_IN_MEMORY); 1461 $self->in_memory (cf::MAP_IN_MEMORY);
1399} 1462}
1400 1463
1401sub customise_for { 1464sub customise_for {
1402 my ($self, $ob) = @_; 1465 my ($self, $ob) = @_;
… …
1442 1505
1443 cf::sync_job { $map->load }; 1506 cf::sync_job { $map->load };
1444} 1507}
1445 1508
1446our %MAP_PREFETCH; 1509our %MAP_PREFETCH;
1447our $MAP_PREFETCHER = Coro::async { 1510our $MAP_PREFETCHER = undef;
1448 while () {
1449 for my $path (keys %MAP_PREFETCH) {
1450 my $map = find $path
1451 or next;
1452 $map->load;
1453
1454 delete $MAP_PREFETCH{$path};
1455 }
1456 Coro::schedule;
1457 }
1458};
1459 1511
1460sub find_async { 1512sub find_async {
1461 my ($path, $origin) = @_; 1513 my ($path, $origin) = @_;
1462 1514
1463 $path = normalise $path, $origin && $origin->{path}; 1515 $path = normalise $path, $origin && $origin->{path};
1464 1516
1465 if (my $map = $cf::MAP{$path}) { 1517 if (my $map = $cf::MAP{$path}) {
1466 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1518 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1467 } 1519 }
1468 1520
1469 $MAP_PREFETCH{$path} = 0; 1521 undef $MAP_PREFETCH{$path};
1522 $MAP_PREFETCHER ||= cf::async {
1523 while (%MAP_PREFETCH) {
1524 for my $path (keys %MAP_PREFETCH) {
1525 my $map = find $path
1526 or next;
1527 $map->load;
1528
1529 delete $MAP_PREFETCH{$path};
1530 }
1531 }
1532 undef $MAP_PREFETCHER;
1533 };
1470 $MAP_PREFETCHER->ready; 1534 $MAP_PREFETCHER->prio (6);
1471 1535
1472 () 1536 ()
1473} 1537}
1474 1538
1475sub save { 1539sub save {
… …
1535 my ($self) = @_; 1599 my ($self) = @_;
1536 1600
1537 $self->reset_at <= $cf::RUNTIME 1601 $self->reset_at <= $cf::RUNTIME
1538} 1602}
1539 1603
1540sub rename {
1541 my ($self, $new_path) = @_;
1542
1543 normalise $new_path;
1544
1545 $self->unlink_save;
1546
1547 delete $cf::MAP{$self->path};
1548 $self->{path} = $new_path; $self->path ($self->{path});
1549 $cf::MAP{$self->path} = $self;
1550
1551 $self->save;
1552}
1553
1554sub reset { 1604sub reset {
1555 my ($self) = @_; 1605 my ($self) = @_;
1556 1606
1557 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1607 my $lock = cf::lock_acquire "map_data:$self->{path}";
1558 1608
… …
1575my $nuke_counter = "aaaa"; 1625my $nuke_counter = "aaaa";
1576 1626
1577sub nuke { 1627sub nuke {
1578 my ($self) = @_; 1628 my ($self) = @_;
1579 1629
1630 delete $cf::MAP{$self->path};
1631
1632 $self->unlink_save;
1633
1634 bless $self, "cf::map";
1635 delete $self->{deny_reset};
1580 $self->{deny_save} = 1; 1636 $self->{deny_save} = 1;
1581 $self->reset_timeout (1); 1637 $self->reset_timeout (1);
1582 $self->rename ("{nuke}/" . ($nuke_counter++)); 1638 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1639
1640 $cf::MAP{$self->path} = $self;
1641
1583 $self->reset; # polite request, might not happen 1642 $self->reset; # polite request, might not happen
1584} 1643}
1585 1644
1586=item cf::map::unique_maps 1645=item cf::map::unique_maps
1587 1646
… …
1599 for (@$files) { 1658 for (@$files) {
1600 utf8::decode $_; 1659 utf8::decode $_;
1601 next if /\.pst$/; 1660 next if /\.pst$/;
1602 next unless /^$PATH_SEP/o; 1661 next unless /^$PATH_SEP/o;
1603 1662
1604 s/\.map$//; 1663 push @paths, cf::map::normalise $_;
1605 push @paths, $_;
1606 } 1664 }
1607 1665
1608 \@paths 1666 \@paths
1609} 1667}
1610 1668
… …
1704=cut 1762=cut
1705 1763
1706sub link_map { 1764sub link_map {
1707 unless ($LINK_MAP) { 1765 unless ($LINK_MAP) {
1708 $LINK_MAP = cf::map::find "{link}" 1766 $LINK_MAP = cf::map::find "{link}"
1709 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1767 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1710 $LINK_MAP->load; 1768 $LINK_MAP->load;
1711 } 1769 }
1712 1770
1713 $LINK_MAP 1771 $LINK_MAP
1714} 1772}
… …
1721 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1779 return if UNIVERSAL::isa $self->map, "ext::map_link";
1722 1780
1723 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1781 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1724 if $self->map; 1782 if $self->map;
1725 1783
1726 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1784 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1727} 1785}
1728 1786
1729sub cf::object::player::leave_link { 1787sub cf::object::player::leave_link {
1730 my ($self, $map, $x, $y) = @_; 1788 my ($self, $map, $x, $y) = @_;
1731 1789
… …
1798 my ($self, $path, $x, $y) = @_; 1856 my ($self, $path, $x, $y) = @_;
1799 1857
1800 $self->enter_link; 1858 $self->enter_link;
1801 1859
1802 (async { 1860 (async {
1861 my $map = eval {
1803 my $map = cf::map::find $path; 1862 my $map = cf::map::find $path;
1804 $map = $map->customise_for ($self) if $map; 1863 $map = $map->customise_for ($self) if $map;
1805 1864 $map
1806# warn "entering ", $map->path, " at ($x, $y)\n" 1865 } or
1807# if $map;
1808
1809 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1866 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1810 1867
1811 $self->leave_link ($map, $x, $y); 1868 $self->leave_link ($map, $x, $y);
1812 })->prio (1); 1869 })->prio (1);
1813} 1870}
1814 1871
… …
1818 1875
1819sub parse_random_map_params { 1876sub parse_random_map_params {
1820 my ($spec) = @_; 1877 my ($spec) = @_;
1821 1878
1822 my $rmp = { # defaults 1879 my $rmp = { # defaults
1823 xsize => 10, 1880 xsize => (cf::rndm 15, 40),
1824 ysize => 10, 1881 ysize => (cf::rndm 15, 40),
1882 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1883 #layout => string,
1825 }; 1884 };
1826 1885
1827 for (split /\n/, $spec) { 1886 for (split /\n/, $spec) {
1828 my ($k, $v) = split /\s+/, $_, 2; 1887 my ($k, $v) = split /\s+/, $_, 2;
1829 1888
… …
1833 $rmp 1892 $rmp
1834} 1893}
1835 1894
1836sub prepare_random_map { 1895sub prepare_random_map {
1837 my ($exit) = @_; 1896 my ($exit) = @_;
1897
1898 my $guard = cf::lock_acquire "exit_prepare:$exit";
1838 1899
1839 # all this does is basically replace the /! path by 1900 # all this does is basically replace the /! path by
1840 # a new random map path (?random/...) with a seed 1901 # a new random map path (?random/...) with a seed
1841 # that depends on the exit object 1902 # that depends on the exit object
1842 1903
1843 my $rmp = parse_random_map_params $exit->msg; 1904 my $rmp = parse_random_map_params $exit->msg;
1844 1905
1845 if ($exit->map) { 1906 if ($exit->map) {
1846 $rmp->{region} = $exit->map->region_name; 1907 $rmp->{region} = $exit->region->name;
1847 $rmp->{origin_map} = $exit->map->path; 1908 $rmp->{origin_map} = $exit->map->path;
1848 $rmp->{origin_x} = $exit->x; 1909 $rmp->{origin_x} = $exit->x;
1849 $rmp->{origin_y} = $exit->y; 1910 $rmp->{origin_y} = $exit->y;
1850 } 1911 }
1851 1912
1852 $rmp->{random_seed} ||= $exit->random_seed; 1913 $rmp->{random_seed} ||= $exit->random_seed;
1853 1914
1854 my $data = cf::to_json $rmp; 1915 my $data = cf::to_json $rmp;
1855 my $md5 = Digest::MD5::md5_hex $data; 1916 my $md5 = Digest::MD5::md5_hex $data;
1917 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1856 1918
1857 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1919 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1858 aio_write $fh, 0, (length $data), $data, 0; 1920 aio_write $fh, 0, (length $data), $data, 0;
1921 undef $fh;
1922 aio_rename "$meta~", $meta;
1859 1923
1860 $exit->slaying ("?random/$md5"); 1924 $exit->slaying ("?random/$md5");
1861 $exit->msg (undef); 1925 $exit->msg (undef);
1862 } 1926 }
1863} 1927}
1864 1928
1865sub cf::object::player::enter_exit { 1929sub cf::object::player::enter_exit {
1866 my ($self, $exit) = @_; 1930 my ($self, $exit) = @_;
1867 1931
1868 return unless $self->type == cf::PLAYER; 1932 return unless $self->type == cf::PLAYER;
1933
1934 if ($exit->slaying eq "/!") {
1935 #TODO: this should de-fi-ni-te-ly not be a sync-job
1936 cf::sync_job { prepare_random_map $exit };
1937 }
1938
1939 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1940 my $hp = $exit->stats->hp;
1941 my $sp = $exit->stats->sp;
1869 1942
1870 $self->enter_link; 1943 $self->enter_link;
1871 1944
1872 (async { 1945 (async {
1873 $self->deactivate_recursive; # just to be sure 1946 $self->deactivate_recursive; # just to be sure
1874 unless (eval { 1947 unless (eval {
1875 prepare_random_map $exit 1948 $self->goto ($slaying, $hp, $sp);
1876 if $exit->slaying eq "/!";
1877
1878 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1879 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1880 1949
1881 1; 1950 1;
1882 }) { 1951 }) {
1883 $self->message ("Something went wrong deep within the crossfire server. " 1952 $self->message ("Something went wrong deep within the crossfire server. "
1884 . "I'll try to bring you back to the map you were before. " 1953 . "I'll try to bring you back to the map you were before. "
… …
1945 # get handled first 2014 # get handled first
1946 my $queue = delete $ns->{query_queue} 2015 my $queue = delete $ns->{query_queue}
1947 or return; # be conservative, not sure how that can happen, but we saw a crash here 2016 or return; # be conservative, not sure how that can happen, but we saw a crash here
1948 2017
1949 (shift @$queue)->[1]->($msg); 2018 (shift @$queue)->[1]->($msg);
2019 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1950 2020
1951 push @{ $ns->{query_queue} }, @$queue; 2021 push @{ $ns->{query_queue} }, @$queue;
1952 2022
1953 if (@{ $ns->{query_queue} } == @$queue) { 2023 if (@{ $ns->{query_queue} } == @$queue) {
1954 if (@$queue) { 2024 if (@$queue) {
… …
2115The parameter C<$family> should best start with the name of the extension 2185The parameter C<$family> should best start with the name of the extension
2116using it, it should be unique. 2186using it, it should be unique.
2117 2187
2118=over 4 2188=over 4
2119 2189
2120=item $hashref = cf::db_get $family
2121
2122Return a hashref for use by the extension C<$family>, which can be
2123modified. After modifications, you have to call C<cf::db_dirty> or
2124C<cf::db_sync>.
2125
2126=item $value = cf::db_get $family => $key 2190=item $value = cf::db_get $family => $key
2127 2191
2128Returns a single value from the database 2192Returns a single value from the database.
2129
2130=item cf::db_put $family => $hashref
2131
2132Stores the given family hashref into the database. Updates are delayed, if
2133you want the data to be synced to disk immediately, use C<cf::db_sync>.
2134 2193
2135=item cf::db_put $family => $key => $value 2194=item cf::db_put $family => $key => $value
2136 2195
2137Stores the given C<$value> in the family hash. Updates are delayed, if you 2196Stores the given C<$value> in the family.
2138want the data to be synced to disk immediately, use C<cf::db_sync>.
2139
2140=item cf::db_dirty
2141
2142Marks the database as dirty, to be updated at a later time.
2143
2144=item cf::db_sync
2145
2146Immediately write the database to disk I<if it is dirty>.
2147 2197
2148=cut 2198=cut
2149 2199
2150our $DB; 2200our $DB;
2151 2201
2152{ 2202unless ($DB) {
2203 $DB = BDB::db_create $DB_ENV;
2204
2205 cf::sync_job {
2206 eval {
2207 $DB->set_flags (BDB::CHKSUM);
2208
2209 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2210 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2211 cf::cleanup "db_open(db): $!" if $!;
2212 };
2213 cf::cleanup "db_open(db): $@" if $@;
2214 };
2215
2153 my $path = cf::localdir . "/database.pst"; 2216 my $path = cf::localdir . "/database.pst";
2217 if (stat $path) {
2218 cf::sync_job {
2219 my $pst = Storable::retrieve $path;
2154 2220
2155 sub db_load() { 2221 cf::db_put (board => data => $pst->{board});
2156 $DB = stat $path ? Storable::retrieve $path : { }; 2222 cf::db_put (guildrules => data => $pst->{guildrules});
2157 } 2223 cf::db_put (rent => balance => $pst->{rent}{balance});
2224 BDB::db_env_txn_checkpoint $DB_ENV;
2158 2225
2159 my $pid; 2226 unlink $path;
2160
2161 sub db_save() {
2162 waitpid $pid, 0 if $pid;
2163 if (0 == ($pid = fork)) {
2164 $DB->{_meta}{version} = 1;
2165 Storable::nstore $DB, "$path~";
2166 rename "$path~", $path;
2167 cf::_exit 0 if defined $pid;
2168 } 2227 };
2169 }
2170
2171 my $dirty;
2172
2173 sub db_sync() {
2174 db_save if $dirty;
2175 undef $dirty;
2176 }
2177
2178 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2179 db_sync;
2180 }); 2228 }
2229}
2181 2230
2182 sub db_dirty() {
2183 $dirty = 1;
2184 $idle->start;
2185 }
2186
2187 sub db_get($;$) { 2231sub db_get($$) {
2188 @_ >= 2 2232 my $key = "$_[0]/$_[1]";
2189 ? $DB->{$_[0]}{$_[1]}
2190 : ($DB->{$_[0]} ||= { })
2191 }
2192 2233
2234 cf::sync_job {
2235 BDB::db_get $DB, undef, $key, my $data;
2236
2237 $! ? ()
2238 : Compress::LZF::sthaw $data
2239 }
2240}
2241
2193 sub db_put($$;$) { 2242sub db_put($$$) {
2194 if (@_ >= 3) { 2243 BDB::dbreq_pri 4;
2195 $DB->{$_[0]}{$_[1]} = $_[2]; 2244 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2196 } else {
2197 $DB->{$_[0]} = $_[1];
2198 }
2199 db_dirty;
2200 }
2201
2202 cf::global->attach (
2203 prio => 10000,
2204 on_cleanup => sub {
2205 db_sync;
2206 },
2207 );
2208} 2245}
2209 2246
2210############################################################################# 2247#############################################################################
2211# the server's main() 2248# the server's init and main functions
2249
2250sub load_resources {
2251 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2252 or die "unable to load regions file\n";#d#
2253}
2212 2254
2213sub cfg_load { 2255sub cfg_load {
2214 open my $fh, "<:utf8", cf::confdir . "/config" 2256 open my $fh, "<:utf8", cf::confdir . "/config"
2215 or return; 2257 or return;
2216 2258
… …
2229 }; 2271 };
2230 warn $@ if $@; 2272 warn $@ if $@;
2231 } 2273 }
2232} 2274}
2233 2275
2276sub init {
2277 load_resources;
2278}
2279
2234sub main { 2280sub main {
2235 # we must not ever block the main coroutine 2281 # we must not ever block the main coroutine
2236 local $Coro::idle = sub { 2282 local $Coro::idle = sub {
2237 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2283 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2284 (async {
2238 async { Event::one_event }; 2285 Event::one_event;
2286 })->prio (Coro::PRIO_MAX);
2239 }; 2287 };
2240 2288
2241 cfg_load; 2289 cfg_load;
2242 db_load;
2243 load_extensions; 2290 load_extensions;
2291
2292 $TICK_WATCHER->start;
2244 Event::loop; 2293 Event::loop;
2245} 2294}
2246 2295
2247############################################################################# 2296#############################################################################
2248# initialisation and cleanup 2297# initialisation and cleanup
2249 2298
2250# install some emergency cleanup handlers 2299# install some emergency cleanup handlers
2251BEGIN { 2300BEGIN {
2252 for my $signal (qw(INT HUP TERM)) { 2301 for my $signal (qw(INT HUP TERM)) {
2253 Event->signal ( 2302 Event->signal (
2303 reentrant => 0,
2254 data => WF_AUTOCANCEL, 2304 data => WF_AUTOCANCEL,
2255 signal => $signal, 2305 signal => $signal,
2306 prio => 0,
2256 cb => sub { 2307 cb => sub {
2257 cf::cleanup "SIG$signal"; 2308 cf::cleanup "SIG$signal";
2258 }, 2309 },
2259 ); 2310 );
2260 } 2311 }
2261} 2312}
… …
2282 my $map = $cf::MAP{$path} or next; 2333 my $map = $cf::MAP{$path} or next;
2283 $map->valid or next; 2334 $map->valid or next;
2284 $map->save; 2335 $map->save;
2285 } 2336 }
2286 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";
2287 }; 2342 };
2288 2343
2289 warn "leave emergency perl save\n"; 2344 warn "leave emergency perl save\n";
2290} 2345}
2291 2346
2292sub reload() { 2347sub reload() {
2293 # can/must only be called in main 2348 # can/must only be called in main
2294 if ($Coro::current != $Coro::main) { 2349 if ($Coro::current != $Coro::main) {
2295 warn "can only reload from main coroutine\n"; 2350 warn "can only reload from main coroutine";
2296 return; 2351 return;
2297 } 2352 }
2298 2353
2299 warn "reloading..."; 2354 warn "reloading...";
2300 2355
2301 warn "freezing server"; 2356 warn "cancelling server ticker";
2302 my $guard = freeze_mainloop; 2357 $TICK_WATCHER->cancel;
2358
2303 cf::emergency_save; 2359 cf::emergency_save;
2304
2305 warn "sync database to disk";
2306 cf::db_sync;
2307 IO::AIO::flush;
2308 2360
2309 eval { 2361 eval {
2310 # if anything goes wrong in here, we should simply crash as we already saved 2362 # if anything goes wrong in here, we should simply crash as we already saved
2311 2363
2312 warn "cancel all watchers"; 2364 warn "cancelling all WF_AUTOCANCEL watchers";
2313 for (Event::all_watchers) { 2365 for (Event::all_watchers) {
2314 $_->cancel if $_->data & WF_AUTOCANCEL; 2366 $_->cancel if $_->data & WF_AUTOCANCEL;
2315 } 2367 }
2316 2368
2369 warn "syncing database to disk";
2370 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2371
2372 warn "flushing outstanding aio requests";
2373 for (;;) {
2374 BDB::flush;
2375 IO::AIO::flush;
2376 Coro::cede;
2377 last unless IO::AIO::nreqs || BDB::nreqs;
2378 warn "iterate...";
2379 }
2380
2317 warn "cancel all extension coros"; 2381 warn "cancelling all extension coros";
2318 $_->cancel for values %EXT_CORO; 2382 $_->cancel for values %EXT_CORO;
2319 %EXT_CORO = (); 2383 %EXT_CORO = ();
2320 2384
2321 warn "remove commands"; 2385 warn "removing commands";
2322 %COMMAND = (); 2386 %COMMAND = ();
2323 2387
2324 warn "remove ext commands"; 2388 warn "removing ext commands";
2325 %EXTCMD = (); 2389 %EXTCMD = ();
2326 2390
2327 warn "unload/nuke all extensions"; 2391 warn "unloading/nuking all extensions";
2328 for my $pkg (@EXTS) { 2392 for my $pkg (@EXTS) {
2329 warn "... unloading $pkg"; 2393 warn "... unloading $pkg";
2330 2394
2331 if (my $cb = $pkg->can ("unload")) { 2395 if (my $cb = $pkg->can ("unload")) {
2332 eval { 2396 eval {
… …
2337 2401
2338 warn "... nuking $pkg"; 2402 warn "... nuking $pkg";
2339 Symbol::delete_package $pkg; 2403 Symbol::delete_package $pkg;
2340 } 2404 }
2341 2405
2342 warn "unload all perl modules loaded from $LIBDIR"; 2406 warn "unloading all perl modules loaded from $LIBDIR";
2343 while (my ($k, $v) = each %INC) { 2407 while (my ($k, $v) = each %INC) {
2344 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2408 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2345 2409
2346 warn "removing <$k>"; 2410 warn "... unloading $k";
2347 delete $INC{$k}; 2411 delete $INC{$k};
2348 2412
2349 $k =~ s/\.pm$//; 2413 $k =~ s/\.pm$//;
2350 $k =~ s/\//::/g; 2414 $k =~ s/\//::/g;
2351 2415
… …
2354 } 2418 }
2355 2419
2356 Symbol::delete_package $k; 2420 Symbol::delete_package $k;
2357 } 2421 }
2358 2422
2359 warn "get rid of safe::, as good as possible"; 2423 warn "getting rid of safe::, as good as possible";
2360 Symbol::delete_package "safe::$_" 2424 Symbol::delete_package "safe::$_"
2361 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2425 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2362 2426
2363 warn "unload cf.pm \"a bit\""; 2427 warn "unloading cf.pm \"a bit\"";
2364 delete $INC{"cf.pm"}; 2428 delete $INC{"cf.pm"};
2365 2429
2366 # don't, removes xs symbols, too, 2430 # don't, removes xs symbols, too,
2367 # and global variables created in xs 2431 # and global variables created in xs
2368 #Symbol::delete_package __PACKAGE__; 2432 #Symbol::delete_package __PACKAGE__;
2369 2433
2434 warn "unload completed, starting to reload now";
2435
2370 warn "reloading cf.pm"; 2436 warn "reloading cf.pm";
2371 require cf; 2437 require cf;
2372 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2438 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2373 2439
2374 warn "load config and database again"; 2440 warn "loading config and database again";
2375 cf::cfg_load; 2441 cf::cfg_load;
2376 cf::db_load;
2377 2442
2378 warn "load extensions"; 2443 warn "loading extensions";
2379 cf::load_extensions; 2444 cf::load_extensions;
2380 2445
2381 warn "reattach attachments to objects/players"; 2446 warn "reattaching attachments to objects/players";
2382 _global_reattach; 2447 _global_reattach;
2383 warn "reattach attachments to maps"; 2448 warn "reattaching attachments to maps";
2384 reattach $_ for values %MAP; 2449 reattach $_ for values %MAP;
2450
2451 warn "loading reloadable resources";
2452 load_resources;
2453
2454 warn "restarting server ticker";
2455
2456 $TICK_WATCHER->start;
2385 }; 2457 };
2386 2458
2387 if ($@) { 2459 if ($@) {
2388 warn $@; 2460 warn $@;
2389 warn "error while reloading, exiting."; 2461 warn "error while reloading, exiting.";
… …
2391 } 2463 }
2392 2464
2393 warn "reloaded"; 2465 warn "reloaded";
2394}; 2466};
2395 2467
2468our $RELOAD_WATCHER; # used only during reload
2469
2396register_command "reload" => sub { 2470register_command "reload" => sub {
2397 my ($who, $arg) = @_; 2471 my ($who, $arg) = @_;
2398 2472
2399 if ($who->flag (FLAG_WIZ)) { 2473 if ($who->flag (FLAG_WIZ)) {
2400 $who->message ("start of reload."); 2474 $who->message ("reloading server.");
2475
2476 # doing reload synchronously and two reloads happen back-to-back,
2477 # coro crashes during coro_state_free->destroy here.
2478
2479 $RELOAD_WATCHER ||= Event->timer (
2480 reentrant => 0,
2481 after => 0,
2482 data => WF_AUTOCANCEL,
2483 cb => sub {
2401 reload; 2484 reload;
2402 $who->message ("end of reload."); 2485 undef $RELOAD_WATCHER;
2486 },
2487 );
2403 } 2488 }
2404}; 2489};
2405 2490
2406unshift @INC, $LIBDIR; 2491unshift @INC, $LIBDIR;
2492
2493my $bug_warning = 0;
2407 2494
2408$TICK_WATCHER = Event->timer ( 2495$TICK_WATCHER = Event->timer (
2409 reentrant => 0, 2496 reentrant => 0,
2497 parked => 1,
2410 prio => 0, 2498 prio => 0,
2411 at => $NEXT_TICK || $TICK, 2499 at => $NEXT_TICK || $TICK,
2412 data => WF_AUTOCANCEL, 2500 data => WF_AUTOCANCEL,
2413 cb => sub { 2501 cb => sub {
2502 if ($Coro::current != $Coro::main) {
2503 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2504 unless ++$bug_warning > 10;
2505 return;
2506 }
2507
2414 $NOW = Event::time; 2508 $NOW = Event::time;
2415 2509
2416 cf::server_tick; # one server iteration 2510 cf::server_tick; # one server iteration
2417 $RUNTIME += $TICK; 2511 $RUNTIME += $TICK;
2418 $NEXT_TICK += $TICK; 2512 $NEXT_TICK += $TICK;
2419 2513
2420 $WAIT_FOR_TICK->broadcast; 2514 $WAIT_FOR_TICK->broadcast;
2421 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2515 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2516
2517 Event::sweep;
2518 Coro::cede_notself;
2519
2520# my $AFTER = Event::time;
2521# warn $AFTER - $NOW;#d#
2422 2522
2423 # if we are delayed by four ticks or more, skip them all 2523 # if we are delayed by four ticks or more, skip them all
2424 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2524 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2425 2525
2426 $TICK_WATCHER->at ($NEXT_TICK); 2526 $TICK_WATCHER->at ($NEXT_TICK);
2427 $TICK_WATCHER->start; 2527 $TICK_WATCHER->start;
2428 }, 2528 },
2429); 2529);
2430 2530
2531{
2532 BDB::max_poll_time $TICK * 0.1;
2533 $BDB_POLL_WATCHER = Event->io (
2534 reentrant => 0,
2535 fd => BDB::poll_fileno,
2536 poll => 'r',
2537 prio => 0,
2538 data => WF_AUTOCANCEL,
2539 cb => \&BDB::poll_cb,
2540 );
2541 BDB::min_parallel 8;
2542
2543 BDB::set_sync_prepare {
2544 my $status;
2545 my $current = $Coro::current;
2546 (
2547 sub {
2548 $status = $!;
2549 $current->ready; undef $current;
2550 },
2551 sub {
2552 Coro::schedule while defined $current;
2553 $! = $status;
2554 },
2555 )
2556 };
2557
2558 unless ($DB_ENV) {
2559 $DB_ENV = BDB::db_env_create;
2560
2561 cf::sync_job {
2562 eval {
2563 BDB::db_env_open
2564 $DB_ENV,
2565 $BDB_ENV_DIR,
2566 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2567 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2568 0666;
2569
2570 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2571
2572 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2573 $DB_ENV->set_lk_detect;
2574 };
2575
2576 cf::cleanup "db_env_open(db): $@" if $@;
2577 };
2578 }
2579}
2580
2581{
2582 IO::AIO::min_parallel 8;
2583
2584 undef $Coro::AIO::WATCHER;
2431IO::AIO::max_poll_time $TICK * 0.2; 2585 IO::AIO::max_poll_time $TICK * 0.1;
2432
2433$AIO_POLL_WATCHER = Event->io ( 2586 $AIO_POLL_WATCHER = Event->io (
2587 reentrant => 0,
2434 fd => IO::AIO::poll_fileno, 2588 fd => IO::AIO::poll_fileno,
2435 poll => 'r', 2589 poll => 'r',
2436 prio => 5, 2590 prio => 6,
2437 data => WF_AUTOCANCEL, 2591 data => WF_AUTOCANCEL,
2438 cb => \&IO::AIO::poll_cb, 2592 cb => \&IO::AIO::poll_cb,
2439); 2593 );
2594}
2440 2595
2441$WRITE_RUNTIME_WATCHER = Event->timer ( 2596$WRITE_RUNTIME_WATCHER = Event->timer (
2597 reentrant => 0,
2442 data => WF_AUTOCANCEL, 2598 data => WF_AUTOCANCEL,
2443 after => 0, 2599 after => 1,
2444 interval => 10, 2600 interval => 10,
2445 cb => sub { 2601 prio => 6, # keep it lowest so it acts like a watchdog
2446 (Coro::unblock_sub { 2602 cb => Coro::unblock_sub {
2447 write_runtime 2603 write_runtime
2448 or warn "ERROR: unable to write runtime file: $!"; 2604 or warn "ERROR: unable to write runtime file: $!";
2449 })->();
2450 }, 2605 },
2451); 2606);
2452 2607
2453END { cf::emergency_save } 2608END { cf::emergency_save }
2454 2609

Diff Legend

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