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.224 by root, Mon Mar 12 21:42:12 2007 UTC

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

Diff Legend

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