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.168 by root, Sun Jan 14 00:37:14 2007 UTC vs.
Revision 1.219 by root, Sat Feb 17 03:19:44 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.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;
… …
503our @CB_TYPE = (); # registry for type (cf-object class) based events 519our @CB_TYPE = (); # registry for type (cf-object class) based events
504our @CB_MAP = (); 520our @CB_MAP = ();
505 521
506my %attachment; 522my %attachment;
507 523
524sub cf::attachable::thawer_merge {
525 # simply override everything except _meta
526 local $_[0]{_meta};
527 %{$_[0]} = %{$_[1]};
528}
529
508sub _attach_cb($$$$) { 530sub _attach_cb($$$$) {
509 my ($registry, $event, $prio, $cb) = @_; 531 my ($registry, $event, $prio, $cb) = @_;
510 532
511 use sort 'stable'; 533 use sort 'stable';
512 534
… …
683# object support 705# object support
684 706
685sub reattach { 707sub reattach {
686 # basically do the same as instantiate, without calling instantiate 708 # basically do the same as instantiate, without calling instantiate
687 my ($obj) = @_; 709 my ($obj) = @_;
710
711 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
688 712
689 my $registry = $obj->registry; 713 my $registry = $obj->registry;
690 714
691 @$registry = (); 715 @$registry = ();
692 716
… …
739 $filename, length $$rdata, scalar @$objs; 763 $filename, length $$rdata, scalar @$objs;
740 764
741 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 765 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
742 chmod SAVE_MODE, $fh; 766 chmod SAVE_MODE, $fh;
743 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 767 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
744 aio_fsync $fh; 768 aio_fsync $fh if $cf::USE_FSYNC;
745 close $fh; 769 close $fh;
746 770
747 if (@$objs) { 771 if (@$objs) {
748 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) {
749 chmod SAVE_MODE, $fh; 773 chmod SAVE_MODE, $fh;
750 my $data = Storable::nfreeze { version => 1, objs => $objs }; 774 my $data = Storable::nfreeze { version => 1, objs => $objs };
751 aio_write $fh, 0, (length $data), $data, 0; 775 aio_write $fh, 0, (length $data), $data, 0;
752 aio_fsync $fh; 776 aio_fsync $fh if $cf::USE_FSYNC;
753 close $fh; 777 close $fh;
754 aio_rename "$filename.pst~", "$filename.pst"; 778 aio_rename "$filename.pst~", "$filename.pst";
755 } 779 }
756 } else { 780 } else {
757 aio_unlink "$filename.pst"; 781 aio_unlink "$filename.pst";
… …
949 973
950sub exists($) { 974sub exists($) {
951 my ($login) = @_; 975 my ($login) = @_;
952 976
953 $cf::PLAYER{$login} 977 $cf::PLAYER{$login}
954 or cf::sync_job { !aio_stat $login } 978 or cf::sync_job { !aio_stat path $login }
955} 979}
956 980
957sub find($) { 981sub find($) {
958 return $cf::PLAYER{$_[0]} || do { 982 return $cf::PLAYER{$_[0]} || do {
959 my $login = $_[0]; 983 my $login = $_[0];
… …
1057=cut 1081=cut
1058 1082
1059sub maps($) { 1083sub maps($) {
1060 my ($pl) = @_; 1084 my ($pl) = @_;
1061 1085
1086 $pl = ref $pl ? $pl->ob->name : $pl;
1087
1062 my $files = aio_readdir playerdir $pl 1088 my $files = aio_readdir playerdir $pl
1063 or return; 1089 or return;
1064 1090
1065 my @paths; 1091 my @paths;
1066 1092
1067 for (@$files) { 1093 for (@$files) {
1068 utf8::decode $_; 1094 utf8::decode $_;
1069 next if /\.(?:pl|pst)$/; 1095 next if /\.(?:pl|pst)$/;
1070 next unless /^$PATH_SEP/o; 1096 next unless /^$PATH_SEP/o;
1071 1097
1072 s/\.map$//; 1098 push @paths, cf::map::normalise "~$pl/$_";
1073 push @paths, "~" . $pl->ob->name . "/" . $_;
1074 } 1099 }
1075 1100
1076 \@paths 1101 \@paths
1077} 1102}
1078 1103
… …
1105 1130
1106use Fcntl; 1131use Fcntl;
1107use Coro::AIO; 1132use Coro::AIO;
1108 1133
1109use overload 1134use overload
1110 '""' => \&as_string; 1135 '""' => \&as_string,
1136 fallback => 1;
1111 1137
1112our $MAX_RESET = 3600; 1138our $MAX_RESET = 3600;
1113our $DEFAULT_RESET = 3000; 1139our $DEFAULT_RESET = 3000;
1114 1140
1115sub generate_random_map { 1141sub generate_random_map {
1116 my ($self, $rmp) = @_; 1142 my ($self, $rmp) = @_;
1117
1118 # mit "rum" bekleckern, nicht 1143 # mit "rum" bekleckern, nicht
1119 $self->_create_random_map ( 1144 $self->_create_random_map (
1120 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1145 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1121 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1146 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1122 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1147 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1129 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1154 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1130 (cf::region::find $rmp->{region}), $rmp->{custom} 1155 (cf::region::find $rmp->{region}), $rmp->{custom}
1131 ) 1156 )
1132} 1157}
1133 1158
1159=item cf::map->register ($regex, $prio)
1160
1161Register a handler for the map path matching the given regex at the
1162givne priority (higher is better, built-in handlers have priority 0, the
1163default).
1164
1165=cut
1166
1134sub register { 1167sub register {
1135 my (undef, $regex) = @_; 1168 my (undef, $regex, $prio) = @_;
1136 my $pkg = caller; 1169 my $pkg = caller;
1137 1170
1138 no strict; 1171 no strict;
1139 push @{"$pkg\::ISA"}, __PACKAGE__; 1172 push @{"$pkg\::ISA"}, __PACKAGE__;
1140 1173
1141 $EXT_MAP{$pkg} = qr<$regex>; 1174 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1142} 1175}
1143 1176
1144# also paths starting with '/' 1177# also paths starting with '/'
1145$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1178$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1179
1180sub thawer_merge {
1181 my ($self, $merge) = @_;
1182
1183 # we have to keep some variables in memory intact
1184 local $self->{path};
1185 local $self->{load_path};
1186 local $self->{deny_save};
1187 local $self->{deny_reset};
1188
1189 $self->SUPER::thawer_merge ($merge);
1190}
1146 1191
1147sub normalise { 1192sub normalise {
1148 my ($path, $base) = @_; 1193 my ($path, $base) = @_;
1194
1195 $path = "$path"; # make sure its a string
1196
1197 $path =~ s/\.map$//;
1149 1198
1150 # map plan: 1199 # map plan:
1151 # 1200 #
1152 # /! non-realised random map exit (special hack!) 1201 # /! non-realised random map exit (special hack!)
1153 # {... are special paths that are not being touched 1202 # {... are special paths that are not being touched
… …
1181 1230
1182 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1231 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1183 1232
1184 $path = normalise $path, $base; 1233 $path = normalise $path, $base;
1185 1234
1186 for my $pkg (keys %EXT_MAP) { 1235 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1187 if ($path =~ $EXT_MAP{$pkg}) { 1236 if ($path =~ $EXT_MAP{$pkg}[1]) {
1188 my $self = bless cf::map::new, $pkg; 1237 my $self = bless cf::map::new, $pkg;
1189 $self->{path} = $path; $self->path ($path); 1238 $self->{path} = $path; $self->path ($path);
1190 $self->init; # pass $1 etc. 1239 $self->init; # pass $1 etc.
1191 return $self; 1240 return $self;
1192 } 1241 }
1193 } 1242 }
1194 1243
1195 Carp::carp "unable to resolve path '$path'."; 1244 Carp::carp "unable to resolve path '$path' (base '$base').";
1196 () 1245 ()
1197} 1246}
1198 1247
1199sub init { 1248sub init {
1200 my ($self) = @_; 1249 my ($self) = @_;
… …
1215 1264
1216# the original (read-only) location 1265# the original (read-only) location
1217sub load_path { 1266sub load_path {
1218 my ($self) = @_; 1267 my ($self) = @_;
1219 1268
1220 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1269 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1221} 1270}
1222 1271
1223# the temporary/swap location 1272# the temporary/swap location
1224sub save_path { 1273sub save_path {
1225 my ($self) = @_; 1274 my ($self) = @_;
1226 1275
1227 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1276 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1228 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1277 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1229} 1278}
1230 1279
1231# the unique path, undef == no special unique path 1280# the unique path, undef == no special unique path
1232sub uniq_path { 1281sub uniq_path {
1233 my ($self) = @_; 1282 my ($self) = @_;
… …
1247 1296
1248sub unlink_save { 1297sub unlink_save {
1249 my ($self) = @_; 1298 my ($self) = @_;
1250 1299
1251 utf8::encode (my $save = $self->save_path); 1300 utf8::encode (my $save = $self->save_path);
1252 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1301 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1253 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1254} 1303}
1255 1304
1256sub load_header_from($) { 1305sub load_header_from($) {
1257 my ($self, $path) = @_; 1306 my ($self, $path) = @_;
1258 1307
1259 utf8::encode $path; 1308 utf8::encode $path;
1260 aio_open $path, O_RDONLY, 0 1309 #aio_open $path, O_RDONLY, 0
1261 or return; 1310 # or return;
1262 1311
1263 $self->_load_header ($path) 1312 $self->_load_header ($path)
1264 or return; 1313 or return;
1265 1314
1266 $self->{load_path} = $path; 1315 $self->{load_path} = $path;
1267 1316
1268 1 1317 1
1269} 1318}
1270 1319
1271sub load_orig { 1320sub load_header_orig {
1272 my ($self) = @_; 1321 my ($self) = @_;
1273 1322
1274 $self->load_header_from ($self->load_path) 1323 $self->load_header_from ($self->load_path)
1275} 1324}
1276 1325
1277sub load_temp { 1326sub load_header_temp {
1278 my ($self) = @_; 1327 my ($self) = @_;
1279 1328
1280 $self->load_header_from ($self->save_path) 1329 $self->load_header_from ($self->save_path)
1330}
1331
1332sub prepare_temp {
1333 my ($self) = @_;
1334
1335 $self->last_access ((delete $self->{last_access})
1336 || $cf::RUNTIME); #d#
1337 # safety
1338 $self->{instantiate_time} = $cf::RUNTIME
1339 if $self->{instantiate_time} > $cf::RUNTIME;
1340}
1341
1342sub prepare_orig {
1343 my ($self) = @_;
1344
1345 $self->{load_original} = 1;
1346 $self->{instantiate_time} = $cf::RUNTIME;
1347 $self->last_access ($cf::RUNTIME);
1348 $self->instantiate;
1281} 1349}
1282 1350
1283sub load_header { 1351sub load_header {
1284 my ($self) = @_; 1352 my ($self) = @_;
1285 1353
1286 if ($self->load_temp) { 1354 if ($self->load_header_temp) {
1287 $self->last_access ((delete $self->{last_access}) 1355 $self->prepare_temp;
1288 || $cf::RUNTIME); #d#
1289 # safety
1290 $self->{instantiate_time} = $cf::RUNTIME
1291 if $self->{instantiate_time} > $cf::RUNTIME;
1292 } else { 1356 } else {
1293 $self->load_orig 1357 $self->load_header_orig
1294 or return; 1358 or return;
1295 1359 $self->prepare_orig;
1296 $self->{load_original} = 1;
1297 $self->{instantiate_time} = $cf::RUNTIME;
1298 $self->last_access ($cf::RUNTIME);
1299 $self->instantiate;
1300 } 1360 }
1301 1361
1302 1 1362 1
1303} 1363}
1304 1364
… …
1318 $map->{last_save} = $cf::RUNTIME; 1378 $map->{last_save} = $cf::RUNTIME;
1319 1379
1320 $map->load_header 1380 $map->load_header
1321 or return; 1381 or return;
1322 1382
1323 if ($map->should_reset) { 1383 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1384 # doing this can freeze the server in a sync job, obviously
1385 #$cf::WAIT_FOR_TICK->wait;
1324 $map->reset; 1386 $map->reset;
1325 undef $guard; 1387 undef $guard;
1326 $map = find $path 1388 return find $path;
1327 or return;
1328 } 1389 }
1329 1390
1330 $cf::MAP{$path} = $map 1391 $cf::MAP{$path} = $map
1331 } 1392 }
1332} 1393}
1394
1395sub pre_load { }
1396sub post_load { }
1333 1397
1334sub load { 1398sub load {
1335 my ($self) = @_; 1399 my ($self) = @_;
1336 1400
1401 local $self->{deny_reset} = 1; # loading can take a long time
1402
1337 my $path = $self->{path}; 1403 my $path = $self->{path};
1338 my $guard = cf::lock_acquire "map_load:$path"; 1404 my $guard = cf::lock_acquire "map_load:$path";
1339 1405
1340 return if $self->in_memory != cf::MAP_SWAPPED; 1406 return if $self->in_memory != cf::MAP_SWAPPED;
1341 1407
1342 $self->in_memory (cf::MAP_LOADING); 1408 $self->in_memory (cf::MAP_LOADING);
1343 1409
1344 $self->alloc; 1410 $self->alloc;
1411
1412 $self->pre_load;
1413
1345 $self->_load_objects ($self->{load_path}, 1) 1414 $self->_load_objects ($self->{load_path}, 1)
1346 or return; 1415 or return;
1347 1416
1348 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1417 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1349 if delete $self->{load_original}; 1418 if delete $self->{load_original};
… …
1371 unless $self->difficulty; 1440 unless $self->difficulty;
1372 Coro::cede; 1441 Coro::cede;
1373 $self->activate; 1442 $self->activate;
1374 } 1443 }
1375 1444
1445 $self->post_load;
1446
1376 $self->in_memory (cf::MAP_IN_MEMORY); 1447 $self->in_memory (cf::MAP_IN_MEMORY);
1377} 1448}
1378 1449
1379sub customise_for { 1450sub customise_for {
1380 my ($self, $ob) = @_; 1451 my ($self, $ob) = @_;
… …
1420 1491
1421 cf::sync_job { $map->load }; 1492 cf::sync_job { $map->load };
1422} 1493}
1423 1494
1424our %MAP_PREFETCH; 1495our %MAP_PREFETCH;
1425our $MAP_PREFETCHER = Coro::async { 1496our $MAP_PREFETCHER = undef;
1426 while () {
1427 for my $path (keys %MAP_PREFETCH) {
1428 my $map = find $path
1429 or next;
1430 $map->load;
1431
1432 delete $MAP_PREFETCH{$path};
1433 }
1434 Coro::schedule;
1435 }
1436};
1437 1497
1438sub find_async { 1498sub find_async {
1439 my ($path, $origin) = @_; 1499 my ($path, $origin) = @_;
1440 1500
1441 $path = normalise $path, $origin && $origin->{path}; 1501 $path = normalise $path, $origin && $origin->{path};
1442 1502
1443 if (my $map = $cf::MAP{$path}) { 1503 if (my $map = $cf::MAP{$path}) {
1444 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1504 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1445 } 1505 }
1446 1506
1447 $MAP_PREFETCH{$path} = 0; 1507 undef $MAP_PREFETCH{$path};
1508 $MAP_PREFETCHER ||= cf::async {
1509 while (%MAP_PREFETCH) {
1510 for my $path (keys %MAP_PREFETCH) {
1511 my $map = find $path
1512 or next;
1513 $map->load;
1514
1515 delete $MAP_PREFETCH{$path};
1516 }
1517 }
1518 undef $MAP_PREFETCHER;
1519 };
1448 $MAP_PREFETCHER->ready; 1520 $MAP_PREFETCHER->prio (6);
1449 1521
1450 () 1522 ()
1451} 1523}
1452 1524
1453sub save { 1525sub save {
… …
1498 1570
1499sub reset_at { 1571sub reset_at {
1500 my ($self) = @_; 1572 my ($self) = @_;
1501 1573
1502 # TODO: safety, remove and allow resettable per-player maps 1574 # TODO: safety, remove and allow resettable per-player maps
1503 return 1e99 if $self->isa ("ext::map_per_player"); 1575 return 1e99 if $self->isa ("ext::map_per_player");#d#
1504 return 1e99 if $self->{deny_reset}; 1576 return 1e99 if $self->{deny_reset};
1505 1577
1506 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1578 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1507 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1579 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1508 1580
… …
1513 my ($self) = @_; 1585 my ($self) = @_;
1514 1586
1515 $self->reset_at <= $cf::RUNTIME 1587 $self->reset_at <= $cf::RUNTIME
1516} 1588}
1517 1589
1518sub rename {
1519 my ($self, $new_path) = @_;
1520
1521 normalise $new_path;
1522
1523 $self->unlink_save;
1524
1525 delete $cf::MAP{$self->path};
1526 $self->{path} = $new_path; $self->path ($self->{path});
1527 $cf::MAP{$self->path} = $self;
1528
1529 $self->save;
1530}
1531
1532sub reset { 1590sub reset {
1533 my ($self) = @_; 1591 my ($self) = @_;
1534 1592
1535 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1593 my $lock = cf::lock_acquire "map_data:$self->{path}";
1536 1594
1537 return if $self->players; 1595 return if $self->players;
1538 return if $self->isa ("ext::map_per_player");#d# 1596 return if $self->isa ("ext::map_per_player");#d#
1539 1597
1540 warn "resetting map ", $self->path;#d# 1598 warn "resetting map ", $self->path;#d#
1541 1599
1600 $self->in_memory (cf::MAP_SWAPPED);
1601
1602 # need to save uniques path
1603 unless ($self->{deny_save}) {
1604 my $uniq = $self->uniq_path; utf8::encode $uniq;
1605
1606 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1607 if $uniq;
1608 }
1609
1542 delete $cf::MAP{$self->path}; 1610 delete $cf::MAP{$self->path};
1543 1611
1544 $self->in_memory (cf::MAP_SWAPPED);
1545 $self->clear; 1612 $self->clear;
1546 1613
1547 $_->clear_links_to ($self) for values %cf::MAP; 1614 $_->clear_links_to ($self) for values %cf::MAP;
1548 1615
1549 $self->unlink_save; 1616 $self->unlink_save;
… …
1553my $nuke_counter = "aaaa"; 1620my $nuke_counter = "aaaa";
1554 1621
1555sub nuke { 1622sub nuke {
1556 my ($self) = @_; 1623 my ($self) = @_;
1557 1624
1625 delete $cf::MAP{$self->path};
1626
1627 $self->unlink_save;
1628
1629 bless $self, "cf::map";
1630 delete $self->{deny_reset};
1558 $self->{deny_save} = 1; 1631 $self->{deny_save} = 1;
1559 $self->reset_timeout (1); 1632 $self->reset_timeout (1);
1560 $self->rename ("{nuke}/" . ($nuke_counter++)); 1633 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1634
1635 $cf::MAP{$self->path} = $self;
1636
1561 $self->reset; # polite request, might not happen 1637 $self->reset; # polite request, might not happen
1562} 1638}
1563 1639
1564=item cf::map::unique_maps 1640=item cf::map::unique_maps
1565 1641
… …
1577 for (@$files) { 1653 for (@$files) {
1578 utf8::decode $_; 1654 utf8::decode $_;
1579 next if /\.pst$/; 1655 next if /\.pst$/;
1580 next unless /^$PATH_SEP/o; 1656 next unless /^$PATH_SEP/o;
1581 1657
1582 s/\.map$//; 1658 push @paths, cf::map::normalise $_;
1583 push @paths, $_;
1584 } 1659 }
1585 1660
1586 \@paths 1661 \@paths
1587} 1662}
1588 1663
… …
1682=cut 1757=cut
1683 1758
1684sub link_map { 1759sub link_map {
1685 unless ($LINK_MAP) { 1760 unless ($LINK_MAP) {
1686 $LINK_MAP = cf::map::find "{link}" 1761 $LINK_MAP = cf::map::find "{link}"
1687 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1762 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1688 $LINK_MAP->load; 1763 $LINK_MAP->load;
1689 } 1764 }
1690 1765
1691 $LINK_MAP 1766 $LINK_MAP
1692} 1767}
… …
1699 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1774 return if UNIVERSAL::isa $self->map, "ext::map_link";
1700 1775
1701 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1776 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1702 if $self->map; 1777 if $self->map;
1703 1778
1704 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1779 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1705} 1780}
1706 1781
1707sub cf::object::player::leave_link { 1782sub cf::object::player::leave_link {
1708 my ($self, $map, $x, $y) = @_; 1783 my ($self, $map, $x, $y) = @_;
1709 1784
… …
1731 $map->load; 1806 $map->load;
1732 $map->load_diag; 1807 $map->load_diag;
1733 1808
1734 return unless $self->contr->active; 1809 return unless $self->contr->active;
1735 $self->activate_recursive; 1810 $self->activate_recursive;
1811
1812 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1736 $self->enter_map ($map, $x, $y); 1813 $self->enter_map ($map, $x, $y);
1737} 1814}
1738 1815
1739cf::player->attach ( 1816cf::player->attach (
1740 on_logout => sub { 1817 on_logout => sub {
… …
1753 # try to abort aborted map switching on player login :) 1830 # try to abort aborted map switching on player login :)
1754 # should happen only on crashes 1831 # should happen only on crashes
1755 if ($pl->ob->{_link_pos}) { 1832 if ($pl->ob->{_link_pos}) {
1756 $pl->ob->enter_link; 1833 $pl->ob->enter_link;
1757 (async { 1834 (async {
1758 # we need this sleep as the login has a concurrent enter_exit running
1759 # and this sleep increases chances of the player not ending up in scorn
1760 $pl->ob->reply (undef, 1835 $pl->ob->reply (undef,
1761 "There was an internal problem at your last logout, " 1836 "There was an internal problem at your last logout, "
1762 . "the server will try to bring you to your intended destination in a second.", 1837 . "the server will try to bring you to your intended destination in a second.",
1763 cf::NDI_RED); 1838 cf::NDI_RED);
1839 # we need this sleep as the login has a concurrent enter_exit running
1840 # and this sleep increases chances of the player not ending up in scorn
1764 Coro::Timer::sleep 1; 1841 Coro::Timer::sleep 1;
1765 $pl->ob->leave_link; 1842 $pl->ob->leave_link;
1766 })->prio (2); 1843 })->prio (2);
1767 } 1844 }
1768 }, 1845 },
… …
1776 my ($self, $path, $x, $y) = @_; 1853 my ($self, $path, $x, $y) = @_;
1777 1854
1778 $self->enter_link; 1855 $self->enter_link;
1779 1856
1780 (async { 1857 (async {
1858 my $map = eval {
1781 my $map = cf::map::find $path; 1859 my $map = cf::map::find $path;
1782 $map = $map->customise_for ($self) if $map; 1860 $map = $map->customise_for ($self) if $map;
1783 1861 $map
1784# warn "entering ", $map->path, " at ($x, $y)\n" 1862 } or
1785# if $map;
1786
1787 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1863 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1788 1864
1789 $self->leave_link ($map, $x, $y); 1865 $self->leave_link ($map, $x, $y);
1790 })->prio (1); 1866 })->prio (1);
1791} 1867}
1792 1868
… …
1796 1872
1797sub parse_random_map_params { 1873sub parse_random_map_params {
1798 my ($spec) = @_; 1874 my ($spec) = @_;
1799 1875
1800 my $rmp = { # defaults 1876 my $rmp = { # defaults
1801 xsize => 10, 1877 xsize => (cf::rndm 15, 40),
1802 ysize => 10, 1878 ysize => (cf::rndm 15, 40),
1879 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1880 #layout => string,
1803 }; 1881 };
1804 1882
1805 for (split /\n/, $spec) { 1883 for (split /\n/, $spec) {
1806 my ($k, $v) = split /\s+/, $_, 2; 1884 my ($k, $v) = split /\s+/, $_, 2;
1807 1885
… …
1811 $rmp 1889 $rmp
1812} 1890}
1813 1891
1814sub prepare_random_map { 1892sub prepare_random_map {
1815 my ($exit) = @_; 1893 my ($exit) = @_;
1894
1895 my $guard = cf::lock_acquire "exit_prepare:$exit";
1816 1896
1817 # all this does is basically replace the /! path by 1897 # all this does is basically replace the /! path by
1818 # a new random map path (?random/...) with a seed 1898 # a new random map path (?random/...) with a seed
1819 # that depends on the exit object 1899 # that depends on the exit object
1820 1900
1821 my $rmp = parse_random_map_params $exit->msg; 1901 my $rmp = parse_random_map_params $exit->msg;
1822 1902
1823 if ($exit->map) { 1903 if ($exit->map) {
1824 $rmp->{region} = $exit->map->region_name; 1904 $rmp->{region} = $exit->region->name;
1825 $rmp->{origin_map} = $exit->map->path; 1905 $rmp->{origin_map} = $exit->map->path;
1826 $rmp->{origin_x} = $exit->x; 1906 $rmp->{origin_x} = $exit->x;
1827 $rmp->{origin_y} = $exit->y; 1907 $rmp->{origin_y} = $exit->y;
1828 } 1908 }
1829 1909
1830 $rmp->{random_seed} ||= $exit->random_seed; 1910 $rmp->{random_seed} ||= $exit->random_seed;
1831 1911
1832 my $data = cf::to_json $rmp; 1912 my $data = cf::to_json $rmp;
1833 my $md5 = Digest::MD5::md5_hex $data; 1913 my $md5 = Digest::MD5::md5_hex $data;
1914 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1834 1915
1835 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1916 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1836 aio_write $fh, 0, (length $data), $data, 0; 1917 aio_write $fh, 0, (length $data), $data, 0;
1918 undef $fh;
1919 aio_rename "$meta~", $meta;
1837 1920
1838 $exit->slaying ("?random/$md5"); 1921 $exit->slaying ("?random/$md5");
1839 $exit->msg (undef); 1922 $exit->msg (undef);
1840 } 1923 }
1841} 1924}
1842 1925
1843sub cf::object::player::enter_exit { 1926sub cf::object::player::enter_exit {
1844 my ($self, $exit) = @_; 1927 my ($self, $exit) = @_;
1845 1928
1846 return unless $self->type == cf::PLAYER; 1929 return unless $self->type == cf::PLAYER;
1930
1931 if ($exit->slaying eq "/!") {
1932 #TODO: this should de-fi-ni-te-ly not be a sync-job
1933 cf::sync_job { prepare_random_map $exit };
1934 }
1935
1936 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1937 my $hp = $exit->stats->hp;
1938 my $sp = $exit->stats->sp;
1847 1939
1848 $self->enter_link; 1940 $self->enter_link;
1849 1941
1850 (async { 1942 (async {
1851 $self->deactivate_recursive; # just to be sure 1943 $self->deactivate_recursive; # just to be sure
1852 unless (eval { 1944 unless (eval {
1853 prepare_random_map $exit 1945 $self->goto ($slaying, $hp, $sp);
1854 if $exit->slaying eq "/!";
1855
1856 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1857 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1858 1946
1859 1; 1947 1;
1860 }) { 1948 }) {
1861 $self->message ("Something went wrong deep within the crossfire server. " 1949 $self->message ("Something went wrong deep within the crossfire server. "
1862 . "I'll try to bring you back to the map you were before. " 1950 . "I'll try to bring you back to the map you were before. "
… …
1923 # get handled first 2011 # get handled first
1924 my $queue = delete $ns->{query_queue} 2012 my $queue = delete $ns->{query_queue}
1925 or return; # be conservative, not sure how that can happen, but we saw a crash here 2013 or return; # be conservative, not sure how that can happen, but we saw a crash here
1926 2014
1927 (shift @$queue)->[1]->($msg); 2015 (shift @$queue)->[1]->($msg);
2016 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1928 2017
1929 push @{ $ns->{query_queue} }, @$queue; 2018 push @{ $ns->{query_queue} }, @$queue;
1930 2019
1931 if (@{ $ns->{query_queue} } == @$queue) { 2020 if (@{ $ns->{query_queue} } == @$queue) {
1932 if (@$queue) { 2021 if (@$queue) {
… …
2093The parameter C<$family> should best start with the name of the extension 2182The parameter C<$family> should best start with the name of the extension
2094using it, it should be unique. 2183using it, it should be unique.
2095 2184
2096=over 4 2185=over 4
2097 2186
2098=item $hashref = cf::db_get $family
2099
2100Return a hashref for use by the extension C<$family>, which can be
2101modified. After modifications, you have to call C<cf::db_dirty> or
2102C<cf::db_sync>.
2103
2104=item $value = cf::db_get $family => $key 2187=item $value = cf::db_get $family => $key
2105 2188
2106Returns a single value from the database 2189Returns a single value from the database.
2107
2108=item cf::db_put $family => $hashref
2109
2110Stores the given family hashref into the database. Updates are delayed, if
2111you want the data to be synced to disk immediately, use C<cf::db_sync>.
2112 2190
2113=item cf::db_put $family => $key => $value 2191=item cf::db_put $family => $key => $value
2114 2192
2115Stores the given C<$value> in the family hash. Updates are delayed, if you 2193Stores the given C<$value> in the family.
2116want the data to be synced to disk immediately, use C<cf::db_sync>.
2117
2118=item cf::db_dirty
2119
2120Marks the database as dirty, to be updated at a later time.
2121
2122=item cf::db_sync
2123
2124Immediately write the database to disk I<if it is dirty>.
2125 2194
2126=cut 2195=cut
2127 2196
2128our $DB; 2197our $DB;
2129 2198
2130{ 2199sub db_init {
2200 unless ($DB) {
2201 $DB = BDB::db_create $DB_ENV;
2202
2203 cf::sync_job {
2204 eval {
2205 $DB->set_flags (BDB::CHKSUM);
2206
2207 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2208 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2209 cf::cleanup "db_open(db): $!" if $!;
2210 };
2211 cf::cleanup "db_open(db): $@" if $@;
2212 };
2213
2131 my $path = cf::localdir . "/database.pst"; 2214 my $path = cf::localdir . "/database.pst";
2215 if (stat $path) {
2216 cf::sync_job {
2217 my $pst = Storable::retrieve $path;
2132 2218
2133 sub db_load() { 2219 cf::db_put (board => data => $pst->{board});
2134 $DB = stat $path ? Storable::retrieve $path : { }; 2220 cf::db_put (guildrules => data => $pst->{guildrules});
2135 } 2221 cf::db_put (rent => balance => $pst->{rent}{balance});
2222 BDB::db_env_txn_checkpoint $DB_ENV;
2136 2223
2137 my $pid; 2224 unlink $path;
2138
2139 sub db_save() {
2140 waitpid $pid, 0 if $pid;
2141 if (0 == ($pid = fork)) {
2142 $DB->{_meta}{version} = 1;
2143 Storable::nstore $DB, "$path~";
2144 rename "$path~", $path;
2145 cf::_exit 0 if defined $pid;
2146 } 2225 };
2147 }
2148
2149 my $dirty;
2150
2151 sub db_sync() {
2152 db_save if $dirty;
2153 undef $dirty;
2154 }
2155
2156 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2157 db_sync;
2158 });
2159
2160 sub db_dirty() {
2161 $dirty = 1;
2162 $idle->start;
2163 }
2164
2165 sub db_get($;$) {
2166 @_ >= 2
2167 ? $DB->{$_[0]}{$_[1]}
2168 : ($DB->{$_[0]} ||= { })
2169 }
2170
2171 sub db_put($$;$) {
2172 if (@_ >= 3) {
2173 $DB->{$_[0]}{$_[1]} = $_[2];
2174 } else {
2175 $DB->{$_[0]} = $_[1];
2176 }
2177 db_dirty;
2178 }
2179
2180 cf::global->attach (
2181 prio => 10000,
2182 on_cleanup => sub {
2183 db_sync;
2184 }, 2226 }
2185 ); 2227 }
2228}
2229
2230sub db_get($$) {
2231 my $key = "$_[0]/$_[1]";
2232
2233 cf::sync_job {
2234 BDB::db_get $DB, undef, $key, my $data;
2235
2236 $! ? ()
2237 : Compress::LZF::sthaw $data
2238 }
2239}
2240
2241sub db_put($$$) {
2242 BDB::dbreq_pri 4;
2243 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2186} 2244}
2187 2245
2188############################################################################# 2246#############################################################################
2189# the server's main() 2247# the server's init and main functions
2248
2249sub init_resources {
2250 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2251 or die "unable to load regions file\n";#d#
2252}
2190 2253
2191sub cfg_load { 2254sub cfg_load {
2192 open my $fh, "<:utf8", cf::confdir . "/config" 2255 open my $fh, "<:utf8", cf::confdir . "/config"
2193 or return; 2256 or return;
2194 2257
… …
2207 }; 2270 };
2208 warn $@ if $@; 2271 warn $@ if $@;
2209 } 2272 }
2210} 2273}
2211 2274
2275sub init {
2276 init_resources;
2277}
2278
2212sub main { 2279sub main {
2213 # we must not ever block the main coroutine 2280 # we must not ever block the main coroutine
2214 local $Coro::idle = sub { 2281 local $Coro::idle = sub {
2215 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2282 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2283 (async {
2216 async { Event::one_event }; 2284 Event::one_event;
2285 })->prio (Coro::PRIO_MAX);
2217 }; 2286 };
2218 2287
2219 cfg_load; 2288 cfg_load;
2220 db_load; 2289 db_init;
2221 load_extensions; 2290 load_extensions;
2291
2292 $TICK_WATCHER->start;
2222 Event::loop; 2293 Event::loop;
2223} 2294}
2224 2295
2225############################################################################# 2296#############################################################################
2226# initialisation and cleanup 2297# initialisation and cleanup
2227 2298
2228# install some emergency cleanup handlers 2299# install some emergency cleanup handlers
2229BEGIN { 2300BEGIN {
2230 for my $signal (qw(INT HUP TERM)) { 2301 for my $signal (qw(INT HUP TERM)) {
2231 Event->signal ( 2302 Event->signal (
2303 reentrant => 0,
2232 data => WF_AUTOCANCEL, 2304 data => WF_AUTOCANCEL,
2233 signal => $signal, 2305 signal => $signal,
2306 prio => 0,
2234 cb => sub { 2307 cb => sub {
2235 cf::cleanup "SIG$signal"; 2308 cf::cleanup "SIG$signal";
2236 }, 2309 },
2237 ); 2310 );
2238 } 2311 }
2239} 2312}
… …
2260 my $map = $cf::MAP{$path} or next; 2333 my $map = $cf::MAP{$path} or next;
2261 $map->valid or next; 2334 $map->valid or next;
2262 $map->save; 2335 $map->save;
2263 } 2336 }
2264 warn "end emergency map save\n"; 2337 warn "end emergency map save\n";
2338
2339 warn "begin emergency database checkpoint\n";
2340 BDB::db_env_txn_checkpoint $DB_ENV;
2341 warn "end emergency database checkpoint\n";
2265 }; 2342 };
2266 2343
2267 warn "leave emergency perl save\n"; 2344 warn "leave emergency perl save\n";
2345}
2346
2347sub post_cleanup {
2348 my ($make_core) = @_;
2349
2350 warn Carp::longmess "post_cleanup backtrace"
2351 if $make_core;
2268} 2352}
2269 2353
2270sub reload() { 2354sub reload() {
2271 # can/must only be called in main 2355 # can/must only be called in main
2272 if ($Coro::current != $Coro::main) { 2356 if ($Coro::current != $Coro::main) {
2273 warn "can only reload from main coroutine\n"; 2357 warn "can only reload from main coroutine";
2274 return; 2358 return;
2275 } 2359 }
2276 2360
2277 warn "reloading..."; 2361 warn "reloading...";
2278 2362
2279 warn "freezing server"; 2363 warn "entering sync_job";
2280 my $guard = freeze_mainloop; 2364
2365 cf::sync_job {
2366 cf::write_runtime; # external watchdog should not bark
2281 cf::emergency_save; 2367 cf::emergency_save;
2368 cf::write_runtime; # external watchdog should not bark
2282 2369
2283 warn "sync database to disk"; 2370 warn "syncing database to disk";
2284 cf::db_sync; 2371 BDB::db_env_txn_checkpoint $DB_ENV;
2285 IO::AIO::flush;
2286 2372
2287 eval {
2288 # if anything goes wrong in here, we should simply crash as we already saved 2373 # if anything goes wrong in here, we should simply crash as we already saved
2289 2374
2290 warn "cancel all watchers"; 2375 warn "cancelling all WF_AUTOCANCEL watchers";
2291 for (Event::all_watchers) { 2376 for (Event::all_watchers) {
2292 $_->cancel if $_->data & WF_AUTOCANCEL; 2377 $_->cancel if $_->data & WF_AUTOCANCEL;
2293 } 2378 }
2294 2379
2380 warn "flushing outstanding aio requests";
2381 for (;;) {
2382 BDB::flush;
2383 IO::AIO::flush;
2384 Coro::cede;
2385 last unless IO::AIO::nreqs || BDB::nreqs;
2386 warn "iterate...";
2387 }
2388
2295 warn "cancel all extension coros"; 2389 warn "cancelling all extension coros";
2296 $_->cancel for values %EXT_CORO; 2390 $_->cancel for values %EXT_CORO;
2297 %EXT_CORO = (); 2391 %EXT_CORO = ();
2298 2392
2299 warn "remove commands"; 2393 warn "removing commands";
2300 %COMMAND = (); 2394 %COMMAND = ();
2301 2395
2302 warn "remove ext commands"; 2396 warn "removing ext commands";
2303 %EXTCMD = (); 2397 %EXTCMD = ();
2304 2398
2305 warn "unload/nuke all extensions"; 2399 warn "unloading/nuking all extensions";
2306 for my $pkg (@EXTS) { 2400 for my $pkg (@EXTS) {
2307 warn "... unloading $pkg"; 2401 warn "... unloading $pkg";
2308 2402
2309 if (my $cb = $pkg->can ("unload")) { 2403 if (my $cb = $pkg->can ("unload")) {
2310 eval { 2404 eval {
… …
2315 2409
2316 warn "... nuking $pkg"; 2410 warn "... nuking $pkg";
2317 Symbol::delete_package $pkg; 2411 Symbol::delete_package $pkg;
2318 } 2412 }
2319 2413
2320 warn "unload all perl modules loaded from $LIBDIR"; 2414 warn "unloading all perl modules loaded from $LIBDIR";
2321 while (my ($k, $v) = each %INC) { 2415 while (my ($k, $v) = each %INC) {
2322 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2416 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2323 2417
2324 warn "removing <$k>"; 2418 warn "... unloading $k";
2325 delete $INC{$k}; 2419 delete $INC{$k};
2326 2420
2327 $k =~ s/\.pm$//; 2421 $k =~ s/\.pm$//;
2328 $k =~ s/\//::/g; 2422 $k =~ s/\//::/g;
2329 2423
… …
2332 } 2426 }
2333 2427
2334 Symbol::delete_package $k; 2428 Symbol::delete_package $k;
2335 } 2429 }
2336 2430
2337 warn "get rid of safe::, as good as possible"; 2431 warn "getting rid of safe::, as good as possible";
2338 Symbol::delete_package "safe::$_" 2432 Symbol::delete_package "safe::$_"
2339 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2433 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2340 2434
2341 warn "unload cf.pm \"a bit\""; 2435 warn "unloading cf.pm \"a bit\"";
2342 delete $INC{"cf.pm"}; 2436 delete $INC{"cf.pm"};
2343 2437
2344 # don't, removes xs symbols, too, 2438 # don't, removes xs symbols, too,
2345 # and global variables created in xs 2439 # and global variables created in xs
2346 #Symbol::delete_package __PACKAGE__; 2440 #Symbol::delete_package __PACKAGE__;
2347 2441
2442 warn "unload completed, starting to reload now";
2443
2348 warn "reloading cf.pm"; 2444 warn "reloading cf.pm";
2349 require cf; 2445 require cf;
2350 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2446 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2351 2447
2352 warn "load config and database again"; 2448 warn "loading config and database again";
2353 cf::cfg_load; 2449 cf::cfg_load;
2354 cf::db_load;
2355 2450
2356 warn "load extensions"; 2451 warn "loading extensions";
2357 cf::load_extensions; 2452 cf::load_extensions;
2358 2453
2359 warn "reattach attachments to objects/players"; 2454 warn "reattaching attachments to objects/players";
2360 _global_reattach; 2455 _global_reattach;
2361 warn "reattach attachments to maps"; 2456 warn "reattaching attachments to maps";
2362 reattach $_ for values %MAP; 2457 reattach $_ for values %MAP;
2363 };
2364 2458
2365 if ($@) { 2459 warn "loading reloadable resources";
2460 init_resources;
2461
2462 warn "leaving sync_job";
2463
2464 1
2465 } or do {
2366 warn $@; 2466 warn $@;
2367 warn "error while reloading, exiting."; 2467 warn "error while reloading, exiting.";
2368 exit 1; 2468 exit 1;
2369 } 2469 };
2370 2470
2371 warn "reloaded"; 2471 warn "reloaded";
2372}; 2472};
2373 2473
2474our $RELOAD_WATCHER; # used only during reload
2475
2374register_command "reload" => sub { 2476register_command "reload" => sub {
2375 my ($who, $arg) = @_; 2477 my ($who, $arg) = @_;
2376 2478
2377 if ($who->flag (FLAG_WIZ)) { 2479 if ($who->flag (FLAG_WIZ)) {
2378 $who->message ("start of reload."); 2480 $who->message ("reloading server.");
2481
2482 # doing reload synchronously and two reloads happen back-to-back,
2483 # coro crashes during coro_state_free->destroy here.
2484
2485 $RELOAD_WATCHER ||= Event->timer (
2486 reentrant => 0,
2487 after => 0,
2488 data => WF_AUTOCANCEL,
2489 cb => sub {
2379 reload; 2490 reload;
2380 $who->message ("end of reload."); 2491 undef $RELOAD_WATCHER;
2492 },
2493 );
2381 } 2494 }
2382}; 2495};
2383 2496
2384unshift @INC, $LIBDIR; 2497unshift @INC, $LIBDIR;
2498
2499my $bug_warning = 0;
2385 2500
2386$TICK_WATCHER = Event->timer ( 2501$TICK_WATCHER = Event->timer (
2387 reentrant => 0, 2502 reentrant => 0,
2503 parked => 1,
2388 prio => 0, 2504 prio => 0,
2389 at => $NEXT_TICK || $TICK, 2505 at => $NEXT_TICK || $TICK,
2390 data => WF_AUTOCANCEL, 2506 data => WF_AUTOCANCEL,
2391 cb => sub { 2507 cb => sub {
2508 if ($Coro::current != $Coro::main) {
2509 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2510 unless ++$bug_warning > 10;
2511 return;
2512 }
2513
2392 $NOW = Event::time; 2514 $NOW = Event::time;
2393 2515
2394 cf::server_tick; # one server iteration 2516 cf::server_tick; # one server iteration
2395 $RUNTIME += $TICK; 2517 $RUNTIME += $TICK;
2396 $NEXT_TICK += $TICK; 2518 $NEXT_TICK += $TICK;
2397 2519
2520 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2521 $NEXT_RUNTIME_WRITE = $NOW + 10;
2522 Coro::async_pool {
2523 write_runtime
2524 or warn "ERROR: unable to write runtime file: $!";
2525 };
2526 }
2527
2398 $WAIT_FOR_TICK->broadcast; 2528 $WAIT_FOR_TICK->broadcast;
2399 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2529 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2530
2531# my $AFTER = Event::time;
2532# warn $AFTER - $NOW;#d#
2400 2533
2401 # if we are delayed by four ticks or more, skip them all 2534 # if we are delayed by four ticks or more, skip them all
2402 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2535 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2403 2536
2404 $TICK_WATCHER->at ($NEXT_TICK); 2537 $TICK_WATCHER->at ($NEXT_TICK);
2405 $TICK_WATCHER->start; 2538 $TICK_WATCHER->start;
2406 }, 2539 },
2407); 2540);
2408 2541
2542{
2543 BDB::max_poll_time $TICK * 0.1;
2544 $BDB_POLL_WATCHER = Event->io (
2545 reentrant => 0,
2546 fd => BDB::poll_fileno,
2547 poll => 'r',
2548 prio => 0,
2549 data => WF_AUTOCANCEL,
2550 cb => \&BDB::poll_cb,
2551 );
2552 BDB::min_parallel 8;
2553
2554 BDB::set_sync_prepare {
2555 my $status;
2556 my $current = $Coro::current;
2557 (
2558 sub {
2559 $status = $!;
2560 $current->ready; undef $current;
2561 },
2562 sub {
2563 Coro::schedule while defined $current;
2564 $! = $status;
2565 },
2566 )
2567 };
2568
2569 unless ($DB_ENV) {
2570 $DB_ENV = BDB::db_env_create;
2571
2572 cf::sync_job {
2573 eval {
2574 BDB::db_env_open
2575 $DB_ENV,
2576 $BDB_ENV_DIR,
2577 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2578 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2579 0666;
2580
2581 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2582
2583 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2584 $DB_ENV->set_lk_detect;
2585 };
2586
2587 cf::cleanup "db_env_open(db): $@" if $@;
2588 };
2589 }
2590}
2591
2592{
2593 IO::AIO::min_parallel 8;
2594
2595 undef $Coro::AIO::WATCHER;
2409IO::AIO::max_poll_time $TICK * 0.2; 2596 IO::AIO::max_poll_time $TICK * 0.1;
2410
2411$AIO_POLL_WATCHER = Event->io ( 2597 $AIO_POLL_WATCHER = Event->io (
2412 fd => IO::AIO::poll_fileno, 2598 reentrant => 0,
2413 poll => 'r',
2414 prio => 5,
2415 data => WF_AUTOCANCEL,
2416 cb => \&IO::AIO::poll_cb,
2417);
2418
2419$WRITE_RUNTIME_WATCHER = Event->timer (
2420 data => WF_AUTOCANCEL, 2599 data => WF_AUTOCANCEL,
2421 after => 0, 2600 fd => IO::AIO::poll_fileno,
2422 interval => 10, 2601 poll => 'r',
2423 cb => sub { 2602 prio => 6,
2424 (Coro::unblock_sub { 2603 cb => \&IO::AIO::poll_cb,
2425 write_runtime 2604 );
2426 or warn "ERROR: unable to write runtime file: $!"; 2605}
2427 })->();
2428 },
2429);
2430 2606
2431END { cf::emergency_save } 2607END { cf::emergency_save }
2432 2608
24331 26091
2434 2610

Diff Legend

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