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.211 by root, Tue Feb 13 16:23:32 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; 361 $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1;
344 362
345 my $runtime = cf::localdir . "/runtime"; 363 my $runtime = cf::localdir . "/runtime";
346 364
347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 365 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
348 or return; 366 or return;
349 367
368 my $value = $cf::RUNTIME + 90 + 10;
350 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 369 # 10 is the runtime save interval, for a monotonic clock
370 # 60 allows for the watchdog to kill the server.
371
351 (aio_write $fh, 0, (length $value), $value, 0) <= 0 372 (aio_write $fh, 0, (length $value), $value, 0) <= 0
352 and return; 373 and return;
353 374
375 # always fsync - this file is important
354 aio_fsync $fh 376 aio_fsync $fh
355 and return; 377 and return;
356 378
357 close $fh 379 close $fh
358 or return; 380 or return;
… …
499our @CB_TYPE = (); # registry for type (cf-object class) based events 521our @CB_TYPE = (); # registry for type (cf-object class) based events
500our @CB_MAP = (); 522our @CB_MAP = ();
501 523
502my %attachment; 524my %attachment;
503 525
526sub cf::attachable::thawer_merge {
527 # simply override everything except _meta
528 local $_[0]{_meta};
529 %{$_[0]} = %{$_[1]};
530}
531
504sub _attach_cb($$$$) { 532sub _attach_cb($$$$) {
505 my ($registry, $event, $prio, $cb) = @_; 533 my ($registry, $event, $prio, $cb) = @_;
506 534
507 use sort 'stable'; 535 use sort 'stable';
508 536
… …
679# object support 707# object support
680 708
681sub reattach { 709sub reattach {
682 # basically do the same as instantiate, without calling instantiate 710 # basically do the same as instantiate, without calling instantiate
683 my ($obj) = @_; 711 my ($obj) = @_;
712
713 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
684 714
685 my $registry = $obj->registry; 715 my $registry = $obj->registry;
686 716
687 @$registry = (); 717 @$registry = ();
688 718
… …
735 $filename, length $$rdata, scalar @$objs; 765 $filename, length $$rdata, scalar @$objs;
736 766
737 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 767 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
738 chmod SAVE_MODE, $fh; 768 chmod SAVE_MODE, $fh;
739 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 769 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
740 aio_fsync $fh; 770 aio_fsync $fh if $cf::USE_FSYNC;
741 close $fh; 771 close $fh;
742 772
743 if (@$objs) { 773 if (@$objs) {
744 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 774 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
745 chmod SAVE_MODE, $fh; 775 chmod SAVE_MODE, $fh;
746 my $data = Storable::nfreeze { version => 1, objs => $objs }; 776 my $data = Storable::nfreeze { version => 1, objs => $objs };
747 aio_write $fh, 0, (length $data), $data, 0; 777 aio_write $fh, 0, (length $data), $data, 0;
748 aio_fsync $fh; 778 aio_fsync $fh if $cf::USE_FSYNC;
749 close $fh; 779 close $fh;
750 aio_rename "$filename.pst~", "$filename.pst"; 780 aio_rename "$filename.pst~", "$filename.pst";
751 } 781 }
752 } else { 782 } else {
753 aio_unlink "$filename.pst"; 783 aio_unlink "$filename.pst";
… …
759 } 789 }
760 } else { 790 } else {
761 aio_unlink $filename; 791 aio_unlink $filename;
762 aio_unlink "$filename.pst"; 792 aio_unlink "$filename.pst";
763 } 793 }
794
795 #d##TODO# nuke non .map-files if exist
796 if ($filename =~ s/\.map$//) {
797 aio_unlink $filename;
798 aio_unlink "$filename.pst";
799 }
764 } 800 }
765} 801}
766 802
767sub object_freezer_as_string { 803sub object_freezer_as_string {
768 my ($rdata, $objs) = @_; 804 my ($rdata, $objs) = @_;
… …
774 810
775sub object_thawer_load { 811sub object_thawer_load {
776 my ($filename) = @_; 812 my ($filename) = @_;
777 813
778 my ($data, $av); 814 my ($data, $av);
815
816 #d#TODO remove .map if file does not exist
817 aio_stat $filename and $filename =~ s/\.map$//;
779 818
780 (aio_load $filename, $data) >= 0 819 (aio_load $filename, $data) >= 0
781 or return; 820 or return;
782 821
783 unless (aio_stat "$filename.pst") { 822 unless (aio_stat "$filename.pst") {
… …
900 } or warn "$ext not loaded: $@"; 939 } or warn "$ext not loaded: $@";
901 } 940 }
902} 941}
903 942
904############################################################################# 943#############################################################################
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 944
920=head2 CORE EXTENSIONS 945=head2 CORE EXTENSIONS
921 946
922Functions and methods that extend core crossfire objects. 947Functions and methods that extend core crossfire objects.
923 948
… …
959 984
960sub exists($) { 985sub exists($) {
961 my ($login) = @_; 986 my ($login) = @_;
962 987
963 $cf::PLAYER{$login} 988 $cf::PLAYER{$login}
964 or cf::sync_job { !aio_stat $login } 989 or cf::sync_job { !aio_stat path $login }
965} 990}
966 991
967sub find($) { 992sub find($) {
968 return $cf::PLAYER{$_[0]} || do { 993 return $cf::PLAYER{$_[0]} || do {
969 my $login = $_[0]; 994 my $login = $_[0];
… …
1067=cut 1092=cut
1068 1093
1069sub maps($) { 1094sub maps($) {
1070 my ($pl) = @_; 1095 my ($pl) = @_;
1071 1096
1097 $pl = ref $pl ? $pl->ob->name : $pl;
1098
1072 my $files = aio_readdir playerdir $pl 1099 my $files = aio_readdir playerdir $pl
1073 or return; 1100 or return;
1074 1101
1075 my @paths; 1102 my @paths;
1076 1103
1077 for (@$files) { 1104 for (@$files) {
1078 utf8::decode $_; 1105 utf8::decode $_;
1079 next if /\.(?:pl|pst)$/; 1106 next if /\.(?:pl|pst)$/;
1080 next unless /^$PATH_SEP/o; 1107 next unless /^$PATH_SEP/o;
1081 1108
1082 push @paths, "~" . $pl->ob->name . "/" . $_; 1109 push @paths, cf::map::normalise "~$pl/$_";
1083 } 1110 }
1084 1111
1085 \@paths 1112 \@paths
1086} 1113}
1087 1114
… …
1114 1141
1115use Fcntl; 1142use Fcntl;
1116use Coro::AIO; 1143use Coro::AIO;
1117 1144
1118use overload 1145use overload
1119 '""' => \&as_string; 1146 '""' => \&as_string,
1147 fallback => 1;
1120 1148
1121our $MAX_RESET = 3600; 1149our $MAX_RESET = 3600;
1122our $DEFAULT_RESET = 3000; 1150our $DEFAULT_RESET = 3000;
1123 1151
1124sub generate_random_map { 1152sub generate_random_map {
1125 my ($self, $rmp) = @_; 1153 my ($self, $rmp) = @_;
1126
1127 # mit "rum" bekleckern, nicht 1154 # mit "rum" bekleckern, nicht
1128 $self->_create_random_map ( 1155 $self->_create_random_map (
1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1156 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1157 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1158 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1165 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1139 (cf::region::find $rmp->{region}), $rmp->{custom} 1166 (cf::region::find $rmp->{region}), $rmp->{custom}
1140 ) 1167 )
1141} 1168}
1142 1169
1170=item cf::map->register ($regex, $prio)
1171
1172Register a handler for the map path matching the given regex at the
1173givne priority (higher is better, built-in handlers have priority 0, the
1174default).
1175
1176=cut
1177
1143sub register { 1178sub register {
1144 my (undef, $regex) = @_; 1179 my (undef, $regex, $prio) = @_;
1145 my $pkg = caller; 1180 my $pkg = caller;
1146 1181
1147 no strict; 1182 no strict;
1148 push @{"$pkg\::ISA"}, __PACKAGE__; 1183 push @{"$pkg\::ISA"}, __PACKAGE__;
1149 1184
1150 $EXT_MAP{$pkg} = qr<$regex>; 1185 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1151} 1186}
1152 1187
1153# also paths starting with '/' 1188# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1189$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1190
1191sub thawer_merge {
1192 my ($self, $merge) = @_;
1193
1194 # we have to keep some variables in memory intact
1195 local $self->{path};
1196 local $self->{load_path};
1197 local $self->{deny_save};
1198 local $self->{deny_reset};
1199
1200 $self->SUPER::thawer_merge ($merge);
1201}
1155 1202
1156sub normalise { 1203sub normalise {
1157 my ($path, $base) = @_; 1204 my ($path, $base) = @_;
1205
1206 $path = "$path"; # make sure its a string
1207
1208 $path =~ s/\.map$//;
1158 1209
1159 # map plan: 1210 # map plan:
1160 # 1211 #
1161 # /! non-realised random map exit (special hack!) 1212 # /! non-realised random map exit (special hack!)
1162 # {... are special paths that are not being touched 1213 # {... are special paths that are not being touched
… …
1190 1241
1191 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1242 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1192 1243
1193 $path = normalise $path, $base; 1244 $path = normalise $path, $base;
1194 1245
1195 for my $pkg (keys %EXT_MAP) { 1246 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1196 if ($path =~ $EXT_MAP{$pkg}) { 1247 if ($path =~ $EXT_MAP{$pkg}[1]) {
1197 my $self = bless cf::map::new, $pkg; 1248 my $self = bless cf::map::new, $pkg;
1198 $self->{path} = $path; $self->path ($path); 1249 $self->{path} = $path; $self->path ($path);
1199 $self->init; # pass $1 etc. 1250 $self->init; # pass $1 etc.
1200 return $self; 1251 return $self;
1201 } 1252 }
1202 } 1253 }
1203 1254
1204 Carp::carp "unable to resolve path '$path'."; 1255 Carp::carp "unable to resolve path '$path' (base '$base').";
1205 () 1256 ()
1206} 1257}
1207 1258
1208sub init { 1259sub init {
1209 my ($self) = @_; 1260 my ($self) = @_;
… …
1220# the displayed name, this is a one way mapping 1271# the displayed name, this is a one way mapping
1221sub visible_name { 1272sub visible_name {
1222 &as_string 1273 &as_string
1223} 1274}
1224 1275
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 1276# the original (read-only) location
1233sub load_path { 1277sub load_path {
1234 my ($self) = @_; 1278 my ($self) = @_;
1235 1279
1236 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1280 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1237} 1281}
1238 1282
1239# the temporary/swap location 1283# the temporary/swap location
1240sub save_path { 1284sub save_path {
1241 my ($self) = @_; 1285 my ($self) = @_;
1242 1286
1287 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1243 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $self->_escaped_path 1288 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1244} 1289}
1245 1290
1246# the unique path, undef == no special unique path 1291# the unique path, undef == no special unique path
1247sub uniq_path { 1292sub uniq_path {
1248 my ($self) = @_; 1293 my ($self) = @_;
1249 1294
1295 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1250 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 1296 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1251} 1297}
1252 1298
1253# and all this just because we cannot iterate over 1299# and all this just because we cannot iterate over
1254# all maps in C++... 1300# all maps in C++...
1255sub change_all_map_light { 1301sub change_all_map_light {
… …
1261 1307
1262sub unlink_save { 1308sub unlink_save {
1263 my ($self) = @_; 1309 my ($self) = @_;
1264 1310
1265 utf8::encode (my $save = $self->save_path); 1311 utf8::encode (my $save = $self->save_path);
1266 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1312 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1267 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1314
1315 #d#TODO remove .map and also nuke
1316 $save =~ s/\.map// or return;#d#
1317 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1318 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1268} 1319}
1269 1320
1270sub load_header_from($) { 1321sub load_header_from($) {
1271 my ($self, $path) = @_; 1322 my ($self, $path) = @_;
1272 1323
1273 utf8::encode $path; 1324 utf8::encode $path;
1274 aio_open $path, O_RDONLY, 0 1325 #aio_open $path, O_RDONLY, 0
1275 or return; 1326 # or return;
1276 1327
1277 $self->_load_header ($path) 1328 $self->_load_header ($path)
1278 or return; 1329 or return;
1279 1330
1280 $self->{load_path} = $path; 1331 $self->{load_path} = $path;
1281 1332
1282 1 1333 1
1283} 1334}
1284 1335
1285sub load_orig { 1336sub load_header_orig {
1286 my ($self) = @_; 1337 my ($self) = @_;
1287 1338
1288 $self->load_header_from ($self->load_path) 1339 $self->load_header_from ($self->load_path)
1289} 1340}
1290 1341
1291sub load_temp { 1342sub load_header_temp {
1292 my ($self) = @_; 1343 my ($self) = @_;
1293 1344
1294 $self->load_header_from ($self->save_path) 1345 $self->load_header_from ($self->save_path)
1346}
1347
1348sub prepare_temp {
1349 my ($self) = @_;
1350
1351 $self->last_access ((delete $self->{last_access})
1352 || $cf::RUNTIME); #d#
1353 # safety
1354 $self->{instantiate_time} = $cf::RUNTIME
1355 if $self->{instantiate_time} > $cf::RUNTIME;
1356}
1357
1358sub prepare_orig {
1359 my ($self) = @_;
1360
1361 $self->{load_original} = 1;
1362 $self->{instantiate_time} = $cf::RUNTIME;
1363 $self->last_access ($cf::RUNTIME);
1364 $self->instantiate;
1295} 1365}
1296 1366
1297sub load_header { 1367sub load_header {
1298 my ($self) = @_; 1368 my ($self) = @_;
1299 1369
1300 if ($self->load_temp) { 1370 if ($self->load_header_temp) {
1301 $self->last_access ((delete $self->{last_access}) 1371 $self->prepare_temp;
1302 || $cf::RUNTIME); #d#
1303 # safety
1304 $self->{instantiate_time} = $cf::RUNTIME
1305 if $self->{instantiate_time} > $cf::RUNTIME;
1306 } else { 1372 } else {
1307 $self->load_orig 1373 $self->load_header_orig
1308 or return; 1374 or return;
1309 1375 $self->prepare_orig;
1310 $self->{load_original} = 1;
1311 $self->{instantiate_time} = $cf::RUNTIME;
1312 $self->last_access ($cf::RUNTIME);
1313 $self->instantiate;
1314 } 1376 }
1315 1377
1316 1 1378 1
1317} 1379}
1318 1380
… …
1332 $map->{last_save} = $cf::RUNTIME; 1394 $map->{last_save} = $cf::RUNTIME;
1333 1395
1334 $map->load_header 1396 $map->load_header
1335 or return; 1397 or return;
1336 1398
1337 if ($map->should_reset) { 1399 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1400 # doing this can freeze the server in a sync job, obviously
1401 #$cf::WAIT_FOR_TICK->wait;
1338 $map->reset; 1402 $map->reset;
1339 undef $guard; 1403 undef $guard;
1340 $map = find $path 1404 return find $path;
1341 or return;
1342 } 1405 }
1343 1406
1344 $cf::MAP{$path} = $map 1407 $cf::MAP{$path} = $map
1345 } 1408 }
1346} 1409}
1410
1411sub pre_load { }
1412sub post_load { }
1347 1413
1348sub load { 1414sub load {
1349 my ($self) = @_; 1415 my ($self) = @_;
1350 1416
1417 local $self->{deny_reset} = 1; # loading can take a long time
1418
1351 my $path = $self->{path}; 1419 my $path = $self->{path};
1352 my $guard = cf::lock_acquire "map_load:$path"; 1420 my $guard = cf::lock_acquire "map_load:$path";
1353 1421
1354 return if $self->in_memory != cf::MAP_SWAPPED; 1422 return if $self->in_memory != cf::MAP_SWAPPED;
1355 1423
1356 $self->in_memory (cf::MAP_LOADING); 1424 $self->in_memory (cf::MAP_LOADING);
1357 1425
1358 $self->alloc; 1426 $self->alloc;
1427
1428 $self->pre_load;
1429
1359 $self->_load_objects ($self->{load_path}, 1) 1430 $self->_load_objects ($self->{load_path}, 1)
1360 or return; 1431 or return;
1361 1432
1362 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1433 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1363 if delete $self->{load_original}; 1434 if delete $self->{load_original};
… …
1385 unless $self->difficulty; 1456 unless $self->difficulty;
1386 Coro::cede; 1457 Coro::cede;
1387 $self->activate; 1458 $self->activate;
1388 } 1459 }
1389 1460
1461 $self->post_load;
1462
1390 $self->in_memory (cf::MAP_IN_MEMORY); 1463 $self->in_memory (cf::MAP_IN_MEMORY);
1391} 1464}
1392 1465
1393sub customise_for { 1466sub customise_for {
1394 my ($self, $ob) = @_; 1467 my ($self, $ob) = @_;
… …
1434 1507
1435 cf::sync_job { $map->load }; 1508 cf::sync_job { $map->load };
1436} 1509}
1437 1510
1438our %MAP_PREFETCH; 1511our %MAP_PREFETCH;
1439our $MAP_PREFETCHER = Coro::async { 1512our $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 1513
1452sub find_async { 1514sub find_async {
1453 my ($path, $origin) = @_; 1515 my ($path, $origin) = @_;
1454 1516
1455 $path = normalise $path, $origin && $origin->{path}; 1517 $path = normalise $path, $origin && $origin->{path};
1456 1518
1457 if (my $map = $cf::MAP{$path}) { 1519 if (my $map = $cf::MAP{$path}) {
1458 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1520 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1459 } 1521 }
1460 1522
1461 $MAP_PREFETCH{$path} = 0; 1523 undef $MAP_PREFETCH{$path};
1524 $MAP_PREFETCHER ||= cf::async {
1525 while (%MAP_PREFETCH) {
1526 for my $path (keys %MAP_PREFETCH) {
1527 my $map = find $path
1528 or next;
1529 $map->load;
1530
1531 delete $MAP_PREFETCH{$path};
1532 }
1533 }
1534 undef $MAP_PREFETCHER;
1535 };
1462 $MAP_PREFETCHER->ready; 1536 $MAP_PREFETCHER->prio (6);
1463 1537
1464 () 1538 ()
1465} 1539}
1466 1540
1467sub save { 1541sub save {
… …
1512 1586
1513sub reset_at { 1587sub reset_at {
1514 my ($self) = @_; 1588 my ($self) = @_;
1515 1589
1516 # TODO: safety, remove and allow resettable per-player maps 1590 # TODO: safety, remove and allow resettable per-player maps
1517 return 1e99 if $self->isa ("ext::map_per_player"); 1591 return 1e99 if $self->isa ("ext::map_per_player");#d#
1518 return 1e99 if $self->{deny_reset}; 1592 return 1e99 if $self->{deny_reset};
1519 1593
1520 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1594 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1521 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1595 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1522 1596
… …
1527 my ($self) = @_; 1601 my ($self) = @_;
1528 1602
1529 $self->reset_at <= $cf::RUNTIME 1603 $self->reset_at <= $cf::RUNTIME
1530} 1604}
1531 1605
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 { 1606sub reset {
1547 my ($self) = @_; 1607 my ($self) = @_;
1548 1608
1549 my $lock = cf::lock_acquire "map_data:" . $self->path; 1609 my $lock = cf::lock_acquire "map_data:$self->{path}";
1550 1610
1551 return if $self->players; 1611 return if $self->players;
1552 return if $self->isa ("ext::map_per_player");#d# 1612 return if $self->isa ("ext::map_per_player");#d#
1553 1613
1554 warn "resetting map ", $self->path;#d# 1614 warn "resetting map ", $self->path;#d#
1555 1615
1616 $self->in_memory (cf::MAP_SWAPPED);
1617
1618 # need to save uniques path
1619 unless ($self->{deny_save}) {
1620 my $uniq = $self->uniq_path; utf8::encode $uniq;
1621
1622 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1623 if $uniq;
1624 }
1625
1556 delete $cf::MAP{$self->path}; 1626 delete $cf::MAP{$self->path};
1627
1628 $self->clear;
1557 1629
1558 $_->clear_links_to ($self) for values %cf::MAP; 1630 $_->clear_links_to ($self) for values %cf::MAP;
1559 1631
1560 $self->unlink_save; 1632 $self->unlink_save;
1561 $self->destroy; 1633 $self->destroy;
… …
1564my $nuke_counter = "aaaa"; 1636my $nuke_counter = "aaaa";
1565 1637
1566sub nuke { 1638sub nuke {
1567 my ($self) = @_; 1639 my ($self) = @_;
1568 1640
1641 delete $cf::MAP{$self->path};
1642
1643 $self->unlink_save;
1644
1645 bless $self, "cf::map";
1646 delete $self->{deny_reset};
1569 $self->{deny_save} = 1; 1647 $self->{deny_save} = 1;
1570 $self->reset_timeout (1); 1648 $self->reset_timeout (1);
1571 $self->rename ("{nuke}/" . ($nuke_counter++)); 1649 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1650
1651 $cf::MAP{$self->path} = $self;
1652
1572 $self->reset; # polite request, might not happen 1653 $self->reset; # polite request, might not happen
1573} 1654}
1574 1655
1575=item cf::map::unique_maps 1656=item cf::map::unique_maps
1576 1657
… …
1588 for (@$files) { 1669 for (@$files) {
1589 utf8::decode $_; 1670 utf8::decode $_;
1590 next if /\.pst$/; 1671 next if /\.pst$/;
1591 next unless /^$PATH_SEP/o; 1672 next unless /^$PATH_SEP/o;
1592 1673
1593 push @paths, $_; 1674 push @paths, cf::map::normalise $_;
1594 } 1675 }
1595 1676
1596 \@paths 1677 \@paths
1597} 1678}
1598 1679
… …
1692=cut 1773=cut
1693 1774
1694sub link_map { 1775sub link_map {
1695 unless ($LINK_MAP) { 1776 unless ($LINK_MAP) {
1696 $LINK_MAP = cf::map::find "{link}" 1777 $LINK_MAP = cf::map::find "{link}"
1697 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1778 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1698 $LINK_MAP->load; 1779 $LINK_MAP->load;
1699 } 1780 }
1700 1781
1701 $LINK_MAP 1782 $LINK_MAP
1702} 1783}
… …
1709 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1790 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710 1791
1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1792 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712 if $self->map; 1793 if $self->map;
1713 1794
1714 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1795 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1715} 1796}
1716 1797
1717sub cf::object::player::leave_link { 1798sub cf::object::player::leave_link {
1718 my ($self, $map, $x, $y) = @_; 1799 my ($self, $map, $x, $y) = @_;
1719 1800
… …
1786 my ($self, $path, $x, $y) = @_; 1867 my ($self, $path, $x, $y) = @_;
1787 1868
1788 $self->enter_link; 1869 $self->enter_link;
1789 1870
1790 (async { 1871 (async {
1872 my $map = eval {
1791 my $map = cf::map::find $path; 1873 my $map = cf::map::find $path;
1792 $map = $map->customise_for ($self) if $map; 1874 $map = $map->customise_for ($self) if $map;
1793 1875 $map
1794# warn "entering ", $map->path, " at ($x, $y)\n" 1876 } or
1795# if $map;
1796
1797 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1877 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1798 1878
1799 $self->leave_link ($map, $x, $y); 1879 $self->leave_link ($map, $x, $y);
1800 })->prio (1); 1880 })->prio (1);
1801} 1881}
1802 1882
… …
1806 1886
1807sub parse_random_map_params { 1887sub parse_random_map_params {
1808 my ($spec) = @_; 1888 my ($spec) = @_;
1809 1889
1810 my $rmp = { # defaults 1890 my $rmp = { # defaults
1811 xsize => 10, 1891 xsize => (cf::rndm 15, 40),
1812 ysize => 10, 1892 ysize => (cf::rndm 15, 40),
1893 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1894 #layout => string,
1813 }; 1895 };
1814 1896
1815 for (split /\n/, $spec) { 1897 for (split /\n/, $spec) {
1816 my ($k, $v) = split /\s+/, $_, 2; 1898 my ($k, $v) = split /\s+/, $_, 2;
1817 1899
… …
1821 $rmp 1903 $rmp
1822} 1904}
1823 1905
1824sub prepare_random_map { 1906sub prepare_random_map {
1825 my ($exit) = @_; 1907 my ($exit) = @_;
1908
1909 my $guard = cf::lock_acquire "exit_prepare:$exit";
1826 1910
1827 # all this does is basically replace the /! path by 1911 # all this does is basically replace the /! path by
1828 # a new random map path (?random/...) with a seed 1912 # a new random map path (?random/...) with a seed
1829 # that depends on the exit object 1913 # that depends on the exit object
1830 1914
1831 my $rmp = parse_random_map_params $exit->msg; 1915 my $rmp = parse_random_map_params $exit->msg;
1832 1916
1833 if ($exit->map) { 1917 if ($exit->map) {
1834 $rmp->{region} = $exit->map->region_name; 1918 $rmp->{region} = $exit->region->name;
1835 $rmp->{origin_map} = $exit->map->path; 1919 $rmp->{origin_map} = $exit->map->path;
1836 $rmp->{origin_x} = $exit->x; 1920 $rmp->{origin_x} = $exit->x;
1837 $rmp->{origin_y} = $exit->y; 1921 $rmp->{origin_y} = $exit->y;
1838 } 1922 }
1839 1923
1840 $rmp->{random_seed} ||= $exit->random_seed; 1924 $rmp->{random_seed} ||= $exit->random_seed;
1841 1925
1842 my $data = cf::to_json $rmp; 1926 my $data = cf::to_json $rmp;
1843 my $md5 = Digest::MD5::md5_hex $data; 1927 my $md5 = Digest::MD5::md5_hex $data;
1928 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1844 1929
1845 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1930 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1846 aio_write $fh, 0, (length $data), $data, 0; 1931 aio_write $fh, 0, (length $data), $data, 0;
1932 undef $fh;
1933 aio_rename "$meta~", $meta;
1847 1934
1848 $exit->slaying ("?random/$md5"); 1935 $exit->slaying ("?random/$md5");
1849 $exit->msg (undef); 1936 $exit->msg (undef);
1850 } 1937 }
1851} 1938}
1852 1939
1853sub cf::object::player::enter_exit { 1940sub cf::object::player::enter_exit {
1854 my ($self, $exit) = @_; 1941 my ($self, $exit) = @_;
1855 1942
1856 return unless $self->type == cf::PLAYER; 1943 return unless $self->type == cf::PLAYER;
1944
1945 if ($exit->slaying eq "/!") {
1946 #TODO: this should de-fi-ni-te-ly not be a sync-job
1947 cf::sync_job { prepare_random_map $exit };
1948 }
1949
1950 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1951 my $hp = $exit->stats->hp;
1952 my $sp = $exit->stats->sp;
1857 1953
1858 $self->enter_link; 1954 $self->enter_link;
1859 1955
1860 (async { 1956 (async {
1861 $self->deactivate_recursive; # just to be sure 1957 $self->deactivate_recursive; # just to be sure
1862 unless (eval { 1958 unless (eval {
1863 prepare_random_map $exit 1959 $self->goto ($slaying, $hp, $sp);
1864 if $exit->slaying eq "/!";
1865
1866 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1867 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1868 1960
1869 1; 1961 1;
1870 }) { 1962 }) {
1871 $self->message ("Something went wrong deep within the crossfire server. " 1963 $self->message ("Something went wrong deep within the crossfire server. "
1872 . "I'll try to bring you back to the map you were before. " 1964 . "I'll try to bring you back to the map you were before. "
… …
1933 # get handled first 2025 # get handled first
1934 my $queue = delete $ns->{query_queue} 2026 my $queue = delete $ns->{query_queue}
1935 or return; # be conservative, not sure how that can happen, but we saw a crash here 2027 or return; # be conservative, not sure how that can happen, but we saw a crash here
1936 2028
1937 (shift @$queue)->[1]->($msg); 2029 (shift @$queue)->[1]->($msg);
2030 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1938 2031
1939 push @{ $ns->{query_queue} }, @$queue; 2032 push @{ $ns->{query_queue} }, @$queue;
1940 2033
1941 if (@{ $ns->{query_queue} } == @$queue) { 2034 if (@{ $ns->{query_queue} } == @$queue) {
1942 if (@$queue) { 2035 if (@$queue) {
… …
2103The parameter C<$family> should best start with the name of the extension 2196The parameter C<$family> should best start with the name of the extension
2104using it, it should be unique. 2197using it, it should be unique.
2105 2198
2106=over 4 2199=over 4
2107 2200
2108=item $hashref = cf::db_get $family
2109
2110Return a hashref for use by the extension C<$family>, which can be
2111modified. After modifications, you have to call C<cf::db_dirty> or
2112C<cf::db_sync>.
2113
2114=item $value = cf::db_get $family => $key 2201=item $value = cf::db_get $family => $key
2115 2202
2116Returns a single value from the database 2203Returns a single value from the database.
2117
2118=item cf::db_put $family => $hashref
2119
2120Stores the given family hashref into the database. Updates are delayed, if
2121you want the data to be synced to disk immediately, use C<cf::db_sync>.
2122 2204
2123=item cf::db_put $family => $key => $value 2205=item cf::db_put $family => $key => $value
2124 2206
2125Stores the given C<$value> in the family hash. Updates are delayed, if you 2207Stores the given C<$value> in the family.
2126want the data to be synced to disk immediately, use C<cf::db_sync>.
2127
2128=item cf::db_dirty
2129
2130Marks the database as dirty, to be updated at a later time.
2131
2132=item cf::db_sync
2133
2134Immediately write the database to disk I<if it is dirty>.
2135 2208
2136=cut 2209=cut
2137 2210
2138our $DB; 2211our $DB;
2139 2212
2140{ 2213sub db_init {
2214 unless ($DB) {
2215 $DB = BDB::db_create $DB_ENV;
2216
2217 cf::sync_job {
2218 eval {
2219 $DB->set_flags (BDB::CHKSUM);
2220
2221 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2222 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2223 cf::cleanup "db_open(db): $!" if $!;
2224 };
2225 cf::cleanup "db_open(db): $@" if $@;
2226 };
2227
2141 my $path = cf::localdir . "/database.pst"; 2228 my $path = cf::localdir . "/database.pst";
2229 if (stat $path) {
2230 cf::sync_job {
2231 my $pst = Storable::retrieve $path;
2142 2232
2143 sub db_load() { 2233 cf::db_put (board => data => $pst->{board});
2144 $DB = stat $path ? Storable::retrieve $path : { }; 2234 cf::db_put (guildrules => data => $pst->{guildrules});
2145 } 2235 cf::db_put (rent => balance => $pst->{rent}{balance});
2236 BDB::db_env_txn_checkpoint $DB_ENV;
2146 2237
2147 my $pid; 2238 unlink $path;
2148
2149 sub db_save() {
2150 waitpid $pid, 0 if $pid;
2151 if (0 == ($pid = fork)) {
2152 $DB->{_meta}{version} = 1;
2153 Storable::nstore $DB, "$path~";
2154 rename "$path~", $path;
2155 cf::_exit 0 if defined $pid;
2156 } 2239 };
2157 }
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 }, 2240 }
2195 ); 2241 }
2242}
2243
2244sub db_get($$) {
2245 my $key = "$_[0]/$_[1]";
2246
2247 cf::sync_job {
2248 BDB::db_get $DB, undef, $key, my $data;
2249
2250 $! ? ()
2251 : Compress::LZF::sthaw $data
2252 }
2253}
2254
2255sub db_put($$$) {
2256 BDB::dbreq_pri 4;
2257 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2196} 2258}
2197 2259
2198############################################################################# 2260#############################################################################
2199# the server's main() 2261# the server's init and main functions
2262
2263sub load_resources {
2264 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2265 or die "unable to load regions file\n";#d#
2266}
2200 2267
2201sub cfg_load { 2268sub cfg_load {
2202 open my $fh, "<:utf8", cf::confdir . "/config" 2269 open my $fh, "<:utf8", cf::confdir . "/config"
2203 or return; 2270 or return;
2204 2271
… …
2217 }; 2284 };
2218 warn $@ if $@; 2285 warn $@ if $@;
2219 } 2286 }
2220} 2287}
2221 2288
2289sub init {
2290 load_resources;
2291}
2292
2222sub main { 2293sub main {
2223 # we must not ever block the main coroutine 2294 # we must not ever block the main coroutine
2224 local $Coro::idle = sub { 2295 local $Coro::idle = sub {
2225 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2296 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2297 (async {
2226 async { Event::one_event }; 2298 Event::one_event;
2299 })->prio (Coro::PRIO_MAX);
2227 }; 2300 };
2228 2301
2229 cfg_load; 2302 cfg_load;
2230 db_load; 2303 db_init;
2231 load_extensions; 2304 load_extensions;
2305
2306 $TICK_WATCHER->start;
2232 Event::loop; 2307 Event::loop;
2233} 2308}
2234 2309
2235############################################################################# 2310#############################################################################
2236# initialisation and cleanup 2311# initialisation and cleanup
2237 2312
2238# install some emergency cleanup handlers 2313# install some emergency cleanup handlers
2239BEGIN { 2314BEGIN {
2240 for my $signal (qw(INT HUP TERM)) { 2315 for my $signal (qw(INT HUP TERM)) {
2241 Event->signal ( 2316 Event->signal (
2317 reentrant => 0,
2242 data => WF_AUTOCANCEL, 2318 data => WF_AUTOCANCEL,
2243 signal => $signal, 2319 signal => $signal,
2320 prio => 0,
2244 cb => sub { 2321 cb => sub {
2245 cf::cleanup "SIG$signal"; 2322 cf::cleanup "SIG$signal";
2246 }, 2323 },
2247 ); 2324 );
2248 } 2325 }
2249} 2326}
… …
2254 warn "enter emergency perl save\n"; 2331 warn "enter emergency perl save\n";
2255 2332
2256 cf::sync_job { 2333 cf::sync_job {
2257 # use a peculiar iteration method to avoid tripping on perl 2334 # use a peculiar iteration method to avoid tripping on perl
2258 # refcount bugs in for. also avoids problems with players 2335 # refcount bugs in for. also avoids problems with players
2259 # and maps saved/Destroyed asynchronously. 2336 # and maps saved/destroyed asynchronously.
2260 warn "begin emergency player save\n"; 2337 warn "begin emergency player save\n";
2261 for my $login (keys %cf::PLAYER) { 2338 for my $login (keys %cf::PLAYER) {
2262 my $pl = $cf::PLAYER{$login} or next; 2339 my $pl = $cf::PLAYER{$login} or next;
2263 $pl->valid or next; 2340 $pl->valid or next;
2264 $pl->save; 2341 $pl->save;
… …
2270 my $map = $cf::MAP{$path} or next; 2347 my $map = $cf::MAP{$path} or next;
2271 $map->valid or next; 2348 $map->valid or next;
2272 $map->save; 2349 $map->save;
2273 } 2350 }
2274 warn "end emergency map save\n"; 2351 warn "end emergency map save\n";
2352
2353 warn "begin emergency database checkpoint\n";
2354 BDB::db_env_txn_checkpoint $DB_ENV;
2355 warn "end emergency database checkpoint\n";
2275 }; 2356 };
2276 2357
2277 warn "leave emergency perl save\n"; 2358 warn "leave emergency perl save\n";
2359}
2360
2361sub post_cleanup {
2362 my ($make_core) = @_;
2363
2364 warn Carp::longmess "post_cleanup backtrace"
2365 if $make_core;
2278} 2366}
2279 2367
2280sub reload() { 2368sub reload() {
2281 # can/must only be called in main 2369 # can/must only be called in main
2282 if ($Coro::current != $Coro::main) { 2370 if ($Coro::current != $Coro::main) {
2283 warn "can only reload from main coroutine\n"; 2371 warn "can only reload from main coroutine";
2284 return; 2372 return;
2285 } 2373 }
2286 2374
2287 warn "reloading..."; 2375 warn "reloading...";
2288 2376
2289 warn "freezing server"; 2377 warn "cancelling server ticker";
2290 my $guard = freeze_mainloop; 2378 $TICK_WATCHER->cancel;
2379
2291 cf::emergency_save; 2380 cf::emergency_save;
2292
2293 warn "sync database to disk";
2294 cf::db_sync;
2295 IO::AIO::flush;
2296 2381
2297 eval { 2382 eval {
2298 # if anything goes wrong in here, we should simply crash as we already saved 2383 # if anything goes wrong in here, we should simply crash as we already saved
2299 2384
2300 warn "cancel all watchers"; 2385 warn "cancelling all WF_AUTOCANCEL watchers";
2301 for (Event::all_watchers) { 2386 for (Event::all_watchers) {
2302 $_->cancel if $_->data & WF_AUTOCANCEL; 2387 $_->cancel if $_->data & WF_AUTOCANCEL;
2303 } 2388 }
2304 2389
2390 warn "syncing database to disk";
2391 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2392
2393 warn "flushing outstanding aio requests";
2394 for (;;) {
2395 BDB::flush;
2396 IO::AIO::flush;
2397 Coro::cede;
2398 last unless IO::AIO::nreqs || BDB::nreqs;
2399 warn "iterate...";
2400 }
2401
2305 warn "cancel all extension coros"; 2402 warn "cancelling all extension coros";
2306 $_->cancel for values %EXT_CORO; 2403 $_->cancel for values %EXT_CORO;
2307 %EXT_CORO = (); 2404 %EXT_CORO = ();
2308 2405
2309 warn "remove commands"; 2406 warn "removing commands";
2310 %COMMAND = (); 2407 %COMMAND = ();
2311 2408
2312 warn "remove ext commands"; 2409 warn "removing ext commands";
2313 %EXTCMD = (); 2410 %EXTCMD = ();
2314 2411
2315 warn "unload/nuke all extensions"; 2412 warn "unloading/nuking all extensions";
2316 for my $pkg (@EXTS) { 2413 for my $pkg (@EXTS) {
2317 warn "... unloading $pkg"; 2414 warn "... unloading $pkg";
2318 2415
2319 if (my $cb = $pkg->can ("unload")) { 2416 if (my $cb = $pkg->can ("unload")) {
2320 eval { 2417 eval {
… …
2325 2422
2326 warn "... nuking $pkg"; 2423 warn "... nuking $pkg";
2327 Symbol::delete_package $pkg; 2424 Symbol::delete_package $pkg;
2328 } 2425 }
2329 2426
2330 warn "unload all perl modules loaded from $LIBDIR"; 2427 warn "unloading all perl modules loaded from $LIBDIR";
2331 while (my ($k, $v) = each %INC) { 2428 while (my ($k, $v) = each %INC) {
2332 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2429 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2333 2430
2334 warn "removing <$k>"; 2431 warn "... unloading $k";
2335 delete $INC{$k}; 2432 delete $INC{$k};
2336 2433
2337 $k =~ s/\.pm$//; 2434 $k =~ s/\.pm$//;
2338 $k =~ s/\//::/g; 2435 $k =~ s/\//::/g;
2339 2436
… …
2342 } 2439 }
2343 2440
2344 Symbol::delete_package $k; 2441 Symbol::delete_package $k;
2345 } 2442 }
2346 2443
2347 warn "get rid of safe::, as good as possible"; 2444 warn "getting rid of safe::, as good as possible";
2348 Symbol::delete_package "safe::$_" 2445 Symbol::delete_package "safe::$_"
2349 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2446 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2350 2447
2351 warn "unload cf.pm \"a bit\""; 2448 warn "unloading cf.pm \"a bit\"";
2352 delete $INC{"cf.pm"}; 2449 delete $INC{"cf.pm"};
2353 2450
2354 # don't, removes xs symbols, too, 2451 # don't, removes xs symbols, too,
2355 # and global variables created in xs 2452 # and global variables created in xs
2356 #Symbol::delete_package __PACKAGE__; 2453 #Symbol::delete_package __PACKAGE__;
2357 2454
2455 warn "unload completed, starting to reload now";
2456
2358 warn "reloading cf.pm"; 2457 warn "reloading cf.pm";
2359 require cf; 2458 require cf;
2360 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2459 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2361 2460
2362 warn "load config and database again"; 2461 warn "loading config and database again";
2363 cf::cfg_load; 2462 cf::cfg_load;
2364 cf::db_load;
2365 2463
2366 warn "load extensions"; 2464 warn "loading extensions";
2367 cf::load_extensions; 2465 cf::load_extensions;
2368 2466
2369 warn "reattach attachments to objects/players"; 2467 warn "reattaching attachments to objects/players";
2370 _global_reattach; 2468 _global_reattach;
2371 warn "reattach attachments to maps"; 2469 warn "reattaching attachments to maps";
2372 reattach $_ for values %MAP; 2470 reattach $_ for values %MAP;
2471
2472 warn "loading reloadable resources";
2473 load_resources;
2474
2475 warn "restarting server ticker";
2476
2477 $TICK_WATCHER->start;
2373 }; 2478 };
2374 2479
2375 if ($@) { 2480 if ($@) {
2376 warn $@; 2481 warn $@;
2377 warn "error while reloading, exiting."; 2482 warn "error while reloading, exiting.";
… …
2379 } 2484 }
2380 2485
2381 warn "reloaded"; 2486 warn "reloaded";
2382}; 2487};
2383 2488
2489our $RELOAD_WATCHER; # used only during reload
2490
2384register_command "reload" => sub { 2491register_command "reload" => sub {
2385 my ($who, $arg) = @_; 2492 my ($who, $arg) = @_;
2386 2493
2387 if ($who->flag (FLAG_WIZ)) { 2494 if ($who->flag (FLAG_WIZ)) {
2388 $who->message ("start of reload."); 2495 $who->message ("reloading server.");
2496
2497 # doing reload synchronously and two reloads happen back-to-back,
2498 # coro crashes during coro_state_free->destroy here.
2499
2500 $RELOAD_WATCHER ||= Event->timer (
2501 reentrant => 0,
2502 after => 0,
2503 data => WF_AUTOCANCEL,
2504 cb => sub {
2389 reload; 2505 reload;
2390 $who->message ("end of reload."); 2506 undef $RELOAD_WATCHER;
2507 },
2508 );
2391 } 2509 }
2392}; 2510};
2393 2511
2394unshift @INC, $LIBDIR; 2512unshift @INC, $LIBDIR;
2513
2514my $bug_warning = 0;
2395 2515
2396$TICK_WATCHER = Event->timer ( 2516$TICK_WATCHER = Event->timer (
2397 reentrant => 0, 2517 reentrant => 0,
2518 parked => 1,
2398 prio => 0, 2519 prio => 0,
2399 at => $NEXT_TICK || $TICK, 2520 at => $NEXT_TICK || $TICK,
2400 data => WF_AUTOCANCEL, 2521 data => WF_AUTOCANCEL,
2401 cb => sub { 2522 cb => sub {
2523 if ($Coro::current != $Coro::main) {
2524 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2525 unless ++$bug_warning > 10;
2526 return;
2527 }
2528
2402 $NOW = Event::time; 2529 $NOW = Event::time;
2403 2530
2404 cf::server_tick; # one server iteration 2531 cf::server_tick; # one server iteration
2405 $RUNTIME += $TICK; 2532 $RUNTIME += $TICK;
2406 $NEXT_TICK += $TICK; 2533 $NEXT_TICK += $TICK;
2407 2534
2408 $WAIT_FOR_TICK->broadcast; 2535 $WAIT_FOR_TICK->broadcast;
2409 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2536 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2537
2538 Event::sweep;
2539 Coro::cede_notself;
2540
2541# my $AFTER = Event::time;
2542# warn $AFTER - $NOW;#d#
2410 2543
2411 # if we are delayed by four ticks or more, skip them all 2544 # if we are delayed by four ticks or more, skip them all
2412 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2545 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2413 2546
2414 $TICK_WATCHER->at ($NEXT_TICK); 2547 $TICK_WATCHER->at ($NEXT_TICK);
2415 $TICK_WATCHER->start; 2548 $TICK_WATCHER->start;
2416 }, 2549 },
2417); 2550);
2418 2551
2552{
2553 BDB::max_poll_time $TICK * 0.1;
2554 $BDB_POLL_WATCHER = Event->io (
2555 reentrant => 0,
2556 fd => BDB::poll_fileno,
2557 poll => 'r',
2558 prio => 0,
2559 data => WF_AUTOCANCEL,
2560 cb => \&BDB::poll_cb,
2561 );
2562 BDB::min_parallel 8;
2563
2564 BDB::set_sync_prepare {
2565 my $status;
2566 my $current = $Coro::current;
2567 (
2568 sub {
2569 $status = $!;
2570 $current->ready; undef $current;
2571 },
2572 sub {
2573 Coro::schedule while defined $current;
2574 $! = $status;
2575 },
2576 )
2577 };
2578
2579 unless ($DB_ENV) {
2580 $DB_ENV = BDB::db_env_create;
2581
2582 cf::sync_job {
2583 eval {
2584 BDB::db_env_open
2585 $DB_ENV,
2586 $BDB_ENV_DIR,
2587 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2588 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2589 0666;
2590
2591 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2592
2593 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2594 $DB_ENV->set_lk_detect;
2595 };
2596
2597 cf::cleanup "db_env_open(db): $@" if $@;
2598 };
2599 }
2600}
2601
2602{
2603 IO::AIO::min_parallel 8;
2604
2605 undef $Coro::AIO::WATCHER;
2419IO::AIO::max_poll_time $TICK * 0.2; 2606 IO::AIO::max_poll_time $TICK * 0.1;
2420 2607 $AIO_POLL_WATCHER = Event->io (
2421Event->io ( 2608 reentrant => 0,
2422 fd => IO::AIO::poll_fileno, 2609 fd => IO::AIO::poll_fileno,
2423 poll => 'r', 2610 poll => 'r',
2424 prio => 5, 2611 prio => 6,
2425 data => WF_AUTOCANCEL, 2612 data => WF_AUTOCANCEL,
2426 cb => \&IO::AIO::poll_cb, 2613 cb => \&IO::AIO::poll_cb,
2427); 2614 );
2615}
2428 2616
2429Event->timer ( 2617$WRITE_RUNTIME_WATCHER = Event->timer (
2618 reentrant => 0,
2430 data => WF_AUTOCANCEL, 2619 data => WF_AUTOCANCEL,
2431 after => 0, 2620 after => 1,
2432 interval => 10, 2621 interval => 10,
2433 cb => sub { 2622 prio => 6, # keep it lowest so it acts like a watchdog
2434 (Coro::unblock_sub { 2623 cb => Coro::unblock_sub {
2435 write_runtime 2624 write_runtime
2436 or warn "ERROR: unable to write runtime file: $!"; 2625 or warn "ERROR: unable to write runtime file: $!";
2437 })->();
2438 }, 2626 },
2439); 2627);
2440 2628
2441END { cf::emergency_save } 2629END { cf::emergency_save }
2442 2630

Diff Legend

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