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.178 by root, Thu Jan 18 00:06:55 2007 UTC vs.
Revision 1.228 by root, Mon Mar 26 16:53:33 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;
… …
747 $filename, length $$rdata, scalar @$objs; 755 $filename, length $$rdata, scalar @$objs;
748 756
749 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 757 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
750 chmod SAVE_MODE, $fh; 758 chmod SAVE_MODE, $fh;
751 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 759 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
752 aio_fsync $fh; 760 aio_fsync $fh if $cf::USE_FSYNC;
753 close $fh; 761 close $fh;
754 762
755 if (@$objs) { 763 if (@$objs) {
756 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 764 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
757 chmod SAVE_MODE, $fh; 765 chmod SAVE_MODE, $fh;
758 my $data = Storable::nfreeze { version => 1, objs => $objs }; 766 my $data = Storable::nfreeze { version => 1, objs => $objs };
759 aio_write $fh, 0, (length $data), $data, 0; 767 aio_write $fh, 0, (length $data), $data, 0;
760 aio_fsync $fh; 768 aio_fsync $fh if $cf::USE_FSYNC;
761 close $fh; 769 close $fh;
762 aio_rename "$filename.pst~", "$filename.pst"; 770 aio_rename "$filename.pst~", "$filename.pst";
763 } 771 }
764 } else { 772 } else {
765 aio_unlink "$filename.pst"; 773 aio_unlink "$filename.pst";
… …
957 965
958sub exists($) { 966sub exists($) {
959 my ($login) = @_; 967 my ($login) = @_;
960 968
961 $cf::PLAYER{$login} 969 $cf::PLAYER{$login}
962 or cf::sync_job { !aio_stat $login } 970 or cf::sync_job { !aio_stat path $login }
963} 971}
964 972
965sub find($) { 973sub find($) {
966 return $cf::PLAYER{$_[0]} || do { 974 return $cf::PLAYER{$_[0]} || do {
967 my $login = $_[0]; 975 my $login = $_[0];
… …
1013 1021
1014=cut 1022=cut
1015 1023
1016sub quit_character { 1024sub quit_character {
1017 my ($pl) = @_; 1025 my ($pl) = @_;
1026
1027 my $name = $pl->ob->name;
1018 1028
1019 $pl->{deny_save} = 1; 1029 $pl->{deny_save} = 1;
1020 $pl->password ("*"); # this should lock out the player until we nuked the dir 1030 $pl->password ("*"); # this should lock out the player until we nuked the dir
1021 1031
1022 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1032 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
… …
1027 my $path = playerdir $pl; 1037 my $path = playerdir $pl;
1028 my $temp = "$path~$cf::RUNTIME~deleting~"; 1038 my $temp = "$path~$cf::RUNTIME~deleting~";
1029 aio_rename $path, $temp; 1039 aio_rename $path, $temp;
1030 delete $cf::PLAYER{$pl->ob->name}; 1040 delete $cf::PLAYER{$pl->ob->name};
1031 $pl->destroy; 1041 $pl->destroy;
1042
1043 my $prefix = qr<^~\Q$name\E/>;
1044
1045 # nuke player maps
1046 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1047
1032 IO::AIO::aio_rmtree $temp; 1048 IO::AIO::aio_rmtree $temp;
1049}
1050
1051=item $pl->kick
1052
1053Kicks a player out of the game. This destroys the connection.
1054
1055=cut
1056
1057sub kick {
1058 my ($pl, $kicker) = @_;
1059
1060 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1061 $pl->killer ("kicked");
1062 $pl->ns->destroy;
1033} 1063}
1034 1064
1035=item cf::player::list_logins 1065=item cf::player::list_logins
1036 1066
1037Returns am arrayref of all valid playernames in the system, can take a 1067Returns am arrayref of all valid playernames in the system, can take a
… …
1065=cut 1095=cut
1066 1096
1067sub maps($) { 1097sub maps($) {
1068 my ($pl) = @_; 1098 my ($pl) = @_;
1069 1099
1100 $pl = ref $pl ? $pl->ob->name : $pl;
1101
1070 my $files = aio_readdir playerdir $pl 1102 my $files = aio_readdir playerdir $pl
1071 or return; 1103 or return;
1072 1104
1073 my @paths; 1105 my @paths;
1074 1106
1075 for (@$files) { 1107 for (@$files) {
1076 utf8::decode $_; 1108 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1109 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1110 next unless /^$PATH_SEP/o;
1079 1111
1080 s/\.map$//; 1112 push @paths, cf::map::normalise "~$pl/$_";
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 } 1113 }
1083 1114
1084 \@paths 1115 \@paths
1085} 1116}
1086 1117
… …
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1168 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1169 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1170 )
1140} 1171}
1141 1172
1173=item cf::map->register ($regex, $prio)
1174
1175Register a handler for the map path matching the given regex at the
1176givne priority (higher is better, built-in handlers have priority 0, the
1177default).
1178
1179=cut
1180
1142sub register { 1181sub register {
1143 my (undef, $regex) = @_; 1182 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1183 my $pkg = caller;
1145 1184
1146 no strict; 1185 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1186 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1187
1149 $EXT_MAP{$pkg} = qr<$regex>; 1188 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1189}
1151 1190
1152# also paths starting with '/' 1191# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1192$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1193
1155sub thawer_merge { 1194sub thawer_merge {
1156 my ($self, $merge) = @_; 1195 my ($self, $merge) = @_;
1157 1196
1158 # we have to keep some variables in memory intact 1197 # we have to keep some variables in memory intact
… …
1164 $self->SUPER::thawer_merge ($merge); 1203 $self->SUPER::thawer_merge ($merge);
1165} 1204}
1166 1205
1167sub normalise { 1206sub normalise {
1168 my ($path, $base) = @_; 1207 my ($path, $base) = @_;
1208
1209 $path = "$path"; # make sure its a string
1210
1211 $path =~ s/\.map$//;
1169 1212
1170 # map plan: 1213 # map plan:
1171 # 1214 #
1172 # /! non-realised random map exit (special hack!) 1215 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched 1216 # {... are special paths that are not being touched
… …
1201 1244
1202 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1245 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1203 1246
1204 $path = normalise $path, $base; 1247 $path = normalise $path, $base;
1205 1248
1206 for my $pkg (keys %EXT_MAP) { 1249 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1250 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1251 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1252 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1253 $self->init; # pass $1 etc.
1211 return $self; 1254 return $self;
1212 } 1255 }
1213 } 1256 }
1214 1257
1215 Carp::carp "unable to resolve path '$path'."; 1258 Carp::carp "unable to resolve path '$path' (base '$base').";
1216 () 1259 ()
1217} 1260}
1218 1261
1219sub init { 1262sub init {
1220 my ($self) = @_; 1263 my ($self) = @_;
… …
1235 1278
1236# the original (read-only) location 1279# the original (read-only) location
1237sub load_path { 1280sub load_path {
1238 my ($self) = @_; 1281 my ($self) = @_;
1239 1282
1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1283 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1241} 1284}
1242 1285
1243# the temporary/swap location 1286# the temporary/swap location
1244sub save_path { 1287sub save_path {
1245 my ($self) = @_; 1288 my ($self) = @_;
1246 1289
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1290 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1291 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1249} 1292}
1250 1293
1251# the unique path, undef == no special unique path 1294# the unique path, undef == no special unique path
1252sub uniq_path { 1295sub uniq_path {
1253 my ($self) = @_; 1296 my ($self) = @_;
… …
1275 1318
1276sub load_header_from($) { 1319sub load_header_from($) {
1277 my ($self, $path) = @_; 1320 my ($self, $path) = @_;
1278 1321
1279 utf8::encode $path; 1322 utf8::encode $path;
1280 aio_open $path, O_RDONLY, 0 1323 #aio_open $path, O_RDONLY, 0
1281 or return; 1324 # or return;
1282 1325
1283 $self->_load_header ($path) 1326 $self->_load_header ($path)
1284 or return; 1327 or return;
1285 1328
1286 $self->{load_path} = $path; 1329 $self->{load_path} = $path;
1287 1330
1288 1 1331 1
1289} 1332}
1290 1333
1291sub load_orig { 1334sub load_header_orig {
1292 my ($self) = @_; 1335 my ($self) = @_;
1293 1336
1294 $self->load_header_from ($self->load_path) 1337 $self->load_header_from ($self->load_path)
1295} 1338}
1296 1339
1297sub load_temp { 1340sub load_header_temp {
1298 my ($self) = @_; 1341 my ($self) = @_;
1299 1342
1300 $self->load_header_from ($self->save_path) 1343 $self->load_header_from ($self->save_path)
1344}
1345
1346sub prepare_temp {
1347 my ($self) = @_;
1348
1349 $self->last_access ((delete $self->{last_access})
1350 || $cf::RUNTIME); #d#
1351 # safety
1352 $self->{instantiate_time} = $cf::RUNTIME
1353 if $self->{instantiate_time} > $cf::RUNTIME;
1354}
1355
1356sub prepare_orig {
1357 my ($self) = @_;
1358
1359 $self->{load_original} = 1;
1360 $self->{instantiate_time} = $cf::RUNTIME;
1361 $self->last_access ($cf::RUNTIME);
1362 $self->instantiate;
1301} 1363}
1302 1364
1303sub load_header { 1365sub load_header {
1304 my ($self) = @_; 1366 my ($self) = @_;
1305 1367
1306 if ($self->load_temp) { 1368 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1369 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1370 } else {
1313 $self->load_orig 1371 $self->load_header_orig
1314 or return; 1372 or return;
1315 1373 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1374 }
1321 1375
1322 1 1376 1
1323} 1377}
1324 1378
… …
1338 $map->{last_save} = $cf::RUNTIME; 1392 $map->{last_save} = $cf::RUNTIME;
1339 1393
1340 $map->load_header 1394 $map->load_header
1341 or return; 1395 or return;
1342 1396
1343 if ($map->should_reset) { 1397 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1398 # doing this can freeze the server in a sync job, obviously
1344 $cf::WAIT_FOR_TICK->wait; 1399 #$cf::WAIT_FOR_TICK->wait;
1345 $map->reset; 1400 $map->reset;
1346 undef $guard; 1401 undef $guard;
1347 $map = find $path 1402 return find $path;
1348 or return;
1349 } 1403 }
1350 1404
1351 $cf::MAP{$path} = $map 1405 $cf::MAP{$path} = $map
1352 } 1406 }
1353} 1407}
1408
1409sub pre_load { }
1410sub post_load { }
1354 1411
1355sub load { 1412sub load {
1356 my ($self) = @_; 1413 my ($self) = @_;
1357 1414
1415 local $self->{deny_reset} = 1; # loading can take a long time
1416
1358 my $path = $self->{path}; 1417 my $path = $self->{path};
1359 my $guard = cf::lock_acquire "map_load:$path"; 1418 my $guard = cf::lock_acquire "map_load:$path";
1360 1419
1361 return if $self->in_memory != cf::MAP_SWAPPED; 1420 return if $self->in_memory != cf::MAP_SWAPPED;
1362 1421
1363 $self->in_memory (cf::MAP_LOADING); 1422 $self->in_memory (cf::MAP_LOADING);
1364 1423
1365 $self->alloc; 1424 $self->alloc;
1425
1426 $self->pre_load;
1427
1366 $self->_load_objects ($self->{load_path}, 1) 1428 $self->_load_objects ($self->{load_path}, 1)
1367 or return; 1429 or return;
1368 1430
1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1431 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1370 if delete $self->{load_original}; 1432 if delete $self->{load_original};
… …
1392 unless $self->difficulty; 1454 unless $self->difficulty;
1393 Coro::cede; 1455 Coro::cede;
1394 $self->activate; 1456 $self->activate;
1395 } 1457 }
1396 1458
1459 $self->post_load;
1460
1397 $self->in_memory (cf::MAP_IN_MEMORY); 1461 $self->in_memory (cf::MAP_IN_MEMORY);
1398} 1462}
1399 1463
1400sub customise_for { 1464sub customise_for {
1401 my ($self, $ob) = @_; 1465 my ($self, $ob) = @_;
… …
1441 1505
1442 cf::sync_job { $map->load }; 1506 cf::sync_job { $map->load };
1443} 1507}
1444 1508
1445our %MAP_PREFETCH; 1509our %MAP_PREFETCH;
1446our $MAP_PREFETCHER = Coro::async { 1510our $MAP_PREFETCHER = undef;
1447 while () {
1448 for my $path (keys %MAP_PREFETCH) {
1449 my $map = find $path
1450 or next;
1451 $map->load;
1452
1453 delete $MAP_PREFETCH{$path};
1454 }
1455 Coro::schedule;
1456 }
1457};
1458 1511
1459sub find_async { 1512sub find_async {
1460 my ($path, $origin) = @_; 1513 my ($path, $origin) = @_;
1461 1514
1462 $path = normalise $path, $origin && $origin->{path}; 1515 $path = normalise $path, $origin && $origin->{path};
1463 1516
1464 if (my $map = $cf::MAP{$path}) { 1517 if (my $map = $cf::MAP{$path}) {
1465 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1518 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1466 } 1519 }
1467 1520
1468 $MAP_PREFETCH{$path} = 0; 1521 undef $MAP_PREFETCH{$path};
1522 $MAP_PREFETCHER ||= cf::async {
1523 while (%MAP_PREFETCH) {
1524 for my $path (keys %MAP_PREFETCH) {
1525 my $map = find $path
1526 or next;
1527 $map->load;
1528
1529 delete $MAP_PREFETCH{$path};
1530 }
1531 }
1532 undef $MAP_PREFETCHER;
1533 };
1469 $MAP_PREFETCHER->ready; 1534 $MAP_PREFETCHER->prio (6);
1470 1535
1471 () 1536 ()
1472} 1537}
1473 1538
1474sub save { 1539sub save {
… …
1544 return if $self->players; 1609 return if $self->players;
1545 return if $self->isa ("ext::map_per_player");#d# 1610 return if $self->isa ("ext::map_per_player");#d#
1546 1611
1547 warn "resetting map ", $self->path;#d# 1612 warn "resetting map ", $self->path;#d#
1548 1613
1614 $self->in_memory (cf::MAP_SWAPPED);
1615
1616 # need to save uniques path
1617 unless ($self->{deny_save}) {
1618 my $uniq = $self->uniq_path; utf8::encode $uniq;
1619
1620 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1621 if $uniq;
1622 }
1623
1549 delete $cf::MAP{$self->path}; 1624 delete $cf::MAP{$self->path};
1550 1625
1551 $self->in_memory (cf::MAP_SWAPPED);
1552 $self->clear; 1626 $self->clear;
1553 1627
1554 $_->clear_links_to ($self) for values %cf::MAP; 1628 $_->clear_links_to ($self) for values %cf::MAP;
1555 1629
1556 $self->unlink_save; 1630 $self->unlink_save;
… …
1593 for (@$files) { 1667 for (@$files) {
1594 utf8::decode $_; 1668 utf8::decode $_;
1595 next if /\.pst$/; 1669 next if /\.pst$/;
1596 next unless /^$PATH_SEP/o; 1670 next unless /^$PATH_SEP/o;
1597 1671
1598 s/\.map$//; 1672 push @paths, cf::map::normalise $_;
1599 push @paths, $_;
1600 } 1673 }
1601 1674
1602 \@paths 1675 \@paths
1603} 1676}
1604 1677
… …
1698=cut 1771=cut
1699 1772
1700sub link_map { 1773sub link_map {
1701 unless ($LINK_MAP) { 1774 unless ($LINK_MAP) {
1702 $LINK_MAP = cf::map::find "{link}" 1775 $LINK_MAP = cf::map::find "{link}"
1703 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1776 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1704 $LINK_MAP->load; 1777 $LINK_MAP->load;
1705 } 1778 }
1706 1779
1707 $LINK_MAP 1780 $LINK_MAP
1708} 1781}
… …
1715 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1788 return if UNIVERSAL::isa $self->map, "ext::map_link";
1716 1789
1717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1790 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1718 if $self->map; 1791 if $self->map;
1719 1792
1720 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1793 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1721} 1794}
1722 1795
1723sub cf::object::player::leave_link { 1796sub cf::object::player::leave_link {
1724 my ($self, $map, $x, $y) = @_; 1797 my ($self, $map, $x, $y) = @_;
1725 1798
… …
1747 $map->load; 1820 $map->load;
1748 $map->load_diag; 1821 $map->load_diag;
1749 1822
1750 return unless $self->contr->active; 1823 return unless $self->contr->active;
1751 $self->activate_recursive; 1824 $self->activate_recursive;
1825
1826 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1752 $self->enter_map ($map, $x, $y); 1827 $self->enter_map ($map, $x, $y);
1753} 1828}
1754 1829
1755cf::player->attach ( 1830cf::player->attach (
1756 on_logout => sub { 1831 on_logout => sub {
… …
1769 # try to abort aborted map switching on player login :) 1844 # try to abort aborted map switching on player login :)
1770 # should happen only on crashes 1845 # should happen only on crashes
1771 if ($pl->ob->{_link_pos}) { 1846 if ($pl->ob->{_link_pos}) {
1772 $pl->ob->enter_link; 1847 $pl->ob->enter_link;
1773 (async { 1848 (async {
1774 # we need this sleep as the login has a concurrent enter_exit running
1775 # and this sleep increases chances of the player not ending up in scorn
1776 $pl->ob->reply (undef, 1849 $pl->ob->reply (undef,
1777 "There was an internal problem at your last logout, " 1850 "There was an internal problem at your last logout, "
1778 . "the server will try to bring you to your intended destination in a second.", 1851 . "the server will try to bring you to your intended destination in a second.",
1779 cf::NDI_RED); 1852 cf::NDI_RED);
1853 # we need this sleep as the login has a concurrent enter_exit running
1854 # and this sleep increases chances of the player not ending up in scorn
1780 Coro::Timer::sleep 1; 1855 Coro::Timer::sleep 1;
1781 $pl->ob->leave_link; 1856 $pl->ob->leave_link;
1782 })->prio (2); 1857 })->prio (2);
1783 } 1858 }
1784 }, 1859 },
… …
1792 my ($self, $path, $x, $y) = @_; 1867 my ($self, $path, $x, $y) = @_;
1793 1868
1794 $self->enter_link; 1869 $self->enter_link;
1795 1870
1796 (async { 1871 (async {
1872 my $map = eval {
1797 my $map = cf::map::find $path; 1873 my $map = cf::map::find $path;
1798 $map = $map->customise_for ($self) if $map; 1874 $map = $map->customise_for ($self) if $map;
1799 1875 $map
1800# warn "entering ", $map->path, " at ($x, $y)\n" 1876 } or
1801# if $map;
1802
1803 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1877 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1804 1878
1805 $self->leave_link ($map, $x, $y); 1879 $self->leave_link ($map, $x, $y);
1806 })->prio (1); 1880 })->prio (1);
1807} 1881}
1808 1882
… …
1812 1886
1813sub parse_random_map_params { 1887sub parse_random_map_params {
1814 my ($spec) = @_; 1888 my ($spec) = @_;
1815 1889
1816 my $rmp = { # defaults 1890 my $rmp = { # defaults
1817 xsize => -1, 1891 xsize => (cf::rndm 15, 40),
1818 ysize => -1, 1892 ysize => (cf::rndm 15, 40),
1893 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1894 #layout => string,
1819 }; 1895 };
1820 1896
1821 for (split /\n/, $spec) { 1897 for (split /\n/, $spec) {
1822 my ($k, $v) = split /\s+/, $_, 2; 1898 my ($k, $v) = split /\s+/, $_, 2;
1823 1899
… …
1827 $rmp 1903 $rmp
1828} 1904}
1829 1905
1830sub prepare_random_map { 1906sub prepare_random_map {
1831 my ($exit) = @_; 1907 my ($exit) = @_;
1908
1909 my $guard = cf::lock_acquire "exit_prepare:$exit";
1832 1910
1833 # all this does is basically replace the /! path by 1911 # all this does is basically replace the /! path by
1834 # a new random map path (?random/...) with a seed 1912 # a new random map path (?random/...) with a seed
1835 # that depends on the exit object 1913 # that depends on the exit object
1836 1914
1837 my $rmp = parse_random_map_params $exit->msg; 1915 my $rmp = parse_random_map_params $exit->msg;
1838 1916
1839 if ($exit->map) { 1917 if ($exit->map) {
1840 $rmp->{region} = $exit->map->region_name; 1918 $rmp->{region} = $exit->region->name;
1841 $rmp->{origin_map} = $exit->map->path; 1919 $rmp->{origin_map} = $exit->map->path;
1842 $rmp->{origin_x} = $exit->x; 1920 $rmp->{origin_x} = $exit->x;
1843 $rmp->{origin_y} = $exit->y; 1921 $rmp->{origin_y} = $exit->y;
1844 } 1922 }
1845 1923
… …
1862sub cf::object::player::enter_exit { 1940sub cf::object::player::enter_exit {
1863 my ($self, $exit) = @_; 1941 my ($self, $exit) = @_;
1864 1942
1865 return unless $self->type == cf::PLAYER; 1943 return unless $self->type == cf::PLAYER;
1866 1944
1945 if ($exit->slaying eq "/!") {
1946 #TODO: this should de-fi-ni-te-ly not be a sync-job
1947 cf::sync_job { prepare_random_map $exit };
1948 }
1949
1950 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1951 my $hp = $exit->stats->hp;
1952 my $sp = $exit->stats->sp;
1953
1867 $self->enter_link; 1954 $self->enter_link;
1868 1955
1869 (async { 1956 (async {
1870 $self->deactivate_recursive; # just to be sure 1957 $self->deactivate_recursive; # just to be sure
1871 unless (eval { 1958 unless (eval {
1872 prepare_random_map $exit 1959 $self->goto ($slaying, $hp, $sp);
1873 if $exit->slaying eq "/!";
1874
1875 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1876 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1877 1960
1878 1; 1961 1;
1879 }) { 1962 }) {
1880 $self->message ("Something went wrong deep within the crossfire server. " 1963 $self->message ("Something went wrong deep within the crossfire server. "
1881 . "I'll try to bring you back to the map you were before. " 1964 . "I'll try to bring you back to the map you were before. "
… …
1901 1984
1902sub cf::client::send_drawinfo { 1985sub cf::client::send_drawinfo {
1903 my ($self, $text, $flags) = @_; 1986 my ($self, $text, $flags) = @_;
1904 1987
1905 utf8::encode $text; 1988 utf8::encode $text;
1906 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 1989 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1907} 1990}
1908 1991
1909 1992
1910=item $success = $client->query ($flags, "text", \&cb) 1993=item $success = $client->query ($flags, "text", \&cb)
1911 1994
… …
1942 # get handled first 2025 # get handled first
1943 my $queue = delete $ns->{query_queue} 2026 my $queue = delete $ns->{query_queue}
1944 or return; # be conservative, not sure how that can happen, but we saw a crash here 2027 or return; # be conservative, not sure how that can happen, but we saw a crash here
1945 2028
1946 (shift @$queue)->[1]->($msg); 2029 (shift @$queue)->[1]->($msg);
2030 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1947 2031
1948 push @{ $ns->{query_queue} }, @$queue; 2032 push @{ $ns->{query_queue} }, @$queue;
1949 2033
1950 if (@{ $ns->{query_queue} } == @$queue) { 2034 if (@{ $ns->{query_queue} } == @$queue) {
1951 if (@$queue) { 2035 if (@$queue) {
… …
2009 2093
2010# here we export the classes and methods available to script code 2094# here we export the classes and methods available to script code
2011 2095
2012=pod 2096=pod
2013 2097
2014The following fucntions and emthods are available within a safe environment: 2098The following functions and methods are available within a safe environment:
2015 2099
2016 cf::object contr pay_amount pay_player map 2100 cf::object contr pay_amount pay_player map
2017 cf::object::player player 2101 cf::object::player player
2018 cf::player peaceful 2102 cf::player peaceful
2019 cf::map trigger 2103 cf::map trigger
… …
2112The parameter C<$family> should best start with the name of the extension 2196The parameter C<$family> should best start with the name of the extension
2113using it, it should be unique. 2197using it, it should be unique.
2114 2198
2115=over 4 2199=over 4
2116 2200
2117=item $hashref = cf::db_get $family
2118
2119Return a hashref for use by the extension C<$family>, which can be
2120modified. After modifications, you have to call C<cf::db_dirty> or
2121C<cf::db_sync>.
2122
2123=item $value = cf::db_get $family => $key 2201=item $value = cf::db_get $family => $key
2124 2202
2125Returns a single value from the database 2203Returns a single value from the database.
2126
2127=item cf::db_put $family => $hashref
2128
2129Stores the given family hashref into the database. Updates are delayed, if
2130you want the data to be synced to disk immediately, use C<cf::db_sync>.
2131 2204
2132=item cf::db_put $family => $key => $value 2205=item cf::db_put $family => $key => $value
2133 2206
2134Stores the given C<$value> in the family hash. Updates are delayed, if you 2207Stores the given C<$value> in the family.
2135want the data to be synced to disk immediately, use C<cf::db_sync>.
2136
2137=item cf::db_dirty
2138
2139Marks the database as dirty, to be updated at a later time.
2140
2141=item cf::db_sync
2142
2143Immediately write the database to disk I<if it is dirty>.
2144 2208
2145=cut 2209=cut
2146 2210
2147our $DB; 2211our $DB;
2148 2212
2149{ 2213sub db_init {
2214 unless ($DB) {
2215 $DB = BDB::db_create $DB_ENV;
2216
2217 cf::sync_job {
2218 eval {
2219 $DB->set_flags (BDB::CHKSUM);
2220
2221 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2222 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2223 cf::cleanup "db_open(db): $!" if $!;
2224 };
2225 cf::cleanup "db_open(db): $@" if $@;
2226 };
2227
2150 my $path = cf::localdir . "/database.pst"; 2228 my $path = cf::localdir . "/database.pst";
2229 if (stat $path) {
2230 cf::sync_job {
2231 my $pst = Storable::retrieve $path;
2151 2232
2152 sub db_load() { 2233 cf::db_put (board => data => $pst->{board});
2153 $DB = stat $path ? Storable::retrieve $path : { }; 2234 cf::db_put (guildrules => data => $pst->{guildrules});
2154 } 2235 cf::db_put (rent => balance => $pst->{rent}{balance});
2236 BDB::db_env_txn_checkpoint $DB_ENV;
2155 2237
2156 my $pid; 2238 unlink $path;
2157
2158 sub db_save() {
2159 waitpid $pid, 0 if $pid;
2160 if (0 == ($pid = fork)) {
2161 $DB->{_meta}{version} = 1;
2162 Storable::nstore $DB, "$path~";
2163 rename "$path~", $path;
2164 cf::_exit 0 if defined $pid;
2165 } 2239 };
2166 } 2240 }
2167
2168 my $dirty;
2169
2170 sub db_sync() {
2171 db_save if $dirty;
2172 undef $dirty;
2173 }
2174
2175 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2176 db_sync;
2177 }); 2241 }
2242}
2178 2243
2179 sub db_dirty() {
2180 $dirty = 1;
2181 $idle->start;
2182 }
2183
2184 sub db_get($;$) { 2244sub db_get($$) {
2185 @_ >= 2 2245 my $key = "$_[0]/$_[1]";
2186 ? $DB->{$_[0]}{$_[1]}
2187 : ($DB->{$_[0]} ||= { })
2188 }
2189 2246
2247 cf::sync_job {
2248 BDB::db_get $DB, undef, $key, my $data;
2249
2250 $! ? ()
2251 : Compress::LZF::sthaw $data
2252 }
2253}
2254
2190 sub db_put($$;$) { 2255sub db_put($$$) {
2191 if (@_ >= 3) { 2256 BDB::dbreq_pri 4;
2192 $DB->{$_[0]}{$_[1]} = $_[2]; 2257 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2258}
2259
2260#############################################################################
2261# the server's init and main functions
2262
2263sub load_faces {
2264 my $path = sprintf "%s/faces", cf::datadir;
2265
2266 warn "loading faces from $path\n";
2267
2268 my $faces;
2269 0 < aio_load $path, $faces
2270 or die "$path: $!";
2271
2272 Coro::cede;
2273 $faces = Storable::thaw $faces;
2274 Coro::cede;
2275
2276 my $meta = delete $faces->{""};
2277 $meta->{version} == 1
2278 or cf::cleanup "$path: version mismatch, cannot proceed.";
2279
2280 while (my ($face, $info) = each %$faces) {
2281 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2282 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2283 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2284 Coro::cede;
2285 }
2286
2287 while (my ($face, $info) = each %$faces) {
2288 next unless $info->{smooth};
2289 my $idx = cf::face::find $face
2290 or next;
2291 if (my $smooth = cf::face::find $info->{smooth}) {
2292 cf::face::set_smooth $idx, $smooth;
2193 } else { 2293 } else {
2194 $DB->{$_[0]} = $_[1]; 2294 warn "smooth face '$info->{smooth}' not found for face '$face'";
2195 }
2196 db_dirty;
2197 }
2198
2199 cf::global->attach (
2200 prio => 10000,
2201 on_cleanup => sub {
2202 db_sync;
2203 }, 2295 }
2204 ); 2296 Coro::cede;
2205} 2297 }
2206 2298
2207############################################################################# 2299 1
2208# the server's main() 2300}
2301
2302sub reload_resources {
2303 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2304 or die "unable to load regions file\n";#d#
2305 load_faces
2306 or die "unable to load faces\n";#d#
2307}
2308
2309sub init {
2310 reload_resources;
2311}
2209 2312
2210sub cfg_load { 2313sub cfg_load {
2211 open my $fh, "<:utf8", cf::confdir . "/config" 2314 open my $fh, "<:utf8", cf::confdir . "/config"
2212 or return; 2315 or return;
2213 2316
… …
2236 Event::one_event; 2339 Event::one_event;
2237 })->prio (Coro::PRIO_MAX); 2340 })->prio (Coro::PRIO_MAX);
2238 }; 2341 };
2239 2342
2240 cfg_load; 2343 cfg_load;
2241 db_load; 2344 db_init;
2242 load_extensions; 2345 load_extensions;
2346
2347 $TICK_WATCHER->start;
2243 Event::loop; 2348 Event::loop;
2244} 2349}
2245 2350
2246############################################################################# 2351#############################################################################
2247# initialisation and cleanup 2352# initialisation and cleanup
2248 2353
2249# install some emergency cleanup handlers 2354# install some emergency cleanup handlers
2250BEGIN { 2355BEGIN {
2251 for my $signal (qw(INT HUP TERM)) { 2356 for my $signal (qw(INT HUP TERM)) {
2252 Event->signal ( 2357 Event->signal (
2358 reentrant => 0,
2253 data => WF_AUTOCANCEL, 2359 data => WF_AUTOCANCEL,
2254 signal => $signal, 2360 signal => $signal,
2361 prio => 0,
2255 cb => sub { 2362 cb => sub {
2256 cf::cleanup "SIG$signal"; 2363 cf::cleanup "SIG$signal";
2257 }, 2364 },
2258 ); 2365 );
2259 } 2366 }
2260} 2367}
… …
2281 my $map = $cf::MAP{$path} or next; 2388 my $map = $cf::MAP{$path} or next;
2282 $map->valid or next; 2389 $map->valid or next;
2283 $map->save; 2390 $map->save;
2284 } 2391 }
2285 warn "end emergency map save\n"; 2392 warn "end emergency map save\n";
2393
2394 warn "begin emergency database checkpoint\n";
2395 BDB::db_env_txn_checkpoint $DB_ENV;
2396 warn "end emergency database checkpoint\n";
2286 }; 2397 };
2287 2398
2288 warn "leave emergency perl save\n"; 2399 warn "leave emergency perl save\n";
2400}
2401
2402sub post_cleanup {
2403 my ($make_core) = @_;
2404
2405 warn Carp::longmess "post_cleanup backtrace"
2406 if $make_core;
2289} 2407}
2290 2408
2291sub reload() { 2409sub reload() {
2292 # can/must only be called in main 2410 # can/must only be called in main
2293 if ($Coro::current != $Coro::main) { 2411 if ($Coro::current != $Coro::main) {
2294 warn "can only reload from main coroutine\n"; 2412 warn "can only reload from main coroutine";
2295 return; 2413 return;
2296 } 2414 }
2297 2415
2298 warn "reloading..."; 2416 warn "reloading...";
2299 2417
2300 warn "freezing server"; 2418 warn "entering sync_job";
2301 my $guard = freeze_mainloop; 2419
2420 cf::sync_job {
2421 cf::write_runtime; # external watchdog should not bark
2302 cf::emergency_save; 2422 cf::emergency_save;
2423 cf::write_runtime; # external watchdog should not bark
2303 2424
2304 warn "sync database to disk"; 2425 warn "syncing database to disk";
2305 cf::db_sync; 2426 BDB::db_env_txn_checkpoint $DB_ENV;
2306 IO::AIO::flush;
2307 2427
2308 eval {
2309 # if anything goes wrong in here, we should simply crash as we already saved 2428 # if anything goes wrong in here, we should simply crash as we already saved
2310 2429
2311 warn "cancel all watchers"; 2430 warn "cancelling all WF_AUTOCANCEL watchers";
2312 for (Event::all_watchers) { 2431 for (Event::all_watchers) {
2313 $_->cancel if $_->data & WF_AUTOCANCEL; 2432 $_->cancel if $_->data & WF_AUTOCANCEL;
2314 } 2433 }
2315 2434
2435 warn "flushing outstanding aio requests";
2436 for (;;) {
2437 BDB::flush;
2438 IO::AIO::flush;
2439 Coro::cede;
2440 last unless IO::AIO::nreqs || BDB::nreqs;
2441 warn "iterate...";
2442 }
2443
2444 ++$RELOAD;
2445
2316 warn "cancel all extension coros"; 2446 warn "cancelling all extension coros";
2317 $_->cancel for values %EXT_CORO; 2447 $_->cancel for values %EXT_CORO;
2318 %EXT_CORO = (); 2448 %EXT_CORO = ();
2319 2449
2320 warn "remove commands"; 2450 warn "removing commands";
2321 %COMMAND = (); 2451 %COMMAND = ();
2322 2452
2323 warn "remove ext commands"; 2453 warn "removing ext commands";
2324 %EXTCMD = (); 2454 %EXTCMD = ();
2325 2455
2326 warn "unload/nuke all extensions"; 2456 warn "unloading/nuking all extensions";
2327 for my $pkg (@EXTS) { 2457 for my $pkg (@EXTS) {
2328 warn "... unloading $pkg"; 2458 warn "... unloading $pkg";
2329 2459
2330 if (my $cb = $pkg->can ("unload")) { 2460 if (my $cb = $pkg->can ("unload")) {
2331 eval { 2461 eval {
… …
2336 2466
2337 warn "... nuking $pkg"; 2467 warn "... nuking $pkg";
2338 Symbol::delete_package $pkg; 2468 Symbol::delete_package $pkg;
2339 } 2469 }
2340 2470
2341 warn "unload all perl modules loaded from $LIBDIR"; 2471 warn "unloading all perl modules loaded from $LIBDIR";
2342 while (my ($k, $v) = each %INC) { 2472 while (my ($k, $v) = each %INC) {
2343 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2473 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2344 2474
2345 warn "removing <$k>"; 2475 warn "... unloading $k";
2346 delete $INC{$k}; 2476 delete $INC{$k};
2347 2477
2348 $k =~ s/\.pm$//; 2478 $k =~ s/\.pm$//;
2349 $k =~ s/\//::/g; 2479 $k =~ s/\//::/g;
2350 2480
… …
2353 } 2483 }
2354 2484
2355 Symbol::delete_package $k; 2485 Symbol::delete_package $k;
2356 } 2486 }
2357 2487
2358 warn "get rid of safe::, as good as possible"; 2488 warn "getting rid of safe::, as good as possible";
2359 Symbol::delete_package "safe::$_" 2489 Symbol::delete_package "safe::$_"
2360 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2490 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2361 2491
2362 warn "unload cf.pm \"a bit\""; 2492 warn "unloading cf.pm \"a bit\"";
2363 delete $INC{"cf.pm"}; 2493 delete $INC{"cf.pm"};
2364 2494
2365 # don't, removes xs symbols, too, 2495 # don't, removes xs symbols, too,
2366 # and global variables created in xs 2496 # and global variables created in xs
2367 #Symbol::delete_package __PACKAGE__; 2497 #Symbol::delete_package __PACKAGE__;
2368 2498
2499 warn "unload completed, starting to reload now";
2500
2369 warn "reloading cf.pm"; 2501 warn "reloading cf.pm";
2370 require cf; 2502 require cf;
2371 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2503 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2372 2504
2373 warn "load config and database again"; 2505 warn "loading config and database again";
2374 cf::cfg_load; 2506 cf::cfg_load;
2375 cf::db_load;
2376 2507
2377 warn "load extensions"; 2508 warn "loading extensions";
2378 cf::load_extensions; 2509 cf::load_extensions;
2379 2510
2380 warn "reattach attachments to objects/players"; 2511 warn "reattaching attachments to objects/players";
2381 _global_reattach; 2512 _global_reattach; # objects, sockets
2382 warn "reattach attachments to maps"; 2513 warn "reattaching attachments to maps";
2383 reattach $_ for values %MAP; 2514 reattach $_ for values %MAP;
2384 }; 2515 warn "reattaching attachments to players";
2516 reattach $_ for values %PLAYER;
2385 2517
2386 if ($@) { 2518 warn "loading reloadable resources";
2519 reload_resources;
2520
2521 warn "leaving sync_job";
2522
2523 1
2524 } or do {
2387 warn $@; 2525 warn $@;
2388 warn "error while reloading, exiting."; 2526 warn "error while reloading, exiting.";
2389 exit 1; 2527 exit 1;
2390 } 2528 };
2391 2529
2392 warn "reloaded"; 2530 warn "reloaded";
2393}; 2531};
2394 2532
2395our $RELOAD_WATCHER; # used only during reload 2533our $RELOAD_WATCHER; # used only during reload
… …
2401 $who->message ("reloading server."); 2539 $who->message ("reloading server.");
2402 2540
2403 # doing reload synchronously and two reloads happen back-to-back, 2541 # doing reload synchronously and two reloads happen back-to-back,
2404 # coro crashes during coro_state_free->destroy here. 2542 # coro crashes during coro_state_free->destroy here.
2405 2543
2406 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2544 $RELOAD_WATCHER ||= Event->timer (
2545 reentrant => 0,
2546 after => 0,
2547 data => WF_AUTOCANCEL,
2548 cb => sub {
2407 reload; 2549 reload;
2408 undef $RELOAD_WATCHER; 2550 undef $RELOAD_WATCHER;
2551 },
2409 }); 2552 );
2410 } 2553 }
2411}; 2554};
2412 2555
2413unshift @INC, $LIBDIR; 2556unshift @INC, $LIBDIR;
2557
2558my $bug_warning = 0;
2414 2559
2415$TICK_WATCHER = Event->timer ( 2560$TICK_WATCHER = Event->timer (
2416 reentrant => 0, 2561 reentrant => 0,
2562 parked => 1,
2417 prio => 0, 2563 prio => 0,
2418 at => $NEXT_TICK || $TICK, 2564 at => $NEXT_TICK || $TICK,
2419 data => WF_AUTOCANCEL, 2565 data => WF_AUTOCANCEL,
2420 cb => sub { 2566 cb => sub {
2567 if ($Coro::current != $Coro::main) {
2568 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2569 unless ++$bug_warning > 10;
2570 return;
2571 }
2572
2421 $NOW = Event::time; 2573 $NOW = Event::time;
2422 2574
2423 cf::server_tick; # one server iteration 2575 cf::server_tick; # one server iteration
2424 $RUNTIME += $TICK; 2576 $RUNTIME += $TICK;
2425 $NEXT_TICK += $TICK; 2577 $NEXT_TICK += $TICK;
2426 2578
2579 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2580 $NEXT_RUNTIME_WRITE = $NOW + 10;
2581 Coro::async_pool {
2582 write_runtime
2583 or warn "ERROR: unable to write runtime file: $!";
2584 };
2585 }
2586
2427 $WAIT_FOR_TICK->broadcast; 2587 $WAIT_FOR_TICK->broadcast;
2428 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2588 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2589
2590# my $AFTER = Event::time;
2591# warn $AFTER - $NOW;#d#
2429 2592
2430 # if we are delayed by four ticks or more, skip them all 2593 # if we are delayed by four ticks or more, skip them all
2431 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2594 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2432 2595
2433 $TICK_WATCHER->at ($NEXT_TICK); 2596 $TICK_WATCHER->at ($NEXT_TICK);
2434 $TICK_WATCHER->start; 2597 $TICK_WATCHER->start;
2435 }, 2598 },
2436); 2599);
2437 2600
2601{
2602 BDB::max_poll_time $TICK * 0.1;
2603 $BDB_POLL_WATCHER = Event->io (
2604 reentrant => 0,
2605 fd => BDB::poll_fileno,
2606 poll => 'r',
2607 prio => 0,
2608 data => WF_AUTOCANCEL,
2609 cb => \&BDB::poll_cb,
2610 );
2611 BDB::min_parallel 8;
2612
2613 BDB::set_sync_prepare {
2614 my $status;
2615 my $current = $Coro::current;
2616 (
2617 sub {
2618 $status = $!;
2619 $current->ready; undef $current;
2620 },
2621 sub {
2622 Coro::schedule while defined $current;
2623 $! = $status;
2624 },
2625 )
2626 };
2627
2628 unless ($DB_ENV) {
2629 $DB_ENV = BDB::db_env_create;
2630
2631 cf::sync_job {
2632 eval {
2633 BDB::db_env_open
2634 $DB_ENV,
2635 $BDB_ENV_DIR,
2636 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2637 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2638 0666;
2639
2640 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2641
2642 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2643 $DB_ENV->set_lk_detect;
2644 };
2645
2646 cf::cleanup "db_env_open(db): $@" if $@;
2647 };
2648 }
2649}
2650
2651{
2652 IO::AIO::min_parallel 8;
2653
2654 undef $Coro::AIO::WATCHER;
2438IO::AIO::max_poll_time $TICK * 0.2; 2655 IO::AIO::max_poll_time $TICK * 0.1;
2439
2440$AIO_POLL_WATCHER = Event->io ( 2656 $AIO_POLL_WATCHER = Event->io (
2441 fd => IO::AIO::poll_fileno, 2657 reentrant => 0,
2442 poll => 'r',
2443 prio => 5,
2444 data => WF_AUTOCANCEL,
2445 cb => \&IO::AIO::poll_cb,
2446);
2447
2448$WRITE_RUNTIME_WATCHER = Event->timer (
2449 data => WF_AUTOCANCEL, 2658 data => WF_AUTOCANCEL,
2450 after => 0, 2659 fd => IO::AIO::poll_fileno,
2451 interval => 10, 2660 poll => 'r',
2452 cb => sub { 2661 prio => 6,
2453 (Coro::unblock_sub { 2662 cb => \&IO::AIO::poll_cb,
2454 write_runtime 2663 );
2455 or warn "ERROR: unable to write runtime file: $!"; 2664}
2456 })->();
2457 },
2458);
2459 2665
2460END { cf::emergency_save } 2666END { cf::emergency_save }
2461 2667
24621 26681
2463 2669

Diff Legend

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