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.178 by root, Thu Jan 18 00:06:55 2007 UTC vs.
Revision 1.226 by root, Wed Mar 14 04:12:29 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
… …
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1179 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1180 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1181 )
1140} 1182}
1141 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
1142sub register { 1192sub register {
1143 my (undef, $regex) = @_; 1193 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1194 my $pkg = caller;
1145 1195
1146 no strict; 1196 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1197 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1198
1149 $EXT_MAP{$pkg} = qr<$regex>; 1199 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1200}
1151 1201
1152# also paths starting with '/' 1202# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1203$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1204
1155sub thawer_merge { 1205sub thawer_merge {
1156 my ($self, $merge) = @_; 1206 my ($self, $merge) = @_;
1157 1207
1158 # we have to keep some variables in memory intact 1208 # we have to keep some variables in memory intact
… …
1164 $self->SUPER::thawer_merge ($merge); 1214 $self->SUPER::thawer_merge ($merge);
1165} 1215}
1166 1216
1167sub normalise { 1217sub normalise {
1168 my ($path, $base) = @_; 1218 my ($path, $base) = @_;
1219
1220 $path = "$path"; # make sure its a string
1221
1222 $path =~ s/\.map$//;
1169 1223
1170 # map plan: 1224 # map plan:
1171 # 1225 #
1172 # /! non-realised random map exit (special hack!) 1226 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched 1227 # {... are special paths that are not being touched
… …
1201 1255
1202 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
1203 1257
1204 $path = normalise $path, $base; 1258 $path = normalise $path, $base;
1205 1259
1206 for my $pkg (keys %EXT_MAP) { 1260 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1261 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1262 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1263 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1264 $self->init; # pass $1 etc.
1211 return $self; 1265 return $self;
1212 } 1266 }
1213 } 1267 }
1214 1268
1215 Carp::carp "unable to resolve path '$path'."; 1269 Carp::carp "unable to resolve path '$path' (base '$base').";
1216 () 1270 ()
1217} 1271}
1218 1272
1219sub init { 1273sub init {
1220 my ($self) = @_; 1274 my ($self) = @_;
… …
1235 1289
1236# the original (read-only) location 1290# the original (read-only) location
1237sub load_path { 1291sub load_path {
1238 my ($self) = @_; 1292 my ($self) = @_;
1239 1293
1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1294 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1241} 1295}
1242 1296
1243# the temporary/swap location 1297# the temporary/swap location
1244sub save_path { 1298sub save_path {
1245 my ($self) = @_; 1299 my ($self) = @_;
1246 1300
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1301 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1302 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1249} 1303}
1250 1304
1251# the unique path, undef == no special unique path 1305# the unique path, undef == no special unique path
1252sub uniq_path { 1306sub uniq_path {
1253 my ($self) = @_; 1307 my ($self) = @_;
… …
1275 1329
1276sub load_header_from($) { 1330sub load_header_from($) {
1277 my ($self, $path) = @_; 1331 my ($self, $path) = @_;
1278 1332
1279 utf8::encode $path; 1333 utf8::encode $path;
1280 aio_open $path, O_RDONLY, 0 1334 #aio_open $path, O_RDONLY, 0
1281 or return; 1335 # or return;
1282 1336
1283 $self->_load_header ($path) 1337 $self->_load_header ($path)
1284 or return; 1338 or return;
1285 1339
1286 $self->{load_path} = $path; 1340 $self->{load_path} = $path;
1287 1341
1288 1 1342 1
1289} 1343}
1290 1344
1291sub load_orig { 1345sub load_header_orig {
1292 my ($self) = @_; 1346 my ($self) = @_;
1293 1347
1294 $self->load_header_from ($self->load_path) 1348 $self->load_header_from ($self->load_path)
1295} 1349}
1296 1350
1297sub load_temp { 1351sub load_header_temp {
1298 my ($self) = @_; 1352 my ($self) = @_;
1299 1353
1300 $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;
1301} 1374}
1302 1375
1303sub load_header { 1376sub load_header {
1304 my ($self) = @_; 1377 my ($self) = @_;
1305 1378
1306 if ($self->load_temp) { 1379 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1380 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1381 } else {
1313 $self->load_orig 1382 $self->load_header_orig
1314 or return; 1383 or return;
1315 1384 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1385 }
1321 1386
1322 1 1387 1
1323} 1388}
1324 1389
… …
1338 $map->{last_save} = $cf::RUNTIME; 1403 $map->{last_save} = $cf::RUNTIME;
1339 1404
1340 $map->load_header 1405 $map->load_header
1341 or return; 1406 or return;
1342 1407
1343 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
1344 $cf::WAIT_FOR_TICK->wait; 1410 #$cf::WAIT_FOR_TICK->wait;
1345 $map->reset; 1411 $map->reset;
1346 undef $guard; 1412 undef $guard;
1347 $map = find $path 1413 return find $path;
1348 or return;
1349 } 1414 }
1350 1415
1351 $cf::MAP{$path} = $map 1416 $cf::MAP{$path} = $map
1352 } 1417 }
1353} 1418}
1419
1420sub pre_load { }
1421sub post_load { }
1354 1422
1355sub load { 1423sub load {
1356 my ($self) = @_; 1424 my ($self) = @_;
1357 1425
1426 local $self->{deny_reset} = 1; # loading can take a long time
1427
1358 my $path = $self->{path}; 1428 my $path = $self->{path};
1359 my $guard = cf::lock_acquire "map_load:$path"; 1429 my $guard = cf::lock_acquire "map_load:$path";
1360 1430
1361 return if $self->in_memory != cf::MAP_SWAPPED; 1431 return if $self->in_memory != cf::MAP_SWAPPED;
1362 1432
1363 $self->in_memory (cf::MAP_LOADING); 1433 $self->in_memory (cf::MAP_LOADING);
1364 1434
1365 $self->alloc; 1435 $self->alloc;
1436
1437 $self->pre_load;
1438
1366 $self->_load_objects ($self->{load_path}, 1) 1439 $self->_load_objects ($self->{load_path}, 1)
1367 or return; 1440 or return;
1368 1441
1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1442 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1370 if delete $self->{load_original}; 1443 if delete $self->{load_original};
… …
1392 unless $self->difficulty; 1465 unless $self->difficulty;
1393 Coro::cede; 1466 Coro::cede;
1394 $self->activate; 1467 $self->activate;
1395 } 1468 }
1396 1469
1470 $self->post_load;
1471
1397 $self->in_memory (cf::MAP_IN_MEMORY); 1472 $self->in_memory (cf::MAP_IN_MEMORY);
1398} 1473}
1399 1474
1400sub customise_for { 1475sub customise_for {
1401 my ($self, $ob) = @_; 1476 my ($self, $ob) = @_;
… …
1441 1516
1442 cf::sync_job { $map->load }; 1517 cf::sync_job { $map->load };
1443} 1518}
1444 1519
1445our %MAP_PREFETCH; 1520our %MAP_PREFETCH;
1446our $MAP_PREFETCHER = Coro::async { 1521our $MAP_PREFETCHER = undef;
1447 while () {
1448 for my $path (keys %MAP_PREFETCH) {
1449 my $map = find $path
1450 or next;
1451 $map->load;
1452
1453 delete $MAP_PREFETCH{$path};
1454 }
1455 Coro::schedule;
1456 }
1457};
1458 1522
1459sub find_async { 1523sub find_async {
1460 my ($path, $origin) = @_; 1524 my ($path, $origin) = @_;
1461 1525
1462 $path = normalise $path, $origin && $origin->{path}; 1526 $path = normalise $path, $origin && $origin->{path};
1463 1527
1464 if (my $map = $cf::MAP{$path}) { 1528 if (my $map = $cf::MAP{$path}) {
1465 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1529 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1466 } 1530 }
1467 1531
1468 $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 };
1469 $MAP_PREFETCHER->ready; 1545 $MAP_PREFETCHER->prio (6);
1470 1546
1471 () 1547 ()
1472} 1548}
1473 1549
1474sub save { 1550sub save {
… …
1544 return if $self->players; 1620 return if $self->players;
1545 return if $self->isa ("ext::map_per_player");#d# 1621 return if $self->isa ("ext::map_per_player");#d#
1546 1622
1547 warn "resetting map ", $self->path;#d# 1623 warn "resetting map ", $self->path;#d#
1548 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
1549 delete $cf::MAP{$self->path}; 1635 delete $cf::MAP{$self->path};
1550 1636
1551 $self->in_memory (cf::MAP_SWAPPED);
1552 $self->clear; 1637 $self->clear;
1553 1638
1554 $_->clear_links_to ($self) for values %cf::MAP; 1639 $_->clear_links_to ($self) for values %cf::MAP;
1555 1640
1556 $self->unlink_save; 1641 $self->unlink_save;
… …
1593 for (@$files) { 1678 for (@$files) {
1594 utf8::decode $_; 1679 utf8::decode $_;
1595 next if /\.pst$/; 1680 next if /\.pst$/;
1596 next unless /^$PATH_SEP/o; 1681 next unless /^$PATH_SEP/o;
1597 1682
1598 s/\.map$//; 1683 push @paths, cf::map::normalise $_;
1599 push @paths, $_;
1600 } 1684 }
1601 1685
1602 \@paths 1686 \@paths
1603} 1687}
1604 1688
… …
1698=cut 1782=cut
1699 1783
1700sub link_map { 1784sub link_map {
1701 unless ($LINK_MAP) { 1785 unless ($LINK_MAP) {
1702 $LINK_MAP = cf::map::find "{link}" 1786 $LINK_MAP = cf::map::find "{link}"
1703 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1787 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1704 $LINK_MAP->load; 1788 $LINK_MAP->load;
1705 } 1789 }
1706 1790
1707 $LINK_MAP 1791 $LINK_MAP
1708} 1792}
… …
1715 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1799 return if UNIVERSAL::isa $self->map, "ext::map_link";
1716 1800
1717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1801 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1718 if $self->map; 1802 if $self->map;
1719 1803
1720 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1804 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1721} 1805}
1722 1806
1723sub cf::object::player::leave_link { 1807sub cf::object::player::leave_link {
1724 my ($self, $map, $x, $y) = @_; 1808 my ($self, $map, $x, $y) = @_;
1725 1809
… …
1747 $map->load; 1831 $map->load;
1748 $map->load_diag; 1832 $map->load_diag;
1749 1833
1750 return unless $self->contr->active; 1834 return unless $self->contr->active;
1751 $self->activate_recursive; 1835 $self->activate_recursive;
1836
1837 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1752 $self->enter_map ($map, $x, $y); 1838 $self->enter_map ($map, $x, $y);
1753} 1839}
1754 1840
1755cf::player->attach ( 1841cf::player->attach (
1756 on_logout => sub { 1842 on_logout => sub {
… …
1769 # try to abort aborted map switching on player login :) 1855 # try to abort aborted map switching on player login :)
1770 # should happen only on crashes 1856 # should happen only on crashes
1771 if ($pl->ob->{_link_pos}) { 1857 if ($pl->ob->{_link_pos}) {
1772 $pl->ob->enter_link; 1858 $pl->ob->enter_link;
1773 (async { 1859 (async {
1774 # we need this sleep as the login has a concurrent enter_exit running
1775 # and this sleep increases chances of the player not ending up in scorn
1776 $pl->ob->reply (undef, 1860 $pl->ob->reply (undef,
1777 "There was an internal problem at your last logout, " 1861 "There was an internal problem at your last logout, "
1778 . "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.",
1779 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
1780 Coro::Timer::sleep 1; 1866 Coro::Timer::sleep 1;
1781 $pl->ob->leave_link; 1867 $pl->ob->leave_link;
1782 })->prio (2); 1868 })->prio (2);
1783 } 1869 }
1784 }, 1870 },
… …
1792 my ($self, $path, $x, $y) = @_; 1878 my ($self, $path, $x, $y) = @_;
1793 1879
1794 $self->enter_link; 1880 $self->enter_link;
1795 1881
1796 (async { 1882 (async {
1883 my $map = eval {
1797 my $map = cf::map::find $path; 1884 my $map = cf::map::find $path;
1798 $map = $map->customise_for ($self) if $map; 1885 $map = $map->customise_for ($self) if $map;
1799 1886 $map
1800# warn "entering ", $map->path, " at ($x, $y)\n" 1887 } or
1801# if $map;
1802
1803 $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);
1804 1889
1805 $self->leave_link ($map, $x, $y); 1890 $self->leave_link ($map, $x, $y);
1806 })->prio (1); 1891 })->prio (1);
1807} 1892}
1808 1893
… …
1812 1897
1813sub parse_random_map_params { 1898sub parse_random_map_params {
1814 my ($spec) = @_; 1899 my ($spec) = @_;
1815 1900
1816 my $rmp = { # defaults 1901 my $rmp = { # defaults
1817 xsize => -1, 1902 xsize => (cf::rndm 15, 40),
1818 ysize => -1, 1903 ysize => (cf::rndm 15, 40),
1904 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1905 #layout => string,
1819 }; 1906 };
1820 1907
1821 for (split /\n/, $spec) { 1908 for (split /\n/, $spec) {
1822 my ($k, $v) = split /\s+/, $_, 2; 1909 my ($k, $v) = split /\s+/, $_, 2;
1823 1910
… …
1827 $rmp 1914 $rmp
1828} 1915}
1829 1916
1830sub prepare_random_map { 1917sub prepare_random_map {
1831 my ($exit) = @_; 1918 my ($exit) = @_;
1919
1920 my $guard = cf::lock_acquire "exit_prepare:$exit";
1832 1921
1833 # all this does is basically replace the /! path by 1922 # all this does is basically replace the /! path by
1834 # a new random map path (?random/...) with a seed 1923 # a new random map path (?random/...) with a seed
1835 # that depends on the exit object 1924 # that depends on the exit object
1836 1925
1837 my $rmp = parse_random_map_params $exit->msg; 1926 my $rmp = parse_random_map_params $exit->msg;
1838 1927
1839 if ($exit->map) { 1928 if ($exit->map) {
1840 $rmp->{region} = $exit->map->region_name; 1929 $rmp->{region} = $exit->region->name;
1841 $rmp->{origin_map} = $exit->map->path; 1930 $rmp->{origin_map} = $exit->map->path;
1842 $rmp->{origin_x} = $exit->x; 1931 $rmp->{origin_x} = $exit->x;
1843 $rmp->{origin_y} = $exit->y; 1932 $rmp->{origin_y} = $exit->y;
1844 } 1933 }
1845 1934
… …
1862sub cf::object::player::enter_exit { 1951sub cf::object::player::enter_exit {
1863 my ($self, $exit) = @_; 1952 my ($self, $exit) = @_;
1864 1953
1865 return unless $self->type == cf::PLAYER; 1954 return unless $self->type == cf::PLAYER;
1866 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;
1964
1867 $self->enter_link; 1965 $self->enter_link;
1868 1966
1869 (async { 1967 (async {
1870 $self->deactivate_recursive; # just to be sure 1968 $self->deactivate_recursive; # just to be sure
1871 unless (eval { 1969 unless (eval {
1872 prepare_random_map $exit 1970 $self->goto ($slaying, $hp, $sp);
1873 if $exit->slaying eq "/!";
1874
1875 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1876 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1877 1971
1878 1; 1972 1;
1879 }) { 1973 }) {
1880 $self->message ("Something went wrong deep within the crossfire server. " 1974 $self->message ("Something went wrong deep within the crossfire server. "
1881 . "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. "
… …
1901 1995
1902sub cf::client::send_drawinfo { 1996sub cf::client::send_drawinfo {
1903 my ($self, $text, $flags) = @_; 1997 my ($self, $text, $flags) = @_;
1904 1998
1905 utf8::encode $text; 1999 utf8::encode $text;
1906 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2000 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1907} 2001}
1908 2002
1909 2003
1910=item $success = $client->query ($flags, "text", \&cb) 2004=item $success = $client->query ($flags, "text", \&cb)
1911 2005
… …
1942 # get handled first 2036 # get handled first
1943 my $queue = delete $ns->{query_queue} 2037 my $queue = delete $ns->{query_queue}
1944 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
1945 2039
1946 (shift @$queue)->[1]->($msg); 2040 (shift @$queue)->[1]->($msg);
2041 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1947 2042
1948 push @{ $ns->{query_queue} }, @$queue; 2043 push @{ $ns->{query_queue} }, @$queue;
1949 2044
1950 if (@{ $ns->{query_queue} } == @$queue) { 2045 if (@{ $ns->{query_queue} } == @$queue) {
1951 if (@$queue) { 2046 if (@$queue) {
… …
2112The 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
2113using it, it should be unique. 2208using it, it should be unique.
2114 2209
2115=over 4 2210=over 4
2116 2211
2117=item $hashref = cf::db_get $family
2118
2119Return a hashref for use by the extension C<$family>, which can be
2120modified. After modifications, you have to call C<cf::db_dirty> or
2121C<cf::db_sync>.
2122
2123=item $value = cf::db_get $family => $key 2212=item $value = cf::db_get $family => $key
2124 2213
2125Returns a single value from the database 2214Returns a single value from the database.
2126
2127=item cf::db_put $family => $hashref
2128
2129Stores the given family hashref into the database. Updates are delayed, if
2130you want the data to be synced to disk immediately, use C<cf::db_sync>.
2131 2215
2132=item cf::db_put $family => $key => $value 2216=item cf::db_put $family => $key => $value
2133 2217
2134Stores the given C<$value> in the family hash. Updates are delayed, if you 2218Stores the given C<$value> in the family.
2135want the data to be synced to disk immediately, use C<cf::db_sync>.
2136
2137=item cf::db_dirty
2138
2139Marks the database as dirty, to be updated at a later time.
2140
2141=item cf::db_sync
2142
2143Immediately write the database to disk I<if it is dirty>.
2144 2219
2145=cut 2220=cut
2146 2221
2147our $DB; 2222our $DB;
2148 2223
2149{ 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
2150 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;
2151 2243
2152 sub db_load() { 2244 cf::db_put (board => data => $pst->{board});
2153 $DB = stat $path ? Storable::retrieve $path : { }; 2245 cf::db_put (guildrules => data => $pst->{guildrules});
2154 } 2246 cf::db_put (rent => balance => $pst->{rent}{balance});
2247 BDB::db_env_txn_checkpoint $DB_ENV;
2155 2248
2156 my $pid; 2249 unlink $path;
2157
2158 sub db_save() {
2159 waitpid $pid, 0 if $pid;
2160 if (0 == ($pid = fork)) {
2161 $DB->{_meta}{version} = 1;
2162 Storable::nstore $DB, "$path~";
2163 rename "$path~", $path;
2164 cf::_exit 0 if defined $pid;
2165 } 2250 };
2166 } 2251 }
2167
2168 my $dirty;
2169
2170 sub db_sync() {
2171 db_save if $dirty;
2172 undef $dirty;
2173 }
2174
2175 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2176 db_sync;
2177 }); 2252 }
2253}
2178 2254
2179 sub db_dirty() {
2180 $dirty = 1;
2181 $idle->start;
2182 }
2183
2184 sub db_get($;$) { 2255sub db_get($$) {
2185 @_ >= 2 2256 my $key = "$_[0]/$_[1]";
2186 ? $DB->{$_[0]}{$_[1]}
2187 : ($DB->{$_[0]} ||= { })
2188 }
2189 2257
2258 cf::sync_job {
2259 BDB::db_get $DB, undef, $key, my $data;
2260
2261 $! ? ()
2262 : Compress::LZF::sthaw $data
2263 }
2264}
2265
2190 sub db_put($$;$) { 2266sub db_put($$$) {
2191 if (@_ >= 3) { 2267 BDB::dbreq_pri 4;
2192 $DB->{$_[0]}{$_[1]} = $_[2]; 2268 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2269}
2270
2271#############################################################################
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 my $meta = delete $faces->{""};
2288 $meta->{version} == 1
2289 or cf::cleanup "$path: version mismatch, cannot proceed.";
2290
2291 while (my ($face, $info) = each %$faces) {
2292 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2293 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2294 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2295 Coro::cede;
2296 }
2297
2298 while (my ($face, $info) = each %$faces) {
2299 next unless $info->{smooth};
2300 my $idx = cf::face::find $face
2301 or next;
2302 if (my $smooth = cf::face::find $info->{smooth}) {
2303 cf::face::set_smooth $idx, $smooth;
2193 } else { 2304 } else {
2194 $DB->{$_[0]} = $_[1]; 2305 warn "smooth face '$info->{smooth}' not found for face '$face'";
2195 }
2196 db_dirty;
2197 }
2198
2199 cf::global->attach (
2200 prio => 10000,
2201 on_cleanup => sub {
2202 db_sync;
2203 }, 2306 }
2204 ); 2307 Coro::cede;
2205} 2308 }
2206 2309
2207############################################################################# 2310 1
2208# the server's main() 2311}
2312
2313sub reload_resources {
2314 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2315 or die "unable to load regions file\n";#d#
2316 load_faces
2317 or die "unable to load faces\n";#d#
2318}
2319
2320sub init {
2321 reload_resources;
2322}
2209 2323
2210sub cfg_load { 2324sub cfg_load {
2211 open my $fh, "<:utf8", cf::confdir . "/config" 2325 open my $fh, "<:utf8", cf::confdir . "/config"
2212 or return; 2326 or return;
2213 2327
… …
2236 Event::one_event; 2350 Event::one_event;
2237 })->prio (Coro::PRIO_MAX); 2351 })->prio (Coro::PRIO_MAX);
2238 }; 2352 };
2239 2353
2240 cfg_load; 2354 cfg_load;
2241 db_load; 2355 db_init;
2242 load_extensions; 2356 load_extensions;
2357
2358 $TICK_WATCHER->start;
2243 Event::loop; 2359 Event::loop;
2244} 2360}
2245 2361
2246############################################################################# 2362#############################################################################
2247# initialisation and cleanup 2363# initialisation and cleanup
2248 2364
2249# install some emergency cleanup handlers 2365# install some emergency cleanup handlers
2250BEGIN { 2366BEGIN {
2251 for my $signal (qw(INT HUP TERM)) { 2367 for my $signal (qw(INT HUP TERM)) {
2252 Event->signal ( 2368 Event->signal (
2369 reentrant => 0,
2253 data => WF_AUTOCANCEL, 2370 data => WF_AUTOCANCEL,
2254 signal => $signal, 2371 signal => $signal,
2372 prio => 0,
2255 cb => sub { 2373 cb => sub {
2256 cf::cleanup "SIG$signal"; 2374 cf::cleanup "SIG$signal";
2257 }, 2375 },
2258 ); 2376 );
2259 } 2377 }
2260} 2378}
… …
2281 my $map = $cf::MAP{$path} or next; 2399 my $map = $cf::MAP{$path} or next;
2282 $map->valid or next; 2400 $map->valid or next;
2283 $map->save; 2401 $map->save;
2284 } 2402 }
2285 warn "end emergency map save\n"; 2403 warn "end emergency map save\n";
2404
2405 warn "begin emergency database checkpoint\n";
2406 BDB::db_env_txn_checkpoint $DB_ENV;
2407 warn "end emergency database checkpoint\n";
2286 }; 2408 };
2287 2409
2288 warn "leave emergency perl save\n"; 2410 warn "leave emergency perl save\n";
2411}
2412
2413sub post_cleanup {
2414 my ($make_core) = @_;
2415
2416 warn Carp::longmess "post_cleanup backtrace"
2417 if $make_core;
2289} 2418}
2290 2419
2291sub reload() { 2420sub reload() {
2292 # can/must only be called in main 2421 # can/must only be called in main
2293 if ($Coro::current != $Coro::main) { 2422 if ($Coro::current != $Coro::main) {
2294 warn "can only reload from main coroutine\n"; 2423 warn "can only reload from main coroutine";
2295 return; 2424 return;
2296 } 2425 }
2297 2426
2298 warn "reloading..."; 2427 warn "reloading...";
2299 2428
2300 warn "freezing server"; 2429 warn "entering sync_job";
2301 my $guard = freeze_mainloop; 2430
2431 cf::sync_job {
2432 cf::write_runtime; # external watchdog should not bark
2302 cf::emergency_save; 2433 cf::emergency_save;
2434 cf::write_runtime; # external watchdog should not bark
2303 2435
2304 warn "sync database to disk"; 2436 warn "syncing database to disk";
2305 cf::db_sync; 2437 BDB::db_env_txn_checkpoint $DB_ENV;
2306 IO::AIO::flush;
2307 2438
2308 eval {
2309 # if anything goes wrong in here, we should simply crash as we already saved 2439 # if anything goes wrong in here, we should simply crash as we already saved
2310 2440
2311 warn "cancel all watchers"; 2441 warn "cancelling all WF_AUTOCANCEL watchers";
2312 for (Event::all_watchers) { 2442 for (Event::all_watchers) {
2313 $_->cancel if $_->data & WF_AUTOCANCEL; 2443 $_->cancel if $_->data & WF_AUTOCANCEL;
2314 } 2444 }
2315 2445
2446 warn "flushing outstanding aio requests";
2447 for (;;) {
2448 BDB::flush;
2449 IO::AIO::flush;
2450 Coro::cede;
2451 last unless IO::AIO::nreqs || BDB::nreqs;
2452 warn "iterate...";
2453 }
2454
2455 ++$RELOAD;
2456
2316 warn "cancel all extension coros"; 2457 warn "cancelling all extension coros";
2317 $_->cancel for values %EXT_CORO; 2458 $_->cancel for values %EXT_CORO;
2318 %EXT_CORO = (); 2459 %EXT_CORO = ();
2319 2460
2320 warn "remove commands"; 2461 warn "removing commands";
2321 %COMMAND = (); 2462 %COMMAND = ();
2322 2463
2323 warn "remove ext commands"; 2464 warn "removing ext commands";
2324 %EXTCMD = (); 2465 %EXTCMD = ();
2325 2466
2326 warn "unload/nuke all extensions"; 2467 warn "unloading/nuking all extensions";
2327 for my $pkg (@EXTS) { 2468 for my $pkg (@EXTS) {
2328 warn "... unloading $pkg"; 2469 warn "... unloading $pkg";
2329 2470
2330 if (my $cb = $pkg->can ("unload")) { 2471 if (my $cb = $pkg->can ("unload")) {
2331 eval { 2472 eval {
… …
2336 2477
2337 warn "... nuking $pkg"; 2478 warn "... nuking $pkg";
2338 Symbol::delete_package $pkg; 2479 Symbol::delete_package $pkg;
2339 } 2480 }
2340 2481
2341 warn "unload all perl modules loaded from $LIBDIR"; 2482 warn "unloading all perl modules loaded from $LIBDIR";
2342 while (my ($k, $v) = each %INC) { 2483 while (my ($k, $v) = each %INC) {
2343 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2484 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2344 2485
2345 warn "removing <$k>"; 2486 warn "... unloading $k";
2346 delete $INC{$k}; 2487 delete $INC{$k};
2347 2488
2348 $k =~ s/\.pm$//; 2489 $k =~ s/\.pm$//;
2349 $k =~ s/\//::/g; 2490 $k =~ s/\//::/g;
2350 2491
… …
2353 } 2494 }
2354 2495
2355 Symbol::delete_package $k; 2496 Symbol::delete_package $k;
2356 } 2497 }
2357 2498
2358 warn "get rid of safe::, as good as possible"; 2499 warn "getting rid of safe::, as good as possible";
2359 Symbol::delete_package "safe::$_" 2500 Symbol::delete_package "safe::$_"
2360 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2501 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2361 2502
2362 warn "unload cf.pm \"a bit\""; 2503 warn "unloading cf.pm \"a bit\"";
2363 delete $INC{"cf.pm"}; 2504 delete $INC{"cf.pm"};
2364 2505
2365 # don't, removes xs symbols, too, 2506 # don't, removes xs symbols, too,
2366 # and global variables created in xs 2507 # and global variables created in xs
2367 #Symbol::delete_package __PACKAGE__; 2508 #Symbol::delete_package __PACKAGE__;
2368 2509
2510 warn "unload completed, starting to reload now";
2511
2369 warn "reloading cf.pm"; 2512 warn "reloading cf.pm";
2370 require cf; 2513 require cf;
2371 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2514 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2372 2515
2373 warn "load config and database again"; 2516 warn "loading config and database again";
2374 cf::cfg_load; 2517 cf::cfg_load;
2375 cf::db_load;
2376 2518
2377 warn "load extensions"; 2519 warn "loading extensions";
2378 cf::load_extensions; 2520 cf::load_extensions;
2379 2521
2380 warn "reattach attachments to objects/players"; 2522 warn "reattaching attachments to objects/players";
2381 _global_reattach; 2523 _global_reattach; # objects, sockets
2382 warn "reattach attachments to maps"; 2524 warn "reattaching attachments to maps";
2383 reattach $_ for values %MAP; 2525 reattach $_ for values %MAP;
2384 }; 2526 warn "reattaching attachments to players";
2527 reattach $_ for values %PLAYER;
2385 2528
2386 if ($@) { 2529 warn "loading reloadable resources";
2530 reload_resources;
2531
2532 warn "leaving sync_job";
2533
2534 1
2535 } or do {
2387 warn $@; 2536 warn $@;
2388 warn "error while reloading, exiting."; 2537 warn "error while reloading, exiting.";
2389 exit 1; 2538 exit 1;
2390 } 2539 };
2391 2540
2392 warn "reloaded"; 2541 warn "reloaded";
2393}; 2542};
2394 2543
2395our $RELOAD_WATCHER; # used only during reload 2544our $RELOAD_WATCHER; # used only during reload
… …
2401 $who->message ("reloading server."); 2550 $who->message ("reloading server.");
2402 2551
2403 # doing reload synchronously and two reloads happen back-to-back, 2552 # doing reload synchronously and two reloads happen back-to-back,
2404 # coro crashes during coro_state_free->destroy here. 2553 # coro crashes during coro_state_free->destroy here.
2405 2554
2406 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2555 $RELOAD_WATCHER ||= Event->timer (
2556 reentrant => 0,
2557 after => 0,
2558 data => WF_AUTOCANCEL,
2559 cb => sub {
2407 reload; 2560 reload;
2408 undef $RELOAD_WATCHER; 2561 undef $RELOAD_WATCHER;
2562 },
2409 }); 2563 );
2410 } 2564 }
2411}; 2565};
2412 2566
2413unshift @INC, $LIBDIR; 2567unshift @INC, $LIBDIR;
2568
2569my $bug_warning = 0;
2414 2570
2415$TICK_WATCHER = Event->timer ( 2571$TICK_WATCHER = Event->timer (
2416 reentrant => 0, 2572 reentrant => 0,
2573 parked => 1,
2417 prio => 0, 2574 prio => 0,
2418 at => $NEXT_TICK || $TICK, 2575 at => $NEXT_TICK || $TICK,
2419 data => WF_AUTOCANCEL, 2576 data => WF_AUTOCANCEL,
2420 cb => sub { 2577 cb => sub {
2578 if ($Coro::current != $Coro::main) {
2579 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2580 unless ++$bug_warning > 10;
2581 return;
2582 }
2583
2421 $NOW = Event::time; 2584 $NOW = Event::time;
2422 2585
2423 cf::server_tick; # one server iteration 2586 cf::server_tick; # one server iteration
2424 $RUNTIME += $TICK; 2587 $RUNTIME += $TICK;
2425 $NEXT_TICK += $TICK; 2588 $NEXT_TICK += $TICK;
2426 2589
2590 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2591 $NEXT_RUNTIME_WRITE = $NOW + 10;
2592 Coro::async_pool {
2593 write_runtime
2594 or warn "ERROR: unable to write runtime file: $!";
2595 };
2596 }
2597
2427 $WAIT_FOR_TICK->broadcast; 2598 $WAIT_FOR_TICK->broadcast;
2428 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2599 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2600
2601# my $AFTER = Event::time;
2602# warn $AFTER - $NOW;#d#
2429 2603
2430 # if we are delayed by four ticks or more, skip them all 2604 # if we are delayed by four ticks or more, skip them all
2431 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2605 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2432 2606
2433 $TICK_WATCHER->at ($NEXT_TICK); 2607 $TICK_WATCHER->at ($NEXT_TICK);
2434 $TICK_WATCHER->start; 2608 $TICK_WATCHER->start;
2435 }, 2609 },
2436); 2610);
2437 2611
2612{
2613 BDB::max_poll_time $TICK * 0.1;
2614 $BDB_POLL_WATCHER = Event->io (
2615 reentrant => 0,
2616 fd => BDB::poll_fileno,
2617 poll => 'r',
2618 prio => 0,
2619 data => WF_AUTOCANCEL,
2620 cb => \&BDB::poll_cb,
2621 );
2622 BDB::min_parallel 8;
2623
2624 BDB::set_sync_prepare {
2625 my $status;
2626 my $current = $Coro::current;
2627 (
2628 sub {
2629 $status = $!;
2630 $current->ready; undef $current;
2631 },
2632 sub {
2633 Coro::schedule while defined $current;
2634 $! = $status;
2635 },
2636 )
2637 };
2638
2639 unless ($DB_ENV) {
2640 $DB_ENV = BDB::db_env_create;
2641
2642 cf::sync_job {
2643 eval {
2644 BDB::db_env_open
2645 $DB_ENV,
2646 $BDB_ENV_DIR,
2647 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2648 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2649 0666;
2650
2651 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2652
2653 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2654 $DB_ENV->set_lk_detect;
2655 };
2656
2657 cf::cleanup "db_env_open(db): $@" if $@;
2658 };
2659 }
2660}
2661
2662{
2663 IO::AIO::min_parallel 8;
2664
2665 undef $Coro::AIO::WATCHER;
2438IO::AIO::max_poll_time $TICK * 0.2; 2666 IO::AIO::max_poll_time $TICK * 0.1;
2439
2440$AIO_POLL_WATCHER = Event->io ( 2667 $AIO_POLL_WATCHER = Event->io (
2441 fd => IO::AIO::poll_fileno, 2668 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, 2669 data => WF_AUTOCANCEL,
2450 after => 0, 2670 fd => IO::AIO::poll_fileno,
2451 interval => 10, 2671 poll => 'r',
2452 cb => sub { 2672 prio => 6,
2453 (Coro::unblock_sub { 2673 cb => \&IO::AIO::poll_cb,
2454 write_runtime 2674 );
2455 or warn "ERROR: unable to write runtime file: $!"; 2675}
2456 })->();
2457 },
2458);
2459 2676
2460END { cf::emergency_save } 2677END { cf::emergency_save }
2461 2678
24621 26791
2463 2680

Diff Legend

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