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.172 by root, Sun Jan 14 13:32:48 2007 UTC vs.
Revision 1.215 by root, Thu Feb 15 03:19:02 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
… …
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;
49our $AIO_POLL_WATCHER; 53our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 54our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 55our $NEXT_TICK;
52our $NOW; 56our $NOW;
57our $USE_FSYNC = 1; # use fsync to write maps - default off
58
59our $BDB_POLL_WATCHER;
60our $DB_ENV;
53 61
54our %CFG; 62our %CFG;
55 63
56our $UPTIME; $UPTIME ||= time; 64our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 65our $RUNTIME;
58 66
59our %PLAYER; # all users 67our %PLAYER; # all users
60our %MAP; # all maps 68our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 69our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 70our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db";
63 72
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 75
67# 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 ∕
… …
80mkdir cf::localdir; 89mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 90mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 91mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 92mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
85 95
86our $EMERGENCY_POSITION; 96our $EMERGENCY_POSITION;
97
98sub cf::map::normalise;
87 99
88############################################################################# 100#############################################################################
89 101
90=head2 GLOBAL VARIABLES 102=head2 GLOBAL VARIABLES
91 103
… …
261sub freeze_mainloop { 273sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 274 return unless $TICK_WATCHER->is_active;
263 275
264 my $guard = Coro::guard { 276 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 277 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 278 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 279 $TICK_WATCHER->stop;
270 $guard 280 $guard
271} 281}
272 282
273=item cf::async { BLOCK } 283=item cf::async { BLOCK }
… …
349 my $runtime = cf::localdir . "/runtime"; 359 my $runtime = cf::localdir . "/runtime";
350 360
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 362 or return;
353 363
364 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 365 # 10 is the runtime save interval, for a monotonic clock
366 # 60 allows for the watchdog to kill the server.
367
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 368 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 369 and return;
357 370
371 # always fsync - this file is important
358 aio_fsync $fh 372 aio_fsync $fh
359 and return; 373 and return;
360 374
361 close $fh 375 close $fh
362 or return; 376 or return;
… …
747 $filename, length $$rdata, scalar @$objs; 761 $filename, length $$rdata, scalar @$objs;
748 762
749 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 763 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
750 chmod SAVE_MODE, $fh; 764 chmod SAVE_MODE, $fh;
751 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 765 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
752 aio_fsync $fh; 766 aio_fsync $fh if $cf::USE_FSYNC;
753 close $fh; 767 close $fh;
754 768
755 if (@$objs) { 769 if (@$objs) {
756 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 770 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
757 chmod SAVE_MODE, $fh; 771 chmod SAVE_MODE, $fh;
758 my $data = Storable::nfreeze { version => 1, objs => $objs }; 772 my $data = Storable::nfreeze { version => 1, objs => $objs };
759 aio_write $fh, 0, (length $data), $data, 0; 773 aio_write $fh, 0, (length $data), $data, 0;
760 aio_fsync $fh; 774 aio_fsync $fh if $cf::USE_FSYNC;
761 close $fh; 775 close $fh;
762 aio_rename "$filename.pst~", "$filename.pst"; 776 aio_rename "$filename.pst~", "$filename.pst";
763 } 777 }
764 } else { 778 } else {
765 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
… …
771 } 785 }
772 } else { 786 } else {
773 aio_unlink $filename; 787 aio_unlink $filename;
774 aio_unlink "$filename.pst"; 788 aio_unlink "$filename.pst";
775 } 789 }
790
791 #d##TODO# nuke non .map-files if exist
792 if ($filename =~ s/\.map$//) {
793 aio_unlink $filename;
794 aio_unlink "$filename.pst";
795 }
776 } 796 }
777} 797}
778 798
779sub object_freezer_as_string { 799sub object_freezer_as_string {
780 my ($rdata, $objs) = @_; 800 my ($rdata, $objs) = @_;
… …
786 806
787sub object_thawer_load { 807sub object_thawer_load {
788 my ($filename) = @_; 808 my ($filename) = @_;
789 809
790 my ($data, $av); 810 my ($data, $av);
811
812 #d#TODO remove .map if file does not exist
813 aio_stat $filename and $filename =~ s/\.map$//;
791 814
792 (aio_load $filename, $data) >= 0 815 (aio_load $filename, $data) >= 0
793 or return; 816 or return;
794 817
795 unless (aio_stat "$filename.pst") { 818 unless (aio_stat "$filename.pst") {
… …
957 980
958sub exists($) { 981sub exists($) {
959 my ($login) = @_; 982 my ($login) = @_;
960 983
961 $cf::PLAYER{$login} 984 $cf::PLAYER{$login}
962 or cf::sync_job { !aio_stat $login } 985 or cf::sync_job { !aio_stat path $login }
963} 986}
964 987
965sub find($) { 988sub find($) {
966 return $cf::PLAYER{$_[0]} || do { 989 return $cf::PLAYER{$_[0]} || do {
967 my $login = $_[0]; 990 my $login = $_[0];
… …
1065=cut 1088=cut
1066 1089
1067sub maps($) { 1090sub maps($) {
1068 my ($pl) = @_; 1091 my ($pl) = @_;
1069 1092
1093 $pl = ref $pl ? $pl->ob->name : $pl;
1094
1070 my $files = aio_readdir playerdir $pl 1095 my $files = aio_readdir playerdir $pl
1071 or return; 1096 or return;
1072 1097
1073 my @paths; 1098 my @paths;
1074 1099
1075 for (@$files) { 1100 for (@$files) {
1076 utf8::decode $_; 1101 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1102 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1103 next unless /^$PATH_SEP/o;
1079 1104
1080 s/\.map$//; 1105 push @paths, cf::map::normalise "~$pl/$_";
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 } 1106 }
1083 1107
1084 \@paths 1108 \@paths
1085} 1109}
1086 1110
… …
1113 1137
1114use Fcntl; 1138use Fcntl;
1115use Coro::AIO; 1139use Coro::AIO;
1116 1140
1117use overload 1141use overload
1118 '""' => \&as_string; 1142 '""' => \&as_string,
1143 fallback => 1;
1119 1144
1120our $MAX_RESET = 3600; 1145our $MAX_RESET = 3600;
1121our $DEFAULT_RESET = 3000; 1146our $DEFAULT_RESET = 3000;
1122 1147
1123sub generate_random_map { 1148sub generate_random_map {
1124 my ($self, $rmp) = @_; 1149 my ($self, $rmp) = @_;
1125
1126 # mit "rum" bekleckern, nicht 1150 # mit "rum" bekleckern, nicht
1127 $self->_create_random_map ( 1151 $self->_create_random_map (
1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1152 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1153 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1154 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1161 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1162 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1163 )
1140} 1164}
1141 1165
1166=item cf::map->register ($regex, $prio)
1167
1168Register a handler for the map path matching the given regex at the
1169givne priority (higher is better, built-in handlers have priority 0, the
1170default).
1171
1172=cut
1173
1142sub register { 1174sub register {
1143 my (undef, $regex) = @_; 1175 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1176 my $pkg = caller;
1145 1177
1146 no strict; 1178 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1179 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1180
1149 $EXT_MAP{$pkg} = qr<$regex>; 1181 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1182}
1151 1183
1152# also paths starting with '/' 1184# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1185$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1186
1155sub thawer_merge { 1187sub thawer_merge {
1156 my ($self, $merge) = @_; 1188 my ($self, $merge) = @_;
1157 1189
1158 # we have to keep some variables in memory intact 1190 # we have to keep some variables in memory intact
… …
1164 $self->SUPER::thawer_merge ($merge); 1196 $self->SUPER::thawer_merge ($merge);
1165} 1197}
1166 1198
1167sub normalise { 1199sub normalise {
1168 my ($path, $base) = @_; 1200 my ($path, $base) = @_;
1201
1202 $path = "$path"; # make sure its a string
1203
1204 $path =~ s/\.map$//;
1169 1205
1170 # map plan: 1206 # map plan:
1171 # 1207 #
1172 # /! non-realised random map exit (special hack!) 1208 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched 1209 # {... are special paths that are not being touched
… …
1201 1237
1202 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1238 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1203 1239
1204 $path = normalise $path, $base; 1240 $path = normalise $path, $base;
1205 1241
1206 for my $pkg (keys %EXT_MAP) { 1242 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1243 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1244 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1245 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1246 $self->init; # pass $1 etc.
1211 return $self; 1247 return $self;
1212 } 1248 }
1213 } 1249 }
1214 1250
1215 Carp::carp "unable to resolve path '$path'."; 1251 Carp::carp "unable to resolve path '$path' (base '$base').";
1216 () 1252 ()
1217} 1253}
1218 1254
1219sub init { 1255sub init {
1220 my ($self) = @_; 1256 my ($self) = @_;
… …
1235 1271
1236# the original (read-only) location 1272# the original (read-only) location
1237sub load_path { 1273sub load_path {
1238 my ($self) = @_; 1274 my ($self) = @_;
1239 1275
1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1276 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1241} 1277}
1242 1278
1243# the temporary/swap location 1279# the temporary/swap location
1244sub save_path { 1280sub save_path {
1245 my ($self) = @_; 1281 my ($self) = @_;
1246 1282
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1283 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1284 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1249} 1285}
1250 1286
1251# the unique path, undef == no special unique path 1287# the unique path, undef == no special unique path
1252sub uniq_path { 1288sub uniq_path {
1253 my ($self) = @_; 1289 my ($self) = @_;
… …
1269 my ($self) = @_; 1305 my ($self) = @_;
1270 1306
1271 utf8::encode (my $save = $self->save_path); 1307 utf8::encode (my $save = $self->save_path);
1272 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1309 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1310
1311 #d#TODO remove .map and also nuke
1312 $save =~ s/\.map// or return;#d#
1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1314 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1274} 1315}
1275 1316
1276sub load_header_from($) { 1317sub load_header_from($) {
1277 my ($self, $path) = @_; 1318 my ($self, $path) = @_;
1278 1319
1279 utf8::encode $path; 1320 utf8::encode $path;
1280 aio_open $path, O_RDONLY, 0 1321 #aio_open $path, O_RDONLY, 0
1281 or return; 1322 # or return;
1282 1323
1283 $self->_load_header ($path) 1324 $self->_load_header ($path)
1284 or return; 1325 or return;
1285 1326
1286 $self->{load_path} = $path; 1327 $self->{load_path} = $path;
1287 1328
1288 1 1329 1
1289} 1330}
1290 1331
1291sub load_orig { 1332sub load_header_orig {
1292 my ($self) = @_; 1333 my ($self) = @_;
1293 1334
1294 $self->load_header_from ($self->load_path) 1335 $self->load_header_from ($self->load_path)
1295} 1336}
1296 1337
1297sub load_temp { 1338sub load_header_temp {
1298 my ($self) = @_; 1339 my ($self) = @_;
1299 1340
1300 $self->load_header_from ($self->save_path) 1341 $self->load_header_from ($self->save_path)
1342}
1343
1344sub prepare_temp {
1345 my ($self) = @_;
1346
1347 $self->last_access ((delete $self->{last_access})
1348 || $cf::RUNTIME); #d#
1349 # safety
1350 $self->{instantiate_time} = $cf::RUNTIME
1351 if $self->{instantiate_time} > $cf::RUNTIME;
1352}
1353
1354sub prepare_orig {
1355 my ($self) = @_;
1356
1357 $self->{load_original} = 1;
1358 $self->{instantiate_time} = $cf::RUNTIME;
1359 $self->last_access ($cf::RUNTIME);
1360 $self->instantiate;
1301} 1361}
1302 1362
1303sub load_header { 1363sub load_header {
1304 my ($self) = @_; 1364 my ($self) = @_;
1305 1365
1306 if ($self->load_temp) { 1366 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1367 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1368 } else {
1313 $self->load_orig 1369 $self->load_header_orig
1314 or return; 1370 or return;
1315 1371 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1372 }
1321 1373
1322 1 1374 1
1323} 1375}
1324 1376
… …
1338 $map->{last_save} = $cf::RUNTIME; 1390 $map->{last_save} = $cf::RUNTIME;
1339 1391
1340 $map->load_header 1392 $map->load_header
1341 or return; 1393 or return;
1342 1394
1343 if ($map->should_reset) { 1395 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1396 # doing this can freeze the server in a sync job, obviously
1344 $cf::WAIT_FOR_TICK->wait; 1397 #$cf::WAIT_FOR_TICK->wait;
1345 $map->reset; 1398 $map->reset;
1346 undef $guard; 1399 undef $guard;
1347 $map = find $path 1400 return find $path;
1348 or return;
1349 } 1401 }
1350 1402
1351 $cf::MAP{$path} = $map 1403 $cf::MAP{$path} = $map
1352 } 1404 }
1353} 1405}
1406
1407sub pre_load { }
1408sub post_load { }
1354 1409
1355sub load { 1410sub load {
1356 my ($self) = @_; 1411 my ($self) = @_;
1357 1412
1413 local $self->{deny_reset} = 1; # loading can take a long time
1414
1358 my $path = $self->{path}; 1415 my $path = $self->{path};
1359 my $guard = cf::lock_acquire "map_load:$path"; 1416 my $guard = cf::lock_acquire "map_load:$path";
1360 1417
1361 return if $self->in_memory != cf::MAP_SWAPPED; 1418 return if $self->in_memory != cf::MAP_SWAPPED;
1362 1419
1363 $self->in_memory (cf::MAP_LOADING); 1420 $self->in_memory (cf::MAP_LOADING);
1364 1421
1365 $self->alloc; 1422 $self->alloc;
1423
1424 $self->pre_load;
1425
1366 $self->_load_objects ($self->{load_path}, 1) 1426 $self->_load_objects ($self->{load_path}, 1)
1367 or return; 1427 or return;
1368 1428
1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1429 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1370 if delete $self->{load_original}; 1430 if delete $self->{load_original};
… …
1392 unless $self->difficulty; 1452 unless $self->difficulty;
1393 Coro::cede; 1453 Coro::cede;
1394 $self->activate; 1454 $self->activate;
1395 } 1455 }
1396 1456
1457 $self->post_load;
1458
1397 $self->in_memory (cf::MAP_IN_MEMORY); 1459 $self->in_memory (cf::MAP_IN_MEMORY);
1398} 1460}
1399 1461
1400sub customise_for { 1462sub customise_for {
1401 my ($self, $ob) = @_; 1463 my ($self, $ob) = @_;
… …
1441 1503
1442 cf::sync_job { $map->load }; 1504 cf::sync_job { $map->load };
1443} 1505}
1444 1506
1445our %MAP_PREFETCH; 1507our %MAP_PREFETCH;
1446our $MAP_PREFETCHER = Coro::async { 1508our $MAP_PREFETCHER = undef;
1447 while () {
1448 for my $path (keys %MAP_PREFETCH) {
1449 my $map = find $path
1450 or next;
1451 $map->load;
1452
1453 delete $MAP_PREFETCH{$path};
1454 }
1455 Coro::schedule;
1456 }
1457};
1458 1509
1459sub find_async { 1510sub find_async {
1460 my ($path, $origin) = @_; 1511 my ($path, $origin) = @_;
1461 1512
1462 $path = normalise $path, $origin && $origin->{path}; 1513 $path = normalise $path, $origin && $origin->{path};
1463 1514
1464 if (my $map = $cf::MAP{$path}) { 1515 if (my $map = $cf::MAP{$path}) {
1465 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1516 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1466 } 1517 }
1467 1518
1468 $MAP_PREFETCH{$path} = 0; 1519 undef $MAP_PREFETCH{$path};
1520 $MAP_PREFETCHER ||= cf::async {
1521 while (%MAP_PREFETCH) {
1522 for my $path (keys %MAP_PREFETCH) {
1523 my $map = find $path
1524 or next;
1525 $map->load;
1526
1527 delete $MAP_PREFETCH{$path};
1528 }
1529 }
1530 undef $MAP_PREFETCHER;
1531 };
1469 $MAP_PREFETCHER->ready; 1532 $MAP_PREFETCHER->prio (6);
1470 1533
1471 () 1534 ()
1472} 1535}
1473 1536
1474sub save { 1537sub save {
… …
1534 my ($self) = @_; 1597 my ($self) = @_;
1535 1598
1536 $self->reset_at <= $cf::RUNTIME 1599 $self->reset_at <= $cf::RUNTIME
1537} 1600}
1538 1601
1539sub rename {
1540 my ($self, $new_path) = @_;
1541
1542 normalise $new_path;
1543
1544 $self->unlink_save;
1545
1546 delete $cf::MAP{$self->path};
1547 $self->{path} = $new_path; $self->path ($self->{path});
1548 $cf::MAP{$self->path} = $self;
1549
1550 $self->save;
1551}
1552
1553sub reset { 1602sub reset {
1554 my ($self) = @_; 1603 my ($self) = @_;
1555 1604
1556 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1605 my $lock = cf::lock_acquire "map_data:$self->{path}";
1557 1606
1558 return if $self->players; 1607 return if $self->players;
1559 return if $self->isa ("ext::map_per_player");#d# 1608 return if $self->isa ("ext::map_per_player");#d#
1560 1609
1561 warn "resetting map ", $self->path;#d# 1610 warn "resetting map ", $self->path;#d#
1562 1611
1612 $self->in_memory (cf::MAP_SWAPPED);
1613
1614 # need to save uniques path
1615 unless ($self->{deny_save}) {
1616 my $uniq = $self->uniq_path; utf8::encode $uniq;
1617
1618 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1619 if $uniq;
1620 }
1621
1563 delete $cf::MAP{$self->path}; 1622 delete $cf::MAP{$self->path};
1564 1623
1565 $self->in_memory (cf::MAP_SWAPPED);
1566 $self->clear; 1624 $self->clear;
1567 1625
1568 $_->clear_links_to ($self) for values %cf::MAP; 1626 $_->clear_links_to ($self) for values %cf::MAP;
1569 1627
1570 $self->unlink_save; 1628 $self->unlink_save;
… …
1574my $nuke_counter = "aaaa"; 1632my $nuke_counter = "aaaa";
1575 1633
1576sub nuke { 1634sub nuke {
1577 my ($self) = @_; 1635 my ($self) = @_;
1578 1636
1637 delete $cf::MAP{$self->path};
1638
1639 $self->unlink_save;
1640
1641 bless $self, "cf::map";
1642 delete $self->{deny_reset};
1579 $self->{deny_save} = 1; 1643 $self->{deny_save} = 1;
1580 $self->reset_timeout (1); 1644 $self->reset_timeout (1);
1581 $self->rename ("{nuke}/" . ($nuke_counter++)); 1645 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1646
1647 $cf::MAP{$self->path} = $self;
1648
1582 $self->reset; # polite request, might not happen 1649 $self->reset; # polite request, might not happen
1583} 1650}
1584 1651
1585=item cf::map::unique_maps 1652=item cf::map::unique_maps
1586 1653
… …
1598 for (@$files) { 1665 for (@$files) {
1599 utf8::decode $_; 1666 utf8::decode $_;
1600 next if /\.pst$/; 1667 next if /\.pst$/;
1601 next unless /^$PATH_SEP/o; 1668 next unless /^$PATH_SEP/o;
1602 1669
1603 s/\.map$//; 1670 push @paths, cf::map::normalise $_;
1604 push @paths, $_;
1605 } 1671 }
1606 1672
1607 \@paths 1673 \@paths
1608} 1674}
1609 1675
… …
1703=cut 1769=cut
1704 1770
1705sub link_map { 1771sub link_map {
1706 unless ($LINK_MAP) { 1772 unless ($LINK_MAP) {
1707 $LINK_MAP = cf::map::find "{link}" 1773 $LINK_MAP = cf::map::find "{link}"
1708 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1774 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1709 $LINK_MAP->load; 1775 $LINK_MAP->load;
1710 } 1776 }
1711 1777
1712 $LINK_MAP 1778 $LINK_MAP
1713} 1779}
… …
1720 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1786 return if UNIVERSAL::isa $self->map, "ext::map_link";
1721 1787
1722 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1788 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1723 if $self->map; 1789 if $self->map;
1724 1790
1725 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1791 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1726} 1792}
1727 1793
1728sub cf::object::player::leave_link { 1794sub cf::object::player::leave_link {
1729 my ($self, $map, $x, $y) = @_; 1795 my ($self, $map, $x, $y) = @_;
1730 1796
… …
1752 $map->load; 1818 $map->load;
1753 $map->load_diag; 1819 $map->load_diag;
1754 1820
1755 return unless $self->contr->active; 1821 return unless $self->contr->active;
1756 $self->activate_recursive; 1822 $self->activate_recursive;
1823
1824 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1757 $self->enter_map ($map, $x, $y); 1825 $self->enter_map ($map, $x, $y);
1758} 1826}
1759 1827
1760cf::player->attach ( 1828cf::player->attach (
1761 on_logout => sub { 1829 on_logout => sub {
… …
1774 # try to abort aborted map switching on player login :) 1842 # try to abort aborted map switching on player login :)
1775 # should happen only on crashes 1843 # should happen only on crashes
1776 if ($pl->ob->{_link_pos}) { 1844 if ($pl->ob->{_link_pos}) {
1777 $pl->ob->enter_link; 1845 $pl->ob->enter_link;
1778 (async { 1846 (async {
1779 # we need this sleep as the login has a concurrent enter_exit running
1780 # and this sleep increases chances of the player not ending up in scorn
1781 $pl->ob->reply (undef, 1847 $pl->ob->reply (undef,
1782 "There was an internal problem at your last logout, " 1848 "There was an internal problem at your last logout, "
1783 . "the server will try to bring you to your intended destination in a second.", 1849 . "the server will try to bring you to your intended destination in a second.",
1784 cf::NDI_RED); 1850 cf::NDI_RED);
1851 # we need this sleep as the login has a concurrent enter_exit running
1852 # and this sleep increases chances of the player not ending up in scorn
1785 Coro::Timer::sleep 1; 1853 Coro::Timer::sleep 1;
1786 $pl->ob->leave_link; 1854 $pl->ob->leave_link;
1787 })->prio (2); 1855 })->prio (2);
1788 } 1856 }
1789 }, 1857 },
… …
1797 my ($self, $path, $x, $y) = @_; 1865 my ($self, $path, $x, $y) = @_;
1798 1866
1799 $self->enter_link; 1867 $self->enter_link;
1800 1868
1801 (async { 1869 (async {
1870 my $map = eval {
1802 my $map = cf::map::find $path; 1871 my $map = cf::map::find $path;
1803 $map = $map->customise_for ($self) if $map; 1872 $map = $map->customise_for ($self) if $map;
1804 1873 $map
1805# warn "entering ", $map->path, " at ($x, $y)\n" 1874 } or
1806# if $map;
1807
1808 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1875 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1809 1876
1810 $self->leave_link ($map, $x, $y); 1877 $self->leave_link ($map, $x, $y);
1811 })->prio (1); 1878 })->prio (1);
1812} 1879}
1813 1880
… …
1817 1884
1818sub parse_random_map_params { 1885sub parse_random_map_params {
1819 my ($spec) = @_; 1886 my ($spec) = @_;
1820 1887
1821 my $rmp = { # defaults 1888 my $rmp = { # defaults
1822 xsize => 10, 1889 xsize => (cf::rndm 15, 40),
1823 ysize => 10, 1890 ysize => (cf::rndm 15, 40),
1891 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1892 #layout => string,
1824 }; 1893 };
1825 1894
1826 for (split /\n/, $spec) { 1895 for (split /\n/, $spec) {
1827 my ($k, $v) = split /\s+/, $_, 2; 1896 my ($k, $v) = split /\s+/, $_, 2;
1828 1897
… …
1832 $rmp 1901 $rmp
1833} 1902}
1834 1903
1835sub prepare_random_map { 1904sub prepare_random_map {
1836 my ($exit) = @_; 1905 my ($exit) = @_;
1906
1907 my $guard = cf::lock_acquire "exit_prepare:$exit";
1837 1908
1838 # all this does is basically replace the /! path by 1909 # all this does is basically replace the /! path by
1839 # a new random map path (?random/...) with a seed 1910 # a new random map path (?random/...) with a seed
1840 # that depends on the exit object 1911 # that depends on the exit object
1841 1912
1842 my $rmp = parse_random_map_params $exit->msg; 1913 my $rmp = parse_random_map_params $exit->msg;
1843 1914
1844 if ($exit->map) { 1915 if ($exit->map) {
1845 $rmp->{region} = $exit->map->region_name; 1916 $rmp->{region} = $exit->region->name;
1846 $rmp->{origin_map} = $exit->map->path; 1917 $rmp->{origin_map} = $exit->map->path;
1847 $rmp->{origin_x} = $exit->x; 1918 $rmp->{origin_x} = $exit->x;
1848 $rmp->{origin_y} = $exit->y; 1919 $rmp->{origin_y} = $exit->y;
1849 } 1920 }
1850 1921
1851 $rmp->{random_seed} ||= $exit->random_seed; 1922 $rmp->{random_seed} ||= $exit->random_seed;
1852 1923
1853 my $data = cf::to_json $rmp; 1924 my $data = cf::to_json $rmp;
1854 my $md5 = Digest::MD5::md5_hex $data; 1925 my $md5 = Digest::MD5::md5_hex $data;
1926 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1855 1927
1856 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1928 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1857 aio_write $fh, 0, (length $data), $data, 0; 1929 aio_write $fh, 0, (length $data), $data, 0;
1930 undef $fh;
1931 aio_rename "$meta~", $meta;
1858 1932
1859 $exit->slaying ("?random/$md5"); 1933 $exit->slaying ("?random/$md5");
1860 $exit->msg (undef); 1934 $exit->msg (undef);
1861 } 1935 }
1862} 1936}
1863 1937
1864sub cf::object::player::enter_exit { 1938sub cf::object::player::enter_exit {
1865 my ($self, $exit) = @_; 1939 my ($self, $exit) = @_;
1866 1940
1867 return unless $self->type == cf::PLAYER; 1941 return unless $self->type == cf::PLAYER;
1942
1943 if ($exit->slaying eq "/!") {
1944 #TODO: this should de-fi-ni-te-ly not be a sync-job
1945 cf::sync_job { prepare_random_map $exit };
1946 }
1947
1948 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1949 my $hp = $exit->stats->hp;
1950 my $sp = $exit->stats->sp;
1868 1951
1869 $self->enter_link; 1952 $self->enter_link;
1870 1953
1871 (async { 1954 (async {
1872 $self->deactivate_recursive; # just to be sure 1955 $self->deactivate_recursive; # just to be sure
1873 unless (eval { 1956 unless (eval {
1874 prepare_random_map $exit 1957 $self->goto ($slaying, $hp, $sp);
1875 if $exit->slaying eq "/!";
1876
1877 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1878 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1879 1958
1880 1; 1959 1;
1881 }) { 1960 }) {
1882 $self->message ("Something went wrong deep within the crossfire server. " 1961 $self->message ("Something went wrong deep within the crossfire server. "
1883 . "I'll try to bring you back to the map you were before. " 1962 . "I'll try to bring you back to the map you were before. "
… …
1944 # get handled first 2023 # get handled first
1945 my $queue = delete $ns->{query_queue} 2024 my $queue = delete $ns->{query_queue}
1946 or return; # be conservative, not sure how that can happen, but we saw a crash here 2025 or return; # be conservative, not sure how that can happen, but we saw a crash here
1947 2026
1948 (shift @$queue)->[1]->($msg); 2027 (shift @$queue)->[1]->($msg);
2028 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1949 2029
1950 push @{ $ns->{query_queue} }, @$queue; 2030 push @{ $ns->{query_queue} }, @$queue;
1951 2031
1952 if (@{ $ns->{query_queue} } == @$queue) { 2032 if (@{ $ns->{query_queue} } == @$queue) {
1953 if (@$queue) { 2033 if (@$queue) {
… …
2114The parameter C<$family> should best start with the name of the extension 2194The parameter C<$family> should best start with the name of the extension
2115using it, it should be unique. 2195using it, it should be unique.
2116 2196
2117=over 4 2197=over 4
2118 2198
2119=item $hashref = cf::db_get $family
2120
2121Return a hashref for use by the extension C<$family>, which can be
2122modified. After modifications, you have to call C<cf::db_dirty> or
2123C<cf::db_sync>.
2124
2125=item $value = cf::db_get $family => $key 2199=item $value = cf::db_get $family => $key
2126 2200
2127Returns a single value from the database 2201Returns a single value from the database.
2128
2129=item cf::db_put $family => $hashref
2130
2131Stores the given family hashref into the database. Updates are delayed, if
2132you want the data to be synced to disk immediately, use C<cf::db_sync>.
2133 2202
2134=item cf::db_put $family => $key => $value 2203=item cf::db_put $family => $key => $value
2135 2204
2136Stores the given C<$value> in the family hash. Updates are delayed, if you 2205Stores the given C<$value> in the family.
2137want the data to be synced to disk immediately, use C<cf::db_sync>.
2138
2139=item cf::db_dirty
2140
2141Marks the database as dirty, to be updated at a later time.
2142
2143=item cf::db_sync
2144
2145Immediately write the database to disk I<if it is dirty>.
2146 2206
2147=cut 2207=cut
2148 2208
2149our $DB; 2209our $DB;
2150 2210
2151{ 2211sub db_init {
2212 unless ($DB) {
2213 $DB = BDB::db_create $DB_ENV;
2214
2215 cf::sync_job {
2216 eval {
2217 $DB->set_flags (BDB::CHKSUM);
2218
2219 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2220 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2221 cf::cleanup "db_open(db): $!" if $!;
2222 };
2223 cf::cleanup "db_open(db): $@" if $@;
2224 };
2225
2152 my $path = cf::localdir . "/database.pst"; 2226 my $path = cf::localdir . "/database.pst";
2227 if (stat $path) {
2228 cf::sync_job {
2229 my $pst = Storable::retrieve $path;
2153 2230
2154 sub db_load() { 2231 cf::db_put (board => data => $pst->{board});
2155 $DB = stat $path ? Storable::retrieve $path : { }; 2232 cf::db_put (guildrules => data => $pst->{guildrules});
2156 } 2233 cf::db_put (rent => balance => $pst->{rent}{balance});
2234 BDB::db_env_txn_checkpoint $DB_ENV;
2157 2235
2158 my $pid; 2236 unlink $path;
2159
2160 sub db_save() {
2161 waitpid $pid, 0 if $pid;
2162 if (0 == ($pid = fork)) {
2163 $DB->{_meta}{version} = 1;
2164 Storable::nstore $DB, "$path~";
2165 rename "$path~", $path;
2166 cf::_exit 0 if defined $pid;
2167 } 2237 };
2168 }
2169
2170 my $dirty;
2171
2172 sub db_sync() {
2173 db_save if $dirty;
2174 undef $dirty;
2175 }
2176
2177 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2178 db_sync;
2179 });
2180
2181 sub db_dirty() {
2182 $dirty = 1;
2183 $idle->start;
2184 }
2185
2186 sub db_get($;$) {
2187 @_ >= 2
2188 ? $DB->{$_[0]}{$_[1]}
2189 : ($DB->{$_[0]} ||= { })
2190 }
2191
2192 sub db_put($$;$) {
2193 if (@_ >= 3) {
2194 $DB->{$_[0]}{$_[1]} = $_[2];
2195 } else {
2196 $DB->{$_[0]} = $_[1];
2197 }
2198 db_dirty;
2199 }
2200
2201 cf::global->attach (
2202 prio => 10000,
2203 on_cleanup => sub {
2204 db_sync;
2205 }, 2238 }
2206 ); 2239 }
2240}
2241
2242sub db_get($$) {
2243 my $key = "$_[0]/$_[1]";
2244
2245 cf::sync_job {
2246 BDB::db_get $DB, undef, $key, my $data;
2247
2248 $! ? ()
2249 : Compress::LZF::sthaw $data
2250 }
2251}
2252
2253sub db_put($$$) {
2254 BDB::dbreq_pri 4;
2255 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2207} 2256}
2208 2257
2209############################################################################# 2258#############################################################################
2210# the server's main() 2259# the server's init and main functions
2260
2261sub load_resources {
2262 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2263 or die "unable to load regions file\n";#d#
2264}
2211 2265
2212sub cfg_load { 2266sub cfg_load {
2213 open my $fh, "<:utf8", cf::confdir . "/config" 2267 open my $fh, "<:utf8", cf::confdir . "/config"
2214 or return; 2268 or return;
2215 2269
… …
2228 }; 2282 };
2229 warn $@ if $@; 2283 warn $@ if $@;
2230 } 2284 }
2231} 2285}
2232 2286
2287sub init {
2288 load_resources;
2289}
2290
2233sub main { 2291sub main {
2234 # we must not ever block the main coroutine 2292 # we must not ever block the main coroutine
2235 local $Coro::idle = sub { 2293 local $Coro::idle = sub {
2236 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2294 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2295 (async {
2237 async { Event::one_event }; 2296 Event::one_event;
2297 })->prio (Coro::PRIO_MAX);
2238 }; 2298 };
2239 2299
2240 cfg_load; 2300 cfg_load;
2241 db_load; 2301 db_init;
2242 load_extensions; 2302 load_extensions;
2303
2304 $TICK_WATCHER->start;
2243 Event::loop; 2305 Event::loop;
2244} 2306}
2245 2307
2246############################################################################# 2308#############################################################################
2247# initialisation and cleanup 2309# initialisation and cleanup
2248 2310
2249# install some emergency cleanup handlers 2311# install some emergency cleanup handlers
2250BEGIN { 2312BEGIN {
2251 for my $signal (qw(INT HUP TERM)) { 2313 for my $signal (qw(INT HUP TERM)) {
2252 Event->signal ( 2314 Event->signal (
2315 reentrant => 0,
2253 data => WF_AUTOCANCEL, 2316 data => WF_AUTOCANCEL,
2254 signal => $signal, 2317 signal => $signal,
2318 prio => 0,
2255 cb => sub { 2319 cb => sub {
2256 cf::cleanup "SIG$signal"; 2320 cf::cleanup "SIG$signal";
2257 }, 2321 },
2258 ); 2322 );
2259 } 2323 }
2260} 2324}
… …
2281 my $map = $cf::MAP{$path} or next; 2345 my $map = $cf::MAP{$path} or next;
2282 $map->valid or next; 2346 $map->valid or next;
2283 $map->save; 2347 $map->save;
2284 } 2348 }
2285 warn "end emergency map save\n"; 2349 warn "end emergency map save\n";
2350
2351 warn "begin emergency database checkpoint\n";
2352 BDB::db_env_txn_checkpoint $DB_ENV;
2353 warn "end emergency database checkpoint\n";
2286 }; 2354 };
2287 2355
2288 warn "leave emergency perl save\n"; 2356 warn "leave emergency perl save\n";
2357}
2358
2359sub post_cleanup {
2360 my ($make_core) = @_;
2361
2362 warn Carp::longmess "post_cleanup backtrace"
2363 if $make_core;
2289} 2364}
2290 2365
2291sub reload() { 2366sub reload() {
2292 # can/must only be called in main 2367 # can/must only be called in main
2293 if ($Coro::current != $Coro::main) { 2368 if ($Coro::current != $Coro::main) {
2294 warn "can only reload from main coroutine\n"; 2369 warn "can only reload from main coroutine";
2295 return; 2370 return;
2296 } 2371 }
2297 2372
2298 warn "reloading..."; 2373 warn "reloading...";
2299 2374
2300 warn "freezing server"; 2375 warn "entering sync_job";
2301 my $guard = freeze_mainloop; 2376
2377 cf::sync_job {
2378 cf::write_runtime; # external watchdog should not bark
2302 cf::emergency_save; 2379 cf::emergency_save;
2380 cf::write_runtime; # external watchdog should not bark
2303 2381
2304 warn "sync database to disk"; 2382 warn "syncing database to disk";
2305 cf::db_sync; 2383 BDB::db_env_txn_checkpoint $DB_ENV;
2306 IO::AIO::flush;
2307 2384
2308 eval {
2309 # if anything goes wrong in here, we should simply crash as we already saved 2385 # if anything goes wrong in here, we should simply crash as we already saved
2310 2386
2311 warn "cancel all watchers"; 2387 warn "cancelling all WF_AUTOCANCEL watchers";
2312 for (Event::all_watchers) { 2388 for (Event::all_watchers) {
2313 $_->cancel if $_->data & WF_AUTOCANCEL; 2389 $_->cancel if $_->data & WF_AUTOCANCEL;
2314 } 2390 }
2315 2391
2392 warn "flushing outstanding aio requests";
2393 for (;;) {
2394 BDB::flush;
2395 IO::AIO::flush;
2396 Coro::cede;
2397 last unless IO::AIO::nreqs || BDB::nreqs;
2398 warn "iterate...";
2399 }
2400
2316 warn "cancel all extension coros"; 2401 warn "cancelling all extension coros";
2317 $_->cancel for values %EXT_CORO; 2402 $_->cancel for values %EXT_CORO;
2318 %EXT_CORO = (); 2403 %EXT_CORO = ();
2319 2404
2320 warn "remove commands"; 2405 warn "removing commands";
2321 %COMMAND = (); 2406 %COMMAND = ();
2322 2407
2323 warn "remove ext commands"; 2408 warn "removing ext commands";
2324 %EXTCMD = (); 2409 %EXTCMD = ();
2325 2410
2326 warn "unload/nuke all extensions"; 2411 warn "unloading/nuking all extensions";
2327 for my $pkg (@EXTS) { 2412 for my $pkg (@EXTS) {
2328 warn "... unloading $pkg"; 2413 warn "... unloading $pkg";
2329 2414
2330 if (my $cb = $pkg->can ("unload")) { 2415 if (my $cb = $pkg->can ("unload")) {
2331 eval { 2416 eval {
… …
2336 2421
2337 warn "... nuking $pkg"; 2422 warn "... nuking $pkg";
2338 Symbol::delete_package $pkg; 2423 Symbol::delete_package $pkg;
2339 } 2424 }
2340 2425
2341 warn "unload all perl modules loaded from $LIBDIR"; 2426 warn "unloading all perl modules loaded from $LIBDIR";
2342 while (my ($k, $v) = each %INC) { 2427 while (my ($k, $v) = each %INC) {
2343 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2428 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2344 2429
2345 warn "removing <$k>"; 2430 warn "... unloading $k";
2346 delete $INC{$k}; 2431 delete $INC{$k};
2347 2432
2348 $k =~ s/\.pm$//; 2433 $k =~ s/\.pm$//;
2349 $k =~ s/\//::/g; 2434 $k =~ s/\//::/g;
2350 2435
… …
2353 } 2438 }
2354 2439
2355 Symbol::delete_package $k; 2440 Symbol::delete_package $k;
2356 } 2441 }
2357 2442
2358 warn "get rid of safe::, as good as possible"; 2443 warn "getting rid of safe::, as good as possible";
2359 Symbol::delete_package "safe::$_" 2444 Symbol::delete_package "safe::$_"
2360 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2445 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2361 2446
2362 warn "unload cf.pm \"a bit\""; 2447 warn "unloading cf.pm \"a bit\"";
2363 delete $INC{"cf.pm"}; 2448 delete $INC{"cf.pm"};
2364 2449
2365 # don't, removes xs symbols, too, 2450 # don't, removes xs symbols, too,
2366 # and global variables created in xs 2451 # and global variables created in xs
2367 #Symbol::delete_package __PACKAGE__; 2452 #Symbol::delete_package __PACKAGE__;
2368 2453
2454 warn "unload completed, starting to reload now";
2455
2369 warn "reloading cf.pm"; 2456 warn "reloading cf.pm";
2370 require cf; 2457 require cf;
2371 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2458 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2372 2459
2373 warn "load config and database again"; 2460 warn "loading config and database again";
2374 cf::cfg_load; 2461 cf::cfg_load;
2375 cf::db_load;
2376 2462
2377 warn "load extensions"; 2463 warn "loading extensions";
2378 cf::load_extensions; 2464 cf::load_extensions;
2379 2465
2380 warn "reattach attachments to objects/players"; 2466 warn "reattaching attachments to objects/players";
2381 _global_reattach; 2467 _global_reattach;
2382 warn "reattach attachments to maps"; 2468 warn "reattaching attachments to maps";
2383 reattach $_ for values %MAP; 2469 reattach $_ for values %MAP;
2384 };
2385 2470
2386 if ($@) { 2471 warn "loading reloadable resources";
2472 load_resources;
2473
2474 warn "leaving sync_job";
2475
2476 1
2477 } or do {
2387 warn $@; 2478 warn $@;
2388 warn "error while reloading, exiting."; 2479 warn "error while reloading, exiting.";
2389 exit 1; 2480 exit 1;
2390 } 2481 };
2391 2482
2392 warn "reloaded"; 2483 warn "reloaded";
2393}; 2484};
2394 2485
2486our $RELOAD_WATCHER; # used only during reload
2487
2395register_command "reload" => sub { 2488register_command "reload" => sub {
2396 my ($who, $arg) = @_; 2489 my ($who, $arg) = @_;
2397 2490
2398 if ($who->flag (FLAG_WIZ)) { 2491 if ($who->flag (FLAG_WIZ)) {
2399 $who->message ("start of reload."); 2492 $who->message ("reloading server.");
2493
2494 # doing reload synchronously and two reloads happen back-to-back,
2495 # coro crashes during coro_state_free->destroy here.
2496
2497 $RELOAD_WATCHER ||= Event->timer (
2498 reentrant => 0,
2499 after => 0,
2500 data => WF_AUTOCANCEL,
2501 cb => sub {
2400 reload; 2502 reload;
2401 $who->message ("end of reload."); 2503 undef $RELOAD_WATCHER;
2504 },
2505 );
2402 } 2506 }
2403}; 2507};
2404 2508
2405unshift @INC, $LIBDIR; 2509unshift @INC, $LIBDIR;
2510
2511my $bug_warning = 0;
2406 2512
2407$TICK_WATCHER = Event->timer ( 2513$TICK_WATCHER = Event->timer (
2408 reentrant => 0, 2514 reentrant => 0,
2515 parked => 1,
2409 prio => 0, 2516 prio => 0,
2410 at => $NEXT_TICK || $TICK, 2517 at => $NEXT_TICK || $TICK,
2411 data => WF_AUTOCANCEL, 2518 data => WF_AUTOCANCEL,
2412 cb => sub { 2519 cb => sub {
2520 if ($Coro::current != $Coro::main) {
2521 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2522 unless ++$bug_warning > 10;
2523 return;
2524 }
2525
2413 $NOW = Event::time; 2526 $NOW = Event::time;
2414 2527
2415 cf::server_tick; # one server iteration 2528 cf::server_tick; # one server iteration
2416 $RUNTIME += $TICK; 2529 $RUNTIME += $TICK;
2417 $NEXT_TICK += $TICK; 2530 $NEXT_TICK += $TICK;
2418 2531
2532 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2533 $NEXT_RUNTIME_WRITE = $NOW + 10;
2534 Coro::async_pool {
2535 write_runtime
2536 or warn "ERROR: unable to write runtime file: $!";
2537 };
2538 }
2539
2540
2419 $WAIT_FOR_TICK->broadcast; 2541 $WAIT_FOR_TICK->broadcast;
2420 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2542 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2543
2544# my $AFTER = Event::time;
2545# warn $AFTER - $NOW;#d#
2421 2546
2422 # if we are delayed by four ticks or more, skip them all 2547 # if we are delayed by four ticks or more, skip them all
2423 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2548 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2424 2549
2425 $TICK_WATCHER->at ($NEXT_TICK); 2550 $TICK_WATCHER->at ($NEXT_TICK);
2426 $TICK_WATCHER->start; 2551 $TICK_WATCHER->start;
2427 }, 2552 },
2428); 2553);
2429 2554
2555{
2556 BDB::max_poll_time $TICK * 0.1;
2557 $BDB_POLL_WATCHER = Event->io (
2558 reentrant => 0,
2559 fd => BDB::poll_fileno,
2560 poll => 'r',
2561 prio => 0,
2562 data => WF_AUTOCANCEL,
2563 cb => \&BDB::poll_cb,
2564 );
2565 BDB::min_parallel 8;
2566
2567 BDB::set_sync_prepare {
2568 my $status;
2569 my $current = $Coro::current;
2570 (
2571 sub {
2572 $status = $!;
2573 $current->ready; undef $current;
2574 },
2575 sub {
2576 Coro::schedule while defined $current;
2577 $! = $status;
2578 },
2579 )
2580 };
2581
2582 unless ($DB_ENV) {
2583 $DB_ENV = BDB::db_env_create;
2584
2585 cf::sync_job {
2586 eval {
2587 BDB::db_env_open
2588 $DB_ENV,
2589 $BDB_ENV_DIR,
2590 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2591 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2592 0666;
2593
2594 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2595
2596 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2597 $DB_ENV->set_lk_detect;
2598 };
2599
2600 cf::cleanup "db_env_open(db): $@" if $@;
2601 };
2602 }
2603}
2604
2605{
2606 IO::AIO::min_parallel 8;
2607
2608 undef $Coro::AIO::WATCHER;
2430IO::AIO::max_poll_time $TICK * 0.2; 2609 IO::AIO::max_poll_time $TICK * 0.1;
2431
2432$AIO_POLL_WATCHER = Event->io ( 2610 $AIO_POLL_WATCHER = Event->io (
2433 fd => IO::AIO::poll_fileno, 2611 reentrant => 0,
2434 poll => 'r',
2435 prio => 5,
2436 data => WF_AUTOCANCEL,
2437 cb => \&IO::AIO::poll_cb,
2438);
2439
2440$WRITE_RUNTIME_WATCHER = Event->timer (
2441 data => WF_AUTOCANCEL, 2612 data => WF_AUTOCANCEL,
2442 after => 0, 2613 fd => IO::AIO::poll_fileno,
2443 interval => 10, 2614 poll => 'r',
2444 cb => sub { 2615 prio => 6,
2445 (Coro::unblock_sub { 2616 cb => \&IO::AIO::poll_cb,
2446 write_runtime 2617 );
2447 or warn "ERROR: unable to write runtime file: $!"; 2618}
2448 })->();
2449 },
2450);
2451 2619
2452END { cf::emergency_save } 2620END { cf::emergency_save }
2453 2621
24541 26221
2455 2623

Diff Legend

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