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

Diff Legend

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