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.220 by root, Sat Feb 17 23:54:35 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3 (); 13use Coro 3.5 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use BDB ();
20use Data::Dumper; 21use Data::Dumper;
21use Digest::MD5; 22use Digest::MD5;
22use Fcntl; 23use Fcntl;
23use IO::AIO 2.32 (); 24use IO::AIO 2.32 ();
24use YAML::Syck (); 25use YAML::Syck ();
25use Time::HiRes; 26use Time::HiRes;
27use Compress::LZF;
28
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
26 30
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 31use Event; $Event::Eval = 1; # no idea why this is required, but it is
28 32
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 34
… …
44our @EVENT; 48our @EVENT;
45our $LIBDIR = datadir . "/ext"; 49our $LIBDIR = datadir . "/ext";
46 50
47our $TICK = MAX_TIME * 1e-6; 51our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 52our $TICK_WATCHER;
53our $AIO_POLL_WATCHER;
54our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
49our $NEXT_TICK; 55our $NEXT_TICK;
50our $NOW; 56our $NOW;
57our $USE_FSYNC = 1; # use fsync to write maps - default off
58
59our $BDB_POLL_WATCHER;
60our $DB_ENV;
51 61
52our %CFG; 62our %CFG;
53 63
54our $UPTIME; $UPTIME ||= time; 64our $UPTIME; $UPTIME ||= time;
55our $RUNTIME; 65our $RUNTIME;
56 66
57our %PLAYER; # all users 67our %PLAYER; # all users
58our %MAP; # all maps 68our %MAP; # all maps
59our $LINK_MAP; # the special {link} map, which is always available 69our $LINK_MAP; # the special {link} map, which is always available
60our $RANDOM_MAPS = cf::localdir . "/random"; 70our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db";
61 72
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
64 75
65# used to convert map paths into valid unix filenames by replacing / by ∕ 76# used to convert map paths into valid unix filenames by replacing / by ∕
… …
78mkdir cf::localdir; 89mkdir cf::localdir;
79mkdir cf::localdir . "/" . cf::playerdir; 90mkdir cf::localdir . "/" . cf::playerdir;
80mkdir cf::localdir . "/" . cf::tmpdir; 91mkdir cf::localdir . "/" . cf::tmpdir;
81mkdir cf::localdir . "/" . cf::uniquedir; 92mkdir cf::localdir . "/" . cf::uniquedir;
82mkdir $RANDOM_MAPS; 93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
83 95
84our $EMERGENCY_POSITION; 96our $EMERGENCY_POSITION;
97
98sub cf::map::normalise;
85 99
86############################################################################# 100#############################################################################
87 101
88=head2 GLOBAL VARIABLES 102=head2 GLOBAL VARIABLES
89 103
… …
257} 271}
258 272
259sub freeze_mainloop { 273sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active; 274 return unless $TICK_WATCHER->is_active;
261 275
262 my $guard = Coro::guard { $TICK_WATCHER->start }; 276 my $guard = Coro::guard {
277 $TICK_WATCHER->start;
278 };
263 $TICK_WATCHER->stop; 279 $TICK_WATCHER->stop;
264 $guard 280 $guard
265} 281}
266 282
267=item cf::async { BLOCK } 283=item cf::async { BLOCK }
… …
338 354
339 $coro 355 $coro
340} 356}
341 357
342sub write_runtime { 358sub write_runtime {
343 return unless $TICK_WATCHER->is_active; 359 my $guard = cf::lock_acquire "write_runtime";
344 360
345 my $runtime = cf::localdir . "/runtime"; 361 my $runtime = cf::localdir . "/runtime";
346 362
347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 363 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
348 or return; 364 or return;
349 365
366 my $value = $cf::RUNTIME + 90 + 10;
350 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 367 # 10 is the runtime save interval, for a monotonic clock
368 # 60 allows for the watchdog to kill the server.
369
351 (aio_write $fh, 0, (length $value), $value, 0) <= 0 370 (aio_write $fh, 0, (length $value), $value, 0) <= 0
352 and return; 371 and return;
353 372
373 # always fsync - this file is important
354 aio_fsync $fh 374 aio_fsync $fh
355 and return; 375 and return;
356 376
357 close $fh 377 close $fh
358 or return; 378 or return;
… …
499our @CB_TYPE = (); # registry for type (cf-object class) based events 519our @CB_TYPE = (); # registry for type (cf-object class) based events
500our @CB_MAP = (); 520our @CB_MAP = ();
501 521
502my %attachment; 522my %attachment;
503 523
524sub cf::attachable::thawer_merge {
525 # simply override everything except _meta
526 local $_[0]{_meta};
527 %{$_[0]} = %{$_[1]};
528}
529
504sub _attach_cb($$$$) { 530sub _attach_cb($$$$) {
505 my ($registry, $event, $prio, $cb) = @_; 531 my ($registry, $event, $prio, $cb) = @_;
506 532
507 use sort 'stable'; 533 use sort 'stable';
508 534
… …
679# object support 705# object support
680 706
681sub reattach { 707sub reattach {
682 # basically do the same as instantiate, without calling instantiate 708 # basically do the same as instantiate, without calling instantiate
683 my ($obj) = @_; 709 my ($obj) = @_;
710
711 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
684 712
685 my $registry = $obj->registry; 713 my $registry = $obj->registry;
686 714
687 @$registry = (); 715 @$registry = ();
688 716
… …
735 $filename, length $$rdata, scalar @$objs; 763 $filename, length $$rdata, scalar @$objs;
736 764
737 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 765 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
738 chmod SAVE_MODE, $fh; 766 chmod SAVE_MODE, $fh;
739 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 767 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
740 aio_fsync $fh; 768 aio_fsync $fh if $cf::USE_FSYNC;
741 close $fh; 769 close $fh;
742 770
743 if (@$objs) { 771 if (@$objs) {
744 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 772 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
745 chmod SAVE_MODE, $fh; 773 chmod SAVE_MODE, $fh;
746 my $data = Storable::nfreeze { version => 1, objs => $objs }; 774 my $data = Storable::nfreeze { version => 1, objs => $objs };
747 aio_write $fh, 0, (length $data), $data, 0; 775 aio_write $fh, 0, (length $data), $data, 0;
748 aio_fsync $fh; 776 aio_fsync $fh if $cf::USE_FSYNC;
749 close $fh; 777 close $fh;
750 aio_rename "$filename.pst~", "$filename.pst"; 778 aio_rename "$filename.pst~", "$filename.pst";
751 } 779 }
752 } else { 780 } else {
753 aio_unlink "$filename.pst"; 781 aio_unlink "$filename.pst";
… …
900 } or warn "$ext not loaded: $@"; 928 } or warn "$ext not loaded: $@";
901 } 929 }
902} 930}
903 931
904############################################################################# 932#############################################################################
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 933
920=head2 CORE EXTENSIONS 934=head2 CORE EXTENSIONS
921 935
922Functions and methods that extend core crossfire objects. 936Functions and methods that extend core crossfire objects.
923 937
… …
959 973
960sub exists($) { 974sub exists($) {
961 my ($login) = @_; 975 my ($login) = @_;
962 976
963 $cf::PLAYER{$login} 977 $cf::PLAYER{$login}
964 or cf::sync_job { !aio_stat $login } 978 or cf::sync_job { !aio_stat path $login }
965} 979}
966 980
967sub find($) { 981sub find($) {
968 return $cf::PLAYER{$_[0]} || do { 982 return $cf::PLAYER{$_[0]} || do {
969 my $login = $_[0]; 983 my $login = $_[0];
… …
1015 1029
1016=cut 1030=cut
1017 1031
1018sub quit_character { 1032sub quit_character {
1019 my ($pl) = @_; 1033 my ($pl) = @_;
1034
1035 my $name = $pl->ob->name;
1020 1036
1021 $pl->{deny_save} = 1; 1037 $pl->{deny_save} = 1;
1022 $pl->password ("*"); # this should lock out the player until we nuked the dir 1038 $pl->password ("*"); # this should lock out the player until we nuked the dir
1023 1039
1024 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1040 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
… …
1029 my $path = playerdir $pl; 1045 my $path = playerdir $pl;
1030 my $temp = "$path~$cf::RUNTIME~deleting~"; 1046 my $temp = "$path~$cf::RUNTIME~deleting~";
1031 aio_rename $path, $temp; 1047 aio_rename $path, $temp;
1032 delete $cf::PLAYER{$pl->ob->name}; 1048 delete $cf::PLAYER{$pl->ob->name};
1033 $pl->destroy; 1049 $pl->destroy;
1050
1051 my $prefix = qr<^~\Q$name\E/>;
1052
1053 # nuke player maps
1054 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1055
1034 IO::AIO::aio_rmtree $temp; 1056 IO::AIO::aio_rmtree $temp;
1035} 1057}
1036 1058
1037=item cf::player::list_logins 1059=item cf::player::list_logins
1038 1060
… …
1067=cut 1089=cut
1068 1090
1069sub maps($) { 1091sub maps($) {
1070 my ($pl) = @_; 1092 my ($pl) = @_;
1071 1093
1094 $pl = ref $pl ? $pl->ob->name : $pl;
1095
1072 my $files = aio_readdir playerdir $pl 1096 my $files = aio_readdir playerdir $pl
1073 or return; 1097 or return;
1074 1098
1075 my @paths; 1099 my @paths;
1076 1100
1077 for (@$files) { 1101 for (@$files) {
1078 utf8::decode $_; 1102 utf8::decode $_;
1079 next if /\.(?:pl|pst)$/; 1103 next if /\.(?:pl|pst)$/;
1080 next unless /^$PATH_SEP/o; 1104 next unless /^$PATH_SEP/o;
1081 1105
1082 push @paths, "~" . $pl->ob->name . "/" . $_; 1106 push @paths, cf::map::normalise "~$pl/$_";
1083 } 1107 }
1084 1108
1085 \@paths 1109 \@paths
1086} 1110}
1087 1111
… …
1114 1138
1115use Fcntl; 1139use Fcntl;
1116use Coro::AIO; 1140use Coro::AIO;
1117 1141
1118use overload 1142use overload
1119 '""' => \&as_string; 1143 '""' => \&as_string,
1144 fallback => 1;
1120 1145
1121our $MAX_RESET = 3600; 1146our $MAX_RESET = 3600;
1122our $DEFAULT_RESET = 3000; 1147our $DEFAULT_RESET = 3000;
1123 1148
1124sub generate_random_map { 1149sub generate_random_map {
1125 my ($self, $rmp) = @_; 1150 my ($self, $rmp) = @_;
1126
1127 # mit "rum" bekleckern, nicht 1151 # mit "rum" bekleckern, nicht
1128 $self->_create_random_map ( 1152 $self->_create_random_map (
1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1153 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1154 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1155 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1162 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1139 (cf::region::find $rmp->{region}), $rmp->{custom} 1163 (cf::region::find $rmp->{region}), $rmp->{custom}
1140 ) 1164 )
1141} 1165}
1142 1166
1167=item cf::map->register ($regex, $prio)
1168
1169Register a handler for the map path matching the given regex at the
1170givne priority (higher is better, built-in handlers have priority 0, the
1171default).
1172
1173=cut
1174
1143sub register { 1175sub register {
1144 my (undef, $regex) = @_; 1176 my (undef, $regex, $prio) = @_;
1145 my $pkg = caller; 1177 my $pkg = caller;
1146 1178
1147 no strict; 1179 no strict;
1148 push @{"$pkg\::ISA"}, __PACKAGE__; 1180 push @{"$pkg\::ISA"}, __PACKAGE__;
1149 1181
1150 $EXT_MAP{$pkg} = qr<$regex>; 1182 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1151} 1183}
1152 1184
1153# also paths starting with '/' 1185# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1186$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1187
1188sub thawer_merge {
1189 my ($self, $merge) = @_;
1190
1191 # we have to keep some variables in memory intact
1192 local $self->{path};
1193 local $self->{load_path};
1194 local $self->{deny_save};
1195 local $self->{deny_reset};
1196
1197 $self->SUPER::thawer_merge ($merge);
1198}
1155 1199
1156sub normalise { 1200sub normalise {
1157 my ($path, $base) = @_; 1201 my ($path, $base) = @_;
1202
1203 $path = "$path"; # make sure its a string
1204
1205 $path =~ s/\.map$//;
1158 1206
1159 # map plan: 1207 # map plan:
1160 # 1208 #
1161 # /! non-realised random map exit (special hack!) 1209 # /! non-realised random map exit (special hack!)
1162 # {... are special paths that are not being touched 1210 # {... are special paths that are not being touched
… …
1190 1238
1191 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1239 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1192 1240
1193 $path = normalise $path, $base; 1241 $path = normalise $path, $base;
1194 1242
1195 for my $pkg (keys %EXT_MAP) { 1243 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1196 if ($path =~ $EXT_MAP{$pkg}) { 1244 if ($path =~ $EXT_MAP{$pkg}[1]) {
1197 my $self = bless cf::map::new, $pkg; 1245 my $self = bless cf::map::new, $pkg;
1198 $self->{path} = $path; $self->path ($path); 1246 $self->{path} = $path; $self->path ($path);
1199 $self->init; # pass $1 etc. 1247 $self->init; # pass $1 etc.
1200 return $self; 1248 return $self;
1201 } 1249 }
1202 } 1250 }
1203 1251
1204 Carp::carp "unable to resolve path '$path'."; 1252 Carp::carp "unable to resolve path '$path' (base '$base').";
1205 () 1253 ()
1206} 1254}
1207 1255
1208sub init { 1256sub init {
1209 my ($self) = @_; 1257 my ($self) = @_;
… …
1220# the displayed name, this is a one way mapping 1268# the displayed name, this is a one way mapping
1221sub visible_name { 1269sub visible_name {
1222 &as_string 1270 &as_string
1223} 1271}
1224 1272
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 1273# the original (read-only) location
1233sub load_path { 1274sub load_path {
1234 my ($self) = @_; 1275 my ($self) = @_;
1235 1276
1236 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1277 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1237} 1278}
1238 1279
1239# the temporary/swap location 1280# the temporary/swap location
1240sub save_path { 1281sub save_path {
1241 my ($self) = @_; 1282 my ($self) = @_;
1242 1283
1284 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1243 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $self->_escaped_path 1285 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1244} 1286}
1245 1287
1246# the unique path, undef == no special unique path 1288# the unique path, undef == no special unique path
1247sub uniq_path { 1289sub uniq_path {
1248 my ($self) = @_; 1290 my ($self) = @_;
1249 1291
1292 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1250 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 1293 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1251} 1294}
1252 1295
1253# and all this just because we cannot iterate over 1296# and all this just because we cannot iterate over
1254# all maps in C++... 1297# all maps in C++...
1255sub change_all_map_light { 1298sub change_all_map_light {
… …
1261 1304
1262sub unlink_save { 1305sub unlink_save {
1263 my ($self) = @_; 1306 my ($self) = @_;
1264 1307
1265 utf8::encode (my $save = $self->save_path); 1308 utf8::encode (my $save = $self->save_path);
1266 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1309 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1267 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1310 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1268} 1311}
1269 1312
1270sub load_header_from($) { 1313sub load_header_from($) {
1271 my ($self, $path) = @_; 1314 my ($self, $path) = @_;
1272 1315
1273 utf8::encode $path; 1316 utf8::encode $path;
1274 aio_open $path, O_RDONLY, 0 1317 #aio_open $path, O_RDONLY, 0
1275 or return; 1318 # or return;
1276 1319
1277 $self->_load_header ($path) 1320 $self->_load_header ($path)
1278 or return; 1321 or return;
1279 1322
1280 $self->{load_path} = $path; 1323 $self->{load_path} = $path;
1281 1324
1282 1 1325 1
1283} 1326}
1284 1327
1285sub load_orig { 1328sub load_header_orig {
1286 my ($self) = @_; 1329 my ($self) = @_;
1287 1330
1288 $self->load_header_from ($self->load_path) 1331 $self->load_header_from ($self->load_path)
1289} 1332}
1290 1333
1291sub load_temp { 1334sub load_header_temp {
1292 my ($self) = @_; 1335 my ($self) = @_;
1293 1336
1294 $self->load_header_from ($self->save_path) 1337 $self->load_header_from ($self->save_path)
1338}
1339
1340sub prepare_temp {
1341 my ($self) = @_;
1342
1343 $self->last_access ((delete $self->{last_access})
1344 || $cf::RUNTIME); #d#
1345 # safety
1346 $self->{instantiate_time} = $cf::RUNTIME
1347 if $self->{instantiate_time} > $cf::RUNTIME;
1348}
1349
1350sub prepare_orig {
1351 my ($self) = @_;
1352
1353 $self->{load_original} = 1;
1354 $self->{instantiate_time} = $cf::RUNTIME;
1355 $self->last_access ($cf::RUNTIME);
1356 $self->instantiate;
1295} 1357}
1296 1358
1297sub load_header { 1359sub load_header {
1298 my ($self) = @_; 1360 my ($self) = @_;
1299 1361
1300 if ($self->load_temp) { 1362 if ($self->load_header_temp) {
1301 $self->last_access ((delete $self->{last_access}) 1363 $self->prepare_temp;
1302 || $cf::RUNTIME); #d#
1303 # safety
1304 $self->{instantiate_time} = $cf::RUNTIME
1305 if $self->{instantiate_time} > $cf::RUNTIME;
1306 } else { 1364 } else {
1307 $self->load_orig 1365 $self->load_header_orig
1308 or return; 1366 or return;
1309 1367 $self->prepare_orig;
1310 $self->{load_original} = 1;
1311 $self->{instantiate_time} = $cf::RUNTIME;
1312 $self->last_access ($cf::RUNTIME);
1313 $self->instantiate;
1314 } 1368 }
1315 1369
1316 1 1370 1
1317} 1371}
1318 1372
… …
1332 $map->{last_save} = $cf::RUNTIME; 1386 $map->{last_save} = $cf::RUNTIME;
1333 1387
1334 $map->load_header 1388 $map->load_header
1335 or return; 1389 or return;
1336 1390
1337 if ($map->should_reset) { 1391 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1392 # doing this can freeze the server in a sync job, obviously
1393 #$cf::WAIT_FOR_TICK->wait;
1338 $map->reset; 1394 $map->reset;
1339 undef $guard; 1395 undef $guard;
1340 $map = find $path 1396 return find $path;
1341 or return;
1342 } 1397 }
1343 1398
1344 $cf::MAP{$path} = $map 1399 $cf::MAP{$path} = $map
1345 } 1400 }
1346} 1401}
1402
1403sub pre_load { }
1404sub post_load { }
1347 1405
1348sub load { 1406sub load {
1349 my ($self) = @_; 1407 my ($self) = @_;
1350 1408
1409 local $self->{deny_reset} = 1; # loading can take a long time
1410
1351 my $path = $self->{path}; 1411 my $path = $self->{path};
1352 my $guard = cf::lock_acquire "map_load:$path"; 1412 my $guard = cf::lock_acquire "map_load:$path";
1353 1413
1354 return if $self->in_memory != cf::MAP_SWAPPED; 1414 return if $self->in_memory != cf::MAP_SWAPPED;
1355 1415
1356 $self->in_memory (cf::MAP_LOADING); 1416 $self->in_memory (cf::MAP_LOADING);
1357 1417
1358 $self->alloc; 1418 $self->alloc;
1419
1420 $self->pre_load;
1421
1359 $self->_load_objects ($self->{load_path}, 1) 1422 $self->_load_objects ($self->{load_path}, 1)
1360 or return; 1423 or return;
1361 1424
1362 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1425 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1363 if delete $self->{load_original}; 1426 if delete $self->{load_original};
… …
1385 unless $self->difficulty; 1448 unless $self->difficulty;
1386 Coro::cede; 1449 Coro::cede;
1387 $self->activate; 1450 $self->activate;
1388 } 1451 }
1389 1452
1453 $self->post_load;
1454
1390 $self->in_memory (cf::MAP_IN_MEMORY); 1455 $self->in_memory (cf::MAP_IN_MEMORY);
1391} 1456}
1392 1457
1393sub customise_for { 1458sub customise_for {
1394 my ($self, $ob) = @_; 1459 my ($self, $ob) = @_;
… …
1434 1499
1435 cf::sync_job { $map->load }; 1500 cf::sync_job { $map->load };
1436} 1501}
1437 1502
1438our %MAP_PREFETCH; 1503our %MAP_PREFETCH;
1439our $MAP_PREFETCHER = Coro::async { 1504our $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 1505
1452sub find_async { 1506sub find_async {
1453 my ($path, $origin) = @_; 1507 my ($path, $origin) = @_;
1454 1508
1455 $path = normalise $path, $origin && $origin->{path}; 1509 $path = normalise $path, $origin && $origin->{path};
1456 1510
1457 if (my $map = $cf::MAP{$path}) { 1511 if (my $map = $cf::MAP{$path}) {
1458 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1512 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1459 } 1513 }
1460 1514
1461 $MAP_PREFETCH{$path} = 0; 1515 undef $MAP_PREFETCH{$path};
1516 $MAP_PREFETCHER ||= cf::async {
1517 while (%MAP_PREFETCH) {
1518 for my $path (keys %MAP_PREFETCH) {
1519 my $map = find $path
1520 or next;
1521 $map->load;
1522
1523 delete $MAP_PREFETCH{$path};
1524 }
1525 }
1526 undef $MAP_PREFETCHER;
1527 };
1462 $MAP_PREFETCHER->ready; 1528 $MAP_PREFETCHER->prio (6);
1463 1529
1464 () 1530 ()
1465} 1531}
1466 1532
1467sub save { 1533sub save {
… …
1512 1578
1513sub reset_at { 1579sub reset_at {
1514 my ($self) = @_; 1580 my ($self) = @_;
1515 1581
1516 # TODO: safety, remove and allow resettable per-player maps 1582 # TODO: safety, remove and allow resettable per-player maps
1517 return 1e99 if $self->isa ("ext::map_per_player"); 1583 return 1e99 if $self->isa ("ext::map_per_player");#d#
1518 return 1e99 if $self->{deny_reset}; 1584 return 1e99 if $self->{deny_reset};
1519 1585
1520 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1586 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1521 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1587 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1522 1588
… …
1527 my ($self) = @_; 1593 my ($self) = @_;
1528 1594
1529 $self->reset_at <= $cf::RUNTIME 1595 $self->reset_at <= $cf::RUNTIME
1530} 1596}
1531 1597
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 { 1598sub reset {
1547 my ($self) = @_; 1599 my ($self) = @_;
1548 1600
1549 my $lock = cf::lock_acquire "map_data:" . $self->path; 1601 my $lock = cf::lock_acquire "map_data:$self->{path}";
1550 1602
1551 return if $self->players; 1603 return if $self->players;
1552 return if $self->isa ("ext::map_per_player");#d# 1604 return if $self->isa ("ext::map_per_player");#d#
1553 1605
1554 warn "resetting map ", $self->path;#d# 1606 warn "resetting map ", $self->path;#d#
1555 1607
1608 $self->in_memory (cf::MAP_SWAPPED);
1609
1610 # need to save uniques path
1611 unless ($self->{deny_save}) {
1612 my $uniq = $self->uniq_path; utf8::encode $uniq;
1613
1614 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1615 if $uniq;
1616 }
1617
1556 delete $cf::MAP{$self->path}; 1618 delete $cf::MAP{$self->path};
1619
1620 $self->clear;
1557 1621
1558 $_->clear_links_to ($self) for values %cf::MAP; 1622 $_->clear_links_to ($self) for values %cf::MAP;
1559 1623
1560 $self->unlink_save; 1624 $self->unlink_save;
1561 $self->destroy; 1625 $self->destroy;
… …
1564my $nuke_counter = "aaaa"; 1628my $nuke_counter = "aaaa";
1565 1629
1566sub nuke { 1630sub nuke {
1567 my ($self) = @_; 1631 my ($self) = @_;
1568 1632
1633 delete $cf::MAP{$self->path};
1634
1635 $self->unlink_save;
1636
1637 bless $self, "cf::map";
1638 delete $self->{deny_reset};
1569 $self->{deny_save} = 1; 1639 $self->{deny_save} = 1;
1570 $self->reset_timeout (1); 1640 $self->reset_timeout (1);
1571 $self->rename ("{nuke}/" . ($nuke_counter++)); 1641 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1642
1643 $cf::MAP{$self->path} = $self;
1644
1572 $self->reset; # polite request, might not happen 1645 $self->reset; # polite request, might not happen
1573} 1646}
1574 1647
1575=item cf::map::unique_maps 1648=item cf::map::unique_maps
1576 1649
… …
1588 for (@$files) { 1661 for (@$files) {
1589 utf8::decode $_; 1662 utf8::decode $_;
1590 next if /\.pst$/; 1663 next if /\.pst$/;
1591 next unless /^$PATH_SEP/o; 1664 next unless /^$PATH_SEP/o;
1592 1665
1593 push @paths, $_; 1666 push @paths, cf::map::normalise $_;
1594 } 1667 }
1595 1668
1596 \@paths 1669 \@paths
1597} 1670}
1598 1671
… …
1692=cut 1765=cut
1693 1766
1694sub link_map { 1767sub link_map {
1695 unless ($LINK_MAP) { 1768 unless ($LINK_MAP) {
1696 $LINK_MAP = cf::map::find "{link}" 1769 $LINK_MAP = cf::map::find "{link}"
1697 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1770 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1698 $LINK_MAP->load; 1771 $LINK_MAP->load;
1699 } 1772 }
1700 1773
1701 $LINK_MAP 1774 $LINK_MAP
1702} 1775}
… …
1709 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1782 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710 1783
1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1784 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712 if $self->map; 1785 if $self->map;
1713 1786
1714 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1787 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1715} 1788}
1716 1789
1717sub cf::object::player::leave_link { 1790sub cf::object::player::leave_link {
1718 my ($self, $map, $x, $y) = @_; 1791 my ($self, $map, $x, $y) = @_;
1719 1792
… …
1741 $map->load; 1814 $map->load;
1742 $map->load_diag; 1815 $map->load_diag;
1743 1816
1744 return unless $self->contr->active; 1817 return unless $self->contr->active;
1745 $self->activate_recursive; 1818 $self->activate_recursive;
1819
1820 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1746 $self->enter_map ($map, $x, $y); 1821 $self->enter_map ($map, $x, $y);
1747} 1822}
1748 1823
1749cf::player->attach ( 1824cf::player->attach (
1750 on_logout => sub { 1825 on_logout => sub {
… …
1763 # try to abort aborted map switching on player login :) 1838 # try to abort aborted map switching on player login :)
1764 # should happen only on crashes 1839 # should happen only on crashes
1765 if ($pl->ob->{_link_pos}) { 1840 if ($pl->ob->{_link_pos}) {
1766 $pl->ob->enter_link; 1841 $pl->ob->enter_link;
1767 (async { 1842 (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, 1843 $pl->ob->reply (undef,
1771 "There was an internal problem at your last logout, " 1844 "There was an internal problem at your last logout, "
1772 . "the server will try to bring you to your intended destination in a second.", 1845 . "the server will try to bring you to your intended destination in a second.",
1773 cf::NDI_RED); 1846 cf::NDI_RED);
1847 # we need this sleep as the login has a concurrent enter_exit running
1848 # and this sleep increases chances of the player not ending up in scorn
1774 Coro::Timer::sleep 1; 1849 Coro::Timer::sleep 1;
1775 $pl->ob->leave_link; 1850 $pl->ob->leave_link;
1776 })->prio (2); 1851 })->prio (2);
1777 } 1852 }
1778 }, 1853 },
… …
1786 my ($self, $path, $x, $y) = @_; 1861 my ($self, $path, $x, $y) = @_;
1787 1862
1788 $self->enter_link; 1863 $self->enter_link;
1789 1864
1790 (async { 1865 (async {
1866 my $map = eval {
1791 my $map = cf::map::find $path; 1867 my $map = cf::map::find $path;
1792 $map = $map->customise_for ($self) if $map; 1868 $map = $map->customise_for ($self) if $map;
1793 1869 $map
1794# warn "entering ", $map->path, " at ($x, $y)\n" 1870 } or
1795# if $map;
1796
1797 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1871 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1798 1872
1799 $self->leave_link ($map, $x, $y); 1873 $self->leave_link ($map, $x, $y);
1800 })->prio (1); 1874 })->prio (1);
1801} 1875}
1802 1876
… …
1806 1880
1807sub parse_random_map_params { 1881sub parse_random_map_params {
1808 my ($spec) = @_; 1882 my ($spec) = @_;
1809 1883
1810 my $rmp = { # defaults 1884 my $rmp = { # defaults
1811 xsize => 10, 1885 xsize => (cf::rndm 15, 40),
1812 ysize => 10, 1886 ysize => (cf::rndm 15, 40),
1887 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1888 #layout => string,
1813 }; 1889 };
1814 1890
1815 for (split /\n/, $spec) { 1891 for (split /\n/, $spec) {
1816 my ($k, $v) = split /\s+/, $_, 2; 1892 my ($k, $v) = split /\s+/, $_, 2;
1817 1893
… …
1821 $rmp 1897 $rmp
1822} 1898}
1823 1899
1824sub prepare_random_map { 1900sub prepare_random_map {
1825 my ($exit) = @_; 1901 my ($exit) = @_;
1902
1903 my $guard = cf::lock_acquire "exit_prepare:$exit";
1826 1904
1827 # all this does is basically replace the /! path by 1905 # all this does is basically replace the /! path by
1828 # a new random map path (?random/...) with a seed 1906 # a new random map path (?random/...) with a seed
1829 # that depends on the exit object 1907 # that depends on the exit object
1830 1908
1831 my $rmp = parse_random_map_params $exit->msg; 1909 my $rmp = parse_random_map_params $exit->msg;
1832 1910
1833 if ($exit->map) { 1911 if ($exit->map) {
1834 $rmp->{region} = $exit->map->region_name; 1912 $rmp->{region} = $exit->region->name;
1835 $rmp->{origin_map} = $exit->map->path; 1913 $rmp->{origin_map} = $exit->map->path;
1836 $rmp->{origin_x} = $exit->x; 1914 $rmp->{origin_x} = $exit->x;
1837 $rmp->{origin_y} = $exit->y; 1915 $rmp->{origin_y} = $exit->y;
1838 } 1916 }
1839 1917
1840 $rmp->{random_seed} ||= $exit->random_seed; 1918 $rmp->{random_seed} ||= $exit->random_seed;
1841 1919
1842 my $data = cf::to_json $rmp; 1920 my $data = cf::to_json $rmp;
1843 my $md5 = Digest::MD5::md5_hex $data; 1921 my $md5 = Digest::MD5::md5_hex $data;
1922 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1844 1923
1845 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1924 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1846 aio_write $fh, 0, (length $data), $data, 0; 1925 aio_write $fh, 0, (length $data), $data, 0;
1926 undef $fh;
1927 aio_rename "$meta~", $meta;
1847 1928
1848 $exit->slaying ("?random/$md5"); 1929 $exit->slaying ("?random/$md5");
1849 $exit->msg (undef); 1930 $exit->msg (undef);
1850 } 1931 }
1851} 1932}
1852 1933
1853sub cf::object::player::enter_exit { 1934sub cf::object::player::enter_exit {
1854 my ($self, $exit) = @_; 1935 my ($self, $exit) = @_;
1855 1936
1856 return unless $self->type == cf::PLAYER; 1937 return unless $self->type == cf::PLAYER;
1938
1939 if ($exit->slaying eq "/!") {
1940 #TODO: this should de-fi-ni-te-ly not be a sync-job
1941 cf::sync_job { prepare_random_map $exit };
1942 }
1943
1944 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1945 my $hp = $exit->stats->hp;
1946 my $sp = $exit->stats->sp;
1857 1947
1858 $self->enter_link; 1948 $self->enter_link;
1859 1949
1860 (async { 1950 (async {
1861 $self->deactivate_recursive; # just to be sure 1951 $self->deactivate_recursive; # just to be sure
1862 unless (eval { 1952 unless (eval {
1863 prepare_random_map $exit 1953 $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 1954
1869 1; 1955 1;
1870 }) { 1956 }) {
1871 $self->message ("Something went wrong deep within the crossfire server. " 1957 $self->message ("Something went wrong deep within the crossfire server. "
1872 . "I'll try to bring you back to the map you were before. " 1958 . "I'll try to bring you back to the map you were before. "
… …
1933 # get handled first 2019 # get handled first
1934 my $queue = delete $ns->{query_queue} 2020 my $queue = delete $ns->{query_queue}
1935 or return; # be conservative, not sure how that can happen, but we saw a crash here 2021 or return; # be conservative, not sure how that can happen, but we saw a crash here
1936 2022
1937 (shift @$queue)->[1]->($msg); 2023 (shift @$queue)->[1]->($msg);
2024 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1938 2025
1939 push @{ $ns->{query_queue} }, @$queue; 2026 push @{ $ns->{query_queue} }, @$queue;
1940 2027
1941 if (@{ $ns->{query_queue} } == @$queue) { 2028 if (@{ $ns->{query_queue} } == @$queue) {
1942 if (@$queue) { 2029 if (@$queue) {
… …
2103The parameter C<$family> should best start with the name of the extension 2190The parameter C<$family> should best start with the name of the extension
2104using it, it should be unique. 2191using it, it should be unique.
2105 2192
2106=over 4 2193=over 4
2107 2194
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 2195=item $value = cf::db_get $family => $key
2115 2196
2116Returns a single value from the database 2197Returns 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 2198
2123=item cf::db_put $family => $key => $value 2199=item cf::db_put $family => $key => $value
2124 2200
2125Stores the given C<$value> in the family hash. Updates are delayed, if you 2201Stores 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 2202
2136=cut 2203=cut
2137 2204
2138our $DB; 2205our $DB;
2139 2206
2140{ 2207sub db_init {
2208 unless ($DB) {
2209 $DB = BDB::db_create $DB_ENV;
2210
2211 cf::sync_job {
2212 eval {
2213 $DB->set_flags (BDB::CHKSUM);
2214
2215 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2216 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2217 cf::cleanup "db_open(db): $!" if $!;
2218 };
2219 cf::cleanup "db_open(db): $@" if $@;
2220 };
2221
2141 my $path = cf::localdir . "/database.pst"; 2222 my $path = cf::localdir . "/database.pst";
2223 if (stat $path) {
2224 cf::sync_job {
2225 my $pst = Storable::retrieve $path;
2142 2226
2143 sub db_load() { 2227 cf::db_put (board => data => $pst->{board});
2144 $DB = stat $path ? Storable::retrieve $path : { }; 2228 cf::db_put (guildrules => data => $pst->{guildrules});
2145 } 2229 cf::db_put (rent => balance => $pst->{rent}{balance});
2230 BDB::db_env_txn_checkpoint $DB_ENV;
2146 2231
2147 my $pid; 2232 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 } 2233 };
2157 }
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 });
2169
2170 sub db_dirty() {
2171 $dirty = 1;
2172 $idle->start;
2173 }
2174
2175 sub db_get($;$) {
2176 @_ >= 2
2177 ? $DB->{$_[0]}{$_[1]}
2178 : ($DB->{$_[0]} ||= { })
2179 }
2180
2181 sub db_put($$;$) {
2182 if (@_ >= 3) {
2183 $DB->{$_[0]}{$_[1]} = $_[2];
2184 } else {
2185 $DB->{$_[0]} = $_[1];
2186 }
2187 db_dirty;
2188 }
2189
2190 cf::global->attach (
2191 prio => 10000,
2192 on_cleanup => sub {
2193 db_sync;
2194 }, 2234 }
2195 ); 2235 }
2236}
2237
2238sub db_get($$) {
2239 my $key = "$_[0]/$_[1]";
2240
2241 cf::sync_job {
2242 BDB::db_get $DB, undef, $key, my $data;
2243
2244 $! ? ()
2245 : Compress::LZF::sthaw $data
2246 }
2247}
2248
2249sub db_put($$$) {
2250 BDB::dbreq_pri 4;
2251 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2196} 2252}
2197 2253
2198############################################################################# 2254#############################################################################
2199# the server's main() 2255# the server's init and main functions
2256
2257sub init_resources {
2258 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2259 or die "unable to load regions file\n";#d#
2260}
2200 2261
2201sub cfg_load { 2262sub cfg_load {
2202 open my $fh, "<:utf8", cf::confdir . "/config" 2263 open my $fh, "<:utf8", cf::confdir . "/config"
2203 or return; 2264 or return;
2204 2265
… …
2217 }; 2278 };
2218 warn $@ if $@; 2279 warn $@ if $@;
2219 } 2280 }
2220} 2281}
2221 2282
2283sub init {
2284 init_resources;
2285}
2286
2222sub main { 2287sub main {
2223 # we must not ever block the main coroutine 2288 # we must not ever block the main coroutine
2224 local $Coro::idle = sub { 2289 local $Coro::idle = sub {
2225 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2290 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2291 (async {
2226 async { Event::one_event }; 2292 Event::one_event;
2293 })->prio (Coro::PRIO_MAX);
2227 }; 2294 };
2228 2295
2229 cfg_load; 2296 cfg_load;
2230 db_load; 2297 db_init;
2231 load_extensions; 2298 load_extensions;
2299
2300 $TICK_WATCHER->start;
2232 Event::loop; 2301 Event::loop;
2233} 2302}
2234 2303
2235############################################################################# 2304#############################################################################
2236# initialisation and cleanup 2305# initialisation and cleanup
2237 2306
2238# install some emergency cleanup handlers 2307# install some emergency cleanup handlers
2239BEGIN { 2308BEGIN {
2240 for my $signal (qw(INT HUP TERM)) { 2309 for my $signal (qw(INT HUP TERM)) {
2241 Event->signal ( 2310 Event->signal (
2311 reentrant => 0,
2242 data => WF_AUTOCANCEL, 2312 data => WF_AUTOCANCEL,
2243 signal => $signal, 2313 signal => $signal,
2314 prio => 0,
2244 cb => sub { 2315 cb => sub {
2245 cf::cleanup "SIG$signal"; 2316 cf::cleanup "SIG$signal";
2246 }, 2317 },
2247 ); 2318 );
2248 } 2319 }
2249} 2320}
… …
2254 warn "enter emergency perl save\n"; 2325 warn "enter emergency perl save\n";
2255 2326
2256 cf::sync_job { 2327 cf::sync_job {
2257 # use a peculiar iteration method to avoid tripping on perl 2328 # use a peculiar iteration method to avoid tripping on perl
2258 # refcount bugs in for. also avoids problems with players 2329 # refcount bugs in for. also avoids problems with players
2259 # and maps saved/Destroyed asynchronously. 2330 # and maps saved/destroyed asynchronously.
2260 warn "begin emergency player save\n"; 2331 warn "begin emergency player save\n";
2261 for my $login (keys %cf::PLAYER) { 2332 for my $login (keys %cf::PLAYER) {
2262 my $pl = $cf::PLAYER{$login} or next; 2333 my $pl = $cf::PLAYER{$login} or next;
2263 $pl->valid or next; 2334 $pl->valid or next;
2264 $pl->save; 2335 $pl->save;
… …
2270 my $map = $cf::MAP{$path} or next; 2341 my $map = $cf::MAP{$path} or next;
2271 $map->valid or next; 2342 $map->valid or next;
2272 $map->save; 2343 $map->save;
2273 } 2344 }
2274 warn "end emergency map save\n"; 2345 warn "end emergency map save\n";
2346
2347 warn "begin emergency database checkpoint\n";
2348 BDB::db_env_txn_checkpoint $DB_ENV;
2349 warn "end emergency database checkpoint\n";
2275 }; 2350 };
2276 2351
2277 warn "leave emergency perl save\n"; 2352 warn "leave emergency perl save\n";
2353}
2354
2355sub post_cleanup {
2356 my ($make_core) = @_;
2357
2358 warn Carp::longmess "post_cleanup backtrace"
2359 if $make_core;
2278} 2360}
2279 2361
2280sub reload() { 2362sub reload() {
2281 # can/must only be called in main 2363 # can/must only be called in main
2282 if ($Coro::current != $Coro::main) { 2364 if ($Coro::current != $Coro::main) {
2283 warn "can only reload from main coroutine\n"; 2365 warn "can only reload from main coroutine";
2284 return; 2366 return;
2285 } 2367 }
2286 2368
2287 warn "reloading..."; 2369 warn "reloading...";
2288 2370
2289 warn "freezing server"; 2371 warn "entering sync_job";
2290 my $guard = freeze_mainloop; 2372
2373 cf::sync_job {
2374 cf::write_runtime; # external watchdog should not bark
2291 cf::emergency_save; 2375 cf::emergency_save;
2376 cf::write_runtime; # external watchdog should not bark
2292 2377
2293 warn "sync database to disk"; 2378 warn "syncing database to disk";
2294 cf::db_sync; 2379 BDB::db_env_txn_checkpoint $DB_ENV;
2295 IO::AIO::flush;
2296 2380
2297 eval {
2298 # if anything goes wrong in here, we should simply crash as we already saved 2381 # if anything goes wrong in here, we should simply crash as we already saved
2299 2382
2300 warn "cancel all watchers"; 2383 warn "cancelling all WF_AUTOCANCEL watchers";
2301 for (Event::all_watchers) { 2384 for (Event::all_watchers) {
2302 $_->cancel if $_->data & WF_AUTOCANCEL; 2385 $_->cancel if $_->data & WF_AUTOCANCEL;
2303 } 2386 }
2304 2387
2388 warn "flushing outstanding aio requests";
2389 for (;;) {
2390 BDB::flush;
2391 IO::AIO::flush;
2392 Coro::cede;
2393 last unless IO::AIO::nreqs || BDB::nreqs;
2394 warn "iterate...";
2395 }
2396
2305 warn "cancel all extension coros"; 2397 warn "cancelling all extension coros";
2306 $_->cancel for values %EXT_CORO; 2398 $_->cancel for values %EXT_CORO;
2307 %EXT_CORO = (); 2399 %EXT_CORO = ();
2308 2400
2309 warn "remove commands"; 2401 warn "removing commands";
2310 %COMMAND = (); 2402 %COMMAND = ();
2311 2403
2312 warn "remove ext commands"; 2404 warn "removing ext commands";
2313 %EXTCMD = (); 2405 %EXTCMD = ();
2314 2406
2315 warn "unload/nuke all extensions"; 2407 warn "unloading/nuking all extensions";
2316 for my $pkg (@EXTS) { 2408 for my $pkg (@EXTS) {
2317 warn "... unloading $pkg"; 2409 warn "... unloading $pkg";
2318 2410
2319 if (my $cb = $pkg->can ("unload")) { 2411 if (my $cb = $pkg->can ("unload")) {
2320 eval { 2412 eval {
… …
2325 2417
2326 warn "... nuking $pkg"; 2418 warn "... nuking $pkg";
2327 Symbol::delete_package $pkg; 2419 Symbol::delete_package $pkg;
2328 } 2420 }
2329 2421
2330 warn "unload all perl modules loaded from $LIBDIR"; 2422 warn "unloading all perl modules loaded from $LIBDIR";
2331 while (my ($k, $v) = each %INC) { 2423 while (my ($k, $v) = each %INC) {
2332 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2424 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2333 2425
2334 warn "removing <$k>"; 2426 warn "... unloading $k";
2335 delete $INC{$k}; 2427 delete $INC{$k};
2336 2428
2337 $k =~ s/\.pm$//; 2429 $k =~ s/\.pm$//;
2338 $k =~ s/\//::/g; 2430 $k =~ s/\//::/g;
2339 2431
… …
2342 } 2434 }
2343 2435
2344 Symbol::delete_package $k; 2436 Symbol::delete_package $k;
2345 } 2437 }
2346 2438
2347 warn "get rid of safe::, as good as possible"; 2439 warn "getting rid of safe::, as good as possible";
2348 Symbol::delete_package "safe::$_" 2440 Symbol::delete_package "safe::$_"
2349 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2441 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2350 2442
2351 warn "unload cf.pm \"a bit\""; 2443 warn "unloading cf.pm \"a bit\"";
2352 delete $INC{"cf.pm"}; 2444 delete $INC{"cf.pm"};
2353 2445
2354 # don't, removes xs symbols, too, 2446 # don't, removes xs symbols, too,
2355 # and global variables created in xs 2447 # and global variables created in xs
2356 #Symbol::delete_package __PACKAGE__; 2448 #Symbol::delete_package __PACKAGE__;
2357 2449
2450 warn "unload completed, starting to reload now";
2451
2358 warn "reloading cf.pm"; 2452 warn "reloading cf.pm";
2359 require cf; 2453 require cf;
2360 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2454 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2361 2455
2362 warn "load config and database again"; 2456 warn "loading config and database again";
2363 cf::cfg_load; 2457 cf::cfg_load;
2364 cf::db_load;
2365 2458
2366 warn "load extensions"; 2459 warn "loading extensions";
2367 cf::load_extensions; 2460 cf::load_extensions;
2368 2461
2369 warn "reattach attachments to objects/players"; 2462 warn "reattaching attachments to objects/players";
2370 _global_reattach; 2463 _global_reattach;
2371 warn "reattach attachments to maps"; 2464 warn "reattaching attachments to maps";
2372 reattach $_ for values %MAP; 2465 reattach $_ for values %MAP;
2373 };
2374 2466
2375 if ($@) { 2467 warn "loading reloadable resources";
2468 init_resources;
2469
2470 warn "leaving sync_job";
2471
2472 1
2473 } or do {
2376 warn $@; 2474 warn $@;
2377 warn "error while reloading, exiting."; 2475 warn "error while reloading, exiting.";
2378 exit 1; 2476 exit 1;
2379 } 2477 };
2380 2478
2381 warn "reloaded"; 2479 warn "reloaded";
2382}; 2480};
2383 2481
2482our $RELOAD_WATCHER; # used only during reload
2483
2384register_command "reload" => sub { 2484register_command "reload" => sub {
2385 my ($who, $arg) = @_; 2485 my ($who, $arg) = @_;
2386 2486
2387 if ($who->flag (FLAG_WIZ)) { 2487 if ($who->flag (FLAG_WIZ)) {
2388 $who->message ("start of reload."); 2488 $who->message ("reloading server.");
2489
2490 # doing reload synchronously and two reloads happen back-to-back,
2491 # coro crashes during coro_state_free->destroy here.
2492
2493 $RELOAD_WATCHER ||= Event->timer (
2494 reentrant => 0,
2495 after => 0,
2496 data => WF_AUTOCANCEL,
2497 cb => sub {
2389 reload; 2498 reload;
2390 $who->message ("end of reload."); 2499 undef $RELOAD_WATCHER;
2500 },
2501 );
2391 } 2502 }
2392}; 2503};
2393 2504
2394unshift @INC, $LIBDIR; 2505unshift @INC, $LIBDIR;
2506
2507my $bug_warning = 0;
2395 2508
2396$TICK_WATCHER = Event->timer ( 2509$TICK_WATCHER = Event->timer (
2397 reentrant => 0, 2510 reentrant => 0,
2511 parked => 1,
2398 prio => 0, 2512 prio => 0,
2399 at => $NEXT_TICK || $TICK, 2513 at => $NEXT_TICK || $TICK,
2400 data => WF_AUTOCANCEL, 2514 data => WF_AUTOCANCEL,
2401 cb => sub { 2515 cb => sub {
2516 if ($Coro::current != $Coro::main) {
2517 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2518 unless ++$bug_warning > 10;
2519 return;
2520 }
2521
2402 $NOW = Event::time; 2522 $NOW = Event::time;
2403 2523
2404 cf::server_tick; # one server iteration 2524 cf::server_tick; # one server iteration
2405 $RUNTIME += $TICK; 2525 $RUNTIME += $TICK;
2406 $NEXT_TICK += $TICK; 2526 $NEXT_TICK += $TICK;
2407 2527
2528 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2529 $NEXT_RUNTIME_WRITE = $NOW + 10;
2530 Coro::async_pool {
2531 write_runtime
2532 or warn "ERROR: unable to write runtime file: $!";
2533 };
2534 }
2535
2408 $WAIT_FOR_TICK->broadcast; 2536 $WAIT_FOR_TICK->broadcast;
2409 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2537 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2538
2539# my $AFTER = Event::time;
2540# warn $AFTER - $NOW;#d#
2410 2541
2411 # if we are delayed by four ticks or more, skip them all 2542 # if we are delayed by four ticks or more, skip them all
2412 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2543 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2413 2544
2414 $TICK_WATCHER->at ($NEXT_TICK); 2545 $TICK_WATCHER->at ($NEXT_TICK);
2415 $TICK_WATCHER->start; 2546 $TICK_WATCHER->start;
2416 }, 2547 },
2417); 2548);
2418 2549
2550{
2419IO::AIO::max_poll_time $TICK * 0.2; 2551 BDB::max_poll_time $TICK * 0.1;
2420 2552 $BDB_POLL_WATCHER = Event->io (
2421Event->io ( 2553 reentrant => 0,
2422 fd => IO::AIO::poll_fileno, 2554 fd => BDB::poll_fileno,
2423 poll => 'r', 2555 poll => 'r',
2424 prio => 5, 2556 prio => 0,
2425 data => WF_AUTOCANCEL,
2426 cb => \&IO::AIO::poll_cb,
2427);
2428
2429Event->timer (
2430 data => WF_AUTOCANCEL, 2557 data => WF_AUTOCANCEL,
2431 after => 0, 2558 cb => \&BDB::poll_cb,
2432 interval => 10, 2559 );
2433 cb => sub { 2560 BDB::min_parallel 8;
2434 (Coro::unblock_sub { 2561
2435 write_runtime 2562 BDB::set_sync_prepare {
2436 or warn "ERROR: unable to write runtime file: $!"; 2563 my $status;
2564 my $current = $Coro::current;
2565 (
2566 sub {
2567 $status = $!;
2568 $current->ready; undef $current;
2569 },
2570 sub {
2571 Coro::schedule while defined $current;
2572 $! = $status;
2573 },
2574 )
2575 };
2576
2577 unless ($DB_ENV) {
2578 $DB_ENV = BDB::db_env_create;
2579
2580 cf::sync_job {
2581 eval {
2582 BDB::db_env_open
2583 $DB_ENV,
2584 $BDB_ENV_DIR,
2585 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2586 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2587 0666;
2588
2589 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2590
2591 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2592 $DB_ENV->set_lk_detect;
2593 };
2594
2595 cf::cleanup "db_env_open(db): $@" if $@;
2437 })->(); 2596 };
2438 }, 2597 }
2439); 2598}
2599
2600{
2601 IO::AIO::min_parallel 8;
2602
2603 undef $Coro::AIO::WATCHER;
2604 IO::AIO::max_poll_time $TICK * 0.1;
2605 $AIO_POLL_WATCHER = Event->io (
2606 reentrant => 0,
2607 data => WF_AUTOCANCEL,
2608 fd => IO::AIO::poll_fileno,
2609 poll => 'r',
2610 prio => 6,
2611 cb => \&IO::AIO::poll_cb,
2612 );
2613}
2440 2614
2441END { cf::emergency_save } 2615END { cf::emergency_save }
2442 2616
24431 26171
2444 2618

Diff Legend

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