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

Diff Legend

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