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.181 by root, Fri Jan 19 15:29:52 2007 UTC vs.
Revision 1.234 by root, Thu Apr 5 13:44:31 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";
… …
944} 963}
945 964
946sub path($) { 965sub path($) {
947 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 966 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
948 967
949 (playerdir $login) . "/$login.pl" 968 (playerdir $login) . "/playerdata"
950} 969}
951 970
952sub find_active($) { 971sub find_active($) {
953 $cf::PLAYER{$_[0]} 972 $cf::PLAYER{$_[0]}
954 and $cf::PLAYER{$_[0]}->active 973 and $cf::PLAYER{$_[0]}->active
… …
967 my $login = $_[0]; 986 my $login = $_[0];
968 987
969 my $guard = cf::lock_acquire "user_find:$login"; 988 my $guard = cf::lock_acquire "user_find:$login";
970 989
971 $cf::PLAYER{$_[0]} || do { 990 $cf::PLAYER{$_[0]} || do {
991 # rename old playerfiles to new ones
992 #TODO: remove when no longer required
993 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
994 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
995 aio_unlink +(playerdir $login) . "/$login.pl.pst";
996 aio_unlink +(playerdir $login) . "/$login.pl";
997
972 my $pl = load_pl path $login 998 my $pl = load_pl path $login
973 or return; 999 or return;
974 $cf::PLAYER{$login} = $pl 1000 $cf::PLAYER{$login} = $pl
975 } 1001 }
976 } 1002 }
… …
1013 1039
1014=cut 1040=cut
1015 1041
1016sub quit_character { 1042sub quit_character {
1017 my ($pl) = @_; 1043 my ($pl) = @_;
1044
1045 my $name = $pl->ob->name;
1018 1046
1019 $pl->{deny_save} = 1; 1047 $pl->{deny_save} = 1;
1020 $pl->password ("*"); # this should lock out the player until we nuked the dir 1048 $pl->password ("*"); # this should lock out the player until we nuked the dir
1021 1049
1022 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1050 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
… …
1027 my $path = playerdir $pl; 1055 my $path = playerdir $pl;
1028 my $temp = "$path~$cf::RUNTIME~deleting~"; 1056 my $temp = "$path~$cf::RUNTIME~deleting~";
1029 aio_rename $path, $temp; 1057 aio_rename $path, $temp;
1030 delete $cf::PLAYER{$pl->ob->name}; 1058 delete $cf::PLAYER{$pl->ob->name};
1031 $pl->destroy; 1059 $pl->destroy;
1060
1061 my $prefix = qr<^~\Q$name\E/>;
1062
1063 # nuke player maps
1064 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1065
1032 IO::AIO::aio_rmtree $temp; 1066 IO::AIO::aio_rmtree $temp;
1067}
1068
1069=item $pl->kick
1070
1071Kicks a player out of the game. This destroys the connection.
1072
1073=cut
1074
1075sub kick {
1076 my ($pl, $kicker) = @_;
1077
1078 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1079 $pl->killer ("kicked");
1080 $pl->ns->destroy;
1033} 1081}
1034 1082
1035=item cf::player::list_logins 1083=item cf::player::list_logins
1036 1084
1037Returns am arrayref of all valid playernames in the system, can take a 1085Returns am arrayref of all valid playernames in the system, can take a
… …
1065=cut 1113=cut
1066 1114
1067sub maps($) { 1115sub maps($) {
1068 my ($pl) = @_; 1116 my ($pl) = @_;
1069 1117
1118 $pl = ref $pl ? $pl->ob->name : $pl;
1119
1070 my $files = aio_readdir playerdir $pl 1120 my $files = aio_readdir playerdir $pl
1071 or return; 1121 or return;
1072 1122
1073 my @paths; 1123 my @paths;
1074 1124
1075 for (@$files) { 1125 for (@$files) {
1076 utf8::decode $_; 1126 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1127 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1128 next unless /^$PATH_SEP/o;
1079 1129
1080 s/\.map$//; 1130 push @paths, cf::map::normalise "~$pl/$_";
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 } 1131 }
1083 1132
1084 \@paths 1133 \@paths
1085} 1134}
1086 1135
1087=item $player->ext_reply ($msgid, $msgtype, %msg) 1136=item $player->ext_reply ($msgid, %msg)
1088 1137
1089Sends an ext reply to the player. 1138Sends an ext reply to the player.
1090 1139
1091=cut 1140=cut
1092 1141
1093sub ext_reply($$$%) { 1142sub ext_reply($$%) {
1094 my ($self, $id, %msg) = @_; 1143 my ($self, $id, %msg) = @_;
1095 1144
1096 $msg{msgid} = $id; 1145 $msg{msgid} = $id;
1097 1146
1098 $self->send ("ext " . cf::to_json \%msg); 1147 $self->send ("ext " . cf::to_json \%msg);
1148}
1149
1150=item $player->ext_event ($type, %msg)
1151
1152Sends an ext event to the client.
1153
1154=cut
1155
1156sub ext_event($$%) {
1157 my ($self, $type, %msg) = @_;
1158
1159 $self->ns->ext_event ($type, %msg);
1099} 1160}
1100 1161
1101package cf; 1162package cf;
1102 1163
1103=back 1164=back
… …
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1198 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1199 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1200 )
1140} 1201}
1141 1202
1203=item cf::map->register ($regex, $prio)
1204
1205Register a handler for the map path matching the given regex at the
1206givne priority (higher is better, built-in handlers have priority 0, the
1207default).
1208
1209=cut
1210
1142sub register { 1211sub register {
1143 my (undef, $regex) = @_; 1212 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1213 my $pkg = caller;
1145 1214
1146 no strict; 1215 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1216 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1217
1149 $EXT_MAP{$pkg} = qr<$regex>; 1218 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1219}
1151 1220
1152# also paths starting with '/' 1221# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1222$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1223
1155sub thawer_merge { 1224sub thawer_merge {
1156 my ($self, $merge) = @_; 1225 my ($self, $merge) = @_;
1157 1226
1158 # we have to keep some variables in memory intact 1227 # we have to keep some variables in memory intact
… …
1164 $self->SUPER::thawer_merge ($merge); 1233 $self->SUPER::thawer_merge ($merge);
1165} 1234}
1166 1235
1167sub normalise { 1236sub normalise {
1168 my ($path, $base) = @_; 1237 my ($path, $base) = @_;
1238
1239 $path = "$path"; # make sure its a string
1240
1241 $path =~ s/\.map$//;
1169 1242
1170 # map plan: 1243 # map plan:
1171 # 1244 #
1172 # /! non-realised random map exit (special hack!) 1245 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched 1246 # {... are special paths that are not being touched
… …
1201 1274
1202 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1275 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1203 1276
1204 $path = normalise $path, $base; 1277 $path = normalise $path, $base;
1205 1278
1206 for my $pkg (keys %EXT_MAP) { 1279 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1280 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1281 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1282 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1283 $self->init; # pass $1 etc.
1211 return $self; 1284 return $self;
1212 } 1285 }
1213 } 1286 }
1214 1287
1215 Carp::carp "unable to resolve path '$path'."; 1288 Carp::carp "unable to resolve path '$path' (base '$base').";
1216 () 1289 ()
1217} 1290}
1218 1291
1219sub init { 1292sub init {
1220 my ($self) = @_; 1293 my ($self) = @_;
… …
1235 1308
1236# the original (read-only) location 1309# the original (read-only) location
1237sub load_path { 1310sub load_path {
1238 my ($self) = @_; 1311 my ($self) = @_;
1239 1312
1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1313 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1241} 1314}
1242 1315
1243# the temporary/swap location 1316# the temporary/swap location
1244sub save_path { 1317sub save_path {
1245 my ($self) = @_; 1318 my ($self) = @_;
1246 1319
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1320 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1321 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1249} 1322}
1250 1323
1251# the unique path, undef == no special unique path 1324# the unique path, undef == no special unique path
1252sub uniq_path { 1325sub uniq_path {
1253 my ($self) = @_; 1326 my ($self) = @_;
… …
1275 1348
1276sub load_header_from($) { 1349sub load_header_from($) {
1277 my ($self, $path) = @_; 1350 my ($self, $path) = @_;
1278 1351
1279 utf8::encode $path; 1352 utf8::encode $path;
1280 aio_open $path, O_RDONLY, 0 1353 #aio_open $path, O_RDONLY, 0
1281 or return; 1354 # or return;
1282 1355
1283 $self->_load_header ($path) 1356 $self->_load_header ($path)
1284 or return; 1357 or return;
1285 1358
1286 $self->{load_path} = $path; 1359 $self->{load_path} = $path;
1287 1360
1288 1 1361 1
1289} 1362}
1290 1363
1291sub load_orig { 1364sub load_header_orig {
1292 my ($self) = @_; 1365 my ($self) = @_;
1293 1366
1294 $self->load_header_from ($self->load_path) 1367 $self->load_header_from ($self->load_path)
1295} 1368}
1296 1369
1297sub load_temp { 1370sub load_header_temp {
1298 my ($self) = @_; 1371 my ($self) = @_;
1299 1372
1300 $self->load_header_from ($self->save_path) 1373 $self->load_header_from ($self->save_path)
1374}
1375
1376sub prepare_temp {
1377 my ($self) = @_;
1378
1379 $self->last_access ((delete $self->{last_access})
1380 || $cf::RUNTIME); #d#
1381 # safety
1382 $self->{instantiate_time} = $cf::RUNTIME
1383 if $self->{instantiate_time} > $cf::RUNTIME;
1384}
1385
1386sub prepare_orig {
1387 my ($self) = @_;
1388
1389 $self->{load_original} = 1;
1390 $self->{instantiate_time} = $cf::RUNTIME;
1391 $self->last_access ($cf::RUNTIME);
1392 $self->instantiate;
1301} 1393}
1302 1394
1303sub load_header { 1395sub load_header {
1304 my ($self) = @_; 1396 my ($self) = @_;
1305 1397
1306 if ($self->load_temp) { 1398 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1399 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1400 } else {
1313 $self->load_orig 1401 $self->load_header_orig
1314 or return; 1402 or return;
1315 1403 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1404 }
1321 1405
1322 1 1406 1
1323} 1407}
1324 1408
… …
1338 $map->{last_save} = $cf::RUNTIME; 1422 $map->{last_save} = $cf::RUNTIME;
1339 1423
1340 $map->load_header 1424 $map->load_header
1341 or return; 1425 or return;
1342 1426
1343 if ($map->should_reset) { 1427 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1428 # doing this can freeze the server in a sync job, obviously
1344 $cf::WAIT_FOR_TICK->wait; 1429 #$cf::WAIT_FOR_TICK->wait;
1345 $map->reset; 1430 $map->reset;
1346 undef $guard; 1431 undef $guard;
1347 $map = find $path 1432 return find $path;
1348 or return;
1349 } 1433 }
1350 1434
1351 $cf::MAP{$path} = $map 1435 $cf::MAP{$path} = $map
1352 } 1436 }
1353} 1437}
1438
1439sub pre_load { }
1440sub post_load { }
1354 1441
1355sub load { 1442sub load {
1356 my ($self) = @_; 1443 my ($self) = @_;
1357 1444
1445 local $self->{deny_reset} = 1; # loading can take a long time
1446
1358 my $path = $self->{path}; 1447 my $path = $self->{path};
1359 my $guard = cf::lock_acquire "map_load:$path"; 1448 my $guard = cf::lock_acquire "map_load:$path";
1360 1449
1361 return if $self->in_memory != cf::MAP_SWAPPED; 1450 return if $self->in_memory != cf::MAP_SWAPPED;
1362 1451
1363 $self->in_memory (cf::MAP_LOADING); 1452 $self->in_memory (cf::MAP_LOADING);
1364 1453
1365 $self->alloc; 1454 $self->alloc;
1455
1456 $self->pre_load;
1457
1366 $self->_load_objects ($self->{load_path}, 1) 1458 $self->_load_objects ($self->{load_path}, 1)
1367 or return; 1459 or return;
1368 1460
1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1461 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1370 if delete $self->{load_original}; 1462 if delete $self->{load_original};
… …
1392 unless $self->difficulty; 1484 unless $self->difficulty;
1393 Coro::cede; 1485 Coro::cede;
1394 $self->activate; 1486 $self->activate;
1395 } 1487 }
1396 1488
1489 $self->post_load;
1490
1397 $self->in_memory (cf::MAP_IN_MEMORY); 1491 $self->in_memory (cf::MAP_IN_MEMORY);
1398} 1492}
1399 1493
1400sub customise_for { 1494sub customise_for {
1401 my ($self, $ob) = @_; 1495 my ($self, $ob) = @_;
… …
1441 1535
1442 cf::sync_job { $map->load }; 1536 cf::sync_job { $map->load };
1443} 1537}
1444 1538
1445our %MAP_PREFETCH; 1539our %MAP_PREFETCH;
1446our $MAP_PREFETCHER = Coro::async { 1540our $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 1541
1459sub find_async { 1542sub find_async {
1460 my ($path, $origin) = @_; 1543 my ($path, $origin) = @_;
1461 1544
1462 $path = normalise $path, $origin && $origin->{path}; 1545 $path = normalise $path, $origin && $origin->{path};
1463 1546
1464 if (my $map = $cf::MAP{$path}) { 1547 if (my $map = $cf::MAP{$path}) {
1465 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1548 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1466 } 1549 }
1467 1550
1468 $MAP_PREFETCH{$path} = 0; 1551 undef $MAP_PREFETCH{$path};
1552 $MAP_PREFETCHER ||= cf::async {
1553 while (%MAP_PREFETCH) {
1554 for my $path (keys %MAP_PREFETCH) {
1555 my $map = find $path
1556 or next;
1557 $map->load;
1558
1559 delete $MAP_PREFETCH{$path};
1560 }
1561 }
1562 undef $MAP_PREFETCHER;
1563 };
1469 $MAP_PREFETCHER->ready; 1564 $MAP_PREFETCHER->prio (6);
1470 1565
1471 () 1566 ()
1472} 1567}
1473 1568
1474sub save { 1569sub save {
… …
1544 return if $self->players; 1639 return if $self->players;
1545 return if $self->isa ("ext::map_per_player");#d# 1640 return if $self->isa ("ext::map_per_player");#d#
1546 1641
1547 warn "resetting map ", $self->path;#d# 1642 warn "resetting map ", $self->path;#d#
1548 1643
1644 $self->in_memory (cf::MAP_SWAPPED);
1645
1646 # need to save uniques path
1647 unless ($self->{deny_save}) {
1648 my $uniq = $self->uniq_path; utf8::encode $uniq;
1649
1650 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1651 if $uniq;
1652 }
1653
1549 delete $cf::MAP{$self->path}; 1654 delete $cf::MAP{$self->path};
1550 1655
1551 $self->in_memory (cf::MAP_SWAPPED);
1552 $self->clear; 1656 $self->clear;
1553 1657
1554 $_->clear_links_to ($self) for values %cf::MAP; 1658 $_->clear_links_to ($self) for values %cf::MAP;
1555 1659
1556 $self->unlink_save; 1660 $self->unlink_save;
… …
1593 for (@$files) { 1697 for (@$files) {
1594 utf8::decode $_; 1698 utf8::decode $_;
1595 next if /\.pst$/; 1699 next if /\.pst$/;
1596 next unless /^$PATH_SEP/o; 1700 next unless /^$PATH_SEP/o;
1597 1701
1598 s/\.map$//; 1702 push @paths, cf::map::normalise $_;
1599 push @paths, $_;
1600 } 1703 }
1601 1704
1602 \@paths 1705 \@paths
1603} 1706}
1604 1707
… …
1698=cut 1801=cut
1699 1802
1700sub link_map { 1803sub link_map {
1701 unless ($LINK_MAP) { 1804 unless ($LINK_MAP) {
1702 $LINK_MAP = cf::map::find "{link}" 1805 $LINK_MAP = cf::map::find "{link}"
1703 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1806 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1704 $LINK_MAP->load; 1807 $LINK_MAP->load;
1705 } 1808 }
1706 1809
1707 $LINK_MAP 1810 $LINK_MAP
1708} 1811}
… …
1715 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1818 return if UNIVERSAL::isa $self->map, "ext::map_link";
1716 1819
1717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1820 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1718 if $self->map; 1821 if $self->map;
1719 1822
1720 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1823 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1721} 1824}
1722 1825
1723sub cf::object::player::leave_link { 1826sub cf::object::player::leave_link {
1724 my ($self, $map, $x, $y) = @_; 1827 my ($self, $map, $x, $y) = @_;
1725 1828
… …
1747 $map->load; 1850 $map->load;
1748 $map->load_diag; 1851 $map->load_diag;
1749 1852
1750 return unless $self->contr->active; 1853 return unless $self->contr->active;
1751 $self->activate_recursive; 1854 $self->activate_recursive;
1855
1856 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1752 $self->enter_map ($map, $x, $y); 1857 $self->enter_map ($map, $x, $y);
1753} 1858}
1754 1859
1755cf::player->attach ( 1860cf::player->attach (
1756 on_logout => sub { 1861 on_logout => sub {
… …
1769 # try to abort aborted map switching on player login :) 1874 # try to abort aborted map switching on player login :)
1770 # should happen only on crashes 1875 # should happen only on crashes
1771 if ($pl->ob->{_link_pos}) { 1876 if ($pl->ob->{_link_pos}) {
1772 $pl->ob->enter_link; 1877 $pl->ob->enter_link;
1773 (async { 1878 (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, 1879 $pl->ob->reply (undef,
1777 "There was an internal problem at your last logout, " 1880 "There was an internal problem at your last logout, "
1778 . "the server will try to bring you to your intended destination in a second.", 1881 . "the server will try to bring you to your intended destination in a second.",
1779 cf::NDI_RED); 1882 cf::NDI_RED);
1883 # we need this sleep as the login has a concurrent enter_exit running
1884 # and this sleep increases chances of the player not ending up in scorn
1780 Coro::Timer::sleep 1; 1885 Coro::Timer::sleep 1;
1781 $pl->ob->leave_link; 1886 $pl->ob->leave_link;
1782 })->prio (2); 1887 })->prio (2);
1783 } 1888 }
1784 }, 1889 },
… …
1792 my ($self, $path, $x, $y) = @_; 1897 my ($self, $path, $x, $y) = @_;
1793 1898
1794 $self->enter_link; 1899 $self->enter_link;
1795 1900
1796 (async { 1901 (async {
1902 my $map = eval {
1797 my $map = cf::map::find $path; 1903 my $map = cf::map::find $path;
1798 $map = $map->customise_for ($self) if $map; 1904 $map = $map->customise_for ($self) if $map;
1799 1905 $map
1800# warn "entering ", $map->path, " at ($x, $y)\n" 1906 } or
1801# if $map;
1802
1803 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1907 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1804 1908
1805 $self->leave_link ($map, $x, $y); 1909 $self->leave_link ($map, $x, $y);
1806 })->prio (1); 1910 })->prio (1);
1807} 1911}
1808 1912
… …
1815 1919
1816 my $rmp = { # defaults 1920 my $rmp = { # defaults
1817 xsize => (cf::rndm 15, 40), 1921 xsize => (cf::rndm 15, 40),
1818 ysize => (cf::rndm 15, 40), 1922 ysize => (cf::rndm 15, 40),
1819 symmetry => (cf::rndm 1, cf::SYMMETRY_XY), 1923 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1820 #layout => string 1924 #layout => string,
1821 }; 1925 };
1822 1926
1823 for (split /\n/, $spec) { 1927 for (split /\n/, $spec) {
1824 my ($k, $v) = split /\s+/, $_, 2; 1928 my ($k, $v) = split /\s+/, $_, 2;
1825 1929
… …
1839 # that depends on the exit object 1943 # that depends on the exit object
1840 1944
1841 my $rmp = parse_random_map_params $exit->msg; 1945 my $rmp = parse_random_map_params $exit->msg;
1842 1946
1843 if ($exit->map) { 1947 if ($exit->map) {
1844 $rmp->{region} = $exit->map->region_name; 1948 $rmp->{region} = $exit->region->name;
1845 $rmp->{origin_map} = $exit->map->path; 1949 $rmp->{origin_map} = $exit->map->path;
1846 $rmp->{origin_x} = $exit->x; 1950 $rmp->{origin_x} = $exit->x;
1847 $rmp->{origin_y} = $exit->y; 1951 $rmp->{origin_y} = $exit->y;
1848 } 1952 }
1849 1953
… …
1866sub cf::object::player::enter_exit { 1970sub cf::object::player::enter_exit {
1867 my ($self, $exit) = @_; 1971 my ($self, $exit) = @_;
1868 1972
1869 return unless $self->type == cf::PLAYER; 1973 return unless $self->type == cf::PLAYER;
1870 1974
1975 if ($exit->slaying eq "/!") {
1976 #TODO: this should de-fi-ni-te-ly not be a sync-job
1977 # the problem is that $exit might not survive long enough
1978 # so it needs to be done right now, right here
1979 cf::sync_job { prepare_random_map $exit };
1980 }
1981
1982 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1983 my $hp = $exit->stats->hp;
1984 my $sp = $exit->stats->sp;
1985
1871 $self->enter_link; 1986 $self->enter_link;
1872 1987
1873 (async { 1988 (async {
1874 $self->deactivate_recursive; # just to be sure 1989 $self->deactivate_recursive; # just to be sure
1875 unless (eval { 1990 unless (eval {
1876 prepare_random_map $exit 1991 $self->goto ($slaying, $hp, $sp);
1877 if $exit->slaying eq "/!";
1878
1879 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1880 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1881 1992
1882 1; 1993 1;
1883 }) { 1994 }) {
1884 $self->message ("Something went wrong deep within the crossfire server. " 1995 $self->message ("Something went wrong deep within the crossfire server. "
1885 . "I'll try to bring you back to the map you were before. " 1996 . "I'll try to bring you back to the map you were before. "
1886 . "Please report this to the dungeon master!", 1997 . "Please report this to the dungeon master!",
1887 cf::NDI_UNIQUE | cf::NDI_RED); 1998 cf::NDI_UNIQUE | cf::NDI_RED);
1888 1999
1889 warn "ERROR in enter_exit: $@"; 2000 warn "ERROR in enter_exit: $@";
1890 $self->leave_link; 2001 $self->leave_link;
1891 } 2002 }
1892 })->prio (1); 2003 })->prio (1);
… …
1905 2016
1906sub cf::client::send_drawinfo { 2017sub cf::client::send_drawinfo {
1907 my ($self, $text, $flags) = @_; 2018 my ($self, $text, $flags) = @_;
1908 2019
1909 utf8::encode $text; 2020 utf8::encode $text;
1910 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2021 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1911} 2022}
1912 2023
2024=item $client->ext_event ($type, %msg)
2025
2026Sends an exti event to the client.
2027
2028=cut
2029
2030sub cf::client::ext_event($$%) {
2031 my ($self, $type, %msg) = @_;
2032
2033 $msg{msgtype} = "event_$type";
2034 $self->send_packet ("ext " . cf::to_json \%msg);
2035}
1913 2036
1914=item $success = $client->query ($flags, "text", \&cb) 2037=item $success = $client->query ($flags, "text", \&cb)
1915 2038
1916Queues a query to the client, calling the given callback with 2039Queues a query to the client, calling the given callback with
1917the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2040the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
… …
1946 # get handled first 2069 # get handled first
1947 my $queue = delete $ns->{query_queue} 2070 my $queue = delete $ns->{query_queue}
1948 or return; # be conservative, not sure how that can happen, but we saw a crash here 2071 or return; # be conservative, not sure how that can happen, but we saw a crash here
1949 2072
1950 (shift @$queue)->[1]->($msg); 2073 (shift @$queue)->[1]->($msg);
2074 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1951 2075
1952 push @{ $ns->{query_queue} }, @$queue; 2076 push @{ $ns->{query_queue} }, @$queue;
1953 2077
1954 if (@{ $ns->{query_queue} } == @$queue) { 2078 if (@{ $ns->{query_queue} } == @$queue) {
1955 if (@$queue) { 2079 if (@$queue) {
… …
2013 2137
2014# here we export the classes and methods available to script code 2138# here we export the classes and methods available to script code
2015 2139
2016=pod 2140=pod
2017 2141
2018The following fucntions and emthods are available within a safe environment: 2142The following functions and methods are available within a safe environment:
2019 2143
2020 cf::object contr pay_amount pay_player map 2144 cf::object contr pay_amount pay_player map
2021 cf::object::player player 2145 cf::object::player player
2022 cf::player peaceful 2146 cf::player peaceful
2023 cf::map trigger 2147 cf::map trigger
… …
2116The parameter C<$family> should best start with the name of the extension 2240The parameter C<$family> should best start with the name of the extension
2117using it, it should be unique. 2241using it, it should be unique.
2118 2242
2119=over 4 2243=over 4
2120 2244
2121=item $hashref = cf::db_get $family
2122
2123Return a hashref for use by the extension C<$family>, which can be
2124modified. After modifications, you have to call C<cf::db_dirty> or
2125C<cf::db_sync>.
2126
2127=item $value = cf::db_get $family => $key 2245=item $value = cf::db_get $family => $key
2128 2246
2129Returns a single value from the database 2247Returns a single value from the database.
2130
2131=item cf::db_put $family => $hashref
2132
2133Stores the given family hashref into the database. Updates are delayed, if
2134you want the data to be synced to disk immediately, use C<cf::db_sync>.
2135 2248
2136=item cf::db_put $family => $key => $value 2249=item cf::db_put $family => $key => $value
2137 2250
2138Stores the given C<$value> in the family hash. Updates are delayed, if you 2251Stores the given C<$value> in the family.
2139want the data to be synced to disk immediately, use C<cf::db_sync>.
2140
2141=item cf::db_dirty
2142
2143Marks the database as dirty, to be updated at a later time.
2144
2145=item cf::db_sync
2146
2147Immediately write the database to disk I<if it is dirty>.
2148 2252
2149=cut 2253=cut
2150 2254
2151our $DB; 2255our $DB;
2152 2256
2153{ 2257sub db_init {
2258 unless ($DB) {
2259 $DB = BDB::db_create $DB_ENV;
2260
2261 cf::sync_job {
2262 eval {
2263 $DB->set_flags (BDB::CHKSUM);
2264
2265 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2266 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2267 cf::cleanup "db_open(db): $!" if $!;
2268 };
2269 cf::cleanup "db_open(db): $@" if $@;
2270 };
2271
2154 my $path = cf::localdir . "/database.pst"; 2272 my $path = cf::localdir . "/database.pst";
2273 if (stat $path) {
2274 cf::sync_job {
2275 my $pst = Storable::retrieve $path;
2155 2276
2156 sub db_load() { 2277 cf::db_put (board => data => $pst->{board});
2157 $DB = stat $path ? Storable::retrieve $path : { }; 2278 cf::db_put (guildrules => data => $pst->{guildrules});
2158 } 2279 cf::db_put (rent => balance => $pst->{rent}{balance});
2280 BDB::db_env_txn_checkpoint $DB_ENV;
2159 2281
2160 my $pid; 2282 unlink $path;
2161
2162 sub db_save() {
2163 waitpid $pid, 0 if $pid;
2164 if (0 == ($pid = fork)) {
2165 $DB->{_meta}{version} = 1;
2166 Storable::nstore $DB, "$path~";
2167 rename "$path~", $path;
2168 cf::_exit 0 if defined $pid;
2169 } 2283 };
2170 } 2284 }
2171
2172 my $dirty;
2173
2174 sub db_sync() {
2175 db_save if $dirty;
2176 undef $dirty;
2177 }
2178
2179 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2180 db_sync;
2181 }); 2285 }
2286}
2182 2287
2183 sub db_dirty() {
2184 $dirty = 1;
2185 $idle->start;
2186 }
2187
2188 sub db_get($;$) { 2288sub db_get($$) {
2189 @_ >= 2 2289 my $key = "$_[0]/$_[1]";
2190 ? $DB->{$_[0]}{$_[1]}
2191 : ($DB->{$_[0]} ||= { })
2192 }
2193 2290
2291 cf::sync_job {
2292 BDB::db_get $DB, undef, $key, my $data;
2293
2294 $! ? ()
2295 : Compress::LZF::sthaw $data
2296 }
2297}
2298
2194 sub db_put($$;$) { 2299sub db_put($$$) {
2195 if (@_ >= 3) { 2300 BDB::dbreq_pri 4;
2196 $DB->{$_[0]}{$_[1]} = $_[2]; 2301 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2302}
2303
2304#############################################################################
2305# the server's init and main functions
2306
2307sub load_facedata {
2308 my $path = sprintf "%s/facedata", cf::datadir;
2309
2310 warn "loading facedata from $path\n";
2311
2312 my $faces;
2313 0 < aio_load $path, $faces
2314 or die "$path: $!";
2315
2316 Coro::cede;
2317 $faces = Storable::thaw $faces;
2318 Coro::cede;
2319
2320 my $meta = delete $faces->{""};
2321 $meta->{version} == 1
2322 or cf::cleanup "$path: version mismatch, cannot proceed.";
2323
2324 while (my ($face, $info) = each %$faces) {
2325 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2326 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2327 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2328 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2329 Coro::cede;
2330 }
2331
2332 while (my ($face, $info) = each %$faces) {
2333 next unless $info->{smooth};
2334 my $idx = cf::face::find $face
2335 or next;
2336 if (my $smooth = cf::face::find $info->{smooth}) {
2337 cf::face::set_smooth $idx, $smooth;
2197 } else { 2338 } else {
2198 $DB->{$_[0]} = $_[1]; 2339 warn "smooth face '$info->{smooth}' not found for face '$face'";
2199 }
2200 db_dirty;
2201 }
2202
2203 cf::global->attach (
2204 prio => 10000,
2205 on_cleanup => sub {
2206 db_sync;
2207 }, 2340 }
2208 ); 2341 Coro::cede;
2209} 2342 }
2210 2343
2211############################################################################# 2344 1
2212# the server's main() 2345}
2346
2347sub reload_resources {
2348 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2349 or die "unable to load regions file\n";#d#
2350 load_facedata
2351 or die "unable to load facedata\n";#d#
2352}
2353
2354sub init {
2355 reload_resources;
2356}
2213 2357
2214sub cfg_load { 2358sub cfg_load {
2215 open my $fh, "<:utf8", cf::confdir . "/config" 2359 open my $fh, "<:utf8", cf::confdir . "/config"
2216 or return; 2360 or return;
2217 2361
… …
2240 Event::one_event; 2384 Event::one_event;
2241 })->prio (Coro::PRIO_MAX); 2385 })->prio (Coro::PRIO_MAX);
2242 }; 2386 };
2243 2387
2244 cfg_load; 2388 cfg_load;
2245 db_load; 2389 db_init;
2246 load_extensions; 2390 load_extensions;
2391
2392 $TICK_WATCHER->start;
2247 Event::loop; 2393 Event::loop;
2248} 2394}
2249 2395
2250############################################################################# 2396#############################################################################
2251# initialisation and cleanup 2397# initialisation and cleanup
2252 2398
2253# install some emergency cleanup handlers 2399# install some emergency cleanup handlers
2254BEGIN { 2400BEGIN {
2255 for my $signal (qw(INT HUP TERM)) { 2401 for my $signal (qw(INT HUP TERM)) {
2256 Event->signal ( 2402 Event->signal (
2403 reentrant => 0,
2257 data => WF_AUTOCANCEL, 2404 data => WF_AUTOCANCEL,
2258 signal => $signal, 2405 signal => $signal,
2406 prio => 0,
2259 cb => sub { 2407 cb => sub {
2260 cf::cleanup "SIG$signal"; 2408 cf::cleanup "SIG$signal";
2261 }, 2409 },
2262 ); 2410 );
2263 } 2411 }
2264} 2412}
… …
2285 my $map = $cf::MAP{$path} or next; 2433 my $map = $cf::MAP{$path} or next;
2286 $map->valid or next; 2434 $map->valid or next;
2287 $map->save; 2435 $map->save;
2288 } 2436 }
2289 warn "end emergency map save\n"; 2437 warn "end emergency map save\n";
2438
2439 warn "begin emergency database checkpoint\n";
2440 BDB::db_env_txn_checkpoint $DB_ENV;
2441 warn "end emergency database checkpoint\n";
2290 }; 2442 };
2291 2443
2292 warn "leave emergency perl save\n"; 2444 warn "leave emergency perl save\n";
2445}
2446
2447sub post_cleanup {
2448 my ($make_core) = @_;
2449
2450 warn Carp::longmess "post_cleanup backtrace"
2451 if $make_core;
2293} 2452}
2294 2453
2295sub reload() { 2454sub reload() {
2296 # can/must only be called in main 2455 # can/must only be called in main
2297 if ($Coro::current != $Coro::main) { 2456 if ($Coro::current != $Coro::main) {
2298 warn "can only reload from main coroutine\n"; 2457 warn "can only reload from main coroutine";
2299 return; 2458 return;
2300 } 2459 }
2301 2460
2302 warn "reloading..."; 2461 warn "reloading...";
2303 2462
2304 warn "freezing server"; 2463 warn "entering sync_job";
2305 my $guard = freeze_mainloop; 2464
2465 cf::sync_job {
2466 cf::write_runtime; # external watchdog should not bark
2306 cf::emergency_save; 2467 cf::emergency_save;
2468 cf::write_runtime; # external watchdog should not bark
2307 2469
2308 warn "sync database to disk"; 2470 warn "syncing database to disk";
2309 cf::db_sync; 2471 BDB::db_env_txn_checkpoint $DB_ENV;
2310 IO::AIO::flush;
2311 2472
2312 eval {
2313 # if anything goes wrong in here, we should simply crash as we already saved 2473 # if anything goes wrong in here, we should simply crash as we already saved
2314 2474
2315 warn "cancel all watchers"; 2475 warn "cancelling all WF_AUTOCANCEL watchers";
2316 for (Event::all_watchers) { 2476 for (Event::all_watchers) {
2317 $_->cancel if $_->data & WF_AUTOCANCEL; 2477 $_->cancel if $_->data & WF_AUTOCANCEL;
2318 } 2478 }
2319 2479
2480 warn "flushing outstanding aio requests";
2481 for (;;) {
2482 BDB::flush;
2483 IO::AIO::flush;
2484 Coro::cede;
2485 last unless IO::AIO::nreqs || BDB::nreqs;
2486 warn "iterate...";
2487 }
2488
2489 ++$RELOAD;
2490
2320 warn "cancel all extension coros"; 2491 warn "cancelling all extension coros";
2321 $_->cancel for values %EXT_CORO; 2492 $_->cancel for values %EXT_CORO;
2322 %EXT_CORO = (); 2493 %EXT_CORO = ();
2323 2494
2324 warn "remove commands"; 2495 warn "removing commands";
2325 %COMMAND = (); 2496 %COMMAND = ();
2326 2497
2327 warn "remove ext commands"; 2498 warn "removing ext commands";
2328 %EXTCMD = (); 2499 %EXTCMD = ();
2329 2500
2330 warn "unload/nuke all extensions"; 2501 warn "unloading/nuking all extensions";
2331 for my $pkg (@EXTS) { 2502 for my $pkg (@EXTS) {
2332 warn "... unloading $pkg"; 2503 warn "... unloading $pkg";
2333 2504
2334 if (my $cb = $pkg->can ("unload")) { 2505 if (my $cb = $pkg->can ("unload")) {
2335 eval { 2506 eval {
… …
2340 2511
2341 warn "... nuking $pkg"; 2512 warn "... nuking $pkg";
2342 Symbol::delete_package $pkg; 2513 Symbol::delete_package $pkg;
2343 } 2514 }
2344 2515
2345 warn "unload all perl modules loaded from $LIBDIR"; 2516 warn "unloading all perl modules loaded from $LIBDIR";
2346 while (my ($k, $v) = each %INC) { 2517 while (my ($k, $v) = each %INC) {
2347 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2518 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2348 2519
2349 warn "removing <$k>"; 2520 warn "... unloading $k";
2350 delete $INC{$k}; 2521 delete $INC{$k};
2351 2522
2352 $k =~ s/\.pm$//; 2523 $k =~ s/\.pm$//;
2353 $k =~ s/\//::/g; 2524 $k =~ s/\//::/g;
2354 2525
… …
2357 } 2528 }
2358 2529
2359 Symbol::delete_package $k; 2530 Symbol::delete_package $k;
2360 } 2531 }
2361 2532
2362 warn "get rid of safe::, as good as possible"; 2533 warn "getting rid of safe::, as good as possible";
2363 Symbol::delete_package "safe::$_" 2534 Symbol::delete_package "safe::$_"
2364 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2535 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2365 2536
2366 warn "unload cf.pm \"a bit\""; 2537 warn "unloading cf.pm \"a bit\"";
2367 delete $INC{"cf.pm"}; 2538 delete $INC{"cf.pm"};
2368 2539
2369 # don't, removes xs symbols, too, 2540 # don't, removes xs symbols, too,
2370 # and global variables created in xs 2541 # and global variables created in xs
2371 #Symbol::delete_package __PACKAGE__; 2542 #Symbol::delete_package __PACKAGE__;
2372 2543
2544 warn "unload completed, starting to reload now";
2545
2373 warn "reloading cf.pm"; 2546 warn "reloading cf.pm";
2374 require cf; 2547 require cf;
2375 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2548 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2376 2549
2377 warn "load config and database again"; 2550 warn "loading config and database again";
2378 cf::cfg_load; 2551 cf::cfg_load;
2379 cf::db_load;
2380 2552
2381 warn "load extensions"; 2553 warn "loading extensions";
2382 cf::load_extensions; 2554 cf::load_extensions;
2383 2555
2384 warn "reattach attachments to objects/players"; 2556 warn "reattaching attachments to objects/players";
2385 _global_reattach; 2557 _global_reattach; # objects, sockets
2386 warn "reattach attachments to maps"; 2558 warn "reattaching attachments to maps";
2387 reattach $_ for values %MAP; 2559 reattach $_ for values %MAP;
2388 }; 2560 warn "reattaching attachments to players";
2561 reattach $_ for values %PLAYER;
2389 2562
2390 if ($@) { 2563 warn "loading reloadable resources";
2564 reload_resources;
2565
2566 warn "leaving sync_job";
2567
2568 1
2569 } or do {
2391 warn $@; 2570 warn $@;
2392 warn "error while reloading, exiting."; 2571 warn "error while reloading, exiting.";
2393 exit 1; 2572 exit 1;
2394 } 2573 };
2395 2574
2396 warn "reloaded"; 2575 warn "reloaded";
2397}; 2576};
2398 2577
2399our $RELOAD_WATCHER; # used only during reload 2578our $RELOAD_WATCHER; # used only during reload
… …
2405 $who->message ("reloading server."); 2584 $who->message ("reloading server.");
2406 2585
2407 # doing reload synchronously and two reloads happen back-to-back, 2586 # doing reload synchronously and two reloads happen back-to-back,
2408 # coro crashes during coro_state_free->destroy here. 2587 # coro crashes during coro_state_free->destroy here.
2409 2588
2410 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2589 $RELOAD_WATCHER ||= Event->timer (
2590 reentrant => 0,
2591 after => 0,
2592 data => WF_AUTOCANCEL,
2593 cb => sub {
2411 reload; 2594 reload;
2412 undef $RELOAD_WATCHER; 2595 undef $RELOAD_WATCHER;
2596 },
2413 }); 2597 );
2414 } 2598 }
2415}; 2599};
2416 2600
2417unshift @INC, $LIBDIR; 2601unshift @INC, $LIBDIR;
2602
2603my $bug_warning = 0;
2418 2604
2419$TICK_WATCHER = Event->timer ( 2605$TICK_WATCHER = Event->timer (
2420 reentrant => 0, 2606 reentrant => 0,
2607 parked => 1,
2421 prio => 0, 2608 prio => 0,
2422 at => $NEXT_TICK || $TICK, 2609 at => $NEXT_TICK || $TICK,
2423 data => WF_AUTOCANCEL, 2610 data => WF_AUTOCANCEL,
2424 cb => sub { 2611 cb => sub {
2612 if ($Coro::current != $Coro::main) {
2613 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2614 unless ++$bug_warning > 10;
2615 return;
2616 }
2617
2425 $NOW = Event::time; 2618 $NOW = Event::time;
2426 2619
2427 cf::server_tick; # one server iteration 2620 cf::server_tick; # one server iteration
2428 $RUNTIME += $TICK; 2621 $RUNTIME += $TICK;
2429 $NEXT_TICK += $TICK; 2622 $NEXT_TICK += $TICK;
2430 2623
2624 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2625 $NEXT_RUNTIME_WRITE = $NOW + 10;
2626 Coro::async_pool {
2627 write_runtime
2628 or warn "ERROR: unable to write runtime file: $!";
2629 };
2630 }
2631
2431 $WAIT_FOR_TICK->broadcast; 2632 $WAIT_FOR_TICK->broadcast;
2432 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2633 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2634
2635# my $AFTER = Event::time;
2636# warn $AFTER - $NOW;#d#
2433 2637
2434 # if we are delayed by four ticks or more, skip them all 2638 # if we are delayed by four ticks or more, skip them all
2435 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2639 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2436 2640
2437 $TICK_WATCHER->at ($NEXT_TICK); 2641 $TICK_WATCHER->at ($NEXT_TICK);
2438 $TICK_WATCHER->start; 2642 $TICK_WATCHER->start;
2439 }, 2643 },
2440); 2644);
2441 2645
2646{
2647 BDB::max_poll_time $TICK * 0.1;
2648 $BDB_POLL_WATCHER = Event->io (
2649 reentrant => 0,
2650 fd => BDB::poll_fileno,
2651 poll => 'r',
2652 prio => 0,
2653 data => WF_AUTOCANCEL,
2654 cb => \&BDB::poll_cb,
2655 );
2656 BDB::min_parallel 8;
2657
2658 BDB::set_sync_prepare {
2659 my $status;
2660 my $current = $Coro::current;
2661 (
2662 sub {
2663 $status = $!;
2664 $current->ready; undef $current;
2665 },
2666 sub {
2667 Coro::schedule while defined $current;
2668 $! = $status;
2669 },
2670 )
2671 };
2672
2673 unless ($DB_ENV) {
2674 $DB_ENV = BDB::db_env_create;
2675
2676 cf::sync_job {
2677 eval {
2678 BDB::db_env_open
2679 $DB_ENV,
2680 $BDB_ENV_DIR,
2681 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2682 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2683 0666;
2684
2685 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2686
2687 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2688 $DB_ENV->set_lk_detect;
2689 };
2690
2691 cf::cleanup "db_env_open(db): $@" if $@;
2692 };
2693 }
2694}
2695
2696{
2697 IO::AIO::min_parallel 8;
2698
2699 undef $Coro::AIO::WATCHER;
2442IO::AIO::max_poll_time $TICK * 0.2; 2700 IO::AIO::max_poll_time $TICK * 0.1;
2443
2444$AIO_POLL_WATCHER = Event->io ( 2701 $AIO_POLL_WATCHER = Event->io (
2445 fd => IO::AIO::poll_fileno, 2702 reentrant => 0,
2446 poll => 'r',
2447 prio => 5,
2448 data => WF_AUTOCANCEL,
2449 cb => \&IO::AIO::poll_cb,
2450);
2451
2452$WRITE_RUNTIME_WATCHER = Event->timer (
2453 data => WF_AUTOCANCEL, 2703 data => WF_AUTOCANCEL,
2454 after => 0, 2704 fd => IO::AIO::poll_fileno,
2455 interval => 10, 2705 poll => 'r',
2456 cb => sub { 2706 prio => 6,
2457 (Coro::unblock_sub { 2707 cb => \&IO::AIO::poll_cb,
2458 write_runtime 2708 );
2459 or warn "ERROR: unable to write runtime file: $!"; 2709}
2460 })->();
2461 },
2462);
2463 2710
2464END { cf::emergency_save } 2711END { cf::emergency_save }
2465 2712
24661 27131
2467 2714

Diff Legend

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