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.198 by root, Sun Jan 28 01:58:37 2007 UTC vs.
Revision 1.205 by root, Mon Feb 5 18:29:20 2007 UTC

… …
48our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 50our $WRITE_RUNTIME_WATCHER;
51our $NEXT_TICK; 51our $NEXT_TICK;
52our $NOW; 52our $NOW;
53our $USE_FSYNC = 1; # use fsync to write maps - default off
53 54
54our %CFG; 55our %CFG;
55 56
56our $UPTIME; $UPTIME ||= time; 57our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 58our $RUNTIME;
… …
82mkdir cf::localdir . "/" . cf::tmpdir; 83mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 84mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 85mkdir $RANDOM_MAPS;
85 86
86our $EMERGENCY_POSITION; 87our $EMERGENCY_POSITION;
88
89sub cf::map::normalise;
87 90
88############################################################################# 91#############################################################################
89 92
90=head2 GLOBAL VARIABLES 93=head2 GLOBAL VARIABLES
91 94
… …
356 # 60 allows for the watchdog to kill the server. 359 # 60 allows for the watchdog to kill the server.
357 360
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 361 (aio_write $fh, 0, (length $value), $value, 0) <= 0
359 and return; 362 and return;
360 363
364 # always fsync - this file is important
361 aio_fsync $fh 365 aio_fsync $fh
362 and return; 366 and return;
363 367
364 close $fh 368 close $fh
365 or return; 369 or return;
… …
750 $filename, length $$rdata, scalar @$objs; 754 $filename, length $$rdata, scalar @$objs;
751 755
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 756 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 757 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 758 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 759 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 760 close $fh;
757 761
758 if (@$objs) { 762 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 763 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 764 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 765 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 766 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 767 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 768 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 769 aio_rename "$filename.pst~", "$filename.pst";
766 } 770 }
767 } else { 771 } else {
768 aio_unlink "$filename.pst"; 772 aio_unlink "$filename.pst";
… …
774 } 778 }
775 } else { 779 } else {
776 aio_unlink $filename; 780 aio_unlink $filename;
777 aio_unlink "$filename.pst"; 781 aio_unlink "$filename.pst";
778 } 782 }
783
784 #d##TODO# nuke non .map-files if exist
785 if ($filename =~ s/\.map$//) {
786 aio_unlink $filename;
787 aio_unlink "$filename.pst";
788 }
779 } 789 }
780} 790}
781 791
782sub object_freezer_as_string { 792sub object_freezer_as_string {
783 my ($rdata, $objs) = @_; 793 my ($rdata, $objs) = @_;
… …
789 799
790sub object_thawer_load { 800sub object_thawer_load {
791 my ($filename) = @_; 801 my ($filename) = @_;
792 802
793 my ($data, $av); 803 my ($data, $av);
804
805 #d#TODO remove .map if file does not exist
806 aio_stat $filename and $filename =~ s/\.map$//;
794 807
795 (aio_load $filename, $data) >= 0 808 (aio_load $filename, $data) >= 0
796 or return; 809 or return;
797 810
798 unless (aio_stat "$filename.pst") { 811 unless (aio_stat "$filename.pst") {
… …
1068=cut 1081=cut
1069 1082
1070sub maps($) { 1083sub maps($) {
1071 my ($pl) = @_; 1084 my ($pl) = @_;
1072 1085
1086 $pl = ref $pl ? $pl->ob->name : $pl;
1087
1073 my $files = aio_readdir playerdir $pl 1088 my $files = aio_readdir playerdir $pl
1074 or return; 1089 or return;
1075 1090
1076 my @paths; 1091 my @paths;
1077 1092
1078 for (@$files) { 1093 for (@$files) {
1079 utf8::decode $_; 1094 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1095 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1096 next unless /^$PATH_SEP/o;
1082 1097
1083 s/\.map$//; 1098 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1099 }
1086 1100
1087 \@paths 1101 \@paths
1088} 1102}
1089 1103
… …
1178sub normalise { 1192sub normalise {
1179 my ($path, $base) = @_; 1193 my ($path, $base) = @_;
1180 1194
1181 $path = "$path"; # make sure its a string 1195 $path = "$path"; # make sure its a string
1182 1196
1197 $path =~ s/\.map$//;
1198
1183 # map plan: 1199 # map plan:
1184 # 1200 #
1185 # /! non-realised random map exit (special hack!) 1201 # /! non-realised random map exit (special hack!)
1186 # {... are special paths that are not being touched 1202 # {... are special paths that are not being touched
1187 # ?xxx/... are special absolute paths 1203 # ?xxx/... are special absolute paths
… …
1248 1264
1249# the original (read-only) location 1265# the original (read-only) location
1250sub load_path { 1266sub load_path {
1251 my ($self) = @_; 1267 my ($self) = @_;
1252 1268
1253 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1269 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1254} 1270}
1255 1271
1256# the temporary/swap location 1272# the temporary/swap location
1257sub save_path { 1273sub save_path {
1258 my ($self) = @_; 1274 my ($self) = @_;
1259 1275
1260 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1276 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1261 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1277 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1262} 1278}
1263 1279
1264# the unique path, undef == no special unique path 1280# the unique path, undef == no special unique path
1265sub uniq_path { 1281sub uniq_path {
1266 my ($self) = @_; 1282 my ($self) = @_;
… …
1282 my ($self) = @_; 1298 my ($self) = @_;
1283 1299
1284 utf8::encode (my $save = $self->save_path); 1300 utf8::encode (my $save = $self->save_path);
1285 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1301 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1286 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1303
1304 #d#TODO remove .map and also nuke
1305 $save =~ s/\.map// or return;#d#
1306 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1307 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1287} 1308}
1288 1309
1289sub load_header_from($) { 1310sub load_header_from($) {
1290 my ($self, $path) = @_; 1311 my ($self, $path) = @_;
1291 1312
1292 utf8::encode $path; 1313 utf8::encode $path;
1293 aio_open $path, O_RDONLY, 0 1314 #aio_open $path, O_RDONLY, 0
1294 or return; 1315 # or return;
1295 1316
1296 $self->_load_header ($path) 1317 $self->_load_header ($path)
1297 or return; 1318 or return;
1298 1319
1299 $self->{load_path} = $path; 1320 $self->{load_path} = $path;
… …
1628 for (@$files) { 1649 for (@$files) {
1629 utf8::decode $_; 1650 utf8::decode $_;
1630 next if /\.pst$/; 1651 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o; 1652 next unless /^$PATH_SEP/o;
1632 1653
1633 s/\.map$//; 1654 push @paths, cf::map::normalise $_;
1634 push @paths, $_;
1635 } 1655 }
1636 1656
1637 \@paths 1657 \@paths
1638} 1658}
1639 1659
… …
1985 # get handled first 2005 # get handled first
1986 my $queue = delete $ns->{query_queue} 2006 my $queue = delete $ns->{query_queue}
1987 or return; # be conservative, not sure how that can happen, but we saw a crash here 2007 or return; # be conservative, not sure how that can happen, but we saw a crash here
1988 2008
1989 (shift @$queue)->[1]->($msg); 2009 (shift @$queue)->[1]->($msg);
2010 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1990 2011
1991 push @{ $ns->{query_queue} }, @$queue; 2012 push @{ $ns->{query_queue} }, @$queue;
1992 2013
1993 if (@{ $ns->{query_queue} } == @$queue) { 2014 if (@{ $ns->{query_queue} } == @$queue) {
1994 if (@$queue) { 2015 if (@$queue) {
… …
2251 }, 2272 },
2252 ); 2273 );
2253} 2274}
2254 2275
2255############################################################################# 2276#############################################################################
2256# the server's main() 2277# the server's init and main functions
2278
2279sub load_resources {
2280 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2281 or die "unable to load regions file\n";#d#
2282}
2257 2283
2258sub cfg_load { 2284sub cfg_load {
2259 open my $fh, "<:utf8", cf::confdir . "/config" 2285 open my $fh, "<:utf8", cf::confdir . "/config"
2260 or return; 2286 or return;
2261 2287
… …
2272 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2298 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2273 and die "WARNING: m(un)lockall failed: $!\n"; 2299 and die "WARNING: m(un)lockall failed: $!\n";
2274 }; 2300 };
2275 warn $@ if $@; 2301 warn $@ if $@;
2276 } 2302 }
2303}
2304
2305sub init {
2306 load_resources;
2277} 2307}
2278 2308
2279sub main { 2309sub main {
2280 # we must not ever block the main coroutine 2310 # we must not ever block the main coroutine
2281 local $Coro::idle = sub { 2311 local $Coro::idle = sub {
… …
2442 warn "reattaching attachments to objects/players"; 2472 warn "reattaching attachments to objects/players";
2443 _global_reattach; 2473 _global_reattach;
2444 warn "reattaching attachments to maps"; 2474 warn "reattaching attachments to maps";
2445 reattach $_ for values %MAP; 2475 reattach $_ for values %MAP;
2446 2476
2477 warn "loading reloadable resources";
2478 load_resources;
2479
2447 warn "restarting server ticker"; 2480 warn "restarting server ticker";
2448 2481
2449 $TICK_WATCHER->start; 2482 $TICK_WATCHER->start;
2450 }; 2483 };
2451 2484

Diff Legend

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