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

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.167 by root, Sat Jan 13 23:32:43 2007 UTC vs.
Revision 1.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
… …
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; 361 $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1;
344 362
345 my $runtime = cf::localdir . "/runtime"; 363 my $runtime = cf::localdir . "/runtime";
346 364
347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 365 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
348 or return; 366 or return;
349 367
368 my $value = $cf::RUNTIME + 90 + 10;
350 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
351 (aio_write $fh, 0, (length $value), $value, 0) <= 0 372 (aio_write $fh, 0, (length $value), $value, 0) <= 0
352 and return; 373 and return;
353 374
375 # always fsync - this file is important
354 aio_fsync $fh 376 aio_fsync $fh
355 and return; 377 and return;
356 378
357 close $fh 379 close $fh
358 or return; 380 or return;
… …
499our @CB_TYPE = (); # registry for type (cf-object class) based events 521our @CB_TYPE = (); # registry for type (cf-object class) based events
500our @CB_MAP = (); 522our @CB_MAP = ();
501 523
502my %attachment; 524my %attachment;
503 525
526sub cf::attachable::thawer_merge {
527 # simply override everything except _meta
528 local $_[0]{_meta};
529 %{$_[0]} = %{$_[1]};
530}
531
504sub _attach_cb($$$$) { 532sub _attach_cb($$$$) {
505 my ($registry, $event, $prio, $cb) = @_; 533 my ($registry, $event, $prio, $cb) = @_;
506 534
507 use sort 'stable'; 535 use sort 'stable';
508 536
… …
679# object support 707# object support
680 708
681sub reattach { 709sub reattach {
682 # basically do the same as instantiate, without calling instantiate 710 # basically do the same as instantiate, without calling instantiate
683 my ($obj) = @_; 711 my ($obj) = @_;
712
713 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
684 714
685 my $registry = $obj->registry; 715 my $registry = $obj->registry;
686 716
687 @$registry = (); 717 @$registry = ();
688 718
… …
735 $filename, length $$rdata, scalar @$objs; 765 $filename, length $$rdata, scalar @$objs;
736 766
737 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 767 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
738 chmod SAVE_MODE, $fh; 768 chmod SAVE_MODE, $fh;
739 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 769 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
740 aio_fsync $fh; 770 aio_fsync $fh if $cf::USE_FSYNC;
741 close $fh; 771 close $fh;
742 772
743 if (@$objs) { 773 if (@$objs) {
744 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) {
745 chmod SAVE_MODE, $fh; 775 chmod SAVE_MODE, $fh;
746 my $data = Storable::nfreeze { version => 1, objs => $objs }; 776 my $data = Storable::nfreeze { version => 1, objs => $objs };
747 aio_write $fh, 0, (length $data), $data, 0; 777 aio_write $fh, 0, (length $data), $data, 0;
748 aio_fsync $fh; 778 aio_fsync $fh if $cf::USE_FSYNC;
749 close $fh; 779 close $fh;
750 aio_rename "$filename.pst~", "$filename.pst"; 780 aio_rename "$filename.pst~", "$filename.pst";
751 } 781 }
752 } else { 782 } else {
753 aio_unlink "$filename.pst"; 783 aio_unlink "$filename.pst";
… …
759 } 789 }
760 } else { 790 } else {
761 aio_unlink $filename; 791 aio_unlink $filename;
762 aio_unlink "$filename.pst"; 792 aio_unlink "$filename.pst";
763 } 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 }
764 } 800 }
765} 801}
766 802
767sub object_freezer_as_string { 803sub object_freezer_as_string {
768 my ($rdata, $objs) = @_; 804 my ($rdata, $objs) = @_;
… …
774 810
775sub object_thawer_load { 811sub object_thawer_load {
776 my ($filename) = @_; 812 my ($filename) = @_;
777 813
778 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$//;
779 818
780 (aio_load $filename, $data) >= 0 819 (aio_load $filename, $data) >= 0
781 or return; 820 or return;
782 821
783 unless (aio_stat "$filename.pst") { 822 unless (aio_stat "$filename.pst") {
… …
945 984
946sub exists($) { 985sub exists($) {
947 my ($login) = @_; 986 my ($login) = @_;
948 987
949 $cf::PLAYER{$login} 988 $cf::PLAYER{$login}
950 or cf::sync_job { !aio_stat $login } 989 or cf::sync_job { !aio_stat path $login }
951} 990}
952 991
953sub find($) { 992sub find($) {
954 return $cf::PLAYER{$_[0]} || do { 993 return $cf::PLAYER{$_[0]} || do {
955 my $login = $_[0]; 994 my $login = $_[0];
… …
1053=cut 1092=cut
1054 1093
1055sub maps($) { 1094sub maps($) {
1056 my ($pl) = @_; 1095 my ($pl) = @_;
1057 1096
1097 $pl = ref $pl ? $pl->ob->name : $pl;
1098
1058 my $files = aio_readdir playerdir $pl 1099 my $files = aio_readdir playerdir $pl
1059 or return; 1100 or return;
1060 1101
1061 my @paths; 1102 my @paths;
1062 1103
1063 for (@$files) { 1104 for (@$files) {
1064 utf8::decode $_; 1105 utf8::decode $_;
1065 next if /\.(?:pl|pst)$/; 1106 next if /\.(?:pl|pst)$/;
1066 next unless /^$PATH_SEP/o; 1107 next unless /^$PATH_SEP/o;
1067 1108
1068 s/\.map$//; 1109 push @paths, cf::map::normalise "~$pl/$_";
1069 push @paths, "~" . $pl->ob->name . "/" . $_;
1070 } 1110 }
1071 1111
1072 \@paths 1112 \@paths
1073} 1113}
1074 1114
… …
1101 1141
1102use Fcntl; 1142use Fcntl;
1103use Coro::AIO; 1143use Coro::AIO;
1104 1144
1105use overload 1145use overload
1106 '""' => \&as_string; 1146 '""' => \&as_string,
1147 fallback => 1;
1107 1148
1108our $MAX_RESET = 3600; 1149our $MAX_RESET = 3600;
1109our $DEFAULT_RESET = 3000; 1150our $DEFAULT_RESET = 3000;
1110 1151
1111sub generate_random_map { 1152sub generate_random_map {
1112 my ($self, $rmp) = @_; 1153 my ($self, $rmp) = @_;
1113
1114 # mit "rum" bekleckern, nicht 1154 # mit "rum" bekleckern, nicht
1115 $self->_create_random_map ( 1155 $self->_create_random_map (
1116 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1156 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1117 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1157 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1118 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1158 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1125 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1165 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1126 (cf::region::find $rmp->{region}), $rmp->{custom} 1166 (cf::region::find $rmp->{region}), $rmp->{custom}
1127 ) 1167 )
1128} 1168}
1129 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
1130sub register { 1178sub register {
1131 my (undef, $regex) = @_; 1179 my (undef, $regex, $prio) = @_;
1132 my $pkg = caller; 1180 my $pkg = caller;
1133 1181
1134 no strict; 1182 no strict;
1135 push @{"$pkg\::ISA"}, __PACKAGE__; 1183 push @{"$pkg\::ISA"}, __PACKAGE__;
1136 1184
1137 $EXT_MAP{$pkg} = qr<$regex>; 1185 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1138} 1186}
1139 1187
1140# also paths starting with '/' 1188# also paths starting with '/'
1141$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}
1142 1202
1143sub normalise { 1203sub normalise {
1144 my ($path, $base) = @_; 1204 my ($path, $base) = @_;
1205
1206 $path = "$path"; # make sure its a string
1207
1208 $path =~ s/\.map$//;
1145 1209
1146 # map plan: 1210 # map plan:
1147 # 1211 #
1148 # /! non-realised random map exit (special hack!) 1212 # /! non-realised random map exit (special hack!)
1149 # {... are special paths that are not being touched 1213 # {... are special paths that are not being touched
… …
1177 1241
1178 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
1179 1243
1180 $path = normalise $path, $base; 1244 $path = normalise $path, $base;
1181 1245
1182 for my $pkg (keys %EXT_MAP) { 1246 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1183 if ($path =~ $EXT_MAP{$pkg}) { 1247 if ($path =~ $EXT_MAP{$pkg}[1]) {
1184 my $self = bless cf::map::new, $pkg; 1248 my $self = bless cf::map::new, $pkg;
1185 $self->{path} = $path; $self->path ($path); 1249 $self->{path} = $path; $self->path ($path);
1186 $self->init; # pass $1 etc. 1250 $self->init; # pass $1 etc.
1187 return $self; 1251 return $self;
1188 } 1252 }
1189 } 1253 }
1190 1254
1191 Carp::carp "unable to resolve path '$path'."; 1255 Carp::carp "unable to resolve path '$path' (base '$base').";
1192 () 1256 ()
1193} 1257}
1194 1258
1195sub init { 1259sub init {
1196 my ($self) = @_; 1260 my ($self) = @_;
… …
1211 1275
1212# the original (read-only) location 1276# the original (read-only) location
1213sub load_path { 1277sub load_path {
1214 my ($self) = @_; 1278 my ($self) = @_;
1215 1279
1216 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1280 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1217} 1281}
1218 1282
1219# the temporary/swap location 1283# the temporary/swap location
1220sub save_path { 1284sub save_path {
1221 my ($self) = @_; 1285 my ($self) = @_;
1222 1286
1223 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1287 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1224 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1288 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1225} 1289}
1226 1290
1227# the unique path, undef == no special unique path 1291# the unique path, undef == no special unique path
1228sub uniq_path { 1292sub uniq_path {
1229 my ($self) = @_; 1293 my ($self) = @_;
… …
1243 1307
1244sub unlink_save { 1308sub unlink_save {
1245 my ($self) = @_; 1309 my ($self) = @_;
1246 1310
1247 utf8::encode (my $save = $self->save_path); 1311 utf8::encode (my $save = $self->save_path);
1248 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1312 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1249 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#
1250} 1319}
1251 1320
1252sub load_header_from($) { 1321sub load_header_from($) {
1253 my ($self, $path) = @_; 1322 my ($self, $path) = @_;
1254 1323
1255 utf8::encode $path; 1324 utf8::encode $path;
1256 aio_open $path, O_RDONLY, 0 1325 #aio_open $path, O_RDONLY, 0
1257 or return; 1326 # or return;
1258 1327
1259 $self->_load_header ($path) 1328 $self->_load_header ($path)
1260 or return; 1329 or return;
1261 1330
1262 $self->{load_path} = $path; 1331 $self->{load_path} = $path;
1263 1332
1264 1 1333 1
1265} 1334}
1266 1335
1267sub load_orig { 1336sub load_header_orig {
1268 my ($self) = @_; 1337 my ($self) = @_;
1269 1338
1270 $self->load_header_from ($self->load_path) 1339 $self->load_header_from ($self->load_path)
1271} 1340}
1272 1341
1273sub load_temp { 1342sub load_header_temp {
1274 my ($self) = @_; 1343 my ($self) = @_;
1275 1344
1276 $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;
1277} 1365}
1278 1366
1279sub load_header { 1367sub load_header {
1280 my ($self) = @_; 1368 my ($self) = @_;
1281 1369
1282 if ($self->load_temp) { 1370 if ($self->load_header_temp) {
1283 $self->last_access ((delete $self->{last_access}) 1371 $self->prepare_temp;
1284 || $cf::RUNTIME); #d#
1285 # safety
1286 $self->{instantiate_time} = $cf::RUNTIME
1287 if $self->{instantiate_time} > $cf::RUNTIME;
1288 } else { 1372 } else {
1289 $self->load_orig 1373 $self->load_header_orig
1290 or return; 1374 or return;
1291 1375 $self->prepare_orig;
1292 $self->{load_original} = 1;
1293 $self->{instantiate_time} = $cf::RUNTIME;
1294 $self->last_access ($cf::RUNTIME);
1295 $self->instantiate;
1296 } 1376 }
1297 1377
1298 1 1378 1
1299} 1379}
1300 1380
… …
1314 $map->{last_save} = $cf::RUNTIME; 1394 $map->{last_save} = $cf::RUNTIME;
1315 1395
1316 $map->load_header 1396 $map->load_header
1317 or return; 1397 or return;
1318 1398
1319 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;
1320 $map->reset; 1402 $map->reset;
1321 undef $guard; 1403 undef $guard;
1322 $map = find $path 1404 return find $path;
1323 or return;
1324 } 1405 }
1325 1406
1326 $cf::MAP{$path} = $map 1407 $cf::MAP{$path} = $map
1327 } 1408 }
1328} 1409}
1410
1411sub pre_load { }
1412sub post_load { }
1329 1413
1330sub load { 1414sub load {
1331 my ($self) = @_; 1415 my ($self) = @_;
1332 1416
1417 local $self->{deny_reset} = 1; # loading can take a long time
1418
1333 my $path = $self->{path}; 1419 my $path = $self->{path};
1334 my $guard = cf::lock_acquire "map_load:$path"; 1420 my $guard = cf::lock_acquire "map_load:$path";
1335 1421
1336 return if $self->in_memory != cf::MAP_SWAPPED; 1422 return if $self->in_memory != cf::MAP_SWAPPED;
1337 1423
1338 $self->in_memory (cf::MAP_LOADING); 1424 $self->in_memory (cf::MAP_LOADING);
1339 1425
1340 $self->alloc; 1426 $self->alloc;
1427
1428 $self->pre_load;
1429
1341 $self->_load_objects ($self->{load_path}, 1) 1430 $self->_load_objects ($self->{load_path}, 1)
1342 or return; 1431 or return;
1343 1432
1344 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1433 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1345 if delete $self->{load_original}; 1434 if delete $self->{load_original};
… …
1367 unless $self->difficulty; 1456 unless $self->difficulty;
1368 Coro::cede; 1457 Coro::cede;
1369 $self->activate; 1458 $self->activate;
1370 } 1459 }
1371 1460
1461 $self->post_load;
1462
1372 $self->in_memory (cf::MAP_IN_MEMORY); 1463 $self->in_memory (cf::MAP_IN_MEMORY);
1373} 1464}
1374 1465
1375sub customise_for { 1466sub customise_for {
1376 my ($self, $ob) = @_; 1467 my ($self, $ob) = @_;
… …
1416 1507
1417 cf::sync_job { $map->load }; 1508 cf::sync_job { $map->load };
1418} 1509}
1419 1510
1420our %MAP_PREFETCH; 1511our %MAP_PREFETCH;
1421our $MAP_PREFETCHER = Coro::async { 1512our $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 1513
1434sub find_async { 1514sub find_async {
1435 my ($path, $origin) = @_; 1515 my ($path, $origin) = @_;
1436 1516
1437 $path = normalise $path, $origin && $origin->{path}; 1517 $path = normalise $path, $origin && $origin->{path};
1438 1518
1439 if (my $map = $cf::MAP{$path}) { 1519 if (my $map = $cf::MAP{$path}) {
1440 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1520 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1441 } 1521 }
1442 1522
1443 $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 };
1444 $MAP_PREFETCHER->ready; 1536 $MAP_PREFETCHER->prio (6);
1445 1537
1446 () 1538 ()
1447} 1539}
1448 1540
1449sub save { 1541sub save {
… …
1494 1586
1495sub reset_at { 1587sub reset_at {
1496 my ($self) = @_; 1588 my ($self) = @_;
1497 1589
1498 # TODO: safety, remove and allow resettable per-player maps 1590 # TODO: safety, remove and allow resettable per-player maps
1499 return 1e99 if $self->isa ("ext::map_per_player"); 1591 return 1e99 if $self->isa ("ext::map_per_player");#d#
1500 return 1e99 if $self->{deny_reset}; 1592 return 1e99 if $self->{deny_reset};
1501 1593
1502 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1594 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1503 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1595 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1504 1596
… …
1509 my ($self) = @_; 1601 my ($self) = @_;
1510 1602
1511 $self->reset_at <= $cf::RUNTIME 1603 $self->reset_at <= $cf::RUNTIME
1512} 1604}
1513 1605
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 { 1606sub reset {
1529 my ($self) = @_; 1607 my ($self) = @_;
1530 1608
1531 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1609 my $lock = cf::lock_acquire "map_data:$self->{path}";
1532 1610
1533 return if $self->players; 1611 return if $self->players;
1534 return if $self->isa ("ext::map_per_player");#d# 1612 return if $self->isa ("ext::map_per_player");#d#
1535 1613
1536 warn "resetting map ", $self->path;#d# 1614 warn "resetting map ", $self->path;#d#
1537 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
1538 delete $cf::MAP{$self->path}; 1626 delete $cf::MAP{$self->path};
1539 1627
1540 $self->in_memory (cf::MAP_SWAPPED);
1541 $self->clear; 1628 $self->clear;
1542 1629
1543 $_->clear_links_to ($self) for values %cf::MAP; 1630 $_->clear_links_to ($self) for values %cf::MAP;
1544 1631
1545 $self->unlink_save; 1632 $self->unlink_save;
… …
1549my $nuke_counter = "aaaa"; 1636my $nuke_counter = "aaaa";
1550 1637
1551sub nuke { 1638sub nuke {
1552 my ($self) = @_; 1639 my ($self) = @_;
1553 1640
1641 delete $cf::MAP{$self->path};
1642
1643 $self->unlink_save;
1644
1645 bless $self, "cf::map";
1646 delete $self->{deny_reset};
1554 $self->{deny_save} = 1; 1647 $self->{deny_save} = 1;
1555 $self->reset_timeout (1); 1648 $self->reset_timeout (1);
1556 $self->rename ("{nuke}/" . ($nuke_counter++)); 1649 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1650
1651 $cf::MAP{$self->path} = $self;
1652
1557 $self->reset; # polite request, might not happen 1653 $self->reset; # polite request, might not happen
1558} 1654}
1559 1655
1560=item cf::map::unique_maps 1656=item cf::map::unique_maps
1561 1657
… …
1573 for (@$files) { 1669 for (@$files) {
1574 utf8::decode $_; 1670 utf8::decode $_;
1575 next if /\.pst$/; 1671 next if /\.pst$/;
1576 next unless /^$PATH_SEP/o; 1672 next unless /^$PATH_SEP/o;
1577 1673
1578 s/\.map$//; 1674 push @paths, cf::map::normalise $_;
1579 push @paths, $_;
1580 } 1675 }
1581 1676
1582 \@paths 1677 \@paths
1583} 1678}
1584 1679
… …
1678=cut 1773=cut
1679 1774
1680sub link_map { 1775sub link_map {
1681 unless ($LINK_MAP) { 1776 unless ($LINK_MAP) {
1682 $LINK_MAP = cf::map::find "{link}" 1777 $LINK_MAP = cf::map::find "{link}"
1683 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1778 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1684 $LINK_MAP->load; 1779 $LINK_MAP->load;
1685 } 1780 }
1686 1781
1687 $LINK_MAP 1782 $LINK_MAP
1688} 1783}
… …
1695 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1790 return if UNIVERSAL::isa $self->map, "ext::map_link";
1696 1791
1697 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1792 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1698 if $self->map; 1793 if $self->map;
1699 1794
1700 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1795 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1701} 1796}
1702 1797
1703sub cf::object::player::leave_link { 1798sub cf::object::player::leave_link {
1704 my ($self, $map, $x, $y) = @_; 1799 my ($self, $map, $x, $y) = @_;
1705 1800
… …
1772 my ($self, $path, $x, $y) = @_; 1867 my ($self, $path, $x, $y) = @_;
1773 1868
1774 $self->enter_link; 1869 $self->enter_link;
1775 1870
1776 (async { 1871 (async {
1872 my $map = eval {
1777 my $map = cf::map::find $path; 1873 my $map = cf::map::find $path;
1778 $map = $map->customise_for ($self) if $map; 1874 $map = $map->customise_for ($self) if $map;
1779 1875 $map
1780# warn "entering ", $map->path, " at ($x, $y)\n" 1876 } or
1781# if $map;
1782
1783 $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);
1784 1878
1785 $self->leave_link ($map, $x, $y); 1879 $self->leave_link ($map, $x, $y);
1786 })->prio (1); 1880 })->prio (1);
1787} 1881}
1788 1882
… …
1792 1886
1793sub parse_random_map_params { 1887sub parse_random_map_params {
1794 my ($spec) = @_; 1888 my ($spec) = @_;
1795 1889
1796 my $rmp = { # defaults 1890 my $rmp = { # defaults
1797 xsize => 10, 1891 xsize => (cf::rndm 15, 40),
1798 ysize => 10, 1892 ysize => (cf::rndm 15, 40),
1893 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1894 #layout => string,
1799 }; 1895 };
1800 1896
1801 for (split /\n/, $spec) { 1897 for (split /\n/, $spec) {
1802 my ($k, $v) = split /\s+/, $_, 2; 1898 my ($k, $v) = split /\s+/, $_, 2;
1803 1899
… …
1807 $rmp 1903 $rmp
1808} 1904}
1809 1905
1810sub prepare_random_map { 1906sub prepare_random_map {
1811 my ($exit) = @_; 1907 my ($exit) = @_;
1908
1909 my $guard = cf::lock_acquire "exit_prepare:$exit";
1812 1910
1813 # all this does is basically replace the /! path by 1911 # all this does is basically replace the /! path by
1814 # a new random map path (?random/...) with a seed 1912 # a new random map path (?random/...) with a seed
1815 # that depends on the exit object 1913 # that depends on the exit object
1816 1914
1817 my $rmp = parse_random_map_params $exit->msg; 1915 my $rmp = parse_random_map_params $exit->msg;
1818 1916
1819 if ($exit->map) { 1917 if ($exit->map) {
1820 $rmp->{region} = $exit->map->region_name; 1918 $rmp->{region} = $exit->region->name;
1821 $rmp->{origin_map} = $exit->map->path; 1919 $rmp->{origin_map} = $exit->map->path;
1822 $rmp->{origin_x} = $exit->x; 1920 $rmp->{origin_x} = $exit->x;
1823 $rmp->{origin_y} = $exit->y; 1921 $rmp->{origin_y} = $exit->y;
1824 } 1922 }
1825 1923
1826 $rmp->{random_seed} ||= $exit->random_seed; 1924 $rmp->{random_seed} ||= $exit->random_seed;
1827 1925
1828 my $data = cf::to_json $rmp; 1926 my $data = cf::to_json $rmp;
1829 my $md5 = Digest::MD5::md5_hex $data; 1927 my $md5 = Digest::MD5::md5_hex $data;
1928 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1830 1929
1831 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) {
1832 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;
1833 1934
1834 $exit->slaying ("?random/$md5"); 1935 $exit->slaying ("?random/$md5");
1835 $exit->msg (undef); 1936 $exit->msg (undef);
1836 } 1937 }
1837} 1938}
1838 1939
1839sub cf::object::player::enter_exit { 1940sub cf::object::player::enter_exit {
1840 my ($self, $exit) = @_; 1941 my ($self, $exit) = @_;
1841 1942
1842 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;
1843 1953
1844 $self->enter_link; 1954 $self->enter_link;
1845 1955
1846 (async { 1956 (async {
1847 $self->deactivate_recursive; # just to be sure 1957 $self->deactivate_recursive; # just to be sure
1848 unless (eval { 1958 unless (eval {
1849 prepare_random_map $exit 1959 $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 1960
1855 1; 1961 1;
1856 }) { 1962 }) {
1857 $self->message ("Something went wrong deep within the crossfire server. " 1963 $self->message ("Something went wrong deep within the crossfire server. "
1858 . "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. "
… …
1919 # get handled first 2025 # get handled first
1920 my $queue = delete $ns->{query_queue} 2026 my $queue = delete $ns->{query_queue}
1921 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
1922 2028
1923 (shift @$queue)->[1]->($msg); 2029 (shift @$queue)->[1]->($msg);
2030 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1924 2031
1925 push @{ $ns->{query_queue} }, @$queue; 2032 push @{ $ns->{query_queue} }, @$queue;
1926 2033
1927 if (@{ $ns->{query_queue} } == @$queue) { 2034 if (@{ $ns->{query_queue} } == @$queue) {
1928 if (@$queue) { 2035 if (@$queue) {
… …
2089The 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
2090using it, it should be unique. 2197using it, it should be unique.
2091 2198
2092=over 4 2199=over 4
2093 2200
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 2201=item $value = cf::db_get $family => $key
2101 2202
2102Returns a single value from the database 2203Returns 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 2204
2109=item cf::db_put $family => $key => $value 2205=item cf::db_put $family => $key => $value
2110 2206
2111Stores the given C<$value> in the family hash. Updates are delayed, if you 2207Stores 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 2208
2122=cut 2209=cut
2123 2210
2124our $DB; 2211our $DB;
2125 2212
2126{ 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
2127 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;
2128 2232
2129 sub db_load() { 2233 cf::db_put (board => data => $pst->{board});
2130 $DB = stat $path ? Storable::retrieve $path : { }; 2234 cf::db_put (guildrules => data => $pst->{guildrules});
2131 } 2235 cf::db_put (rent => balance => $pst->{rent}{balance});
2236 BDB::db_env_txn_checkpoint $DB_ENV;
2132 2237
2133 my $pid; 2238 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 } 2239 };
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 }, 2240 }
2181 ); 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 { };
2182} 2258}
2183 2259
2184############################################################################# 2260#############################################################################
2185# 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}
2186 2267
2187sub cfg_load { 2268sub cfg_load {
2188 open my $fh, "<:utf8", cf::confdir . "/config" 2269 open my $fh, "<:utf8", cf::confdir . "/config"
2189 or return; 2270 or return;
2190 2271
… …
2203 }; 2284 };
2204 warn $@ if $@; 2285 warn $@ if $@;
2205 } 2286 }
2206} 2287}
2207 2288
2289sub init {
2290 load_resources;
2291}
2292
2208sub main { 2293sub main {
2209 # we must not ever block the main coroutine 2294 # we must not ever block the main coroutine
2210 local $Coro::idle = sub { 2295 local $Coro::idle = sub {
2211 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 {
2212 async { Event::one_event }; 2298 Event::one_event;
2299 })->prio (Coro::PRIO_MAX);
2213 }; 2300 };
2214 2301
2215 cfg_load; 2302 cfg_load;
2216 db_load; 2303 db_init;
2217 load_extensions; 2304 load_extensions;
2305
2306 $TICK_WATCHER->start;
2218 Event::loop; 2307 Event::loop;
2219} 2308}
2220 2309
2221############################################################################# 2310#############################################################################
2222# initialisation and cleanup 2311# initialisation and cleanup
2223 2312
2224# install some emergency cleanup handlers 2313# install some emergency cleanup handlers
2225BEGIN { 2314BEGIN {
2226 for my $signal (qw(INT HUP TERM)) { 2315 for my $signal (qw(INT HUP TERM)) {
2227 Event->signal ( 2316 Event->signal (
2317 reentrant => 0,
2228 data => WF_AUTOCANCEL, 2318 data => WF_AUTOCANCEL,
2229 signal => $signal, 2319 signal => $signal,
2320 prio => 0,
2230 cb => sub { 2321 cb => sub {
2231 cf::cleanup "SIG$signal"; 2322 cf::cleanup "SIG$signal";
2232 }, 2323 },
2233 ); 2324 );
2234 } 2325 }
2235} 2326}
… …
2256 my $map = $cf::MAP{$path} or next; 2347 my $map = $cf::MAP{$path} or next;
2257 $map->valid or next; 2348 $map->valid or next;
2258 $map->save; 2349 $map->save;
2259 } 2350 }
2260 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";
2261 }; 2356 };
2262 2357
2263 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;
2264} 2366}
2265 2367
2266sub reload() { 2368sub reload() {
2267 # can/must only be called in main 2369 # can/must only be called in main
2268 if ($Coro::current != $Coro::main) { 2370 if ($Coro::current != $Coro::main) {
2269 warn "can only reload from main coroutine\n"; 2371 warn "can only reload from main coroutine";
2270 return; 2372 return;
2271 } 2373 }
2272 2374
2273 warn "reloading..."; 2375 warn "reloading...";
2274 2376
2275 warn "freezing server"; 2377 warn "cancelling server ticker";
2276 my $guard = freeze_mainloop; 2378 $TICK_WATCHER->cancel;
2379
2277 cf::emergency_save; 2380 cf::emergency_save;
2278
2279 warn "sync database to disk";
2280 cf::db_sync;
2281 IO::AIO::flush;
2282 2381
2283 eval { 2382 eval {
2284 # if anything goes wrong in here, we should simply crash as we already saved 2383 # if anything goes wrong in here, we should simply crash as we already saved
2285 2384
2286 warn "cancel all watchers"; 2385 warn "cancelling all WF_AUTOCANCEL watchers";
2287 for (Event::all_watchers) { 2386 for (Event::all_watchers) {
2288 $_->cancel if $_->data & WF_AUTOCANCEL; 2387 $_->cancel if $_->data & WF_AUTOCANCEL;
2289 } 2388 }
2290 2389
2390 warn "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
2291 warn "cancel all extension coros"; 2402 warn "cancelling all extension coros";
2292 $_->cancel for values %EXT_CORO; 2403 $_->cancel for values %EXT_CORO;
2293 %EXT_CORO = (); 2404 %EXT_CORO = ();
2294 2405
2295 warn "remove commands"; 2406 warn "removing commands";
2296 %COMMAND = (); 2407 %COMMAND = ();
2297 2408
2298 warn "remove ext commands"; 2409 warn "removing ext commands";
2299 %EXTCMD = (); 2410 %EXTCMD = ();
2300 2411
2301 warn "unload/nuke all extensions"; 2412 warn "unloading/nuking all extensions";
2302 for my $pkg (@EXTS) { 2413 for my $pkg (@EXTS) {
2303 warn "... unloading $pkg"; 2414 warn "... unloading $pkg";
2304 2415
2305 if (my $cb = $pkg->can ("unload")) { 2416 if (my $cb = $pkg->can ("unload")) {
2306 eval { 2417 eval {
… …
2311 2422
2312 warn "... nuking $pkg"; 2423 warn "... nuking $pkg";
2313 Symbol::delete_package $pkg; 2424 Symbol::delete_package $pkg;
2314 } 2425 }
2315 2426
2316 warn "unload all perl modules loaded from $LIBDIR"; 2427 warn "unloading all perl modules loaded from $LIBDIR";
2317 while (my ($k, $v) = each %INC) { 2428 while (my ($k, $v) = each %INC) {
2318 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2429 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2319 2430
2320 warn "removing <$k>"; 2431 warn "... unloading $k";
2321 delete $INC{$k}; 2432 delete $INC{$k};
2322 2433
2323 $k =~ s/\.pm$//; 2434 $k =~ s/\.pm$//;
2324 $k =~ s/\//::/g; 2435 $k =~ s/\//::/g;
2325 2436
… …
2328 } 2439 }
2329 2440
2330 Symbol::delete_package $k; 2441 Symbol::delete_package $k;
2331 } 2442 }
2332 2443
2333 warn "get rid of safe::, as good as possible"; 2444 warn "getting rid of safe::, as good as possible";
2334 Symbol::delete_package "safe::$_" 2445 Symbol::delete_package "safe::$_"
2335 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);
2336 2447
2337 warn "unload cf.pm \"a bit\""; 2448 warn "unloading cf.pm \"a bit\"";
2338 delete $INC{"cf.pm"}; 2449 delete $INC{"cf.pm"};
2339 2450
2340 # don't, removes xs symbols, too, 2451 # don't, removes xs symbols, too,
2341 # and global variables created in xs 2452 # and global variables created in xs
2342 #Symbol::delete_package __PACKAGE__; 2453 #Symbol::delete_package __PACKAGE__;
2343 2454
2455 warn "unload completed, starting to reload now";
2456
2344 warn "reloading cf.pm"; 2457 warn "reloading cf.pm";
2345 require cf; 2458 require cf;
2346 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2459 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2347 2460
2348 warn "load config and database again"; 2461 warn "loading config and database again";
2349 cf::cfg_load; 2462 cf::cfg_load;
2350 cf::db_load;
2351 2463
2352 warn "load extensions"; 2464 warn "loading extensions";
2353 cf::load_extensions; 2465 cf::load_extensions;
2354 2466
2355 warn "reattach attachments to objects/players"; 2467 warn "reattaching attachments to objects/players";
2356 _global_reattach; 2468 _global_reattach;
2357 warn "reattach attachments to maps"; 2469 warn "reattaching attachments to maps";
2358 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;
2359 }; 2478 };
2360 2479
2361 if ($@) { 2480 if ($@) {
2362 warn $@; 2481 warn $@;
2363 warn "error while reloading, exiting."; 2482 warn "error while reloading, exiting.";
… …
2365 } 2484 }
2366 2485
2367 warn "reloaded"; 2486 warn "reloaded";
2368}; 2487};
2369 2488
2489our $RELOAD_WATCHER; # used only during reload
2490
2370register_command "reload" => sub { 2491register_command "reload" => sub {
2371 my ($who, $arg) = @_; 2492 my ($who, $arg) = @_;
2372 2493
2373 if ($who->flag (FLAG_WIZ)) { 2494 if ($who->flag (FLAG_WIZ)) {
2374 $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 {
2375 reload; 2505 reload;
2376 $who->message ("end of reload."); 2506 undef $RELOAD_WATCHER;
2507 },
2508 );
2377 } 2509 }
2378}; 2510};
2379 2511
2380unshift @INC, $LIBDIR; 2512unshift @INC, $LIBDIR;
2513
2514my $bug_warning = 0;
2381 2515
2382$TICK_WATCHER = Event->timer ( 2516$TICK_WATCHER = Event->timer (
2383 reentrant => 0, 2517 reentrant => 0,
2518 parked => 1,
2384 prio => 0, 2519 prio => 0,
2385 at => $NEXT_TICK || $TICK, 2520 at => $NEXT_TICK || $TICK,
2386 data => WF_AUTOCANCEL, 2521 data => WF_AUTOCANCEL,
2387 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
2388 $NOW = Event::time; 2529 $NOW = Event::time;
2389 2530
2390 cf::server_tick; # one server iteration 2531 cf::server_tick; # one server iteration
2391 $RUNTIME += $TICK; 2532 $RUNTIME += $TICK;
2392 $NEXT_TICK += $TICK; 2533 $NEXT_TICK += $TICK;
2393 2534
2394 $WAIT_FOR_TICK->broadcast; 2535 $WAIT_FOR_TICK->broadcast;
2395 $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#
2396 2543
2397 # 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
2398 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2545 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2399 2546
2400 $TICK_WATCHER->at ($NEXT_TICK); 2547 $TICK_WATCHER->at ($NEXT_TICK);
2401 $TICK_WATCHER->start; 2548 $TICK_WATCHER->start;
2402 }, 2549 },
2403); 2550);
2404 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;
2405IO::AIO::max_poll_time $TICK * 0.2; 2606 IO::AIO::max_poll_time $TICK * 0.1;
2406 2607 $AIO_POLL_WATCHER = Event->io (
2407Event->io ( 2608 reentrant => 0,
2408 fd => IO::AIO::poll_fileno, 2609 fd => IO::AIO::poll_fileno,
2409 poll => 'r', 2610 poll => 'r',
2410 prio => 5, 2611 prio => 6,
2411 data => WF_AUTOCANCEL, 2612 data => WF_AUTOCANCEL,
2412 cb => \&IO::AIO::poll_cb, 2613 cb => \&IO::AIO::poll_cb,
2413); 2614 );
2615}
2414 2616
2415Event->timer ( 2617$WRITE_RUNTIME_WATCHER = Event->timer (
2618 reentrant => 0,
2416 data => WF_AUTOCANCEL, 2619 data => WF_AUTOCANCEL,
2417 after => 0, 2620 after => 1,
2418 interval => 10, 2621 interval => 10,
2419 cb => sub { 2622 prio => 6, # keep it lowest so it acts like a watchdog
2420 (Coro::unblock_sub { 2623 cb => Coro::unblock_sub {
2421 write_runtime 2624 write_runtime
2422 or warn "ERROR: unable to write runtime file: $!"; 2625 or warn "ERROR: unable to write runtime file: $!";
2423 })->();
2424 }, 2626 },
2425); 2627);
2426 2628
2427END { cf::emergency_save } 2629END { cf::emergency_save }
2428 2630

Diff Legend

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