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.183 by root, Fri Jan 19 19:42:37 2007 UTC vs.
Revision 1.233 by root, Wed Apr 4 02:20:27 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Storable; 8use Storable;
9use Event;
9use Opcode; 10use Opcode;
10use Safe; 11use Safe;
11use Safe::Hole; 12use Safe::Hole;
12 13
13use Coro 3.4 (); 14use Coro 3.52 ();
15use Coro::State;
14use Coro::Event; 16use Coro::Event;
15use Coro::Timer; 17use Coro::Timer;
16use Coro::Signal; 18use Coro::Signal;
17use Coro::Semaphore; 19use Coro::Semaphore;
18use Coro::AIO; 20use Coro::AIO;
19 21
22use BDB ();
20use Data::Dumper; 23use Data::Dumper;
21use Digest::MD5; 24use Digest::MD5;
22use Fcntl; 25use Fcntl;
26use YAML::Syck ();
23use IO::AIO 2.32 (); 27use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 28use Time::HiRes;
29use Compress::LZF;
26 30
31# configure various modules to our taste
32#
33Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
34Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 36$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 37
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 38# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 39$YAML::Syck::ImplicitUnicode = 1;
33 40
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 41$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
42
43sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35 44
36our %COMMAND = (); 45our %COMMAND = ();
37our %COMMAND_TIME = (); 46our %COMMAND_TIME = ();
38 47
39our @EXTS = (); # list of extension package names 48our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 49our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 50our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 51our %EXT_MAP = (); # pluggable maps
43 52
53our $RELOAD; # number of reloads so far
44our @EVENT; 54our @EVENT;
45our $LIBDIR = datadir . "/ext"; 55our $LIBDIR = datadir . "/ext";
46 56
47our $TICK = MAX_TIME * 1e-6; 57our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 58our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 59our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 60our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 61our $NEXT_TICK;
52our $NOW; 62our $NOW;
63our $USE_FSYNC = 1; # use fsync to write maps - default off
64
65our $BDB_POLL_WATCHER;
66our $DB_ENV;
53 67
54our %CFG; 68our %CFG;
55 69
56our $UPTIME; $UPTIME ||= time; 70our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 71our $RUNTIME;
58 72
59our %PLAYER; # all users 73our %PLAYER; # all users
60our %MAP; # all maps 74our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 75our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 76our $RANDOM_MAPS = cf::localdir . "/random";
77our $BDB_ENV_DIR = cf::localdir . "/db";
63 78
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 79our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 80our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 81
67# used to convert map paths into valid unix filenames by replacing / by ∕ 82# used to convert map paths into valid unix filenames by replacing / by ∕
… …
80mkdir cf::localdir; 95mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 96mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 97mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 98mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 99mkdir $RANDOM_MAPS;
100mkdir $BDB_ENV_DIR;
85 101
86our $EMERGENCY_POSITION; 102our $EMERGENCY_POSITION;
103
104sub cf::map::normalise;
87 105
88############################################################################# 106#############################################################################
89 107
90=head2 GLOBAL VARIABLES 108=head2 GLOBAL VARIABLES
91 109
… …
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 208 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d 209 $d
192 } || "[unable to dump $_[0]: '$@']"; 210 } || "[unable to dump $_[0]: '$@']";
193} 211}
194 212
195use JSON::Syck (); # TODO# replace by JSON::PC once working 213use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
196 214
197=item $ref = cf::from_json $json 215=item $ref = cf::from_json $json
198 216
199Converts a JSON string into the corresponding perl data structure. 217Converts a JSON string into the corresponding perl data structure.
200 218
201=cut
202
203sub from_json($) {
204 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
205 JSON::Syck::Load $_[0]
206}
207
208=item $json = cf::to_json $ref 219=item $json = cf::to_json $ref
209 220
210Converts a perl data structure into its JSON representation. 221Converts a perl data structure into its JSON representation.
211
212=cut
213
214sub to_json($) {
215 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
216 JSON::Syck::Dump $_[0]
217}
218 222
219=item cf::lock_wait $string 223=item cf::lock_wait $string
220 224
221Wait until the given lock is available. See cf::lock_acquire. 225Wait until the given lock is available. See cf::lock_acquire.
222 226
… …
261sub freeze_mainloop { 265sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 266 return unless $TICK_WATCHER->is_active;
263 267
264 my $guard = Coro::guard { 268 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 269 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 270 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 271 $TICK_WATCHER->stop;
270 $guard 272 $guard
271} 273}
272 274
273=item cf::async { BLOCK } 275=item cf::async { BLOCK }
… …
344 346
345 $coro 347 $coro
346} 348}
347 349
348sub write_runtime { 350sub write_runtime {
351 my $guard = cf::lock_acquire "write_runtime";
352
349 my $runtime = cf::localdir . "/runtime"; 353 my $runtime = cf::localdir . "/runtime";
350 354
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 356 or return;
353 357
358 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 359 # 10 is the runtime save interval, for a monotonic clock
360 # 60 allows for the watchdog to kill the server.
361
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 362 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 363 and return;
357 364
365 # always fsync - this file is important
358 aio_fsync $fh 366 aio_fsync $fh
359 and return; 367 and return;
360 368
361 close $fh 369 close $fh
362 or return; 370 or return;
363 371
364 aio_rename "$runtime~", $runtime 372 aio_rename "$runtime~", $runtime
365 and return; 373 and return;
366 374
367 1 375 1
376}
377
378=item cf::datalog type => key => value, ...
379
380Log a datalog packet of the given type with the given key-value pairs.
381
382=cut
383
384sub datalog($@) {
385 my ($type, %kv) = @_;
386 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
368} 387}
369 388
370=back 389=back
371 390
372=cut 391=cut
… …
747 $filename, length $$rdata, scalar @$objs; 766 $filename, length $$rdata, scalar @$objs;
748 767
749 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 768 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
750 chmod SAVE_MODE, $fh; 769 chmod SAVE_MODE, $fh;
751 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 770 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
752 aio_fsync $fh; 771 aio_fsync $fh if $cf::USE_FSYNC;
753 close $fh; 772 close $fh;
754 773
755 if (@$objs) { 774 if (@$objs) {
756 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 775 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
757 chmod SAVE_MODE, $fh; 776 chmod SAVE_MODE, $fh;
758 my $data = Storable::nfreeze { version => 1, objs => $objs }; 777 my $data = Storable::nfreeze { version => 1, objs => $objs };
759 aio_write $fh, 0, (length $data), $data, 0; 778 aio_write $fh, 0, (length $data), $data, 0;
760 aio_fsync $fh; 779 aio_fsync $fh if $cf::USE_FSYNC;
761 close $fh; 780 close $fh;
762 aio_rename "$filename.pst~", "$filename.pst"; 781 aio_rename "$filename.pst~", "$filename.pst";
763 } 782 }
764 } else { 783 } else {
765 aio_unlink "$filename.pst"; 784 aio_unlink "$filename.pst";
… …
1014=cut 1033=cut
1015 1034
1016sub quit_character { 1035sub quit_character {
1017 my ($pl) = @_; 1036 my ($pl) = @_;
1018 1037
1038 my $name = $pl->ob->name;
1039
1019 $pl->{deny_save} = 1; 1040 $pl->{deny_save} = 1;
1020 $pl->password ("*"); # this should lock out the player until we nuked the dir 1041 $pl->password ("*"); # this should lock out the player until we nuked the dir
1021 1042
1022 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1043 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1023 $pl->deactivate; 1044 $pl->deactivate;
… …
1027 my $path = playerdir $pl; 1048 my $path = playerdir $pl;
1028 my $temp = "$path~$cf::RUNTIME~deleting~"; 1049 my $temp = "$path~$cf::RUNTIME~deleting~";
1029 aio_rename $path, $temp; 1050 aio_rename $path, $temp;
1030 delete $cf::PLAYER{$pl->ob->name}; 1051 delete $cf::PLAYER{$pl->ob->name};
1031 $pl->destroy; 1052 $pl->destroy;
1053
1054 my $prefix = qr<^~\Q$name\E/>;
1055
1056 # nuke player maps
1057 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1058
1032 IO::AIO::aio_rmtree $temp; 1059 IO::AIO::aio_rmtree $temp;
1060}
1061
1062=item $pl->kick
1063
1064Kicks a player out of the game. This destroys the connection.
1065
1066=cut
1067
1068sub kick {
1069 my ($pl, $kicker) = @_;
1070
1071 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1072 $pl->killer ("kicked");
1073 $pl->ns->destroy;
1033} 1074}
1034 1075
1035=item cf::player::list_logins 1076=item cf::player::list_logins
1036 1077
1037Returns am arrayref of all valid playernames in the system, can take a 1078Returns am arrayref of all valid playernames in the system, can take a
… …
1065=cut 1106=cut
1066 1107
1067sub maps($) { 1108sub maps($) {
1068 my ($pl) = @_; 1109 my ($pl) = @_;
1069 1110
1111 $pl = ref $pl ? $pl->ob->name : $pl;
1112
1070 my $files = aio_readdir playerdir $pl 1113 my $files = aio_readdir playerdir $pl
1071 or return; 1114 or return;
1072 1115
1073 my @paths; 1116 my @paths;
1074 1117
1075 for (@$files) { 1118 for (@$files) {
1076 utf8::decode $_; 1119 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1120 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1121 next unless /^$PATH_SEP/o;
1079 1122
1080 s/\.map$//; 1123 push @paths, cf::map::normalise "~$pl/$_";
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 } 1124 }
1083 1125
1084 \@paths 1126 \@paths
1085} 1127}
1086 1128
1087=item $player->ext_reply ($msgid, $msgtype, %msg) 1129=item $player->ext_reply ($msgid, %msg)
1088 1130
1089Sends an ext reply to the player. 1131Sends an ext reply to the player.
1090 1132
1091=cut 1133=cut
1092 1134
1093sub ext_reply($$$%) { 1135sub ext_reply($$%) {
1094 my ($self, $id, %msg) = @_; 1136 my ($self, $id, %msg) = @_;
1095 1137
1096 $msg{msgid} = $id; 1138 $msg{msgid} = $id;
1097 1139
1098 $self->send ("ext " . cf::to_json \%msg); 1140 $self->send ("ext " . cf::to_json \%msg);
1141}
1142
1143=item $player->ext_event ($type, %msg)
1144
1145Sends an ext event to the client.
1146
1147=cut
1148
1149sub ext_event($$%) {
1150 my ($self, $type, %msg) = @_;
1151
1152 $self->ns->ext_event ($type, %msg);
1099} 1153}
1100 1154
1101package cf; 1155package cf;
1102 1156
1103=back 1157=back
… …
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1191 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1192 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1193 )
1140} 1194}
1141 1195
1196=item cf::map->register ($regex, $prio)
1197
1198Register a handler for the map path matching the given regex at the
1199givne priority (higher is better, built-in handlers have priority 0, the
1200default).
1201
1202=cut
1203
1142sub register { 1204sub register {
1143 my (undef, $regex) = @_; 1205 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1206 my $pkg = caller;
1145 1207
1146 no strict; 1208 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1209 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1210
1149 $EXT_MAP{$pkg} = qr<$regex>; 1211 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1212}
1151 1213
1152# also paths starting with '/' 1214# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1215$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1216
1155sub thawer_merge { 1217sub thawer_merge {
1156 my ($self, $merge) = @_; 1218 my ($self, $merge) = @_;
1157 1219
1158 # we have to keep some variables in memory intact 1220 # we have to keep some variables in memory intact
… …
1164 $self->SUPER::thawer_merge ($merge); 1226 $self->SUPER::thawer_merge ($merge);
1165} 1227}
1166 1228
1167sub normalise { 1229sub normalise {
1168 my ($path, $base) = @_; 1230 my ($path, $base) = @_;
1231
1232 $path = "$path"; # make sure its a string
1233
1234 $path =~ s/\.map$//;
1169 1235
1170 # map plan: 1236 # map plan:
1171 # 1237 #
1172 # /! non-realised random map exit (special hack!) 1238 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched 1239 # {... are special paths that are not being touched
… …
1201 1267
1202 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1268 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1203 1269
1204 $path = normalise $path, $base; 1270 $path = normalise $path, $base;
1205 1271
1206 for my $pkg (keys %EXT_MAP) { 1272 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1273 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1274 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1275 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1276 $self->init; # pass $1 etc.
1211 return $self; 1277 return $self;
1212 } 1278 }
1213 } 1279 }
1214 1280
1215 Carp::carp "unable to resolve path '$path'."; 1281 Carp::carp "unable to resolve path '$path' (base '$base').";
1216 () 1282 ()
1217} 1283}
1218 1284
1219sub init { 1285sub init {
1220 my ($self) = @_; 1286 my ($self) = @_;
… …
1235 1301
1236# the original (read-only) location 1302# the original (read-only) location
1237sub load_path { 1303sub load_path {
1238 my ($self) = @_; 1304 my ($self) = @_;
1239 1305
1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1306 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1241} 1307}
1242 1308
1243# the temporary/swap location 1309# the temporary/swap location
1244sub save_path { 1310sub save_path {
1245 my ($self) = @_; 1311 my ($self) = @_;
1246 1312
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1313 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1314 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1249} 1315}
1250 1316
1251# the unique path, undef == no special unique path 1317# the unique path, undef == no special unique path
1252sub uniq_path { 1318sub uniq_path {
1253 my ($self) = @_; 1319 my ($self) = @_;
… …
1275 1341
1276sub load_header_from($) { 1342sub load_header_from($) {
1277 my ($self, $path) = @_; 1343 my ($self, $path) = @_;
1278 1344
1279 utf8::encode $path; 1345 utf8::encode $path;
1280 aio_open $path, O_RDONLY, 0 1346 #aio_open $path, O_RDONLY, 0
1281 or return; 1347 # or return;
1282 1348
1283 $self->_load_header ($path) 1349 $self->_load_header ($path)
1284 or return; 1350 or return;
1285 1351
1286 $self->{load_path} = $path; 1352 $self->{load_path} = $path;
1287 1353
1288 1 1354 1
1289} 1355}
1290 1356
1291sub load_orig { 1357sub load_header_orig {
1292 my ($self) = @_; 1358 my ($self) = @_;
1293 1359
1294 $self->load_header_from ($self->load_path) 1360 $self->load_header_from ($self->load_path)
1295} 1361}
1296 1362
1297sub load_temp { 1363sub load_header_temp {
1298 my ($self) = @_; 1364 my ($self) = @_;
1299 1365
1300 $self->load_header_from ($self->save_path) 1366 $self->load_header_from ($self->save_path)
1367}
1368
1369sub prepare_temp {
1370 my ($self) = @_;
1371
1372 $self->last_access ((delete $self->{last_access})
1373 || $cf::RUNTIME); #d#
1374 # safety
1375 $self->{instantiate_time} = $cf::RUNTIME
1376 if $self->{instantiate_time} > $cf::RUNTIME;
1377}
1378
1379sub prepare_orig {
1380 my ($self) = @_;
1381
1382 $self->{load_original} = 1;
1383 $self->{instantiate_time} = $cf::RUNTIME;
1384 $self->last_access ($cf::RUNTIME);
1385 $self->instantiate;
1301} 1386}
1302 1387
1303sub load_header { 1388sub load_header {
1304 my ($self) = @_; 1389 my ($self) = @_;
1305 1390
1306 if ($self->load_temp) { 1391 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1392 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1393 } else {
1313 $self->load_orig 1394 $self->load_header_orig
1314 or return; 1395 or return;
1315 1396 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1397 }
1321 1398
1322 1 1399 1
1323} 1400}
1324 1401
… …
1338 $map->{last_save} = $cf::RUNTIME; 1415 $map->{last_save} = $cf::RUNTIME;
1339 1416
1340 $map->load_header 1417 $map->load_header
1341 or return; 1418 or return;
1342 1419
1343 if ($map->should_reset) { 1420 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1421 # doing this can freeze the server in a sync job, obviously
1344 $cf::WAIT_FOR_TICK->wait; 1422 #$cf::WAIT_FOR_TICK->wait;
1345 $map->reset; 1423 $map->reset;
1346 undef $guard; 1424 undef $guard;
1347 $map = find $path 1425 return find $path;
1348 or return;
1349 } 1426 }
1350 1427
1351 $cf::MAP{$path} = $map 1428 $cf::MAP{$path} = $map
1352 } 1429 }
1353} 1430}
1431
1432sub pre_load { }
1433sub post_load { }
1354 1434
1355sub load { 1435sub load {
1356 my ($self) = @_; 1436 my ($self) = @_;
1357 1437
1438 local $self->{deny_reset} = 1; # loading can take a long time
1439
1358 my $path = $self->{path}; 1440 my $path = $self->{path};
1359 my $guard = cf::lock_acquire "map_load:$path"; 1441 my $guard = cf::lock_acquire "map_load:$path";
1360 1442
1361 return if $self->in_memory != cf::MAP_SWAPPED; 1443 return if $self->in_memory != cf::MAP_SWAPPED;
1362 1444
1363 $self->in_memory (cf::MAP_LOADING); 1445 $self->in_memory (cf::MAP_LOADING);
1364 1446
1365 $self->alloc; 1447 $self->alloc;
1448
1449 $self->pre_load;
1450
1366 $self->_load_objects ($self->{load_path}, 1) 1451 $self->_load_objects ($self->{load_path}, 1)
1367 or return; 1452 or return;
1368 1453
1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1454 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1370 if delete $self->{load_original}; 1455 if delete $self->{load_original};
… …
1392 unless $self->difficulty; 1477 unless $self->difficulty;
1393 Coro::cede; 1478 Coro::cede;
1394 $self->activate; 1479 $self->activate;
1395 } 1480 }
1396 1481
1482 $self->post_load;
1483
1397 $self->in_memory (cf::MAP_IN_MEMORY); 1484 $self->in_memory (cf::MAP_IN_MEMORY);
1398} 1485}
1399 1486
1400sub customise_for { 1487sub customise_for {
1401 my ($self, $ob) = @_; 1488 my ($self, $ob) = @_;
… …
1456 1543
1457 undef $MAP_PREFETCH{$path}; 1544 undef $MAP_PREFETCH{$path};
1458 $MAP_PREFETCHER ||= cf::async { 1545 $MAP_PREFETCHER ||= cf::async {
1459 while (%MAP_PREFETCH) { 1546 while (%MAP_PREFETCH) {
1460 for my $path (keys %MAP_PREFETCH) { 1547 for my $path (keys %MAP_PREFETCH) {
1461 warn "prefetching $path...\n";#d#
1462 my $map = find $path 1548 my $map = find $path
1463 or next; 1549 or next;
1464 $map->load; 1550 $map->load;
1465 1551
1466 delete $MAP_PREFETCH{$path}; 1552 delete $MAP_PREFETCH{$path};
1467 } 1553 }
1468 } 1554 }
1469 undef $MAP_PREFETCHER; 1555 undef $MAP_PREFETCHER;
1470 }; 1556 };
1557 $MAP_PREFETCHER->prio (6);
1471 1558
1472 () 1559 ()
1473} 1560}
1474 1561
1475sub save { 1562sub save {
… …
1545 return if $self->players; 1632 return if $self->players;
1546 return if $self->isa ("ext::map_per_player");#d# 1633 return if $self->isa ("ext::map_per_player");#d#
1547 1634
1548 warn "resetting map ", $self->path;#d# 1635 warn "resetting map ", $self->path;#d#
1549 1636
1637 $self->in_memory (cf::MAP_SWAPPED);
1638
1639 # need to save uniques path
1640 unless ($self->{deny_save}) {
1641 my $uniq = $self->uniq_path; utf8::encode $uniq;
1642
1643 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1644 if $uniq;
1645 }
1646
1550 delete $cf::MAP{$self->path}; 1647 delete $cf::MAP{$self->path};
1551 1648
1552 $self->in_memory (cf::MAP_SWAPPED);
1553 $self->clear; 1649 $self->clear;
1554 1650
1555 $_->clear_links_to ($self) for values %cf::MAP; 1651 $_->clear_links_to ($self) for values %cf::MAP;
1556 1652
1557 $self->unlink_save; 1653 $self->unlink_save;
… …
1594 for (@$files) { 1690 for (@$files) {
1595 utf8::decode $_; 1691 utf8::decode $_;
1596 next if /\.pst$/; 1692 next if /\.pst$/;
1597 next unless /^$PATH_SEP/o; 1693 next unless /^$PATH_SEP/o;
1598 1694
1599 s/\.map$//; 1695 push @paths, cf::map::normalise $_;
1600 push @paths, $_;
1601 } 1696 }
1602 1697
1603 \@paths 1698 \@paths
1604} 1699}
1605 1700
… …
1699=cut 1794=cut
1700 1795
1701sub link_map { 1796sub link_map {
1702 unless ($LINK_MAP) { 1797 unless ($LINK_MAP) {
1703 $LINK_MAP = cf::map::find "{link}" 1798 $LINK_MAP = cf::map::find "{link}"
1704 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1799 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1705 $LINK_MAP->load; 1800 $LINK_MAP->load;
1706 } 1801 }
1707 1802
1708 $LINK_MAP 1803 $LINK_MAP
1709} 1804}
… …
1716 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1811 return if UNIVERSAL::isa $self->map, "ext::map_link";
1717 1812
1718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1813 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1719 if $self->map; 1814 if $self->map;
1720 1815
1721 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1816 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1722} 1817}
1723 1818
1724sub cf::object::player::leave_link { 1819sub cf::object::player::leave_link {
1725 my ($self, $map, $x, $y) = @_; 1820 my ($self, $map, $x, $y) = @_;
1726 1821
… …
1748 $map->load; 1843 $map->load;
1749 $map->load_diag; 1844 $map->load_diag;
1750 1845
1751 return unless $self->contr->active; 1846 return unless $self->contr->active;
1752 $self->activate_recursive; 1847 $self->activate_recursive;
1848
1849 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1753 $self->enter_map ($map, $x, $y); 1850 $self->enter_map ($map, $x, $y);
1754} 1851}
1755 1852
1756cf::player->attach ( 1853cf::player->attach (
1757 on_logout => sub { 1854 on_logout => sub {
… …
1770 # try to abort aborted map switching on player login :) 1867 # try to abort aborted map switching on player login :)
1771 # should happen only on crashes 1868 # should happen only on crashes
1772 if ($pl->ob->{_link_pos}) { 1869 if ($pl->ob->{_link_pos}) {
1773 $pl->ob->enter_link; 1870 $pl->ob->enter_link;
1774 (async { 1871 (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, 1872 $pl->ob->reply (undef,
1778 "There was an internal problem at your last logout, " 1873 "There was an internal problem at your last logout, "
1779 . "the server will try to bring you to your intended destination in a second.", 1874 . "the server will try to bring you to your intended destination in a second.",
1780 cf::NDI_RED); 1875 cf::NDI_RED);
1876 # we need this sleep as the login has a concurrent enter_exit running
1877 # and this sleep increases chances of the player not ending up in scorn
1781 Coro::Timer::sleep 1; 1878 Coro::Timer::sleep 1;
1782 $pl->ob->leave_link; 1879 $pl->ob->leave_link;
1783 })->prio (2); 1880 })->prio (2);
1784 } 1881 }
1785 }, 1882 },
… …
1793 my ($self, $path, $x, $y) = @_; 1890 my ($self, $path, $x, $y) = @_;
1794 1891
1795 $self->enter_link; 1892 $self->enter_link;
1796 1893
1797 (async { 1894 (async {
1895 my $map = eval {
1798 my $map = cf::map::find $path; 1896 my $map = cf::map::find $path;
1799 $map = $map->customise_for ($self) if $map; 1897 $map = $map->customise_for ($self) if $map;
1800 1898 $map
1801# warn "entering ", $map->path, " at ($x, $y)\n" 1899 } or
1802# if $map;
1803
1804 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1900 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1805 1901
1806 $self->leave_link ($map, $x, $y); 1902 $self->leave_link ($map, $x, $y);
1807 })->prio (1); 1903 })->prio (1);
1808} 1904}
1809 1905
… …
1840 # that depends on the exit object 1936 # that depends on the exit object
1841 1937
1842 my $rmp = parse_random_map_params $exit->msg; 1938 my $rmp = parse_random_map_params $exit->msg;
1843 1939
1844 if ($exit->map) { 1940 if ($exit->map) {
1845 $rmp->{region} = $exit->map->region_name; 1941 $rmp->{region} = $exit->region->name;
1846 $rmp->{origin_map} = $exit->map->path; 1942 $rmp->{origin_map} = $exit->map->path;
1847 $rmp->{origin_x} = $exit->x; 1943 $rmp->{origin_x} = $exit->x;
1848 $rmp->{origin_y} = $exit->y; 1944 $rmp->{origin_y} = $exit->y;
1849 } 1945 }
1850 1946
… …
1867sub cf::object::player::enter_exit { 1963sub cf::object::player::enter_exit {
1868 my ($self, $exit) = @_; 1964 my ($self, $exit) = @_;
1869 1965
1870 return unless $self->type == cf::PLAYER; 1966 return unless $self->type == cf::PLAYER;
1871 1967
1968 if ($exit->slaying eq "/!") {
1969 #TODO: this should de-fi-ni-te-ly not be a sync-job
1970 # the problem is that $exit might not survive long enough
1971 # so it needs to be done right now, right here
1972 cf::sync_job { prepare_random_map $exit };
1973 }
1974
1975 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1976 my $hp = $exit->stats->hp;
1977 my $sp = $exit->stats->sp;
1978
1872 $self->enter_link; 1979 $self->enter_link;
1873 1980
1874 (async { 1981 (async {
1875 $self->deactivate_recursive; # just to be sure 1982 $self->deactivate_recursive; # just to be sure
1876 unless (eval { 1983 unless (eval {
1877 prepare_random_map $exit 1984 $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 1985
1883 1; 1986 1;
1884 }) { 1987 }) {
1885 $self->message ("Something went wrong deep within the crossfire server. " 1988 $self->message ("Something went wrong deep within the crossfire server. "
1886 . "I'll try to bring you back to the map you were before. " 1989 . "I'll try to bring you back to the map you were before. "
1887 . "Please report this to the dungeon master!", 1990 . "Please report this to the dungeon master!",
1888 cf::NDI_UNIQUE | cf::NDI_RED); 1991 cf::NDI_UNIQUE | cf::NDI_RED);
1889 1992
1890 warn "ERROR in enter_exit: $@"; 1993 warn "ERROR in enter_exit: $@";
1891 $self->leave_link; 1994 $self->leave_link;
1892 } 1995 }
1893 })->prio (1); 1996 })->prio (1);
… …
1906 2009
1907sub cf::client::send_drawinfo { 2010sub cf::client::send_drawinfo {
1908 my ($self, $text, $flags) = @_; 2011 my ($self, $text, $flags) = @_;
1909 2012
1910 utf8::encode $text; 2013 utf8::encode $text;
1911 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2014 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1912} 2015}
1913 2016
2017=item $client->ext_event ($type, %msg)
2018
2019Sends an exti event to the client.
2020
2021=cut
2022
2023sub cf::client::ext_event($$%) {
2024 my ($self, $type, %msg) = @_;
2025
2026 $msg{msgtype} = "event_$type";
2027 $self->send_packet ("ext " . cf::to_json \%msg);
2028}
1914 2029
1915=item $success = $client->query ($flags, "text", \&cb) 2030=item $success = $client->query ($flags, "text", \&cb)
1916 2031
1917Queues a query to the client, calling the given callback with 2032Queues a query to the client, calling the given callback with
1918the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2033the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
… …
1947 # get handled first 2062 # get handled first
1948 my $queue = delete $ns->{query_queue} 2063 my $queue = delete $ns->{query_queue}
1949 or return; # be conservative, not sure how that can happen, but we saw a crash here 2064 or return; # be conservative, not sure how that can happen, but we saw a crash here
1950 2065
1951 (shift @$queue)->[1]->($msg); 2066 (shift @$queue)->[1]->($msg);
2067 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1952 2068
1953 push @{ $ns->{query_queue} }, @$queue; 2069 push @{ $ns->{query_queue} }, @$queue;
1954 2070
1955 if (@{ $ns->{query_queue} } == @$queue) { 2071 if (@{ $ns->{query_queue} } == @$queue) {
1956 if (@$queue) { 2072 if (@$queue) {
… …
2014 2130
2015# here we export the classes and methods available to script code 2131# here we export the classes and methods available to script code
2016 2132
2017=pod 2133=pod
2018 2134
2019The following fucntions and emthods are available within a safe environment: 2135The following functions and methods are available within a safe environment:
2020 2136
2021 cf::object contr pay_amount pay_player map 2137 cf::object contr pay_amount pay_player map
2022 cf::object::player player 2138 cf::object::player player
2023 cf::player peaceful 2139 cf::player peaceful
2024 cf::map trigger 2140 cf::map trigger
… …
2117The parameter C<$family> should best start with the name of the extension 2233The parameter C<$family> should best start with the name of the extension
2118using it, it should be unique. 2234using it, it should be unique.
2119 2235
2120=over 4 2236=over 4
2121 2237
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 2238=item $value = cf::db_get $family => $key
2129 2239
2130Returns a single value from the database 2240Returns 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 2241
2137=item cf::db_put $family => $key => $value 2242=item cf::db_put $family => $key => $value
2138 2243
2139Stores the given C<$value> in the family hash. Updates are delayed, if you 2244Stores 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 2245
2150=cut 2246=cut
2151 2247
2152our $DB; 2248our $DB;
2153 2249
2154{ 2250sub db_init {
2251 unless ($DB) {
2252 $DB = BDB::db_create $DB_ENV;
2253
2254 cf::sync_job {
2255 eval {
2256 $DB->set_flags (BDB::CHKSUM);
2257
2258 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2259 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2260 cf::cleanup "db_open(db): $!" if $!;
2261 };
2262 cf::cleanup "db_open(db): $@" if $@;
2263 };
2264
2155 my $path = cf::localdir . "/database.pst"; 2265 my $path = cf::localdir . "/database.pst";
2266 if (stat $path) {
2267 cf::sync_job {
2268 my $pst = Storable::retrieve $path;
2156 2269
2157 sub db_load() { 2270 cf::db_put (board => data => $pst->{board});
2158 $DB = stat $path ? Storable::retrieve $path : { }; 2271 cf::db_put (guildrules => data => $pst->{guildrules});
2159 } 2272 cf::db_put (rent => balance => $pst->{rent}{balance});
2273 BDB::db_env_txn_checkpoint $DB_ENV;
2160 2274
2161 my $pid; 2275 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 } 2276 };
2171 } 2277 }
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 }); 2278 }
2279}
2183 2280
2184 sub db_dirty() {
2185 $dirty = 1;
2186 $idle->start;
2187 }
2188
2189 sub db_get($;$) { 2281sub db_get($$) {
2190 @_ >= 2 2282 my $key = "$_[0]/$_[1]";
2191 ? $DB->{$_[0]}{$_[1]}
2192 : ($DB->{$_[0]} ||= { })
2193 }
2194 2283
2284 cf::sync_job {
2285 BDB::db_get $DB, undef, $key, my $data;
2286
2287 $! ? ()
2288 : Compress::LZF::sthaw $data
2289 }
2290}
2291
2195 sub db_put($$;$) { 2292sub db_put($$$) {
2196 if (@_ >= 3) { 2293 BDB::dbreq_pri 4;
2197 $DB->{$_[0]}{$_[1]} = $_[2]; 2294 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2295}
2296
2297#############################################################################
2298# the server's init and main functions
2299
2300sub load_facedata {
2301 my $path = sprintf "%s/facedata", cf::datadir;
2302
2303 warn "loading facedata from $path\n";
2304
2305 my $faces;
2306 0 < aio_load $path, $faces
2307 or die "$path: $!";
2308
2309 Coro::cede;
2310 $faces = Storable::thaw $faces;
2311 Coro::cede;
2312
2313 my $meta = delete $faces->{""};
2314 $meta->{version} == 1
2315 or cf::cleanup "$path: version mismatch, cannot proceed.";
2316
2317 while (my ($face, $info) = each %$faces) {
2318 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2319 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2320 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2321 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2322 Coro::cede;
2323 }
2324
2325 while (my ($face, $info) = each %$faces) {
2326 next unless $info->{smooth};
2327 my $idx = cf::face::find $face
2328 or next;
2329 if (my $smooth = cf::face::find $info->{smooth}) {
2330 cf::face::set_smooth $idx, $smooth;
2198 } else { 2331 } else {
2199 $DB->{$_[0]} = $_[1]; 2332 warn "smooth face '$info->{smooth}' not found for face '$face'";
2200 }
2201 db_dirty;
2202 }
2203
2204 cf::global->attach (
2205 prio => 10000,
2206 on_cleanup => sub {
2207 db_sync;
2208 }, 2333 }
2209 ); 2334 Coro::cede;
2210} 2335 }
2211 2336
2212############################################################################# 2337 1
2213# the server's main() 2338}
2339
2340sub reload_resources {
2341 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2342 or die "unable to load regions file\n";#d#
2343 load_facedata
2344 or die "unable to load facedata\n";#d#
2345}
2346
2347sub init {
2348 reload_resources;
2349}
2214 2350
2215sub cfg_load { 2351sub cfg_load {
2216 open my $fh, "<:utf8", cf::confdir . "/config" 2352 open my $fh, "<:utf8", cf::confdir . "/config"
2217 or return; 2353 or return;
2218 2354
… …
2241 Event::one_event; 2377 Event::one_event;
2242 })->prio (Coro::PRIO_MAX); 2378 })->prio (Coro::PRIO_MAX);
2243 }; 2379 };
2244 2380
2245 cfg_load; 2381 cfg_load;
2246 db_load; 2382 db_init;
2247 load_extensions; 2383 load_extensions;
2248 2384
2249 $TICK_WATCHER->start; 2385 $TICK_WATCHER->start;
2250 Event::loop; 2386 Event::loop;
2251} 2387}
… …
2255 2391
2256# install some emergency cleanup handlers 2392# install some emergency cleanup handlers
2257BEGIN { 2393BEGIN {
2258 for my $signal (qw(INT HUP TERM)) { 2394 for my $signal (qw(INT HUP TERM)) {
2259 Event->signal ( 2395 Event->signal (
2396 reentrant => 0,
2260 data => WF_AUTOCANCEL, 2397 data => WF_AUTOCANCEL,
2261 signal => $signal, 2398 signal => $signal,
2399 prio => 0,
2262 cb => sub { 2400 cb => sub {
2263 cf::cleanup "SIG$signal"; 2401 cf::cleanup "SIG$signal";
2264 }, 2402 },
2265 ); 2403 );
2266 } 2404 }
2267} 2405}
… …
2288 my $map = $cf::MAP{$path} or next; 2426 my $map = $cf::MAP{$path} or next;
2289 $map->valid or next; 2427 $map->valid or next;
2290 $map->save; 2428 $map->save;
2291 } 2429 }
2292 warn "end emergency map save\n"; 2430 warn "end emergency map save\n";
2431
2432 warn "begin emergency database checkpoint\n";
2433 BDB::db_env_txn_checkpoint $DB_ENV;
2434 warn "end emergency database checkpoint\n";
2293 }; 2435 };
2294 2436
2295 warn "leave emergency perl save\n"; 2437 warn "leave emergency perl save\n";
2438}
2439
2440sub post_cleanup {
2441 my ($make_core) = @_;
2442
2443 warn Carp::longmess "post_cleanup backtrace"
2444 if $make_core;
2296} 2445}
2297 2446
2298sub reload() { 2447sub reload() {
2299 # can/must only be called in main 2448 # can/must only be called in main
2300 if ($Coro::current != $Coro::main) { 2449 if ($Coro::current != $Coro::main) {
… …
2302 return; 2451 return;
2303 } 2452 }
2304 2453
2305 warn "reloading..."; 2454 warn "reloading...";
2306 2455
2307 warn "cancelling server ticker"; 2456 warn "entering sync_job";
2308 $TICK_WATCHER->cancel;
2309 2457
2458 cf::sync_job {
2459 cf::write_runtime; # external watchdog should not bark
2310 cf::emergency_save; 2460 cf::emergency_save;
2461 cf::write_runtime; # external watchdog should not bark
2311 2462
2312 eval { 2463 warn "syncing database to disk";
2464 BDB::db_env_txn_checkpoint $DB_ENV;
2465
2313 # if anything goes wrong in here, we should simply crash as we already saved 2466 # 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 2467
2318 warn "cancelling all WF_AUTOCANCEL watchers"; 2468 warn "cancelling all WF_AUTOCANCEL watchers";
2319 for (Event::all_watchers) { 2469 for (Event::all_watchers) {
2320 $_->cancel if $_->data & WF_AUTOCANCEL; 2470 $_->cancel if $_->data & WF_AUTOCANCEL;
2321 } 2471 }
2322 2472
2323 warn "flushing outstanding aio requests"; 2473 warn "flushing outstanding aio requests";
2324 for (;;) { 2474 for (;;) {
2475 BDB::flush;
2325 IO::AIO::flush; 2476 IO::AIO::flush;
2326 Coro::cede; 2477 Coro::cede;
2327 last unless IO::AIO::nreqs; 2478 last unless IO::AIO::nreqs || BDB::nreqs;
2328 warn "iterate..."; 2479 warn "iterate...";
2329 } 2480 }
2481
2482 ++$RELOAD;
2330 2483
2331 warn "cancelling all extension coros"; 2484 warn "cancelling all extension coros";
2332 $_->cancel for values %EXT_CORO; 2485 $_->cancel for values %EXT_CORO;
2333 %EXT_CORO = (); 2486 %EXT_CORO = ();
2334 2487
… …
2387 require cf; 2540 require cf;
2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2541 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2389 2542
2390 warn "loading config and database again"; 2543 warn "loading config and database again";
2391 cf::cfg_load; 2544 cf::cfg_load;
2392 cf::db_load;
2393 2545
2394 warn "loading extensions"; 2546 warn "loading extensions";
2395 cf::load_extensions; 2547 cf::load_extensions;
2396 2548
2397 warn "reattaching attachments to objects/players"; 2549 warn "reattaching attachments to objects/players";
2398 _global_reattach; 2550 _global_reattach; # objects, sockets
2399 warn "reattaching attachments to maps"; 2551 warn "reattaching attachments to maps";
2400 reattach $_ for values %MAP; 2552 reattach $_ for values %MAP;
2553 warn "reattaching attachments to players";
2554 reattach $_ for values %PLAYER;
2401 2555
2402 warn "restarting server ticker"; 2556 warn "loading reloadable resources";
2557 reload_resources;
2403 2558
2404 $TICK_WATCHER->start; 2559 warn "leaving sync_job";
2405 };
2406 2560
2407 if ($@) { 2561 1
2562 } or do {
2408 warn $@; 2563 warn $@;
2409 warn "error while reloading, exiting."; 2564 warn "error while reloading, exiting.";
2410 exit 1; 2565 exit 1;
2411 } 2566 };
2412 2567
2413 warn "reloaded"; 2568 warn "reloaded";
2414}; 2569};
2415 2570
2416our $RELOAD_WATCHER; # used only during reload 2571our $RELOAD_WATCHER; # used only during reload
… …
2422 $who->message ("reloading server."); 2577 $who->message ("reloading server.");
2423 2578
2424 # doing reload synchronously and two reloads happen back-to-back, 2579 # doing reload synchronously and two reloads happen back-to-back,
2425 # coro crashes during coro_state_free->destroy here. 2580 # coro crashes during coro_state_free->destroy here.
2426 2581
2427 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2582 $RELOAD_WATCHER ||= Event->timer (
2583 reentrant => 0,
2584 after => 0,
2585 data => WF_AUTOCANCEL,
2586 cb => sub {
2428 reload; 2587 reload;
2429 undef $RELOAD_WATCHER; 2588 undef $RELOAD_WATCHER;
2589 },
2430 }); 2590 );
2431 } 2591 }
2432}; 2592};
2433 2593
2434unshift @INC, $LIBDIR; 2594unshift @INC, $LIBDIR;
2435 2595
… …
2452 2612
2453 cf::server_tick; # one server iteration 2613 cf::server_tick; # one server iteration
2454 $RUNTIME += $TICK; 2614 $RUNTIME += $TICK;
2455 $NEXT_TICK += $TICK; 2615 $NEXT_TICK += $TICK;
2456 2616
2617 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2618 $NEXT_RUNTIME_WRITE = $NOW + 10;
2619 Coro::async_pool {
2620 write_runtime
2621 or warn "ERROR: unable to write runtime file: $!";
2622 };
2623 }
2624
2457 $WAIT_FOR_TICK->broadcast; 2625 $WAIT_FOR_TICK->broadcast;
2458 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2626 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2627
2628# my $AFTER = Event::time;
2629# warn $AFTER - $NOW;#d#
2459 2630
2460 # if we are delayed by four ticks or more, skip them all 2631 # if we are delayed by four ticks or more, skip them all
2461 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2632 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2462 2633
2463 $TICK_WATCHER->at ($NEXT_TICK); 2634 $TICK_WATCHER->at ($NEXT_TICK);
2464 $TICK_WATCHER->start; 2635 $TICK_WATCHER->start;
2465 }, 2636 },
2466); 2637);
2467 2638
2639{
2640 BDB::max_poll_time $TICK * 0.1;
2641 $BDB_POLL_WATCHER = Event->io (
2642 reentrant => 0,
2643 fd => BDB::poll_fileno,
2644 poll => 'r',
2645 prio => 0,
2646 data => WF_AUTOCANCEL,
2647 cb => \&BDB::poll_cb,
2648 );
2649 BDB::min_parallel 8;
2650
2651 BDB::set_sync_prepare {
2652 my $status;
2653 my $current = $Coro::current;
2654 (
2655 sub {
2656 $status = $!;
2657 $current->ready; undef $current;
2658 },
2659 sub {
2660 Coro::schedule while defined $current;
2661 $! = $status;
2662 },
2663 )
2664 };
2665
2666 unless ($DB_ENV) {
2667 $DB_ENV = BDB::db_env_create;
2668
2669 cf::sync_job {
2670 eval {
2671 BDB::db_env_open
2672 $DB_ENV,
2673 $BDB_ENV_DIR,
2674 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2675 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2676 0666;
2677
2678 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2679
2680 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2681 $DB_ENV->set_lk_detect;
2682 };
2683
2684 cf::cleanup "db_env_open(db): $@" if $@;
2685 };
2686 }
2687}
2688
2689{
2690 IO::AIO::min_parallel 8;
2691
2692 undef $Coro::AIO::WATCHER;
2468IO::AIO::max_poll_time $TICK * 0.2; 2693 IO::AIO::max_poll_time $TICK * 0.1;
2469
2470$AIO_POLL_WATCHER = Event->io ( 2694 $AIO_POLL_WATCHER = Event->io (
2471 fd => IO::AIO::poll_fileno, 2695 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, 2696 data => WF_AUTOCANCEL,
2480 after => 1, 2697 fd => IO::AIO::poll_fileno,
2481 interval => 10, 2698 poll => 'r',
2482 cb => Coro::unblock_sub { 2699 prio => 6,
2483 write_runtime 2700 cb => \&IO::AIO::poll_cb,
2484 or warn "ERROR: unable to write runtime file: $!"; 2701 );
2485 }, 2702}
2486);
2487 2703
2488END { cf::emergency_save } 2704END { cf::emergency_save }
2489 2705
24901 27061
2491 2707

Diff Legend

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