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

Diff Legend

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