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.208 by root, Mon Feb 12 00:27:20 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 $WRITE_RUNTIME_WATCHER;
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 $WRITE_RUNTIME_WATCHER->start;
279 };
280 $WRITE_RUNTIME_WATCHER->stop;
263 $TICK_WATCHER->stop; 281 $TICK_WATCHER->stop;
264 $guard 282 $guard
265} 283}
266 284
267=item cf::async { BLOCK } 285=item cf::async { BLOCK }
… …
338 356
339 $coro 357 $coro
340} 358}
341 359
342sub write_runtime { 360sub write_runtime {
343 return unless $TICK_WATCHER->is_active;
344
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";
… …
759 } 787 }
760 } else { 788 } else {
761 aio_unlink $filename; 789 aio_unlink $filename;
762 aio_unlink "$filename.pst"; 790 aio_unlink "$filename.pst";
763 } 791 }
792
793 #d##TODO# nuke non .map-files if exist
794 if ($filename =~ s/\.map$//) {
795 aio_unlink $filename;
796 aio_unlink "$filename.pst";
797 }
764 } 798 }
765} 799}
766 800
767sub object_freezer_as_string { 801sub object_freezer_as_string {
768 my ($rdata, $objs) = @_; 802 my ($rdata, $objs) = @_;
… …
774 808
775sub object_thawer_load { 809sub object_thawer_load {
776 my ($filename) = @_; 810 my ($filename) = @_;
777 811
778 my ($data, $av); 812 my ($data, $av);
813
814 #d#TODO remove .map if file does not exist
815 aio_stat $filename and $filename =~ s/\.map$//;
779 816
780 (aio_load $filename, $data) >= 0 817 (aio_load $filename, $data) >= 0
781 or return; 818 or return;
782 819
783 unless (aio_stat "$filename.pst") { 820 unless (aio_stat "$filename.pst") {
… …
900 } or warn "$ext not loaded: $@"; 937 } or warn "$ext not loaded: $@";
901 } 938 }
902} 939}
903 940
904############################################################################# 941#############################################################################
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 942
920=head2 CORE EXTENSIONS 943=head2 CORE EXTENSIONS
921 944
922Functions and methods that extend core crossfire objects. 945Functions and methods that extend core crossfire objects.
923 946
… …
959 982
960sub exists($) { 983sub exists($) {
961 my ($login) = @_; 984 my ($login) = @_;
962 985
963 $cf::PLAYER{$login} 986 $cf::PLAYER{$login}
964 or cf::sync_job { !aio_stat $login } 987 or cf::sync_job { !aio_stat path $login }
965} 988}
966 989
967sub find($) { 990sub find($) {
968 return $cf::PLAYER{$_[0]} || do { 991 return $cf::PLAYER{$_[0]} || do {
969 my $login = $_[0]; 992 my $login = $_[0];
… …
1067=cut 1090=cut
1068 1091
1069sub maps($) { 1092sub maps($) {
1070 my ($pl) = @_; 1093 my ($pl) = @_;
1071 1094
1095 $pl = ref $pl ? $pl->ob->name : $pl;
1096
1072 my $files = aio_readdir playerdir $pl 1097 my $files = aio_readdir playerdir $pl
1073 or return; 1098 or return;
1074 1099
1075 my @paths; 1100 my @paths;
1076 1101
1077 for (@$files) { 1102 for (@$files) {
1078 utf8::decode $_; 1103 utf8::decode $_;
1079 next if /\.(?:pl|pst)$/; 1104 next if /\.(?:pl|pst)$/;
1080 next unless /^$PATH_SEP/o; 1105 next unless /^$PATH_SEP/o;
1081 1106
1082 push @paths, "~" . $pl->ob->name . "/" . $_; 1107 push @paths, cf::map::normalise "~$pl/$_";
1083 } 1108 }
1084 1109
1085 \@paths 1110 \@paths
1086} 1111}
1087 1112
… …
1114 1139
1115use Fcntl; 1140use Fcntl;
1116use Coro::AIO; 1141use Coro::AIO;
1117 1142
1118use overload 1143use overload
1119 '""' => \&as_string; 1144 '""' => \&as_string,
1145 fallback => 1;
1120 1146
1121our $MAX_RESET = 3600; 1147our $MAX_RESET = 3600;
1122our $DEFAULT_RESET = 3000; 1148our $DEFAULT_RESET = 3000;
1123 1149
1124sub generate_random_map { 1150sub generate_random_map {
1125 my ($self, $rmp) = @_; 1151 my ($self, $rmp) = @_;
1126
1127 # mit "rum" bekleckern, nicht 1152 # mit "rum" bekleckern, nicht
1128 $self->_create_random_map ( 1153 $self->_create_random_map (
1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1154 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1155 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1156 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1163 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1139 (cf::region::find $rmp->{region}), $rmp->{custom} 1164 (cf::region::find $rmp->{region}), $rmp->{custom}
1140 ) 1165 )
1141} 1166}
1142 1167
1168=item cf::map->register ($regex, $prio)
1169
1170Register a handler for the map path matching the given regex at the
1171givne priority (higher is better, built-in handlers have priority 0, the
1172default).
1173
1174=cut
1175
1143sub register { 1176sub register {
1144 my (undef, $regex) = @_; 1177 my (undef, $regex, $prio) = @_;
1145 my $pkg = caller; 1178 my $pkg = caller;
1146 1179
1147 no strict; 1180 no strict;
1148 push @{"$pkg\::ISA"}, __PACKAGE__; 1181 push @{"$pkg\::ISA"}, __PACKAGE__;
1149 1182
1150 $EXT_MAP{$pkg} = qr<$regex>; 1183 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1151} 1184}
1152 1185
1153# also paths starting with '/' 1186# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1187$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1188
1189sub thawer_merge {
1190 my ($self, $merge) = @_;
1191
1192 # we have to keep some variables in memory intact
1193 local $self->{path};
1194 local $self->{load_path};
1195 local $self->{deny_save};
1196 local $self->{deny_reset};
1197
1198 $self->SUPER::thawer_merge ($merge);
1199}
1155 1200
1156sub normalise { 1201sub normalise {
1157 my ($path, $base) = @_; 1202 my ($path, $base) = @_;
1203
1204 $path = "$path"; # make sure its a string
1205
1206 $path =~ s/\.map$//;
1158 1207
1159 # map plan: 1208 # map plan:
1160 # 1209 #
1161 # /! non-realised random map exit (special hack!) 1210 # /! non-realised random map exit (special hack!)
1162 # {... are special paths that are not being touched 1211 # {... are special paths that are not being touched
… …
1190 1239
1191 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1240 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1192 1241
1193 $path = normalise $path, $base; 1242 $path = normalise $path, $base;
1194 1243
1195 for my $pkg (keys %EXT_MAP) { 1244 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1196 if ($path =~ $EXT_MAP{$pkg}) { 1245 if ($path =~ $EXT_MAP{$pkg}[1]) {
1197 my $self = bless cf::map::new, $pkg; 1246 my $self = bless cf::map::new, $pkg;
1198 $self->{path} = $path; $self->path ($path); 1247 $self->{path} = $path; $self->path ($path);
1199 $self->init; # pass $1 etc. 1248 $self->init; # pass $1 etc.
1200 return $self; 1249 return $self;
1201 } 1250 }
1202 } 1251 }
1203 1252
1204 Carp::carp "unable to resolve path '$path'."; 1253 Carp::carp "unable to resolve path '$path' (base '$base').";
1205 () 1254 ()
1206} 1255}
1207 1256
1208sub init { 1257sub init {
1209 my ($self) = @_; 1258 my ($self) = @_;
… …
1220# the displayed name, this is a one way mapping 1269# the displayed name, this is a one way mapping
1221sub visible_name { 1270sub visible_name {
1222 &as_string 1271 &as_string
1223} 1272}
1224 1273
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 1274# the original (read-only) location
1233sub load_path { 1275sub load_path {
1234 my ($self) = @_; 1276 my ($self) = @_;
1235 1277
1236 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1278 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1237} 1279}
1238 1280
1239# the temporary/swap location 1281# the temporary/swap location
1240sub save_path { 1282sub save_path {
1241 my ($self) = @_; 1283 my ($self) = @_;
1242 1284
1285 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1243 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $self->_escaped_path 1286 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1244} 1287}
1245 1288
1246# the unique path, undef == no special unique path 1289# the unique path, undef == no special unique path
1247sub uniq_path { 1290sub uniq_path {
1248 my ($self) = @_; 1291 my ($self) = @_;
1249 1292
1293 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1250 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 1294 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1251} 1295}
1252 1296
1253# and all this just because we cannot iterate over 1297# and all this just because we cannot iterate over
1254# all maps in C++... 1298# all maps in C++...
1255sub change_all_map_light { 1299sub change_all_map_light {
… …
1261 1305
1262sub unlink_save { 1306sub unlink_save {
1263 my ($self) = @_; 1307 my ($self) = @_;
1264 1308
1265 utf8::encode (my $save = $self->save_path); 1309 utf8::encode (my $save = $self->save_path);
1266 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1310 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1267 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1311 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1312
1313 #d#TODO remove .map and also nuke
1314 $save =~ s/\.map// or return;#d#
1315 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1316 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
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
1556 delete $cf::MAP{$self->path}; 1614 delete $cf::MAP{$self->path};
1557 1615
1616 $self->in_memory (cf::MAP_SWAPPED);
1617 $self->clear;
1618
1558 $_->clear_links_to ($self) for values %cf::MAP; 1619 $_->clear_links_to ($self) for values %cf::MAP;
1559 1620
1560 $self->unlink_save; 1621 $self->unlink_save;
1561 $self->destroy; 1622 $self->destroy;
1562} 1623}
… …
1564my $nuke_counter = "aaaa"; 1625my $nuke_counter = "aaaa";
1565 1626
1566sub nuke { 1627sub nuke {
1567 my ($self) = @_; 1628 my ($self) = @_;
1568 1629
1630 delete $cf::MAP{$self->path};
1631
1632 $self->unlink_save;
1633
1634 bless $self, "cf::map";
1635 delete $self->{deny_reset};
1569 $self->{deny_save} = 1; 1636 $self->{deny_save} = 1;
1570 $self->reset_timeout (1); 1637 $self->reset_timeout (1);
1571 $self->rename ("{nuke}/" . ($nuke_counter++)); 1638 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1639
1640 $cf::MAP{$self->path} = $self;
1641
1572 $self->reset; # polite request, might not happen 1642 $self->reset; # polite request, might not happen
1573} 1643}
1574 1644
1575=item cf::map::unique_maps 1645=item cf::map::unique_maps
1576 1646
… …
1588 for (@$files) { 1658 for (@$files) {
1589 utf8::decode $_; 1659 utf8::decode $_;
1590 next if /\.pst$/; 1660 next if /\.pst$/;
1591 next unless /^$PATH_SEP/o; 1661 next unless /^$PATH_SEP/o;
1592 1662
1593 push @paths, $_; 1663 push @paths, cf::map::normalise $_;
1594 } 1664 }
1595 1665
1596 \@paths 1666 \@paths
1597} 1667}
1598 1668
… …
1692=cut 1762=cut
1693 1763
1694sub link_map { 1764sub link_map {
1695 unless ($LINK_MAP) { 1765 unless ($LINK_MAP) {
1696 $LINK_MAP = cf::map::find "{link}" 1766 $LINK_MAP = cf::map::find "{link}"
1697 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1767 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1698 $LINK_MAP->load; 1768 $LINK_MAP->load;
1699 } 1769 }
1700 1770
1701 $LINK_MAP 1771 $LINK_MAP
1702} 1772}
… …
1709 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1779 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710 1780
1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1781 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712 if $self->map; 1782 if $self->map;
1713 1783
1714 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1784 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1715} 1785}
1716 1786
1717sub cf::object::player::leave_link { 1787sub cf::object::player::leave_link {
1718 my ($self, $map, $x, $y) = @_; 1788 my ($self, $map, $x, $y) = @_;
1719 1789
… …
1786 my ($self, $path, $x, $y) = @_; 1856 my ($self, $path, $x, $y) = @_;
1787 1857
1788 $self->enter_link; 1858 $self->enter_link;
1789 1859
1790 (async { 1860 (async {
1861 my $map = eval {
1791 my $map = cf::map::find $path; 1862 my $map = cf::map::find $path;
1792 $map = $map->customise_for ($self) if $map; 1863 $map = $map->customise_for ($self) if $map;
1793 1864 $map
1794# warn "entering ", $map->path, " at ($x, $y)\n" 1865 } or
1795# if $map;
1796
1797 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1866 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1798 1867
1799 $self->leave_link ($map, $x, $y); 1868 $self->leave_link ($map, $x, $y);
1800 })->prio (1); 1869 })->prio (1);
1801} 1870}
1802 1871
… …
1806 1875
1807sub parse_random_map_params { 1876sub parse_random_map_params {
1808 my ($spec) = @_; 1877 my ($spec) = @_;
1809 1878
1810 my $rmp = { # defaults 1879 my $rmp = { # defaults
1811 xsize => 10, 1880 xsize => (cf::rndm 15, 40),
1812 ysize => 10, 1881 ysize => (cf::rndm 15, 40),
1882 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1883 #layout => string,
1813 }; 1884 };
1814 1885
1815 for (split /\n/, $spec) { 1886 for (split /\n/, $spec) {
1816 my ($k, $v) = split /\s+/, $_, 2; 1887 my ($k, $v) = split /\s+/, $_, 2;
1817 1888
… …
1821 $rmp 1892 $rmp
1822} 1893}
1823 1894
1824sub prepare_random_map { 1895sub prepare_random_map {
1825 my ($exit) = @_; 1896 my ($exit) = @_;
1897
1898 my $guard = cf::lock_acquire "exit_prepare:$exit";
1826 1899
1827 # all this does is basically replace the /! path by 1900 # all this does is basically replace the /! path by
1828 # a new random map path (?random/...) with a seed 1901 # a new random map path (?random/...) with a seed
1829 # that depends on the exit object 1902 # that depends on the exit object
1830 1903
1831 my $rmp = parse_random_map_params $exit->msg; 1904 my $rmp = parse_random_map_params $exit->msg;
1832 1905
1833 if ($exit->map) { 1906 if ($exit->map) {
1834 $rmp->{region} = $exit->map->region_name; 1907 $rmp->{region} = $exit->region->name;
1835 $rmp->{origin_map} = $exit->map->path; 1908 $rmp->{origin_map} = $exit->map->path;
1836 $rmp->{origin_x} = $exit->x; 1909 $rmp->{origin_x} = $exit->x;
1837 $rmp->{origin_y} = $exit->y; 1910 $rmp->{origin_y} = $exit->y;
1838 } 1911 }
1839 1912
1840 $rmp->{random_seed} ||= $exit->random_seed; 1913 $rmp->{random_seed} ||= $exit->random_seed;
1841 1914
1842 my $data = cf::to_json $rmp; 1915 my $data = cf::to_json $rmp;
1843 my $md5 = Digest::MD5::md5_hex $data; 1916 my $md5 = Digest::MD5::md5_hex $data;
1917 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1844 1918
1845 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1919 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1846 aio_write $fh, 0, (length $data), $data, 0; 1920 aio_write $fh, 0, (length $data), $data, 0;
1921 undef $fh;
1922 aio_rename "$meta~", $meta;
1847 1923
1848 $exit->slaying ("?random/$md5"); 1924 $exit->slaying ("?random/$md5");
1849 $exit->msg (undef); 1925 $exit->msg (undef);
1850 } 1926 }
1851} 1927}
1852 1928
1853sub cf::object::player::enter_exit { 1929sub cf::object::player::enter_exit {
1854 my ($self, $exit) = @_; 1930 my ($self, $exit) = @_;
1855 1931
1856 return unless $self->type == cf::PLAYER; 1932 return unless $self->type == cf::PLAYER;
1933
1934 if ($exit->slaying eq "/!") {
1935 #TODO: this should de-fi-ni-te-ly not be a sync-job
1936 cf::sync_job { prepare_random_map $exit };
1937 }
1938
1939 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1940 my $hp = $exit->stats->hp;
1941 my $sp = $exit->stats->sp;
1857 1942
1858 $self->enter_link; 1943 $self->enter_link;
1859 1944
1860 (async { 1945 (async {
1861 $self->deactivate_recursive; # just to be sure 1946 $self->deactivate_recursive; # just to be sure
1862 unless (eval { 1947 unless (eval {
1863 prepare_random_map $exit 1948 $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 1949
1869 1; 1950 1;
1870 }) { 1951 }) {
1871 $self->message ("Something went wrong deep within the crossfire server. " 1952 $self->message ("Something went wrong deep within the crossfire server. "
1872 . "I'll try to bring you back to the map you were before. " 1953 . "I'll try to bring you back to the map you were before. "
… …
1933 # get handled first 2014 # get handled first
1934 my $queue = delete $ns->{query_queue} 2015 my $queue = delete $ns->{query_queue}
1935 or return; # be conservative, not sure how that can happen, but we saw a crash here 2016 or return; # be conservative, not sure how that can happen, but we saw a crash here
1936 2017
1937 (shift @$queue)->[1]->($msg); 2018 (shift @$queue)->[1]->($msg);
2019 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1938 2020
1939 push @{ $ns->{query_queue} }, @$queue; 2021 push @{ $ns->{query_queue} }, @$queue;
1940 2022
1941 if (@{ $ns->{query_queue} } == @$queue) { 2023 if (@{ $ns->{query_queue} } == @$queue) {
1942 if (@$queue) { 2024 if (@$queue) {
… …
2103The parameter C<$family> should best start with the name of the extension 2185The parameter C<$family> should best start with the name of the extension
2104using it, it should be unique. 2186using it, it should be unique.
2105 2187
2106=over 4 2188=over 4
2107 2189
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 2190=item $value = cf::db_get $family => $key
2115 2191
2116Returns a single value from the database 2192Returns 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 2193
2123=item cf::db_put $family => $key => $value 2194=item cf::db_put $family => $key => $value
2124 2195
2125Stores the given C<$value> in the family hash. Updates are delayed, if you 2196Stores 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 2197
2136=cut 2198=cut
2137 2199
2138our $DB; 2200our $DB;
2139 2201
2140{ 2202sub db_load() {
2203 unless ($DB) {
2204 $DB = BDB::db_create $DB_ENV;
2205
2206 cf::sync_job {
2207 eval {
2208 $DB->set_flags (BDB::CHKSUM);
2209
2210 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2211 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2212 cf::cleanup "db_open(db): $!" if $!;
2213 };
2214 cf::cleanup "db_open(db): $@" if $@;
2215 };
2216
2141 my $path = cf::localdir . "/database.pst"; 2217 my $path = cf::localdir . "/database.pst";
2218 if (stat $path) {
2219 cf::sync_job {
2220 my $pst = Storable::retrieve $path;
2142 2221
2143 sub db_load() { 2222 cf::db_put (board => data => $pst->{board});
2144 $DB = stat $path ? Storable::retrieve $path : { }; 2223 cf::db_put (guildrules => data => $pst->{guildrules});
2145 } 2224 cf::db_put (rent => balance => $pst->{rent}{balance});
2225 BDB::db_env_txn_checkpoint $DB_ENV;
2146 2226
2147 my $pid; 2227 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 } 2228 };
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 }, 2229 }
2195 ); 2230 }
2231}
2232
2233sub db_get($$) {
2234 my $key = "$_[0]/$_[1]";
2235
2236 cf::sync_job {
2237 BDB::db_get $DB, undef, $key, my $data;
2238
2239 $! ? ()
2240 : Compress::LZF::sthaw $data
2241 }
2242}
2243
2244sub db_put($$$) {
2245 BDB::dbreq_pri 4;
2246 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2196} 2247}
2197 2248
2198############################################################################# 2249#############################################################################
2199# the server's main() 2250# the server's init and main functions
2251
2252sub load_resources {
2253 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2254 or die "unable to load regions file\n";#d#
2255}
2200 2256
2201sub cfg_load { 2257sub cfg_load {
2202 open my $fh, "<:utf8", cf::confdir . "/config" 2258 open my $fh, "<:utf8", cf::confdir . "/config"
2203 or return; 2259 or return;
2204 2260
… …
2217 }; 2273 };
2218 warn $@ if $@; 2274 warn $@ if $@;
2219 } 2275 }
2220} 2276}
2221 2277
2278sub init {
2279 load_resources;
2280}
2281
2222sub main { 2282sub main {
2223 # we must not ever block the main coroutine 2283 # we must not ever block the main coroutine
2224 local $Coro::idle = sub { 2284 local $Coro::idle = sub {
2225 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2285 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2286 (async {
2226 async { Event::one_event }; 2287 Event::one_event;
2288 })->prio (Coro::PRIO_MAX);
2227 }; 2289 };
2228 2290
2229 cfg_load; 2291 cfg_load;
2230 db_load; 2292 db_load;
2231 load_extensions; 2293 load_extensions;
2294
2295 $TICK_WATCHER->start;
2232 Event::loop; 2296 Event::loop;
2233} 2297}
2234 2298
2235############################################################################# 2299#############################################################################
2236# initialisation and cleanup 2300# initialisation and cleanup
2237 2301
2238# install some emergency cleanup handlers 2302# install some emergency cleanup handlers
2239BEGIN { 2303BEGIN {
2240 for my $signal (qw(INT HUP TERM)) { 2304 for my $signal (qw(INT HUP TERM)) {
2241 Event->signal ( 2305 Event->signal (
2306 reentrant => 0,
2242 data => WF_AUTOCANCEL, 2307 data => WF_AUTOCANCEL,
2243 signal => $signal, 2308 signal => $signal,
2309 prio => 0,
2244 cb => sub { 2310 cb => sub {
2245 cf::cleanup "SIG$signal"; 2311 cf::cleanup "SIG$signal";
2246 }, 2312 },
2247 ); 2313 );
2248 } 2314 }
2249} 2315}
… …
2254 warn "enter emergency perl save\n"; 2320 warn "enter emergency perl save\n";
2255 2321
2256 cf::sync_job { 2322 cf::sync_job {
2257 # use a peculiar iteration method to avoid tripping on perl 2323 # use a peculiar iteration method to avoid tripping on perl
2258 # refcount bugs in for. also avoids problems with players 2324 # refcount bugs in for. also avoids problems with players
2259 # and maps saved/Destroyed asynchronously. 2325 # and maps saved/destroyed asynchronously.
2260 warn "begin emergency player save\n"; 2326 warn "begin emergency player save\n";
2261 for my $login (keys %cf::PLAYER) { 2327 for my $login (keys %cf::PLAYER) {
2262 my $pl = $cf::PLAYER{$login} or next; 2328 my $pl = $cf::PLAYER{$login} or next;
2263 $pl->valid or next; 2329 $pl->valid or next;
2264 $pl->save; 2330 $pl->save;
… …
2270 my $map = $cf::MAP{$path} or next; 2336 my $map = $cf::MAP{$path} or next;
2271 $map->valid or next; 2337 $map->valid or next;
2272 $map->save; 2338 $map->save;
2273 } 2339 }
2274 warn "end emergency map save\n"; 2340 warn "end emergency map save\n";
2341
2342 warn "begin emergency database checkpoint\n";
2343 BDB::db_env_txn_checkpoint $DB_ENV;
2344 warn "end emergency database checkpoint\n";
2275 }; 2345 };
2276 2346
2277 warn "leave emergency perl save\n"; 2347 warn "leave emergency perl save\n";
2278} 2348}
2279 2349
2280sub reload() { 2350sub reload() {
2281 # can/must only be called in main 2351 # can/must only be called in main
2282 if ($Coro::current != $Coro::main) { 2352 if ($Coro::current != $Coro::main) {
2283 warn "can only reload from main coroutine\n"; 2353 warn "can only reload from main coroutine";
2284 return; 2354 return;
2285 } 2355 }
2286 2356
2287 warn "reloading..."; 2357 warn "reloading...";
2288 2358
2289 warn "freezing server"; 2359 warn "cancelling server ticker";
2290 my $guard = freeze_mainloop; 2360 $TICK_WATCHER->cancel;
2361
2291 cf::emergency_save; 2362 cf::emergency_save;
2292
2293 warn "sync database to disk";
2294 cf::db_sync;
2295 IO::AIO::flush;
2296 2363
2297 eval { 2364 eval {
2298 # if anything goes wrong in here, we should simply crash as we already saved 2365 # if anything goes wrong in here, we should simply crash as we already saved
2299 2366
2300 warn "cancel all watchers"; 2367 warn "cancelling all WF_AUTOCANCEL watchers";
2301 for (Event::all_watchers) { 2368 for (Event::all_watchers) {
2302 $_->cancel if $_->data & WF_AUTOCANCEL; 2369 $_->cancel if $_->data & WF_AUTOCANCEL;
2303 } 2370 }
2304 2371
2372 warn "syncing database to disk";
2373 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2374
2375 warn "flushing outstanding aio requests";
2376 for (;;) {
2377 BDB::flush;
2378 IO::AIO::flush;
2379 Coro::cede;
2380 last unless IO::AIO::nreqs || BDB::nreqs;
2381 warn "iterate...";
2382 }
2383
2305 warn "cancel all extension coros"; 2384 warn "cancelling all extension coros";
2306 $_->cancel for values %EXT_CORO; 2385 $_->cancel for values %EXT_CORO;
2307 %EXT_CORO = (); 2386 %EXT_CORO = ();
2308 2387
2309 warn "remove commands"; 2388 warn "removing commands";
2310 %COMMAND = (); 2389 %COMMAND = ();
2311 2390
2312 warn "remove ext commands"; 2391 warn "removing ext commands";
2313 %EXTCMD = (); 2392 %EXTCMD = ();
2314 2393
2315 warn "unload/nuke all extensions"; 2394 warn "unloading/nuking all extensions";
2316 for my $pkg (@EXTS) { 2395 for my $pkg (@EXTS) {
2317 warn "... unloading $pkg"; 2396 warn "... unloading $pkg";
2318 2397
2319 if (my $cb = $pkg->can ("unload")) { 2398 if (my $cb = $pkg->can ("unload")) {
2320 eval { 2399 eval {
… …
2325 2404
2326 warn "... nuking $pkg"; 2405 warn "... nuking $pkg";
2327 Symbol::delete_package $pkg; 2406 Symbol::delete_package $pkg;
2328 } 2407 }
2329 2408
2330 warn "unload all perl modules loaded from $LIBDIR"; 2409 warn "unloading all perl modules loaded from $LIBDIR";
2331 while (my ($k, $v) = each %INC) { 2410 while (my ($k, $v) = each %INC) {
2332 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2411 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2333 2412
2334 warn "removing <$k>"; 2413 warn "... unloading $k";
2335 delete $INC{$k}; 2414 delete $INC{$k};
2336 2415
2337 $k =~ s/\.pm$//; 2416 $k =~ s/\.pm$//;
2338 $k =~ s/\//::/g; 2417 $k =~ s/\//::/g;
2339 2418
… …
2342 } 2421 }
2343 2422
2344 Symbol::delete_package $k; 2423 Symbol::delete_package $k;
2345 } 2424 }
2346 2425
2347 warn "get rid of safe::, as good as possible"; 2426 warn "getting rid of safe::, as good as possible";
2348 Symbol::delete_package "safe::$_" 2427 Symbol::delete_package "safe::$_"
2349 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2428 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2350 2429
2351 warn "unload cf.pm \"a bit\""; 2430 warn "unloading cf.pm \"a bit\"";
2352 delete $INC{"cf.pm"}; 2431 delete $INC{"cf.pm"};
2353 2432
2354 # don't, removes xs symbols, too, 2433 # don't, removes xs symbols, too,
2355 # and global variables created in xs 2434 # and global variables created in xs
2356 #Symbol::delete_package __PACKAGE__; 2435 #Symbol::delete_package __PACKAGE__;
2357 2436
2437 warn "unload completed, starting to reload now";
2438
2358 warn "reloading cf.pm"; 2439 warn "reloading cf.pm";
2359 require cf; 2440 require cf;
2360 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2441 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2361 2442
2362 warn "load config and database again"; 2443 warn "loading config and database again";
2363 cf::cfg_load; 2444 cf::cfg_load;
2364 cf::db_load; 2445 cf::db_load;
2365 2446
2366 warn "load extensions"; 2447 warn "loading extensions";
2367 cf::load_extensions; 2448 cf::load_extensions;
2368 2449
2369 warn "reattach attachments to objects/players"; 2450 warn "reattaching attachments to objects/players";
2370 _global_reattach; 2451 _global_reattach;
2371 warn "reattach attachments to maps"; 2452 warn "reattaching attachments to maps";
2372 reattach $_ for values %MAP; 2453 reattach $_ for values %MAP;
2454
2455 warn "loading reloadable resources";
2456 load_resources;
2457
2458 warn "restarting server ticker";
2459
2460 $TICK_WATCHER->start;
2373 }; 2461 };
2374 2462
2375 if ($@) { 2463 if ($@) {
2376 warn $@; 2464 warn $@;
2377 warn "error while reloading, exiting."; 2465 warn "error while reloading, exiting.";
… …
2379 } 2467 }
2380 2468
2381 warn "reloaded"; 2469 warn "reloaded";
2382}; 2470};
2383 2471
2472our $RELOAD_WATCHER; # used only during reload
2473
2384register_command "reload" => sub { 2474register_command "reload" => sub {
2385 my ($who, $arg) = @_; 2475 my ($who, $arg) = @_;
2386 2476
2387 if ($who->flag (FLAG_WIZ)) { 2477 if ($who->flag (FLAG_WIZ)) {
2388 $who->message ("start of reload."); 2478 $who->message ("reloading server.");
2479
2480 # doing reload synchronously and two reloads happen back-to-back,
2481 # coro crashes during coro_state_free->destroy here.
2482
2483 $RELOAD_WATCHER ||= Event->timer (
2484 reentrant => 0,
2485 after => 0,
2486 data => WF_AUTOCANCEL,
2487 cb => sub {
2389 reload; 2488 reload;
2390 $who->message ("end of reload."); 2489 undef $RELOAD_WATCHER;
2490 },
2491 );
2391 } 2492 }
2392}; 2493};
2393 2494
2394unshift @INC, $LIBDIR; 2495unshift @INC, $LIBDIR;
2496
2497my $bug_warning = 0;
2395 2498
2396$TICK_WATCHER = Event->timer ( 2499$TICK_WATCHER = Event->timer (
2397 reentrant => 0, 2500 reentrant => 0,
2501 parked => 1,
2398 prio => 0, 2502 prio => 0,
2399 at => $NEXT_TICK || $TICK, 2503 at => $NEXT_TICK || $TICK,
2400 data => WF_AUTOCANCEL, 2504 data => WF_AUTOCANCEL,
2401 cb => sub { 2505 cb => sub {
2506 if ($Coro::current != $Coro::main) {
2507 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2508 unless ++$bug_warning > 10;
2509 return;
2510 }
2511
2402 $NOW = Event::time; 2512 $NOW = Event::time;
2403 2513
2404 cf::server_tick; # one server iteration 2514 cf::server_tick; # one server iteration
2405 $RUNTIME += $TICK; 2515 $RUNTIME += $TICK;
2406 $NEXT_TICK += $TICK; 2516 $NEXT_TICK += $TICK;
2407 2517
2408 $WAIT_FOR_TICK->broadcast; 2518 $WAIT_FOR_TICK->broadcast;
2409 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2519 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2520
2521 Event::sweep;
2522 Coro::cede_notself;
2523
2524# my $AFTER = Event::time;
2525# warn $AFTER - $NOW;#d#
2410 2526
2411 # if we are delayed by four ticks or more, skip them all 2527 # if we are delayed by four ticks or more, skip them all
2412 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2528 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2413 2529
2414 $TICK_WATCHER->at ($NEXT_TICK); 2530 $TICK_WATCHER->at ($NEXT_TICK);
2415 $TICK_WATCHER->start; 2531 $TICK_WATCHER->start;
2416 }, 2532 },
2417); 2533);
2418 2534
2535{
2536 BDB::max_poll_time $TICK * 0.1;
2537 $BDB_POLL_WATCHER = Event->io (
2538 reentrant => 0,
2539 fd => BDB::poll_fileno,
2540 poll => 'r',
2541 prio => 0,
2542 data => WF_AUTOCANCEL,
2543 cb => \&BDB::poll_cb,
2544 );
2545 BDB::min_parallel 8;
2546
2547 BDB::set_sync_prepare {
2548 my $status;
2549 my $current = $Coro::current;
2550 (
2551 sub {
2552 $status = $!;
2553 $current->ready; undef $current;
2554 },
2555 sub {
2556 Coro::schedule while defined $current;
2557 $! = $status;
2558 },
2559 )
2560 };
2561
2562 unless ($DB_ENV) {
2563 $DB_ENV = BDB::db_env_create;
2564
2565 cf::sync_job {
2566 eval {
2567 BDB::db_env_open
2568 $DB_ENV,
2569 $BDB_ENV_DIR,
2570 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2571 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2572 0666;
2573
2574 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2575
2576 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2577 $DB_ENV->set_lk_detect;
2578 };
2579
2580 cf::cleanup "db_env_open(db): $@" if $@;
2581 };
2582 }
2583}
2584
2585{
2586 IO::AIO::min_parallel 8;
2587
2588 undef $Coro::AIO::WATCHER;
2419IO::AIO::max_poll_time $TICK * 0.2; 2589 IO::AIO::max_poll_time $TICK * 0.1;
2420 2590 $AIO_POLL_WATCHER = Event->io (
2421Event->io ( 2591 reentrant => 0,
2422 fd => IO::AIO::poll_fileno, 2592 fd => IO::AIO::poll_fileno,
2423 poll => 'r', 2593 poll => 'r',
2424 prio => 5, 2594 prio => 6,
2425 data => WF_AUTOCANCEL, 2595 data => WF_AUTOCANCEL,
2426 cb => \&IO::AIO::poll_cb, 2596 cb => \&IO::AIO::poll_cb,
2427); 2597 );
2598}
2428 2599
2429Event->timer ( 2600$WRITE_RUNTIME_WATCHER = Event->timer (
2601 reentrant => 0,
2430 data => WF_AUTOCANCEL, 2602 data => WF_AUTOCANCEL,
2431 after => 0, 2603 after => 1,
2432 interval => 10, 2604 interval => 10,
2433 cb => sub { 2605 prio => 6, # keep it lowest so it acts like a watchdog
2434 (Coro::unblock_sub { 2606 cb => Coro::unblock_sub {
2435 write_runtime 2607 write_runtime
2436 or warn "ERROR: unable to write runtime file: $!"; 2608 or warn "ERROR: unable to write runtime file: $!";
2437 })->();
2438 }, 2609 },
2439); 2610);
2440 2611
2441END { cf::emergency_save } 2612END { cf::emergency_save }
2442 2613

Diff Legend

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