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

Diff Legend

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