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.231 by root, Wed Apr 4 00:02:06 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;
366 371
367 aio_rename "$runtime~", $runtime 372 aio_rename "$runtime~", $runtime
368 and return; 373 and return;
369 374
370 1 375 1
376}
377
378=item cf::datalog type => key => value, ...
379
380Log a datalog packet of the given type with the given key-value pairs.
381
382=cut
383
384sub datalog($@) {
385 my ($type, %kv) = @_;
386 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
371} 387}
372 388
373=back 389=back
374 390
375=cut 391=cut
… …
750 $filename, length $$rdata, scalar @$objs; 766 $filename, length $$rdata, scalar @$objs;
751 767
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 768 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 769 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 770 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 771 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 772 close $fh;
757 773
758 if (@$objs) { 774 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 775 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 776 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 777 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 778 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 779 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 780 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 781 aio_rename "$filename.pst~", "$filename.pst";
766 } 782 }
767 } else { 783 } else {
768 aio_unlink "$filename.pst"; 784 aio_unlink "$filename.pst";
… …
1017=cut 1033=cut
1018 1034
1019sub quit_character { 1035sub quit_character {
1020 my ($pl) = @_; 1036 my ($pl) = @_;
1021 1037
1038 my $name = $pl->ob->name;
1039
1022 $pl->{deny_save} = 1; 1040 $pl->{deny_save} = 1;
1023 $pl->password ("*"); # this should lock out the player until we nuked the dir 1041 $pl->password ("*"); # this should lock out the player until we nuked the dir
1024 1042
1025 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1043 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1026 $pl->deactivate; 1044 $pl->deactivate;
… …
1030 my $path = playerdir $pl; 1048 my $path = playerdir $pl;
1031 my $temp = "$path~$cf::RUNTIME~deleting~"; 1049 my $temp = "$path~$cf::RUNTIME~deleting~";
1032 aio_rename $path, $temp; 1050 aio_rename $path, $temp;
1033 delete $cf::PLAYER{$pl->ob->name}; 1051 delete $cf::PLAYER{$pl->ob->name};
1034 $pl->destroy; 1052 $pl->destroy;
1053
1054 my $prefix = qr<^~\Q$name\E/>;
1055
1056 # nuke player maps
1057 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1058
1035 IO::AIO::aio_rmtree $temp; 1059 IO::AIO::aio_rmtree $temp;
1060}
1061
1062=item $pl->kick
1063
1064Kicks a player out of the game. This destroys the connection.
1065
1066=cut
1067
1068sub kick {
1069 my ($pl, $kicker) = @_;
1070
1071 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1072 $pl->killer ("kicked");
1073 $pl->ns->destroy;
1036} 1074}
1037 1075
1038=item cf::player::list_logins 1076=item cf::player::list_logins
1039 1077
1040Returns am arrayref of all valid playernames in the system, can take a 1078Returns am arrayref of all valid playernames in the system, can take a
… …
1068=cut 1106=cut
1069 1107
1070sub maps($) { 1108sub maps($) {
1071 my ($pl) = @_; 1109 my ($pl) = @_;
1072 1110
1111 $pl = ref $pl ? $pl->ob->name : $pl;
1112
1073 my $files = aio_readdir playerdir $pl 1113 my $files = aio_readdir playerdir $pl
1074 or return; 1114 or return;
1075 1115
1076 my @paths; 1116 my @paths;
1077 1117
1078 for (@$files) { 1118 for (@$files) {
1079 utf8::decode $_; 1119 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1120 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1121 next unless /^$PATH_SEP/o;
1082 1122
1083 s/\.map$//; 1123 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1124 }
1086 1125
1087 \@paths 1126 \@paths
1088} 1127}
1089 1128
1090=item $player->ext_reply ($msgid, $msgtype, %msg) 1129=item $player->ext_reply ($msgid, %msg)
1091 1130
1092Sends an ext reply to the player. 1131Sends an ext reply to the player.
1093 1132
1094=cut 1133=cut
1095 1134
1096sub ext_reply($$$%) { 1135sub ext_reply($$%) {
1097 my ($self, $id, %msg) = @_; 1136 my ($self, $id, %msg) = @_;
1098 1137
1099 $msg{msgid} = $id; 1138 $msg{msgid} = $id;
1139
1140 $self->send ("ext " . cf::to_json \%msg);
1141}
1142
1143=item $player->ext_event ($type, %msg)
1144
1145Sends an ext event to the client.
1146
1147=cut
1148
1149sub ext_event($$%) {
1150 my ($self, $type, %msg) = @_;
1151
1152 delete $msg{msgid};
1153 $msg{msgtype} = "event";
1154 $msg{eventtype} = $type;
1100 1155
1101 $self->send ("ext " . cf::to_json \%msg); 1156 $self->send ("ext " . cf::to_json \%msg);
1102} 1157}
1103 1158
1104package cf; 1159package cf;
… …
1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1195 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1141 (cf::region::find $rmp->{region}), $rmp->{custom} 1196 (cf::region::find $rmp->{region}), $rmp->{custom}
1142 ) 1197 )
1143} 1198}
1144 1199
1200=item cf::map->register ($regex, $prio)
1201
1202Register a handler for the map path matching the given regex at the
1203givne priority (higher is better, built-in handlers have priority 0, the
1204default).
1205
1206=cut
1207
1145sub register { 1208sub register {
1146 my (undef, $regex) = @_; 1209 my (undef, $regex, $prio) = @_;
1147 my $pkg = caller; 1210 my $pkg = caller;
1148 1211
1149 no strict; 1212 no strict;
1150 push @{"$pkg\::ISA"}, __PACKAGE__; 1213 push @{"$pkg\::ISA"}, __PACKAGE__;
1151 1214
1152 $EXT_MAP{$pkg} = qr<$regex>; 1215 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1153} 1216}
1154 1217
1155# also paths starting with '/' 1218# also paths starting with '/'
1156$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1219$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1157 1220
1158sub thawer_merge { 1221sub thawer_merge {
1159 my ($self, $merge) = @_; 1222 my ($self, $merge) = @_;
1160 1223
1161 # we have to keep some variables in memory intact 1224 # we have to keep some variables in memory intact
… …
1167 $self->SUPER::thawer_merge ($merge); 1230 $self->SUPER::thawer_merge ($merge);
1168} 1231}
1169 1232
1170sub normalise { 1233sub normalise {
1171 my ($path, $base) = @_; 1234 my ($path, $base) = @_;
1235
1236 $path = "$path"; # make sure its a string
1237
1238 $path =~ s/\.map$//;
1172 1239
1173 # map plan: 1240 # map plan:
1174 # 1241 #
1175 # /! non-realised random map exit (special hack!) 1242 # /! non-realised random map exit (special hack!)
1176 # {... are special paths that are not being touched 1243 # {... are special paths that are not being touched
… …
1204 1271
1205 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1272 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1206 1273
1207 $path = normalise $path, $base; 1274 $path = normalise $path, $base;
1208 1275
1209 for my $pkg (keys %EXT_MAP) { 1276 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1210 if ($path =~ $EXT_MAP{$pkg}) { 1277 if ($path =~ $EXT_MAP{$pkg}[1]) {
1211 my $self = bless cf::map::new, $pkg; 1278 my $self = bless cf::map::new, $pkg;
1212 $self->{path} = $path; $self->path ($path); 1279 $self->{path} = $path; $self->path ($path);
1213 $self->init; # pass $1 etc. 1280 $self->init; # pass $1 etc.
1214 return $self; 1281 return $self;
1215 } 1282 }
1216 } 1283 }
1217 1284
1218 Carp::carp "unable to resolve path '$path'."; 1285 Carp::carp "unable to resolve path '$path' (base '$base').";
1219 () 1286 ()
1220} 1287}
1221 1288
1222sub init { 1289sub init {
1223 my ($self) = @_; 1290 my ($self) = @_;
… …
1238 1305
1239# the original (read-only) location 1306# the original (read-only) location
1240sub load_path { 1307sub load_path {
1241 my ($self) = @_; 1308 my ($self) = @_;
1242 1309
1243 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1310 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1244} 1311}
1245 1312
1246# the temporary/swap location 1313# the temporary/swap location
1247sub save_path { 1314sub save_path {
1248 my ($self) = @_; 1315 my ($self) = @_;
1249 1316
1250 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1317 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1251 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1318 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1252} 1319}
1253 1320
1254# the unique path, undef == no special unique path 1321# the unique path, undef == no special unique path
1255sub uniq_path { 1322sub uniq_path {
1256 my ($self) = @_; 1323 my ($self) = @_;
… …
1278 1345
1279sub load_header_from($) { 1346sub load_header_from($) {
1280 my ($self, $path) = @_; 1347 my ($self, $path) = @_;
1281 1348
1282 utf8::encode $path; 1349 utf8::encode $path;
1283 aio_open $path, O_RDONLY, 0 1350 #aio_open $path, O_RDONLY, 0
1284 or return; 1351 # or return;
1285 1352
1286 $self->_load_header ($path) 1353 $self->_load_header ($path)
1287 or return; 1354 or return;
1288 1355
1289 $self->{load_path} = $path; 1356 $self->{load_path} = $path;
1290 1357
1291 1 1358 1
1292} 1359}
1293 1360
1294sub load_orig { 1361sub load_header_orig {
1295 my ($self) = @_; 1362 my ($self) = @_;
1296 1363
1297 $self->load_header_from ($self->load_path) 1364 $self->load_header_from ($self->load_path)
1298} 1365}
1299 1366
1300sub load_temp { 1367sub load_header_temp {
1301 my ($self) = @_; 1368 my ($self) = @_;
1302 1369
1303 $self->load_header_from ($self->save_path) 1370 $self->load_header_from ($self->save_path)
1371}
1372
1373sub prepare_temp {
1374 my ($self) = @_;
1375
1376 $self->last_access ((delete $self->{last_access})
1377 || $cf::RUNTIME); #d#
1378 # safety
1379 $self->{instantiate_time} = $cf::RUNTIME
1380 if $self->{instantiate_time} > $cf::RUNTIME;
1381}
1382
1383sub prepare_orig {
1384 my ($self) = @_;
1385
1386 $self->{load_original} = 1;
1387 $self->{instantiate_time} = $cf::RUNTIME;
1388 $self->last_access ($cf::RUNTIME);
1389 $self->instantiate;
1304} 1390}
1305 1391
1306sub load_header { 1392sub load_header {
1307 my ($self) = @_; 1393 my ($self) = @_;
1308 1394
1309 if ($self->load_temp) { 1395 if ($self->load_header_temp) {
1310 $self->last_access ((delete $self->{last_access}) 1396 $self->prepare_temp;
1311 || $cf::RUNTIME); #d#
1312 # safety
1313 $self->{instantiate_time} = $cf::RUNTIME
1314 if $self->{instantiate_time} > $cf::RUNTIME;
1315 } else { 1397 } else {
1316 $self->load_orig 1398 $self->load_header_orig
1317 or return; 1399 or return;
1318 1400 $self->prepare_orig;
1319 $self->{load_original} = 1;
1320 $self->{instantiate_time} = $cf::RUNTIME;
1321 $self->last_access ($cf::RUNTIME);
1322 $self->instantiate;
1323 } 1401 }
1324 1402
1325 1 1403 1
1326} 1404}
1327 1405
… …
1341 $map->{last_save} = $cf::RUNTIME; 1419 $map->{last_save} = $cf::RUNTIME;
1342 1420
1343 $map->load_header 1421 $map->load_header
1344 or return; 1422 or return;
1345 1423
1346 if ($map->should_reset) { 1424 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1347 # doing this can freeze the server in a sync job, obviously 1425 # doing this can freeze the server in a sync job, obviously
1348 #$cf::WAIT_FOR_TICK->wait; 1426 #$cf::WAIT_FOR_TICK->wait;
1349 $map->reset; 1427 $map->reset;
1350 undef $guard; 1428 undef $guard;
1351 $map = find $path 1429 return find $path;
1352 or return;
1353 } 1430 }
1354 1431
1355 $cf::MAP{$path} = $map 1432 $cf::MAP{$path} = $map
1356 } 1433 }
1357} 1434}
1435
1436sub pre_load { }
1437sub post_load { }
1358 1438
1359sub load { 1439sub load {
1360 my ($self) = @_; 1440 my ($self) = @_;
1361 1441
1442 local $self->{deny_reset} = 1; # loading can take a long time
1443
1362 my $path = $self->{path}; 1444 my $path = $self->{path};
1363 my $guard = cf::lock_acquire "map_load:$path"; 1445 my $guard = cf::lock_acquire "map_load:$path";
1364 1446
1365 return if $self->in_memory != cf::MAP_SWAPPED; 1447 return if $self->in_memory != cf::MAP_SWAPPED;
1366 1448
1367 $self->in_memory (cf::MAP_LOADING); 1449 $self->in_memory (cf::MAP_LOADING);
1368 1450
1369 $self->alloc; 1451 $self->alloc;
1452
1453 $self->pre_load;
1454
1370 $self->_load_objects ($self->{load_path}, 1) 1455 $self->_load_objects ($self->{load_path}, 1)
1371 or return; 1456 or return;
1372 1457
1373 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1458 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1374 if delete $self->{load_original}; 1459 if delete $self->{load_original};
… …
1396 unless $self->difficulty; 1481 unless $self->difficulty;
1397 Coro::cede; 1482 Coro::cede;
1398 $self->activate; 1483 $self->activate;
1399 } 1484 }
1400 1485
1486 $self->post_load;
1487
1401 $self->in_memory (cf::MAP_IN_MEMORY); 1488 $self->in_memory (cf::MAP_IN_MEMORY);
1402} 1489}
1403 1490
1404sub customise_for { 1491sub customise_for {
1405 my ($self, $ob) = @_; 1492 my ($self, $ob) = @_;
… …
1469 delete $MAP_PREFETCH{$path}; 1556 delete $MAP_PREFETCH{$path};
1470 } 1557 }
1471 } 1558 }
1472 undef $MAP_PREFETCHER; 1559 undef $MAP_PREFETCHER;
1473 }; 1560 };
1561 $MAP_PREFETCHER->prio (6);
1474 1562
1475 () 1563 ()
1476} 1564}
1477 1565
1478sub save { 1566sub save {
… …
1548 return if $self->players; 1636 return if $self->players;
1549 return if $self->isa ("ext::map_per_player");#d# 1637 return if $self->isa ("ext::map_per_player");#d#
1550 1638
1551 warn "resetting map ", $self->path;#d# 1639 warn "resetting map ", $self->path;#d#
1552 1640
1641 $self->in_memory (cf::MAP_SWAPPED);
1642
1643 # need to save uniques path
1644 unless ($self->{deny_save}) {
1645 my $uniq = $self->uniq_path; utf8::encode $uniq;
1646
1647 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1648 if $uniq;
1649 }
1650
1553 delete $cf::MAP{$self->path}; 1651 delete $cf::MAP{$self->path};
1554 1652
1555 $self->in_memory (cf::MAP_SWAPPED);
1556 $self->clear; 1653 $self->clear;
1557 1654
1558 $_->clear_links_to ($self) for values %cf::MAP; 1655 $_->clear_links_to ($self) for values %cf::MAP;
1559 1656
1560 $self->unlink_save; 1657 $self->unlink_save;
… …
1597 for (@$files) { 1694 for (@$files) {
1598 utf8::decode $_; 1695 utf8::decode $_;
1599 next if /\.pst$/; 1696 next if /\.pst$/;
1600 next unless /^$PATH_SEP/o; 1697 next unless /^$PATH_SEP/o;
1601 1698
1602 s/\.map$//; 1699 push @paths, cf::map::normalise $_;
1603 push @paths, $_;
1604 } 1700 }
1605 1701
1606 \@paths 1702 \@paths
1607} 1703}
1608 1704
… …
1702=cut 1798=cut
1703 1799
1704sub link_map { 1800sub link_map {
1705 unless ($LINK_MAP) { 1801 unless ($LINK_MAP) {
1706 $LINK_MAP = cf::map::find "{link}" 1802 $LINK_MAP = cf::map::find "{link}"
1707 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1803 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1708 $LINK_MAP->load; 1804 $LINK_MAP->load;
1709 } 1805 }
1710 1806
1711 $LINK_MAP 1807 $LINK_MAP
1712} 1808}
… …
1719 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1815 return if UNIVERSAL::isa $self->map, "ext::map_link";
1720 1816
1721 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1817 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1722 if $self->map; 1818 if $self->map;
1723 1819
1724 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1820 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1725} 1821}
1726 1822
1727sub cf::object::player::leave_link { 1823sub cf::object::player::leave_link {
1728 my ($self, $map, $x, $y) = @_; 1824 my ($self, $map, $x, $y) = @_;
1729 1825
… …
1751 $map->load; 1847 $map->load;
1752 $map->load_diag; 1848 $map->load_diag;
1753 1849
1754 return unless $self->contr->active; 1850 return unless $self->contr->active;
1755 $self->activate_recursive; 1851 $self->activate_recursive;
1852
1853 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1756 $self->enter_map ($map, $x, $y); 1854 $self->enter_map ($map, $x, $y);
1757} 1855}
1758 1856
1759cf::player->attach ( 1857cf::player->attach (
1760 on_logout => sub { 1858 on_logout => sub {
… …
1773 # try to abort aborted map switching on player login :) 1871 # try to abort aborted map switching on player login :)
1774 # should happen only on crashes 1872 # should happen only on crashes
1775 if ($pl->ob->{_link_pos}) { 1873 if ($pl->ob->{_link_pos}) {
1776 $pl->ob->enter_link; 1874 $pl->ob->enter_link;
1777 (async { 1875 (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, 1876 $pl->ob->reply (undef,
1781 "There was an internal problem at your last logout, " 1877 "There was an internal problem at your last logout, "
1782 . "the server will try to bring you to your intended destination in a second.", 1878 . "the server will try to bring you to your intended destination in a second.",
1783 cf::NDI_RED); 1879 cf::NDI_RED);
1880 # we need this sleep as the login has a concurrent enter_exit running
1881 # and this sleep increases chances of the player not ending up in scorn
1784 Coro::Timer::sleep 1; 1882 Coro::Timer::sleep 1;
1785 $pl->ob->leave_link; 1883 $pl->ob->leave_link;
1786 })->prio (2); 1884 })->prio (2);
1787 } 1885 }
1788 }, 1886 },
… …
1796 my ($self, $path, $x, $y) = @_; 1894 my ($self, $path, $x, $y) = @_;
1797 1895
1798 $self->enter_link; 1896 $self->enter_link;
1799 1897
1800 (async { 1898 (async {
1899 my $map = eval {
1801 my $map = cf::map::find $path; 1900 my $map = cf::map::find $path;
1802 $map = $map->customise_for ($self) if $map; 1901 $map = $map->customise_for ($self) if $map;
1803 1902 $map
1804# warn "entering ", $map->path, " at ($x, $y)\n" 1903 } or
1805# if $map;
1806
1807 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1904 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1808 1905
1809 $self->leave_link ($map, $x, $y); 1906 $self->leave_link ($map, $x, $y);
1810 })->prio (1); 1907 })->prio (1);
1811} 1908}
1812 1909
… …
1843 # that depends on the exit object 1940 # that depends on the exit object
1844 1941
1845 my $rmp = parse_random_map_params $exit->msg; 1942 my $rmp = parse_random_map_params $exit->msg;
1846 1943
1847 if ($exit->map) { 1944 if ($exit->map) {
1848 $rmp->{region} = $exit->map->region_name; 1945 $rmp->{region} = $exit->region->name;
1849 $rmp->{origin_map} = $exit->map->path; 1946 $rmp->{origin_map} = $exit->map->path;
1850 $rmp->{origin_x} = $exit->x; 1947 $rmp->{origin_x} = $exit->x;
1851 $rmp->{origin_y} = $exit->y; 1948 $rmp->{origin_y} = $exit->y;
1852 } 1949 }
1853 1950
… …
1870sub cf::object::player::enter_exit { 1967sub cf::object::player::enter_exit {
1871 my ($self, $exit) = @_; 1968 my ($self, $exit) = @_;
1872 1969
1873 return unless $self->type == cf::PLAYER; 1970 return unless $self->type == cf::PLAYER;
1874 1971
1972 if ($exit->slaying eq "/!") {
1973 #TODO: this should de-fi-ni-te-ly not be a sync-job
1974 cf::sync_job { prepare_random_map $exit };
1975 }
1976
1977 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1978 my $hp = $exit->stats->hp;
1979 my $sp = $exit->stats->sp;
1980
1875 $self->enter_link; 1981 $self->enter_link;
1876 1982
1877 (async { 1983 (async {
1878 $self->deactivate_recursive; # just to be sure 1984 $self->deactivate_recursive; # just to be sure
1879 unless (eval { 1985 unless (eval {
1880 prepare_random_map $exit 1986 $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 1987
1886 1; 1988 1;
1887 }) { 1989 }) {
1888 $self->message ("Something went wrong deep within the crossfire server. " 1990 $self->message ("Something went wrong deep within the crossfire server. "
1889 . "I'll try to bring you back to the map you were before. " 1991 . "I'll try to bring you back to the map you were before. "
… …
1909 2011
1910sub cf::client::send_drawinfo { 2012sub cf::client::send_drawinfo {
1911 my ($self, $text, $flags) = @_; 2013 my ($self, $text, $flags) = @_;
1912 2014
1913 utf8::encode $text; 2015 utf8::encode $text;
1914 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2016 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1915} 2017}
1916 2018
1917 2019
1918=item $success = $client->query ($flags, "text", \&cb) 2020=item $success = $client->query ($flags, "text", \&cb)
1919 2021
… …
1950 # get handled first 2052 # get handled first
1951 my $queue = delete $ns->{query_queue} 2053 my $queue = delete $ns->{query_queue}
1952 or return; # be conservative, not sure how that can happen, but we saw a crash here 2054 or return; # be conservative, not sure how that can happen, but we saw a crash here
1953 2055
1954 (shift @$queue)->[1]->($msg); 2056 (shift @$queue)->[1]->($msg);
2057 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1955 2058
1956 push @{ $ns->{query_queue} }, @$queue; 2059 push @{ $ns->{query_queue} }, @$queue;
1957 2060
1958 if (@{ $ns->{query_queue} } == @$queue) { 2061 if (@{ $ns->{query_queue} } == @$queue) {
1959 if (@$queue) { 2062 if (@$queue) {
… …
2017 2120
2018# here we export the classes and methods available to script code 2121# here we export the classes and methods available to script code
2019 2122
2020=pod 2123=pod
2021 2124
2022The following fucntions and emthods are available within a safe environment: 2125The following functions and methods are available within a safe environment:
2023 2126
2024 cf::object contr pay_amount pay_player map 2127 cf::object contr pay_amount pay_player map
2025 cf::object::player player 2128 cf::object::player player
2026 cf::player peaceful 2129 cf::player peaceful
2027 cf::map trigger 2130 cf::map trigger
… …
2120The parameter C<$family> should best start with the name of the extension 2223The parameter C<$family> should best start with the name of the extension
2121using it, it should be unique. 2224using it, it should be unique.
2122 2225
2123=over 4 2226=over 4
2124 2227
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 2228=item $value = cf::db_get $family => $key
2132 2229
2133Returns a single value from the database 2230Returns 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 2231
2140=item cf::db_put $family => $key => $value 2232=item cf::db_put $family => $key => $value
2141 2233
2142Stores the given C<$value> in the family hash. Updates are delayed, if you 2234Stores 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 2235
2153=cut 2236=cut
2154 2237
2155our $DB; 2238our $DB;
2156 2239
2157{ 2240sub db_init {
2241 unless ($DB) {
2242 $DB = BDB::db_create $DB_ENV;
2243
2244 cf::sync_job {
2245 eval {
2246 $DB->set_flags (BDB::CHKSUM);
2247
2248 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2249 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2250 cf::cleanup "db_open(db): $!" if $!;
2251 };
2252 cf::cleanup "db_open(db): $@" if $@;
2253 };
2254
2158 my $path = cf::localdir . "/database.pst"; 2255 my $path = cf::localdir . "/database.pst";
2256 if (stat $path) {
2257 cf::sync_job {
2258 my $pst = Storable::retrieve $path;
2159 2259
2160 sub db_load() { 2260 cf::db_put (board => data => $pst->{board});
2161 $DB = stat $path ? Storable::retrieve $path : { }; 2261 cf::db_put (guildrules => data => $pst->{guildrules});
2162 } 2262 cf::db_put (rent => balance => $pst->{rent}{balance});
2263 BDB::db_env_txn_checkpoint $DB_ENV;
2163 2264
2164 my $pid; 2265 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 } 2266 };
2174 } 2267 }
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 }); 2268 }
2269}
2186 2270
2187 sub db_dirty() {
2188 $dirty = 1;
2189 $idle->start;
2190 }
2191
2192 sub db_get($;$) { 2271sub db_get($$) {
2193 @_ >= 2 2272 my $key = "$_[0]/$_[1]";
2194 ? $DB->{$_[0]}{$_[1]}
2195 : ($DB->{$_[0]} ||= { })
2196 }
2197 2273
2274 cf::sync_job {
2275 BDB::db_get $DB, undef, $key, my $data;
2276
2277 $! ? ()
2278 : Compress::LZF::sthaw $data
2279 }
2280}
2281
2198 sub db_put($$;$) { 2282sub db_put($$$) {
2199 if (@_ >= 3) { 2283 BDB::dbreq_pri 4;
2200 $DB->{$_[0]}{$_[1]} = $_[2]; 2284 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2285}
2286
2287#############################################################################
2288# the server's init and main functions
2289
2290sub load_facedata {
2291 my $path = sprintf "%s/facedata", cf::datadir;
2292
2293 warn "loading facedata from $path\n";
2294
2295 my $faces;
2296 0 < aio_load $path, $faces
2297 or die "$path: $!";
2298
2299 Coro::cede;
2300 $faces = Storable::thaw $faces;
2301 Coro::cede;
2302
2303 my $meta = delete $faces->{""};
2304 $meta->{version} == 1
2305 or cf::cleanup "$path: version mismatch, cannot proceed.";
2306
2307 while (my ($face, $info) = each %$faces) {
2308 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2309 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2310 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2311 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2312 Coro::cede;
2313 }
2314
2315 while (my ($face, $info) = each %$faces) {
2316 next unless $info->{smooth};
2317 my $idx = cf::face::find $face
2318 or next;
2319 if (my $smooth = cf::face::find $info->{smooth}) {
2320 cf::face::set_smooth $idx, $smooth;
2201 } else { 2321 } else {
2202 $DB->{$_[0]} = $_[1]; 2322 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 }, 2323 }
2212 ); 2324 Coro::cede;
2213} 2325 }
2214 2326
2215############################################################################# 2327 1
2216# the server's main() 2328}
2329
2330sub reload_resources {
2331 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2332 or die "unable to load regions file\n";#d#
2333 load_facedata
2334 or die "unable to load facedata\n";#d#
2335}
2336
2337sub init {
2338 reload_resources;
2339}
2217 2340
2218sub cfg_load { 2341sub cfg_load {
2219 open my $fh, "<:utf8", cf::confdir . "/config" 2342 open my $fh, "<:utf8", cf::confdir . "/config"
2220 or return; 2343 or return;
2221 2344
… …
2244 Event::one_event; 2367 Event::one_event;
2245 })->prio (Coro::PRIO_MAX); 2368 })->prio (Coro::PRIO_MAX);
2246 }; 2369 };
2247 2370
2248 cfg_load; 2371 cfg_load;
2249 db_load; 2372 db_init;
2250 load_extensions; 2373 load_extensions;
2251 2374
2252 $TICK_WATCHER->start; 2375 $TICK_WATCHER->start;
2253 Event::loop; 2376 Event::loop;
2254} 2377}
… …
2258 2381
2259# install some emergency cleanup handlers 2382# install some emergency cleanup handlers
2260BEGIN { 2383BEGIN {
2261 for my $signal (qw(INT HUP TERM)) { 2384 for my $signal (qw(INT HUP TERM)) {
2262 Event->signal ( 2385 Event->signal (
2386 reentrant => 0,
2263 data => WF_AUTOCANCEL, 2387 data => WF_AUTOCANCEL,
2264 signal => $signal, 2388 signal => $signal,
2389 prio => 0,
2265 cb => sub { 2390 cb => sub {
2266 cf::cleanup "SIG$signal"; 2391 cf::cleanup "SIG$signal";
2267 }, 2392 },
2268 ); 2393 );
2269 } 2394 }
2270} 2395}
… …
2291 my $map = $cf::MAP{$path} or next; 2416 my $map = $cf::MAP{$path} or next;
2292 $map->valid or next; 2417 $map->valid or next;
2293 $map->save; 2418 $map->save;
2294 } 2419 }
2295 warn "end emergency map save\n"; 2420 warn "end emergency map save\n";
2421
2422 warn "begin emergency database checkpoint\n";
2423 BDB::db_env_txn_checkpoint $DB_ENV;
2424 warn "end emergency database checkpoint\n";
2296 }; 2425 };
2297 2426
2298 warn "leave emergency perl save\n"; 2427 warn "leave emergency perl save\n";
2428}
2429
2430sub post_cleanup {
2431 my ($make_core) = @_;
2432
2433 warn Carp::longmess "post_cleanup backtrace"
2434 if $make_core;
2299} 2435}
2300 2436
2301sub reload() { 2437sub reload() {
2302 # can/must only be called in main 2438 # can/must only be called in main
2303 if ($Coro::current != $Coro::main) { 2439 if ($Coro::current != $Coro::main) {
… …
2305 return; 2441 return;
2306 } 2442 }
2307 2443
2308 warn "reloading..."; 2444 warn "reloading...";
2309 2445
2310 warn "cancelling server ticker"; 2446 warn "entering sync_job";
2311 $TICK_WATCHER->cancel;
2312 2447
2448 cf::sync_job {
2449 cf::write_runtime; # external watchdog should not bark
2313 cf::emergency_save; 2450 cf::emergency_save;
2451 cf::write_runtime; # external watchdog should not bark
2314 2452
2315 eval { 2453 warn "syncing database to disk";
2454 BDB::db_env_txn_checkpoint $DB_ENV;
2455
2316 # if anything goes wrong in here, we should simply crash as we already saved 2456 # 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 2457
2321 warn "cancelling all WF_AUTOCANCEL watchers"; 2458 warn "cancelling all WF_AUTOCANCEL watchers";
2322 for (Event::all_watchers) { 2459 for (Event::all_watchers) {
2323 $_->cancel if $_->data & WF_AUTOCANCEL; 2460 $_->cancel if $_->data & WF_AUTOCANCEL;
2324 } 2461 }
2325 2462
2326 warn "flushing outstanding aio requests"; 2463 warn "flushing outstanding aio requests";
2327 for (;;) { 2464 for (;;) {
2465 BDB::flush;
2328 IO::AIO::flush; 2466 IO::AIO::flush;
2329 Coro::cede; 2467 Coro::cede;
2330 last unless IO::AIO::nreqs; 2468 last unless IO::AIO::nreqs || BDB::nreqs;
2331 warn "iterate..."; 2469 warn "iterate...";
2332 } 2470 }
2471
2472 ++$RELOAD;
2333 2473
2334 warn "cancelling all extension coros"; 2474 warn "cancelling all extension coros";
2335 $_->cancel for values %EXT_CORO; 2475 $_->cancel for values %EXT_CORO;
2336 %EXT_CORO = (); 2476 %EXT_CORO = ();
2337 2477
… …
2390 require cf; 2530 require cf;
2391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2531 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2392 2532
2393 warn "loading config and database again"; 2533 warn "loading config and database again";
2394 cf::cfg_load; 2534 cf::cfg_load;
2395 cf::db_load;
2396 2535
2397 warn "loading extensions"; 2536 warn "loading extensions";
2398 cf::load_extensions; 2537 cf::load_extensions;
2399 2538
2400 warn "reattaching attachments to objects/players"; 2539 warn "reattaching attachments to objects/players";
2401 _global_reattach; 2540 _global_reattach; # objects, sockets
2402 warn "reattaching attachments to maps"; 2541 warn "reattaching attachments to maps";
2403 reattach $_ for values %MAP; 2542 reattach $_ for values %MAP;
2543 warn "reattaching attachments to players";
2544 reattach $_ for values %PLAYER;
2404 2545
2405 warn "restarting server ticker"; 2546 warn "loading reloadable resources";
2547 reload_resources;
2406 2548
2407 $TICK_WATCHER->start; 2549 warn "leaving sync_job";
2408 };
2409 2550
2410 if ($@) { 2551 1
2552 } or do {
2411 warn $@; 2553 warn $@;
2412 warn "error while reloading, exiting."; 2554 warn "error while reloading, exiting.";
2413 exit 1; 2555 exit 1;
2414 } 2556 };
2415 2557
2416 warn "reloaded"; 2558 warn "reloaded";
2417}; 2559};
2418 2560
2419our $RELOAD_WATCHER; # used only during reload 2561our $RELOAD_WATCHER; # used only during reload
… …
2425 $who->message ("reloading server."); 2567 $who->message ("reloading server.");
2426 2568
2427 # doing reload synchronously and two reloads happen back-to-back, 2569 # doing reload synchronously and two reloads happen back-to-back,
2428 # coro crashes during coro_state_free->destroy here. 2570 # coro crashes during coro_state_free->destroy here.
2429 2571
2430 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2572 $RELOAD_WATCHER ||= Event->timer (
2573 reentrant => 0,
2574 after => 0,
2575 data => WF_AUTOCANCEL,
2576 cb => sub {
2431 reload; 2577 reload;
2432 undef $RELOAD_WATCHER; 2578 undef $RELOAD_WATCHER;
2579 },
2433 }); 2580 );
2434 } 2581 }
2435}; 2582};
2436 2583
2437unshift @INC, $LIBDIR; 2584unshift @INC, $LIBDIR;
2438 2585
… …
2455 2602
2456 cf::server_tick; # one server iteration 2603 cf::server_tick; # one server iteration
2457 $RUNTIME += $TICK; 2604 $RUNTIME += $TICK;
2458 $NEXT_TICK += $TICK; 2605 $NEXT_TICK += $TICK;
2459 2606
2607 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2608 $NEXT_RUNTIME_WRITE = $NOW + 10;
2609 Coro::async_pool {
2610 write_runtime
2611 or warn "ERROR: unable to write runtime file: $!";
2612 };
2613 }
2614
2460 $WAIT_FOR_TICK->broadcast; 2615 $WAIT_FOR_TICK->broadcast;
2461 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2616 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2617
2618# my $AFTER = Event::time;
2619# warn $AFTER - $NOW;#d#
2462 2620
2463 # if we are delayed by four ticks or more, skip them all 2621 # if we are delayed by four ticks or more, skip them all
2464 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2622 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2465 2623
2466 $TICK_WATCHER->at ($NEXT_TICK); 2624 $TICK_WATCHER->at ($NEXT_TICK);
2467 $TICK_WATCHER->start; 2625 $TICK_WATCHER->start;
2468 }, 2626 },
2469); 2627);
2470 2628
2629{
2630 BDB::max_poll_time $TICK * 0.1;
2631 $BDB_POLL_WATCHER = Event->io (
2632 reentrant => 0,
2633 fd => BDB::poll_fileno,
2634 poll => 'r',
2635 prio => 0,
2636 data => WF_AUTOCANCEL,
2637 cb => \&BDB::poll_cb,
2638 );
2639 BDB::min_parallel 8;
2640
2641 BDB::set_sync_prepare {
2642 my $status;
2643 my $current = $Coro::current;
2644 (
2645 sub {
2646 $status = $!;
2647 $current->ready; undef $current;
2648 },
2649 sub {
2650 Coro::schedule while defined $current;
2651 $! = $status;
2652 },
2653 )
2654 };
2655
2656 unless ($DB_ENV) {
2657 $DB_ENV = BDB::db_env_create;
2658
2659 cf::sync_job {
2660 eval {
2661 BDB::db_env_open
2662 $DB_ENV,
2663 $BDB_ENV_DIR,
2664 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2665 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2666 0666;
2667
2668 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2669
2670 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2671 $DB_ENV->set_lk_detect;
2672 };
2673
2674 cf::cleanup "db_env_open(db): $@" if $@;
2675 };
2676 }
2677}
2678
2679{
2680 IO::AIO::min_parallel 8;
2681
2682 undef $Coro::AIO::WATCHER;
2471IO::AIO::max_poll_time $TICK * 0.2; 2683 IO::AIO::max_poll_time $TICK * 0.1;
2472
2473$AIO_POLL_WATCHER = Event->io ( 2684 $AIO_POLL_WATCHER = Event->io (
2474 fd => IO::AIO::poll_fileno, 2685 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, 2686 data => WF_AUTOCANCEL,
2483 after => 1, 2687 fd => IO::AIO::poll_fileno,
2484 interval => 10, 2688 poll => 'r',
2485 prio => 6, # keep it lowest so it acts like a watchdog 2689 prio => 6,
2486 cb => Coro::unblock_sub { 2690 cb => \&IO::AIO::poll_cb,
2487 write_runtime 2691 );
2488 or warn "ERROR: unable to write runtime file: $!"; 2692}
2489 },
2490);
2491 2693
2492END { cf::emergency_save } 2694END { cf::emergency_save }
2493 2695
24941 26961
2495 2697

Diff Legend

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