ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/map-random.ext
(Generate patch)

Comparing deliantra/server/ext/map-random.ext (file contents):
Revision 1.12 by root, Sat Jan 27 12:45:04 2007 UTC vs.
Revision 1.15 by root, Sat Apr 21 17:34:24 2007 UTC

… …
5sub init { 5sub init {
6 my ($self) = @_; 6 my ($self) = @_;
7 7
8 $self->{random_id} = $1; 8 $self->{random_id} = $1;
9 9
10 if (0 < Coro::AIO::aio_load "$cf::RANDOM_MAPS/$self->{random_id}.meta", my $data) { 10 if (0 < Coro::AIO::aio_load "$cf::RANDOMDIR/$self->{random_id}.meta", my $data) {
11 $self->{random} = cf::from_json $data; 11 $self->{random} = cf::from_json $data;
12 $self->{random}{custom} ||= "$self->{random}{origin_map}+$self->{random}{origin_x}+$self->{random}{origin_y}"; 12 $self->{random}{custom} ||= "$self->{random}{origin_map}+$self->{random}{origin_x}+$self->{random}{origin_y}";
13 } else { 13 } else {
14 warn "unable to read meta file for $self->{random_id}\n"; 14 warn "unable to read meta file for $self->{random_id}\n";
15 return 0; 15 return 0;
… …
34} 34}
35 35
36sub save_path { 36sub save_path {
37 my ($self) = @_; 37 my ($self) = @_;
38 38
39 sprintf "%s/%s.map", $cf::RANDOM_MAPS, $self->{random_id} 39 sprintf "%s/%s.map", $cf::RANDOMDIR, $self->{random_id}
40} 40}
41 41
42sub uniq_path { 42sub uniq_path {
43 undef 43 undef
44} 44}
… …
47 my ($self) = @_; 47 my ($self) = @_;
48 48
49 return unless $self->{random}; 49 return unless $self->{random};
50 50
51 $self->generate_random_map ($self->{random}); 51 $self->generate_random_map ($self->{random});
52 $self->activate;
52 53
53 1 54 1
54} 55}
55 56
56sub clean_random_maps { 57sub clean_random_maps {
57 my $files = Coro::AIO::aio_readdir $cf::RANDOM_MAPS 58 my $files = Coro::AIO::aio_readdir $cf::RANDOMDIR
58 or return; 59 or return;
59 60
60 my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7; 61 my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7;
61 my $MAP_TIMEOUT = $cf::CFG{map_random_map_timeout} || 3600 * 6; 62 my $MAP_TIMEOUT = $cf::CFG{map_random_map_timeout} || 3600 * 6;
62 63
63 for my $file (@$files) { 64 for my $file (@$files) {
64 next if $file =~ /\.pst$/; 65 next if $file =~ /\.pst$/;
65 66
66 Coro::AIO::aio_stat "$cf::RANDOM_MAPS/$file" 67 Coro::AIO::aio_stat "$cf::RANDOMDIR/$file"
67 and next; 68 and next;
68 69
69 my $age = $cf::NOW - (stat _)[8]; 70 my $age = $cf::NOW - (stat _)[8];
70 71
71 if ($file =~ /\.meta$/) { 72 if ($file =~ /\.meta$/) {
72 if ($age > $META_TIMEOUT) { 73 if ($age > $META_TIMEOUT) {
73 warn "resetting random meta data for $file"; 74 warn "resetting random meta data for $file";
74 IO::AIO::aio_unlink "$cf::RANDOM_MAPS/$file"; 75 IO::AIO::aio_unlink "$cf::RANDOMDIR/$file";
75 } 76 }
76 } else { 77 } else {
77 if ($age > $MAP_TIMEOUT) { 78 if ($age > $MAP_TIMEOUT) {
78 warn "resetting random map $file"; 79 warn "resetting random map $file";
79 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$cf::RANDOM_MAPS/$file"; 80 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$cf::RANDOMDIR/$file";
80 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$cf::RANDOM_MAPS/$file.pst"; 81 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$cf::RANDOMDIR/$file.pst";
81 } 82 }
82 } 83 }
83 } 84 }
84} 85}
85 86
… …
91 after => 60, 92 after => 60,
92 cb => Coro::unblock_sub { clean_random_maps }, 93 cb => Coro::unblock_sub { clean_random_maps },
93); 94);
94 95
95# map generator stresstest, never enable under normal circumstances 96# map generator stresstest, never enable under normal circumstances
96if (1) { 97if (0) {
97 cf::async { 98 cf::async {
98 my $seed = 0; 99 my $seed = 0;
99 while () { 100 while () {
100 my $map = cf::map::new; 101 my $map = cf::map::new;
101 $map->generate_random_map ({ 102 $map->generate_random_map ({

Diff Legend

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