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.169 by root, Sun Jan 14 01:09:46 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
… …
45our $LIBDIR = datadir . "/ext"; 49our $LIBDIR = datadir . "/ext";
46 50
47our $TICK = MAX_TIME * 1e-6; 51our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 52our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 53our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 54our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 55our $NEXT_TICK;
52our $NOW; 56our $NOW;
57our $USE_FSYNC = 1; # use fsync to write maps - default off
58
59our $BDB_POLL_WATCHER;
60our $DB_ENV;
53 61
54our %CFG; 62our %CFG;
55 63
56our $UPTIME; $UPTIME ||= time; 64our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 65our $RUNTIME;
58 66
59our %PLAYER; # all users 67our %PLAYER; # all users
60our %MAP; # all maps 68our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 69our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 70our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db";
63 72
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 75
67# used to convert map paths into valid unix filenames by replacing / by ∕ 76# used to convert map paths into valid unix filenames by replacing / by ∕
… …
80mkdir cf::localdir; 89mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 90mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 91mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 92mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
85 95
86our $EMERGENCY_POSITION; 96our $EMERGENCY_POSITION;
97
98sub cf::map::normalise;
87 99
88############################################################################# 100#############################################################################
89 101
90=head2 GLOBAL VARIABLES 102=head2 GLOBAL VARIABLES
91 103
… …
261sub freeze_mainloop { 273sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 274 return unless $TICK_WATCHER->is_active;
263 275
264 my $guard = Coro::guard { 276 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 277 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 278 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 279 $TICK_WATCHER->stop;
270 $guard 280 $guard
271} 281}
272 282
273=item cf::async { BLOCK } 283=item cf::async { BLOCK }
… …
349 my $runtime = cf::localdir . "/runtime"; 359 my $runtime = cf::localdir . "/runtime";
350 360
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 362 or return;
353 363
364 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 365 # 10 is the runtime save interval, for a monotonic clock
366 # 60 allows for the watchdog to kill the server.
367
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 368 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 369 and return;
357 370
371 # always fsync - this file is important
358 aio_fsync $fh 372 aio_fsync $fh
359 and return; 373 and return;
360 374
361 close $fh 375 close $fh
362 or return; 376 or return;
… …
503our @CB_TYPE = (); # registry for type (cf-object class) based events 517our @CB_TYPE = (); # registry for type (cf-object class) based events
504our @CB_MAP = (); 518our @CB_MAP = ();
505 519
506my %attachment; 520my %attachment;
507 521
522sub cf::attachable::thawer_merge {
523 # simply override everything except _meta
524 local $_[0]{_meta};
525 %{$_[0]} = %{$_[1]};
526}
527
508sub _attach_cb($$$$) { 528sub _attach_cb($$$$) {
509 my ($registry, $event, $prio, $cb) = @_; 529 my ($registry, $event, $prio, $cb) = @_;
510 530
511 use sort 'stable'; 531 use sort 'stable';
512 532
… …
741 $filename, length $$rdata, scalar @$objs; 761 $filename, length $$rdata, scalar @$objs;
742 762
743 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 763 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
744 chmod SAVE_MODE, $fh; 764 chmod SAVE_MODE, $fh;
745 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 765 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
746 aio_fsync $fh; 766 aio_fsync $fh if $cf::USE_FSYNC;
747 close $fh; 767 close $fh;
748 768
749 if (@$objs) { 769 if (@$objs) {
750 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) {
751 chmod SAVE_MODE, $fh; 771 chmod SAVE_MODE, $fh;
752 my $data = Storable::nfreeze { version => 1, objs => $objs }; 772 my $data = Storable::nfreeze { version => 1, objs => $objs };
753 aio_write $fh, 0, (length $data), $data, 0; 773 aio_write $fh, 0, (length $data), $data, 0;
754 aio_fsync $fh; 774 aio_fsync $fh if $cf::USE_FSYNC;
755 close $fh; 775 close $fh;
756 aio_rename "$filename.pst~", "$filename.pst"; 776 aio_rename "$filename.pst~", "$filename.pst";
757 } 777 }
758 } else { 778 } else {
759 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
… …
765 } 785 }
766 } else { 786 } else {
767 aio_unlink $filename; 787 aio_unlink $filename;
768 aio_unlink "$filename.pst"; 788 aio_unlink "$filename.pst";
769 } 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 }
770 } 796 }
771} 797}
772 798
773sub object_freezer_as_string { 799sub object_freezer_as_string {
774 my ($rdata, $objs) = @_; 800 my ($rdata, $objs) = @_;
… …
780 806
781sub object_thawer_load { 807sub object_thawer_load {
782 my ($filename) = @_; 808 my ($filename) = @_;
783 809
784 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$//;
785 814
786 (aio_load $filename, $data) >= 0 815 (aio_load $filename, $data) >= 0
787 or return; 816 or return;
788 817
789 unless (aio_stat "$filename.pst") { 818 unless (aio_stat "$filename.pst") {
… …
951 980
952sub exists($) { 981sub exists($) {
953 my ($login) = @_; 982 my ($login) = @_;
954 983
955 $cf::PLAYER{$login} 984 $cf::PLAYER{$login}
956 or cf::sync_job { !aio_stat $login } 985 or cf::sync_job { !aio_stat path $login }
957} 986}
958 987
959sub find($) { 988sub find($) {
960 return $cf::PLAYER{$_[0]} || do { 989 return $cf::PLAYER{$_[0]} || do {
961 my $login = $_[0]; 990 my $login = $_[0];
… …
1059=cut 1088=cut
1060 1089
1061sub maps($) { 1090sub maps($) {
1062 my ($pl) = @_; 1091 my ($pl) = @_;
1063 1092
1093 $pl = ref $pl ? $pl->ob->name : $pl;
1094
1064 my $files = aio_readdir playerdir $pl 1095 my $files = aio_readdir playerdir $pl
1065 or return; 1096 or return;
1066 1097
1067 my @paths; 1098 my @paths;
1068 1099
1069 for (@$files) { 1100 for (@$files) {
1070 utf8::decode $_; 1101 utf8::decode $_;
1071 next if /\.(?:pl|pst)$/; 1102 next if /\.(?:pl|pst)$/;
1072 next unless /^$PATH_SEP/o; 1103 next unless /^$PATH_SEP/o;
1073 1104
1074 s/\.map$//; 1105 push @paths, cf::map::normalise "~$pl/$_";
1075 push @paths, "~" . $pl->ob->name . "/" . $_;
1076 } 1106 }
1077 1107
1078 \@paths 1108 \@paths
1079} 1109}
1080 1110
… …
1107 1137
1108use Fcntl; 1138use Fcntl;
1109use Coro::AIO; 1139use Coro::AIO;
1110 1140
1111use overload 1141use overload
1112 '""' => \&as_string; 1142 '""' => \&as_string,
1143 fallback => 1;
1113 1144
1114our $MAX_RESET = 3600; 1145our $MAX_RESET = 3600;
1115our $DEFAULT_RESET = 3000; 1146our $DEFAULT_RESET = 3000;
1116 1147
1117sub generate_random_map { 1148sub generate_random_map {
1118 my ($self, $rmp) = @_; 1149 my ($self, $rmp) = @_;
1119
1120 # mit "rum" bekleckern, nicht 1150 # mit "rum" bekleckern, nicht
1121 $self->_create_random_map ( 1151 $self->_create_random_map (
1122 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1152 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1123 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1153 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1124 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1154 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1131 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1161 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1132 (cf::region::find $rmp->{region}), $rmp->{custom} 1162 (cf::region::find $rmp->{region}), $rmp->{custom}
1133 ) 1163 )
1134} 1164}
1135 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
1136sub register { 1174sub register {
1137 my (undef, $regex) = @_; 1175 my (undef, $regex, $prio) = @_;
1138 my $pkg = caller; 1176 my $pkg = caller;
1139 1177
1140 no strict; 1178 no strict;
1141 push @{"$pkg\::ISA"}, __PACKAGE__; 1179 push @{"$pkg\::ISA"}, __PACKAGE__;
1142 1180
1143 $EXT_MAP{$pkg} = qr<$regex>; 1181 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1144} 1182}
1145 1183
1146# also paths starting with '/' 1184# also paths starting with '/'
1147$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}
1148 1198
1149sub normalise { 1199sub normalise {
1150 my ($path, $base) = @_; 1200 my ($path, $base) = @_;
1201
1202 $path = "$path"; # make sure its a string
1203
1204 $path =~ s/\.map$//;
1151 1205
1152 # map plan: 1206 # map plan:
1153 # 1207 #
1154 # /! non-realised random map exit (special hack!) 1208 # /! non-realised random map exit (special hack!)
1155 # {... are special paths that are not being touched 1209 # {... are special paths that are not being touched
… …
1183 1237
1184 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
1185 1239
1186 $path = normalise $path, $base; 1240 $path = normalise $path, $base;
1187 1241
1188 for my $pkg (keys %EXT_MAP) { 1242 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1189 if ($path =~ $EXT_MAP{$pkg}) { 1243 if ($path =~ $EXT_MAP{$pkg}[1]) {
1190 my $self = bless cf::map::new, $pkg; 1244 my $self = bless cf::map::new, $pkg;
1191 $self->{path} = $path; $self->path ($path); 1245 $self->{path} = $path; $self->path ($path);
1192 $self->init; # pass $1 etc. 1246 $self->init; # pass $1 etc.
1193 return $self; 1247 return $self;
1194 } 1248 }
1195 } 1249 }
1196 1250
1197 Carp::carp "unable to resolve path '$path'."; 1251 Carp::carp "unable to resolve path '$path' (base '$base').";
1198 () 1252 ()
1199} 1253}
1200 1254
1201sub init { 1255sub init {
1202 my ($self) = @_; 1256 my ($self) = @_;
… …
1217 1271
1218# the original (read-only) location 1272# the original (read-only) location
1219sub load_path { 1273sub load_path {
1220 my ($self) = @_; 1274 my ($self) = @_;
1221 1275
1222 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1276 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1223} 1277}
1224 1278
1225# the temporary/swap location 1279# the temporary/swap location
1226sub save_path { 1280sub save_path {
1227 my ($self) = @_; 1281 my ($self) = @_;
1228 1282
1229 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1283 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1230 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1284 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1231} 1285}
1232 1286
1233# the unique path, undef == no special unique path 1287# the unique path, undef == no special unique path
1234sub uniq_path { 1288sub uniq_path {
1235 my ($self) = @_; 1289 my ($self) = @_;
… …
1249 1303
1250sub unlink_save { 1304sub unlink_save {
1251 my ($self) = @_; 1305 my ($self) = @_;
1252 1306
1253 utf8::encode (my $save = $self->save_path); 1307 utf8::encode (my $save = $self->save_path);
1254 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1255 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#
1256} 1315}
1257 1316
1258sub load_header_from($) { 1317sub load_header_from($) {
1259 my ($self, $path) = @_; 1318 my ($self, $path) = @_;
1260 1319
1261 utf8::encode $path; 1320 utf8::encode $path;
1262 aio_open $path, O_RDONLY, 0 1321 #aio_open $path, O_RDONLY, 0
1263 or return; 1322 # or return;
1264 1323
1265 $self->_load_header ($path) 1324 $self->_load_header ($path)
1266 or return; 1325 or return;
1267 1326
1268 $self->{load_path} = $path; 1327 $self->{load_path} = $path;
1269 1328
1270 1 1329 1
1271} 1330}
1272 1331
1273sub load_orig { 1332sub load_header_orig {
1274 my ($self) = @_; 1333 my ($self) = @_;
1275 1334
1276 $self->load_header_from ($self->load_path) 1335 $self->load_header_from ($self->load_path)
1277} 1336}
1278 1337
1279sub load_temp { 1338sub load_header_temp {
1280 my ($self) = @_; 1339 my ($self) = @_;
1281 1340
1282 $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;
1283} 1361}
1284 1362
1285sub load_header { 1363sub load_header {
1286 my ($self) = @_; 1364 my ($self) = @_;
1287 1365
1288 if ($self->load_temp) { 1366 if ($self->load_header_temp) {
1289 $self->last_access ((delete $self->{last_access}) 1367 $self->prepare_temp;
1290 || $cf::RUNTIME); #d#
1291 # safety
1292 $self->{instantiate_time} = $cf::RUNTIME
1293 if $self->{instantiate_time} > $cf::RUNTIME;
1294 } else { 1368 } else {
1295 $self->load_orig 1369 $self->load_header_orig
1296 or return; 1370 or return;
1297 1371 $self->prepare_orig;
1298 $self->{load_original} = 1;
1299 $self->{instantiate_time} = $cf::RUNTIME;
1300 $self->last_access ($cf::RUNTIME);
1301 $self->instantiate;
1302 } 1372 }
1303 1373
1304 1 1374 1
1305} 1375}
1306 1376
… …
1320 $map->{last_save} = $cf::RUNTIME; 1390 $map->{last_save} = $cf::RUNTIME;
1321 1391
1322 $map->load_header 1392 $map->load_header
1323 or return; 1393 or return;
1324 1394
1325 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;
1326 $map->reset; 1398 $map->reset;
1327 undef $guard; 1399 undef $guard;
1328 $map = find $path 1400 return find $path;
1329 or return;
1330 } 1401 }
1331 1402
1332 $cf::MAP{$path} = $map 1403 $cf::MAP{$path} = $map
1333 } 1404 }
1334} 1405}
1406
1407sub pre_load { }
1408sub post_load { }
1335 1409
1336sub load { 1410sub load {
1337 my ($self) = @_; 1411 my ($self) = @_;
1338 1412
1413 local $self->{deny_reset} = 1; # loading can take a long time
1414
1339 my $path = $self->{path}; 1415 my $path = $self->{path};
1340 my $guard = cf::lock_acquire "map_load:$path"; 1416 my $guard = cf::lock_acquire "map_load:$path";
1341 1417
1342 return if $self->in_memory != cf::MAP_SWAPPED; 1418 return if $self->in_memory != cf::MAP_SWAPPED;
1343 1419
1344 $self->in_memory (cf::MAP_LOADING); 1420 $self->in_memory (cf::MAP_LOADING);
1345 1421
1346 $self->alloc; 1422 $self->alloc;
1423
1424 $self->pre_load;
1425
1347 $self->_load_objects ($self->{load_path}, 1) 1426 $self->_load_objects ($self->{load_path}, 1)
1348 or return; 1427 or return;
1349 1428
1350 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1429 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1351 if delete $self->{load_original}; 1430 if delete $self->{load_original};
… …
1373 unless $self->difficulty; 1452 unless $self->difficulty;
1374 Coro::cede; 1453 Coro::cede;
1375 $self->activate; 1454 $self->activate;
1376 } 1455 }
1377 1456
1457 $self->post_load;
1458
1378 $self->in_memory (cf::MAP_IN_MEMORY); 1459 $self->in_memory (cf::MAP_IN_MEMORY);
1379} 1460}
1380 1461
1381sub customise_for { 1462sub customise_for {
1382 my ($self, $ob) = @_; 1463 my ($self, $ob) = @_;
… …
1422 1503
1423 cf::sync_job { $map->load }; 1504 cf::sync_job { $map->load };
1424} 1505}
1425 1506
1426our %MAP_PREFETCH; 1507our %MAP_PREFETCH;
1427our $MAP_PREFETCHER = Coro::async { 1508our $MAP_PREFETCHER = undef;
1428 while () {
1429 for my $path (keys %MAP_PREFETCH) {
1430 my $map = find $path
1431 or next;
1432 $map->load;
1433
1434 delete $MAP_PREFETCH{$path};
1435 }
1436 Coro::schedule;
1437 }
1438};
1439 1509
1440sub find_async { 1510sub find_async {
1441 my ($path, $origin) = @_; 1511 my ($path, $origin) = @_;
1442 1512
1443 $path = normalise $path, $origin && $origin->{path}; 1513 $path = normalise $path, $origin && $origin->{path};
1444 1514
1445 if (my $map = $cf::MAP{$path}) { 1515 if (my $map = $cf::MAP{$path}) {
1446 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1516 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1447 } 1517 }
1448 1518
1449 $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 };
1450 $MAP_PREFETCHER->ready; 1532 $MAP_PREFETCHER->prio (6);
1451 1533
1452 () 1534 ()
1453} 1535}
1454 1536
1455sub save { 1537sub save {
… …
1515 my ($self) = @_; 1597 my ($self) = @_;
1516 1598
1517 $self->reset_at <= $cf::RUNTIME 1599 $self->reset_at <= $cf::RUNTIME
1518} 1600}
1519 1601
1520sub rename {
1521 my ($self, $new_path) = @_;
1522
1523 normalise $new_path;
1524
1525 $self->unlink_save;
1526
1527 delete $cf::MAP{$self->path};
1528 $self->{path} = $new_path; $self->path ($self->{path});
1529 $cf::MAP{$self->path} = $self;
1530
1531 $self->save;
1532}
1533
1534sub reset { 1602sub reset {
1535 my ($self) = @_; 1603 my ($self) = @_;
1536 1604
1537 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1605 my $lock = cf::lock_acquire "map_data:$self->{path}";
1538 1606
1539 return if $self->players; 1607 return if $self->players;
1540 return if $self->isa ("ext::map_per_player");#d# 1608 return if $self->isa ("ext::map_per_player");#d#
1541 1609
1542 warn "resetting map ", $self->path;#d# 1610 warn "resetting map ", $self->path;#d#
1543 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
1544 delete $cf::MAP{$self->path}; 1622 delete $cf::MAP{$self->path};
1545 1623
1546 $self->in_memory (cf::MAP_SWAPPED);
1547 $self->clear; 1624 $self->clear;
1548 1625
1549 $_->clear_links_to ($self) for values %cf::MAP; 1626 $_->clear_links_to ($self) for values %cf::MAP;
1550 1627
1551 $self->unlink_save; 1628 $self->unlink_save;
… …
1555my $nuke_counter = "aaaa"; 1632my $nuke_counter = "aaaa";
1556 1633
1557sub nuke { 1634sub nuke {
1558 my ($self) = @_; 1635 my ($self) = @_;
1559 1636
1637 delete $cf::MAP{$self->path};
1638
1639 $self->unlink_save;
1640
1641 bless $self, "cf::map";
1642 delete $self->{deny_reset};
1560 $self->{deny_save} = 1; 1643 $self->{deny_save} = 1;
1561 $self->reset_timeout (1); 1644 $self->reset_timeout (1);
1562 $self->rename ("{nuke}/" . ($nuke_counter++)); 1645 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1646
1647 $cf::MAP{$self->path} = $self;
1648
1563 $self->reset; # polite request, might not happen 1649 $self->reset; # polite request, might not happen
1564} 1650}
1565 1651
1566=item cf::map::unique_maps 1652=item cf::map::unique_maps
1567 1653
… …
1579 for (@$files) { 1665 for (@$files) {
1580 utf8::decode $_; 1666 utf8::decode $_;
1581 next if /\.pst$/; 1667 next if /\.pst$/;
1582 next unless /^$PATH_SEP/o; 1668 next unless /^$PATH_SEP/o;
1583 1669
1584 s/\.map$//; 1670 push @paths, cf::map::normalise $_;
1585 push @paths, $_;
1586 } 1671 }
1587 1672
1588 \@paths 1673 \@paths
1589} 1674}
1590 1675
… …
1684=cut 1769=cut
1685 1770
1686sub link_map { 1771sub link_map {
1687 unless ($LINK_MAP) { 1772 unless ($LINK_MAP) {
1688 $LINK_MAP = cf::map::find "{link}" 1773 $LINK_MAP = cf::map::find "{link}"
1689 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1774 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1690 $LINK_MAP->load; 1775 $LINK_MAP->load;
1691 } 1776 }
1692 1777
1693 $LINK_MAP 1778 $LINK_MAP
1694} 1779}
… …
1701 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1786 return if UNIVERSAL::isa $self->map, "ext::map_link";
1702 1787
1703 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1788 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1704 if $self->map; 1789 if $self->map;
1705 1790
1706 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1791 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1707} 1792}
1708 1793
1709sub cf::object::player::leave_link { 1794sub cf::object::player::leave_link {
1710 my ($self, $map, $x, $y) = @_; 1795 my ($self, $map, $x, $y) = @_;
1711 1796
… …
1778 my ($self, $path, $x, $y) = @_; 1863 my ($self, $path, $x, $y) = @_;
1779 1864
1780 $self->enter_link; 1865 $self->enter_link;
1781 1866
1782 (async { 1867 (async {
1868 my $map = eval {
1783 my $map = cf::map::find $path; 1869 my $map = cf::map::find $path;
1784 $map = $map->customise_for ($self) if $map; 1870 $map = $map->customise_for ($self) if $map;
1785 1871 $map
1786# warn "entering ", $map->path, " at ($x, $y)\n" 1872 } or
1787# if $map;
1788
1789 $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);
1790 1874
1791 $self->leave_link ($map, $x, $y); 1875 $self->leave_link ($map, $x, $y);
1792 })->prio (1); 1876 })->prio (1);
1793} 1877}
1794 1878
… …
1798 1882
1799sub parse_random_map_params { 1883sub parse_random_map_params {
1800 my ($spec) = @_; 1884 my ($spec) = @_;
1801 1885
1802 my $rmp = { # defaults 1886 my $rmp = { # defaults
1803 xsize => 10, 1887 xsize => (cf::rndm 15, 40),
1804 ysize => 10, 1888 ysize => (cf::rndm 15, 40),
1889 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1890 #layout => string,
1805 }; 1891 };
1806 1892
1807 for (split /\n/, $spec) { 1893 for (split /\n/, $spec) {
1808 my ($k, $v) = split /\s+/, $_, 2; 1894 my ($k, $v) = split /\s+/, $_, 2;
1809 1895
… …
1813 $rmp 1899 $rmp
1814} 1900}
1815 1901
1816sub prepare_random_map { 1902sub prepare_random_map {
1817 my ($exit) = @_; 1903 my ($exit) = @_;
1904
1905 my $guard = cf::lock_acquire "exit_prepare:$exit";
1818 1906
1819 # all this does is basically replace the /! path by 1907 # all this does is basically replace the /! path by
1820 # a new random map path (?random/...) with a seed 1908 # a new random map path (?random/...) with a seed
1821 # that depends on the exit object 1909 # that depends on the exit object
1822 1910
1823 my $rmp = parse_random_map_params $exit->msg; 1911 my $rmp = parse_random_map_params $exit->msg;
1824 1912
1825 if ($exit->map) { 1913 if ($exit->map) {
1826 $rmp->{region} = $exit->map->region_name; 1914 $rmp->{region} = $exit->region->name;
1827 $rmp->{origin_map} = $exit->map->path; 1915 $rmp->{origin_map} = $exit->map->path;
1828 $rmp->{origin_x} = $exit->x; 1916 $rmp->{origin_x} = $exit->x;
1829 $rmp->{origin_y} = $exit->y; 1917 $rmp->{origin_y} = $exit->y;
1830 } 1918 }
1831 1919
1832 $rmp->{random_seed} ||= $exit->random_seed; 1920 $rmp->{random_seed} ||= $exit->random_seed;
1833 1921
1834 my $data = cf::to_json $rmp; 1922 my $data = cf::to_json $rmp;
1835 my $md5 = Digest::MD5::md5_hex $data; 1923 my $md5 = Digest::MD5::md5_hex $data;
1924 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1836 1925
1837 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) {
1838 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;
1839 1930
1840 $exit->slaying ("?random/$md5"); 1931 $exit->slaying ("?random/$md5");
1841 $exit->msg (undef); 1932 $exit->msg (undef);
1842 } 1933 }
1843} 1934}
1844 1935
1845sub cf::object::player::enter_exit { 1936sub cf::object::player::enter_exit {
1846 my ($self, $exit) = @_; 1937 my ($self, $exit) = @_;
1847 1938
1848 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;
1849 1949
1850 $self->enter_link; 1950 $self->enter_link;
1851 1951
1852 (async { 1952 (async {
1853 $self->deactivate_recursive; # just to be sure 1953 $self->deactivate_recursive; # just to be sure
1854 unless (eval { 1954 unless (eval {
1855 prepare_random_map $exit 1955 $self->goto ($slaying, $hp, $sp);
1856 if $exit->slaying eq "/!";
1857
1858 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1859 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1860 1956
1861 1; 1957 1;
1862 }) { 1958 }) {
1863 $self->message ("Something went wrong deep within the crossfire server. " 1959 $self->message ("Something went wrong deep within the crossfire server. "
1864 . "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. "
… …
1925 # get handled first 2021 # get handled first
1926 my $queue = delete $ns->{query_queue} 2022 my $queue = delete $ns->{query_queue}
1927 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
1928 2024
1929 (shift @$queue)->[1]->($msg); 2025 (shift @$queue)->[1]->($msg);
2026 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1930 2027
1931 push @{ $ns->{query_queue} }, @$queue; 2028 push @{ $ns->{query_queue} }, @$queue;
1932 2029
1933 if (@{ $ns->{query_queue} } == @$queue) { 2030 if (@{ $ns->{query_queue} } == @$queue) {
1934 if (@$queue) { 2031 if (@$queue) {
… …
2095The 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
2096using it, it should be unique. 2193using it, it should be unique.
2097 2194
2098=over 4 2195=over 4
2099 2196
2100=item $hashref = cf::db_get $family
2101
2102Return a hashref for use by the extension C<$family>, which can be
2103modified. After modifications, you have to call C<cf::db_dirty> or
2104C<cf::db_sync>.
2105
2106=item $value = cf::db_get $family => $key 2197=item $value = cf::db_get $family => $key
2107 2198
2108Returns a single value from the database 2199Returns a single value from the database.
2109
2110=item cf::db_put $family => $hashref
2111
2112Stores the given family hashref into the database. Updates are delayed, if
2113you want the data to be synced to disk immediately, use C<cf::db_sync>.
2114 2200
2115=item cf::db_put $family => $key => $value 2201=item cf::db_put $family => $key => $value
2116 2202
2117Stores the given C<$value> in the family hash. Updates are delayed, if you 2203Stores the given C<$value> in the family.
2118want the data to be synced to disk immediately, use C<cf::db_sync>.
2119
2120=item cf::db_dirty
2121
2122Marks the database as dirty, to be updated at a later time.
2123
2124=item cf::db_sync
2125
2126Immediately write the database to disk I<if it is dirty>.
2127 2204
2128=cut 2205=cut
2129 2206
2130our $DB; 2207our $DB;
2131 2208
2132{ 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
2133 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;
2134 2228
2135 sub db_load() { 2229 cf::db_put (board => data => $pst->{board});
2136 $DB = stat $path ? Storable::retrieve $path : { }; 2230 cf::db_put (guildrules => data => $pst->{guildrules});
2137 } 2231 cf::db_put (rent => balance => $pst->{rent}{balance});
2232 BDB::db_env_txn_checkpoint $DB_ENV;
2138 2233
2139 my $pid; 2234 unlink $path;
2140
2141 sub db_save() {
2142 waitpid $pid, 0 if $pid;
2143 if (0 == ($pid = fork)) {
2144 $DB->{_meta}{version} = 1;
2145 Storable::nstore $DB, "$path~";
2146 rename "$path~", $path;
2147 cf::_exit 0 if defined $pid;
2148 } 2235 };
2149 }
2150
2151 my $dirty;
2152
2153 sub db_sync() {
2154 db_save if $dirty;
2155 undef $dirty;
2156 }
2157
2158 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2159 db_sync;
2160 });
2161
2162 sub db_dirty() {
2163 $dirty = 1;
2164 $idle->start;
2165 }
2166
2167 sub db_get($;$) {
2168 @_ >= 2
2169 ? $DB->{$_[0]}{$_[1]}
2170 : ($DB->{$_[0]} ||= { })
2171 }
2172
2173 sub db_put($$;$) {
2174 if (@_ >= 3) {
2175 $DB->{$_[0]}{$_[1]} = $_[2];
2176 } else {
2177 $DB->{$_[0]} = $_[1];
2178 }
2179 db_dirty;
2180 }
2181
2182 cf::global->attach (
2183 prio => 10000,
2184 on_cleanup => sub {
2185 db_sync;
2186 }, 2236 }
2187 ); 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 { };
2188} 2254}
2189 2255
2190############################################################################# 2256#############################################################################
2191# 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}
2192 2263
2193sub cfg_load { 2264sub cfg_load {
2194 open my $fh, "<:utf8", cf::confdir . "/config" 2265 open my $fh, "<:utf8", cf::confdir . "/config"
2195 or return; 2266 or return;
2196 2267
… …
2209 }; 2280 };
2210 warn $@ if $@; 2281 warn $@ if $@;
2211 } 2282 }
2212} 2283}
2213 2284
2285sub init {
2286 load_resources;
2287}
2288
2214sub main { 2289sub main {
2215 # we must not ever block the main coroutine 2290 # we must not ever block the main coroutine
2216 local $Coro::idle = sub { 2291 local $Coro::idle = sub {
2217 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 {
2218 async { Event::one_event }; 2294 Event::one_event;
2295 })->prio (Coro::PRIO_MAX);
2219 }; 2296 };
2220 2297
2221 cfg_load; 2298 cfg_load;
2222 db_load; 2299 db_init;
2223 load_extensions; 2300 load_extensions;
2301
2302 $TICK_WATCHER->start;
2224 Event::loop; 2303 Event::loop;
2225} 2304}
2226 2305
2227############################################################################# 2306#############################################################################
2228# initialisation and cleanup 2307# initialisation and cleanup
2229 2308
2230# install some emergency cleanup handlers 2309# install some emergency cleanup handlers
2231BEGIN { 2310BEGIN {
2232 for my $signal (qw(INT HUP TERM)) { 2311 for my $signal (qw(INT HUP TERM)) {
2233 Event->signal ( 2312 Event->signal (
2313 reentrant => 0,
2234 data => WF_AUTOCANCEL, 2314 data => WF_AUTOCANCEL,
2235 signal => $signal, 2315 signal => $signal,
2316 prio => 0,
2236 cb => sub { 2317 cb => sub {
2237 cf::cleanup "SIG$signal"; 2318 cf::cleanup "SIG$signal";
2238 }, 2319 },
2239 ); 2320 );
2240 } 2321 }
2241} 2322}
… …
2262 my $map = $cf::MAP{$path} or next; 2343 my $map = $cf::MAP{$path} or next;
2263 $map->valid or next; 2344 $map->valid or next;
2264 $map->save; 2345 $map->save;
2265 } 2346 }
2266 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";
2267 }; 2352 };
2268 2353
2269 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;
2270} 2362}
2271 2363
2272sub reload() { 2364sub reload() {
2273 # can/must only be called in main 2365 # can/must only be called in main
2274 if ($Coro::current != $Coro::main) { 2366 if ($Coro::current != $Coro::main) {
2275 warn "can only reload from main coroutine\n"; 2367 warn "can only reload from main coroutine";
2276 return; 2368 return;
2277 } 2369 }
2278 2370
2279 warn "reloading..."; 2371 warn "reloading...";
2280 2372
2281 warn "freezing server"; 2373 warn "entering sync_job";
2282 my $guard = freeze_mainloop; 2374
2375 cf::sync_job {
2376 cf::write_runtime; # external watchdog should not bark
2283 cf::emergency_save; 2377 cf::emergency_save;
2378 cf::write_runtime; # external watchdog should not bark
2284 2379
2285 warn "sync database to disk"; 2380 warn "syncing database to disk";
2286 cf::db_sync; 2381 BDB::db_env_txn_checkpoint $DB_ENV;
2287 IO::AIO::flush;
2288 2382
2289 eval {
2290 # 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
2291 2384
2292 warn "cancel all watchers"; 2385 warn "cancelling all WF_AUTOCANCEL watchers";
2293 for (Event::all_watchers) { 2386 for (Event::all_watchers) {
2294 $_->cancel if $_->data & WF_AUTOCANCEL; 2387 $_->cancel if $_->data & WF_AUTOCANCEL;
2295 } 2388 }
2296 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
2297 warn "cancel all extension coros"; 2399 warn "cancelling all extension coros";
2298 $_->cancel for values %EXT_CORO; 2400 $_->cancel for values %EXT_CORO;
2299 %EXT_CORO = (); 2401 %EXT_CORO = ();
2300 2402
2301 warn "remove commands"; 2403 warn "removing commands";
2302 %COMMAND = (); 2404 %COMMAND = ();
2303 2405
2304 warn "remove ext commands"; 2406 warn "removing ext commands";
2305 %EXTCMD = (); 2407 %EXTCMD = ();
2306 2408
2307 warn "unload/nuke all extensions"; 2409 warn "unloading/nuking all extensions";
2308 for my $pkg (@EXTS) { 2410 for my $pkg (@EXTS) {
2309 warn "... unloading $pkg"; 2411 warn "... unloading $pkg";
2310 2412
2311 if (my $cb = $pkg->can ("unload")) { 2413 if (my $cb = $pkg->can ("unload")) {
2312 eval { 2414 eval {
… …
2317 2419
2318 warn "... nuking $pkg"; 2420 warn "... nuking $pkg";
2319 Symbol::delete_package $pkg; 2421 Symbol::delete_package $pkg;
2320 } 2422 }
2321 2423
2322 warn "unload all perl modules loaded from $LIBDIR"; 2424 warn "unloading all perl modules loaded from $LIBDIR";
2323 while (my ($k, $v) = each %INC) { 2425 while (my ($k, $v) = each %INC) {
2324 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2426 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2325 2427
2326 warn "removing <$k>"; 2428 warn "... unloading $k";
2327 delete $INC{$k}; 2429 delete $INC{$k};
2328 2430
2329 $k =~ s/\.pm$//; 2431 $k =~ s/\.pm$//;
2330 $k =~ s/\//::/g; 2432 $k =~ s/\//::/g;
2331 2433
… …
2334 } 2436 }
2335 2437
2336 Symbol::delete_package $k; 2438 Symbol::delete_package $k;
2337 } 2439 }
2338 2440
2339 warn "get rid of safe::, as good as possible"; 2441 warn "getting rid of safe::, as good as possible";
2340 Symbol::delete_package "safe::$_" 2442 Symbol::delete_package "safe::$_"
2341 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);
2342 2444
2343 warn "unload cf.pm \"a bit\""; 2445 warn "unloading cf.pm \"a bit\"";
2344 delete $INC{"cf.pm"}; 2446 delete $INC{"cf.pm"};
2345 2447
2346 # don't, removes xs symbols, too, 2448 # don't, removes xs symbols, too,
2347 # and global variables created in xs 2449 # and global variables created in xs
2348 #Symbol::delete_package __PACKAGE__; 2450 #Symbol::delete_package __PACKAGE__;
2349 2451
2452 warn "unload completed, starting to reload now";
2453
2350 warn "reloading cf.pm"; 2454 warn "reloading cf.pm";
2351 require cf; 2455 require cf;
2352 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2456 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2353 2457
2354 warn "load config and database again"; 2458 warn "loading config and database again";
2355 cf::cfg_load; 2459 cf::cfg_load;
2356 cf::db_load;
2357 2460
2358 warn "load extensions"; 2461 warn "loading extensions";
2359 cf::load_extensions; 2462 cf::load_extensions;
2360 2463
2361 warn "reattach attachments to objects/players"; 2464 warn "reattaching attachments to objects/players";
2362 _global_reattach; 2465 _global_reattach;
2363 warn "reattach attachments to maps"; 2466 warn "reattaching attachments to maps";
2364 reattach $_ for values %MAP; 2467 reattach $_ for values %MAP;
2365 };
2366 2468
2367 if ($@) { 2469 warn "loading reloadable resources";
2470 load_resources;
2471
2472 warn "leaving sync_job";
2473
2474 1
2475 } or do {
2368 warn $@; 2476 warn $@;
2369 warn "error while reloading, exiting."; 2477 warn "error while reloading, exiting.";
2370 exit 1; 2478 exit 1;
2371 } 2479 };
2372 2480
2373 warn "reloaded"; 2481 warn "reloaded";
2374}; 2482};
2375 2483
2484our $RELOAD_WATCHER; # used only during reload
2485
2376register_command "reload" => sub { 2486register_command "reload" => sub {
2377 my ($who, $arg) = @_; 2487 my ($who, $arg) = @_;
2378 2488
2379 if ($who->flag (FLAG_WIZ)) { 2489 if ($who->flag (FLAG_WIZ)) {
2380 $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 {
2381 reload; 2500 reload;
2382 $who->message ("end of reload."); 2501 undef $RELOAD_WATCHER;
2502 },
2503 );
2383 } 2504 }
2384}; 2505};
2385 2506
2386unshift @INC, $LIBDIR; 2507unshift @INC, $LIBDIR;
2508
2509my $bug_warning = 0;
2387 2510
2388$TICK_WATCHER = Event->timer ( 2511$TICK_WATCHER = Event->timer (
2389 reentrant => 0, 2512 reentrant => 0,
2513 parked => 1,
2390 prio => 0, 2514 prio => 0,
2391 at => $NEXT_TICK || $TICK, 2515 at => $NEXT_TICK || $TICK,
2392 data => WF_AUTOCANCEL, 2516 data => WF_AUTOCANCEL,
2393 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
2394 $NOW = Event::time; 2524 $NOW = Event::time;
2395 2525
2396 cf::server_tick; # one server iteration 2526 cf::server_tick; # one server iteration
2397 $RUNTIME += $TICK; 2527 $RUNTIME += $TICK;
2398 $NEXT_TICK += $TICK; 2528 $NEXT_TICK += $TICK;
2399 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
2400 $WAIT_FOR_TICK->broadcast; 2539 $WAIT_FOR_TICK->broadcast;
2401 $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#
2402 2544
2403 # 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
2404 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2546 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2405 2547
2406 $TICK_WATCHER->at ($NEXT_TICK); 2548 $TICK_WATCHER->at ($NEXT_TICK);
2407 $TICK_WATCHER->start; 2549 $TICK_WATCHER->start;
2408 }, 2550 },
2409); 2551);
2410 2552
2553{
2554 BDB::max_poll_time $TICK * 0.1;
2555 $BDB_POLL_WATCHER = Event->io (
2556 reentrant => 0,
2557 fd => BDB::poll_fileno,
2558 poll => 'r',
2559 prio => 0,
2560 data => WF_AUTOCANCEL,
2561 cb => \&BDB::poll_cb,
2562 );
2563 BDB::min_parallel 8;
2564
2565 BDB::set_sync_prepare {
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 $@;
2599 };
2600 }
2601}
2602
2603{
2604 IO::AIO::min_parallel 8;
2605
2606 undef $Coro::AIO::WATCHER;
2411IO::AIO::max_poll_time $TICK * 0.2; 2607 IO::AIO::max_poll_time $TICK * 0.1;
2412
2413$AIO_POLL_WATCHER = Event->io ( 2608 $AIO_POLL_WATCHER = Event->io (
2414 fd => IO::AIO::poll_fileno, 2609 reentrant => 0,
2415 poll => 'r',
2416 prio => 5,
2417 data => WF_AUTOCANCEL,
2418 cb => \&IO::AIO::poll_cb,
2419);
2420
2421$WRITE_RUNTIME_WATCHER = Event->timer (
2422 data => WF_AUTOCANCEL, 2610 data => WF_AUTOCANCEL,
2423 after => 0, 2611 fd => IO::AIO::poll_fileno,
2424 interval => 10, 2612 poll => 'r',
2425 cb => sub { 2613 prio => 6,
2426 (Coro::unblock_sub { 2614 cb => \&IO::AIO::poll_cb,
2427 write_runtime 2615 );
2428 or warn "ERROR: unable to write runtime file: $!"; 2616}
2429 })->();
2430 },
2431);
2432 2617
2433END { cf::emergency_save } 2618END { cf::emergency_save }
2434 2619
24351 26201
2436 2621

Diff Legend

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