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.237 by root, Fri Apr 13 05:08:51 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;
21use Coro::Storable;
19 22
23use BDB ();
20use Data::Dumper; 24use Data::Dumper;
21use Digest::MD5; 25use Digest::MD5;
22use Fcntl; 26use Fcntl;
27use YAML::Syck ();
23use IO::AIO 2.32 (); 28use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 29use Time::HiRes;
30use Compress::LZF;
26 31
32# configure various modules to our taste
33#
34$Storable::canonical = 1; # reduce rsync transfers
35Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
36Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
37
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 38$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 39
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 40# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 41$YAML::Syck::ImplicitUnicode = 1;
33 42
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 43$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
44
45sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35 46
36our %COMMAND = (); 47our %COMMAND = ();
37our %COMMAND_TIME = (); 48our %COMMAND_TIME = ();
38 49
39our @EXTS = (); # list of extension package names 50our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 51our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 52our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 53our %EXT_MAP = (); # pluggable maps
43 54
55our $RELOAD; # number of reloads so far
44our @EVENT; 56our @EVENT;
45our $LIBDIR = datadir . "/ext"; 57our $LIBDIR = datadir . "/ext";
46 58
47our $TICK = MAX_TIME * 1e-6; 59our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 60our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 61our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 63our $NEXT_TICK;
52our $NOW; 64our $NOW;
65our $USE_FSYNC = 1; # use fsync to write maps - default off
66
67our $BDB_POLL_WATCHER;
68our $DB_ENV;
53 69
54our %CFG; 70our %CFG;
55 71
56our $UPTIME; $UPTIME ||= time; 72our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 73our $RUNTIME;
58 74
59our %PLAYER; # all users 75our %PLAYER; # all users
60our %MAP; # all maps 76our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 77our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 78our $RANDOM_MAPS = cf::localdir . "/random";
79our $BDB_ENV_DIR = cf::localdir . "/db";
63 80
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 81our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 82our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 83
67# used to convert map paths into valid unix filenames by replacing / by ∕ 84# used to convert map paths into valid unix filenames by replacing / by ∕
… …
80mkdir cf::localdir; 97mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 98mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 99mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 100mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 101mkdir $RANDOM_MAPS;
102mkdir $BDB_ENV_DIR;
85 103
86our $EMERGENCY_POSITION; 104our $EMERGENCY_POSITION;
105
106sub cf::map::normalise;
87 107
88############################################################################# 108#############################################################################
89 109
90=head2 GLOBAL VARIABLES 110=head2 GLOBAL VARIABLES
91 111
… …
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 210 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d 211 $d
192 } || "[unable to dump $_[0]: '$@']"; 212 } || "[unable to dump $_[0]: '$@']";
193} 213}
194 214
195use JSON::Syck (); # TODO# replace by JSON::PC once working 215use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
196 216
197=item $ref = cf::from_json $json 217=item $ref = cf::from_json $json
198 218
199Converts a JSON string into the corresponding perl data structure. 219Converts a JSON string into the corresponding perl data structure.
200 220
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 221=item $json = cf::to_json $ref
209 222
210Converts a perl data structure into its JSON representation. 223Converts 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 224
219=item cf::lock_wait $string 225=item cf::lock_wait $string
220 226
221Wait until the given lock is available. See cf::lock_acquire. 227Wait until the given lock is available. See cf::lock_acquire.
222 228
… …
261sub freeze_mainloop { 267sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 268 return unless $TICK_WATCHER->is_active;
263 269
264 my $guard = Coro::guard { 270 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 271 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 272 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 273 $TICK_WATCHER->stop;
270 $guard 274 $guard
271} 275}
272 276
273=item cf::async { BLOCK } 277=item cf::async { BLOCK }
… …
344 348
345 $coro 349 $coro
346} 350}
347 351
348sub write_runtime { 352sub write_runtime {
353 my $guard = cf::lock_acquire "write_runtime";
354
349 my $runtime = cf::localdir . "/runtime"; 355 my $runtime = cf::localdir . "/runtime";
350 356
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 357 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 358 or return;
353 359
360 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 361 # 10 is the runtime save interval, for a monotonic clock
362 # 60 allows for the watchdog to kill the server.
363
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 364 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 365 and return;
357 366
367 # always fsync - this file is important
358 aio_fsync $fh 368 aio_fsync $fh
359 and return; 369 and return;
360 370
361 close $fh 371 close $fh
362 or return; 372 or return;
363 373
364 aio_rename "$runtime~", $runtime 374 aio_rename "$runtime~", $runtime
365 and return; 375 and return;
366 376
367 1 377 1
378}
379
380=item cf::datalog type => key => value, ...
381
382Log a datalog packet of the given type with the given key-value pairs.
383
384=cut
385
386sub datalog($@) {
387 my ($type, %kv) = @_;
388 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
368} 389}
369 390
370=back 391=back
371 392
372=cut 393=cut
… …
747 $filename, length $$rdata, scalar @$objs; 768 $filename, length $$rdata, scalar @$objs;
748 769
749 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 770 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
750 chmod SAVE_MODE, $fh; 771 chmod SAVE_MODE, $fh;
751 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 772 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
752 aio_fsync $fh; 773 aio_fsync $fh if $cf::USE_FSYNC;
753 close $fh; 774 close $fh;
754 775
755 if (@$objs) { 776 if (@$objs) {
756 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 777 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
757 chmod SAVE_MODE, $fh; 778 chmod SAVE_MODE, $fh;
758 my $data = Storable::nfreeze { version => 1, objs => $objs }; 779 my $data = Storable::nfreeze { version => 1, objs => $objs };
759 aio_write $fh, 0, (length $data), $data, 0; 780 aio_write $fh, 0, (length $data), $data, 0;
760 aio_fsync $fh; 781 aio_fsync $fh if $cf::USE_FSYNC;
761 close $fh; 782 close $fh;
762 aio_rename "$filename.pst~", "$filename.pst"; 783 aio_rename "$filename.pst~", "$filename.pst";
763 } 784 }
764 } else { 785 } else {
765 aio_unlink "$filename.pst"; 786 aio_unlink "$filename.pst";
… …
944} 965}
945 966
946sub path($) { 967sub path($) {
947 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 968 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
948 969
949 (playerdir $login) . "/$login.pl" 970 (playerdir $login) . "/playerdata"
950} 971}
951 972
952sub find_active($) { 973sub find_active($) {
953 $cf::PLAYER{$_[0]} 974 $cf::PLAYER{$_[0]}
954 and $cf::PLAYER{$_[0]}->active 975 and $cf::PLAYER{$_[0]}->active
… …
967 my $login = $_[0]; 988 my $login = $_[0];
968 989
969 my $guard = cf::lock_acquire "user_find:$login"; 990 my $guard = cf::lock_acquire "user_find:$login";
970 991
971 $cf::PLAYER{$_[0]} || do { 992 $cf::PLAYER{$_[0]} || do {
993 # rename old playerfiles to new ones
994 #TODO: remove when no longer required
995 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
996 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
997 aio_unlink +(playerdir $login) . "/$login.pl.pst";
998 aio_unlink +(playerdir $login) . "/$login.pl";
999
972 my $pl = load_pl path $login 1000 my $pl = load_pl path $login
973 or return; 1001 or return;
974 $cf::PLAYER{$login} = $pl 1002 $cf::PLAYER{$login} = $pl
975 } 1003 }
976 } 1004 }
… …
1013 1041
1014=cut 1042=cut
1015 1043
1016sub quit_character { 1044sub quit_character {
1017 my ($pl) = @_; 1045 my ($pl) = @_;
1046
1047 my $name = $pl->ob->name;
1018 1048
1019 $pl->{deny_save} = 1; 1049 $pl->{deny_save} = 1;
1020 $pl->password ("*"); # this should lock out the player until we nuked the dir 1050 $pl->password ("*"); # this should lock out the player until we nuked the dir
1021 1051
1022 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1052 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
… …
1027 my $path = playerdir $pl; 1057 my $path = playerdir $pl;
1028 my $temp = "$path~$cf::RUNTIME~deleting~"; 1058 my $temp = "$path~$cf::RUNTIME~deleting~";
1029 aio_rename $path, $temp; 1059 aio_rename $path, $temp;
1030 delete $cf::PLAYER{$pl->ob->name}; 1060 delete $cf::PLAYER{$pl->ob->name};
1031 $pl->destroy; 1061 $pl->destroy;
1062
1063 my $prefix = qr<^~\Q$name\E/>;
1064
1065 # nuke player maps
1066 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1067
1032 IO::AIO::aio_rmtree $temp; 1068 IO::AIO::aio_rmtree $temp;
1069}
1070
1071=item $pl->kick
1072
1073Kicks a player out of the game. This destroys the connection.
1074
1075=cut
1076
1077sub kick {
1078 my ($pl, $kicker) = @_;
1079
1080 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1081 $pl->killer ("kicked");
1082 $pl->ns->destroy;
1033} 1083}
1034 1084
1035=item cf::player::list_logins 1085=item cf::player::list_logins
1036 1086
1037Returns am arrayref of all valid playernames in the system, can take a 1087Returns am arrayref of all valid playernames in the system, can take a
… …
1065=cut 1115=cut
1066 1116
1067sub maps($) { 1117sub maps($) {
1068 my ($pl) = @_; 1118 my ($pl) = @_;
1069 1119
1120 $pl = ref $pl ? $pl->ob->name : $pl;
1121
1070 my $files = aio_readdir playerdir $pl 1122 my $files = aio_readdir playerdir $pl
1071 or return; 1123 or return;
1072 1124
1073 my @paths; 1125 my @paths;
1074 1126
1075 for (@$files) { 1127 for (@$files) {
1076 utf8::decode $_; 1128 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1129 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1130 next unless /^$PATH_SEP/o;
1079 1131
1080 s/\.map$//; 1132 push @paths, cf::map::normalise "~$pl/$_";
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 } 1133 }
1083 1134
1084 \@paths 1135 \@paths
1085} 1136}
1086 1137
1087=item $player->ext_reply ($msgid, $msgtype, %msg) 1138=item $player->ext_reply ($msgid, %msg)
1088 1139
1089Sends an ext reply to the player. 1140Sends an ext reply to the player.
1090 1141
1091=cut 1142=cut
1092 1143
1093sub ext_reply($$$%) { 1144sub ext_reply($$%) {
1094 my ($self, $id, %msg) = @_; 1145 my ($self, $id, %msg) = @_;
1095 1146
1096 $msg{msgid} = $id; 1147 $msg{msgid} = $id;
1097 1148
1098 $self->send ("ext " . cf::to_json \%msg); 1149 $self->send ("ext " . cf::to_json \%msg);
1150}
1151
1152=item $player->ext_event ($type, %msg)
1153
1154Sends an ext event to the client.
1155
1156=cut
1157
1158sub ext_event($$%) {
1159 my ($self, $type, %msg) = @_;
1160
1161 $self->ns->ext_event ($type, %msg);
1099} 1162}
1100 1163
1101package cf; 1164package cf;
1102 1165
1103=back 1166=back
… …
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1200 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1201 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1202 )
1140} 1203}
1141 1204
1205=item cf::map->register ($regex, $prio)
1206
1207Register a handler for the map path matching the given regex at the
1208givne priority (higher is better, built-in handlers have priority 0, the
1209default).
1210
1211=cut
1212
1142sub register { 1213sub register {
1143 my (undef, $regex) = @_; 1214 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1215 my $pkg = caller;
1145 1216
1146 no strict; 1217 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1218 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1219
1149 $EXT_MAP{$pkg} = qr<$regex>; 1220 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1221}
1151 1222
1152# also paths starting with '/' 1223# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1224$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1225
1155sub thawer_merge { 1226sub thawer_merge {
1156 my ($self, $merge) = @_; 1227 my ($self, $merge) = @_;
1157 1228
1158 # we have to keep some variables in memory intact 1229 # we have to keep some variables in memory intact
… …
1164 $self->SUPER::thawer_merge ($merge); 1235 $self->SUPER::thawer_merge ($merge);
1165} 1236}
1166 1237
1167sub normalise { 1238sub normalise {
1168 my ($path, $base) = @_; 1239 my ($path, $base) = @_;
1240
1241 $path = "$path"; # make sure its a string
1242
1243 $path =~ s/\.map$//;
1169 1244
1170 # map plan: 1245 # map plan:
1171 # 1246 #
1172 # /! non-realised random map exit (special hack!) 1247 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched 1248 # {... are special paths that are not being touched
… …
1201 1276
1202 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1277 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1203 1278
1204 $path = normalise $path, $base; 1279 $path = normalise $path, $base;
1205 1280
1206 for my $pkg (keys %EXT_MAP) { 1281 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1282 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1283 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1284 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1285 $self->init; # pass $1 etc.
1211 return $self; 1286 return $self;
1212 } 1287 }
1213 } 1288 }
1214 1289
1215 Carp::carp "unable to resolve path '$path'."; 1290 Carp::carp "unable to resolve path '$path' (base '$base').";
1216 () 1291 ()
1217} 1292}
1218 1293
1219sub init { 1294sub init {
1220 my ($self) = @_; 1295 my ($self) = @_;
… …
1235 1310
1236# the original (read-only) location 1311# the original (read-only) location
1237sub load_path { 1312sub load_path {
1238 my ($self) = @_; 1313 my ($self) = @_;
1239 1314
1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1315 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1241} 1316}
1242 1317
1243# the temporary/swap location 1318# the temporary/swap location
1244sub save_path { 1319sub save_path {
1245 my ($self) = @_; 1320 my ($self) = @_;
1246 1321
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1322 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1323 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1249} 1324}
1250 1325
1251# the unique path, undef == no special unique path 1326# the unique path, undef == no special unique path
1252sub uniq_path { 1327sub uniq_path {
1253 my ($self) = @_; 1328 my ($self) = @_;
… …
1275 1350
1276sub load_header_from($) { 1351sub load_header_from($) {
1277 my ($self, $path) = @_; 1352 my ($self, $path) = @_;
1278 1353
1279 utf8::encode $path; 1354 utf8::encode $path;
1280 aio_open $path, O_RDONLY, 0 1355 #aio_open $path, O_RDONLY, 0
1281 or return; 1356 # or return;
1282 1357
1283 $self->_load_header ($path) 1358 $self->_load_header ($path)
1284 or return; 1359 or return;
1285 1360
1286 $self->{load_path} = $path; 1361 $self->{load_path} = $path;
1287 1362
1288 1 1363 1
1289} 1364}
1290 1365
1291sub load_orig { 1366sub load_header_orig {
1292 my ($self) = @_; 1367 my ($self) = @_;
1293 1368
1294 $self->load_header_from ($self->load_path) 1369 $self->load_header_from ($self->load_path)
1295} 1370}
1296 1371
1297sub load_temp { 1372sub load_header_temp {
1298 my ($self) = @_; 1373 my ($self) = @_;
1299 1374
1300 $self->load_header_from ($self->save_path) 1375 $self->load_header_from ($self->save_path)
1376}
1377
1378sub prepare_temp {
1379 my ($self) = @_;
1380
1381 $self->last_access ((delete $self->{last_access})
1382 || $cf::RUNTIME); #d#
1383 # safety
1384 $self->{instantiate_time} = $cf::RUNTIME
1385 if $self->{instantiate_time} > $cf::RUNTIME;
1386}
1387
1388sub prepare_orig {
1389 my ($self) = @_;
1390
1391 $self->{load_original} = 1;
1392 $self->{instantiate_time} = $cf::RUNTIME;
1393 $self->last_access ($cf::RUNTIME);
1394 $self->instantiate;
1301} 1395}
1302 1396
1303sub load_header { 1397sub load_header {
1304 my ($self) = @_; 1398 my ($self) = @_;
1305 1399
1306 if ($self->load_temp) { 1400 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1401 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1402 } else {
1313 $self->load_orig 1403 $self->load_header_orig
1314 or return; 1404 or return;
1315 1405 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1406 }
1321 1407
1322 1 1408 1
1323} 1409}
1324 1410
… …
1338 $map->{last_save} = $cf::RUNTIME; 1424 $map->{last_save} = $cf::RUNTIME;
1339 1425
1340 $map->load_header 1426 $map->load_header
1341 or return; 1427 or return;
1342 1428
1343 if ($map->should_reset) { 1429 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1344 # doing this can freeze the server in a sync job, obviously 1430 # doing this can freeze the server in a sync job, obviously
1345 #$cf::WAIT_FOR_TICK->wait; 1431 #$cf::WAIT_FOR_TICK->wait;
1346 $map->reset; 1432 $map->reset;
1347 undef $guard; 1433 undef $guard;
1348 $map = find $path 1434 return find $path;
1349 or return;
1350 } 1435 }
1351 1436
1352 $cf::MAP{$path} = $map 1437 $cf::MAP{$path} = $map
1353 } 1438 }
1354} 1439}
1440
1441sub pre_load { }
1442sub post_load { }
1355 1443
1356sub load { 1444sub load {
1357 my ($self) = @_; 1445 my ($self) = @_;
1358 1446
1447 local $self->{deny_reset} = 1; # loading can take a long time
1448
1359 my $path = $self->{path}; 1449 my $path = $self->{path};
1360 my $guard = cf::lock_acquire "map_load:$path"; 1450 my $guard = cf::lock_acquire "map_load:$path";
1361 1451
1362 return if $self->in_memory != cf::MAP_SWAPPED; 1452 return if $self->in_memory != cf::MAP_SWAPPED;
1363 1453
1364 $self->in_memory (cf::MAP_LOADING); 1454 $self->in_memory (cf::MAP_LOADING);
1365 1455
1366 $self->alloc; 1456 $self->alloc;
1457
1458 $self->pre_load;
1459
1367 $self->_load_objects ($self->{load_path}, 1) 1460 $self->_load_objects ($self->{load_path}, 1)
1368 or return; 1461 or return;
1369 1462
1370 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1463 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1371 if delete $self->{load_original}; 1464 if delete $self->{load_original};
… …
1393 unless $self->difficulty; 1486 unless $self->difficulty;
1394 Coro::cede; 1487 Coro::cede;
1395 $self->activate; 1488 $self->activate;
1396 } 1489 }
1397 1490
1491 $self->post_load;
1492
1398 $self->in_memory (cf::MAP_IN_MEMORY); 1493 $self->in_memory (cf::MAP_IN_MEMORY);
1399} 1494}
1400 1495
1401sub customise_for { 1496sub customise_for {
1402 my ($self, $ob) = @_; 1497 my ($self, $ob) = @_;
… …
1466 delete $MAP_PREFETCH{$path}; 1561 delete $MAP_PREFETCH{$path};
1467 } 1562 }
1468 } 1563 }
1469 undef $MAP_PREFETCHER; 1564 undef $MAP_PREFETCHER;
1470 }; 1565 };
1566 $MAP_PREFETCHER->prio (6);
1471 1567
1472 () 1568 ()
1473} 1569}
1474 1570
1475sub save { 1571sub save {
… …
1545 return if $self->players; 1641 return if $self->players;
1546 return if $self->isa ("ext::map_per_player");#d# 1642 return if $self->isa ("ext::map_per_player");#d#
1547 1643
1548 warn "resetting map ", $self->path;#d# 1644 warn "resetting map ", $self->path;#d#
1549 1645
1646 $self->in_memory (cf::MAP_SWAPPED);
1647
1648 # need to save uniques path
1649 unless ($self->{deny_save}) {
1650 my $uniq = $self->uniq_path; utf8::encode $uniq;
1651
1652 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1653 if $uniq;
1654 }
1655
1550 delete $cf::MAP{$self->path}; 1656 delete $cf::MAP{$self->path};
1551 1657
1552 $self->in_memory (cf::MAP_SWAPPED);
1553 $self->clear; 1658 $self->clear;
1554 1659
1555 $_->clear_links_to ($self) for values %cf::MAP; 1660 $_->clear_links_to ($self) for values %cf::MAP;
1556 1661
1557 $self->unlink_save; 1662 $self->unlink_save;
… …
1594 for (@$files) { 1699 for (@$files) {
1595 utf8::decode $_; 1700 utf8::decode $_;
1596 next if /\.pst$/; 1701 next if /\.pst$/;
1597 next unless /^$PATH_SEP/o; 1702 next unless /^$PATH_SEP/o;
1598 1703
1599 s/\.map$//; 1704 push @paths, cf::map::normalise $_;
1600 push @paths, $_;
1601 } 1705 }
1602 1706
1603 \@paths 1707 \@paths
1604} 1708}
1605 1709
… …
1699=cut 1803=cut
1700 1804
1701sub link_map { 1805sub link_map {
1702 unless ($LINK_MAP) { 1806 unless ($LINK_MAP) {
1703 $LINK_MAP = cf::map::find "{link}" 1807 $LINK_MAP = cf::map::find "{link}"
1704 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1808 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1705 $LINK_MAP->load; 1809 $LINK_MAP->load;
1706 } 1810 }
1707 1811
1708 $LINK_MAP 1812 $LINK_MAP
1709} 1813}
… …
1716 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1820 return if UNIVERSAL::isa $self->map, "ext::map_link";
1717 1821
1718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1822 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1719 if $self->map; 1823 if $self->map;
1720 1824
1721 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1825 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1722} 1826}
1723 1827
1724sub cf::object::player::leave_link { 1828sub cf::object::player::leave_link {
1725 my ($self, $map, $x, $y) = @_; 1829 my ($self, $map, $x, $y) = @_;
1726 1830
… …
1748 $map->load; 1852 $map->load;
1749 $map->load_diag; 1853 $map->load_diag;
1750 1854
1751 return unless $self->contr->active; 1855 return unless $self->contr->active;
1752 $self->activate_recursive; 1856 $self->activate_recursive;
1857
1858 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1753 $self->enter_map ($map, $x, $y); 1859 $self->enter_map ($map, $x, $y);
1754} 1860}
1755 1861
1756cf::player->attach ( 1862cf::player->attach (
1757 on_logout => sub { 1863 on_logout => sub {
… …
1770 # try to abort aborted map switching on player login :) 1876 # try to abort aborted map switching on player login :)
1771 # should happen only on crashes 1877 # should happen only on crashes
1772 if ($pl->ob->{_link_pos}) { 1878 if ($pl->ob->{_link_pos}) {
1773 $pl->ob->enter_link; 1879 $pl->ob->enter_link;
1774 (async { 1880 (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, 1881 $pl->ob->reply (undef,
1778 "There was an internal problem at your last logout, " 1882 "There was an internal problem at your last logout, "
1779 . "the server will try to bring you to your intended destination in a second.", 1883 . "the server will try to bring you to your intended destination in a second.",
1780 cf::NDI_RED); 1884 cf::NDI_RED);
1885 # we need this sleep as the login has a concurrent enter_exit running
1886 # and this sleep increases chances of the player not ending up in scorn
1781 Coro::Timer::sleep 1; 1887 Coro::Timer::sleep 1;
1782 $pl->ob->leave_link; 1888 $pl->ob->leave_link;
1783 })->prio (2); 1889 })->prio (2);
1784 } 1890 }
1785 }, 1891 },
… …
1793 my ($self, $path, $x, $y) = @_; 1899 my ($self, $path, $x, $y) = @_;
1794 1900
1795 $self->enter_link; 1901 $self->enter_link;
1796 1902
1797 (async { 1903 (async {
1904 my $map = eval {
1798 my $map = cf::map::find $path; 1905 my $map = cf::map::find $path;
1799 $map = $map->customise_for ($self) if $map; 1906 $map = $map->customise_for ($self) if $map;
1800 1907 $map
1801# warn "entering ", $map->path, " at ($x, $y)\n" 1908 } or
1802# if $map;
1803
1804 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1909 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1805 1910
1806 $self->leave_link ($map, $x, $y); 1911 $self->leave_link ($map, $x, $y);
1807 })->prio (1); 1912 })->prio (1);
1808} 1913}
1809 1914
… …
1840 # that depends on the exit object 1945 # that depends on the exit object
1841 1946
1842 my $rmp = parse_random_map_params $exit->msg; 1947 my $rmp = parse_random_map_params $exit->msg;
1843 1948
1844 if ($exit->map) { 1949 if ($exit->map) {
1845 $rmp->{region} = $exit->map->region_name; 1950 $rmp->{region} = $exit->region->name;
1846 $rmp->{origin_map} = $exit->map->path; 1951 $rmp->{origin_map} = $exit->map->path;
1847 $rmp->{origin_x} = $exit->x; 1952 $rmp->{origin_x} = $exit->x;
1848 $rmp->{origin_y} = $exit->y; 1953 $rmp->{origin_y} = $exit->y;
1849 } 1954 }
1850 1955
… …
1867sub cf::object::player::enter_exit { 1972sub cf::object::player::enter_exit {
1868 my ($self, $exit) = @_; 1973 my ($self, $exit) = @_;
1869 1974
1870 return unless $self->type == cf::PLAYER; 1975 return unless $self->type == cf::PLAYER;
1871 1976
1977 if ($exit->slaying eq "/!") {
1978 #TODO: this should de-fi-ni-te-ly not be a sync-job
1979 # the problem is that $exit might not survive long enough
1980 # so it needs to be done right now, right here
1981 cf::sync_job { prepare_random_map $exit };
1982 }
1983
1984 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1985 my $hp = $exit->stats->hp;
1986 my $sp = $exit->stats->sp;
1987
1872 $self->enter_link; 1988 $self->enter_link;
1873 1989
1874 (async { 1990 (async {
1875 $self->deactivate_recursive; # just to be sure 1991 $self->deactivate_recursive; # just to be sure
1876 unless (eval { 1992 unless (eval {
1877 prepare_random_map $exit 1993 $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 1994
1883 1; 1995 1;
1884 }) { 1996 }) {
1885 $self->message ("Something went wrong deep within the crossfire server. " 1997 $self->message ("Something went wrong deep within the crossfire server. "
1886 . "I'll try to bring you back to the map you were before. " 1998 . "I'll try to bring you back to the map you were before. "
1887 . "Please report this to the dungeon master!", 1999 . "Please report this to the dungeon master!",
1888 cf::NDI_UNIQUE | cf::NDI_RED); 2000 cf::NDI_UNIQUE | cf::NDI_RED);
1889 2001
1890 warn "ERROR in enter_exit: $@"; 2002 warn "ERROR in enter_exit: $@";
1891 $self->leave_link; 2003 $self->leave_link;
1892 } 2004 }
1893 })->prio (1); 2005 })->prio (1);
… …
1906 2018
1907sub cf::client::send_drawinfo { 2019sub cf::client::send_drawinfo {
1908 my ($self, $text, $flags) = @_; 2020 my ($self, $text, $flags) = @_;
1909 2021
1910 utf8::encode $text; 2022 utf8::encode $text;
1911 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2023 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1912} 2024}
1913 2025
2026=item $client->ext_event ($type, %msg)
2027
2028Sends an exti event to the client.
2029
2030=cut
2031
2032sub cf::client::ext_event($$%) {
2033 my ($self, $type, %msg) = @_;
2034
2035 $msg{msgtype} = "event_$type";
2036 $self->send_packet ("ext " . cf::to_json \%msg);
2037}
1914 2038
1915=item $success = $client->query ($flags, "text", \&cb) 2039=item $success = $client->query ($flags, "text", \&cb)
1916 2040
1917Queues a query to the client, calling the given callback with 2041Queues a query to the client, calling the given callback with
1918the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2042the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
… …
1947 # get handled first 2071 # get handled first
1948 my $queue = delete $ns->{query_queue} 2072 my $queue = delete $ns->{query_queue}
1949 or return; # be conservative, not sure how that can happen, but we saw a crash here 2073 or return; # be conservative, not sure how that can happen, but we saw a crash here
1950 2074
1951 (shift @$queue)->[1]->($msg); 2075 (shift @$queue)->[1]->($msg);
2076 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1952 2077
1953 push @{ $ns->{query_queue} }, @$queue; 2078 push @{ $ns->{query_queue} }, @$queue;
1954 2079
1955 if (@{ $ns->{query_queue} } == @$queue) { 2080 if (@{ $ns->{query_queue} } == @$queue) {
1956 if (@$queue) { 2081 if (@$queue) {
… …
2014 2139
2015# here we export the classes and methods available to script code 2140# here we export the classes and methods available to script code
2016 2141
2017=pod 2142=pod
2018 2143
2019The following fucntions and emthods are available within a safe environment: 2144The following functions and methods are available within a safe environment:
2020 2145
2021 cf::object contr pay_amount pay_player map 2146 cf::object contr pay_amount pay_player map
2022 cf::object::player player 2147 cf::object::player player
2023 cf::player peaceful 2148 cf::player peaceful
2024 cf::map trigger 2149 cf::map trigger
… …
2117The parameter C<$family> should best start with the name of the extension 2242The parameter C<$family> should best start with the name of the extension
2118using it, it should be unique. 2243using it, it should be unique.
2119 2244
2120=over 4 2245=over 4
2121 2246
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 2247=item $value = cf::db_get $family => $key
2129 2248
2130Returns a single value from the database 2249Returns 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 2250
2137=item cf::db_put $family => $key => $value 2251=item cf::db_put $family => $key => $value
2138 2252
2139Stores the given C<$value> in the family hash. Updates are delayed, if you 2253Stores 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 2254
2150=cut 2255=cut
2151 2256
2152our $DB; 2257our $DB;
2153 2258
2154{ 2259sub db_init {
2260 unless ($DB) {
2261 $DB = BDB::db_create $DB_ENV;
2262
2263 cf::sync_job {
2264 eval {
2265 $DB->set_flags (BDB::CHKSUM);
2266
2267 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2268 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2269 cf::cleanup "db_open(db): $!" if $!;
2270 };
2271 cf::cleanup "db_open(db): $@" if $@;
2272 };
2273
2155 my $path = cf::localdir . "/database.pst"; 2274 my $path = cf::localdir . "/database.pst";
2275 if (stat $path) {
2276 cf::sync_job {
2277 my $pst = Storable::retrieve $path;
2156 2278
2157 sub db_load() { 2279 cf::db_put (board => data => $pst->{board});
2158 $DB = stat $path ? Storable::retrieve $path : { }; 2280 cf::db_put (guildrules => data => $pst->{guildrules});
2159 } 2281 cf::db_put (rent => balance => $pst->{rent}{balance});
2282 BDB::db_env_txn_checkpoint $DB_ENV;
2160 2283
2161 my $pid; 2284 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 } 2285 };
2171 }
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 });
2183
2184 sub db_dirty() {
2185 $dirty = 1;
2186 $idle->start;
2187 }
2188
2189 sub db_get($;$) {
2190 @_ >= 2
2191 ? $DB->{$_[0]}{$_[1]}
2192 : ($DB->{$_[0]} ||= { })
2193 }
2194
2195 sub db_put($$;$) {
2196 if (@_ >= 3) {
2197 $DB->{$_[0]}{$_[1]} = $_[2];
2198 } else {
2199 $DB->{$_[0]} = $_[1];
2200 }
2201 db_dirty;
2202 }
2203
2204 cf::global->attach (
2205 prio => 10000,
2206 on_cleanup => sub {
2207 db_sync;
2208 }, 2286 }
2209 ); 2287 }
2288}
2289
2290sub db_get($$) {
2291 my $key = "$_[0]/$_[1]";
2292
2293 cf::sync_job {
2294 BDB::db_get $DB, undef, $key, my $data;
2295
2296 $! ? ()
2297 : Compress::LZF::sthaw $data
2298 }
2299}
2300
2301sub db_put($$$) {
2302 BDB::dbreq_pri 4;
2303 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2210} 2304}
2211 2305
2212############################################################################# 2306#############################################################################
2213# the server's main() 2307# the server's init and main functions
2308
2309sub load_facedata {
2310 my $path = sprintf "%s/facedata", cf::datadir;
2311
2312 warn "loading facedata from $path\n";
2313
2314 my $facedata;
2315 0 < aio_load $path, $facedata
2316 or die "$path: $!";
2317
2318 $facedata = Coro::Storable::thaw $facedata;
2319
2320 $facedata->{version} == 2
2321 or cf::cleanup "$path: version mismatch, cannot proceed.";
2322
2323 {
2324 my $faces = $facedata->{faceinfo};
2325
2326 while (my ($face, $info) = each %$faces) {
2327 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2328 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2329 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2330 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2331 Coro::cede;
2332 }
2333
2334 while (my ($face, $info) = each %$faces) {
2335 next unless $info->{smooth};
2336 my $idx = cf::face::find $face
2337 or next;
2338 if (my $smooth = cf::face::find $info->{smooth}) {
2339 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2340 } else {
2341 warn "smooth face '$info->{smooth}' not found for face '$face'";
2342 }
2343 Coro::cede;
2344 }
2345 }
2346
2347 {
2348 my $anims = $facedata->{animinfo};
2349
2350 while (my ($anim, $info) = each %$anims) {
2351 cf::anim::set $anim, $info->{frames}, $info->{facings};
2352 Coro::cede;
2353 }
2354
2355 cf::anim::invalidate_all; # d'oh
2356 }
2357
2358 1
2359}
2360
2361sub reload_resources {
2362 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2363 or die "unable to load regions file\n";#d#
2364 load_facedata
2365 or die "unable to load facedata\n";#d#
2366}
2367
2368sub init {
2369 reload_resources;
2370}
2214 2371
2215sub cfg_load { 2372sub cfg_load {
2216 open my $fh, "<:utf8", cf::confdir . "/config" 2373 open my $fh, "<:utf8", cf::confdir . "/config"
2217 or return; 2374 or return;
2218 2375
… …
2241 Event::one_event; 2398 Event::one_event;
2242 })->prio (Coro::PRIO_MAX); 2399 })->prio (Coro::PRIO_MAX);
2243 }; 2400 };
2244 2401
2245 cfg_load; 2402 cfg_load;
2246 db_load; 2403 db_init;
2247 load_extensions; 2404 load_extensions;
2248 2405
2249 $TICK_WATCHER->start; 2406 $TICK_WATCHER->start;
2250 Event::loop; 2407 Event::loop;
2251} 2408}
… …
2255 2412
2256# install some emergency cleanup handlers 2413# install some emergency cleanup handlers
2257BEGIN { 2414BEGIN {
2258 for my $signal (qw(INT HUP TERM)) { 2415 for my $signal (qw(INT HUP TERM)) {
2259 Event->signal ( 2416 Event->signal (
2417 reentrant => 0,
2260 data => WF_AUTOCANCEL, 2418 data => WF_AUTOCANCEL,
2261 signal => $signal, 2419 signal => $signal,
2420 prio => 0,
2262 cb => sub { 2421 cb => sub {
2263 cf::cleanup "SIG$signal"; 2422 cf::cleanup "SIG$signal";
2264 }, 2423 },
2265 ); 2424 );
2266 } 2425 }
2267} 2426}
… …
2288 my $map = $cf::MAP{$path} or next; 2447 my $map = $cf::MAP{$path} or next;
2289 $map->valid or next; 2448 $map->valid or next;
2290 $map->save; 2449 $map->save;
2291 } 2450 }
2292 warn "end emergency map save\n"; 2451 warn "end emergency map save\n";
2452
2453 warn "begin emergency database checkpoint\n";
2454 BDB::db_env_txn_checkpoint $DB_ENV;
2455 warn "end emergency database checkpoint\n";
2293 }; 2456 };
2294 2457
2295 warn "leave emergency perl save\n"; 2458 warn "leave emergency perl save\n";
2459}
2460
2461sub post_cleanup {
2462 my ($make_core) = @_;
2463
2464 warn Carp::longmess "post_cleanup backtrace"
2465 if $make_core;
2296} 2466}
2297 2467
2298sub reload() { 2468sub reload() {
2299 # can/must only be called in main 2469 # can/must only be called in main
2300 if ($Coro::current != $Coro::main) { 2470 if ($Coro::current != $Coro::main) {
… …
2302 return; 2472 return;
2303 } 2473 }
2304 2474
2305 warn "reloading..."; 2475 warn "reloading...";
2306 2476
2307 warn "cancelling server ticker"; 2477 warn "entering sync_job";
2308 $TICK_WATCHER->cancel;
2309 2478
2479 cf::sync_job {
2480 cf::write_runtime; # external watchdog should not bark
2310 cf::emergency_save; 2481 cf::emergency_save;
2482 cf::write_runtime; # external watchdog should not bark
2311 2483
2312 eval { 2484 warn "syncing database to disk";
2485 BDB::db_env_txn_checkpoint $DB_ENV;
2486
2313 # if anything goes wrong in here, we should simply crash as we already saved 2487 # 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 2488
2318 warn "cancelling all WF_AUTOCANCEL watchers"; 2489 warn "cancelling all WF_AUTOCANCEL watchers";
2319 for (Event::all_watchers) { 2490 for (Event::all_watchers) {
2320 $_->cancel if $_->data & WF_AUTOCANCEL; 2491 $_->cancel if $_->data & WF_AUTOCANCEL;
2321 } 2492 }
2322 2493
2323 warn "flushing outstanding aio requests"; 2494 warn "flushing outstanding aio requests";
2324 for (;;) { 2495 for (;;) {
2496 BDB::flush;
2325 IO::AIO::flush; 2497 IO::AIO::flush;
2326 Coro::cede; 2498 Coro::cede;
2327 last unless IO::AIO::nreqs; 2499 last unless IO::AIO::nreqs || BDB::nreqs;
2328 warn "iterate..."; 2500 warn "iterate...";
2329 } 2501 }
2502
2503 ++$RELOAD;
2330 2504
2331 warn "cancelling all extension coros"; 2505 warn "cancelling all extension coros";
2332 $_->cancel for values %EXT_CORO; 2506 $_->cancel for values %EXT_CORO;
2333 %EXT_CORO = (); 2507 %EXT_CORO = ();
2334 2508
… …
2387 require cf; 2561 require cf;
2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2562 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2389 2563
2390 warn "loading config and database again"; 2564 warn "loading config and database again";
2391 cf::cfg_load; 2565 cf::cfg_load;
2392 cf::db_load;
2393 2566
2394 warn "loading extensions"; 2567 warn "loading extensions";
2395 cf::load_extensions; 2568 cf::load_extensions;
2396 2569
2397 warn "reattaching attachments to objects/players"; 2570 warn "reattaching attachments to objects/players";
2398 _global_reattach; 2571 _global_reattach; # objects, sockets
2399 warn "reattaching attachments to maps"; 2572 warn "reattaching attachments to maps";
2400 reattach $_ for values %MAP; 2573 reattach $_ for values %MAP;
2574 warn "reattaching attachments to players";
2575 reattach $_ for values %PLAYER;
2401 2576
2402 warn "restarting server ticker"; 2577 warn "loading reloadable resources";
2578 reload_resources;
2403 2579
2404 $TICK_WATCHER->start; 2580 warn "leaving sync_job";
2405 };
2406 2581
2407 if ($@) { 2582 1
2583 } or do {
2408 warn $@; 2584 warn $@;
2409 warn "error while reloading, exiting."; 2585 warn "error while reloading, exiting.";
2410 exit 1; 2586 exit 1;
2411 } 2587 };
2412 2588
2413 warn "reloaded"; 2589 warn "reloaded";
2414}; 2590};
2415 2591
2416our $RELOAD_WATCHER; # used only during reload 2592our $RELOAD_WATCHER; # used only during reload
… …
2422 $who->message ("reloading server."); 2598 $who->message ("reloading server.");
2423 2599
2424 # doing reload synchronously and two reloads happen back-to-back, 2600 # doing reload synchronously and two reloads happen back-to-back,
2425 # coro crashes during coro_state_free->destroy here. 2601 # coro crashes during coro_state_free->destroy here.
2426 2602
2427 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2603 $RELOAD_WATCHER ||= Event->timer (
2604 reentrant => 0,
2605 after => 0,
2606 data => WF_AUTOCANCEL,
2607 cb => sub {
2428 reload; 2608 reload;
2429 undef $RELOAD_WATCHER; 2609 undef $RELOAD_WATCHER;
2610 },
2430 }); 2611 );
2431 } 2612 }
2432}; 2613};
2433 2614
2434unshift @INC, $LIBDIR; 2615unshift @INC, $LIBDIR;
2435 2616
… …
2452 2633
2453 cf::server_tick; # one server iteration 2634 cf::server_tick; # one server iteration
2454 $RUNTIME += $TICK; 2635 $RUNTIME += $TICK;
2455 $NEXT_TICK += $TICK; 2636 $NEXT_TICK += $TICK;
2456 2637
2638 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2639 $NEXT_RUNTIME_WRITE = $NOW + 10;
2640 Coro::async_pool {
2641 write_runtime
2642 or warn "ERROR: unable to write runtime file: $!";
2643 };
2644 }
2645
2457 $WAIT_FOR_TICK->broadcast; 2646 $WAIT_FOR_TICK->broadcast;
2458 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2647 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2648
2649# my $AFTER = Event::time;
2650# warn $AFTER - $NOW;#d#
2459 2651
2460 # if we are delayed by four ticks or more, skip them all 2652 # if we are delayed by four ticks or more, skip them all
2461 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2653 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2462 2654
2463 $TICK_WATCHER->at ($NEXT_TICK); 2655 $TICK_WATCHER->at ($NEXT_TICK);
2464 $TICK_WATCHER->start; 2656 $TICK_WATCHER->start;
2465 }, 2657 },
2466); 2658);
2467 2659
2660{
2661 BDB::max_poll_time $TICK * 0.1;
2662 $BDB_POLL_WATCHER = Event->io (
2663 reentrant => 0,
2664 fd => BDB::poll_fileno,
2665 poll => 'r',
2666 prio => 0,
2667 data => WF_AUTOCANCEL,
2668 cb => \&BDB::poll_cb,
2669 );
2670 BDB::min_parallel 8;
2671
2672 BDB::set_sync_prepare {
2673 my $status;
2674 my $current = $Coro::current;
2675 (
2676 sub {
2677 $status = $!;
2678 $current->ready; undef $current;
2679 },
2680 sub {
2681 Coro::schedule while defined $current;
2682 $! = $status;
2683 },
2684 )
2685 };
2686
2687 unless ($DB_ENV) {
2688 $DB_ENV = BDB::db_env_create;
2689
2690 cf::sync_job {
2691 eval {
2692 BDB::db_env_open
2693 $DB_ENV,
2694 $BDB_ENV_DIR,
2695 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2696 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2697 0666;
2698
2699 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2700
2701 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2702 $DB_ENV->set_lk_detect;
2703 };
2704
2705 cf::cleanup "db_env_open(db): $@" if $@;
2706 };
2707 }
2708}
2709
2710{
2711 IO::AIO::min_parallel 8;
2712
2713 undef $Coro::AIO::WATCHER;
2468IO::AIO::max_poll_time $TICK * 0.2; 2714 IO::AIO::max_poll_time $TICK * 0.1;
2469
2470$AIO_POLL_WATCHER = Event->io ( 2715 $AIO_POLL_WATCHER = Event->io (
2471 fd => IO::AIO::poll_fileno, 2716 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, 2717 data => WF_AUTOCANCEL,
2480 after => 1, 2718 fd => IO::AIO::poll_fileno,
2481 interval => 10, 2719 poll => 'r',
2482 cb => Coro::unblock_sub { 2720 prio => 6,
2483 write_runtime 2721 cb => \&IO::AIO::poll_cb,
2484 or warn "ERROR: unable to write runtime file: $!"; 2722 );
2485 }, 2723}
2486);
2487 2724
2488END { cf::emergency_save } 2725END { cf::emergency_save }
2489 2726
24901 27271
2491 2728

Diff Legend

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