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.185 by root, Fri Jan 19 23:32:52 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
358 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 359 # 10 is the runtime save interval, for a monotonic clock
360 # 60 allows for the watchdog to kill the server.
361
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 362 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 363 and return;
357 364
365 # always fsync - this file is important
358 aio_fsync $fh 366 aio_fsync $fh
359 and return; 367 and return;
360 368
361 close $fh 369 close $fh
362 or return; 370 or return;
363 371
364 aio_rename "$runtime~", $runtime 372 aio_rename "$runtime~", $runtime
365 and return; 373 and return;
366 374
367 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 });
368} 387}
369 388
370=back 389=back
371 390
372=cut 391=cut
… …
747 $filename, length $$rdata, scalar @$objs; 766 $filename, length $$rdata, scalar @$objs;
748 767
749 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 768 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
750 chmod SAVE_MODE, $fh; 769 chmod SAVE_MODE, $fh;
751 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 770 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
752 aio_fsync $fh; 771 aio_fsync $fh if $cf::USE_FSYNC;
753 close $fh; 772 close $fh;
754 773
755 if (@$objs) { 774 if (@$objs) {
756 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) {
757 chmod SAVE_MODE, $fh; 776 chmod SAVE_MODE, $fh;
758 my $data = Storable::nfreeze { version => 1, objs => $objs }; 777 my $data = Storable::nfreeze { version => 1, objs => $objs };
759 aio_write $fh, 0, (length $data), $data, 0; 778 aio_write $fh, 0, (length $data), $data, 0;
760 aio_fsync $fh; 779 aio_fsync $fh if $cf::USE_FSYNC;
761 close $fh; 780 close $fh;
762 aio_rename "$filename.pst~", "$filename.pst"; 781 aio_rename "$filename.pst~", "$filename.pst";
763 } 782 }
764 } else { 783 } else {
765 aio_unlink "$filename.pst"; 784 aio_unlink "$filename.pst";
… …
1014=cut 1033=cut
1015 1034
1016sub quit_character { 1035sub quit_character {
1017 my ($pl) = @_; 1036 my ($pl) = @_;
1018 1037
1038 my $name = $pl->ob->name;
1039
1019 $pl->{deny_save} = 1; 1040 $pl->{deny_save} = 1;
1020 $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
1021 1042
1022 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1043 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1023 $pl->deactivate; 1044 $pl->deactivate;
… …
1027 my $path = playerdir $pl; 1048 my $path = playerdir $pl;
1028 my $temp = "$path~$cf::RUNTIME~deleting~"; 1049 my $temp = "$path~$cf::RUNTIME~deleting~";
1029 aio_rename $path, $temp; 1050 aio_rename $path, $temp;
1030 delete $cf::PLAYER{$pl->ob->name}; 1051 delete $cf::PLAYER{$pl->ob->name};
1031 $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
1032 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;
1033} 1074}
1034 1075
1035=item cf::player::list_logins 1076=item cf::player::list_logins
1036 1077
1037Returns 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
… …
1065=cut 1106=cut
1066 1107
1067sub maps($) { 1108sub maps($) {
1068 my ($pl) = @_; 1109 my ($pl) = @_;
1069 1110
1111 $pl = ref $pl ? $pl->ob->name : $pl;
1112
1070 my $files = aio_readdir playerdir $pl 1113 my $files = aio_readdir playerdir $pl
1071 or return; 1114 or return;
1072 1115
1073 my @paths; 1116 my @paths;
1074 1117
1075 for (@$files) { 1118 for (@$files) {
1076 utf8::decode $_; 1119 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1120 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1121 next unless /^$PATH_SEP/o;
1079 1122
1080 s/\.map$//; 1123 push @paths, cf::map::normalise "~$pl/$_";
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 } 1124 }
1083 1125
1084 \@paths 1126 \@paths
1085} 1127}
1086 1128
1087=item $player->ext_reply ($msgid, $msgtype, %msg) 1129=item $player->ext_reply ($msgid, %msg)
1088 1130
1089Sends an ext reply to the player. 1131Sends an ext reply to the player.
1090 1132
1091=cut 1133=cut
1092 1134
1093sub ext_reply($$$%) { 1135sub ext_reply($$%) {
1094 my ($self, $id, %msg) = @_; 1136 my ($self, $id, %msg) = @_;
1095 1137
1096 $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;
1097 1155
1098 $self->send ("ext " . cf::to_json \%msg); 1156 $self->send ("ext " . cf::to_json \%msg);
1099} 1157}
1100 1158
1101package cf; 1159package cf;
… …
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1195 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1196 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1197 )
1140} 1198}
1141 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
1142sub register { 1208sub register {
1143 my (undef, $regex) = @_; 1209 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1210 my $pkg = caller;
1145 1211
1146 no strict; 1212 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1213 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1214
1149 $EXT_MAP{$pkg} = qr<$regex>; 1215 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1216}
1151 1217
1152# also paths starting with '/' 1218# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1219$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1220
1155sub thawer_merge { 1221sub thawer_merge {
1156 my ($self, $merge) = @_; 1222 my ($self, $merge) = @_;
1157 1223
1158 # we have to keep some variables in memory intact 1224 # we have to keep some variables in memory intact
… …
1164 $self->SUPER::thawer_merge ($merge); 1230 $self->SUPER::thawer_merge ($merge);
1165} 1231}
1166 1232
1167sub normalise { 1233sub normalise {
1168 my ($path, $base) = @_; 1234 my ($path, $base) = @_;
1235
1236 $path = "$path"; # make sure its a string
1237
1238 $path =~ s/\.map$//;
1169 1239
1170 # map plan: 1240 # map plan:
1171 # 1241 #
1172 # /! non-realised random map exit (special hack!) 1242 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched 1243 # {... are special paths that are not being touched
… …
1201 1271
1202 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
1203 1273
1204 $path = normalise $path, $base; 1274 $path = normalise $path, $base;
1205 1275
1206 for my $pkg (keys %EXT_MAP) { 1276 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1277 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1278 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1279 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1280 $self->init; # pass $1 etc.
1211 return $self; 1281 return $self;
1212 } 1282 }
1213 } 1283 }
1214 1284
1215 Carp::carp "unable to resolve path '$path'."; 1285 Carp::carp "unable to resolve path '$path' (base '$base').";
1216 () 1286 ()
1217} 1287}
1218 1288
1219sub init { 1289sub init {
1220 my ($self) = @_; 1290 my ($self) = @_;
… …
1235 1305
1236# the original (read-only) location 1306# the original (read-only) location
1237sub load_path { 1307sub load_path {
1238 my ($self) = @_; 1308 my ($self) = @_;
1239 1309
1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1310 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1241} 1311}
1242 1312
1243# the temporary/swap location 1313# the temporary/swap location
1244sub save_path { 1314sub save_path {
1245 my ($self) = @_; 1315 my ($self) = @_;
1246 1316
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1317 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1318 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1249} 1319}
1250 1320
1251# the unique path, undef == no special unique path 1321# the unique path, undef == no special unique path
1252sub uniq_path { 1322sub uniq_path {
1253 my ($self) = @_; 1323 my ($self) = @_;
… …
1275 1345
1276sub load_header_from($) { 1346sub load_header_from($) {
1277 my ($self, $path) = @_; 1347 my ($self, $path) = @_;
1278 1348
1279 utf8::encode $path; 1349 utf8::encode $path;
1280 aio_open $path, O_RDONLY, 0 1350 #aio_open $path, O_RDONLY, 0
1281 or return; 1351 # or return;
1282 1352
1283 $self->_load_header ($path) 1353 $self->_load_header ($path)
1284 or return; 1354 or return;
1285 1355
1286 $self->{load_path} = $path; 1356 $self->{load_path} = $path;
1287 1357
1288 1 1358 1
1289} 1359}
1290 1360
1291sub load_orig { 1361sub load_header_orig {
1292 my ($self) = @_; 1362 my ($self) = @_;
1293 1363
1294 $self->load_header_from ($self->load_path) 1364 $self->load_header_from ($self->load_path)
1295} 1365}
1296 1366
1297sub load_temp { 1367sub load_header_temp {
1298 my ($self) = @_; 1368 my ($self) = @_;
1299 1369
1300 $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;
1301} 1390}
1302 1391
1303sub load_header { 1392sub load_header {
1304 my ($self) = @_; 1393 my ($self) = @_;
1305 1394
1306 if ($self->load_temp) { 1395 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1396 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1397 } else {
1313 $self->load_orig 1398 $self->load_header_orig
1314 or return; 1399 or return;
1315 1400 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1401 }
1321 1402
1322 1 1403 1
1323} 1404}
1324 1405
… …
1338 $map->{last_save} = $cf::RUNTIME; 1419 $map->{last_save} = $cf::RUNTIME;
1339 1420
1340 $map->load_header 1421 $map->load_header
1341 or return; 1422 or return;
1342 1423
1343 if ($map->should_reset) { 1424 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1344 # doing this can freeze the server in a sync job, obviously 1425 # doing this can freeze the server in a sync job, obviously
1345 #$cf::WAIT_FOR_TICK->wait; 1426 #$cf::WAIT_FOR_TICK->wait;
1346 $map->reset; 1427 $map->reset;
1347 undef $guard; 1428 undef $guard;
1348 $map = find $path 1429 return find $path;
1349 or return;
1350 } 1430 }
1351 1431
1352 $cf::MAP{$path} = $map 1432 $cf::MAP{$path} = $map
1353 } 1433 }
1354} 1434}
1435
1436sub pre_load { }
1437sub post_load { }
1355 1438
1356sub load { 1439sub load {
1357 my ($self) = @_; 1440 my ($self) = @_;
1358 1441
1442 local $self->{deny_reset} = 1; # loading can take a long time
1443
1359 my $path = $self->{path}; 1444 my $path = $self->{path};
1360 my $guard = cf::lock_acquire "map_load:$path"; 1445 my $guard = cf::lock_acquire "map_load:$path";
1361 1446
1362 return if $self->in_memory != cf::MAP_SWAPPED; 1447 return if $self->in_memory != cf::MAP_SWAPPED;
1363 1448
1364 $self->in_memory (cf::MAP_LOADING); 1449 $self->in_memory (cf::MAP_LOADING);
1365 1450
1366 $self->alloc; 1451 $self->alloc;
1452
1453 $self->pre_load;
1454
1367 $self->_load_objects ($self->{load_path}, 1) 1455 $self->_load_objects ($self->{load_path}, 1)
1368 or return; 1456 or return;
1369 1457
1370 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1458 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1371 if delete $self->{load_original}; 1459 if delete $self->{load_original};
… …
1393 unless $self->difficulty; 1481 unless $self->difficulty;
1394 Coro::cede; 1482 Coro::cede;
1395 $self->activate; 1483 $self->activate;
1396 } 1484 }
1397 1485
1486 $self->post_load;
1487
1398 $self->in_memory (cf::MAP_IN_MEMORY); 1488 $self->in_memory (cf::MAP_IN_MEMORY);
1399} 1489}
1400 1490
1401sub customise_for { 1491sub customise_for {
1402 my ($self, $ob) = @_; 1492 my ($self, $ob) = @_;
… …
1466 delete $MAP_PREFETCH{$path}; 1556 delete $MAP_PREFETCH{$path};
1467 } 1557 }
1468 } 1558 }
1469 undef $MAP_PREFETCHER; 1559 undef $MAP_PREFETCHER;
1470 }; 1560 };
1561 $MAP_PREFETCHER->prio (6);
1471 1562
1472 () 1563 ()
1473} 1564}
1474 1565
1475sub save { 1566sub save {
… …
1545 return if $self->players; 1636 return if $self->players;
1546 return if $self->isa ("ext::map_per_player");#d# 1637 return if $self->isa ("ext::map_per_player");#d#
1547 1638
1548 warn "resetting map ", $self->path;#d# 1639 warn "resetting map ", $self->path;#d#
1549 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
1550 delete $cf::MAP{$self->path}; 1651 delete $cf::MAP{$self->path};
1551 1652
1552 $self->in_memory (cf::MAP_SWAPPED);
1553 $self->clear; 1653 $self->clear;
1554 1654
1555 $_->clear_links_to ($self) for values %cf::MAP; 1655 $_->clear_links_to ($self) for values %cf::MAP;
1556 1656
1557 $self->unlink_save; 1657 $self->unlink_save;
… …
1594 for (@$files) { 1694 for (@$files) {
1595 utf8::decode $_; 1695 utf8::decode $_;
1596 next if /\.pst$/; 1696 next if /\.pst$/;
1597 next unless /^$PATH_SEP/o; 1697 next unless /^$PATH_SEP/o;
1598 1698
1599 s/\.map$//; 1699 push @paths, cf::map::normalise $_;
1600 push @paths, $_;
1601 } 1700 }
1602 1701
1603 \@paths 1702 \@paths
1604} 1703}
1605 1704
… …
1699=cut 1798=cut
1700 1799
1701sub link_map { 1800sub link_map {
1702 unless ($LINK_MAP) { 1801 unless ($LINK_MAP) {
1703 $LINK_MAP = cf::map::find "{link}" 1802 $LINK_MAP = cf::map::find "{link}"
1704 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1803 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1705 $LINK_MAP->load; 1804 $LINK_MAP->load;
1706 } 1805 }
1707 1806
1708 $LINK_MAP 1807 $LINK_MAP
1709} 1808}
… …
1716 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1815 return if UNIVERSAL::isa $self->map, "ext::map_link";
1717 1816
1718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1817 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1719 if $self->map; 1818 if $self->map;
1720 1819
1721 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1820 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1722} 1821}
1723 1822
1724sub cf::object::player::leave_link { 1823sub cf::object::player::leave_link {
1725 my ($self, $map, $x, $y) = @_; 1824 my ($self, $map, $x, $y) = @_;
1726 1825
… …
1748 $map->load; 1847 $map->load;
1749 $map->load_diag; 1848 $map->load_diag;
1750 1849
1751 return unless $self->contr->active; 1850 return unless $self->contr->active;
1752 $self->activate_recursive; 1851 $self->activate_recursive;
1852
1853 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1753 $self->enter_map ($map, $x, $y); 1854 $self->enter_map ($map, $x, $y);
1754} 1855}
1755 1856
1756cf::player->attach ( 1857cf::player->attach (
1757 on_logout => sub { 1858 on_logout => sub {
… …
1770 # try to abort aborted map switching on player login :) 1871 # try to abort aborted map switching on player login :)
1771 # should happen only on crashes 1872 # should happen only on crashes
1772 if ($pl->ob->{_link_pos}) { 1873 if ($pl->ob->{_link_pos}) {
1773 $pl->ob->enter_link; 1874 $pl->ob->enter_link;
1774 (async { 1875 (async {
1775 # we need this sleep as the login has a concurrent enter_exit running
1776 # and this sleep increases chances of the player not ending up in scorn
1777 $pl->ob->reply (undef, 1876 $pl->ob->reply (undef,
1778 "There was an internal problem at your last logout, " 1877 "There was an internal problem at your last logout, "
1779 . "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.",
1780 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
1781 Coro::Timer::sleep 1; 1882 Coro::Timer::sleep 1;
1782 $pl->ob->leave_link; 1883 $pl->ob->leave_link;
1783 })->prio (2); 1884 })->prio (2);
1784 } 1885 }
1785 }, 1886 },
… …
1793 my ($self, $path, $x, $y) = @_; 1894 my ($self, $path, $x, $y) = @_;
1794 1895
1795 $self->enter_link; 1896 $self->enter_link;
1796 1897
1797 (async { 1898 (async {
1899 my $map = eval {
1798 my $map = cf::map::find $path; 1900 my $map = cf::map::find $path;
1799 $map = $map->customise_for ($self) if $map; 1901 $map = $map->customise_for ($self) if $map;
1800 1902 $map
1801# warn "entering ", $map->path, " at ($x, $y)\n" 1903 } or
1802# if $map;
1803
1804 $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);
1805 1905
1806 $self->leave_link ($map, $x, $y); 1906 $self->leave_link ($map, $x, $y);
1807 })->prio (1); 1907 })->prio (1);
1808} 1908}
1809 1909
… …
1840 # that depends on the exit object 1940 # that depends on the exit object
1841 1941
1842 my $rmp = parse_random_map_params $exit->msg; 1942 my $rmp = parse_random_map_params $exit->msg;
1843 1943
1844 if ($exit->map) { 1944 if ($exit->map) {
1845 $rmp->{region} = $exit->map->region_name; 1945 $rmp->{region} = $exit->region->name;
1846 $rmp->{origin_map} = $exit->map->path; 1946 $rmp->{origin_map} = $exit->map->path;
1847 $rmp->{origin_x} = $exit->x; 1947 $rmp->{origin_x} = $exit->x;
1848 $rmp->{origin_y} = $exit->y; 1948 $rmp->{origin_y} = $exit->y;
1849 } 1949 }
1850 1950
… …
1867sub cf::object::player::enter_exit { 1967sub cf::object::player::enter_exit {
1868 my ($self, $exit) = @_; 1968 my ($self, $exit) = @_;
1869 1969
1870 return unless $self->type == cf::PLAYER; 1970 return unless $self->type == cf::PLAYER;
1871 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
1872 $self->enter_link; 1981 $self->enter_link;
1873 1982
1874 (async { 1983 (async {
1875 $self->deactivate_recursive; # just to be sure 1984 $self->deactivate_recursive; # just to be sure
1876 unless (eval { 1985 unless (eval {
1877 prepare_random_map $exit 1986 $self->goto ($slaying, $hp, $sp);
1878 if $exit->slaying eq "/!";
1879
1880 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1881 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1882 1987
1883 1; 1988 1;
1884 }) { 1989 }) {
1885 $self->message ("Something went wrong deep within the crossfire server. " 1990 $self->message ("Something went wrong deep within the crossfire server. "
1886 . "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. "
… …
1906 2011
1907sub cf::client::send_drawinfo { 2012sub cf::client::send_drawinfo {
1908 my ($self, $text, $flags) = @_; 2013 my ($self, $text, $flags) = @_;
1909 2014
1910 utf8::encode $text; 2015 utf8::encode $text;
1911 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2016 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1912} 2017}
1913 2018
1914 2019
1915=item $success = $client->query ($flags, "text", \&cb) 2020=item $success = $client->query ($flags, "text", \&cb)
1916 2021
… …
1947 # get handled first 2052 # get handled first
1948 my $queue = delete $ns->{query_queue} 2053 my $queue = delete $ns->{query_queue}
1949 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
1950 2055
1951 (shift @$queue)->[1]->($msg); 2056 (shift @$queue)->[1]->($msg);
2057 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1952 2058
1953 push @{ $ns->{query_queue} }, @$queue; 2059 push @{ $ns->{query_queue} }, @$queue;
1954 2060
1955 if (@{ $ns->{query_queue} } == @$queue) { 2061 if (@{ $ns->{query_queue} } == @$queue) {
1956 if (@$queue) { 2062 if (@$queue) {
… …
2014 2120
2015# here we export the classes and methods available to script code 2121# here we export the classes and methods available to script code
2016 2122
2017=pod 2123=pod
2018 2124
2019The following fucntions and emthods are available within a safe environment: 2125The following functions and methods are available within a safe environment:
2020 2126
2021 cf::object contr pay_amount pay_player map 2127 cf::object contr pay_amount pay_player map
2022 cf::object::player player 2128 cf::object::player player
2023 cf::player peaceful 2129 cf::player peaceful
2024 cf::map trigger 2130 cf::map trigger
… …
2117The 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
2118using it, it should be unique. 2224using it, it should be unique.
2119 2225
2120=over 4 2226=over 4
2121 2227
2122=item $hashref = cf::db_get $family
2123
2124Return a hashref for use by the extension C<$family>, which can be
2125modified. After modifications, you have to call C<cf::db_dirty> or
2126C<cf::db_sync>.
2127
2128=item $value = cf::db_get $family => $key 2228=item $value = cf::db_get $family => $key
2129 2229
2130Returns a single value from the database 2230Returns a single value from the database.
2131
2132=item cf::db_put $family => $hashref
2133
2134Stores the given family hashref into the database. Updates are delayed, if
2135you want the data to be synced to disk immediately, use C<cf::db_sync>.
2136 2231
2137=item cf::db_put $family => $key => $value 2232=item cf::db_put $family => $key => $value
2138 2233
2139Stores the given C<$value> in the family hash. Updates are delayed, if you 2234Stores the given C<$value> in the family.
2140want the data to be synced to disk immediately, use C<cf::db_sync>.
2141
2142=item cf::db_dirty
2143
2144Marks the database as dirty, to be updated at a later time.
2145
2146=item cf::db_sync
2147
2148Immediately write the database to disk I<if it is dirty>.
2149 2235
2150=cut 2236=cut
2151 2237
2152our $DB; 2238our $DB;
2153 2239
2154{ 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
2155 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;
2156 2259
2157 sub db_load() { 2260 cf::db_put (board => data => $pst->{board});
2158 $DB = stat $path ? Storable::retrieve $path : { }; 2261 cf::db_put (guildrules => data => $pst->{guildrules});
2159 } 2262 cf::db_put (rent => balance => $pst->{rent}{balance});
2263 BDB::db_env_txn_checkpoint $DB_ENV;
2160 2264
2161 my $pid; 2265 unlink $path;
2162
2163 sub db_save() {
2164 waitpid $pid, 0 if $pid;
2165 if (0 == ($pid = fork)) {
2166 $DB->{_meta}{version} = 1;
2167 Storable::nstore $DB, "$path~";
2168 rename "$path~", $path;
2169 cf::_exit 0 if defined $pid;
2170 } 2266 };
2171 } 2267 }
2172
2173 my $dirty;
2174
2175 sub db_sync() {
2176 db_save if $dirty;
2177 undef $dirty;
2178 }
2179
2180 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2181 db_sync;
2182 }); 2268 }
2269}
2183 2270
2184 sub db_dirty() {
2185 $dirty = 1;
2186 $idle->start;
2187 }
2188
2189 sub db_get($;$) { 2271sub db_get($$) {
2190 @_ >= 2 2272 my $key = "$_[0]/$_[1]";
2191 ? $DB->{$_[0]}{$_[1]}
2192 : ($DB->{$_[0]} ||= { })
2193 }
2194 2273
2274 cf::sync_job {
2275 BDB::db_get $DB, undef, $key, my $data;
2276
2277 $! ? ()
2278 : Compress::LZF::sthaw $data
2279 }
2280}
2281
2195 sub db_put($$;$) { 2282sub db_put($$$) {
2196 if (@_ >= 3) { 2283 BDB::dbreq_pri 4;
2197 $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;
2198 } else { 2321 } else {
2199 $DB->{$_[0]} = $_[1]; 2322 warn "smooth face '$info->{smooth}' not found for face '$face'";
2200 }
2201 db_dirty;
2202 }
2203
2204 cf::global->attach (
2205 prio => 10000,
2206 on_cleanup => sub {
2207 db_sync;
2208 }, 2323 }
2209 ); 2324 Coro::cede;
2210} 2325 }
2211 2326
2212############################################################################# 2327 1
2213# 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}
2214 2340
2215sub cfg_load { 2341sub cfg_load {
2216 open my $fh, "<:utf8", cf::confdir . "/config" 2342 open my $fh, "<:utf8", cf::confdir . "/config"
2217 or return; 2343 or return;
2218 2344
… …
2241 Event::one_event; 2367 Event::one_event;
2242 })->prio (Coro::PRIO_MAX); 2368 })->prio (Coro::PRIO_MAX);
2243 }; 2369 };
2244 2370
2245 cfg_load; 2371 cfg_load;
2246 db_load; 2372 db_init;
2247 load_extensions; 2373 load_extensions;
2248 2374
2249 $TICK_WATCHER->start; 2375 $TICK_WATCHER->start;
2250 Event::loop; 2376 Event::loop;
2251} 2377}
… …
2255 2381
2256# install some emergency cleanup handlers 2382# install some emergency cleanup handlers
2257BEGIN { 2383BEGIN {
2258 for my $signal (qw(INT HUP TERM)) { 2384 for my $signal (qw(INT HUP TERM)) {
2259 Event->signal ( 2385 Event->signal (
2386 reentrant => 0,
2260 data => WF_AUTOCANCEL, 2387 data => WF_AUTOCANCEL,
2261 signal => $signal, 2388 signal => $signal,
2389 prio => 0,
2262 cb => sub { 2390 cb => sub {
2263 cf::cleanup "SIG$signal"; 2391 cf::cleanup "SIG$signal";
2264 }, 2392 },
2265 ); 2393 );
2266 } 2394 }
2267} 2395}
… …
2288 my $map = $cf::MAP{$path} or next; 2416 my $map = $cf::MAP{$path} or next;
2289 $map->valid or next; 2417 $map->valid or next;
2290 $map->save; 2418 $map->save;
2291 } 2419 }
2292 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";
2293 }; 2425 };
2294 2426
2295 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;
2296} 2435}
2297 2436
2298sub reload() { 2437sub reload() {
2299 # can/must only be called in main 2438 # can/must only be called in main
2300 if ($Coro::current != $Coro::main) { 2439 if ($Coro::current != $Coro::main) {
… …
2302 return; 2441 return;
2303 } 2442 }
2304 2443
2305 warn "reloading..."; 2444 warn "reloading...";
2306 2445
2307 warn "cancelling server ticker"; 2446 warn "entering sync_job";
2308 $TICK_WATCHER->cancel;
2309 2447
2448 cf::sync_job {
2449 cf::write_runtime; # external watchdog should not bark
2310 cf::emergency_save; 2450 cf::emergency_save;
2451 cf::write_runtime; # external watchdog should not bark
2311 2452
2312 eval { 2453 warn "syncing database to disk";
2454 BDB::db_env_txn_checkpoint $DB_ENV;
2455
2313 # 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
2314
2315 warn "syncing database to disk";
2316 cf::db_sync;
2317 2457
2318 warn "cancelling all WF_AUTOCANCEL watchers"; 2458 warn "cancelling all WF_AUTOCANCEL watchers";
2319 for (Event::all_watchers) { 2459 for (Event::all_watchers) {
2320 $_->cancel if $_->data & WF_AUTOCANCEL; 2460 $_->cancel if $_->data & WF_AUTOCANCEL;
2321 } 2461 }
2322 2462
2323 warn "flushing outstanding aio requests"; 2463 warn "flushing outstanding aio requests";
2324 for (;;) { 2464 for (;;) {
2465 BDB::flush;
2325 IO::AIO::flush; 2466 IO::AIO::flush;
2326 Coro::cede; 2467 Coro::cede;
2327 last unless IO::AIO::nreqs; 2468 last unless IO::AIO::nreqs || BDB::nreqs;
2328 warn "iterate..."; 2469 warn "iterate...";
2329 } 2470 }
2471
2472 ++$RELOAD;
2330 2473
2331 warn "cancelling all extension coros"; 2474 warn "cancelling all extension coros";
2332 $_->cancel for values %EXT_CORO; 2475 $_->cancel for values %EXT_CORO;
2333 %EXT_CORO = (); 2476 %EXT_CORO = ();
2334 2477
… …
2387 require cf; 2530 require cf;
2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2531 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2389 2532
2390 warn "loading config and database again"; 2533 warn "loading config and database again";
2391 cf::cfg_load; 2534 cf::cfg_load;
2392 cf::db_load;
2393 2535
2394 warn "loading extensions"; 2536 warn "loading extensions";
2395 cf::load_extensions; 2537 cf::load_extensions;
2396 2538
2397 warn "reattaching attachments to objects/players"; 2539 warn "reattaching attachments to objects/players";
2398 _global_reattach; 2540 _global_reattach; # objects, sockets
2399 warn "reattaching attachments to maps"; 2541 warn "reattaching attachments to maps";
2400 reattach $_ for values %MAP; 2542 reattach $_ for values %MAP;
2543 warn "reattaching attachments to players";
2544 reattach $_ for values %PLAYER;
2401 2545
2402 warn "restarting server ticker"; 2546 warn "loading reloadable resources";
2547 reload_resources;
2403 2548
2404 $TICK_WATCHER->start; 2549 warn "leaving sync_job";
2405 };
2406 2550
2407 if ($@) { 2551 1
2552 } or do {
2408 warn $@; 2553 warn $@;
2409 warn "error while reloading, exiting."; 2554 warn "error while reloading, exiting.";
2410 exit 1; 2555 exit 1;
2411 } 2556 };
2412 2557
2413 warn "reloaded"; 2558 warn "reloaded";
2414}; 2559};
2415 2560
2416our $RELOAD_WATCHER; # used only during reload 2561our $RELOAD_WATCHER; # used only during reload
… …
2422 $who->message ("reloading server."); 2567 $who->message ("reloading server.");
2423 2568
2424 # doing reload synchronously and two reloads happen back-to-back, 2569 # doing reload synchronously and two reloads happen back-to-back,
2425 # coro crashes during coro_state_free->destroy here. 2570 # coro crashes during coro_state_free->destroy here.
2426 2571
2427 $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 {
2428 reload; 2577 reload;
2429 undef $RELOAD_WATCHER; 2578 undef $RELOAD_WATCHER;
2579 },
2430 }); 2580 );
2431 } 2581 }
2432}; 2582};
2433 2583
2434unshift @INC, $LIBDIR; 2584unshift @INC, $LIBDIR;
2435 2585
… …
2452 2602
2453 cf::server_tick; # one server iteration 2603 cf::server_tick; # one server iteration
2454 $RUNTIME += $TICK; 2604 $RUNTIME += $TICK;
2455 $NEXT_TICK += $TICK; 2605 $NEXT_TICK += $TICK;
2456 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
2457 $WAIT_FOR_TICK->broadcast; 2615 $WAIT_FOR_TICK->broadcast;
2458 $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#
2459 2620
2460 # 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
2461 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2622 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2462 2623
2463 $TICK_WATCHER->at ($NEXT_TICK); 2624 $TICK_WATCHER->at ($NEXT_TICK);
2464 $TICK_WATCHER->start; 2625 $TICK_WATCHER->start;
2465 }, 2626 },
2466); 2627);
2467 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;
2468IO::AIO::max_poll_time $TICK * 0.2; 2683 IO::AIO::max_poll_time $TICK * 0.1;
2469
2470$AIO_POLL_WATCHER = Event->io ( 2684 $AIO_POLL_WATCHER = Event->io (
2471 fd => IO::AIO::poll_fileno, 2685 reentrant => 0,
2472 poll => 'r',
2473 prio => 5,
2474 data => WF_AUTOCANCEL,
2475 cb => \&IO::AIO::poll_cb,
2476);
2477
2478$WRITE_RUNTIME_WATCHER = Event->timer (
2479 data => WF_AUTOCANCEL, 2686 data => WF_AUTOCANCEL,
2480 after => 1, 2687 fd => IO::AIO::poll_fileno,
2481 interval => 10, 2688 poll => 'r',
2482 cb => Coro::unblock_sub { 2689 prio => 6,
2483 write_runtime 2690 cb => \&IO::AIO::poll_cb,
2484 or warn "ERROR: unable to write runtime file: $!"; 2691 );
2485 }, 2692}
2486);
2487 2693
2488END { cf::emergency_save } 2694END { cf::emergency_save }
2489 2695
24901 26961
2491 2697

Diff Legend

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