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.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
… …
1113 1152
1114use Fcntl; 1153use Fcntl;
1115use Coro::AIO; 1154use Coro::AIO;
1116 1155
1117use overload 1156use overload
1118 '""' => \&as_string; 1157 '""' => \&as_string,
1158 fallback => 1;
1119 1159
1120our $MAX_RESET = 3600; 1160our $MAX_RESET = 3600;
1121our $DEFAULT_RESET = 3000; 1161our $DEFAULT_RESET = 3000;
1122 1162
1123sub generate_random_map { 1163sub generate_random_map {
1124 my ($self, $rmp) = @_; 1164 my ($self, $rmp) = @_;
1125
1126 # mit "rum" bekleckern, nicht 1165 # mit "rum" bekleckern, nicht
1127 $self->_create_random_map ( 1166 $self->_create_random_map (
1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1167 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1168 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1169 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1176 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1177 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1178 )
1140} 1179}
1141 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
1142sub register { 1189sub register {
1143 my (undef, $regex) = @_; 1190 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1191 my $pkg = caller;
1145 1192
1146 no strict; 1193 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1194 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1195
1149 $EXT_MAP{$pkg} = qr<$regex>; 1196 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1197}
1151 1198
1152# also paths starting with '/' 1199# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1200$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1201
1155sub thawer_merge { 1202sub thawer_merge {
1156 my ($self, $merge) = @_; 1203 my ($self, $merge) = @_;
1157 1204
1158 # we have to keep some variables in memory intact 1205 # we have to keep some variables in memory intact
… …
1164 $self->SUPER::thawer_merge ($merge); 1211 $self->SUPER::thawer_merge ($merge);
1165} 1212}
1166 1213
1167sub normalise { 1214sub normalise {
1168 my ($path, $base) = @_; 1215 my ($path, $base) = @_;
1216
1217 $path = "$path"; # make sure its a string
1218
1219 $path =~ s/\.map$//;
1169 1220
1170 # map plan: 1221 # map plan:
1171 # 1222 #
1172 # /! non-realised random map exit (special hack!) 1223 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched 1224 # {... are special paths that are not being touched
… …
1201 1252
1202 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
1203 1254
1204 $path = normalise $path, $base; 1255 $path = normalise $path, $base;
1205 1256
1206 for my $pkg (keys %EXT_MAP) { 1257 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1258 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1259 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1260 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1261 $self->init; # pass $1 etc.
1211 return $self; 1262 return $self;
1212 } 1263 }
1213 } 1264 }
1214 1265
1215 Carp::carp "unable to resolve path '$path'."; 1266 Carp::carp "unable to resolve path '$path' (base '$base').";
1216 () 1267 ()
1217} 1268}
1218 1269
1219sub init { 1270sub init {
1220 my ($self) = @_; 1271 my ($self) = @_;
… …
1235 1286
1236# the original (read-only) location 1287# the original (read-only) location
1237sub load_path { 1288sub load_path {
1238 my ($self) = @_; 1289 my ($self) = @_;
1239 1290
1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1291 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1241} 1292}
1242 1293
1243# the temporary/swap location 1294# the temporary/swap location
1244sub save_path { 1295sub save_path {
1245 my ($self) = @_; 1296 my ($self) = @_;
1246 1297
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1298 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1299 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1249} 1300}
1250 1301
1251# the unique path, undef == no special unique path 1302# the unique path, undef == no special unique path
1252sub uniq_path { 1303sub uniq_path {
1253 my ($self) = @_; 1304 my ($self) = @_;
… …
1275 1326
1276sub load_header_from($) { 1327sub load_header_from($) {
1277 my ($self, $path) = @_; 1328 my ($self, $path) = @_;
1278 1329
1279 utf8::encode $path; 1330 utf8::encode $path;
1280 aio_open $path, O_RDONLY, 0 1331 #aio_open $path, O_RDONLY, 0
1281 or return; 1332 # or return;
1282 1333
1283 $self->_load_header ($path) 1334 $self->_load_header ($path)
1284 or return; 1335 or return;
1285 1336
1286 $self->{load_path} = $path; 1337 $self->{load_path} = $path;
1287 1338
1288 1 1339 1
1289} 1340}
1290 1341
1291sub load_orig { 1342sub load_header_orig {
1292 my ($self) = @_; 1343 my ($self) = @_;
1293 1344
1294 $self->load_header_from ($self->load_path) 1345 $self->load_header_from ($self->load_path)
1295} 1346}
1296 1347
1297sub load_temp { 1348sub load_header_temp {
1298 my ($self) = @_; 1349 my ($self) = @_;
1299 1350
1300 $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;
1301} 1371}
1302 1372
1303sub load_header { 1373sub load_header {
1304 my ($self) = @_; 1374 my ($self) = @_;
1305 1375
1306 if ($self->load_temp) { 1376 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1377 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1378 } else {
1313 $self->load_orig 1379 $self->load_header_orig
1314 or return; 1380 or return;
1315 1381 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1382 }
1321 1383
1322 1 1384 1
1323} 1385}
1324 1386
… …
1338 $map->{last_save} = $cf::RUNTIME; 1400 $map->{last_save} = $cf::RUNTIME;
1339 1401
1340 $map->load_header 1402 $map->load_header
1341 or return; 1403 or return;
1342 1404
1343 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
1344 $cf::WAIT_FOR_TICK->wait; 1407 #$cf::WAIT_FOR_TICK->wait;
1345 $map->reset; 1408 $map->reset;
1346 undef $guard; 1409 undef $guard;
1347 $map = find $path 1410 return find $path;
1348 or return;
1349 } 1411 }
1350 1412
1351 $cf::MAP{$path} = $map 1413 $cf::MAP{$path} = $map
1352 } 1414 }
1353} 1415}
1416
1417sub pre_load { }
1418sub post_load { }
1354 1419
1355sub load { 1420sub load {
1356 my ($self) = @_; 1421 my ($self) = @_;
1357 1422
1423 local $self->{deny_reset} = 1; # loading can take a long time
1424
1358 my $path = $self->{path}; 1425 my $path = $self->{path};
1359 my $guard = cf::lock_acquire "map_load:$path"; 1426 my $guard = cf::lock_acquire "map_load:$path";
1360 1427
1361 return if $self->in_memory != cf::MAP_SWAPPED; 1428 return if $self->in_memory != cf::MAP_SWAPPED;
1362 1429
1363 $self->in_memory (cf::MAP_LOADING); 1430 $self->in_memory (cf::MAP_LOADING);
1364 1431
1365 $self->alloc; 1432 $self->alloc;
1433
1434 $self->pre_load;
1435
1366 $self->_load_objects ($self->{load_path}, 1) 1436 $self->_load_objects ($self->{load_path}, 1)
1367 or return; 1437 or return;
1368 1438
1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1439 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1370 if delete $self->{load_original}; 1440 if delete $self->{load_original};
… …
1392 unless $self->difficulty; 1462 unless $self->difficulty;
1393 Coro::cede; 1463 Coro::cede;
1394 $self->activate; 1464 $self->activate;
1395 } 1465 }
1396 1466
1467 $self->post_load;
1468
1397 $self->in_memory (cf::MAP_IN_MEMORY); 1469 $self->in_memory (cf::MAP_IN_MEMORY);
1398} 1470}
1399 1471
1400sub customise_for { 1472sub customise_for {
1401 my ($self, $ob) = @_; 1473 my ($self, $ob) = @_;
… …
1441 1513
1442 cf::sync_job { $map->load }; 1514 cf::sync_job { $map->load };
1443} 1515}
1444 1516
1445our %MAP_PREFETCH; 1517our %MAP_PREFETCH;
1446our $MAP_PREFETCHER = Coro::async { 1518our $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 1519
1459sub find_async { 1520sub find_async {
1460 my ($path, $origin) = @_; 1521 my ($path, $origin) = @_;
1461 1522
1462 $path = normalise $path, $origin && $origin->{path}; 1523 $path = normalise $path, $origin && $origin->{path};
1463 1524
1464 if (my $map = $cf::MAP{$path}) { 1525 if (my $map = $cf::MAP{$path}) {
1465 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1526 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1466 } 1527 }
1467 1528
1468 $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 };
1469 $MAP_PREFETCHER->ready; 1542 $MAP_PREFETCHER->prio (6);
1470 1543
1471 () 1544 ()
1472} 1545}
1473 1546
1474sub save { 1547sub save {
… …
1534 my ($self) = @_; 1607 my ($self) = @_;
1535 1608
1536 $self->reset_at <= $cf::RUNTIME 1609 $self->reset_at <= $cf::RUNTIME
1537} 1610}
1538 1611
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 { 1612sub reset {
1554 my ($self) = @_; 1613 my ($self) = @_;
1555 1614
1556 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1615 my $lock = cf::lock_acquire "map_data:$self->{path}";
1557 1616
1558 return if $self->players; 1617 return if $self->players;
1559 return if $self->isa ("ext::map_per_player");#d# 1618 return if $self->isa ("ext::map_per_player");#d#
1560 1619
1561 warn "resetting map ", $self->path;#d# 1620 warn "resetting map ", $self->path;#d#
1562 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
1563 delete $cf::MAP{$self->path}; 1632 delete $cf::MAP{$self->path};
1564 1633
1565 $self->in_memory (cf::MAP_SWAPPED);
1566 $self->clear; 1634 $self->clear;
1567 1635
1568 $_->clear_links_to ($self) for values %cf::MAP; 1636 $_->clear_links_to ($self) for values %cf::MAP;
1569 1637
1570 $self->unlink_save; 1638 $self->unlink_save;
… …
1574my $nuke_counter = "aaaa"; 1642my $nuke_counter = "aaaa";
1575 1643
1576sub nuke { 1644sub nuke {
1577 my ($self) = @_; 1645 my ($self) = @_;
1578 1646
1647 delete $cf::MAP{$self->path};
1648
1649 $self->unlink_save;
1650
1651 bless $self, "cf::map";
1652 delete $self->{deny_reset};
1579 $self->{deny_save} = 1; 1653 $self->{deny_save} = 1;
1580 $self->reset_timeout (1); 1654 $self->reset_timeout (1);
1581 $self->rename ("{nuke}/" . ($nuke_counter++)); 1655 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1656
1657 $cf::MAP{$self->path} = $self;
1658
1582 $self->reset; # polite request, might not happen 1659 $self->reset; # polite request, might not happen
1583} 1660}
1584 1661
1585=item cf::map::unique_maps 1662=item cf::map::unique_maps
1586 1663
… …
1598 for (@$files) { 1675 for (@$files) {
1599 utf8::decode $_; 1676 utf8::decode $_;
1600 next if /\.pst$/; 1677 next if /\.pst$/;
1601 next unless /^$PATH_SEP/o; 1678 next unless /^$PATH_SEP/o;
1602 1679
1603 s/\.map$//; 1680 push @paths, cf::map::normalise $_;
1604 push @paths, $_;
1605 } 1681 }
1606 1682
1607 \@paths 1683 \@paths
1608} 1684}
1609 1685
… …
1703=cut 1779=cut
1704 1780
1705sub link_map { 1781sub link_map {
1706 unless ($LINK_MAP) { 1782 unless ($LINK_MAP) {
1707 $LINK_MAP = cf::map::find "{link}" 1783 $LINK_MAP = cf::map::find "{link}"
1708 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1784 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1709 $LINK_MAP->load; 1785 $LINK_MAP->load;
1710 } 1786 }
1711 1787
1712 $LINK_MAP 1788 $LINK_MAP
1713} 1789}
… …
1720 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1796 return if UNIVERSAL::isa $self->map, "ext::map_link";
1721 1797
1722 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1798 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1723 if $self->map; 1799 if $self->map;
1724 1800
1725 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1801 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1726} 1802}
1727 1803
1728sub cf::object::player::leave_link { 1804sub cf::object::player::leave_link {
1729 my ($self, $map, $x, $y) = @_; 1805 my ($self, $map, $x, $y) = @_;
1730 1806
… …
1752 $map->load; 1828 $map->load;
1753 $map->load_diag; 1829 $map->load_diag;
1754 1830
1755 return unless $self->contr->active; 1831 return unless $self->contr->active;
1756 $self->activate_recursive; 1832 $self->activate_recursive;
1833
1834 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1757 $self->enter_map ($map, $x, $y); 1835 $self->enter_map ($map, $x, $y);
1758} 1836}
1759 1837
1760cf::player->attach ( 1838cf::player->attach (
1761 on_logout => sub { 1839 on_logout => sub {
… …
1774 # try to abort aborted map switching on player login :) 1852 # try to abort aborted map switching on player login :)
1775 # should happen only on crashes 1853 # should happen only on crashes
1776 if ($pl->ob->{_link_pos}) { 1854 if ($pl->ob->{_link_pos}) {
1777 $pl->ob->enter_link; 1855 $pl->ob->enter_link;
1778 (async { 1856 (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, 1857 $pl->ob->reply (undef,
1782 "There was an internal problem at your last logout, " 1858 "There was an internal problem at your last logout, "
1783 . "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.",
1784 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
1785 Coro::Timer::sleep 1; 1863 Coro::Timer::sleep 1;
1786 $pl->ob->leave_link; 1864 $pl->ob->leave_link;
1787 })->prio (2); 1865 })->prio (2);
1788 } 1866 }
1789 }, 1867 },
… …
1797 my ($self, $path, $x, $y) = @_; 1875 my ($self, $path, $x, $y) = @_;
1798 1876
1799 $self->enter_link; 1877 $self->enter_link;
1800 1878
1801 (async { 1879 (async {
1880 my $map = eval {
1802 my $map = cf::map::find $path; 1881 my $map = cf::map::find $path;
1803 $map = $map->customise_for ($self) if $map; 1882 $map = $map->customise_for ($self) if $map;
1804 1883 $map
1805# warn "entering ", $map->path, " at ($x, $y)\n" 1884 } or
1806# if $map;
1807
1808 $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);
1809 1886
1810 $self->leave_link ($map, $x, $y); 1887 $self->leave_link ($map, $x, $y);
1811 })->prio (1); 1888 })->prio (1);
1812} 1889}
1813 1890
… …
1817 1894
1818sub parse_random_map_params { 1895sub parse_random_map_params {
1819 my ($spec) = @_; 1896 my ($spec) = @_;
1820 1897
1821 my $rmp = { # defaults 1898 my $rmp = { # defaults
1822 xsize => 10, 1899 xsize => (cf::rndm 15, 40),
1823 ysize => 10, 1900 ysize => (cf::rndm 15, 40),
1901 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1902 #layout => string,
1824 }; 1903 };
1825 1904
1826 for (split /\n/, $spec) { 1905 for (split /\n/, $spec) {
1827 my ($k, $v) = split /\s+/, $_, 2; 1906 my ($k, $v) = split /\s+/, $_, 2;
1828 1907
… …
1832 $rmp 1911 $rmp
1833} 1912}
1834 1913
1835sub prepare_random_map { 1914sub prepare_random_map {
1836 my ($exit) = @_; 1915 my ($exit) = @_;
1916
1917 my $guard = cf::lock_acquire "exit_prepare:$exit";
1837 1918
1838 # all this does is basically replace the /! path by 1919 # all this does is basically replace the /! path by
1839 # a new random map path (?random/...) with a seed 1920 # a new random map path (?random/...) with a seed
1840 # that depends on the exit object 1921 # that depends on the exit object
1841 1922
1842 my $rmp = parse_random_map_params $exit->msg; 1923 my $rmp = parse_random_map_params $exit->msg;
1843 1924
1844 if ($exit->map) { 1925 if ($exit->map) {
1845 $rmp->{region} = $exit->map->region_name; 1926 $rmp->{region} = $exit->region->name;
1846 $rmp->{origin_map} = $exit->map->path; 1927 $rmp->{origin_map} = $exit->map->path;
1847 $rmp->{origin_x} = $exit->x; 1928 $rmp->{origin_x} = $exit->x;
1848 $rmp->{origin_y} = $exit->y; 1929 $rmp->{origin_y} = $exit->y;
1849 } 1930 }
1850 1931
1851 $rmp->{random_seed} ||= $exit->random_seed; 1932 $rmp->{random_seed} ||= $exit->random_seed;
1852 1933
1853 my $data = cf::to_json $rmp; 1934 my $data = cf::to_json $rmp;
1854 my $md5 = Digest::MD5::md5_hex $data; 1935 my $md5 = Digest::MD5::md5_hex $data;
1936 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1855 1937
1856 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) {
1857 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;
1858 1942
1859 $exit->slaying ("?random/$md5"); 1943 $exit->slaying ("?random/$md5");
1860 $exit->msg (undef); 1944 $exit->msg (undef);
1861 } 1945 }
1862} 1946}
1863 1947
1864sub cf::object::player::enter_exit { 1948sub cf::object::player::enter_exit {
1865 my ($self, $exit) = @_; 1949 my ($self, $exit) = @_;
1866 1950
1867 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;
1868 1961
1869 $self->enter_link; 1962 $self->enter_link;
1870 1963
1871 (async { 1964 (async {
1872 $self->deactivate_recursive; # just to be sure 1965 $self->deactivate_recursive; # just to be sure
1873 unless (eval { 1966 unless (eval {
1874 prepare_random_map $exit 1967 $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 1968
1880 1; 1969 1;
1881 }) { 1970 }) {
1882 $self->message ("Something went wrong deep within the crossfire server. " 1971 $self->message ("Something went wrong deep within the crossfire server. "
1883 . "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. "
… …
1944 # get handled first 2033 # get handled first
1945 my $queue = delete $ns->{query_queue} 2034 my $queue = delete $ns->{query_queue}
1946 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
1947 2036
1948 (shift @$queue)->[1]->($msg); 2037 (shift @$queue)->[1]->($msg);
2038 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1949 2039
1950 push @{ $ns->{query_queue} }, @$queue; 2040 push @{ $ns->{query_queue} }, @$queue;
1951 2041
1952 if (@{ $ns->{query_queue} } == @$queue) { 2042 if (@{ $ns->{query_queue} } == @$queue) {
1953 if (@$queue) { 2043 if (@$queue) {
… …
2114The 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
2115using it, it should be unique. 2205using it, it should be unique.
2116 2206
2117=over 4 2207=over 4
2118 2208
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 2209=item $value = cf::db_get $family => $key
2126 2210
2127Returns a single value from the database 2211Returns 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 2212
2134=item cf::db_put $family => $key => $value 2213=item cf::db_put $family => $key => $value
2135 2214
2136Stores the given C<$value> in the family hash. Updates are delayed, if you 2215Stores 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 2216
2147=cut 2217=cut
2148 2218
2149our $DB; 2219our $DB;
2150 2220
2151{ 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
2152 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;
2153 2240
2154 sub db_load() { 2241 cf::db_put (board => data => $pst->{board});
2155 $DB = stat $path ? Storable::retrieve $path : { }; 2242 cf::db_put (guildrules => data => $pst->{guildrules});
2156 } 2243 cf::db_put (rent => balance => $pst->{rent}{balance});
2244 BDB::db_env_txn_checkpoint $DB_ENV;
2157 2245
2158 my $pid; 2246 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 } 2247 };
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 }, 2248 }
2206 ); 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 { };
2207} 2266}
2208 2267
2209############################################################################# 2268#############################################################################
2210# 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}
2211 2275
2212sub cfg_load { 2276sub cfg_load {
2213 open my $fh, "<:utf8", cf::confdir . "/config" 2277 open my $fh, "<:utf8", cf::confdir . "/config"
2214 or return; 2278 or return;
2215 2279
… …
2228 }; 2292 };
2229 warn $@ if $@; 2293 warn $@ if $@;
2230 } 2294 }
2231} 2295}
2232 2296
2297sub init {
2298 init_resources;
2299}
2300
2233sub main { 2301sub main {
2234 # we must not ever block the main coroutine 2302 # we must not ever block the main coroutine
2235 local $Coro::idle = sub { 2303 local $Coro::idle = sub {
2236 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 {
2237 async { Event::one_event }; 2306 Event::one_event;
2307 })->prio (Coro::PRIO_MAX);
2238 }; 2308 };
2239 2309
2240 cfg_load; 2310 cfg_load;
2241 db_load; 2311 db_init;
2242 load_extensions; 2312 load_extensions;
2313
2314 $TICK_WATCHER->start;
2243 Event::loop; 2315 Event::loop;
2244} 2316}
2245 2317
2246############################################################################# 2318#############################################################################
2247# initialisation and cleanup 2319# initialisation and cleanup
2248 2320
2249# install some emergency cleanup handlers 2321# install some emergency cleanup handlers
2250BEGIN { 2322BEGIN {
2251 for my $signal (qw(INT HUP TERM)) { 2323 for my $signal (qw(INT HUP TERM)) {
2252 Event->signal ( 2324 Event->signal (
2325 reentrant => 0,
2253 data => WF_AUTOCANCEL, 2326 data => WF_AUTOCANCEL,
2254 signal => $signal, 2327 signal => $signal,
2328 prio => 0,
2255 cb => sub { 2329 cb => sub {
2256 cf::cleanup "SIG$signal"; 2330 cf::cleanup "SIG$signal";
2257 }, 2331 },
2258 ); 2332 );
2259 } 2333 }
2260} 2334}
… …
2281 my $map = $cf::MAP{$path} or next; 2355 my $map = $cf::MAP{$path} or next;
2282 $map->valid or next; 2356 $map->valid or next;
2283 $map->save; 2357 $map->save;
2284 } 2358 }
2285 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";
2286 }; 2364 };
2287 2365
2288 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;
2289} 2374}
2290 2375
2291sub reload() { 2376sub reload() {
2292 # can/must only be called in main 2377 # can/must only be called in main
2293 if ($Coro::current != $Coro::main) { 2378 if ($Coro::current != $Coro::main) {
2294 warn "can only reload from main coroutine\n"; 2379 warn "can only reload from main coroutine";
2295 return; 2380 return;
2296 } 2381 }
2297 2382
2298 warn "reloading..."; 2383 warn "reloading...";
2299 2384
2300 warn "freezing server"; 2385 warn "entering sync_job";
2301 my $guard = freeze_mainloop; 2386
2387 cf::sync_job {
2388 cf::write_runtime; # external watchdog should not bark
2302 cf::emergency_save; 2389 cf::emergency_save;
2390 cf::write_runtime; # external watchdog should not bark
2303 2391
2304 warn "sync database to disk"; 2392 warn "syncing database to disk";
2305 cf::db_sync; 2393 BDB::db_env_txn_checkpoint $DB_ENV;
2306 IO::AIO::flush;
2307 2394
2308 eval {
2309 # 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
2310 2396
2311 warn "cancel all watchers"; 2397 warn "cancelling all WF_AUTOCANCEL watchers";
2312 for (Event::all_watchers) { 2398 for (Event::all_watchers) {
2313 $_->cancel if $_->data & WF_AUTOCANCEL; 2399 $_->cancel if $_->data & WF_AUTOCANCEL;
2314 } 2400 }
2315 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
2316 warn "cancel all extension coros"; 2411 warn "cancelling all extension coros";
2317 $_->cancel for values %EXT_CORO; 2412 $_->cancel for values %EXT_CORO;
2318 %EXT_CORO = (); 2413 %EXT_CORO = ();
2319 2414
2320 warn "remove commands"; 2415 warn "removing commands";
2321 %COMMAND = (); 2416 %COMMAND = ();
2322 2417
2323 warn "remove ext commands"; 2418 warn "removing ext commands";
2324 %EXTCMD = (); 2419 %EXTCMD = ();
2325 2420
2326 warn "unload/nuke all extensions"; 2421 warn "unloading/nuking all extensions";
2327 for my $pkg (@EXTS) { 2422 for my $pkg (@EXTS) {
2328 warn "... unloading $pkg"; 2423 warn "... unloading $pkg";
2329 2424
2330 if (my $cb = $pkg->can ("unload")) { 2425 if (my $cb = $pkg->can ("unload")) {
2331 eval { 2426 eval {
… …
2336 2431
2337 warn "... nuking $pkg"; 2432 warn "... nuking $pkg";
2338 Symbol::delete_package $pkg; 2433 Symbol::delete_package $pkg;
2339 } 2434 }
2340 2435
2341 warn "unload all perl modules loaded from $LIBDIR"; 2436 warn "unloading all perl modules loaded from $LIBDIR";
2342 while (my ($k, $v) = each %INC) { 2437 while (my ($k, $v) = each %INC) {
2343 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2438 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2344 2439
2345 warn "removing <$k>"; 2440 warn "... unloading $k";
2346 delete $INC{$k}; 2441 delete $INC{$k};
2347 2442
2348 $k =~ s/\.pm$//; 2443 $k =~ s/\.pm$//;
2349 $k =~ s/\//::/g; 2444 $k =~ s/\//::/g;
2350 2445
… …
2353 } 2448 }
2354 2449
2355 Symbol::delete_package $k; 2450 Symbol::delete_package $k;
2356 } 2451 }
2357 2452
2358 warn "get rid of safe::, as good as possible"; 2453 warn "getting rid of safe::, as good as possible";
2359 Symbol::delete_package "safe::$_" 2454 Symbol::delete_package "safe::$_"
2360 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);
2361 2456
2362 warn "unload cf.pm \"a bit\""; 2457 warn "unloading cf.pm \"a bit\"";
2363 delete $INC{"cf.pm"}; 2458 delete $INC{"cf.pm"};
2364 2459
2365 # don't, removes xs symbols, too, 2460 # don't, removes xs symbols, too,
2366 # and global variables created in xs 2461 # and global variables created in xs
2367 #Symbol::delete_package __PACKAGE__; 2462 #Symbol::delete_package __PACKAGE__;
2368 2463
2464 warn "unload completed, starting to reload now";
2465
2369 warn "reloading cf.pm"; 2466 warn "reloading cf.pm";
2370 require cf; 2467 require cf;
2371 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2468 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2372 2469
2373 warn "load config and database again"; 2470 warn "loading config and database again";
2374 cf::cfg_load; 2471 cf::cfg_load;
2375 cf::db_load;
2376 2472
2377 warn "load extensions"; 2473 warn "loading extensions";
2378 cf::load_extensions; 2474 cf::load_extensions;
2379 2475
2380 warn "reattach attachments to objects/players"; 2476 warn "reattaching attachments to objects/players";
2381 _global_reattach; 2477 _global_reattach; # objects, sockets
2382 warn "reattach attachments to maps"; 2478 warn "reattaching attachments to maps";
2383 reattach $_ for values %MAP; 2479 reattach $_ for values %MAP;
2384 }; 2480 warn "reattaching attachments to players";
2481 reattach $_ for values %PLAYER;
2385 2482
2386 if ($@) { 2483 warn "loading reloadable resources";
2484 init_resources;
2485
2486 warn "leaving sync_job";
2487
2488 1
2489 } or do {
2387 warn $@; 2490 warn $@;
2388 warn "error while reloading, exiting."; 2491 warn "error while reloading, exiting.";
2389 exit 1; 2492 exit 1;
2390 } 2493 };
2391 2494
2392 warn "reloaded"; 2495 warn "reloaded";
2393}; 2496};
2394 2497
2498our $RELOAD_WATCHER; # used only during reload
2499
2395register_command "reload" => sub { 2500register_command "reload" => sub {
2396 my ($who, $arg) = @_; 2501 my ($who, $arg) = @_;
2397 2502
2398 if ($who->flag (FLAG_WIZ)) { 2503 if ($who->flag (FLAG_WIZ)) {
2399 $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 {
2400 reload; 2514 reload;
2401 $who->message ("end of reload."); 2515 undef $RELOAD_WATCHER;
2516 },
2517 );
2402 } 2518 }
2403}; 2519};
2404 2520
2405unshift @INC, $LIBDIR; 2521unshift @INC, $LIBDIR;
2522
2523my $bug_warning = 0;
2406 2524
2407$TICK_WATCHER = Event->timer ( 2525$TICK_WATCHER = Event->timer (
2408 reentrant => 0, 2526 reentrant => 0,
2527 parked => 1,
2409 prio => 0, 2528 prio => 0,
2410 at => $NEXT_TICK || $TICK, 2529 at => $NEXT_TICK || $TICK,
2411 data => WF_AUTOCANCEL, 2530 data => WF_AUTOCANCEL,
2412 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
2413 $NOW = Event::time; 2538 $NOW = Event::time;
2414 2539
2415 cf::server_tick; # one server iteration 2540 cf::server_tick; # one server iteration
2416 $RUNTIME += $TICK; 2541 $RUNTIME += $TICK;
2417 $NEXT_TICK += $TICK; 2542 $NEXT_TICK += $TICK;
2418 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
2419 $WAIT_FOR_TICK->broadcast; 2552 $WAIT_FOR_TICK->broadcast;
2420 $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#
2421 2557
2422 # 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
2423 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2559 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2424 2560
2425 $TICK_WATCHER->at ($NEXT_TICK); 2561 $TICK_WATCHER->at ($NEXT_TICK);
2426 $TICK_WATCHER->start; 2562 $TICK_WATCHER->start;
2427 }, 2563 },
2428); 2564);
2429 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;
2430IO::AIO::max_poll_time $TICK * 0.2; 2620 IO::AIO::max_poll_time $TICK * 0.1;
2431
2432$AIO_POLL_WATCHER = Event->io ( 2621 $AIO_POLL_WATCHER = Event->io (
2433 fd => IO::AIO::poll_fileno, 2622 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, 2623 data => WF_AUTOCANCEL,
2442 after => 0, 2624 fd => IO::AIO::poll_fileno,
2443 interval => 10, 2625 poll => 'r',
2444 cb => sub { 2626 prio => 6,
2445 (Coro::unblock_sub { 2627 cb => \&IO::AIO::poll_cb,
2446 write_runtime 2628 );
2447 or warn "ERROR: unable to write runtime file: $!"; 2629}
2448 })->();
2449 },
2450);
2451 2630
2452END { cf::emergency_save } 2631END { cf::emergency_save }
2453 2632
24541 26331
2455 2634

Diff Legend

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