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.171 by root, Sun Jan 14 12:24:48 2007 UTC vs.
Revision 1.218 by root, Sat Feb 17 01:58:55 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3 (); 13use Coro 3.5 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use BDB ();
20use Data::Dumper; 21use Data::Dumper;
21use Digest::MD5; 22use Digest::MD5;
22use Fcntl; 23use Fcntl;
23use IO::AIO 2.32 (); 24use IO::AIO 2.32 ();
24use YAML::Syck (); 25use YAML::Syck ();
25use Time::HiRes; 26use Time::HiRes;
27use Compress::LZF;
28
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
26 30
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 31use Event; $Event::Eval = 1; # no idea why this is required, but it is
28 32
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 34
… …
45our $LIBDIR = datadir . "/ext"; 49our $LIBDIR = datadir . "/ext";
46 50
47our $TICK = MAX_TIME * 1e-6; 51our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 52our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 53our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 54our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 55our $NEXT_TICK;
52our $NOW; 56our $NOW;
57our $USE_FSYNC = 1; # use fsync to write maps - default off
58
59our $BDB_POLL_WATCHER;
60our $DB_ENV;
53 61
54our %CFG; 62our %CFG;
55 63
56our $UPTIME; $UPTIME ||= time; 64our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 65our $RUNTIME;
58 66
59our %PLAYER; # all users 67our %PLAYER; # all users
60our %MAP; # all maps 68our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 69our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 70our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db";
63 72
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 75
67# used to convert map paths into valid unix filenames by replacing / by ∕ 76# used to convert map paths into valid unix filenames by replacing / by ∕
… …
80mkdir cf::localdir; 89mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 90mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 91mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 92mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
85 95
86our $EMERGENCY_POSITION; 96our $EMERGENCY_POSITION;
97
98sub cf::map::normalise;
87 99
88############################################################################# 100#############################################################################
89 101
90=head2 GLOBAL VARIABLES 102=head2 GLOBAL VARIABLES
91 103
… …
261sub freeze_mainloop { 273sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 274 return unless $TICK_WATCHER->is_active;
263 275
264 my $guard = Coro::guard { 276 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 277 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 278 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 279 $TICK_WATCHER->stop;
270 $guard 280 $guard
271} 281}
272 282
273=item cf::async { BLOCK } 283=item cf::async { BLOCK }
… …
349 my $runtime = cf::localdir . "/runtime"; 359 my $runtime = cf::localdir . "/runtime";
350 360
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 362 or return;
353 363
364 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 365 # 10 is the runtime save interval, for a monotonic clock
366 # 60 allows for the watchdog to kill the server.
367
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 368 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 369 and return;
357 370
371 # always fsync - this file is important
358 aio_fsync $fh 372 aio_fsync $fh
359 and return; 373 and return;
360 374
361 close $fh 375 close $fh
362 or return; 376 or return;
… …
747 $filename, length $$rdata, scalar @$objs; 761 $filename, length $$rdata, scalar @$objs;
748 762
749 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 763 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
750 chmod SAVE_MODE, $fh; 764 chmod SAVE_MODE, $fh;
751 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 765 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
752 aio_fsync $fh; 766 aio_fsync $fh if $cf::USE_FSYNC;
753 close $fh; 767 close $fh;
754 768
755 if (@$objs) { 769 if (@$objs) {
756 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 770 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
757 chmod SAVE_MODE, $fh; 771 chmod SAVE_MODE, $fh;
758 my $data = Storable::nfreeze { version => 1, objs => $objs }; 772 my $data = Storable::nfreeze { version => 1, objs => $objs };
759 aio_write $fh, 0, (length $data), $data, 0; 773 aio_write $fh, 0, (length $data), $data, 0;
760 aio_fsync $fh; 774 aio_fsync $fh if $cf::USE_FSYNC;
761 close $fh; 775 close $fh;
762 aio_rename "$filename.pst~", "$filename.pst"; 776 aio_rename "$filename.pst~", "$filename.pst";
763 } 777 }
764 } else { 778 } else {
765 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
… …
957 971
958sub exists($) { 972sub exists($) {
959 my ($login) = @_; 973 my ($login) = @_;
960 974
961 $cf::PLAYER{$login} 975 $cf::PLAYER{$login}
962 or cf::sync_job { !aio_stat $login } 976 or cf::sync_job { !aio_stat path $login }
963} 977}
964 978
965sub find($) { 979sub find($) {
966 return $cf::PLAYER{$_[0]} || do { 980 return $cf::PLAYER{$_[0]} || do {
967 my $login = $_[0]; 981 my $login = $_[0];
… …
1065=cut 1079=cut
1066 1080
1067sub maps($) { 1081sub maps($) {
1068 my ($pl) = @_; 1082 my ($pl) = @_;
1069 1083
1084 $pl = ref $pl ? $pl->ob->name : $pl;
1085
1070 my $files = aio_readdir playerdir $pl 1086 my $files = aio_readdir playerdir $pl
1071 or return; 1087 or return;
1072 1088
1073 my @paths; 1089 my @paths;
1074 1090
1075 for (@$files) { 1091 for (@$files) {
1076 utf8::decode $_; 1092 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1093 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1094 next unless /^$PATH_SEP/o;
1079 1095
1080 s/\.map$//; 1096 push @paths, cf::map::normalise "~$pl/$_";
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 } 1097 }
1083 1098
1084 \@paths 1099 \@paths
1085} 1100}
1086 1101
… …
1113 1128
1114use Fcntl; 1129use Fcntl;
1115use Coro::AIO; 1130use Coro::AIO;
1116 1131
1117use overload 1132use overload
1118 '""' => \&as_string; 1133 '""' => \&as_string,
1134 fallback => 1;
1119 1135
1120our $MAX_RESET = 3600; 1136our $MAX_RESET = 3600;
1121our $DEFAULT_RESET = 3000; 1137our $DEFAULT_RESET = 3000;
1122 1138
1123sub generate_random_map { 1139sub generate_random_map {
1124 my ($self, $rmp) = @_; 1140 my ($self, $rmp) = @_;
1125
1126 # mit "rum" bekleckern, nicht 1141 # mit "rum" bekleckern, nicht
1127 $self->_create_random_map ( 1142 $self->_create_random_map (
1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1143 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1144 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1145 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1152 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1153 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1154 )
1140} 1155}
1141 1156
1157=item cf::map->register ($regex, $prio)
1158
1159Register a handler for the map path matching the given regex at the
1160givne priority (higher is better, built-in handlers have priority 0, the
1161default).
1162
1163=cut
1164
1142sub register { 1165sub register {
1143 my (undef, $regex) = @_; 1166 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1167 my $pkg = caller;
1145 1168
1146 no strict; 1169 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1170 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1171
1149 $EXT_MAP{$pkg} = qr<$regex>; 1172 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1173}
1151 1174
1152# also paths starting with '/' 1175# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1176$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1177
1155sub thawer_merge { 1178sub thawer_merge {
1179 my ($self, $merge) = @_;
1180
1156 # we have to keep some variables in memory intact 1181 # we have to keep some variables in memory intact
1157 local $_[0]{path}; 1182 local $self->{path};
1183 local $self->{load_path};
1158 local $_[0]{deny_save}; 1184 local $self->{deny_save};
1159 local $_[0]{deny_reset}; 1185 local $self->{deny_reset};
1160 1186
1161 $_[0]->SUPER::thawer_merge ($_[1]); 1187 $self->SUPER::thawer_merge ($merge);
1162} 1188}
1163 1189
1164sub normalise { 1190sub normalise {
1165 my ($path, $base) = @_; 1191 my ($path, $base) = @_;
1192
1193 $path = "$path"; # make sure its a string
1194
1195 $path =~ s/\.map$//;
1166 1196
1167 # map plan: 1197 # map plan:
1168 # 1198 #
1169 # /! non-realised random map exit (special hack!) 1199 # /! non-realised random map exit (special hack!)
1170 # {... are special paths that are not being touched 1200 # {... are special paths that are not being touched
… …
1198 1228
1199 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1229 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1200 1230
1201 $path = normalise $path, $base; 1231 $path = normalise $path, $base;
1202 1232
1203 for my $pkg (keys %EXT_MAP) { 1233 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1204 if ($path =~ $EXT_MAP{$pkg}) { 1234 if ($path =~ $EXT_MAP{$pkg}[1]) {
1205 my $self = bless cf::map::new, $pkg; 1235 my $self = bless cf::map::new, $pkg;
1206 $self->{path} = $path; $self->path ($path); 1236 $self->{path} = $path; $self->path ($path);
1207 $self->init; # pass $1 etc. 1237 $self->init; # pass $1 etc.
1208 return $self; 1238 return $self;
1209 } 1239 }
1210 } 1240 }
1211 1241
1212 Carp::carp "unable to resolve path '$path'."; 1242 Carp::carp "unable to resolve path '$path' (base '$base').";
1213 () 1243 ()
1214} 1244}
1215 1245
1216sub init { 1246sub init {
1217 my ($self) = @_; 1247 my ($self) = @_;
… …
1232 1262
1233# the original (read-only) location 1263# the original (read-only) location
1234sub load_path { 1264sub load_path {
1235 my ($self) = @_; 1265 my ($self) = @_;
1236 1266
1237 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1267 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1238} 1268}
1239 1269
1240# the temporary/swap location 1270# the temporary/swap location
1241sub save_path { 1271sub save_path {
1242 my ($self) = @_; 1272 my ($self) = @_;
1243 1273
1244 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1274 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1245 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1275 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1246} 1276}
1247 1277
1248# the unique path, undef == no special unique path 1278# the unique path, undef == no special unique path
1249sub uniq_path { 1279sub uniq_path {
1250 my ($self) = @_; 1280 my ($self) = @_;
… …
1272 1302
1273sub load_header_from($) { 1303sub load_header_from($) {
1274 my ($self, $path) = @_; 1304 my ($self, $path) = @_;
1275 1305
1276 utf8::encode $path; 1306 utf8::encode $path;
1277 aio_open $path, O_RDONLY, 0 1307 #aio_open $path, O_RDONLY, 0
1278 or return; 1308 # or return;
1279 1309
1280 $self->_load_header ($path) 1310 $self->_load_header ($path)
1281 or return; 1311 or return;
1282 1312
1283 $self->{load_path} = $path; 1313 $self->{load_path} = $path;
1284 1314
1285 1 1315 1
1286} 1316}
1287 1317
1288sub load_orig { 1318sub load_header_orig {
1289 my ($self) = @_; 1319 my ($self) = @_;
1290 1320
1291 $self->load_header_from ($self->load_path) 1321 $self->load_header_from ($self->load_path)
1292} 1322}
1293 1323
1294sub load_temp { 1324sub load_header_temp {
1295 my ($self) = @_; 1325 my ($self) = @_;
1296 1326
1297 $self->load_header_from ($self->save_path) 1327 $self->load_header_from ($self->save_path)
1328}
1329
1330sub prepare_temp {
1331 my ($self) = @_;
1332
1333 $self->last_access ((delete $self->{last_access})
1334 || $cf::RUNTIME); #d#
1335 # safety
1336 $self->{instantiate_time} = $cf::RUNTIME
1337 if $self->{instantiate_time} > $cf::RUNTIME;
1338}
1339
1340sub prepare_orig {
1341 my ($self) = @_;
1342
1343 $self->{load_original} = 1;
1344 $self->{instantiate_time} = $cf::RUNTIME;
1345 $self->last_access ($cf::RUNTIME);
1346 $self->instantiate;
1298} 1347}
1299 1348
1300sub load_header { 1349sub load_header {
1301 my ($self) = @_; 1350 my ($self) = @_;
1302 1351
1303 if ($self->load_temp) { 1352 if ($self->load_header_temp) {
1304 $self->last_access ((delete $self->{last_access}) 1353 $self->prepare_temp;
1305 || $cf::RUNTIME); #d#
1306 # safety
1307 $self->{instantiate_time} = $cf::RUNTIME
1308 if $self->{instantiate_time} > $cf::RUNTIME;
1309 } else { 1354 } else {
1310 $self->load_orig 1355 $self->load_header_orig
1311 or return; 1356 or return;
1312 1357 $self->prepare_orig;
1313 $self->{load_original} = 1;
1314 $self->{instantiate_time} = $cf::RUNTIME;
1315 $self->last_access ($cf::RUNTIME);
1316 $self->instantiate;
1317 } 1358 }
1318 1359
1319 1 1360 1
1320} 1361}
1321 1362
… …
1335 $map->{last_save} = $cf::RUNTIME; 1376 $map->{last_save} = $cf::RUNTIME;
1336 1377
1337 $map->load_header 1378 $map->load_header
1338 or return; 1379 or return;
1339 1380
1340 if ($map->should_reset) { 1381 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1382 # doing this can freeze the server in a sync job, obviously
1341 $cf::WAIT_FOR_TICK->wait; 1383 #$cf::WAIT_FOR_TICK->wait;
1342 $map->reset; 1384 $map->reset;
1343 undef $guard; 1385 undef $guard;
1344 $map = find $path 1386 return find $path;
1345 or return;
1346 } 1387 }
1347 1388
1348 $cf::MAP{$path} = $map 1389 $cf::MAP{$path} = $map
1349 } 1390 }
1350} 1391}
1392
1393sub pre_load { }
1394sub post_load { }
1351 1395
1352sub load { 1396sub load {
1353 my ($self) = @_; 1397 my ($self) = @_;
1354 1398
1399 local $self->{deny_reset} = 1; # loading can take a long time
1400
1355 my $path = $self->{path}; 1401 my $path = $self->{path};
1356 my $guard = cf::lock_acquire "map_load:$path"; 1402 my $guard = cf::lock_acquire "map_load:$path";
1357 1403
1358 return if $self->in_memory != cf::MAP_SWAPPED; 1404 return if $self->in_memory != cf::MAP_SWAPPED;
1359 1405
1360 $self->in_memory (cf::MAP_LOADING); 1406 $self->in_memory (cf::MAP_LOADING);
1361 1407
1362 $self->alloc; 1408 $self->alloc;
1409
1410 $self->pre_load;
1411
1363 $self->_load_objects ($self->{load_path}, 1) 1412 $self->_load_objects ($self->{load_path}, 1)
1364 or return; 1413 or return;
1365 1414
1366 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1415 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1367 if delete $self->{load_original}; 1416 if delete $self->{load_original};
… …
1389 unless $self->difficulty; 1438 unless $self->difficulty;
1390 Coro::cede; 1439 Coro::cede;
1391 $self->activate; 1440 $self->activate;
1392 } 1441 }
1393 1442
1443 $self->post_load;
1444
1394 $self->in_memory (cf::MAP_IN_MEMORY); 1445 $self->in_memory (cf::MAP_IN_MEMORY);
1395} 1446}
1396 1447
1397sub customise_for { 1448sub customise_for {
1398 my ($self, $ob) = @_; 1449 my ($self, $ob) = @_;
… …
1438 1489
1439 cf::sync_job { $map->load }; 1490 cf::sync_job { $map->load };
1440} 1491}
1441 1492
1442our %MAP_PREFETCH; 1493our %MAP_PREFETCH;
1443our $MAP_PREFETCHER = Coro::async { 1494our $MAP_PREFETCHER = undef;
1444 while () {
1445 for my $path (keys %MAP_PREFETCH) {
1446 my $map = find $path
1447 or next;
1448 $map->load;
1449
1450 delete $MAP_PREFETCH{$path};
1451 }
1452 Coro::schedule;
1453 }
1454};
1455 1495
1456sub find_async { 1496sub find_async {
1457 my ($path, $origin) = @_; 1497 my ($path, $origin) = @_;
1458 1498
1459 $path = normalise $path, $origin && $origin->{path}; 1499 $path = normalise $path, $origin && $origin->{path};
1460 1500
1461 if (my $map = $cf::MAP{$path}) { 1501 if (my $map = $cf::MAP{$path}) {
1462 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1502 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1463 } 1503 }
1464 1504
1465 $MAP_PREFETCH{$path} = 0; 1505 undef $MAP_PREFETCH{$path};
1506 $MAP_PREFETCHER ||= cf::async {
1507 while (%MAP_PREFETCH) {
1508 for my $path (keys %MAP_PREFETCH) {
1509 my $map = find $path
1510 or next;
1511 $map->load;
1512
1513 delete $MAP_PREFETCH{$path};
1514 }
1515 }
1516 undef $MAP_PREFETCHER;
1517 };
1466 $MAP_PREFETCHER->ready; 1518 $MAP_PREFETCHER->prio (6);
1467 1519
1468 () 1520 ()
1469} 1521}
1470 1522
1471sub save { 1523sub save {
… …
1531 my ($self) = @_; 1583 my ($self) = @_;
1532 1584
1533 $self->reset_at <= $cf::RUNTIME 1585 $self->reset_at <= $cf::RUNTIME
1534} 1586}
1535 1587
1536sub rename {
1537 my ($self, $new_path) = @_;
1538
1539 normalise $new_path;
1540
1541 $self->unlink_save;
1542
1543 delete $cf::MAP{$self->path};
1544 $self->{path} = $new_path; $self->path ($self->{path});
1545 $cf::MAP{$self->path} = $self;
1546
1547 $self->save;
1548}
1549
1550sub reset { 1588sub reset {
1551 my ($self) = @_; 1589 my ($self) = @_;
1552 1590
1553 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1591 my $lock = cf::lock_acquire "map_data:$self->{path}";
1554 1592
1555 return if $self->players; 1593 return if $self->players;
1556 return if $self->isa ("ext::map_per_player");#d# 1594 return if $self->isa ("ext::map_per_player");#d#
1557 1595
1558 warn "resetting map ", $self->path;#d# 1596 warn "resetting map ", $self->path;#d#
1559 1597
1598 $self->in_memory (cf::MAP_SWAPPED);
1599
1600 # need to save uniques path
1601 unless ($self->{deny_save}) {
1602 my $uniq = $self->uniq_path; utf8::encode $uniq;
1603
1604 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1605 if $uniq;
1606 }
1607
1560 delete $cf::MAP{$self->path}; 1608 delete $cf::MAP{$self->path};
1561 1609
1562 $self->in_memory (cf::MAP_SWAPPED);
1563 $self->clear; 1610 $self->clear;
1564 1611
1565 $_->clear_links_to ($self) for values %cf::MAP; 1612 $_->clear_links_to ($self) for values %cf::MAP;
1566 1613
1567 $self->unlink_save; 1614 $self->unlink_save;
… …
1571my $nuke_counter = "aaaa"; 1618my $nuke_counter = "aaaa";
1572 1619
1573sub nuke { 1620sub nuke {
1574 my ($self) = @_; 1621 my ($self) = @_;
1575 1622
1623 delete $cf::MAP{$self->path};
1624
1625 $self->unlink_save;
1626
1627 bless $self, "cf::map";
1628 delete $self->{deny_reset};
1576 $self->{deny_save} = 1; 1629 $self->{deny_save} = 1;
1577 $self->reset_timeout (1); 1630 $self->reset_timeout (1);
1578 $self->rename ("{nuke}/" . ($nuke_counter++)); 1631 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1632
1633 $cf::MAP{$self->path} = $self;
1634
1579 $self->reset; # polite request, might not happen 1635 $self->reset; # polite request, might not happen
1580} 1636}
1581 1637
1582=item cf::map::unique_maps 1638=item cf::map::unique_maps
1583 1639
… …
1595 for (@$files) { 1651 for (@$files) {
1596 utf8::decode $_; 1652 utf8::decode $_;
1597 next if /\.pst$/; 1653 next if /\.pst$/;
1598 next unless /^$PATH_SEP/o; 1654 next unless /^$PATH_SEP/o;
1599 1655
1600 s/\.map$//; 1656 push @paths, cf::map::normalise $_;
1601 push @paths, $_;
1602 } 1657 }
1603 1658
1604 \@paths 1659 \@paths
1605} 1660}
1606 1661
… …
1700=cut 1755=cut
1701 1756
1702sub link_map { 1757sub link_map {
1703 unless ($LINK_MAP) { 1758 unless ($LINK_MAP) {
1704 $LINK_MAP = cf::map::find "{link}" 1759 $LINK_MAP = cf::map::find "{link}"
1705 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1760 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1706 $LINK_MAP->load; 1761 $LINK_MAP->load;
1707 } 1762 }
1708 1763
1709 $LINK_MAP 1764 $LINK_MAP
1710} 1765}
… …
1717 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1772 return if UNIVERSAL::isa $self->map, "ext::map_link";
1718 1773
1719 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1774 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1720 if $self->map; 1775 if $self->map;
1721 1776
1722 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1777 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1723} 1778}
1724 1779
1725sub cf::object::player::leave_link { 1780sub cf::object::player::leave_link {
1726 my ($self, $map, $x, $y) = @_; 1781 my ($self, $map, $x, $y) = @_;
1727 1782
… …
1749 $map->load; 1804 $map->load;
1750 $map->load_diag; 1805 $map->load_diag;
1751 1806
1752 return unless $self->contr->active; 1807 return unless $self->contr->active;
1753 $self->activate_recursive; 1808 $self->activate_recursive;
1809
1810 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1754 $self->enter_map ($map, $x, $y); 1811 $self->enter_map ($map, $x, $y);
1755} 1812}
1756 1813
1757cf::player->attach ( 1814cf::player->attach (
1758 on_logout => sub { 1815 on_logout => sub {
… …
1771 # try to abort aborted map switching on player login :) 1828 # try to abort aborted map switching on player login :)
1772 # should happen only on crashes 1829 # should happen only on crashes
1773 if ($pl->ob->{_link_pos}) { 1830 if ($pl->ob->{_link_pos}) {
1774 $pl->ob->enter_link; 1831 $pl->ob->enter_link;
1775 (async { 1832 (async {
1776 # we need this sleep as the login has a concurrent enter_exit running
1777 # and this sleep increases chances of the player not ending up in scorn
1778 $pl->ob->reply (undef, 1833 $pl->ob->reply (undef,
1779 "There was an internal problem at your last logout, " 1834 "There was an internal problem at your last logout, "
1780 . "the server will try to bring you to your intended destination in a second.", 1835 . "the server will try to bring you to your intended destination in a second.",
1781 cf::NDI_RED); 1836 cf::NDI_RED);
1837 # we need this sleep as the login has a concurrent enter_exit running
1838 # and this sleep increases chances of the player not ending up in scorn
1782 Coro::Timer::sleep 1; 1839 Coro::Timer::sleep 1;
1783 $pl->ob->leave_link; 1840 $pl->ob->leave_link;
1784 })->prio (2); 1841 })->prio (2);
1785 } 1842 }
1786 }, 1843 },
… …
1794 my ($self, $path, $x, $y) = @_; 1851 my ($self, $path, $x, $y) = @_;
1795 1852
1796 $self->enter_link; 1853 $self->enter_link;
1797 1854
1798 (async { 1855 (async {
1856 my $map = eval {
1799 my $map = cf::map::find $path; 1857 my $map = cf::map::find $path;
1800 $map = $map->customise_for ($self) if $map; 1858 $map = $map->customise_for ($self) if $map;
1801 1859 $map
1802# warn "entering ", $map->path, " at ($x, $y)\n" 1860 } or
1803# if $map;
1804
1805 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1861 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1806 1862
1807 $self->leave_link ($map, $x, $y); 1863 $self->leave_link ($map, $x, $y);
1808 })->prio (1); 1864 })->prio (1);
1809} 1865}
1810 1866
… …
1814 1870
1815sub parse_random_map_params { 1871sub parse_random_map_params {
1816 my ($spec) = @_; 1872 my ($spec) = @_;
1817 1873
1818 my $rmp = { # defaults 1874 my $rmp = { # defaults
1819 xsize => 10, 1875 xsize => (cf::rndm 15, 40),
1820 ysize => 10, 1876 ysize => (cf::rndm 15, 40),
1877 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1878 #layout => string,
1821 }; 1879 };
1822 1880
1823 for (split /\n/, $spec) { 1881 for (split /\n/, $spec) {
1824 my ($k, $v) = split /\s+/, $_, 2; 1882 my ($k, $v) = split /\s+/, $_, 2;
1825 1883
… …
1829 $rmp 1887 $rmp
1830} 1888}
1831 1889
1832sub prepare_random_map { 1890sub prepare_random_map {
1833 my ($exit) = @_; 1891 my ($exit) = @_;
1892
1893 my $guard = cf::lock_acquire "exit_prepare:$exit";
1834 1894
1835 # all this does is basically replace the /! path by 1895 # all this does is basically replace the /! path by
1836 # a new random map path (?random/...) with a seed 1896 # a new random map path (?random/...) with a seed
1837 # that depends on the exit object 1897 # that depends on the exit object
1838 1898
1839 my $rmp = parse_random_map_params $exit->msg; 1899 my $rmp = parse_random_map_params $exit->msg;
1840 1900
1841 if ($exit->map) { 1901 if ($exit->map) {
1842 $rmp->{region} = $exit->map->region_name; 1902 $rmp->{region} = $exit->region->name;
1843 $rmp->{origin_map} = $exit->map->path; 1903 $rmp->{origin_map} = $exit->map->path;
1844 $rmp->{origin_x} = $exit->x; 1904 $rmp->{origin_x} = $exit->x;
1845 $rmp->{origin_y} = $exit->y; 1905 $rmp->{origin_y} = $exit->y;
1846 } 1906 }
1847 1907
1848 $rmp->{random_seed} ||= $exit->random_seed; 1908 $rmp->{random_seed} ||= $exit->random_seed;
1849 1909
1850 my $data = cf::to_json $rmp; 1910 my $data = cf::to_json $rmp;
1851 my $md5 = Digest::MD5::md5_hex $data; 1911 my $md5 = Digest::MD5::md5_hex $data;
1912 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1852 1913
1853 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1914 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1854 aio_write $fh, 0, (length $data), $data, 0; 1915 aio_write $fh, 0, (length $data), $data, 0;
1916 undef $fh;
1917 aio_rename "$meta~", $meta;
1855 1918
1856 $exit->slaying ("?random/$md5"); 1919 $exit->slaying ("?random/$md5");
1857 $exit->msg (undef); 1920 $exit->msg (undef);
1858 } 1921 }
1859} 1922}
1860 1923
1861sub cf::object::player::enter_exit { 1924sub cf::object::player::enter_exit {
1862 my ($self, $exit) = @_; 1925 my ($self, $exit) = @_;
1863 1926
1864 return unless $self->type == cf::PLAYER; 1927 return unless $self->type == cf::PLAYER;
1928
1929 if ($exit->slaying eq "/!") {
1930 #TODO: this should de-fi-ni-te-ly not be a sync-job
1931 cf::sync_job { prepare_random_map $exit };
1932 }
1933
1934 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1935 my $hp = $exit->stats->hp;
1936 my $sp = $exit->stats->sp;
1865 1937
1866 $self->enter_link; 1938 $self->enter_link;
1867 1939
1868 (async { 1940 (async {
1869 $self->deactivate_recursive; # just to be sure 1941 $self->deactivate_recursive; # just to be sure
1870 unless (eval { 1942 unless (eval {
1871 prepare_random_map $exit 1943 $self->goto ($slaying, $hp, $sp);
1872 if $exit->slaying eq "/!";
1873
1874 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1875 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1876 1944
1877 1; 1945 1;
1878 }) { 1946 }) {
1879 $self->message ("Something went wrong deep within the crossfire server. " 1947 $self->message ("Something went wrong deep within the crossfire server. "
1880 . "I'll try to bring you back to the map you were before. " 1948 . "I'll try to bring you back to the map you were before. "
… …
1941 # get handled first 2009 # get handled first
1942 my $queue = delete $ns->{query_queue} 2010 my $queue = delete $ns->{query_queue}
1943 or return; # be conservative, not sure how that can happen, but we saw a crash here 2011 or return; # be conservative, not sure how that can happen, but we saw a crash here
1944 2012
1945 (shift @$queue)->[1]->($msg); 2013 (shift @$queue)->[1]->($msg);
2014 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1946 2015
1947 push @{ $ns->{query_queue} }, @$queue; 2016 push @{ $ns->{query_queue} }, @$queue;
1948 2017
1949 if (@{ $ns->{query_queue} } == @$queue) { 2018 if (@{ $ns->{query_queue} } == @$queue) {
1950 if (@$queue) { 2019 if (@$queue) {
… …
2111The parameter C<$family> should best start with the name of the extension 2180The parameter C<$family> should best start with the name of the extension
2112using it, it should be unique. 2181using it, it should be unique.
2113 2182
2114=over 4 2183=over 4
2115 2184
2116=item $hashref = cf::db_get $family
2117
2118Return a hashref for use by the extension C<$family>, which can be
2119modified. After modifications, you have to call C<cf::db_dirty> or
2120C<cf::db_sync>.
2121
2122=item $value = cf::db_get $family => $key 2185=item $value = cf::db_get $family => $key
2123 2186
2124Returns a single value from the database 2187Returns a single value from the database.
2125
2126=item cf::db_put $family => $hashref
2127
2128Stores the given family hashref into the database. Updates are delayed, if
2129you want the data to be synced to disk immediately, use C<cf::db_sync>.
2130 2188
2131=item cf::db_put $family => $key => $value 2189=item cf::db_put $family => $key => $value
2132 2190
2133Stores the given C<$value> in the family hash. Updates are delayed, if you 2191Stores the given C<$value> in the family.
2134want the data to be synced to disk immediately, use C<cf::db_sync>.
2135
2136=item cf::db_dirty
2137
2138Marks the database as dirty, to be updated at a later time.
2139
2140=item cf::db_sync
2141
2142Immediately write the database to disk I<if it is dirty>.
2143 2192
2144=cut 2193=cut
2145 2194
2146our $DB; 2195our $DB;
2147 2196
2148{ 2197sub db_init {
2198 unless ($DB) {
2199 $DB = BDB::db_create $DB_ENV;
2200
2201 cf::sync_job {
2202 eval {
2203 $DB->set_flags (BDB::CHKSUM);
2204
2205 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2206 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2207 cf::cleanup "db_open(db): $!" if $!;
2208 };
2209 cf::cleanup "db_open(db): $@" if $@;
2210 };
2211
2149 my $path = cf::localdir . "/database.pst"; 2212 my $path = cf::localdir . "/database.pst";
2213 if (stat $path) {
2214 cf::sync_job {
2215 my $pst = Storable::retrieve $path;
2150 2216
2151 sub db_load() { 2217 cf::db_put (board => data => $pst->{board});
2152 $DB = stat $path ? Storable::retrieve $path : { }; 2218 cf::db_put (guildrules => data => $pst->{guildrules});
2153 } 2219 cf::db_put (rent => balance => $pst->{rent}{balance});
2220 BDB::db_env_txn_checkpoint $DB_ENV;
2154 2221
2155 my $pid; 2222 unlink $path;
2156
2157 sub db_save() {
2158 waitpid $pid, 0 if $pid;
2159 if (0 == ($pid = fork)) {
2160 $DB->{_meta}{version} = 1;
2161 Storable::nstore $DB, "$path~";
2162 rename "$path~", $path;
2163 cf::_exit 0 if defined $pid;
2164 } 2223 };
2165 }
2166
2167 my $dirty;
2168
2169 sub db_sync() {
2170 db_save if $dirty;
2171 undef $dirty;
2172 }
2173
2174 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2175 db_sync;
2176 });
2177
2178 sub db_dirty() {
2179 $dirty = 1;
2180 $idle->start;
2181 }
2182
2183 sub db_get($;$) {
2184 @_ >= 2
2185 ? $DB->{$_[0]}{$_[1]}
2186 : ($DB->{$_[0]} ||= { })
2187 }
2188
2189 sub db_put($$;$) {
2190 if (@_ >= 3) {
2191 $DB->{$_[0]}{$_[1]} = $_[2];
2192 } else {
2193 $DB->{$_[0]} = $_[1];
2194 }
2195 db_dirty;
2196 }
2197
2198 cf::global->attach (
2199 prio => 10000,
2200 on_cleanup => sub {
2201 db_sync;
2202 }, 2224 }
2203 ); 2225 }
2226}
2227
2228sub db_get($$) {
2229 my $key = "$_[0]/$_[1]";
2230
2231 cf::sync_job {
2232 BDB::db_get $DB, undef, $key, my $data;
2233
2234 $! ? ()
2235 : Compress::LZF::sthaw $data
2236 }
2237}
2238
2239sub db_put($$$) {
2240 BDB::dbreq_pri 4;
2241 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2204} 2242}
2205 2243
2206############################################################################# 2244#############################################################################
2207# the server's main() 2245# the server's init and main functions
2246
2247sub init_resources {
2248 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2249 or die "unable to load regions file\n";#d#
2250}
2208 2251
2209sub cfg_load { 2252sub cfg_load {
2210 open my $fh, "<:utf8", cf::confdir . "/config" 2253 open my $fh, "<:utf8", cf::confdir . "/config"
2211 or return; 2254 or return;
2212 2255
… …
2225 }; 2268 };
2226 warn $@ if $@; 2269 warn $@ if $@;
2227 } 2270 }
2228} 2271}
2229 2272
2273sub init {
2274 init_resources;
2275}
2276
2230sub main { 2277sub main {
2231 # we must not ever block the main coroutine 2278 # we must not ever block the main coroutine
2232 local $Coro::idle = sub { 2279 local $Coro::idle = sub {
2233 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2280 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2281 (async {
2234 async { Event::one_event }; 2282 Event::one_event;
2283 })->prio (Coro::PRIO_MAX);
2235 }; 2284 };
2236 2285
2237 cfg_load; 2286 cfg_load;
2238 db_load; 2287 db_init;
2239 load_extensions; 2288 load_extensions;
2289
2290 $TICK_WATCHER->start;
2240 Event::loop; 2291 Event::loop;
2241} 2292}
2242 2293
2243############################################################################# 2294#############################################################################
2244# initialisation and cleanup 2295# initialisation and cleanup
2245 2296
2246# install some emergency cleanup handlers 2297# install some emergency cleanup handlers
2247BEGIN { 2298BEGIN {
2248 for my $signal (qw(INT HUP TERM)) { 2299 for my $signal (qw(INT HUP TERM)) {
2249 Event->signal ( 2300 Event->signal (
2301 reentrant => 0,
2250 data => WF_AUTOCANCEL, 2302 data => WF_AUTOCANCEL,
2251 signal => $signal, 2303 signal => $signal,
2304 prio => 0,
2252 cb => sub { 2305 cb => sub {
2253 cf::cleanup "SIG$signal"; 2306 cf::cleanup "SIG$signal";
2254 }, 2307 },
2255 ); 2308 );
2256 } 2309 }
2257} 2310}
… …
2278 my $map = $cf::MAP{$path} or next; 2331 my $map = $cf::MAP{$path} or next;
2279 $map->valid or next; 2332 $map->valid or next;
2280 $map->save; 2333 $map->save;
2281 } 2334 }
2282 warn "end emergency map save\n"; 2335 warn "end emergency map save\n";
2336
2337 warn "begin emergency database checkpoint\n";
2338 BDB::db_env_txn_checkpoint $DB_ENV;
2339 warn "end emergency database checkpoint\n";
2283 }; 2340 };
2284 2341
2285 warn "leave emergency perl save\n"; 2342 warn "leave emergency perl save\n";
2343}
2344
2345sub post_cleanup {
2346 my ($make_core) = @_;
2347
2348 warn Carp::longmess "post_cleanup backtrace"
2349 if $make_core;
2286} 2350}
2287 2351
2288sub reload() { 2352sub reload() {
2289 # can/must only be called in main 2353 # can/must only be called in main
2290 if ($Coro::current != $Coro::main) { 2354 if ($Coro::current != $Coro::main) {
2291 warn "can only reload from main coroutine\n"; 2355 warn "can only reload from main coroutine";
2292 return; 2356 return;
2293 } 2357 }
2294 2358
2295 warn "reloading..."; 2359 warn "reloading...";
2296 2360
2297 warn "freezing server"; 2361 warn "entering sync_job";
2298 my $guard = freeze_mainloop; 2362
2363 cf::sync_job {
2364 cf::write_runtime; # external watchdog should not bark
2299 cf::emergency_save; 2365 cf::emergency_save;
2366 cf::write_runtime; # external watchdog should not bark
2300 2367
2301 warn "sync database to disk"; 2368 warn "syncing database to disk";
2302 cf::db_sync; 2369 BDB::db_env_txn_checkpoint $DB_ENV;
2303 IO::AIO::flush;
2304 2370
2305 eval {
2306 # if anything goes wrong in here, we should simply crash as we already saved 2371 # if anything goes wrong in here, we should simply crash as we already saved
2307 2372
2308 warn "cancel all watchers"; 2373 warn "cancelling all WF_AUTOCANCEL watchers";
2309 for (Event::all_watchers) { 2374 for (Event::all_watchers) {
2310 $_->cancel if $_->data & WF_AUTOCANCEL; 2375 $_->cancel if $_->data & WF_AUTOCANCEL;
2311 } 2376 }
2312 2377
2378 warn "flushing outstanding aio requests";
2379 for (;;) {
2380 BDB::flush;
2381 IO::AIO::flush;
2382 Coro::cede;
2383 last unless IO::AIO::nreqs || BDB::nreqs;
2384 warn "iterate...";
2385 }
2386
2313 warn "cancel all extension coros"; 2387 warn "cancelling all extension coros";
2314 $_->cancel for values %EXT_CORO; 2388 $_->cancel for values %EXT_CORO;
2315 %EXT_CORO = (); 2389 %EXT_CORO = ();
2316 2390
2317 warn "remove commands"; 2391 warn "removing commands";
2318 %COMMAND = (); 2392 %COMMAND = ();
2319 2393
2320 warn "remove ext commands"; 2394 warn "removing ext commands";
2321 %EXTCMD = (); 2395 %EXTCMD = ();
2322 2396
2323 warn "unload/nuke all extensions"; 2397 warn "unloading/nuking all extensions";
2324 for my $pkg (@EXTS) { 2398 for my $pkg (@EXTS) {
2325 warn "... unloading $pkg"; 2399 warn "... unloading $pkg";
2326 2400
2327 if (my $cb = $pkg->can ("unload")) { 2401 if (my $cb = $pkg->can ("unload")) {
2328 eval { 2402 eval {
… …
2333 2407
2334 warn "... nuking $pkg"; 2408 warn "... nuking $pkg";
2335 Symbol::delete_package $pkg; 2409 Symbol::delete_package $pkg;
2336 } 2410 }
2337 2411
2338 warn "unload all perl modules loaded from $LIBDIR"; 2412 warn "unloading all perl modules loaded from $LIBDIR";
2339 while (my ($k, $v) = each %INC) { 2413 while (my ($k, $v) = each %INC) {
2340 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2414 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2341 2415
2342 warn "removing <$k>"; 2416 warn "... unloading $k";
2343 delete $INC{$k}; 2417 delete $INC{$k};
2344 2418
2345 $k =~ s/\.pm$//; 2419 $k =~ s/\.pm$//;
2346 $k =~ s/\//::/g; 2420 $k =~ s/\//::/g;
2347 2421
… …
2350 } 2424 }
2351 2425
2352 Symbol::delete_package $k; 2426 Symbol::delete_package $k;
2353 } 2427 }
2354 2428
2355 warn "get rid of safe::, as good as possible"; 2429 warn "getting rid of safe::, as good as possible";
2356 Symbol::delete_package "safe::$_" 2430 Symbol::delete_package "safe::$_"
2357 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2431 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2358 2432
2359 warn "unload cf.pm \"a bit\""; 2433 warn "unloading cf.pm \"a bit\"";
2360 delete $INC{"cf.pm"}; 2434 delete $INC{"cf.pm"};
2361 2435
2362 # don't, removes xs symbols, too, 2436 # don't, removes xs symbols, too,
2363 # and global variables created in xs 2437 # and global variables created in xs
2364 #Symbol::delete_package __PACKAGE__; 2438 #Symbol::delete_package __PACKAGE__;
2365 2439
2440 warn "unload completed, starting to reload now";
2441
2366 warn "reloading cf.pm"; 2442 warn "reloading cf.pm";
2367 require cf; 2443 require cf;
2368 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2444 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2369 2445
2370 warn "load config and database again"; 2446 warn "loading config and database again";
2371 cf::cfg_load; 2447 cf::cfg_load;
2372 cf::db_load;
2373 2448
2374 warn "load extensions"; 2449 warn "loading extensions";
2375 cf::load_extensions; 2450 cf::load_extensions;
2376 2451
2377 warn "reattach attachments to objects/players"; 2452 warn "reattaching attachments to objects/players";
2378 _global_reattach; 2453 _global_reattach;
2379 warn "reattach attachments to maps"; 2454 warn "reattaching attachments to maps";
2380 reattach $_ for values %MAP; 2455 reattach $_ for values %MAP;
2381 };
2382 2456
2383 if ($@) { 2457 warn "loading reloadable resources";
2458 init_resources;
2459
2460 warn "leaving sync_job";
2461
2462 1
2463 } or do {
2384 warn $@; 2464 warn $@;
2385 warn "error while reloading, exiting."; 2465 warn "error while reloading, exiting.";
2386 exit 1; 2466 exit 1;
2387 } 2467 };
2388 2468
2389 warn "reloaded"; 2469 warn "reloaded";
2390}; 2470};
2391 2471
2472our $RELOAD_WATCHER; # used only during reload
2473
2392register_command "reload" => sub { 2474register_command "reload" => sub {
2393 my ($who, $arg) = @_; 2475 my ($who, $arg) = @_;
2394 2476
2395 if ($who->flag (FLAG_WIZ)) { 2477 if ($who->flag (FLAG_WIZ)) {
2396 $who->message ("start of reload."); 2478 $who->message ("reloading server.");
2479
2480 # doing reload synchronously and two reloads happen back-to-back,
2481 # coro crashes during coro_state_free->destroy here.
2482
2483 $RELOAD_WATCHER ||= Event->timer (
2484 reentrant => 0,
2485 after => 0,
2486 data => WF_AUTOCANCEL,
2487 cb => sub {
2397 reload; 2488 reload;
2398 $who->message ("end of reload."); 2489 undef $RELOAD_WATCHER;
2490 },
2491 );
2399 } 2492 }
2400}; 2493};
2401 2494
2402unshift @INC, $LIBDIR; 2495unshift @INC, $LIBDIR;
2496
2497my $bug_warning = 0;
2403 2498
2404$TICK_WATCHER = Event->timer ( 2499$TICK_WATCHER = Event->timer (
2405 reentrant => 0, 2500 reentrant => 0,
2501 parked => 1,
2406 prio => 0, 2502 prio => 0,
2407 at => $NEXT_TICK || $TICK, 2503 at => $NEXT_TICK || $TICK,
2408 data => WF_AUTOCANCEL, 2504 data => WF_AUTOCANCEL,
2409 cb => sub { 2505 cb => sub {
2506 if ($Coro::current != $Coro::main) {
2507 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2508 unless ++$bug_warning > 10;
2509 return;
2510 }
2511
2410 $NOW = Event::time; 2512 $NOW = Event::time;
2411 2513
2412 cf::server_tick; # one server iteration 2514 cf::server_tick; # one server iteration
2413 $RUNTIME += $TICK; 2515 $RUNTIME += $TICK;
2414 $NEXT_TICK += $TICK; 2516 $NEXT_TICK += $TICK;
2415 2517
2518 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2519 $NEXT_RUNTIME_WRITE = $NOW + 10;
2520 Coro::async_pool {
2521 write_runtime
2522 or warn "ERROR: unable to write runtime file: $!";
2523 };
2524 }
2525
2416 $WAIT_FOR_TICK->broadcast; 2526 $WAIT_FOR_TICK->broadcast;
2417 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2527 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2528
2529# my $AFTER = Event::time;
2530# warn $AFTER - $NOW;#d#
2418 2531
2419 # if we are delayed by four ticks or more, skip them all 2532 # if we are delayed by four ticks or more, skip them all
2420 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2533 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2421 2534
2422 $TICK_WATCHER->at ($NEXT_TICK); 2535 $TICK_WATCHER->at ($NEXT_TICK);
2423 $TICK_WATCHER->start; 2536 $TICK_WATCHER->start;
2424 }, 2537 },
2425); 2538);
2426 2539
2540{
2541 BDB::max_poll_time $TICK * 0.1;
2542 $BDB_POLL_WATCHER = Event->io (
2543 reentrant => 0,
2544 fd => BDB::poll_fileno,
2545 poll => 'r',
2546 prio => 0,
2547 data => WF_AUTOCANCEL,
2548 cb => \&BDB::poll_cb,
2549 );
2550 BDB::min_parallel 8;
2551
2552 BDB::set_sync_prepare {
2553 my $status;
2554 my $current = $Coro::current;
2555 (
2556 sub {
2557 $status = $!;
2558 $current->ready; undef $current;
2559 },
2560 sub {
2561 Coro::schedule while defined $current;
2562 $! = $status;
2563 },
2564 )
2565 };
2566
2567 unless ($DB_ENV) {
2568 $DB_ENV = BDB::db_env_create;
2569
2570 cf::sync_job {
2571 eval {
2572 BDB::db_env_open
2573 $DB_ENV,
2574 $BDB_ENV_DIR,
2575 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2576 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2577 0666;
2578
2579 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2580
2581 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2582 $DB_ENV->set_lk_detect;
2583 };
2584
2585 cf::cleanup "db_env_open(db): $@" if $@;
2586 };
2587 }
2588}
2589
2590{
2591 IO::AIO::min_parallel 8;
2592
2593 undef $Coro::AIO::WATCHER;
2427IO::AIO::max_poll_time $TICK * 0.2; 2594 IO::AIO::max_poll_time $TICK * 0.1;
2428
2429$AIO_POLL_WATCHER = Event->io ( 2595 $AIO_POLL_WATCHER = Event->io (
2430 fd => IO::AIO::poll_fileno, 2596 reentrant => 0,
2431 poll => 'r',
2432 prio => 5,
2433 data => WF_AUTOCANCEL,
2434 cb => \&IO::AIO::poll_cb,
2435);
2436
2437$WRITE_RUNTIME_WATCHER = Event->timer (
2438 data => WF_AUTOCANCEL, 2597 data => WF_AUTOCANCEL,
2439 after => 0, 2598 fd => IO::AIO::poll_fileno,
2440 interval => 10, 2599 poll => 'r',
2441 cb => sub { 2600 prio => 6,
2442 (Coro::unblock_sub { 2601 cb => \&IO::AIO::poll_cb,
2443 write_runtime 2602 );
2444 or warn "ERROR: unable to write runtime file: $!"; 2603}
2445 })->();
2446 },
2447);
2448 2604
2449END { cf::emergency_save } 2605END { cf::emergency_save }
2450 2606
24511 26071
2452 2608

Diff Legend

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