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

Diff Legend

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