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.173 by root, Sun Jan 14 18:00:34 2007 UTC vs.
Revision 1.220 by root, Sat Feb 17 23:54:35 2007 UTC

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

Diff Legend

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