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.187 by root, Sat Jan 20 21:06:52 2007 UTC vs.
Revision 1.235 by root, Tue Apr 10 09:35:23 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";
… …
947} 963}
948 964
949sub path($) { 965sub path($) {
950 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 966 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
951 967
952 (playerdir $login) . "/$login.pl" 968 (playerdir $login) . "/playerdata"
953} 969}
954 970
955sub find_active($) { 971sub find_active($) {
956 $cf::PLAYER{$_[0]} 972 $cf::PLAYER{$_[0]}
957 and $cf::PLAYER{$_[0]}->active 973 and $cf::PLAYER{$_[0]}->active
… …
970 my $login = $_[0]; 986 my $login = $_[0];
971 987
972 my $guard = cf::lock_acquire "user_find:$login"; 988 my $guard = cf::lock_acquire "user_find:$login";
973 989
974 $cf::PLAYER{$_[0]} || do { 990 $cf::PLAYER{$_[0]} || do {
991 # rename old playerfiles to new ones
992 #TODO: remove when no longer required
993 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
994 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
995 aio_unlink +(playerdir $login) . "/$login.pl.pst";
996 aio_unlink +(playerdir $login) . "/$login.pl";
997
975 my $pl = load_pl path $login 998 my $pl = load_pl path $login
976 or return; 999 or return;
977 $cf::PLAYER{$login} = $pl 1000 $cf::PLAYER{$login} = $pl
978 } 1001 }
979 } 1002 }
… …
1016 1039
1017=cut 1040=cut
1018 1041
1019sub quit_character { 1042sub quit_character {
1020 my ($pl) = @_; 1043 my ($pl) = @_;
1044
1045 my $name = $pl->ob->name;
1021 1046
1022 $pl->{deny_save} = 1; 1047 $pl->{deny_save} = 1;
1023 $pl->password ("*"); # this should lock out the player until we nuked the dir 1048 $pl->password ("*"); # this should lock out the player until we nuked the dir
1024 1049
1025 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1050 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
… …
1030 my $path = playerdir $pl; 1055 my $path = playerdir $pl;
1031 my $temp = "$path~$cf::RUNTIME~deleting~"; 1056 my $temp = "$path~$cf::RUNTIME~deleting~";
1032 aio_rename $path, $temp; 1057 aio_rename $path, $temp;
1033 delete $cf::PLAYER{$pl->ob->name}; 1058 delete $cf::PLAYER{$pl->ob->name};
1034 $pl->destroy; 1059 $pl->destroy;
1060
1061 my $prefix = qr<^~\Q$name\E/>;
1062
1063 # nuke player maps
1064 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1065
1035 IO::AIO::aio_rmtree $temp; 1066 IO::AIO::aio_rmtree $temp;
1067}
1068
1069=item $pl->kick
1070
1071Kicks a player out of the game. This destroys the connection.
1072
1073=cut
1074
1075sub kick {
1076 my ($pl, $kicker) = @_;
1077
1078 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1079 $pl->killer ("kicked");
1080 $pl->ns->destroy;
1036} 1081}
1037 1082
1038=item cf::player::list_logins 1083=item cf::player::list_logins
1039 1084
1040Returns am arrayref of all valid playernames in the system, can take a 1085Returns am arrayref of all valid playernames in the system, can take a
… …
1068=cut 1113=cut
1069 1114
1070sub maps($) { 1115sub maps($) {
1071 my ($pl) = @_; 1116 my ($pl) = @_;
1072 1117
1118 $pl = ref $pl ? $pl->ob->name : $pl;
1119
1073 my $files = aio_readdir playerdir $pl 1120 my $files = aio_readdir playerdir $pl
1074 or return; 1121 or return;
1075 1122
1076 my @paths; 1123 my @paths;
1077 1124
1078 for (@$files) { 1125 for (@$files) {
1079 utf8::decode $_; 1126 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1127 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1128 next unless /^$PATH_SEP/o;
1082 1129
1083 s/\.map$//; 1130 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1131 }
1086 1132
1087 \@paths 1133 \@paths
1088} 1134}
1089 1135
1090=item $player->ext_reply ($msgid, $msgtype, %msg) 1136=item $player->ext_reply ($msgid, %msg)
1091 1137
1092Sends an ext reply to the player. 1138Sends an ext reply to the player.
1093 1139
1094=cut 1140=cut
1095 1141
1096sub ext_reply($$$%) { 1142sub ext_reply($$%) {
1097 my ($self, $id, %msg) = @_; 1143 my ($self, $id, %msg) = @_;
1098 1144
1099 $msg{msgid} = $id; 1145 $msg{msgid} = $id;
1100 1146
1101 $self->send ("ext " . cf::to_json \%msg); 1147 $self->send ("ext " . cf::to_json \%msg);
1148}
1149
1150=item $player->ext_event ($type, %msg)
1151
1152Sends an ext event to the client.
1153
1154=cut
1155
1156sub ext_event($$%) {
1157 my ($self, $type, %msg) = @_;
1158
1159 $self->ns->ext_event ($type, %msg);
1102} 1160}
1103 1161
1104package cf; 1162package cf;
1105 1163
1106=back 1164=back
… …
1176} 1234}
1177 1235
1178sub normalise { 1236sub normalise {
1179 my ($path, $base) = @_; 1237 my ($path, $base) = @_;
1180 1238
1239 $path = "$path"; # make sure its a string
1240
1241 $path =~ s/\.map$//;
1242
1181 # map plan: 1243 # map plan:
1182 # 1244 #
1183 # /! non-realised random map exit (special hack!) 1245 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched 1246 # {... are special paths that are not being touched
1185 # ?xxx/... are special absolute paths 1247 # ?xxx/... are special absolute paths
… …
1221 $self->init; # pass $1 etc. 1283 $self->init; # pass $1 etc.
1222 return $self; 1284 return $self;
1223 } 1285 }
1224 } 1286 }
1225 1287
1226 Carp::carp "unable to resolve path '$path'."; 1288 Carp::carp "unable to resolve path '$path' (base '$base').";
1227 () 1289 ()
1228} 1290}
1229 1291
1230sub init { 1292sub init {
1231 my ($self) = @_; 1293 my ($self) = @_;
… …
1246 1308
1247# the original (read-only) location 1309# the original (read-only) location
1248sub load_path { 1310sub load_path {
1249 my ($self) = @_; 1311 my ($self) = @_;
1250 1312
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1313 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1252} 1314}
1253 1315
1254# the temporary/swap location 1316# the temporary/swap location
1255sub save_path { 1317sub save_path {
1256 my ($self) = @_; 1318 my ($self) = @_;
1257 1319
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1320 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1321 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1260} 1322}
1261 1323
1262# the unique path, undef == no special unique path 1324# the unique path, undef == no special unique path
1263sub uniq_path { 1325sub uniq_path {
1264 my ($self) = @_; 1326 my ($self) = @_;
… …
1286 1348
1287sub load_header_from($) { 1349sub load_header_from($) {
1288 my ($self, $path) = @_; 1350 my ($self, $path) = @_;
1289 1351
1290 utf8::encode $path; 1352 utf8::encode $path;
1291 aio_open $path, O_RDONLY, 0 1353 #aio_open $path, O_RDONLY, 0
1292 or return; 1354 # or return;
1293 1355
1294 $self->_load_header ($path) 1356 $self->_load_header ($path)
1295 or return; 1357 or return;
1296 1358
1297 $self->{load_path} = $path; 1359 $self->{load_path} = $path;
1298 1360
1299 1 1361 1
1300} 1362}
1301 1363
1302sub load_orig { 1364sub load_header_orig {
1303 my ($self) = @_; 1365 my ($self) = @_;
1304 1366
1305 $self->load_header_from ($self->load_path) 1367 $self->load_header_from ($self->load_path)
1306} 1368}
1307 1369
1308sub load_temp { 1370sub load_header_temp {
1309 my ($self) = @_; 1371 my ($self) = @_;
1310 1372
1311 $self->load_header_from ($self->save_path) 1373 $self->load_header_from ($self->save_path)
1374}
1375
1376sub prepare_temp {
1377 my ($self) = @_;
1378
1379 $self->last_access ((delete $self->{last_access})
1380 || $cf::RUNTIME); #d#
1381 # safety
1382 $self->{instantiate_time} = $cf::RUNTIME
1383 if $self->{instantiate_time} > $cf::RUNTIME;
1384}
1385
1386sub prepare_orig {
1387 my ($self) = @_;
1388
1389 $self->{load_original} = 1;
1390 $self->{instantiate_time} = $cf::RUNTIME;
1391 $self->last_access ($cf::RUNTIME);
1392 $self->instantiate;
1312} 1393}
1313 1394
1314sub load_header { 1395sub load_header {
1315 my ($self) = @_; 1396 my ($self) = @_;
1316 1397
1317 if ($self->load_temp) { 1398 if ($self->load_header_temp) {
1318 $self->last_access ((delete $self->{last_access}) 1399 $self->prepare_temp;
1319 || $cf::RUNTIME); #d#
1320 # safety
1321 $self->{instantiate_time} = $cf::RUNTIME
1322 if $self->{instantiate_time} > $cf::RUNTIME;
1323 } else { 1400 } else {
1324 $self->load_orig 1401 $self->load_header_orig
1325 or return; 1402 or return;
1326 1403 $self->prepare_orig;
1327 $self->{load_original} = 1;
1328 $self->{instantiate_time} = $cf::RUNTIME;
1329 $self->last_access ($cf::RUNTIME);
1330 $self->instantiate;
1331 } 1404 }
1332 1405
1333 1 1406 1
1334} 1407}
1335 1408
… …
1349 $map->{last_save} = $cf::RUNTIME; 1422 $map->{last_save} = $cf::RUNTIME;
1350 1423
1351 $map->load_header 1424 $map->load_header
1352 or return; 1425 or return;
1353 1426
1354 if ($map->should_reset) { 1427 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1355 # doing this can freeze the server in a sync job, obviously 1428 # doing this can freeze the server in a sync job, obviously
1356 #$cf::WAIT_FOR_TICK->wait; 1429 #$cf::WAIT_FOR_TICK->wait;
1357 $map->reset; 1430 $map->reset;
1358 undef $guard; 1431 undef $guard;
1359 $map = find $path 1432 return find $path;
1360 or return;
1361 } 1433 }
1362 1434
1363 $cf::MAP{$path} = $map 1435 $cf::MAP{$path} = $map
1364 } 1436 }
1365} 1437}
1438
1439sub pre_load { }
1440sub post_load { }
1366 1441
1367sub load { 1442sub load {
1368 my ($self) = @_; 1443 my ($self) = @_;
1369 1444
1445 local $self->{deny_reset} = 1; # loading can take a long time
1446
1370 my $path = $self->{path}; 1447 my $path = $self->{path};
1371 my $guard = cf::lock_acquire "map_load:$path"; 1448 my $guard = cf::lock_acquire "map_load:$path";
1372 1449
1373 return if $self->in_memory != cf::MAP_SWAPPED; 1450 return if $self->in_memory != cf::MAP_SWAPPED;
1374 1451
1375 $self->in_memory (cf::MAP_LOADING); 1452 $self->in_memory (cf::MAP_LOADING);
1376 1453
1377 $self->alloc; 1454 $self->alloc;
1455
1456 $self->pre_load;
1457
1378 $self->_load_objects ($self->{load_path}, 1) 1458 $self->_load_objects ($self->{load_path}, 1)
1379 or return; 1459 or return;
1380 1460
1381 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1461 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1382 if delete $self->{load_original}; 1462 if delete $self->{load_original};
… …
1404 unless $self->difficulty; 1484 unless $self->difficulty;
1405 Coro::cede; 1485 Coro::cede;
1406 $self->activate; 1486 $self->activate;
1407 } 1487 }
1408 1488
1489 $self->post_load;
1490
1409 $self->in_memory (cf::MAP_IN_MEMORY); 1491 $self->in_memory (cf::MAP_IN_MEMORY);
1410} 1492}
1411 1493
1412sub customise_for { 1494sub customise_for {
1413 my ($self, $ob) = @_; 1495 my ($self, $ob) = @_;
… …
1477 delete $MAP_PREFETCH{$path}; 1559 delete $MAP_PREFETCH{$path};
1478 } 1560 }
1479 } 1561 }
1480 undef $MAP_PREFETCHER; 1562 undef $MAP_PREFETCHER;
1481 }; 1563 };
1564 $MAP_PREFETCHER->prio (6);
1482 1565
1483 () 1566 ()
1484} 1567}
1485 1568
1486sub save { 1569sub save {
… …
1556 return if $self->players; 1639 return if $self->players;
1557 return if $self->isa ("ext::map_per_player");#d# 1640 return if $self->isa ("ext::map_per_player");#d#
1558 1641
1559 warn "resetting map ", $self->path;#d# 1642 warn "resetting map ", $self->path;#d#
1560 1643
1644 $self->in_memory (cf::MAP_SWAPPED);
1645
1646 # need to save uniques path
1647 unless ($self->{deny_save}) {
1648 my $uniq = $self->uniq_path; utf8::encode $uniq;
1649
1650 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1651 if $uniq;
1652 }
1653
1561 delete $cf::MAP{$self->path}; 1654 delete $cf::MAP{$self->path};
1562 1655
1563 $self->in_memory (cf::MAP_SWAPPED);
1564 $self->clear; 1656 $self->clear;
1565 1657
1566 $_->clear_links_to ($self) for values %cf::MAP; 1658 $_->clear_links_to ($self) for values %cf::MAP;
1567 1659
1568 $self->unlink_save; 1660 $self->unlink_save;
… …
1605 for (@$files) { 1697 for (@$files) {
1606 utf8::decode $_; 1698 utf8::decode $_;
1607 next if /\.pst$/; 1699 next if /\.pst$/;
1608 next unless /^$PATH_SEP/o; 1700 next unless /^$PATH_SEP/o;
1609 1701
1610 s/\.map$//; 1702 push @paths, cf::map::normalise $_;
1611 push @paths, $_;
1612 } 1703 }
1613 1704
1614 \@paths 1705 \@paths
1615} 1706}
1616 1707
… …
1710=cut 1801=cut
1711 1802
1712sub link_map { 1803sub link_map {
1713 unless ($LINK_MAP) { 1804 unless ($LINK_MAP) {
1714 $LINK_MAP = cf::map::find "{link}" 1805 $LINK_MAP = cf::map::find "{link}"
1715 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1806 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1716 $LINK_MAP->load; 1807 $LINK_MAP->load;
1717 } 1808 }
1718 1809
1719 $LINK_MAP 1810 $LINK_MAP
1720} 1811}
… …
1727 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1818 return if UNIVERSAL::isa $self->map, "ext::map_link";
1728 1819
1729 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1820 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1730 if $self->map; 1821 if $self->map;
1731 1822
1732 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1823 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1733} 1824}
1734 1825
1735sub cf::object::player::leave_link { 1826sub cf::object::player::leave_link {
1736 my ($self, $map, $x, $y) = @_; 1827 my ($self, $map, $x, $y) = @_;
1737 1828
… …
1759 $map->load; 1850 $map->load;
1760 $map->load_diag; 1851 $map->load_diag;
1761 1852
1762 return unless $self->contr->active; 1853 return unless $self->contr->active;
1763 $self->activate_recursive; 1854 $self->activate_recursive;
1855
1856 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1764 $self->enter_map ($map, $x, $y); 1857 $self->enter_map ($map, $x, $y);
1765} 1858}
1766 1859
1767cf::player->attach ( 1860cf::player->attach (
1768 on_logout => sub { 1861 on_logout => sub {
… …
1781 # try to abort aborted map switching on player login :) 1874 # try to abort aborted map switching on player login :)
1782 # should happen only on crashes 1875 # should happen only on crashes
1783 if ($pl->ob->{_link_pos}) { 1876 if ($pl->ob->{_link_pos}) {
1784 $pl->ob->enter_link; 1877 $pl->ob->enter_link;
1785 (async { 1878 (async {
1786 # we need this sleep as the login has a concurrent enter_exit running
1787 # and this sleep increases chances of the player not ending up in scorn
1788 $pl->ob->reply (undef, 1879 $pl->ob->reply (undef,
1789 "There was an internal problem at your last logout, " 1880 "There was an internal problem at your last logout, "
1790 . "the server will try to bring you to your intended destination in a second.", 1881 . "the server will try to bring you to your intended destination in a second.",
1791 cf::NDI_RED); 1882 cf::NDI_RED);
1883 # we need this sleep as the login has a concurrent enter_exit running
1884 # and this sleep increases chances of the player not ending up in scorn
1792 Coro::Timer::sleep 1; 1885 Coro::Timer::sleep 1;
1793 $pl->ob->leave_link; 1886 $pl->ob->leave_link;
1794 })->prio (2); 1887 })->prio (2);
1795 } 1888 }
1796 }, 1889 },
… …
1804 my ($self, $path, $x, $y) = @_; 1897 my ($self, $path, $x, $y) = @_;
1805 1898
1806 $self->enter_link; 1899 $self->enter_link;
1807 1900
1808 (async { 1901 (async {
1902 my $map = eval {
1809 my $map = cf::map::find $path; 1903 my $map = cf::map::find $path;
1810 $map = $map->customise_for ($self) if $map; 1904 $map = $map->customise_for ($self) if $map;
1811 1905 $map
1812# warn "entering ", $map->path, " at ($x, $y)\n" 1906 } or
1813# if $map;
1814
1815 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1907 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1816 1908
1817 $self->leave_link ($map, $x, $y); 1909 $self->leave_link ($map, $x, $y);
1818 })->prio (1); 1910 })->prio (1);
1819} 1911}
1820 1912
… …
1851 # that depends on the exit object 1943 # that depends on the exit object
1852 1944
1853 my $rmp = parse_random_map_params $exit->msg; 1945 my $rmp = parse_random_map_params $exit->msg;
1854 1946
1855 if ($exit->map) { 1947 if ($exit->map) {
1856 $rmp->{region} = $exit->map->region_name; 1948 $rmp->{region} = $exit->region->name;
1857 $rmp->{origin_map} = $exit->map->path; 1949 $rmp->{origin_map} = $exit->map->path;
1858 $rmp->{origin_x} = $exit->x; 1950 $rmp->{origin_x} = $exit->x;
1859 $rmp->{origin_y} = $exit->y; 1951 $rmp->{origin_y} = $exit->y;
1860 } 1952 }
1861 1953
… …
1878sub cf::object::player::enter_exit { 1970sub cf::object::player::enter_exit {
1879 my ($self, $exit) = @_; 1971 my ($self, $exit) = @_;
1880 1972
1881 return unless $self->type == cf::PLAYER; 1973 return unless $self->type == cf::PLAYER;
1882 1974
1975 if ($exit->slaying eq "/!") {
1976 #TODO: this should de-fi-ni-te-ly not be a sync-job
1977 # the problem is that $exit might not survive long enough
1978 # so it needs to be done right now, right here
1979 cf::sync_job { prepare_random_map $exit };
1980 }
1981
1982 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1983 my $hp = $exit->stats->hp;
1984 my $sp = $exit->stats->sp;
1985
1883 $self->enter_link; 1986 $self->enter_link;
1884 1987
1885 (async { 1988 (async {
1886 $self->deactivate_recursive; # just to be sure 1989 $self->deactivate_recursive; # just to be sure
1887 unless (eval { 1990 unless (eval {
1888 prepare_random_map $exit 1991 $self->goto ($slaying, $hp, $sp);
1889 if $exit->slaying eq "/!";
1890
1891 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1892 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1893 1992
1894 1; 1993 1;
1895 }) { 1994 }) {
1896 $self->message ("Something went wrong deep within the crossfire server. " 1995 $self->message ("Something went wrong deep within the crossfire server. "
1897 . "I'll try to bring you back to the map you were before. " 1996 . "I'll try to bring you back to the map you were before. "
1898 . "Please report this to the dungeon master!", 1997 . "Please report this to the dungeon master!",
1899 cf::NDI_UNIQUE | cf::NDI_RED); 1998 cf::NDI_UNIQUE | cf::NDI_RED);
1900 1999
1901 warn "ERROR in enter_exit: $@"; 2000 warn "ERROR in enter_exit: $@";
1902 $self->leave_link; 2001 $self->leave_link;
1903 } 2002 }
1904 })->prio (1); 2003 })->prio (1);
… …
1917 2016
1918sub cf::client::send_drawinfo { 2017sub cf::client::send_drawinfo {
1919 my ($self, $text, $flags) = @_; 2018 my ($self, $text, $flags) = @_;
1920 2019
1921 utf8::encode $text; 2020 utf8::encode $text;
1922 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2021 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1923} 2022}
1924 2023
2024=item $client->ext_event ($type, %msg)
2025
2026Sends an exti event to the client.
2027
2028=cut
2029
2030sub cf::client::ext_event($$%) {
2031 my ($self, $type, %msg) = @_;
2032
2033 $msg{msgtype} = "event_$type";
2034 $self->send_packet ("ext " . cf::to_json \%msg);
2035}
1925 2036
1926=item $success = $client->query ($flags, "text", \&cb) 2037=item $success = $client->query ($flags, "text", \&cb)
1927 2038
1928Queues a query to the client, calling the given callback with 2039Queues a query to the client, calling the given callback with
1929the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2040the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
… …
1958 # get handled first 2069 # get handled first
1959 my $queue = delete $ns->{query_queue} 2070 my $queue = delete $ns->{query_queue}
1960 or return; # be conservative, not sure how that can happen, but we saw a crash here 2071 or return; # be conservative, not sure how that can happen, but we saw a crash here
1961 2072
1962 (shift @$queue)->[1]->($msg); 2073 (shift @$queue)->[1]->($msg);
2074 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1963 2075
1964 push @{ $ns->{query_queue} }, @$queue; 2076 push @{ $ns->{query_queue} }, @$queue;
1965 2077
1966 if (@{ $ns->{query_queue} } == @$queue) { 2078 if (@{ $ns->{query_queue} } == @$queue) {
1967 if (@$queue) { 2079 if (@$queue) {
… …
2025 2137
2026# here we export the classes and methods available to script code 2138# here we export the classes and methods available to script code
2027 2139
2028=pod 2140=pod
2029 2141
2030The following fucntions and emthods are available within a safe environment: 2142The following functions and methods are available within a safe environment:
2031 2143
2032 cf::object contr pay_amount pay_player map 2144 cf::object contr pay_amount pay_player map
2033 cf::object::player player 2145 cf::object::player player
2034 cf::player peaceful 2146 cf::player peaceful
2035 cf::map trigger 2147 cf::map trigger
… …
2128The parameter C<$family> should best start with the name of the extension 2240The parameter C<$family> should best start with the name of the extension
2129using it, it should be unique. 2241using it, it should be unique.
2130 2242
2131=over 4 2243=over 4
2132 2244
2133=item $hashref = cf::db_get $family
2134
2135Return a hashref for use by the extension C<$family>, which can be
2136modified. After modifications, you have to call C<cf::db_dirty> or
2137C<cf::db_sync>.
2138
2139=item $value = cf::db_get $family => $key 2245=item $value = cf::db_get $family => $key
2140 2246
2141Returns a single value from the database 2247Returns a single value from the database.
2142
2143=item cf::db_put $family => $hashref
2144
2145Stores the given family hashref into the database. Updates are delayed, if
2146you want the data to be synced to disk immediately, use C<cf::db_sync>.
2147 2248
2148=item cf::db_put $family => $key => $value 2249=item cf::db_put $family => $key => $value
2149 2250
2150Stores the given C<$value> in the family hash. Updates are delayed, if you 2251Stores the given C<$value> in the family.
2151want the data to be synced to disk immediately, use C<cf::db_sync>.
2152
2153=item cf::db_dirty
2154
2155Marks the database as dirty, to be updated at a later time.
2156
2157=item cf::db_sync
2158
2159Immediately write the database to disk I<if it is dirty>.
2160 2252
2161=cut 2253=cut
2162 2254
2163our $DB; 2255our $DB;
2164 2256
2165{ 2257sub db_init {
2258 unless ($DB) {
2259 $DB = BDB::db_create $DB_ENV;
2260
2261 cf::sync_job {
2262 eval {
2263 $DB->set_flags (BDB::CHKSUM);
2264
2265 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2266 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2267 cf::cleanup "db_open(db): $!" if $!;
2268 };
2269 cf::cleanup "db_open(db): $@" if $@;
2270 };
2271
2166 my $path = cf::localdir . "/database.pst"; 2272 my $path = cf::localdir . "/database.pst";
2273 if (stat $path) {
2274 cf::sync_job {
2275 my $pst = Storable::retrieve $path;
2167 2276
2168 sub db_load() { 2277 cf::db_put (board => data => $pst->{board});
2169 $DB = stat $path ? Storable::retrieve $path : { }; 2278 cf::db_put (guildrules => data => $pst->{guildrules});
2170 } 2279 cf::db_put (rent => balance => $pst->{rent}{balance});
2280 BDB::db_env_txn_checkpoint $DB_ENV;
2171 2281
2172 my $pid; 2282 unlink $path;
2173
2174 sub db_save() {
2175 waitpid $pid, 0 if $pid;
2176 if (0 == ($pid = fork)) {
2177 $DB->{_meta}{version} = 1;
2178 Storable::nstore $DB, "$path~";
2179 rename "$path~", $path;
2180 cf::_exit 0 if defined $pid;
2181 } 2283 };
2182 } 2284 }
2183
2184 my $dirty;
2185
2186 sub db_sync() {
2187 db_save if $dirty;
2188 undef $dirty;
2189 }
2190
2191 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2192 db_sync;
2193 }); 2285 }
2286}
2194 2287
2195 sub db_dirty() {
2196 $dirty = 1;
2197 $idle->start;
2198 }
2199
2200 sub db_get($;$) { 2288sub db_get($$) {
2201 @_ >= 2 2289 my $key = "$_[0]/$_[1]";
2202 ? $DB->{$_[0]}{$_[1]}
2203 : ($DB->{$_[0]} ||= { })
2204 }
2205 2290
2291 cf::sync_job {
2292 BDB::db_get $DB, undef, $key, my $data;
2293
2294 $! ? ()
2295 : Compress::LZF::sthaw $data
2296 }
2297}
2298
2206 sub db_put($$;$) { 2299sub db_put($$$) {
2207 if (@_ >= 3) { 2300 BDB::dbreq_pri 4;
2208 $DB->{$_[0]}{$_[1]} = $_[2]; 2301 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2302}
2303
2304#############################################################################
2305# the server's init and main functions
2306
2307sub load_facedata {
2308 my $path = sprintf "%s/facedata", cf::datadir;
2309
2310 warn "loading facedata from $path\n";
2311
2312 my $faces;
2313 0 < aio_load $path, $faces
2314 or die "$path: $!";
2315
2316 Coro::cede;
2317 $faces = Storable::thaw $faces;
2318 Coro::cede;
2319
2320 my $meta = delete $faces->{""};
2321 $meta->{version} == 1
2322 or cf::cleanup "$path: version mismatch, cannot proceed.";
2323
2324 while (my ($face, $info) = each %$faces) {
2325 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2326 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2327 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2328 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2329 Coro::cede;
2330 }
2331
2332 while (my ($face, $info) = each %$faces) {
2333 next unless $info->{smooth};
2334 my $idx = cf::face::find $face
2335 or next;
2336 if (my $smooth = cf::face::find $info->{smooth}) {
2337 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2209 } else { 2338 } else {
2210 $DB->{$_[0]} = $_[1]; 2339 warn "smooth face '$info->{smooth}' not found for face '$face'";
2211 }
2212 db_dirty;
2213 }
2214
2215 cf::global->attach (
2216 prio => 10000,
2217 on_cleanup => sub {
2218 db_sync;
2219 }, 2340 }
2220 ); 2341 Coro::cede;
2221} 2342 }
2222 2343
2223############################################################################# 2344 1
2224# the server's main() 2345}
2346
2347sub reload_resources {
2348 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2349 or die "unable to load regions file\n";#d#
2350 load_facedata
2351 or die "unable to load facedata\n";#d#
2352}
2353
2354sub init {
2355 reload_resources;
2356}
2225 2357
2226sub cfg_load { 2358sub cfg_load {
2227 open my $fh, "<:utf8", cf::confdir . "/config" 2359 open my $fh, "<:utf8", cf::confdir . "/config"
2228 or return; 2360 or return;
2229 2361
… …
2252 Event::one_event; 2384 Event::one_event;
2253 })->prio (Coro::PRIO_MAX); 2385 })->prio (Coro::PRIO_MAX);
2254 }; 2386 };
2255 2387
2256 cfg_load; 2388 cfg_load;
2257 db_load; 2389 db_init;
2258 load_extensions; 2390 load_extensions;
2259 2391
2260 $TICK_WATCHER->start; 2392 $TICK_WATCHER->start;
2261 Event::loop; 2393 Event::loop;
2262} 2394}
… …
2266 2398
2267# install some emergency cleanup handlers 2399# install some emergency cleanup handlers
2268BEGIN { 2400BEGIN {
2269 for my $signal (qw(INT HUP TERM)) { 2401 for my $signal (qw(INT HUP TERM)) {
2270 Event->signal ( 2402 Event->signal (
2403 reentrant => 0,
2271 data => WF_AUTOCANCEL, 2404 data => WF_AUTOCANCEL,
2272 signal => $signal, 2405 signal => $signal,
2406 prio => 0,
2273 cb => sub { 2407 cb => sub {
2274 cf::cleanup "SIG$signal"; 2408 cf::cleanup "SIG$signal";
2275 }, 2409 },
2276 ); 2410 );
2277 } 2411 }
2278} 2412}
… …
2299 my $map = $cf::MAP{$path} or next; 2433 my $map = $cf::MAP{$path} or next;
2300 $map->valid or next; 2434 $map->valid or next;
2301 $map->save; 2435 $map->save;
2302 } 2436 }
2303 warn "end emergency map save\n"; 2437 warn "end emergency map save\n";
2438
2439 warn "begin emergency database checkpoint\n";
2440 BDB::db_env_txn_checkpoint $DB_ENV;
2441 warn "end emergency database checkpoint\n";
2304 }; 2442 };
2305 2443
2306 warn "leave emergency perl save\n"; 2444 warn "leave emergency perl save\n";
2445}
2446
2447sub post_cleanup {
2448 my ($make_core) = @_;
2449
2450 warn Carp::longmess "post_cleanup backtrace"
2451 if $make_core;
2307} 2452}
2308 2453
2309sub reload() { 2454sub reload() {
2310 # can/must only be called in main 2455 # can/must only be called in main
2311 if ($Coro::current != $Coro::main) { 2456 if ($Coro::current != $Coro::main) {
… …
2313 return; 2458 return;
2314 } 2459 }
2315 2460
2316 warn "reloading..."; 2461 warn "reloading...";
2317 2462
2318 warn "cancelling server ticker"; 2463 warn "entering sync_job";
2319 $TICK_WATCHER->cancel;
2320 2464
2465 cf::sync_job {
2466 cf::write_runtime; # external watchdog should not bark
2321 cf::emergency_save; 2467 cf::emergency_save;
2468 cf::write_runtime; # external watchdog should not bark
2322 2469
2323 eval { 2470 warn "syncing database to disk";
2471 BDB::db_env_txn_checkpoint $DB_ENV;
2472
2324 # if anything goes wrong in here, we should simply crash as we already saved 2473 # if anything goes wrong in here, we should simply crash as we already saved
2325
2326 warn "syncing database to disk";
2327 cf::db_sync;
2328 2474
2329 warn "cancelling all WF_AUTOCANCEL watchers"; 2475 warn "cancelling all WF_AUTOCANCEL watchers";
2330 for (Event::all_watchers) { 2476 for (Event::all_watchers) {
2331 $_->cancel if $_->data & WF_AUTOCANCEL; 2477 $_->cancel if $_->data & WF_AUTOCANCEL;
2332 } 2478 }
2333 2479
2334 warn "flushing outstanding aio requests"; 2480 warn "flushing outstanding aio requests";
2335 for (;;) { 2481 for (;;) {
2482 BDB::flush;
2336 IO::AIO::flush; 2483 IO::AIO::flush;
2337 Coro::cede; 2484 Coro::cede;
2338 last unless IO::AIO::nreqs; 2485 last unless IO::AIO::nreqs || BDB::nreqs;
2339 warn "iterate..."; 2486 warn "iterate...";
2340 } 2487 }
2488
2489 ++$RELOAD;
2341 2490
2342 warn "cancelling all extension coros"; 2491 warn "cancelling all extension coros";
2343 $_->cancel for values %EXT_CORO; 2492 $_->cancel for values %EXT_CORO;
2344 %EXT_CORO = (); 2493 %EXT_CORO = ();
2345 2494
… …
2398 require cf; 2547 require cf;
2399 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2548 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2400 2549
2401 warn "loading config and database again"; 2550 warn "loading config and database again";
2402 cf::cfg_load; 2551 cf::cfg_load;
2403 cf::db_load;
2404 2552
2405 warn "loading extensions"; 2553 warn "loading extensions";
2406 cf::load_extensions; 2554 cf::load_extensions;
2407 2555
2408 warn "reattaching attachments to objects/players"; 2556 warn "reattaching attachments to objects/players";
2409 _global_reattach; 2557 _global_reattach; # objects, sockets
2410 warn "reattaching attachments to maps"; 2558 warn "reattaching attachments to maps";
2411 reattach $_ for values %MAP; 2559 reattach $_ for values %MAP;
2560 warn "reattaching attachments to players";
2561 reattach $_ for values %PLAYER;
2412 2562
2413 warn "restarting server ticker"; 2563 warn "loading reloadable resources";
2564 reload_resources;
2414 2565
2415 $TICK_WATCHER->start; 2566 warn "leaving sync_job";
2416 };
2417 2567
2418 if ($@) { 2568 1
2569 } or do {
2419 warn $@; 2570 warn $@;
2420 warn "error while reloading, exiting."; 2571 warn "error while reloading, exiting.";
2421 exit 1; 2572 exit 1;
2422 } 2573 };
2423 2574
2424 warn "reloaded"; 2575 warn "reloaded";
2425}; 2576};
2426 2577
2427our $RELOAD_WATCHER; # used only during reload 2578our $RELOAD_WATCHER; # used only during reload
… …
2433 $who->message ("reloading server."); 2584 $who->message ("reloading server.");
2434 2585
2435 # doing reload synchronously and two reloads happen back-to-back, 2586 # doing reload synchronously and two reloads happen back-to-back,
2436 # coro crashes during coro_state_free->destroy here. 2587 # coro crashes during coro_state_free->destroy here.
2437 2588
2438 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2589 $RELOAD_WATCHER ||= Event->timer (
2590 reentrant => 0,
2591 after => 0,
2592 data => WF_AUTOCANCEL,
2593 cb => sub {
2439 reload; 2594 reload;
2440 undef $RELOAD_WATCHER; 2595 undef $RELOAD_WATCHER;
2596 },
2441 }); 2597 );
2442 } 2598 }
2443}; 2599};
2444 2600
2445unshift @INC, $LIBDIR; 2601unshift @INC, $LIBDIR;
2446 2602
… …
2463 2619
2464 cf::server_tick; # one server iteration 2620 cf::server_tick; # one server iteration
2465 $RUNTIME += $TICK; 2621 $RUNTIME += $TICK;
2466 $NEXT_TICK += $TICK; 2622 $NEXT_TICK += $TICK;
2467 2623
2624 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2625 $NEXT_RUNTIME_WRITE = $NOW + 10;
2626 Coro::async_pool {
2627 write_runtime
2628 or warn "ERROR: unable to write runtime file: $!";
2629 };
2630 }
2631
2468 $WAIT_FOR_TICK->broadcast; 2632 $WAIT_FOR_TICK->broadcast;
2469 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2633 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2634
2635# my $AFTER = Event::time;
2636# warn $AFTER - $NOW;#d#
2470 2637
2471 # if we are delayed by four ticks or more, skip them all 2638 # if we are delayed by four ticks or more, skip them all
2472 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2639 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2473 2640
2474 $TICK_WATCHER->at ($NEXT_TICK); 2641 $TICK_WATCHER->at ($NEXT_TICK);
2475 $TICK_WATCHER->start; 2642 $TICK_WATCHER->start;
2476 }, 2643 },
2477); 2644);
2478 2645
2646{
2647 BDB::max_poll_time $TICK * 0.1;
2648 $BDB_POLL_WATCHER = Event->io (
2649 reentrant => 0,
2650 fd => BDB::poll_fileno,
2651 poll => 'r',
2652 prio => 0,
2653 data => WF_AUTOCANCEL,
2654 cb => \&BDB::poll_cb,
2655 );
2656 BDB::min_parallel 8;
2657
2658 BDB::set_sync_prepare {
2659 my $status;
2660 my $current = $Coro::current;
2661 (
2662 sub {
2663 $status = $!;
2664 $current->ready; undef $current;
2665 },
2666 sub {
2667 Coro::schedule while defined $current;
2668 $! = $status;
2669 },
2670 )
2671 };
2672
2673 unless ($DB_ENV) {
2674 $DB_ENV = BDB::db_env_create;
2675
2676 cf::sync_job {
2677 eval {
2678 BDB::db_env_open
2679 $DB_ENV,
2680 $BDB_ENV_DIR,
2681 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2682 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2683 0666;
2684
2685 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2686
2687 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2688 $DB_ENV->set_lk_detect;
2689 };
2690
2691 cf::cleanup "db_env_open(db): $@" if $@;
2692 };
2693 }
2694}
2695
2696{
2697 IO::AIO::min_parallel 8;
2698
2699 undef $Coro::AIO::WATCHER;
2479IO::AIO::max_poll_time $TICK * 0.2; 2700 IO::AIO::max_poll_time $TICK * 0.1;
2480
2481$AIO_POLL_WATCHER = Event->io ( 2701 $AIO_POLL_WATCHER = Event->io (
2482 fd => IO::AIO::poll_fileno, 2702 reentrant => 0,
2483 poll => 'r',
2484 prio => 5,
2485 data => WF_AUTOCANCEL,
2486 cb => \&IO::AIO::poll_cb,
2487);
2488
2489$WRITE_RUNTIME_WATCHER = Event->timer (
2490 data => WF_AUTOCANCEL, 2703 data => WF_AUTOCANCEL,
2491 after => 1, 2704 fd => IO::AIO::poll_fileno,
2492 interval => 10, 2705 poll => 'r',
2493 prio => 6, # keep it lowest so it acts like a watchdog 2706 prio => 6,
2494 cb => Coro::unblock_sub { 2707 cb => \&IO::AIO::poll_cb,
2495 write_runtime 2708 );
2496 or warn "ERROR: unable to write runtime file: $!"; 2709}
2497 },
2498);
2499 2710
2500END { cf::emergency_save } 2711END { cf::emergency_save }
2501 2712
25021 27131
2503 2714

Diff Legend

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