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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.186 by root, Sat Jan 20 01:12:39 2007 UTC vs.
Revision 1.229 by root, Sun Apr 1 00:36:34 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Storable; 8use Storable;
9use Event;
9use Opcode; 10use Opcode;
10use Safe; 11use Safe;
11use Safe::Hole; 12use Safe::Hole;
12 13
13use Coro 3.4 (); 14use Coro 3.52 ();
15use Coro::State;
14use Coro::Event; 16use Coro::Event;
15use Coro::Timer; 17use Coro::Timer;
16use Coro::Signal; 18use Coro::Signal;
17use Coro::Semaphore; 19use Coro::Semaphore;
18use Coro::AIO; 20use Coro::AIO;
19 21
22use BDB ();
20use Data::Dumper; 23use Data::Dumper;
21use Digest::MD5; 24use Digest::MD5;
22use Fcntl; 25use Fcntl;
26use YAML::Syck ();
23use IO::AIO 2.32 (); 27use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 28use Time::HiRes;
29use Compress::LZF;
26 30
31# configure various modules to our taste
32#
33Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
34Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 36$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 37
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 38# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 39$YAML::Syck::ImplicitUnicode = 1;
33 40
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 41$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
42
43sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35 44
36our %COMMAND = (); 45our %COMMAND = ();
37our %COMMAND_TIME = (); 46our %COMMAND_TIME = ();
38 47
39our @EXTS = (); # list of extension package names 48our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 49our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 50our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 51our %EXT_MAP = (); # pluggable maps
43 52
53our $RELOAD; # number of reloads so far
44our @EVENT; 54our @EVENT;
45our $LIBDIR = datadir . "/ext"; 55our $LIBDIR = datadir . "/ext";
46 56
47our $TICK = MAX_TIME * 1e-6; 57our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 58our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 59our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 60our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 61our $NEXT_TICK;
52our $NOW; 62our $NOW;
63our $USE_FSYNC = 1; # use fsync to write maps - default off
64
65our $BDB_POLL_WATCHER;
66our $DB_ENV;
53 67
54our %CFG; 68our %CFG;
55 69
56our $UPTIME; $UPTIME ||= time; 70our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 71our $RUNTIME;
58 72
59our %PLAYER; # all users 73our %PLAYER; # all users
60our %MAP; # all maps 74our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 75our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 76our $RANDOM_MAPS = cf::localdir . "/random";
77our $BDB_ENV_DIR = cf::localdir . "/db";
63 78
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 79our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 80our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 81
67# used to convert map paths into valid unix filenames by replacing / by ∕ 82# used to convert map paths into valid unix filenames by replacing / by ∕
… …
80mkdir cf::localdir; 95mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 96mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 97mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 98mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 99mkdir $RANDOM_MAPS;
100mkdir $BDB_ENV_DIR;
85 101
86our $EMERGENCY_POSITION; 102our $EMERGENCY_POSITION;
103
104sub cf::map::normalise;
87 105
88############################################################################# 106#############################################################################
89 107
90=head2 GLOBAL VARIABLES 108=head2 GLOBAL VARIABLES
91 109
… …
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 208 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d 209 $d
192 } || "[unable to dump $_[0]: '$@']"; 210 } || "[unable to dump $_[0]: '$@']";
193} 211}
194 212
195use JSON::Syck (); # TODO# replace by JSON::PC once working 213use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
196 214
197=item $ref = cf::from_json $json 215=item $ref = cf::from_json $json
198 216
199Converts a JSON string into the corresponding perl data structure. 217Converts a JSON string into the corresponding perl data structure.
200 218
201=cut
202
203sub from_json($) {
204 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
205 JSON::Syck::Load $_[0]
206}
207
208=item $json = cf::to_json $ref 219=item $json = cf::to_json $ref
209 220
210Converts a perl data structure into its JSON representation. 221Converts a perl data structure into its JSON representation.
211
212=cut
213
214sub to_json($) {
215 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
216 JSON::Syck::Dump $_[0]
217}
218 222
219=item cf::lock_wait $string 223=item cf::lock_wait $string
220 224
221Wait until the given lock is available. See cf::lock_acquire. 225Wait until the given lock is available. See cf::lock_acquire.
222 226
… …
261sub freeze_mainloop { 265sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 266 return unless $TICK_WATCHER->is_active;
263 267
264 my $guard = Coro::guard { 268 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 269 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 270 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 271 $TICK_WATCHER->stop;
270 $guard 272 $guard
271} 273}
272 274
273=item cf::async { BLOCK } 275=item cf::async { BLOCK }
… …
344 346
345 $coro 347 $coro
346} 348}
347 349
348sub write_runtime { 350sub write_runtime {
351 my $guard = cf::lock_acquire "write_runtime";
352
349 my $runtime = cf::localdir . "/runtime"; 353 my $runtime = cf::localdir . "/runtime";
350 354
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 356 or return;
353 357
… …
356 # 60 allows for the watchdog to kill the server. 360 # 60 allows for the watchdog to kill the server.
357 361
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 362 (aio_write $fh, 0, (length $value), $value, 0) <= 0
359 and return; 363 and return;
360 364
365 # always fsync - this file is important
361 aio_fsync $fh 366 aio_fsync $fh
362 and return; 367 and return;
363 368
364 close $fh 369 close $fh
365 or return; 370 or return;
… …
750 $filename, length $$rdata, scalar @$objs; 755 $filename, length $$rdata, scalar @$objs;
751 756
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 757 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 758 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 759 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 760 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 761 close $fh;
757 762
758 if (@$objs) { 763 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 764 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 765 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 766 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 767 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 768 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 769 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 770 aio_rename "$filename.pst~", "$filename.pst";
766 } 771 }
767 } else { 772 } else {
768 aio_unlink "$filename.pst"; 773 aio_unlink "$filename.pst";
… …
1017=cut 1022=cut
1018 1023
1019sub quit_character { 1024sub quit_character {
1020 my ($pl) = @_; 1025 my ($pl) = @_;
1021 1026
1027 my $name = $pl->ob->name;
1028
1022 $pl->{deny_save} = 1; 1029 $pl->{deny_save} = 1;
1023 $pl->password ("*"); # this should lock out the player until we nuked the dir 1030 $pl->password ("*"); # this should lock out the player until we nuked the dir
1024 1031
1025 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1032 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1026 $pl->deactivate; 1033 $pl->deactivate;
… …
1030 my $path = playerdir $pl; 1037 my $path = playerdir $pl;
1031 my $temp = "$path~$cf::RUNTIME~deleting~"; 1038 my $temp = "$path~$cf::RUNTIME~deleting~";
1032 aio_rename $path, $temp; 1039 aio_rename $path, $temp;
1033 delete $cf::PLAYER{$pl->ob->name}; 1040 delete $cf::PLAYER{$pl->ob->name};
1034 $pl->destroy; 1041 $pl->destroy;
1042
1043 my $prefix = qr<^~\Q$name\E/>;
1044
1045 # nuke player maps
1046 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1047
1035 IO::AIO::aio_rmtree $temp; 1048 IO::AIO::aio_rmtree $temp;
1049}
1050
1051=item $pl->kick
1052
1053Kicks a player out of the game. This destroys the connection.
1054
1055=cut
1056
1057sub kick {
1058 my ($pl, $kicker) = @_;
1059
1060 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1061 $pl->killer ("kicked");
1062 $pl->ns->destroy;
1036} 1063}
1037 1064
1038=item cf::player::list_logins 1065=item cf::player::list_logins
1039 1066
1040Returns am arrayref of all valid playernames in the system, can take a 1067Returns am arrayref of all valid playernames in the system, can take a
… …
1068=cut 1095=cut
1069 1096
1070sub maps($) { 1097sub maps($) {
1071 my ($pl) = @_; 1098 my ($pl) = @_;
1072 1099
1100 $pl = ref $pl ? $pl->ob->name : $pl;
1101
1073 my $files = aio_readdir playerdir $pl 1102 my $files = aio_readdir playerdir $pl
1074 or return; 1103 or return;
1075 1104
1076 my @paths; 1105 my @paths;
1077 1106
1078 for (@$files) { 1107 for (@$files) {
1079 utf8::decode $_; 1108 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1109 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1110 next unless /^$PATH_SEP/o;
1082 1111
1083 s/\.map$//; 1112 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1113 }
1086 1114
1087 \@paths 1115 \@paths
1088} 1116}
1089 1117
… …
1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1168 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1141 (cf::region::find $rmp->{region}), $rmp->{custom} 1169 (cf::region::find $rmp->{region}), $rmp->{custom}
1142 ) 1170 )
1143} 1171}
1144 1172
1173=item cf::map->register ($regex, $prio)
1174
1175Register a handler for the map path matching the given regex at the
1176givne priority (higher is better, built-in handlers have priority 0, the
1177default).
1178
1179=cut
1180
1145sub register { 1181sub register {
1146 my (undef, $regex) = @_; 1182 my (undef, $regex, $prio) = @_;
1147 my $pkg = caller; 1183 my $pkg = caller;
1148 1184
1149 no strict; 1185 no strict;
1150 push @{"$pkg\::ISA"}, __PACKAGE__; 1186 push @{"$pkg\::ISA"}, __PACKAGE__;
1151 1187
1152 $EXT_MAP{$pkg} = qr<$regex>; 1188 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1153} 1189}
1154 1190
1155# also paths starting with '/' 1191# also paths starting with '/'
1156$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1192$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1157 1193
1158sub thawer_merge { 1194sub thawer_merge {
1159 my ($self, $merge) = @_; 1195 my ($self, $merge) = @_;
1160 1196
1161 # we have to keep some variables in memory intact 1197 # we have to keep some variables in memory intact
… …
1167 $self->SUPER::thawer_merge ($merge); 1203 $self->SUPER::thawer_merge ($merge);
1168} 1204}
1169 1205
1170sub normalise { 1206sub normalise {
1171 my ($path, $base) = @_; 1207 my ($path, $base) = @_;
1208
1209 $path = "$path"; # make sure its a string
1210
1211 $path =~ s/\.map$//;
1172 1212
1173 # map plan: 1213 # map plan:
1174 # 1214 #
1175 # /! non-realised random map exit (special hack!) 1215 # /! non-realised random map exit (special hack!)
1176 # {... are special paths that are not being touched 1216 # {... are special paths that are not being touched
… …
1204 1244
1205 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1245 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1206 1246
1207 $path = normalise $path, $base; 1247 $path = normalise $path, $base;
1208 1248
1209 for my $pkg (keys %EXT_MAP) { 1249 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1210 if ($path =~ $EXT_MAP{$pkg}) { 1250 if ($path =~ $EXT_MAP{$pkg}[1]) {
1211 my $self = bless cf::map::new, $pkg; 1251 my $self = bless cf::map::new, $pkg;
1212 $self->{path} = $path; $self->path ($path); 1252 $self->{path} = $path; $self->path ($path);
1213 $self->init; # pass $1 etc. 1253 $self->init; # pass $1 etc.
1214 return $self; 1254 return $self;
1215 } 1255 }
1216 } 1256 }
1217 1257
1218 Carp::carp "unable to resolve path '$path'."; 1258 Carp::carp "unable to resolve path '$path' (base '$base').";
1219 () 1259 ()
1220} 1260}
1221 1261
1222sub init { 1262sub init {
1223 my ($self) = @_; 1263 my ($self) = @_;
… …
1238 1278
1239# the original (read-only) location 1279# the original (read-only) location
1240sub load_path { 1280sub load_path {
1241 my ($self) = @_; 1281 my ($self) = @_;
1242 1282
1243 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1283 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1244} 1284}
1245 1285
1246# the temporary/swap location 1286# the temporary/swap location
1247sub save_path { 1287sub save_path {
1248 my ($self) = @_; 1288 my ($self) = @_;
1249 1289
1250 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1290 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1251 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1291 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1252} 1292}
1253 1293
1254# the unique path, undef == no special unique path 1294# the unique path, undef == no special unique path
1255sub uniq_path { 1295sub uniq_path {
1256 my ($self) = @_; 1296 my ($self) = @_;
… …
1278 1318
1279sub load_header_from($) { 1319sub load_header_from($) {
1280 my ($self, $path) = @_; 1320 my ($self, $path) = @_;
1281 1321
1282 utf8::encode $path; 1322 utf8::encode $path;
1283 aio_open $path, O_RDONLY, 0 1323 #aio_open $path, O_RDONLY, 0
1284 or return; 1324 # or return;
1285 1325
1286 $self->_load_header ($path) 1326 $self->_load_header ($path)
1287 or return; 1327 or return;
1288 1328
1289 $self->{load_path} = $path; 1329 $self->{load_path} = $path;
1290 1330
1291 1 1331 1
1292} 1332}
1293 1333
1294sub load_orig { 1334sub load_header_orig {
1295 my ($self) = @_; 1335 my ($self) = @_;
1296 1336
1297 $self->load_header_from ($self->load_path) 1337 $self->load_header_from ($self->load_path)
1298} 1338}
1299 1339
1300sub load_temp { 1340sub load_header_temp {
1301 my ($self) = @_; 1341 my ($self) = @_;
1302 1342
1303 $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;
1304} 1363}
1305 1364
1306sub load_header { 1365sub load_header {
1307 my ($self) = @_; 1366 my ($self) = @_;
1308 1367
1309 if ($self->load_temp) { 1368 if ($self->load_header_temp) {
1310 $self->last_access ((delete $self->{last_access}) 1369 $self->prepare_temp;
1311 || $cf::RUNTIME); #d#
1312 # safety
1313 $self->{instantiate_time} = $cf::RUNTIME
1314 if $self->{instantiate_time} > $cf::RUNTIME;
1315 } else { 1370 } else {
1316 $self->load_orig 1371 $self->load_header_orig
1317 or return; 1372 or return;
1318 1373 $self->prepare_orig;
1319 $self->{load_original} = 1;
1320 $self->{instantiate_time} = $cf::RUNTIME;
1321 $self->last_access ($cf::RUNTIME);
1322 $self->instantiate;
1323 } 1374 }
1324 1375
1325 1 1376 1
1326} 1377}
1327 1378
… …
1341 $map->{last_save} = $cf::RUNTIME; 1392 $map->{last_save} = $cf::RUNTIME;
1342 1393
1343 $map->load_header 1394 $map->load_header
1344 or return; 1395 or return;
1345 1396
1346 if ($map->should_reset) { 1397 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1347 # doing this can freeze the server in a sync job, obviously 1398 # doing this can freeze the server in a sync job, obviously
1348 #$cf::WAIT_FOR_TICK->wait; 1399 #$cf::WAIT_FOR_TICK->wait;
1349 $map->reset; 1400 $map->reset;
1350 undef $guard; 1401 undef $guard;
1351 $map = find $path 1402 return find $path;
1352 or return;
1353 } 1403 }
1354 1404
1355 $cf::MAP{$path} = $map 1405 $cf::MAP{$path} = $map
1356 } 1406 }
1357} 1407}
1408
1409sub pre_load { }
1410sub post_load { }
1358 1411
1359sub load { 1412sub load {
1360 my ($self) = @_; 1413 my ($self) = @_;
1361 1414
1415 local $self->{deny_reset} = 1; # loading can take a long time
1416
1362 my $path = $self->{path}; 1417 my $path = $self->{path};
1363 my $guard = cf::lock_acquire "map_load:$path"; 1418 my $guard = cf::lock_acquire "map_load:$path";
1364 1419
1365 return if $self->in_memory != cf::MAP_SWAPPED; 1420 return if $self->in_memory != cf::MAP_SWAPPED;
1366 1421
1367 $self->in_memory (cf::MAP_LOADING); 1422 $self->in_memory (cf::MAP_LOADING);
1368 1423
1369 $self->alloc; 1424 $self->alloc;
1425
1426 $self->pre_load;
1427
1370 $self->_load_objects ($self->{load_path}, 1) 1428 $self->_load_objects ($self->{load_path}, 1)
1371 or return; 1429 or return;
1372 1430
1373 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1431 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1374 if delete $self->{load_original}; 1432 if delete $self->{load_original};
… …
1396 unless $self->difficulty; 1454 unless $self->difficulty;
1397 Coro::cede; 1455 Coro::cede;
1398 $self->activate; 1456 $self->activate;
1399 } 1457 }
1400 1458
1459 $self->post_load;
1460
1401 $self->in_memory (cf::MAP_IN_MEMORY); 1461 $self->in_memory (cf::MAP_IN_MEMORY);
1402} 1462}
1403 1463
1404sub customise_for { 1464sub customise_for {
1405 my ($self, $ob) = @_; 1465 my ($self, $ob) = @_;
… …
1469 delete $MAP_PREFETCH{$path}; 1529 delete $MAP_PREFETCH{$path};
1470 } 1530 }
1471 } 1531 }
1472 undef $MAP_PREFETCHER; 1532 undef $MAP_PREFETCHER;
1473 }; 1533 };
1534 $MAP_PREFETCHER->prio (6);
1474 1535
1475 () 1536 ()
1476} 1537}
1477 1538
1478sub save { 1539sub save {
… …
1548 return if $self->players; 1609 return if $self->players;
1549 return if $self->isa ("ext::map_per_player");#d# 1610 return if $self->isa ("ext::map_per_player");#d#
1550 1611
1551 warn "resetting map ", $self->path;#d# 1612 warn "resetting map ", $self->path;#d#
1552 1613
1614 $self->in_memory (cf::MAP_SWAPPED);
1615
1616 # need to save uniques path
1617 unless ($self->{deny_save}) {
1618 my $uniq = $self->uniq_path; utf8::encode $uniq;
1619
1620 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1621 if $uniq;
1622 }
1623
1553 delete $cf::MAP{$self->path}; 1624 delete $cf::MAP{$self->path};
1554 1625
1555 $self->in_memory (cf::MAP_SWAPPED);
1556 $self->clear; 1626 $self->clear;
1557 1627
1558 $_->clear_links_to ($self) for values %cf::MAP; 1628 $_->clear_links_to ($self) for values %cf::MAP;
1559 1629
1560 $self->unlink_save; 1630 $self->unlink_save;
… …
1597 for (@$files) { 1667 for (@$files) {
1598 utf8::decode $_; 1668 utf8::decode $_;
1599 next if /\.pst$/; 1669 next if /\.pst$/;
1600 next unless /^$PATH_SEP/o; 1670 next unless /^$PATH_SEP/o;
1601 1671
1602 s/\.map$//; 1672 push @paths, cf::map::normalise $_;
1603 push @paths, $_;
1604 } 1673 }
1605 1674
1606 \@paths 1675 \@paths
1607} 1676}
1608 1677
… …
1702=cut 1771=cut
1703 1772
1704sub link_map { 1773sub link_map {
1705 unless ($LINK_MAP) { 1774 unless ($LINK_MAP) {
1706 $LINK_MAP = cf::map::find "{link}" 1775 $LINK_MAP = cf::map::find "{link}"
1707 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1776 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1708 $LINK_MAP->load; 1777 $LINK_MAP->load;
1709 } 1778 }
1710 1779
1711 $LINK_MAP 1780 $LINK_MAP
1712} 1781}
… …
1719 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1788 return if UNIVERSAL::isa $self->map, "ext::map_link";
1720 1789
1721 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1790 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1722 if $self->map; 1791 if $self->map;
1723 1792
1724 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1793 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1725} 1794}
1726 1795
1727sub cf::object::player::leave_link { 1796sub cf::object::player::leave_link {
1728 my ($self, $map, $x, $y) = @_; 1797 my ($self, $map, $x, $y) = @_;
1729 1798
… …
1751 $map->load; 1820 $map->load;
1752 $map->load_diag; 1821 $map->load_diag;
1753 1822
1754 return unless $self->contr->active; 1823 return unless $self->contr->active;
1755 $self->activate_recursive; 1824 $self->activate_recursive;
1825
1826 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1756 $self->enter_map ($map, $x, $y); 1827 $self->enter_map ($map, $x, $y);
1757} 1828}
1758 1829
1759cf::player->attach ( 1830cf::player->attach (
1760 on_logout => sub { 1831 on_logout => sub {
… …
1773 # try to abort aborted map switching on player login :) 1844 # try to abort aborted map switching on player login :)
1774 # should happen only on crashes 1845 # should happen only on crashes
1775 if ($pl->ob->{_link_pos}) { 1846 if ($pl->ob->{_link_pos}) {
1776 $pl->ob->enter_link; 1847 $pl->ob->enter_link;
1777 (async { 1848 (async {
1778 # we need this sleep as the login has a concurrent enter_exit running
1779 # and this sleep increases chances of the player not ending up in scorn
1780 $pl->ob->reply (undef, 1849 $pl->ob->reply (undef,
1781 "There was an internal problem at your last logout, " 1850 "There was an internal problem at your last logout, "
1782 . "the server will try to bring you to your intended destination in a second.", 1851 . "the server will try to bring you to your intended destination in a second.",
1783 cf::NDI_RED); 1852 cf::NDI_RED);
1853 # we need this sleep as the login has a concurrent enter_exit running
1854 # and this sleep increases chances of the player not ending up in scorn
1784 Coro::Timer::sleep 1; 1855 Coro::Timer::sleep 1;
1785 $pl->ob->leave_link; 1856 $pl->ob->leave_link;
1786 })->prio (2); 1857 })->prio (2);
1787 } 1858 }
1788 }, 1859 },
… …
1796 my ($self, $path, $x, $y) = @_; 1867 my ($self, $path, $x, $y) = @_;
1797 1868
1798 $self->enter_link; 1869 $self->enter_link;
1799 1870
1800 (async { 1871 (async {
1872 my $map = eval {
1801 my $map = cf::map::find $path; 1873 my $map = cf::map::find $path;
1802 $map = $map->customise_for ($self) if $map; 1874 $map = $map->customise_for ($self) if $map;
1803 1875 $map
1804# warn "entering ", $map->path, " at ($x, $y)\n" 1876 } or
1805# if $map;
1806
1807 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1877 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1808 1878
1809 $self->leave_link ($map, $x, $y); 1879 $self->leave_link ($map, $x, $y);
1810 })->prio (1); 1880 })->prio (1);
1811} 1881}
1812 1882
… …
1843 # that depends on the exit object 1913 # that depends on the exit object
1844 1914
1845 my $rmp = parse_random_map_params $exit->msg; 1915 my $rmp = parse_random_map_params $exit->msg;
1846 1916
1847 if ($exit->map) { 1917 if ($exit->map) {
1848 $rmp->{region} = $exit->map->region_name; 1918 $rmp->{region} = $exit->region->name;
1849 $rmp->{origin_map} = $exit->map->path; 1919 $rmp->{origin_map} = $exit->map->path;
1850 $rmp->{origin_x} = $exit->x; 1920 $rmp->{origin_x} = $exit->x;
1851 $rmp->{origin_y} = $exit->y; 1921 $rmp->{origin_y} = $exit->y;
1852 } 1922 }
1853 1923
… …
1870sub cf::object::player::enter_exit { 1940sub cf::object::player::enter_exit {
1871 my ($self, $exit) = @_; 1941 my ($self, $exit) = @_;
1872 1942
1873 return unless $self->type == cf::PLAYER; 1943 return unless $self->type == cf::PLAYER;
1874 1944
1945 if ($exit->slaying eq "/!") {
1946 #TODO: this should de-fi-ni-te-ly not be a sync-job
1947 cf::sync_job { prepare_random_map $exit };
1948 }
1949
1950 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1951 my $hp = $exit->stats->hp;
1952 my $sp = $exit->stats->sp;
1953
1875 $self->enter_link; 1954 $self->enter_link;
1876 1955
1877 (async { 1956 (async {
1878 $self->deactivate_recursive; # just to be sure 1957 $self->deactivate_recursive; # just to be sure
1879 unless (eval { 1958 unless (eval {
1880 prepare_random_map $exit 1959 $self->goto ($slaying, $hp, $sp);
1881 if $exit->slaying eq "/!";
1882
1883 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1884 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1885 1960
1886 1; 1961 1;
1887 }) { 1962 }) {
1888 $self->message ("Something went wrong deep within the crossfire server. " 1963 $self->message ("Something went wrong deep within the crossfire server. "
1889 . "I'll try to bring you back to the map you were before. " 1964 . "I'll try to bring you back to the map you were before. "
… …
1909 1984
1910sub cf::client::send_drawinfo { 1985sub cf::client::send_drawinfo {
1911 my ($self, $text, $flags) = @_; 1986 my ($self, $text, $flags) = @_;
1912 1987
1913 utf8::encode $text; 1988 utf8::encode $text;
1914 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 1989 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1915} 1990}
1916 1991
1917 1992
1918=item $success = $client->query ($flags, "text", \&cb) 1993=item $success = $client->query ($flags, "text", \&cb)
1919 1994
… …
1950 # get handled first 2025 # get handled first
1951 my $queue = delete $ns->{query_queue} 2026 my $queue = delete $ns->{query_queue}
1952 or return; # be conservative, not sure how that can happen, but we saw a crash here 2027 or return; # be conservative, not sure how that can happen, but we saw a crash here
1953 2028
1954 (shift @$queue)->[1]->($msg); 2029 (shift @$queue)->[1]->($msg);
2030 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1955 2031
1956 push @{ $ns->{query_queue} }, @$queue; 2032 push @{ $ns->{query_queue} }, @$queue;
1957 2033
1958 if (@{ $ns->{query_queue} } == @$queue) { 2034 if (@{ $ns->{query_queue} } == @$queue) {
1959 if (@$queue) { 2035 if (@$queue) {
… …
2017 2093
2018# here we export the classes and methods available to script code 2094# here we export the classes and methods available to script code
2019 2095
2020=pod 2096=pod
2021 2097
2022The following fucntions and emthods are available within a safe environment: 2098The following functions and methods are available within a safe environment:
2023 2099
2024 cf::object contr pay_amount pay_player map 2100 cf::object contr pay_amount pay_player map
2025 cf::object::player player 2101 cf::object::player player
2026 cf::player peaceful 2102 cf::player peaceful
2027 cf::map trigger 2103 cf::map trigger
… …
2120The parameter C<$family> should best start with the name of the extension 2196The parameter C<$family> should best start with the name of the extension
2121using it, it should be unique. 2197using it, it should be unique.
2122 2198
2123=over 4 2199=over 4
2124 2200
2125=item $hashref = cf::db_get $family
2126
2127Return a hashref for use by the extension C<$family>, which can be
2128modified. After modifications, you have to call C<cf::db_dirty> or
2129C<cf::db_sync>.
2130
2131=item $value = cf::db_get $family => $key 2201=item $value = cf::db_get $family => $key
2132 2202
2133Returns a single value from the database 2203Returns a single value from the database.
2134
2135=item cf::db_put $family => $hashref
2136
2137Stores the given family hashref into the database. Updates are delayed, if
2138you want the data to be synced to disk immediately, use C<cf::db_sync>.
2139 2204
2140=item cf::db_put $family => $key => $value 2205=item cf::db_put $family => $key => $value
2141 2206
2142Stores the given C<$value> in the family hash. Updates are delayed, if you 2207Stores the given C<$value> in the family.
2143want the data to be synced to disk immediately, use C<cf::db_sync>.
2144
2145=item cf::db_dirty
2146
2147Marks the database as dirty, to be updated at a later time.
2148
2149=item cf::db_sync
2150
2151Immediately write the database to disk I<if it is dirty>.
2152 2208
2153=cut 2209=cut
2154 2210
2155our $DB; 2211our $DB;
2156 2212
2157{ 2213sub db_init {
2214 unless ($DB) {
2215 $DB = BDB::db_create $DB_ENV;
2216
2217 cf::sync_job {
2218 eval {
2219 $DB->set_flags (BDB::CHKSUM);
2220
2221 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2222 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2223 cf::cleanup "db_open(db): $!" if $!;
2224 };
2225 cf::cleanup "db_open(db): $@" if $@;
2226 };
2227
2158 my $path = cf::localdir . "/database.pst"; 2228 my $path = cf::localdir . "/database.pst";
2229 if (stat $path) {
2230 cf::sync_job {
2231 my $pst = Storable::retrieve $path;
2159 2232
2160 sub db_load() { 2233 cf::db_put (board => data => $pst->{board});
2161 $DB = stat $path ? Storable::retrieve $path : { }; 2234 cf::db_put (guildrules => data => $pst->{guildrules});
2162 } 2235 cf::db_put (rent => balance => $pst->{rent}{balance});
2236 BDB::db_env_txn_checkpoint $DB_ENV;
2163 2237
2164 my $pid; 2238 unlink $path;
2165
2166 sub db_save() {
2167 waitpid $pid, 0 if $pid;
2168 if (0 == ($pid = fork)) {
2169 $DB->{_meta}{version} = 1;
2170 Storable::nstore $DB, "$path~";
2171 rename "$path~", $path;
2172 cf::_exit 0 if defined $pid;
2173 } 2239 };
2174 } 2240 }
2175
2176 my $dirty;
2177
2178 sub db_sync() {
2179 db_save if $dirty;
2180 undef $dirty;
2181 }
2182
2183 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2184 db_sync;
2185 }); 2241 }
2242}
2186 2243
2187 sub db_dirty() {
2188 $dirty = 1;
2189 $idle->start;
2190 }
2191
2192 sub db_get($;$) { 2244sub db_get($$) {
2193 @_ >= 2 2245 my $key = "$_[0]/$_[1]";
2194 ? $DB->{$_[0]}{$_[1]}
2195 : ($DB->{$_[0]} ||= { })
2196 }
2197 2246
2247 cf::sync_job {
2248 BDB::db_get $DB, undef, $key, my $data;
2249
2250 $! ? ()
2251 : Compress::LZF::sthaw $data
2252 }
2253}
2254
2198 sub db_put($$;$) { 2255sub db_put($$$) {
2199 if (@_ >= 3) { 2256 BDB::dbreq_pri 4;
2200 $DB->{$_[0]}{$_[1]} = $_[2]; 2257 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2258}
2259
2260#############################################################################
2261# the server's init and main functions
2262
2263sub load_facedata {
2264 my $path = sprintf "%s/facedata", cf::datadir;
2265
2266 warn "loading facedata from $path\n";
2267
2268 my $faces;
2269 0 < aio_load $path, $faces
2270 or die "$path: $!";
2271
2272 Coro::cede;
2273 $faces = Storable::thaw $faces;
2274 Coro::cede;
2275
2276 my $meta = delete $faces->{""};
2277 $meta->{version} == 1
2278 or cf::cleanup "$path: version mismatch, cannot proceed.";
2279
2280 while (my ($face, $info) = each %$faces) {
2281 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2282 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2283 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2284 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2285 Coro::cede;
2286 }
2287
2288 while (my ($face, $info) = each %$faces) {
2289 next unless $info->{smooth};
2290 my $idx = cf::face::find $face
2291 or next;
2292 if (my $smooth = cf::face::find $info->{smooth}) {
2293 cf::face::set_smooth $idx, $smooth;
2201 } else { 2294 } else {
2202 $DB->{$_[0]} = $_[1]; 2295 warn "smooth face '$info->{smooth}' not found for face '$face'";
2203 }
2204 db_dirty;
2205 }
2206
2207 cf::global->attach (
2208 prio => 10000,
2209 on_cleanup => sub {
2210 db_sync;
2211 }, 2296 }
2212 ); 2297 Coro::cede;
2213} 2298 }
2214 2299
2215############################################################################# 2300 1
2216# the server's main() 2301}
2302
2303sub reload_resources {
2304 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2305 or die "unable to load regions file\n";#d#
2306 load_facedata
2307 or die "unable to load facedata\n";#d#
2308}
2309
2310sub init {
2311 reload_resources;
2312}
2217 2313
2218sub cfg_load { 2314sub cfg_load {
2219 open my $fh, "<:utf8", cf::confdir . "/config" 2315 open my $fh, "<:utf8", cf::confdir . "/config"
2220 or return; 2316 or return;
2221 2317
… …
2244 Event::one_event; 2340 Event::one_event;
2245 })->prio (Coro::PRIO_MAX); 2341 })->prio (Coro::PRIO_MAX);
2246 }; 2342 };
2247 2343
2248 cfg_load; 2344 cfg_load;
2249 db_load; 2345 db_init;
2250 load_extensions; 2346 load_extensions;
2251 2347
2252 $TICK_WATCHER->start; 2348 $TICK_WATCHER->start;
2253 Event::loop; 2349 Event::loop;
2254} 2350}
… …
2258 2354
2259# install some emergency cleanup handlers 2355# install some emergency cleanup handlers
2260BEGIN { 2356BEGIN {
2261 for my $signal (qw(INT HUP TERM)) { 2357 for my $signal (qw(INT HUP TERM)) {
2262 Event->signal ( 2358 Event->signal (
2359 reentrant => 0,
2263 data => WF_AUTOCANCEL, 2360 data => WF_AUTOCANCEL,
2264 signal => $signal, 2361 signal => $signal,
2362 prio => 0,
2265 cb => sub { 2363 cb => sub {
2266 cf::cleanup "SIG$signal"; 2364 cf::cleanup "SIG$signal";
2267 }, 2365 },
2268 ); 2366 );
2269 } 2367 }
2270} 2368}
… …
2291 my $map = $cf::MAP{$path} or next; 2389 my $map = $cf::MAP{$path} or next;
2292 $map->valid or next; 2390 $map->valid or next;
2293 $map->save; 2391 $map->save;
2294 } 2392 }
2295 warn "end emergency map save\n"; 2393 warn "end emergency map save\n";
2394
2395 warn "begin emergency database checkpoint\n";
2396 BDB::db_env_txn_checkpoint $DB_ENV;
2397 warn "end emergency database checkpoint\n";
2296 }; 2398 };
2297 2399
2298 warn "leave emergency perl save\n"; 2400 warn "leave emergency perl save\n";
2401}
2402
2403sub post_cleanup {
2404 my ($make_core) = @_;
2405
2406 warn Carp::longmess "post_cleanup backtrace"
2407 if $make_core;
2299} 2408}
2300 2409
2301sub reload() { 2410sub reload() {
2302 # can/must only be called in main 2411 # can/must only be called in main
2303 if ($Coro::current != $Coro::main) { 2412 if ($Coro::current != $Coro::main) {
… …
2305 return; 2414 return;
2306 } 2415 }
2307 2416
2308 warn "reloading..."; 2417 warn "reloading...";
2309 2418
2310 warn "cancelling server ticker"; 2419 warn "entering sync_job";
2311 $TICK_WATCHER->cancel;
2312 2420
2421 cf::sync_job {
2422 cf::write_runtime; # external watchdog should not bark
2313 cf::emergency_save; 2423 cf::emergency_save;
2424 cf::write_runtime; # external watchdog should not bark
2314 2425
2315 eval { 2426 warn "syncing database to disk";
2427 BDB::db_env_txn_checkpoint $DB_ENV;
2428
2316 # if anything goes wrong in here, we should simply crash as we already saved 2429 # if anything goes wrong in here, we should simply crash as we already saved
2317
2318 warn "syncing database to disk";
2319 cf::db_sync;
2320 2430
2321 warn "cancelling all WF_AUTOCANCEL watchers"; 2431 warn "cancelling all WF_AUTOCANCEL watchers";
2322 for (Event::all_watchers) { 2432 for (Event::all_watchers) {
2323 $_->cancel if $_->data & WF_AUTOCANCEL; 2433 $_->cancel if $_->data & WF_AUTOCANCEL;
2324 } 2434 }
2325 2435
2326 warn "flushing outstanding aio requests"; 2436 warn "flushing outstanding aio requests";
2327 for (;;) { 2437 for (;;) {
2438 BDB::flush;
2328 IO::AIO::flush; 2439 IO::AIO::flush;
2329 Coro::cede; 2440 Coro::cede;
2330 last unless IO::AIO::nreqs; 2441 last unless IO::AIO::nreqs || BDB::nreqs;
2331 warn "iterate..."; 2442 warn "iterate...";
2332 } 2443 }
2444
2445 ++$RELOAD;
2333 2446
2334 warn "cancelling all extension coros"; 2447 warn "cancelling all extension coros";
2335 $_->cancel for values %EXT_CORO; 2448 $_->cancel for values %EXT_CORO;
2336 %EXT_CORO = (); 2449 %EXT_CORO = ();
2337 2450
… …
2390 require cf; 2503 require cf;
2391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2504 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2392 2505
2393 warn "loading config and database again"; 2506 warn "loading config and database again";
2394 cf::cfg_load; 2507 cf::cfg_load;
2395 cf::db_load;
2396 2508
2397 warn "loading extensions"; 2509 warn "loading extensions";
2398 cf::load_extensions; 2510 cf::load_extensions;
2399 2511
2400 warn "reattaching attachments to objects/players"; 2512 warn "reattaching attachments to objects/players";
2401 _global_reattach; 2513 _global_reattach; # objects, sockets
2402 warn "reattaching attachments to maps"; 2514 warn "reattaching attachments to maps";
2403 reattach $_ for values %MAP; 2515 reattach $_ for values %MAP;
2516 warn "reattaching attachments to players";
2517 reattach $_ for values %PLAYER;
2404 2518
2405 warn "restarting server ticker"; 2519 warn "loading reloadable resources";
2520 reload_resources;
2406 2521
2407 $TICK_WATCHER->start; 2522 warn "leaving sync_job";
2408 };
2409 2523
2410 if ($@) { 2524 1
2525 } or do {
2411 warn $@; 2526 warn $@;
2412 warn "error while reloading, exiting."; 2527 warn "error while reloading, exiting.";
2413 exit 1; 2528 exit 1;
2414 } 2529 };
2415 2530
2416 warn "reloaded"; 2531 warn "reloaded";
2417}; 2532};
2418 2533
2419our $RELOAD_WATCHER; # used only during reload 2534our $RELOAD_WATCHER; # used only during reload
… …
2425 $who->message ("reloading server."); 2540 $who->message ("reloading server.");
2426 2541
2427 # doing reload synchronously and two reloads happen back-to-back, 2542 # doing reload synchronously and two reloads happen back-to-back,
2428 # coro crashes during coro_state_free->destroy here. 2543 # coro crashes during coro_state_free->destroy here.
2429 2544
2430 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2545 $RELOAD_WATCHER ||= Event->timer (
2546 reentrant => 0,
2547 after => 0,
2548 data => WF_AUTOCANCEL,
2549 cb => sub {
2431 reload; 2550 reload;
2432 undef $RELOAD_WATCHER; 2551 undef $RELOAD_WATCHER;
2552 },
2433 }); 2553 );
2434 } 2554 }
2435}; 2555};
2436 2556
2437unshift @INC, $LIBDIR; 2557unshift @INC, $LIBDIR;
2438 2558
… …
2455 2575
2456 cf::server_tick; # one server iteration 2576 cf::server_tick; # one server iteration
2457 $RUNTIME += $TICK; 2577 $RUNTIME += $TICK;
2458 $NEXT_TICK += $TICK; 2578 $NEXT_TICK += $TICK;
2459 2579
2580 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2581 $NEXT_RUNTIME_WRITE = $NOW + 10;
2582 Coro::async_pool {
2583 write_runtime
2584 or warn "ERROR: unable to write runtime file: $!";
2585 };
2586 }
2587
2460 $WAIT_FOR_TICK->broadcast; 2588 $WAIT_FOR_TICK->broadcast;
2461 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2589 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2590
2591# my $AFTER = Event::time;
2592# warn $AFTER - $NOW;#d#
2462 2593
2463 # if we are delayed by four ticks or more, skip them all 2594 # if we are delayed by four ticks or more, skip them all
2464 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2595 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2465 2596
2466 $TICK_WATCHER->at ($NEXT_TICK); 2597 $TICK_WATCHER->at ($NEXT_TICK);
2467 $TICK_WATCHER->start; 2598 $TICK_WATCHER->start;
2468 }, 2599 },
2469); 2600);
2470 2601
2602{
2603 BDB::max_poll_time $TICK * 0.1;
2604 $BDB_POLL_WATCHER = Event->io (
2605 reentrant => 0,
2606 fd => BDB::poll_fileno,
2607 poll => 'r',
2608 prio => 0,
2609 data => WF_AUTOCANCEL,
2610 cb => \&BDB::poll_cb,
2611 );
2612 BDB::min_parallel 8;
2613
2614 BDB::set_sync_prepare {
2615 my $status;
2616 my $current = $Coro::current;
2617 (
2618 sub {
2619 $status = $!;
2620 $current->ready; undef $current;
2621 },
2622 sub {
2623 Coro::schedule while defined $current;
2624 $! = $status;
2625 },
2626 )
2627 };
2628
2629 unless ($DB_ENV) {
2630 $DB_ENV = BDB::db_env_create;
2631
2632 cf::sync_job {
2633 eval {
2634 BDB::db_env_open
2635 $DB_ENV,
2636 $BDB_ENV_DIR,
2637 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2638 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2639 0666;
2640
2641 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2642
2643 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2644 $DB_ENV->set_lk_detect;
2645 };
2646
2647 cf::cleanup "db_env_open(db): $@" if $@;
2648 };
2649 }
2650}
2651
2652{
2653 IO::AIO::min_parallel 8;
2654
2655 undef $Coro::AIO::WATCHER;
2471IO::AIO::max_poll_time $TICK * 0.2; 2656 IO::AIO::max_poll_time $TICK * 0.1;
2472
2473$AIO_POLL_WATCHER = Event->io ( 2657 $AIO_POLL_WATCHER = Event->io (
2474 fd => IO::AIO::poll_fileno, 2658 reentrant => 0,
2475 poll => 'r',
2476 prio => 5,
2477 data => WF_AUTOCANCEL,
2478 cb => \&IO::AIO::poll_cb,
2479);
2480
2481$WRITE_RUNTIME_WATCHER = Event->timer (
2482 data => WF_AUTOCANCEL, 2659 data => WF_AUTOCANCEL,
2483 after => 1, 2660 fd => IO::AIO::poll_fileno,
2484 interval => 10, 2661 poll => 'r',
2485 prio => 6, # keep it lowest so it acts like a watchdog 2662 prio => 6,
2486 cb => Coro::unblock_sub { 2663 cb => \&IO::AIO::poll_cb,
2487 write_runtime 2664 );
2488 or warn "ERROR: unable to write runtime file: $!"; 2665}
2489 },
2490);
2491 2666
2492END { cf::emergency_save } 2667END { cf::emergency_save }
2493 2668
24941 26691
2495 2670

Diff Legend

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