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.166 by root, Sat Jan 13 23:06:13 2007 UTC vs.
Revision 1.227 by root, Fri Mar 23 18:32:48 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.3 (); 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;
59our $AIO_POLL_WATCHER;
60our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
49our $NEXT_TICK; 61our $NEXT_TICK;
50our $NOW; 62our $NOW;
63our $USE_FSYNC = 1; # use fsync to write maps - default off
64
65our $BDB_POLL_WATCHER;
66our $DB_ENV;
51 67
52our %CFG; 68our %CFG;
53 69
54our $UPTIME; $UPTIME ||= time; 70our $UPTIME; $UPTIME ||= time;
55our $RUNTIME; 71our $RUNTIME;
56 72
57our %PLAYER; # all users 73our %PLAYER; # all users
58our %MAP; # all maps 74our %MAP; # all maps
59our $LINK_MAP; # the special {link} map, which is always available 75our $LINK_MAP; # the special {link} map, which is always available
60our $RANDOM_MAPS = cf::localdir . "/random"; 76our $RANDOM_MAPS = cf::localdir . "/random";
77our $BDB_ENV_DIR = cf::localdir . "/db";
61 78
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 79our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 80our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
64 81
65# 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 ∕
… …
78mkdir cf::localdir; 95mkdir cf::localdir;
79mkdir cf::localdir . "/" . cf::playerdir; 96mkdir cf::localdir . "/" . cf::playerdir;
80mkdir cf::localdir . "/" . cf::tmpdir; 97mkdir cf::localdir . "/" . cf::tmpdir;
81mkdir cf::localdir . "/" . cf::uniquedir; 98mkdir cf::localdir . "/" . cf::uniquedir;
82mkdir $RANDOM_MAPS; 99mkdir $RANDOM_MAPS;
100mkdir $BDB_ENV_DIR;
83 101
84our $EMERGENCY_POSITION; 102our $EMERGENCY_POSITION;
103
104sub cf::map::normalise;
85 105
86############################################################################# 106#############################################################################
87 107
88=head2 GLOBAL VARIABLES 108=head2 GLOBAL VARIABLES
89 109
… …
188 $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;
189 $d 209 $d
190 } || "[unable to dump $_[0]: '$@']"; 210 } || "[unable to dump $_[0]: '$@']";
191} 211}
192 212
193use JSON::Syck (); # TODO# replace by JSON::PC once working 213use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
194 214
195=item $ref = cf::from_json $json 215=item $ref = cf::from_json $json
196 216
197Converts a JSON string into the corresponding perl data structure. 217Converts a JSON string into the corresponding perl data structure.
198 218
199=cut
200
201sub from_json($) {
202 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
203 JSON::Syck::Load $_[0]
204}
205
206=item $json = cf::to_json $ref 219=item $json = cf::to_json $ref
207 220
208Converts a perl data structure into its JSON representation. 221Converts a perl data structure into its JSON representation.
209
210=cut
211
212sub to_json($) {
213 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
214 JSON::Syck::Dump $_[0]
215}
216 222
217=item cf::lock_wait $string 223=item cf::lock_wait $string
218 224
219Wait until the given lock is available. See cf::lock_acquire. 225Wait until the given lock is available. See cf::lock_acquire.
220 226
… …
257} 263}
258 264
259sub freeze_mainloop { 265sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active; 266 return unless $TICK_WATCHER->is_active;
261 267
262 my $guard = Coro::guard { $TICK_WATCHER->start }; 268 my $guard = Coro::guard {
269 $TICK_WATCHER->start;
270 };
263 $TICK_WATCHER->stop; 271 $TICK_WATCHER->stop;
264 $guard 272 $guard
265} 273}
266 274
267=item cf::async { BLOCK } 275=item cf::async { BLOCK }
… …
338 346
339 $coro 347 $coro
340} 348}
341 349
342sub write_runtime { 350sub write_runtime {
343 return unless $TICK_WATCHER->is_active; 351 my $guard = cf::lock_acquire "write_runtime";
344 352
345 my $runtime = cf::localdir . "/runtime"; 353 my $runtime = cf::localdir . "/runtime";
346 354
347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
348 or return; 356 or return;
349 357
358 my $value = $cf::RUNTIME + 90 + 10;
350 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
351 (aio_write $fh, 0, (length $value), $value, 0) <= 0 362 (aio_write $fh, 0, (length $value), $value, 0) <= 0
352 and return; 363 and return;
353 364
365 # always fsync - this file is important
354 aio_fsync $fh 366 aio_fsync $fh
355 and return; 367 and return;
356 368
357 close $fh 369 close $fh
358 or return; 370 or return;
… …
499our @CB_TYPE = (); # registry for type (cf-object class) based events 511our @CB_TYPE = (); # registry for type (cf-object class) based events
500our @CB_MAP = (); 512our @CB_MAP = ();
501 513
502my %attachment; 514my %attachment;
503 515
516sub cf::attachable::thawer_merge {
517 # simply override everything except _meta
518 local $_[0]{_meta};
519 %{$_[0]} = %{$_[1]};
520}
521
504sub _attach_cb($$$$) { 522sub _attach_cb($$$$) {
505 my ($registry, $event, $prio, $cb) = @_; 523 my ($registry, $event, $prio, $cb) = @_;
506 524
507 use sort 'stable'; 525 use sort 'stable';
508 526
… …
679# object support 697# object support
680 698
681sub reattach { 699sub reattach {
682 # basically do the same as instantiate, without calling instantiate 700 # basically do the same as instantiate, without calling instantiate
683 my ($obj) = @_; 701 my ($obj) = @_;
702
703 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
684 704
685 my $registry = $obj->registry; 705 my $registry = $obj->registry;
686 706
687 @$registry = (); 707 @$registry = ();
688 708
… …
735 $filename, length $$rdata, scalar @$objs; 755 $filename, length $$rdata, scalar @$objs;
736 756
737 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 757 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
738 chmod SAVE_MODE, $fh; 758 chmod SAVE_MODE, $fh;
739 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 759 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
740 aio_fsync $fh; 760 aio_fsync $fh if $cf::USE_FSYNC;
741 close $fh; 761 close $fh;
742 762
743 if (@$objs) { 763 if (@$objs) {
744 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 764 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
745 chmod SAVE_MODE, $fh; 765 chmod SAVE_MODE, $fh;
746 my $data = Storable::nfreeze { version => 1, objs => $objs }; 766 my $data = Storable::nfreeze { version => 1, objs => $objs };
747 aio_write $fh, 0, (length $data), $data, 0; 767 aio_write $fh, 0, (length $data), $data, 0;
748 aio_fsync $fh; 768 aio_fsync $fh if $cf::USE_FSYNC;
749 close $fh; 769 close $fh;
750 aio_rename "$filename.pst~", "$filename.pst"; 770 aio_rename "$filename.pst~", "$filename.pst";
751 } 771 }
752 } else { 772 } else {
753 aio_unlink "$filename.pst"; 773 aio_unlink "$filename.pst";
… …
900 } or warn "$ext not loaded: $@"; 920 } or warn "$ext not loaded: $@";
901 } 921 }
902} 922}
903 923
904############################################################################# 924#############################################################################
905# load/save/clean perl data associated with a map
906
907*cf::mapsupport::on_clean = sub {
908 my ($map) = @_;
909
910 my $path = $map->tmpname;
911 defined $path or return;
912
913 unlink "$path.pst";
914};
915
916cf::map->attach (prio => -10000, package => cf::mapsupport::);
917
918#############################################################################
919 925
920=head2 CORE EXTENSIONS 926=head2 CORE EXTENSIONS
921 927
922Functions and methods that extend core crossfire objects. 928Functions and methods that extend core crossfire objects.
923 929
… …
959 965
960sub exists($) { 966sub exists($) {
961 my ($login) = @_; 967 my ($login) = @_;
962 968
963 $cf::PLAYER{$login} 969 $cf::PLAYER{$login}
964 or cf::sync_job { !aio_stat $login } 970 or cf::sync_job { !aio_stat path $login }
965} 971}
966 972
967sub find($) { 973sub find($) {
968 return $cf::PLAYER{$_[0]} || do { 974 return $cf::PLAYER{$_[0]} || do {
969 my $login = $_[0]; 975 my $login = $_[0];
… …
1015 1021
1016=cut 1022=cut
1017 1023
1018sub quit_character { 1024sub quit_character {
1019 my ($pl) = @_; 1025 my ($pl) = @_;
1026
1027 my $name = $pl->ob->name;
1020 1028
1021 $pl->{deny_save} = 1; 1029 $pl->{deny_save} = 1;
1022 $pl->password ("*"); # this should lock out the player until we nuked the dir 1030 $pl->password ("*"); # this should lock out the player until we nuked the dir
1023 1031
1024 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1032 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
… …
1029 my $path = playerdir $pl; 1037 my $path = playerdir $pl;
1030 my $temp = "$path~$cf::RUNTIME~deleting~"; 1038 my $temp = "$path~$cf::RUNTIME~deleting~";
1031 aio_rename $path, $temp; 1039 aio_rename $path, $temp;
1032 delete $cf::PLAYER{$pl->ob->name}; 1040 delete $cf::PLAYER{$pl->ob->name};
1033 $pl->destroy; 1041 $pl->destroy;
1042
1043 my $prefix = qr<^~\Q$name\E/>;
1044
1045 # nuke player maps
1046 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1047
1034 IO::AIO::aio_rmtree $temp; 1048 IO::AIO::aio_rmtree $temp;
1049}
1050
1051=item $pl->kick
1052
1053Kicks a player out of the game. This destroys the connection.
1054
1055=cut
1056
1057sub kick {
1058 my ($pl, $kicker) = @_;
1059
1060 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1061 $pl->killer ("kicked");
1062 $pl->ns->destroy;
1035} 1063}
1036 1064
1037=item cf::player::list_logins 1065=item cf::player::list_logins
1038 1066
1039Returns am arrayref of all valid playernames in the system, can take a 1067Returns am arrayref of all valid playernames in the system, can take a
… …
1067=cut 1095=cut
1068 1096
1069sub maps($) { 1097sub maps($) {
1070 my ($pl) = @_; 1098 my ($pl) = @_;
1071 1099
1100 $pl = ref $pl ? $pl->ob->name : $pl;
1101
1072 my $files = aio_readdir playerdir $pl 1102 my $files = aio_readdir playerdir $pl
1073 or return; 1103 or return;
1074 1104
1075 my @paths; 1105 my @paths;
1076 1106
1077 for (@$files) { 1107 for (@$files) {
1078 utf8::decode $_; 1108 utf8::decode $_;
1079 next if /\.(?:pl|pst)$/; 1109 next if /\.(?:pl|pst)$/;
1080 next unless /^$PATH_SEP/o; 1110 next unless /^$PATH_SEP/o;
1081 1111
1082 push @paths, "~" . $pl->ob->name . "/" . $_; 1112 push @paths, cf::map::normalise "~$pl/$_";
1083 } 1113 }
1084 1114
1085 \@paths 1115 \@paths
1086} 1116}
1087 1117
… …
1114 1144
1115use Fcntl; 1145use Fcntl;
1116use Coro::AIO; 1146use Coro::AIO;
1117 1147
1118use overload 1148use overload
1119 '""' => \&as_string; 1149 '""' => \&as_string,
1150 fallback => 1;
1120 1151
1121our $MAX_RESET = 3600; 1152our $MAX_RESET = 3600;
1122our $DEFAULT_RESET = 3000; 1153our $DEFAULT_RESET = 3000;
1123 1154
1124sub generate_random_map { 1155sub generate_random_map {
1125 my ($self, $rmp) = @_; 1156 my ($self, $rmp) = @_;
1126
1127 # mit "rum" bekleckern, nicht 1157 # mit "rum" bekleckern, nicht
1128 $self->_create_random_map ( 1158 $self->_create_random_map (
1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1159 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1160 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1161 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1168 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1139 (cf::region::find $rmp->{region}), $rmp->{custom} 1169 (cf::region::find $rmp->{region}), $rmp->{custom}
1140 ) 1170 )
1141} 1171}
1142 1172
1173=item cf::map->register ($regex, $prio)
1174
1175Register a handler for the map path matching the given regex at the
1176givne priority (higher is better, built-in handlers have priority 0, the
1177default).
1178
1179=cut
1180
1143sub register { 1181sub register {
1144 my (undef, $regex) = @_; 1182 my (undef, $regex, $prio) = @_;
1145 my $pkg = caller; 1183 my $pkg = caller;
1146 1184
1147 no strict; 1185 no strict;
1148 push @{"$pkg\::ISA"}, __PACKAGE__; 1186 push @{"$pkg\::ISA"}, __PACKAGE__;
1149 1187
1150 $EXT_MAP{$pkg} = qr<$regex>; 1188 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1151} 1189}
1152 1190
1153# also paths starting with '/' 1191# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1192$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1193
1194sub thawer_merge {
1195 my ($self, $merge) = @_;
1196
1197 # we have to keep some variables in memory intact
1198 local $self->{path};
1199 local $self->{load_path};
1200 local $self->{deny_save};
1201 local $self->{deny_reset};
1202
1203 $self->SUPER::thawer_merge ($merge);
1204}
1155 1205
1156sub normalise { 1206sub normalise {
1157 my ($path, $base) = @_; 1207 my ($path, $base) = @_;
1208
1209 $path = "$path"; # make sure its a string
1210
1211 $path =~ s/\.map$//;
1158 1212
1159 # map plan: 1213 # map plan:
1160 # 1214 #
1161 # /! non-realised random map exit (special hack!) 1215 # /! non-realised random map exit (special hack!)
1162 # {... are special paths that are not being touched 1216 # {... are special paths that are not being touched
… …
1190 1244
1191 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1245 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1192 1246
1193 $path = normalise $path, $base; 1247 $path = normalise $path, $base;
1194 1248
1195 for my $pkg (keys %EXT_MAP) { 1249 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1196 if ($path =~ $EXT_MAP{$pkg}) { 1250 if ($path =~ $EXT_MAP{$pkg}[1]) {
1197 my $self = bless cf::map::new, $pkg; 1251 my $self = bless cf::map::new, $pkg;
1198 $self->{path} = $path; $self->path ($path); 1252 $self->{path} = $path; $self->path ($path);
1199 $self->init; # pass $1 etc. 1253 $self->init; # pass $1 etc.
1200 return $self; 1254 return $self;
1201 } 1255 }
1202 } 1256 }
1203 1257
1204 Carp::carp "unable to resolve path '$path'."; 1258 Carp::carp "unable to resolve path '$path' (base '$base').";
1205 () 1259 ()
1206} 1260}
1207 1261
1208sub init { 1262sub init {
1209 my ($self) = @_; 1263 my ($self) = @_;
… …
1220# the displayed name, this is a one way mapping 1274# the displayed name, this is a one way mapping
1221sub visible_name { 1275sub visible_name {
1222 &as_string 1276 &as_string
1223} 1277}
1224 1278
1225# escape the /'s in the path
1226sub _escaped_path {
1227 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1228
1229 $path
1230}
1231
1232# the original (read-only) location 1279# the original (read-only) location
1233sub load_path { 1280sub load_path {
1234 my ($self) = @_; 1281 my ($self) = @_;
1235 1282
1236 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1283 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1237} 1284}
1238 1285
1239# the temporary/swap location 1286# the temporary/swap location
1240sub save_path { 1287sub save_path {
1241 my ($self) = @_; 1288 my ($self) = @_;
1242 1289
1290 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1243 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $self->_escaped_path 1291 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1244} 1292}
1245 1293
1246# the unique path, undef == no special unique path 1294# the unique path, undef == no special unique path
1247sub uniq_path { 1295sub uniq_path {
1248 my ($self) = @_; 1296 my ($self) = @_;
1249 1297
1298 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1250 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 1299 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1251} 1300}
1252 1301
1253# and all this just because we cannot iterate over 1302# and all this just because we cannot iterate over
1254# all maps in C++... 1303# all maps in C++...
1255sub change_all_map_light { 1304sub change_all_map_light {
… …
1261 1310
1262sub unlink_save { 1311sub unlink_save {
1263 my ($self) = @_; 1312 my ($self) = @_;
1264 1313
1265 utf8::encode (my $save = $self->save_path); 1314 utf8::encode (my $save = $self->save_path);
1266 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1315 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1267 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1316 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1268} 1317}
1269 1318
1270sub load_header_from($) { 1319sub load_header_from($) {
1271 my ($self, $path) = @_; 1320 my ($self, $path) = @_;
1272 1321
1273 utf8::encode $path; 1322 utf8::encode $path;
1274 aio_open $path, O_RDONLY, 0 1323 #aio_open $path, O_RDONLY, 0
1275 or return; 1324 # or return;
1276 1325
1277 $self->_load_header ($path) 1326 $self->_load_header ($path)
1278 or return; 1327 or return;
1279 1328
1280 $self->{load_path} = $path; 1329 $self->{load_path} = $path;
1281 1330
1282 1 1331 1
1283} 1332}
1284 1333
1285sub load_orig { 1334sub load_header_orig {
1286 my ($self) = @_; 1335 my ($self) = @_;
1287 1336
1288 $self->load_header_from ($self->load_path) 1337 $self->load_header_from ($self->load_path)
1289} 1338}
1290 1339
1291sub load_temp { 1340sub load_header_temp {
1292 my ($self) = @_; 1341 my ($self) = @_;
1293 1342
1294 $self->load_header_from ($self->save_path) 1343 $self->load_header_from ($self->save_path)
1344}
1345
1346sub prepare_temp {
1347 my ($self) = @_;
1348
1349 $self->last_access ((delete $self->{last_access})
1350 || $cf::RUNTIME); #d#
1351 # safety
1352 $self->{instantiate_time} = $cf::RUNTIME
1353 if $self->{instantiate_time} > $cf::RUNTIME;
1354}
1355
1356sub prepare_orig {
1357 my ($self) = @_;
1358
1359 $self->{load_original} = 1;
1360 $self->{instantiate_time} = $cf::RUNTIME;
1361 $self->last_access ($cf::RUNTIME);
1362 $self->instantiate;
1295} 1363}
1296 1364
1297sub load_header { 1365sub load_header {
1298 my ($self) = @_; 1366 my ($self) = @_;
1299 1367
1300 if ($self->load_temp) { 1368 if ($self->load_header_temp) {
1301 $self->last_access ((delete $self->{last_access}) 1369 $self->prepare_temp;
1302 || $cf::RUNTIME); #d#
1303 # safety
1304 $self->{instantiate_time} = $cf::RUNTIME
1305 if $self->{instantiate_time} > $cf::RUNTIME;
1306 } else { 1370 } else {
1307 $self->load_orig 1371 $self->load_header_orig
1308 or return; 1372 or return;
1309 1373 $self->prepare_orig;
1310 $self->{load_original} = 1;
1311 $self->{instantiate_time} = $cf::RUNTIME;
1312 $self->last_access ($cf::RUNTIME);
1313 $self->instantiate;
1314 } 1374 }
1315 1375
1316 1 1376 1
1317} 1377}
1318 1378
… …
1332 $map->{last_save} = $cf::RUNTIME; 1392 $map->{last_save} = $cf::RUNTIME;
1333 1393
1334 $map->load_header 1394 $map->load_header
1335 or return; 1395 or return;
1336 1396
1337 if ($map->should_reset) { 1397 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1398 # doing this can freeze the server in a sync job, obviously
1399 #$cf::WAIT_FOR_TICK->wait;
1338 $map->reset; 1400 $map->reset;
1339 undef $guard; 1401 undef $guard;
1340 $map = find $path 1402 return find $path;
1341 or return;
1342 } 1403 }
1343 1404
1344 $cf::MAP{$path} = $map 1405 $cf::MAP{$path} = $map
1345 } 1406 }
1346} 1407}
1408
1409sub pre_load { }
1410sub post_load { }
1347 1411
1348sub load { 1412sub load {
1349 my ($self) = @_; 1413 my ($self) = @_;
1350 1414
1415 local $self->{deny_reset} = 1; # loading can take a long time
1416
1351 my $path = $self->{path}; 1417 my $path = $self->{path};
1352 my $guard = cf::lock_acquire "map_load:$path"; 1418 my $guard = cf::lock_acquire "map_load:$path";
1353 1419
1354 return if $self->in_memory != cf::MAP_SWAPPED; 1420 return if $self->in_memory != cf::MAP_SWAPPED;
1355 1421
1356 $self->in_memory (cf::MAP_LOADING); 1422 $self->in_memory (cf::MAP_LOADING);
1357 1423
1358 $self->alloc; 1424 $self->alloc;
1425
1426 $self->pre_load;
1427
1359 $self->_load_objects ($self->{load_path}, 1) 1428 $self->_load_objects ($self->{load_path}, 1)
1360 or return; 1429 or return;
1361 1430
1362 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1431 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1363 if delete $self->{load_original}; 1432 if delete $self->{load_original};
… …
1385 unless $self->difficulty; 1454 unless $self->difficulty;
1386 Coro::cede; 1455 Coro::cede;
1387 $self->activate; 1456 $self->activate;
1388 } 1457 }
1389 1458
1459 $self->post_load;
1460
1390 $self->in_memory (cf::MAP_IN_MEMORY); 1461 $self->in_memory (cf::MAP_IN_MEMORY);
1391} 1462}
1392 1463
1393sub customise_for { 1464sub customise_for {
1394 my ($self, $ob) = @_; 1465 my ($self, $ob) = @_;
… …
1434 1505
1435 cf::sync_job { $map->load }; 1506 cf::sync_job { $map->load };
1436} 1507}
1437 1508
1438our %MAP_PREFETCH; 1509our %MAP_PREFETCH;
1439our $MAP_PREFETCHER = Coro::async { 1510our $MAP_PREFETCHER = undef;
1440 while () {
1441 for my $path (keys %MAP_PREFETCH) {
1442 my $map = find $path
1443 or next;
1444 $map->load;
1445
1446 delete $MAP_PREFETCH{$path};
1447 }
1448 Coro::schedule;
1449 }
1450};
1451 1511
1452sub find_async { 1512sub find_async {
1453 my ($path, $origin) = @_; 1513 my ($path, $origin) = @_;
1454 1514
1455 $path = normalise $path, $origin && $origin->{path}; 1515 $path = normalise $path, $origin && $origin->{path};
1456 1516
1457 if (my $map = $cf::MAP{$path}) { 1517 if (my $map = $cf::MAP{$path}) {
1458 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1518 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1459 } 1519 }
1460 1520
1461 $MAP_PREFETCH{$path} = 0; 1521 undef $MAP_PREFETCH{$path};
1522 $MAP_PREFETCHER ||= cf::async {
1523 while (%MAP_PREFETCH) {
1524 for my $path (keys %MAP_PREFETCH) {
1525 my $map = find $path
1526 or next;
1527 $map->load;
1528
1529 delete $MAP_PREFETCH{$path};
1530 }
1531 }
1532 undef $MAP_PREFETCHER;
1533 };
1462 $MAP_PREFETCHER->ready; 1534 $MAP_PREFETCHER->prio (6);
1463 1535
1464 () 1536 ()
1465} 1537}
1466 1538
1467sub save { 1539sub save {
… …
1512 1584
1513sub reset_at { 1585sub reset_at {
1514 my ($self) = @_; 1586 my ($self) = @_;
1515 1587
1516 # TODO: safety, remove and allow resettable per-player maps 1588 # TODO: safety, remove and allow resettable per-player maps
1517 return 1e99 if $self->isa ("ext::map_per_player"); 1589 return 1e99 if $self->isa ("ext::map_per_player");#d#
1518 return 1e99 if $self->{deny_reset}; 1590 return 1e99 if $self->{deny_reset};
1519 1591
1520 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1592 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1521 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1593 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1522 1594
… …
1527 my ($self) = @_; 1599 my ($self) = @_;
1528 1600
1529 $self->reset_at <= $cf::RUNTIME 1601 $self->reset_at <= $cf::RUNTIME
1530} 1602}
1531 1603
1532sub rename {
1533 my ($self, $new_path) = @_;
1534
1535 normalise $new_path;
1536
1537 $self->unlink_save;
1538
1539 delete $cf::MAP{$self->path};
1540 $self->{path} = $new_path; $self->path ($self->{path});
1541 $cf::MAP{$self->path} = $self;
1542
1543 $self->save;
1544}
1545
1546sub reset { 1604sub reset {
1547 my ($self) = @_; 1605 my ($self) = @_;
1548 1606
1549 my $lock = cf::lock_acquire "map_data:" . $self->path; 1607 my $lock = cf::lock_acquire "map_data:$self->{path}";
1550 1608
1551 return if $self->players; 1609 return if $self->players;
1552 return if $self->isa ("ext::map_per_player");#d# 1610 return if $self->isa ("ext::map_per_player");#d#
1553 1611
1554 warn "resetting map ", $self->path;#d# 1612 warn "resetting map ", $self->path;#d#
1555 1613
1614 $self->in_memory (cf::MAP_SWAPPED);
1615
1616 # need to save uniques path
1617 unless ($self->{deny_save}) {
1618 my $uniq = $self->uniq_path; utf8::encode $uniq;
1619
1620 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1621 if $uniq;
1622 }
1623
1556 delete $cf::MAP{$self->path}; 1624 delete $cf::MAP{$self->path};
1625
1626 $self->clear;
1557 1627
1558 $_->clear_links_to ($self) for values %cf::MAP; 1628 $_->clear_links_to ($self) for values %cf::MAP;
1559 1629
1560 $self->unlink_save; 1630 $self->unlink_save;
1561 $self->destroy; 1631 $self->destroy;
… …
1564my $nuke_counter = "aaaa"; 1634my $nuke_counter = "aaaa";
1565 1635
1566sub nuke { 1636sub nuke {
1567 my ($self) = @_; 1637 my ($self) = @_;
1568 1638
1639 delete $cf::MAP{$self->path};
1640
1641 $self->unlink_save;
1642
1643 bless $self, "cf::map";
1644 delete $self->{deny_reset};
1569 $self->{deny_save} = 1; 1645 $self->{deny_save} = 1;
1570 $self->reset_timeout (1); 1646 $self->reset_timeout (1);
1571 $self->rename ("{nuke}/" . ($nuke_counter++)); 1647 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1648
1649 $cf::MAP{$self->path} = $self;
1650
1572 $self->reset; # polite request, might not happen 1651 $self->reset; # polite request, might not happen
1573} 1652}
1574 1653
1575=item cf::map::unique_maps 1654=item cf::map::unique_maps
1576 1655
… …
1588 for (@$files) { 1667 for (@$files) {
1589 utf8::decode $_; 1668 utf8::decode $_;
1590 next if /\.pst$/; 1669 next if /\.pst$/;
1591 next unless /^$PATH_SEP/o; 1670 next unless /^$PATH_SEP/o;
1592 1671
1593 push @paths, $_; 1672 push @paths, cf::map::normalise $_;
1594 } 1673 }
1595 1674
1596 \@paths 1675 \@paths
1597} 1676}
1598 1677
… …
1692=cut 1771=cut
1693 1772
1694sub link_map { 1773sub link_map {
1695 unless ($LINK_MAP) { 1774 unless ($LINK_MAP) {
1696 $LINK_MAP = cf::map::find "{link}" 1775 $LINK_MAP = cf::map::find "{link}"
1697 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1776 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1698 $LINK_MAP->load; 1777 $LINK_MAP->load;
1699 } 1778 }
1700 1779
1701 $LINK_MAP 1780 $LINK_MAP
1702} 1781}
… …
1709 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1788 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710 1789
1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1790 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712 if $self->map; 1791 if $self->map;
1713 1792
1714 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1793 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1715} 1794}
1716 1795
1717sub cf::object::player::leave_link { 1796sub cf::object::player::leave_link {
1718 my ($self, $map, $x, $y) = @_; 1797 my ($self, $map, $x, $y) = @_;
1719 1798
… …
1741 $map->load; 1820 $map->load;
1742 $map->load_diag; 1821 $map->load_diag;
1743 1822
1744 return unless $self->contr->active; 1823 return unless $self->contr->active;
1745 $self->activate_recursive; 1824 $self->activate_recursive;
1825
1826 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1746 $self->enter_map ($map, $x, $y); 1827 $self->enter_map ($map, $x, $y);
1747} 1828}
1748 1829
1749cf::player->attach ( 1830cf::player->attach (
1750 on_logout => sub { 1831 on_logout => sub {
… …
1763 # try to abort aborted map switching on player login :) 1844 # try to abort aborted map switching on player login :)
1764 # should happen only on crashes 1845 # should happen only on crashes
1765 if ($pl->ob->{_link_pos}) { 1846 if ($pl->ob->{_link_pos}) {
1766 $pl->ob->enter_link; 1847 $pl->ob->enter_link;
1767 (async { 1848 (async {
1768 # we need this sleep as the login has a concurrent enter_exit running
1769 # and this sleep increases chances of the player not ending up in scorn
1770 $pl->ob->reply (undef, 1849 $pl->ob->reply (undef,
1771 "There was an internal problem at your last logout, " 1850 "There was an internal problem at your last logout, "
1772 . "the server will try to bring you to your intended destination in a second.", 1851 . "the server will try to bring you to your intended destination in a second.",
1773 cf::NDI_RED); 1852 cf::NDI_RED);
1853 # we need this sleep as the login has a concurrent enter_exit running
1854 # and this sleep increases chances of the player not ending up in scorn
1774 Coro::Timer::sleep 1; 1855 Coro::Timer::sleep 1;
1775 $pl->ob->leave_link; 1856 $pl->ob->leave_link;
1776 })->prio (2); 1857 })->prio (2);
1777 } 1858 }
1778 }, 1859 },
… …
1786 my ($self, $path, $x, $y) = @_; 1867 my ($self, $path, $x, $y) = @_;
1787 1868
1788 $self->enter_link; 1869 $self->enter_link;
1789 1870
1790 (async { 1871 (async {
1872 my $map = eval {
1791 my $map = cf::map::find $path; 1873 my $map = cf::map::find $path;
1792 $map = $map->customise_for ($self) if $map; 1874 $map = $map->customise_for ($self) if $map;
1793 1875 $map
1794# warn "entering ", $map->path, " at ($x, $y)\n" 1876 } or
1795# if $map;
1796
1797 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1877 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1798 1878
1799 $self->leave_link ($map, $x, $y); 1879 $self->leave_link ($map, $x, $y);
1800 })->prio (1); 1880 })->prio (1);
1801} 1881}
1802 1882
… …
1806 1886
1807sub parse_random_map_params { 1887sub parse_random_map_params {
1808 my ($spec) = @_; 1888 my ($spec) = @_;
1809 1889
1810 my $rmp = { # defaults 1890 my $rmp = { # defaults
1811 xsize => 10, 1891 xsize => (cf::rndm 15, 40),
1812 ysize => 10, 1892 ysize => (cf::rndm 15, 40),
1893 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1894 #layout => string,
1813 }; 1895 };
1814 1896
1815 for (split /\n/, $spec) { 1897 for (split /\n/, $spec) {
1816 my ($k, $v) = split /\s+/, $_, 2; 1898 my ($k, $v) = split /\s+/, $_, 2;
1817 1899
… …
1821 $rmp 1903 $rmp
1822} 1904}
1823 1905
1824sub prepare_random_map { 1906sub prepare_random_map {
1825 my ($exit) = @_; 1907 my ($exit) = @_;
1908
1909 my $guard = cf::lock_acquire "exit_prepare:$exit";
1826 1910
1827 # all this does is basically replace the /! path by 1911 # all this does is basically replace the /! path by
1828 # a new random map path (?random/...) with a seed 1912 # a new random map path (?random/...) with a seed
1829 # that depends on the exit object 1913 # that depends on the exit object
1830 1914
1831 my $rmp = parse_random_map_params $exit->msg; 1915 my $rmp = parse_random_map_params $exit->msg;
1832 1916
1833 if ($exit->map) { 1917 if ($exit->map) {
1834 $rmp->{region} = $exit->map->region_name; 1918 $rmp->{region} = $exit->region->name;
1835 $rmp->{origin_map} = $exit->map->path; 1919 $rmp->{origin_map} = $exit->map->path;
1836 $rmp->{origin_x} = $exit->x; 1920 $rmp->{origin_x} = $exit->x;
1837 $rmp->{origin_y} = $exit->y; 1921 $rmp->{origin_y} = $exit->y;
1838 } 1922 }
1839 1923
1840 $rmp->{random_seed} ||= $exit->random_seed; 1924 $rmp->{random_seed} ||= $exit->random_seed;
1841 1925
1842 my $data = cf::to_json $rmp; 1926 my $data = cf::to_json $rmp;
1843 my $md5 = Digest::MD5::md5_hex $data; 1927 my $md5 = Digest::MD5::md5_hex $data;
1928 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1844 1929
1845 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1930 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1846 aio_write $fh, 0, (length $data), $data, 0; 1931 aio_write $fh, 0, (length $data), $data, 0;
1932 undef $fh;
1933 aio_rename "$meta~", $meta;
1847 1934
1848 $exit->slaying ("?random/$md5"); 1935 $exit->slaying ("?random/$md5");
1849 $exit->msg (undef); 1936 $exit->msg (undef);
1850 } 1937 }
1851} 1938}
1852 1939
1853sub cf::object::player::enter_exit { 1940sub cf::object::player::enter_exit {
1854 my ($self, $exit) = @_; 1941 my ($self, $exit) = @_;
1855 1942
1856 return unless $self->type == cf::PLAYER; 1943 return unless $self->type == cf::PLAYER;
1944
1945 if ($exit->slaying eq "/!") {
1946 #TODO: this should de-fi-ni-te-ly not be a sync-job
1947 cf::sync_job { prepare_random_map $exit };
1948 }
1949
1950 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1951 my $hp = $exit->stats->hp;
1952 my $sp = $exit->stats->sp;
1857 1953
1858 $self->enter_link; 1954 $self->enter_link;
1859 1955
1860 (async { 1956 (async {
1861 $self->deactivate_recursive; # just to be sure 1957 $self->deactivate_recursive; # just to be sure
1862 unless (eval { 1958 unless (eval {
1863 prepare_random_map $exit 1959 $self->goto ($slaying, $hp, $sp);
1864 if $exit->slaying eq "/!";
1865
1866 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1867 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1868 1960
1869 1; 1961 1;
1870 }) { 1962 }) {
1871 $self->message ("Something went wrong deep within the crossfire server. " 1963 $self->message ("Something went wrong deep within the crossfire server. "
1872 . "I'll try to bring you back to the map you were before. " 1964 . "I'll try to bring you back to the map you were before. "
… …
1892 1984
1893sub cf::client::send_drawinfo { 1985sub cf::client::send_drawinfo {
1894 my ($self, $text, $flags) = @_; 1986 my ($self, $text, $flags) = @_;
1895 1987
1896 utf8::encode $text; 1988 utf8::encode $text;
1897 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 1989 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1898} 1990}
1899 1991
1900 1992
1901=item $success = $client->query ($flags, "text", \&cb) 1993=item $success = $client->query ($flags, "text", \&cb)
1902 1994
… …
1933 # get handled first 2025 # get handled first
1934 my $queue = delete $ns->{query_queue} 2026 my $queue = delete $ns->{query_queue}
1935 or return; # be conservative, not sure how that can happen, but we saw a crash here 2027 or return; # be conservative, not sure how that can happen, but we saw a crash here
1936 2028
1937 (shift @$queue)->[1]->($msg); 2029 (shift @$queue)->[1]->($msg);
2030 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1938 2031
1939 push @{ $ns->{query_queue} }, @$queue; 2032 push @{ $ns->{query_queue} }, @$queue;
1940 2033
1941 if (@{ $ns->{query_queue} } == @$queue) { 2034 if (@{ $ns->{query_queue} } == @$queue) {
1942 if (@$queue) { 2035 if (@$queue) {
… …
2103The parameter C<$family> should best start with the name of the extension 2196The parameter C<$family> should best start with the name of the extension
2104using it, it should be unique. 2197using it, it should be unique.
2105 2198
2106=over 4 2199=over 4
2107 2200
2108=item $hashref = cf::db_get $family
2109
2110Return a hashref for use by the extension C<$family>, which can be
2111modified. After modifications, you have to call C<cf::db_dirty> or
2112C<cf::db_sync>.
2113
2114=item $value = cf::db_get $family => $key 2201=item $value = cf::db_get $family => $key
2115 2202
2116Returns a single value from the database 2203Returns a single value from the database.
2117
2118=item cf::db_put $family => $hashref
2119
2120Stores the given family hashref into the database. Updates are delayed, if
2121you want the data to be synced to disk immediately, use C<cf::db_sync>.
2122 2204
2123=item cf::db_put $family => $key => $value 2205=item cf::db_put $family => $key => $value
2124 2206
2125Stores the given C<$value> in the family hash. Updates are delayed, if you 2207Stores the given C<$value> in the family.
2126want the data to be synced to disk immediately, use C<cf::db_sync>.
2127
2128=item cf::db_dirty
2129
2130Marks the database as dirty, to be updated at a later time.
2131
2132=item cf::db_sync
2133
2134Immediately write the database to disk I<if it is dirty>.
2135 2208
2136=cut 2209=cut
2137 2210
2138our $DB; 2211our $DB;
2139 2212
2140{ 2213sub db_init {
2214 unless ($DB) {
2215 $DB = BDB::db_create $DB_ENV;
2216
2217 cf::sync_job {
2218 eval {
2219 $DB->set_flags (BDB::CHKSUM);
2220
2221 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2222 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2223 cf::cleanup "db_open(db): $!" if $!;
2224 };
2225 cf::cleanup "db_open(db): $@" if $@;
2226 };
2227
2141 my $path = cf::localdir . "/database.pst"; 2228 my $path = cf::localdir . "/database.pst";
2229 if (stat $path) {
2230 cf::sync_job {
2231 my $pst = Storable::retrieve $path;
2142 2232
2143 sub db_load() { 2233 cf::db_put (board => data => $pst->{board});
2144 $DB = stat $path ? Storable::retrieve $path : { }; 2234 cf::db_put (guildrules => data => $pst->{guildrules});
2145 } 2235 cf::db_put (rent => balance => $pst->{rent}{balance});
2236 BDB::db_env_txn_checkpoint $DB_ENV;
2146 2237
2147 my $pid; 2238 unlink $path;
2148
2149 sub db_save() {
2150 waitpid $pid, 0 if $pid;
2151 if (0 == ($pid = fork)) {
2152 $DB->{_meta}{version} = 1;
2153 Storable::nstore $DB, "$path~";
2154 rename "$path~", $path;
2155 cf::_exit 0 if defined $pid;
2156 } 2239 };
2157 } 2240 }
2158
2159 my $dirty;
2160
2161 sub db_sync() {
2162 db_save if $dirty;
2163 undef $dirty;
2164 }
2165
2166 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2167 db_sync;
2168 }); 2241 }
2242}
2169 2243
2170 sub db_dirty() {
2171 $dirty = 1;
2172 $idle->start;
2173 }
2174
2175 sub db_get($;$) { 2244sub db_get($$) {
2176 @_ >= 2 2245 my $key = "$_[0]/$_[1]";
2177 ? $DB->{$_[0]}{$_[1]}
2178 : ($DB->{$_[0]} ||= { })
2179 }
2180 2246
2247 cf::sync_job {
2248 BDB::db_get $DB, undef, $key, my $data;
2249
2250 $! ? ()
2251 : Compress::LZF::sthaw $data
2252 }
2253}
2254
2181 sub db_put($$;$) { 2255sub db_put($$$) {
2182 if (@_ >= 3) { 2256 BDB::dbreq_pri 4;
2183 $DB->{$_[0]}{$_[1]} = $_[2]; 2257 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2258}
2259
2260#############################################################################
2261# the server's init and main functions
2262
2263sub load_faces {
2264 my $path = sprintf "%s/faces", cf::datadir;
2265
2266 warn "loading faces from $path\n";
2267
2268 my $faces;
2269 0 < aio_load $path, $faces
2270 or die "$path: $!";
2271
2272 Coro::cede;
2273 $faces = Storable::thaw $faces;
2274 Coro::cede;
2275
2276 my $meta = delete $faces->{""};
2277 $meta->{version} == 1
2278 or cf::cleanup "$path: version mismatch, cannot proceed.";
2279
2280 while (my ($face, $info) = each %$faces) {
2281 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2282 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2283 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2284 Coro::cede;
2285 }
2286
2287 while (my ($face, $info) = each %$faces) {
2288 next unless $info->{smooth};
2289 my $idx = cf::face::find $face
2290 or next;
2291 if (my $smooth = cf::face::find $info->{smooth}) {
2292 cf::face::set_smooth $idx, $smooth;
2184 } else { 2293 } else {
2185 $DB->{$_[0]} = $_[1]; 2294 warn "smooth face '$info->{smooth}' not found for face '$face'";
2186 }
2187 db_dirty;
2188 }
2189
2190 cf::global->attach (
2191 prio => 10000,
2192 on_cleanup => sub {
2193 db_sync;
2194 }, 2295 }
2195 ); 2296 Coro::cede;
2196} 2297 }
2197 2298
2198############################################################################# 2299 1
2199# the server's main() 2300}
2301
2302sub reload_resources {
2303 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2304 or die "unable to load regions file\n";#d#
2305 load_faces
2306 or die "unable to load faces\n";#d#
2307}
2308
2309sub init {
2310 reload_resources;
2311}
2200 2312
2201sub cfg_load { 2313sub cfg_load {
2202 open my $fh, "<:utf8", cf::confdir . "/config" 2314 open my $fh, "<:utf8", cf::confdir . "/config"
2203 or return; 2315 or return;
2204 2316
… …
2221 2333
2222sub main { 2334sub main {
2223 # we must not ever block the main coroutine 2335 # we must not ever block the main coroutine
2224 local $Coro::idle = sub { 2336 local $Coro::idle = sub {
2225 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2337 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2338 (async {
2226 async { Event::one_event }; 2339 Event::one_event;
2340 })->prio (Coro::PRIO_MAX);
2227 }; 2341 };
2228 2342
2229 cfg_load; 2343 cfg_load;
2230 db_load; 2344 db_init;
2231 load_extensions; 2345 load_extensions;
2346
2347 $TICK_WATCHER->start;
2232 Event::loop; 2348 Event::loop;
2233} 2349}
2234 2350
2235############################################################################# 2351#############################################################################
2236# initialisation and cleanup 2352# initialisation and cleanup
2237 2353
2238# install some emergency cleanup handlers 2354# install some emergency cleanup handlers
2239BEGIN { 2355BEGIN {
2240 for my $signal (qw(INT HUP TERM)) { 2356 for my $signal (qw(INT HUP TERM)) {
2241 Event->signal ( 2357 Event->signal (
2358 reentrant => 0,
2242 data => WF_AUTOCANCEL, 2359 data => WF_AUTOCANCEL,
2243 signal => $signal, 2360 signal => $signal,
2361 prio => 0,
2244 cb => sub { 2362 cb => sub {
2245 cf::cleanup "SIG$signal"; 2363 cf::cleanup "SIG$signal";
2246 }, 2364 },
2247 ); 2365 );
2248 } 2366 }
2249} 2367}
… …
2254 warn "enter emergency perl save\n"; 2372 warn "enter emergency perl save\n";
2255 2373
2256 cf::sync_job { 2374 cf::sync_job {
2257 # use a peculiar iteration method to avoid tripping on perl 2375 # use a peculiar iteration method to avoid tripping on perl
2258 # refcount bugs in for. also avoids problems with players 2376 # refcount bugs in for. also avoids problems with players
2259 # and maps saved/Destroyed asynchronously. 2377 # and maps saved/destroyed asynchronously.
2260 warn "begin emergency player save\n"; 2378 warn "begin emergency player save\n";
2261 for my $login (keys %cf::PLAYER) { 2379 for my $login (keys %cf::PLAYER) {
2262 my $pl = $cf::PLAYER{$login} or next; 2380 my $pl = $cf::PLAYER{$login} or next;
2263 $pl->valid or next; 2381 $pl->valid or next;
2264 $pl->save; 2382 $pl->save;
… …
2270 my $map = $cf::MAP{$path} or next; 2388 my $map = $cf::MAP{$path} or next;
2271 $map->valid or next; 2389 $map->valid or next;
2272 $map->save; 2390 $map->save;
2273 } 2391 }
2274 warn "end emergency map save\n"; 2392 warn "end emergency map save\n";
2393
2394 warn "begin emergency database checkpoint\n";
2395 BDB::db_env_txn_checkpoint $DB_ENV;
2396 warn "end emergency database checkpoint\n";
2275 }; 2397 };
2276 2398
2277 warn "leave emergency perl save\n"; 2399 warn "leave emergency perl save\n";
2400}
2401
2402sub post_cleanup {
2403 my ($make_core) = @_;
2404
2405 warn Carp::longmess "post_cleanup backtrace"
2406 if $make_core;
2278} 2407}
2279 2408
2280sub reload() { 2409sub reload() {
2281 # can/must only be called in main 2410 # can/must only be called in main
2282 if ($Coro::current != $Coro::main) { 2411 if ($Coro::current != $Coro::main) {
2283 warn "can only reload from main coroutine\n"; 2412 warn "can only reload from main coroutine";
2284 return; 2413 return;
2285 } 2414 }
2286 2415
2287 warn "reloading..."; 2416 warn "reloading...";
2288 2417
2289 warn "freezing server"; 2418 warn "entering sync_job";
2290 my $guard = freeze_mainloop; 2419
2420 cf::sync_job {
2421 cf::write_runtime; # external watchdog should not bark
2291 cf::emergency_save; 2422 cf::emergency_save;
2423 cf::write_runtime; # external watchdog should not bark
2292 2424
2293 warn "sync database to disk"; 2425 warn "syncing database to disk";
2294 cf::db_sync; 2426 BDB::db_env_txn_checkpoint $DB_ENV;
2295 IO::AIO::flush;
2296 2427
2297 eval {
2298 # if anything goes wrong in here, we should simply crash as we already saved 2428 # if anything goes wrong in here, we should simply crash as we already saved
2299 2429
2300 warn "cancel all watchers"; 2430 warn "cancelling all WF_AUTOCANCEL watchers";
2301 for (Event::all_watchers) { 2431 for (Event::all_watchers) {
2302 $_->cancel if $_->data & WF_AUTOCANCEL; 2432 $_->cancel if $_->data & WF_AUTOCANCEL;
2303 } 2433 }
2304 2434
2435 warn "flushing outstanding aio requests";
2436 for (;;) {
2437 BDB::flush;
2438 IO::AIO::flush;
2439 Coro::cede;
2440 last unless IO::AIO::nreqs || BDB::nreqs;
2441 warn "iterate...";
2442 }
2443
2444 ++$RELOAD;
2445
2305 warn "cancel all extension coros"; 2446 warn "cancelling all extension coros";
2306 $_->cancel for values %EXT_CORO; 2447 $_->cancel for values %EXT_CORO;
2307 %EXT_CORO = (); 2448 %EXT_CORO = ();
2308 2449
2309 warn "remove commands"; 2450 warn "removing commands";
2310 %COMMAND = (); 2451 %COMMAND = ();
2311 2452
2312 warn "remove ext commands"; 2453 warn "removing ext commands";
2313 %EXTCMD = (); 2454 %EXTCMD = ();
2314 2455
2315 warn "unload/nuke all extensions"; 2456 warn "unloading/nuking all extensions";
2316 for my $pkg (@EXTS) { 2457 for my $pkg (@EXTS) {
2317 warn "... unloading $pkg"; 2458 warn "... unloading $pkg";
2318 2459
2319 if (my $cb = $pkg->can ("unload")) { 2460 if (my $cb = $pkg->can ("unload")) {
2320 eval { 2461 eval {
… …
2325 2466
2326 warn "... nuking $pkg"; 2467 warn "... nuking $pkg";
2327 Symbol::delete_package $pkg; 2468 Symbol::delete_package $pkg;
2328 } 2469 }
2329 2470
2330 warn "unload all perl modules loaded from $LIBDIR"; 2471 warn "unloading all perl modules loaded from $LIBDIR";
2331 while (my ($k, $v) = each %INC) { 2472 while (my ($k, $v) = each %INC) {
2332 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2473 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2333 2474
2334 warn "removing <$k>"; 2475 warn "... unloading $k";
2335 delete $INC{$k}; 2476 delete $INC{$k};
2336 2477
2337 $k =~ s/\.pm$//; 2478 $k =~ s/\.pm$//;
2338 $k =~ s/\//::/g; 2479 $k =~ s/\//::/g;
2339 2480
… …
2342 } 2483 }
2343 2484
2344 Symbol::delete_package $k; 2485 Symbol::delete_package $k;
2345 } 2486 }
2346 2487
2347 warn "get rid of safe::, as good as possible"; 2488 warn "getting rid of safe::, as good as possible";
2348 Symbol::delete_package "safe::$_" 2489 Symbol::delete_package "safe::$_"
2349 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2490 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2350 2491
2351 warn "unload cf.pm \"a bit\""; 2492 warn "unloading cf.pm \"a bit\"";
2352 delete $INC{"cf.pm"}; 2493 delete $INC{"cf.pm"};
2353 2494
2354 # don't, removes xs symbols, too, 2495 # don't, removes xs symbols, too,
2355 # and global variables created in xs 2496 # and global variables created in xs
2356 #Symbol::delete_package __PACKAGE__; 2497 #Symbol::delete_package __PACKAGE__;
2357 2498
2499 warn "unload completed, starting to reload now";
2500
2358 warn "reloading cf.pm"; 2501 warn "reloading cf.pm";
2359 require cf; 2502 require cf;
2360 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2503 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2361 2504
2362 warn "load config and database again"; 2505 warn "loading config and database again";
2363 cf::cfg_load; 2506 cf::cfg_load;
2364 cf::db_load;
2365 2507
2366 warn "load extensions"; 2508 warn "loading extensions";
2367 cf::load_extensions; 2509 cf::load_extensions;
2368 2510
2369 warn "reattach attachments to objects/players"; 2511 warn "reattaching attachments to objects/players";
2370 _global_reattach; 2512 _global_reattach; # objects, sockets
2371 warn "reattach attachments to maps"; 2513 warn "reattaching attachments to maps";
2372 reattach $_ for values %MAP; 2514 reattach $_ for values %MAP;
2373 }; 2515 warn "reattaching attachments to players";
2516 reattach $_ for values %PLAYER;
2374 2517
2375 if ($@) { 2518 warn "loading reloadable resources";
2519 reload_resources;
2520
2521 warn "leaving sync_job";
2522
2523 1
2524 } or do {
2376 warn $@; 2525 warn $@;
2377 warn "error while reloading, exiting."; 2526 warn "error while reloading, exiting.";
2378 exit 1; 2527 exit 1;
2379 } 2528 };
2380 2529
2381 warn "reloaded"; 2530 warn "reloaded";
2382}; 2531};
2383 2532
2533our $RELOAD_WATCHER; # used only during reload
2534
2384register_command "reload" => sub { 2535register_command "reload" => sub {
2385 my ($who, $arg) = @_; 2536 my ($who, $arg) = @_;
2386 2537
2387 if ($who->flag (FLAG_WIZ)) { 2538 if ($who->flag (FLAG_WIZ)) {
2388 $who->message ("start of reload."); 2539 $who->message ("reloading server.");
2540
2541 # doing reload synchronously and two reloads happen back-to-back,
2542 # coro crashes during coro_state_free->destroy here.
2543
2544 $RELOAD_WATCHER ||= Event->timer (
2545 reentrant => 0,
2546 after => 0,
2547 data => WF_AUTOCANCEL,
2548 cb => sub {
2389 reload; 2549 reload;
2390 $who->message ("end of reload."); 2550 undef $RELOAD_WATCHER;
2551 },
2552 );
2391 } 2553 }
2392}; 2554};
2393 2555
2394unshift @INC, $LIBDIR; 2556unshift @INC, $LIBDIR;
2557
2558my $bug_warning = 0;
2395 2559
2396$TICK_WATCHER = Event->timer ( 2560$TICK_WATCHER = Event->timer (
2397 reentrant => 0, 2561 reentrant => 0,
2562 parked => 1,
2398 prio => 0, 2563 prio => 0,
2399 at => $NEXT_TICK || $TICK, 2564 at => $NEXT_TICK || $TICK,
2400 data => WF_AUTOCANCEL, 2565 data => WF_AUTOCANCEL,
2401 cb => sub { 2566 cb => sub {
2567 if ($Coro::current != $Coro::main) {
2568 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2569 unless ++$bug_warning > 10;
2570 return;
2571 }
2572
2402 $NOW = Event::time; 2573 $NOW = Event::time;
2403 2574
2404 cf::server_tick; # one server iteration 2575 cf::server_tick; # one server iteration
2405 $RUNTIME += $TICK; 2576 $RUNTIME += $TICK;
2406 $NEXT_TICK += $TICK; 2577 $NEXT_TICK += $TICK;
2407 2578
2579 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2580 $NEXT_RUNTIME_WRITE = $NOW + 10;
2581 Coro::async_pool {
2582 write_runtime
2583 or warn "ERROR: unable to write runtime file: $!";
2584 };
2585 }
2586
2408 $WAIT_FOR_TICK->broadcast; 2587 $WAIT_FOR_TICK->broadcast;
2409 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2588 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2589
2590# my $AFTER = Event::time;
2591# warn $AFTER - $NOW;#d#
2410 2592
2411 # if we are delayed by four ticks or more, skip them all 2593 # if we are delayed by four ticks or more, skip them all
2412 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2594 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2413 2595
2414 $TICK_WATCHER->at ($NEXT_TICK); 2596 $TICK_WATCHER->at ($NEXT_TICK);
2415 $TICK_WATCHER->start; 2597 $TICK_WATCHER->start;
2416 }, 2598 },
2417); 2599);
2418 2600
2601{
2419IO::AIO::max_poll_time $TICK * 0.2; 2602 BDB::max_poll_time $TICK * 0.1;
2420 2603 $BDB_POLL_WATCHER = Event->io (
2421Event->io ( 2604 reentrant => 0,
2422 fd => IO::AIO::poll_fileno, 2605 fd => BDB::poll_fileno,
2423 poll => 'r', 2606 poll => 'r',
2424 prio => 5, 2607 prio => 0,
2425 data => WF_AUTOCANCEL,
2426 cb => \&IO::AIO::poll_cb,
2427);
2428
2429Event->timer (
2430 data => WF_AUTOCANCEL, 2608 data => WF_AUTOCANCEL,
2431 after => 0, 2609 cb => \&BDB::poll_cb,
2432 interval => 10, 2610 );
2433 cb => sub { 2611 BDB::min_parallel 8;
2434 (Coro::unblock_sub { 2612
2435 write_runtime 2613 BDB::set_sync_prepare {
2436 or warn "ERROR: unable to write runtime file: $!"; 2614 my $status;
2615 my $current = $Coro::current;
2616 (
2617 sub {
2618 $status = $!;
2619 $current->ready; undef $current;
2620 },
2621 sub {
2622 Coro::schedule while defined $current;
2623 $! = $status;
2624 },
2625 )
2626 };
2627
2628 unless ($DB_ENV) {
2629 $DB_ENV = BDB::db_env_create;
2630
2631 cf::sync_job {
2632 eval {
2633 BDB::db_env_open
2634 $DB_ENV,
2635 $BDB_ENV_DIR,
2636 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2637 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2638 0666;
2639
2640 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2641
2642 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2643 $DB_ENV->set_lk_detect;
2644 };
2645
2646 cf::cleanup "db_env_open(db): $@" if $@;
2437 })->(); 2647 };
2438 }, 2648 }
2439); 2649}
2650
2651{
2652 IO::AIO::min_parallel 8;
2653
2654 undef $Coro::AIO::WATCHER;
2655 IO::AIO::max_poll_time $TICK * 0.1;
2656 $AIO_POLL_WATCHER = Event->io (
2657 reentrant => 0,
2658 data => WF_AUTOCANCEL,
2659 fd => IO::AIO::poll_fileno,
2660 poll => 'r',
2661 prio => 6,
2662 cb => \&IO::AIO::poll_cb,
2663 );
2664}
2440 2665
2441END { cf::emergency_save } 2666END { cf::emergency_save }
2442 2667
24431 26681
2444 2669

Diff Legend

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