ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.167 by root, Sat Jan 13 23:32:43 2007 UTC vs.
Revision 1.214 by root, Wed Feb 14 00:40:05 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
… …
44our @EVENT; 48our @EVENT;
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;
53our $AIO_POLL_WATCHER;
54our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
49our $NEXT_TICK; 55our $NEXT_TICK;
50our $NOW; 56our $NOW;
57our $USE_FSYNC = 1; # use fsync to write maps - default off
58
59our $BDB_POLL_WATCHER;
60our $DB_ENV;
51 61
52our %CFG; 62our %CFG;
53 63
54our $UPTIME; $UPTIME ||= time; 64our $UPTIME; $UPTIME ||= time;
55our $RUNTIME; 65our $RUNTIME;
56 66
57our %PLAYER; # all users 67our %PLAYER; # all users
58our %MAP; # all maps 68our %MAP; # all maps
59our $LINK_MAP; # the special {link} map, which is always available 69our $LINK_MAP; # the special {link} map, which is always available
60our $RANDOM_MAPS = cf::localdir . "/random"; 70our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db";
61 72
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
64 75
65# 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 ∕
… …
78mkdir cf::localdir; 89mkdir cf::localdir;
79mkdir cf::localdir . "/" . cf::playerdir; 90mkdir cf::localdir . "/" . cf::playerdir;
80mkdir cf::localdir . "/" . cf::tmpdir; 91mkdir cf::localdir . "/" . cf::tmpdir;
81mkdir cf::localdir . "/" . cf::uniquedir; 92mkdir cf::localdir . "/" . cf::uniquedir;
82mkdir $RANDOM_MAPS; 93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
83 95
84our $EMERGENCY_POSITION; 96our $EMERGENCY_POSITION;
97
98sub cf::map::normalise;
85 99
86############################################################################# 100#############################################################################
87 101
88=head2 GLOBAL VARIABLES 102=head2 GLOBAL VARIABLES
89 103
… …
257} 271}
258 272
259sub freeze_mainloop { 273sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active; 274 return unless $TICK_WATCHER->is_active;
261 275
262 my $guard = Coro::guard { $TICK_WATCHER->start }; 276 my $guard = Coro::guard {
277 $TICK_WATCHER->start;
278 };
263 $TICK_WATCHER->stop; 279 $TICK_WATCHER->stop;
264 $guard 280 $guard
265} 281}
266 282
267=item cf::async { BLOCK } 283=item cf::async { BLOCK }
… …
338 354
339 $coro 355 $coro
340} 356}
341 357
342sub write_runtime { 358sub write_runtime {
343 return unless $TICK_WATCHER->is_active;
344
345 my $runtime = cf::localdir . "/runtime"; 359 my $runtime = cf::localdir . "/runtime";
346 360
347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
348 or return; 362 or return;
349 363
364 my $value = $cf::RUNTIME + 90 + 10;
350 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 365 # 10 is the runtime save interval, for a monotonic clock
366 # 60 allows for the watchdog to kill the server.
367
351 (aio_write $fh, 0, (length $value), $value, 0) <= 0 368 (aio_write $fh, 0, (length $value), $value, 0) <= 0
352 and return; 369 and return;
353 370
371 # always fsync - this file is important
354 aio_fsync $fh 372 aio_fsync $fh
355 and return; 373 and return;
356 374
357 close $fh 375 close $fh
358 or return; 376 or return;
… …
499our @CB_TYPE = (); # registry for type (cf-object class) based events 517our @CB_TYPE = (); # registry for type (cf-object class) based events
500our @CB_MAP = (); 518our @CB_MAP = ();
501 519
502my %attachment; 520my %attachment;
503 521
522sub cf::attachable::thawer_merge {
523 # simply override everything except _meta
524 local $_[0]{_meta};
525 %{$_[0]} = %{$_[1]};
526}
527
504sub _attach_cb($$$$) { 528sub _attach_cb($$$$) {
505 my ($registry, $event, $prio, $cb) = @_; 529 my ($registry, $event, $prio, $cb) = @_;
506 530
507 use sort 'stable'; 531 use sort 'stable';
508 532
… …
679# object support 703# object support
680 704
681sub reattach { 705sub reattach {
682 # basically do the same as instantiate, without calling instantiate 706 # basically do the same as instantiate, without calling instantiate
683 my ($obj) = @_; 707 my ($obj) = @_;
708
709 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
684 710
685 my $registry = $obj->registry; 711 my $registry = $obj->registry;
686 712
687 @$registry = (); 713 @$registry = ();
688 714
… …
735 $filename, length $$rdata, scalar @$objs; 761 $filename, length $$rdata, scalar @$objs;
736 762
737 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 763 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
738 chmod SAVE_MODE, $fh; 764 chmod SAVE_MODE, $fh;
739 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 765 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
740 aio_fsync $fh; 766 aio_fsync $fh if $cf::USE_FSYNC;
741 close $fh; 767 close $fh;
742 768
743 if (@$objs) { 769 if (@$objs) {
744 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 770 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
745 chmod SAVE_MODE, $fh; 771 chmod SAVE_MODE, $fh;
746 my $data = Storable::nfreeze { version => 1, objs => $objs }; 772 my $data = Storable::nfreeze { version => 1, objs => $objs };
747 aio_write $fh, 0, (length $data), $data, 0; 773 aio_write $fh, 0, (length $data), $data, 0;
748 aio_fsync $fh; 774 aio_fsync $fh if $cf::USE_FSYNC;
749 close $fh; 775 close $fh;
750 aio_rename "$filename.pst~", "$filename.pst"; 776 aio_rename "$filename.pst~", "$filename.pst";
751 } 777 }
752 } else { 778 } else {
753 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
… …
759 } 785 }
760 } else { 786 } else {
761 aio_unlink $filename; 787 aio_unlink $filename;
762 aio_unlink "$filename.pst"; 788 aio_unlink "$filename.pst";
763 } 789 }
790
791 #d##TODO# nuke non .map-files if exist
792 if ($filename =~ s/\.map$//) {
793 aio_unlink $filename;
794 aio_unlink "$filename.pst";
795 }
764 } 796 }
765} 797}
766 798
767sub object_freezer_as_string { 799sub object_freezer_as_string {
768 my ($rdata, $objs) = @_; 800 my ($rdata, $objs) = @_;
… …
774 806
775sub object_thawer_load { 807sub object_thawer_load {
776 my ($filename) = @_; 808 my ($filename) = @_;
777 809
778 my ($data, $av); 810 my ($data, $av);
811
812 #d#TODO remove .map if file does not exist
813 aio_stat $filename and $filename =~ s/\.map$//;
779 814
780 (aio_load $filename, $data) >= 0 815 (aio_load $filename, $data) >= 0
781 or return; 816 or return;
782 817
783 unless (aio_stat "$filename.pst") { 818 unless (aio_stat "$filename.pst") {
… …
945 980
946sub exists($) { 981sub exists($) {
947 my ($login) = @_; 982 my ($login) = @_;
948 983
949 $cf::PLAYER{$login} 984 $cf::PLAYER{$login}
950 or cf::sync_job { !aio_stat $login } 985 or cf::sync_job { !aio_stat path $login }
951} 986}
952 987
953sub find($) { 988sub find($) {
954 return $cf::PLAYER{$_[0]} || do { 989 return $cf::PLAYER{$_[0]} || do {
955 my $login = $_[0]; 990 my $login = $_[0];
… …
1053=cut 1088=cut
1054 1089
1055sub maps($) { 1090sub maps($) {
1056 my ($pl) = @_; 1091 my ($pl) = @_;
1057 1092
1093 $pl = ref $pl ? $pl->ob->name : $pl;
1094
1058 my $files = aio_readdir playerdir $pl 1095 my $files = aio_readdir playerdir $pl
1059 or return; 1096 or return;
1060 1097
1061 my @paths; 1098 my @paths;
1062 1099
1063 for (@$files) { 1100 for (@$files) {
1064 utf8::decode $_; 1101 utf8::decode $_;
1065 next if /\.(?:pl|pst)$/; 1102 next if /\.(?:pl|pst)$/;
1066 next unless /^$PATH_SEP/o; 1103 next unless /^$PATH_SEP/o;
1067 1104
1068 s/\.map$//; 1105 push @paths, cf::map::normalise "~$pl/$_";
1069 push @paths, "~" . $pl->ob->name . "/" . $_;
1070 } 1106 }
1071 1107
1072 \@paths 1108 \@paths
1073} 1109}
1074 1110
… …
1101 1137
1102use Fcntl; 1138use Fcntl;
1103use Coro::AIO; 1139use Coro::AIO;
1104 1140
1105use overload 1141use overload
1106 '""' => \&as_string; 1142 '""' => \&as_string,
1143 fallback => 1;
1107 1144
1108our $MAX_RESET = 3600; 1145our $MAX_RESET = 3600;
1109our $DEFAULT_RESET = 3000; 1146our $DEFAULT_RESET = 3000;
1110 1147
1111sub generate_random_map { 1148sub generate_random_map {
1112 my ($self, $rmp) = @_; 1149 my ($self, $rmp) = @_;
1113
1114 # mit "rum" bekleckern, nicht 1150 # mit "rum" bekleckern, nicht
1115 $self->_create_random_map ( 1151 $self->_create_random_map (
1116 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1152 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1117 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1153 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1118 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1154 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1125 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1161 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1126 (cf::region::find $rmp->{region}), $rmp->{custom} 1162 (cf::region::find $rmp->{region}), $rmp->{custom}
1127 ) 1163 )
1128} 1164}
1129 1165
1166=item cf::map->register ($regex, $prio)
1167
1168Register a handler for the map path matching the given regex at the
1169givne priority (higher is better, built-in handlers have priority 0, the
1170default).
1171
1172=cut
1173
1130sub register { 1174sub register {
1131 my (undef, $regex) = @_; 1175 my (undef, $regex, $prio) = @_;
1132 my $pkg = caller; 1176 my $pkg = caller;
1133 1177
1134 no strict; 1178 no strict;
1135 push @{"$pkg\::ISA"}, __PACKAGE__; 1179 push @{"$pkg\::ISA"}, __PACKAGE__;
1136 1180
1137 $EXT_MAP{$pkg} = qr<$regex>; 1181 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1138} 1182}
1139 1183
1140# also paths starting with '/' 1184# also paths starting with '/'
1141$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1185$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1186
1187sub thawer_merge {
1188 my ($self, $merge) = @_;
1189
1190 # we have to keep some variables in memory intact
1191 local $self->{path};
1192 local $self->{load_path};
1193 local $self->{deny_save};
1194 local $self->{deny_reset};
1195
1196 $self->SUPER::thawer_merge ($merge);
1197}
1142 1198
1143sub normalise { 1199sub normalise {
1144 my ($path, $base) = @_; 1200 my ($path, $base) = @_;
1201
1202 $path = "$path"; # make sure its a string
1203
1204 $path =~ s/\.map$//;
1145 1205
1146 # map plan: 1206 # map plan:
1147 # 1207 #
1148 # /! non-realised random map exit (special hack!) 1208 # /! non-realised random map exit (special hack!)
1149 # {... are special paths that are not being touched 1209 # {... are special paths that are not being touched
… …
1177 1237
1178 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1238 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1179 1239
1180 $path = normalise $path, $base; 1240 $path = normalise $path, $base;
1181 1241
1182 for my $pkg (keys %EXT_MAP) { 1242 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1183 if ($path =~ $EXT_MAP{$pkg}) { 1243 if ($path =~ $EXT_MAP{$pkg}[1]) {
1184 my $self = bless cf::map::new, $pkg; 1244 my $self = bless cf::map::new, $pkg;
1185 $self->{path} = $path; $self->path ($path); 1245 $self->{path} = $path; $self->path ($path);
1186 $self->init; # pass $1 etc. 1246 $self->init; # pass $1 etc.
1187 return $self; 1247 return $self;
1188 } 1248 }
1189 } 1249 }
1190 1250
1191 Carp::carp "unable to resolve path '$path'."; 1251 Carp::carp "unable to resolve path '$path' (base '$base').";
1192 () 1252 ()
1193} 1253}
1194 1254
1195sub init { 1255sub init {
1196 my ($self) = @_; 1256 my ($self) = @_;
… …
1211 1271
1212# the original (read-only) location 1272# the original (read-only) location
1213sub load_path { 1273sub load_path {
1214 my ($self) = @_; 1274 my ($self) = @_;
1215 1275
1216 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1276 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1217} 1277}
1218 1278
1219# the temporary/swap location 1279# the temporary/swap location
1220sub save_path { 1280sub save_path {
1221 my ($self) = @_; 1281 my ($self) = @_;
1222 1282
1223 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1283 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1224 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1284 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1225} 1285}
1226 1286
1227# the unique path, undef == no special unique path 1287# the unique path, undef == no special unique path
1228sub uniq_path { 1288sub uniq_path {
1229 my ($self) = @_; 1289 my ($self) = @_;
… …
1243 1303
1244sub unlink_save { 1304sub unlink_save {
1245 my ($self) = @_; 1305 my ($self) = @_;
1246 1306
1247 utf8::encode (my $save = $self->save_path); 1307 utf8::encode (my $save = $self->save_path);
1248 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1249 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1309 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1310
1311 #d#TODO remove .map and also nuke
1312 $save =~ s/\.map// or return;#d#
1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1314 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1250} 1315}
1251 1316
1252sub load_header_from($) { 1317sub load_header_from($) {
1253 my ($self, $path) = @_; 1318 my ($self, $path) = @_;
1254 1319
1255 utf8::encode $path; 1320 utf8::encode $path;
1256 aio_open $path, O_RDONLY, 0 1321 #aio_open $path, O_RDONLY, 0
1257 or return; 1322 # or return;
1258 1323
1259 $self->_load_header ($path) 1324 $self->_load_header ($path)
1260 or return; 1325 or return;
1261 1326
1262 $self->{load_path} = $path; 1327 $self->{load_path} = $path;
1263 1328
1264 1 1329 1
1265} 1330}
1266 1331
1267sub load_orig { 1332sub load_header_orig {
1268 my ($self) = @_; 1333 my ($self) = @_;
1269 1334
1270 $self->load_header_from ($self->load_path) 1335 $self->load_header_from ($self->load_path)
1271} 1336}
1272 1337
1273sub load_temp { 1338sub load_header_temp {
1274 my ($self) = @_; 1339 my ($self) = @_;
1275 1340
1276 $self->load_header_from ($self->save_path) 1341 $self->load_header_from ($self->save_path)
1342}
1343
1344sub prepare_temp {
1345 my ($self) = @_;
1346
1347 $self->last_access ((delete $self->{last_access})
1348 || $cf::RUNTIME); #d#
1349 # safety
1350 $self->{instantiate_time} = $cf::RUNTIME
1351 if $self->{instantiate_time} > $cf::RUNTIME;
1352}
1353
1354sub prepare_orig {
1355 my ($self) = @_;
1356
1357 $self->{load_original} = 1;
1358 $self->{instantiate_time} = $cf::RUNTIME;
1359 $self->last_access ($cf::RUNTIME);
1360 $self->instantiate;
1277} 1361}
1278 1362
1279sub load_header { 1363sub load_header {
1280 my ($self) = @_; 1364 my ($self) = @_;
1281 1365
1282 if ($self->load_temp) { 1366 if ($self->load_header_temp) {
1283 $self->last_access ((delete $self->{last_access}) 1367 $self->prepare_temp;
1284 || $cf::RUNTIME); #d#
1285 # safety
1286 $self->{instantiate_time} = $cf::RUNTIME
1287 if $self->{instantiate_time} > $cf::RUNTIME;
1288 } else { 1368 } else {
1289 $self->load_orig 1369 $self->load_header_orig
1290 or return; 1370 or return;
1291 1371 $self->prepare_orig;
1292 $self->{load_original} = 1;
1293 $self->{instantiate_time} = $cf::RUNTIME;
1294 $self->last_access ($cf::RUNTIME);
1295 $self->instantiate;
1296 } 1372 }
1297 1373
1298 1 1374 1
1299} 1375}
1300 1376
… …
1314 $map->{last_save} = $cf::RUNTIME; 1390 $map->{last_save} = $cf::RUNTIME;
1315 1391
1316 $map->load_header 1392 $map->load_header
1317 or return; 1393 or return;
1318 1394
1319 if ($map->should_reset) { 1395 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1396 # doing this can freeze the server in a sync job, obviously
1397 #$cf::WAIT_FOR_TICK->wait;
1320 $map->reset; 1398 $map->reset;
1321 undef $guard; 1399 undef $guard;
1322 $map = find $path 1400 return find $path;
1323 or return;
1324 } 1401 }
1325 1402
1326 $cf::MAP{$path} = $map 1403 $cf::MAP{$path} = $map
1327 } 1404 }
1328} 1405}
1406
1407sub pre_load { }
1408sub post_load { }
1329 1409
1330sub load { 1410sub load {
1331 my ($self) = @_; 1411 my ($self) = @_;
1332 1412
1413 local $self->{deny_reset} = 1; # loading can take a long time
1414
1333 my $path = $self->{path}; 1415 my $path = $self->{path};
1334 my $guard = cf::lock_acquire "map_load:$path"; 1416 my $guard = cf::lock_acquire "map_load:$path";
1335 1417
1336 return if $self->in_memory != cf::MAP_SWAPPED; 1418 return if $self->in_memory != cf::MAP_SWAPPED;
1337 1419
1338 $self->in_memory (cf::MAP_LOADING); 1420 $self->in_memory (cf::MAP_LOADING);
1339 1421
1340 $self->alloc; 1422 $self->alloc;
1423
1424 $self->pre_load;
1425
1341 $self->_load_objects ($self->{load_path}, 1) 1426 $self->_load_objects ($self->{load_path}, 1)
1342 or return; 1427 or return;
1343 1428
1344 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1429 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1345 if delete $self->{load_original}; 1430 if delete $self->{load_original};
… …
1367 unless $self->difficulty; 1452 unless $self->difficulty;
1368 Coro::cede; 1453 Coro::cede;
1369 $self->activate; 1454 $self->activate;
1370 } 1455 }
1371 1456
1457 $self->post_load;
1458
1372 $self->in_memory (cf::MAP_IN_MEMORY); 1459 $self->in_memory (cf::MAP_IN_MEMORY);
1373} 1460}
1374 1461
1375sub customise_for { 1462sub customise_for {
1376 my ($self, $ob) = @_; 1463 my ($self, $ob) = @_;
… …
1416 1503
1417 cf::sync_job { $map->load }; 1504 cf::sync_job { $map->load };
1418} 1505}
1419 1506
1420our %MAP_PREFETCH; 1507our %MAP_PREFETCH;
1421our $MAP_PREFETCHER = Coro::async { 1508our $MAP_PREFETCHER = undef;
1422 while () {
1423 for my $path (keys %MAP_PREFETCH) {
1424 my $map = find $path
1425 or next;
1426 $map->load;
1427
1428 delete $MAP_PREFETCH{$path};
1429 }
1430 Coro::schedule;
1431 }
1432};
1433 1509
1434sub find_async { 1510sub find_async {
1435 my ($path, $origin) = @_; 1511 my ($path, $origin) = @_;
1436 1512
1437 $path = normalise $path, $origin && $origin->{path}; 1513 $path = normalise $path, $origin && $origin->{path};
1438 1514
1439 if (my $map = $cf::MAP{$path}) { 1515 if (my $map = $cf::MAP{$path}) {
1440 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1516 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1441 } 1517 }
1442 1518
1443 $MAP_PREFETCH{$path} = 0; 1519 undef $MAP_PREFETCH{$path};
1520 $MAP_PREFETCHER ||= cf::async {
1521 while (%MAP_PREFETCH) {
1522 for my $path (keys %MAP_PREFETCH) {
1523 my $map = find $path
1524 or next;
1525 $map->load;
1526
1527 delete $MAP_PREFETCH{$path};
1528 }
1529 }
1530 undef $MAP_PREFETCHER;
1531 };
1444 $MAP_PREFETCHER->ready; 1532 $MAP_PREFETCHER->prio (6);
1445 1533
1446 () 1534 ()
1447} 1535}
1448 1536
1449sub save { 1537sub save {
… …
1494 1582
1495sub reset_at { 1583sub reset_at {
1496 my ($self) = @_; 1584 my ($self) = @_;
1497 1585
1498 # TODO: safety, remove and allow resettable per-player maps 1586 # TODO: safety, remove and allow resettable per-player maps
1499 return 1e99 if $self->isa ("ext::map_per_player"); 1587 return 1e99 if $self->isa ("ext::map_per_player");#d#
1500 return 1e99 if $self->{deny_reset}; 1588 return 1e99 if $self->{deny_reset};
1501 1589
1502 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1590 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1503 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1591 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1504 1592
… …
1509 my ($self) = @_; 1597 my ($self) = @_;
1510 1598
1511 $self->reset_at <= $cf::RUNTIME 1599 $self->reset_at <= $cf::RUNTIME
1512} 1600}
1513 1601
1514sub rename {
1515 my ($self, $new_path) = @_;
1516
1517 normalise $new_path;
1518
1519 $self->unlink_save;
1520
1521 delete $cf::MAP{$self->path};
1522 $self->{path} = $new_path; $self->path ($self->{path});
1523 $cf::MAP{$self->path} = $self;
1524
1525 $self->save;
1526}
1527
1528sub reset { 1602sub reset {
1529 my ($self) = @_; 1603 my ($self) = @_;
1530 1604
1531 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1605 my $lock = cf::lock_acquire "map_data:$self->{path}";
1532 1606
1533 return if $self->players; 1607 return if $self->players;
1534 return if $self->isa ("ext::map_per_player");#d# 1608 return if $self->isa ("ext::map_per_player");#d#
1535 1609
1536 warn "resetting map ", $self->path;#d# 1610 warn "resetting map ", $self->path;#d#
1537 1611
1612 $self->in_memory (cf::MAP_SWAPPED);
1613
1614 # need to save uniques path
1615 unless ($self->{deny_save}) {
1616 my $uniq = $self->uniq_path; utf8::encode $uniq;
1617
1618 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1619 if $uniq;
1620 }
1621
1538 delete $cf::MAP{$self->path}; 1622 delete $cf::MAP{$self->path};
1539 1623
1540 $self->in_memory (cf::MAP_SWAPPED);
1541 $self->clear; 1624 $self->clear;
1542 1625
1543 $_->clear_links_to ($self) for values %cf::MAP; 1626 $_->clear_links_to ($self) for values %cf::MAP;
1544 1627
1545 $self->unlink_save; 1628 $self->unlink_save;
… …
1549my $nuke_counter = "aaaa"; 1632my $nuke_counter = "aaaa";
1550 1633
1551sub nuke { 1634sub nuke {
1552 my ($self) = @_; 1635 my ($self) = @_;
1553 1636
1637 delete $cf::MAP{$self->path};
1638
1639 $self->unlink_save;
1640
1641 bless $self, "cf::map";
1642 delete $self->{deny_reset};
1554 $self->{deny_save} = 1; 1643 $self->{deny_save} = 1;
1555 $self->reset_timeout (1); 1644 $self->reset_timeout (1);
1556 $self->rename ("{nuke}/" . ($nuke_counter++)); 1645 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1646
1647 $cf::MAP{$self->path} = $self;
1648
1557 $self->reset; # polite request, might not happen 1649 $self->reset; # polite request, might not happen
1558} 1650}
1559 1651
1560=item cf::map::unique_maps 1652=item cf::map::unique_maps
1561 1653
… …
1573 for (@$files) { 1665 for (@$files) {
1574 utf8::decode $_; 1666 utf8::decode $_;
1575 next if /\.pst$/; 1667 next if /\.pst$/;
1576 next unless /^$PATH_SEP/o; 1668 next unless /^$PATH_SEP/o;
1577 1669
1578 s/\.map$//; 1670 push @paths, cf::map::normalise $_;
1579 push @paths, $_;
1580 } 1671 }
1581 1672
1582 \@paths 1673 \@paths
1583} 1674}
1584 1675
… …
1678=cut 1769=cut
1679 1770
1680sub link_map { 1771sub link_map {
1681 unless ($LINK_MAP) { 1772 unless ($LINK_MAP) {
1682 $LINK_MAP = cf::map::find "{link}" 1773 $LINK_MAP = cf::map::find "{link}"
1683 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1774 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1684 $LINK_MAP->load; 1775 $LINK_MAP->load;
1685 } 1776 }
1686 1777
1687 $LINK_MAP 1778 $LINK_MAP
1688} 1779}
… …
1695 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1786 return if UNIVERSAL::isa $self->map, "ext::map_link";
1696 1787
1697 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1788 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1698 if $self->map; 1789 if $self->map;
1699 1790
1700 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1791 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1701} 1792}
1702 1793
1703sub cf::object::player::leave_link { 1794sub cf::object::player::leave_link {
1704 my ($self, $map, $x, $y) = @_; 1795 my ($self, $map, $x, $y) = @_;
1705 1796
… …
1772 my ($self, $path, $x, $y) = @_; 1863 my ($self, $path, $x, $y) = @_;
1773 1864
1774 $self->enter_link; 1865 $self->enter_link;
1775 1866
1776 (async { 1867 (async {
1868 my $map = eval {
1777 my $map = cf::map::find $path; 1869 my $map = cf::map::find $path;
1778 $map = $map->customise_for ($self) if $map; 1870 $map = $map->customise_for ($self) if $map;
1779 1871 $map
1780# warn "entering ", $map->path, " at ($x, $y)\n" 1872 } or
1781# if $map;
1782
1783 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1873 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1784 1874
1785 $self->leave_link ($map, $x, $y); 1875 $self->leave_link ($map, $x, $y);
1786 })->prio (1); 1876 })->prio (1);
1787} 1877}
1788 1878
… …
1792 1882
1793sub parse_random_map_params { 1883sub parse_random_map_params {
1794 my ($spec) = @_; 1884 my ($spec) = @_;
1795 1885
1796 my $rmp = { # defaults 1886 my $rmp = { # defaults
1797 xsize => 10, 1887 xsize => (cf::rndm 15, 40),
1798 ysize => 10, 1888 ysize => (cf::rndm 15, 40),
1889 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1890 #layout => string,
1799 }; 1891 };
1800 1892
1801 for (split /\n/, $spec) { 1893 for (split /\n/, $spec) {
1802 my ($k, $v) = split /\s+/, $_, 2; 1894 my ($k, $v) = split /\s+/, $_, 2;
1803 1895
… …
1807 $rmp 1899 $rmp
1808} 1900}
1809 1901
1810sub prepare_random_map { 1902sub prepare_random_map {
1811 my ($exit) = @_; 1903 my ($exit) = @_;
1904
1905 my $guard = cf::lock_acquire "exit_prepare:$exit";
1812 1906
1813 # all this does is basically replace the /! path by 1907 # all this does is basically replace the /! path by
1814 # a new random map path (?random/...) with a seed 1908 # a new random map path (?random/...) with a seed
1815 # that depends on the exit object 1909 # that depends on the exit object
1816 1910
1817 my $rmp = parse_random_map_params $exit->msg; 1911 my $rmp = parse_random_map_params $exit->msg;
1818 1912
1819 if ($exit->map) { 1913 if ($exit->map) {
1820 $rmp->{region} = $exit->map->region_name; 1914 $rmp->{region} = $exit->region->name;
1821 $rmp->{origin_map} = $exit->map->path; 1915 $rmp->{origin_map} = $exit->map->path;
1822 $rmp->{origin_x} = $exit->x; 1916 $rmp->{origin_x} = $exit->x;
1823 $rmp->{origin_y} = $exit->y; 1917 $rmp->{origin_y} = $exit->y;
1824 } 1918 }
1825 1919
1826 $rmp->{random_seed} ||= $exit->random_seed; 1920 $rmp->{random_seed} ||= $exit->random_seed;
1827 1921
1828 my $data = cf::to_json $rmp; 1922 my $data = cf::to_json $rmp;
1829 my $md5 = Digest::MD5::md5_hex $data; 1923 my $md5 = Digest::MD5::md5_hex $data;
1924 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1830 1925
1831 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1926 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1832 aio_write $fh, 0, (length $data), $data, 0; 1927 aio_write $fh, 0, (length $data), $data, 0;
1928 undef $fh;
1929 aio_rename "$meta~", $meta;
1833 1930
1834 $exit->slaying ("?random/$md5"); 1931 $exit->slaying ("?random/$md5");
1835 $exit->msg (undef); 1932 $exit->msg (undef);
1836 } 1933 }
1837} 1934}
1838 1935
1839sub cf::object::player::enter_exit { 1936sub cf::object::player::enter_exit {
1840 my ($self, $exit) = @_; 1937 my ($self, $exit) = @_;
1841 1938
1842 return unless $self->type == cf::PLAYER; 1939 return unless $self->type == cf::PLAYER;
1940
1941 if ($exit->slaying eq "/!") {
1942 #TODO: this should de-fi-ni-te-ly not be a sync-job
1943 cf::sync_job { prepare_random_map $exit };
1944 }
1945
1946 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1947 my $hp = $exit->stats->hp;
1948 my $sp = $exit->stats->sp;
1843 1949
1844 $self->enter_link; 1950 $self->enter_link;
1845 1951
1846 (async { 1952 (async {
1847 $self->deactivate_recursive; # just to be sure 1953 $self->deactivate_recursive; # just to be sure
1848 unless (eval { 1954 unless (eval {
1849 prepare_random_map $exit 1955 $self->goto ($slaying, $hp, $sp);
1850 if $exit->slaying eq "/!";
1851
1852 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1853 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1854 1956
1855 1; 1957 1;
1856 }) { 1958 }) {
1857 $self->message ("Something went wrong deep within the crossfire server. " 1959 $self->message ("Something went wrong deep within the crossfire server. "
1858 . "I'll try to bring you back to the map you were before. " 1960 . "I'll try to bring you back to the map you were before. "
… …
1919 # get handled first 2021 # get handled first
1920 my $queue = delete $ns->{query_queue} 2022 my $queue = delete $ns->{query_queue}
1921 or return; # be conservative, not sure how that can happen, but we saw a crash here 2023 or return; # be conservative, not sure how that can happen, but we saw a crash here
1922 2024
1923 (shift @$queue)->[1]->($msg); 2025 (shift @$queue)->[1]->($msg);
2026 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1924 2027
1925 push @{ $ns->{query_queue} }, @$queue; 2028 push @{ $ns->{query_queue} }, @$queue;
1926 2029
1927 if (@{ $ns->{query_queue} } == @$queue) { 2030 if (@{ $ns->{query_queue} } == @$queue) {
1928 if (@$queue) { 2031 if (@$queue) {
… …
2089The parameter C<$family> should best start with the name of the extension 2192The parameter C<$family> should best start with the name of the extension
2090using it, it should be unique. 2193using it, it should be unique.
2091 2194
2092=over 4 2195=over 4
2093 2196
2094=item $hashref = cf::db_get $family
2095
2096Return a hashref for use by the extension C<$family>, which can be
2097modified. After modifications, you have to call C<cf::db_dirty> or
2098C<cf::db_sync>.
2099
2100=item $value = cf::db_get $family => $key 2197=item $value = cf::db_get $family => $key
2101 2198
2102Returns a single value from the database 2199Returns a single value from the database.
2103
2104=item cf::db_put $family => $hashref
2105
2106Stores the given family hashref into the database. Updates are delayed, if
2107you want the data to be synced to disk immediately, use C<cf::db_sync>.
2108 2200
2109=item cf::db_put $family => $key => $value 2201=item cf::db_put $family => $key => $value
2110 2202
2111Stores the given C<$value> in the family hash. Updates are delayed, if you 2203Stores the given C<$value> in the family.
2112want the data to be synced to disk immediately, use C<cf::db_sync>.
2113
2114=item cf::db_dirty
2115
2116Marks the database as dirty, to be updated at a later time.
2117
2118=item cf::db_sync
2119
2120Immediately write the database to disk I<if it is dirty>.
2121 2204
2122=cut 2205=cut
2123 2206
2124our $DB; 2207our $DB;
2125 2208
2126{ 2209sub db_init {
2210 unless ($DB) {
2211 $DB = BDB::db_create $DB_ENV;
2212
2213 cf::sync_job {
2214 eval {
2215 $DB->set_flags (BDB::CHKSUM);
2216
2217 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2218 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2219 cf::cleanup "db_open(db): $!" if $!;
2220 };
2221 cf::cleanup "db_open(db): $@" if $@;
2222 };
2223
2127 my $path = cf::localdir . "/database.pst"; 2224 my $path = cf::localdir . "/database.pst";
2225 if (stat $path) {
2226 cf::sync_job {
2227 my $pst = Storable::retrieve $path;
2128 2228
2129 sub db_load() { 2229 cf::db_put (board => data => $pst->{board});
2130 $DB = stat $path ? Storable::retrieve $path : { }; 2230 cf::db_put (guildrules => data => $pst->{guildrules});
2131 } 2231 cf::db_put (rent => balance => $pst->{rent}{balance});
2232 BDB::db_env_txn_checkpoint $DB_ENV;
2132 2233
2133 my $pid; 2234 unlink $path;
2134
2135 sub db_save() {
2136 waitpid $pid, 0 if $pid;
2137 if (0 == ($pid = fork)) {
2138 $DB->{_meta}{version} = 1;
2139 Storable::nstore $DB, "$path~";
2140 rename "$path~", $path;
2141 cf::_exit 0 if defined $pid;
2142 } 2235 };
2143 }
2144
2145 my $dirty;
2146
2147 sub db_sync() {
2148 db_save if $dirty;
2149 undef $dirty;
2150 }
2151
2152 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2153 db_sync;
2154 });
2155
2156 sub db_dirty() {
2157 $dirty = 1;
2158 $idle->start;
2159 }
2160
2161 sub db_get($;$) {
2162 @_ >= 2
2163 ? $DB->{$_[0]}{$_[1]}
2164 : ($DB->{$_[0]} ||= { })
2165 }
2166
2167 sub db_put($$;$) {
2168 if (@_ >= 3) {
2169 $DB->{$_[0]}{$_[1]} = $_[2];
2170 } else {
2171 $DB->{$_[0]} = $_[1];
2172 }
2173 db_dirty;
2174 }
2175
2176 cf::global->attach (
2177 prio => 10000,
2178 on_cleanup => sub {
2179 db_sync;
2180 }, 2236 }
2181 ); 2237 }
2238}
2239
2240sub db_get($$) {
2241 my $key = "$_[0]/$_[1]";
2242
2243 cf::sync_job {
2244 BDB::db_get $DB, undef, $key, my $data;
2245
2246 $! ? ()
2247 : Compress::LZF::sthaw $data
2248 }
2249}
2250
2251sub db_put($$$) {
2252 BDB::dbreq_pri 4;
2253 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2182} 2254}
2183 2255
2184############################################################################# 2256#############################################################################
2185# the server's main() 2257# the server's init and main functions
2258
2259sub load_resources {
2260 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2261 or die "unable to load regions file\n";#d#
2262}
2186 2263
2187sub cfg_load { 2264sub cfg_load {
2188 open my $fh, "<:utf8", cf::confdir . "/config" 2265 open my $fh, "<:utf8", cf::confdir . "/config"
2189 or return; 2266 or return;
2190 2267
… …
2203 }; 2280 };
2204 warn $@ if $@; 2281 warn $@ if $@;
2205 } 2282 }
2206} 2283}
2207 2284
2285sub init {
2286 load_resources;
2287}
2288
2208sub main { 2289sub main {
2209 # we must not ever block the main coroutine 2290 # we must not ever block the main coroutine
2210 local $Coro::idle = sub { 2291 local $Coro::idle = sub {
2211 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2292 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2293 (async {
2212 async { Event::one_event }; 2294 Event::one_event;
2295 })->prio (Coro::PRIO_MAX);
2213 }; 2296 };
2214 2297
2215 cfg_load; 2298 cfg_load;
2216 db_load; 2299 db_init;
2217 load_extensions; 2300 load_extensions;
2301
2302 $TICK_WATCHER->start;
2218 Event::loop; 2303 Event::loop;
2219} 2304}
2220 2305
2221############################################################################# 2306#############################################################################
2222# initialisation and cleanup 2307# initialisation and cleanup
2223 2308
2224# install some emergency cleanup handlers 2309# install some emergency cleanup handlers
2225BEGIN { 2310BEGIN {
2226 for my $signal (qw(INT HUP TERM)) { 2311 for my $signal (qw(INT HUP TERM)) {
2227 Event->signal ( 2312 Event->signal (
2313 reentrant => 0,
2228 data => WF_AUTOCANCEL, 2314 data => WF_AUTOCANCEL,
2229 signal => $signal, 2315 signal => $signal,
2316 prio => 0,
2230 cb => sub { 2317 cb => sub {
2231 cf::cleanup "SIG$signal"; 2318 cf::cleanup "SIG$signal";
2232 }, 2319 },
2233 ); 2320 );
2234 } 2321 }
2235} 2322}
… …
2256 my $map = $cf::MAP{$path} or next; 2343 my $map = $cf::MAP{$path} or next;
2257 $map->valid or next; 2344 $map->valid or next;
2258 $map->save; 2345 $map->save;
2259 } 2346 }
2260 warn "end emergency map save\n"; 2347 warn "end emergency map save\n";
2348
2349 warn "begin emergency database checkpoint\n";
2350 BDB::db_env_txn_checkpoint $DB_ENV;
2351 warn "end emergency database checkpoint\n";
2261 }; 2352 };
2262 2353
2263 warn "leave emergency perl save\n"; 2354 warn "leave emergency perl save\n";
2355}
2356
2357sub post_cleanup {
2358 my ($make_core) = @_;
2359
2360 warn Carp::longmess "post_cleanup backtrace"
2361 if $make_core;
2264} 2362}
2265 2363
2266sub reload() { 2364sub reload() {
2267 # can/must only be called in main 2365 # can/must only be called in main
2268 if ($Coro::current != $Coro::main) { 2366 if ($Coro::current != $Coro::main) {
2269 warn "can only reload from main coroutine\n"; 2367 warn "can only reload from main coroutine";
2270 return; 2368 return;
2271 } 2369 }
2272 2370
2273 warn "reloading..."; 2371 warn "reloading...";
2274 2372
2275 warn "freezing server"; 2373 warn "entering sync_job";
2276 my $guard = freeze_mainloop; 2374
2375 cf::sync_job {
2376 cf::write_runtime; # external watchdog should not bark
2277 cf::emergency_save; 2377 cf::emergency_save;
2378 cf::write_runtime; # external watchdog should not bark
2278 2379
2279 warn "sync database to disk"; 2380 warn "syncing database to disk";
2280 cf::db_sync; 2381 BDB::db_env_txn_checkpoint $DB_ENV;
2281 IO::AIO::flush;
2282 2382
2283 eval {
2284 # if anything goes wrong in here, we should simply crash as we already saved 2383 # if anything goes wrong in here, we should simply crash as we already saved
2285 2384
2286 warn "cancel all watchers"; 2385 warn "cancelling all WF_AUTOCANCEL watchers";
2287 for (Event::all_watchers) { 2386 for (Event::all_watchers) {
2288 $_->cancel if $_->data & WF_AUTOCANCEL; 2387 $_->cancel if $_->data & WF_AUTOCANCEL;
2289 } 2388 }
2290 2389
2390 warn "flushing outstanding aio requests";
2391 for (;;) {
2392 BDB::flush;
2393 IO::AIO::flush;
2394 Coro::cede;
2395 last unless IO::AIO::nreqs || BDB::nreqs;
2396 warn "iterate...";
2397 }
2398
2291 warn "cancel all extension coros"; 2399 warn "cancelling all extension coros";
2292 $_->cancel for values %EXT_CORO; 2400 $_->cancel for values %EXT_CORO;
2293 %EXT_CORO = (); 2401 %EXT_CORO = ();
2294 2402
2295 warn "remove commands"; 2403 warn "removing commands";
2296 %COMMAND = (); 2404 %COMMAND = ();
2297 2405
2298 warn "remove ext commands"; 2406 warn "removing ext commands";
2299 %EXTCMD = (); 2407 %EXTCMD = ();
2300 2408
2301 warn "unload/nuke all extensions"; 2409 warn "unloading/nuking all extensions";
2302 for my $pkg (@EXTS) { 2410 for my $pkg (@EXTS) {
2303 warn "... unloading $pkg"; 2411 warn "... unloading $pkg";
2304 2412
2305 if (my $cb = $pkg->can ("unload")) { 2413 if (my $cb = $pkg->can ("unload")) {
2306 eval { 2414 eval {
… …
2311 2419
2312 warn "... nuking $pkg"; 2420 warn "... nuking $pkg";
2313 Symbol::delete_package $pkg; 2421 Symbol::delete_package $pkg;
2314 } 2422 }
2315 2423
2316 warn "unload all perl modules loaded from $LIBDIR"; 2424 warn "unloading all perl modules loaded from $LIBDIR";
2317 while (my ($k, $v) = each %INC) { 2425 while (my ($k, $v) = each %INC) {
2318 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2426 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2319 2427
2320 warn "removing <$k>"; 2428 warn "... unloading $k";
2321 delete $INC{$k}; 2429 delete $INC{$k};
2322 2430
2323 $k =~ s/\.pm$//; 2431 $k =~ s/\.pm$//;
2324 $k =~ s/\//::/g; 2432 $k =~ s/\//::/g;
2325 2433
… …
2328 } 2436 }
2329 2437
2330 Symbol::delete_package $k; 2438 Symbol::delete_package $k;
2331 } 2439 }
2332 2440
2333 warn "get rid of safe::, as good as possible"; 2441 warn "getting rid of safe::, as good as possible";
2334 Symbol::delete_package "safe::$_" 2442 Symbol::delete_package "safe::$_"
2335 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2443 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2336 2444
2337 warn "unload cf.pm \"a bit\""; 2445 warn "unloading cf.pm \"a bit\"";
2338 delete $INC{"cf.pm"}; 2446 delete $INC{"cf.pm"};
2339 2447
2340 # don't, removes xs symbols, too, 2448 # don't, removes xs symbols, too,
2341 # and global variables created in xs 2449 # and global variables created in xs
2342 #Symbol::delete_package __PACKAGE__; 2450 #Symbol::delete_package __PACKAGE__;
2343 2451
2452 warn "unload completed, starting to reload now";
2453
2344 warn "reloading cf.pm"; 2454 warn "reloading cf.pm";
2345 require cf; 2455 require cf;
2346 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2456 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2347 2457
2348 warn "load config and database again"; 2458 warn "loading config and database again";
2349 cf::cfg_load; 2459 cf::cfg_load;
2350 cf::db_load;
2351 2460
2352 warn "load extensions"; 2461 warn "loading extensions";
2353 cf::load_extensions; 2462 cf::load_extensions;
2354 2463
2355 warn "reattach attachments to objects/players"; 2464 warn "reattaching attachments to objects/players";
2356 _global_reattach; 2465 _global_reattach;
2357 warn "reattach attachments to maps"; 2466 warn "reattaching attachments to maps";
2358 reattach $_ for values %MAP; 2467 reattach $_ for values %MAP;
2359 };
2360 2468
2361 if ($@) { 2469 warn "loading reloadable resources";
2470 load_resources;
2471
2472 warn "leaving sync_job";
2473
2474 1
2475 } or do {
2362 warn $@; 2476 warn $@;
2363 warn "error while reloading, exiting."; 2477 warn "error while reloading, exiting.";
2364 exit 1; 2478 exit 1;
2365 } 2479 };
2366 2480
2367 warn "reloaded"; 2481 warn "reloaded";
2368}; 2482};
2369 2483
2484our $RELOAD_WATCHER; # used only during reload
2485
2370register_command "reload" => sub { 2486register_command "reload" => sub {
2371 my ($who, $arg) = @_; 2487 my ($who, $arg) = @_;
2372 2488
2373 if ($who->flag (FLAG_WIZ)) { 2489 if ($who->flag (FLAG_WIZ)) {
2374 $who->message ("start of reload."); 2490 $who->message ("reloading server.");
2491
2492 # doing reload synchronously and two reloads happen back-to-back,
2493 # coro crashes during coro_state_free->destroy here.
2494
2495 $RELOAD_WATCHER ||= Event->timer (
2496 reentrant => 0,
2497 after => 0,
2498 data => WF_AUTOCANCEL,
2499 cb => sub {
2375 reload; 2500 reload;
2376 $who->message ("end of reload."); 2501 undef $RELOAD_WATCHER;
2502 },
2503 );
2377 } 2504 }
2378}; 2505};
2379 2506
2380unshift @INC, $LIBDIR; 2507unshift @INC, $LIBDIR;
2508
2509my $bug_warning = 0;
2381 2510
2382$TICK_WATCHER = Event->timer ( 2511$TICK_WATCHER = Event->timer (
2383 reentrant => 0, 2512 reentrant => 0,
2513 parked => 1,
2384 prio => 0, 2514 prio => 0,
2385 at => $NEXT_TICK || $TICK, 2515 at => $NEXT_TICK || $TICK,
2386 data => WF_AUTOCANCEL, 2516 data => WF_AUTOCANCEL,
2387 cb => sub { 2517 cb => sub {
2518 if ($Coro::current != $Coro::main) {
2519 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2520 unless ++$bug_warning > 10;
2521 return;
2522 }
2523
2388 $NOW = Event::time; 2524 $NOW = Event::time;
2389 2525
2390 cf::server_tick; # one server iteration 2526 cf::server_tick; # one server iteration
2391 $RUNTIME += $TICK; 2527 $RUNTIME += $TICK;
2392 $NEXT_TICK += $TICK; 2528 $NEXT_TICK += $TICK;
2393 2529
2530 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2531 $NEXT_RUNTIME_WRITE = $NOW + 10;
2532 Coro::async_pool {
2533 write_runtime
2534 or warn "ERROR: unable to write runtime file: $!";
2535 };
2536 }
2537
2538
2394 $WAIT_FOR_TICK->broadcast; 2539 $WAIT_FOR_TICK->broadcast;
2395 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2540 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2541
2542# my $AFTER = Event::time;
2543# warn $AFTER - $NOW;#d#
2396 2544
2397 # if we are delayed by four ticks or more, skip them all 2545 # if we are delayed by four ticks or more, skip them all
2398 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2546 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2399 2547
2400 $TICK_WATCHER->at ($NEXT_TICK); 2548 $TICK_WATCHER->at ($NEXT_TICK);
2401 $TICK_WATCHER->start; 2549 $TICK_WATCHER->start;
2402 }, 2550 },
2403); 2551);
2404 2552
2553{
2405IO::AIO::max_poll_time $TICK * 0.2; 2554 BDB::max_poll_time $TICK * 0.1;
2406 2555 $BDB_POLL_WATCHER = Event->io (
2407Event->io ( 2556 reentrant => 0,
2408 fd => IO::AIO::poll_fileno, 2557 fd => BDB::poll_fileno,
2409 poll => 'r', 2558 poll => 'r',
2410 prio => 5, 2559 prio => 0,
2411 data => WF_AUTOCANCEL,
2412 cb => \&IO::AIO::poll_cb,
2413);
2414
2415Event->timer (
2416 data => WF_AUTOCANCEL, 2560 data => WF_AUTOCANCEL,
2417 after => 0, 2561 cb => \&BDB::poll_cb,
2418 interval => 10, 2562 );
2419 cb => sub { 2563 BDB::min_parallel 8;
2420 (Coro::unblock_sub { 2564
2421 write_runtime 2565 BDB::set_sync_prepare {
2422 or warn "ERROR: unable to write runtime file: $!"; 2566 my $status;
2567 my $current = $Coro::current;
2568 (
2569 sub {
2570 $status = $!;
2571 $current->ready; undef $current;
2572 },
2573 sub {
2574 Coro::schedule while defined $current;
2575 $! = $status;
2576 },
2577 )
2578 };
2579
2580 unless ($DB_ENV) {
2581 $DB_ENV = BDB::db_env_create;
2582
2583 cf::sync_job {
2584 eval {
2585 BDB::db_env_open
2586 $DB_ENV,
2587 $BDB_ENV_DIR,
2588 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2589 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2590 0666;
2591
2592 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2593
2594 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2595 $DB_ENV->set_lk_detect;
2596 };
2597
2598 cf::cleanup "db_env_open(db): $@" if $@;
2423 })->(); 2599 };
2424 }, 2600 }
2425); 2601}
2602
2603{
2604 IO::AIO::min_parallel 8;
2605
2606 undef $Coro::AIO::WATCHER;
2607 IO::AIO::max_poll_time $TICK * 0.1;
2608 $AIO_POLL_WATCHER = Event->io (
2609 reentrant => 0,
2610 data => WF_AUTOCANCEL,
2611 fd => IO::AIO::poll_fileno,
2612 poll => 'r',
2613 prio => 6,
2614 cb => \&IO::AIO::poll_cb,
2615 );
2616}
2426 2617
2427END { cf::emergency_save } 2618END { cf::emergency_save }
2428 2619
24291 26201
2430 2621

Diff Legend

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