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

Diff Legend

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