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.6 by root, Sun Jan 14 02:00:36 2007 UTC vs.
Revision 1.10 by root, Wed Jan 24 16:29:10 2007 UTC

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::RANDOM_MAPS/$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 {
14 warn "unable to read meta file for $self->{random_id}\n";
15 return 0;
13 } 16 }
14 17
15 1 18 1
16} 19}
17 20
38 41
39sub uniq_path { 42sub uniq_path {
40 undef 43 undef
41} 44}
42 45
43sub load_orig { 46sub load_header_orig {
44 my ($self) = @_; 47 my ($self) = @_;
45 48
46 return unless $self->{random}; 49 return unless $self->{random};
47 50
48 $self->generate_random_map ($self->{random}); 51 $self->generate_random_map ($self->{random});
49 52
50 1 53 1
51} 54}
52 55
53sub clean_random_maps { 56sub clean_random_maps {
54 cf::async {
55 my $files = Coro::AIO::aio_readdir $cf::RANDOM_MAPS 57 my $files = Coro::AIO::aio_readdir $cf::RANDOM_MAPS
56 or return; 58 or return;
57 59
58 my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7; 60 my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7;
59 my $MAP_TIMEOUT = $cf::CFG{map_random_map_timeout} || 3600 * 6; 61 my $MAP_TIMEOUT = $cf::CFG{map_random_map_timeout} || 3600 * 6;
60 62
61 for my $file (@$files) { 63 for my $file (@$files) {
62 next if $file =~ /\.pst$/; 64 next if $file =~ /\.pst$/;
63 65
64 Coro::AIO::aio_stat "$cf::RANDOM_MAPS/$file" 66 Coro::AIO::aio_stat "$cf::RANDOM_MAPS/$file"
65 and next; 67 and next;
66 68
67 my $age = $cf::NOW - (stat _)[8]; 69 my $age = $cf::NOW - (stat _)[8];
68 70
69 if ($file =~ /\.meta$/) { 71 if ($file =~ /\.meta$/) {
70 if ($age > $META_TIMEOUT) { 72 if ($age > $META_TIMEOUT) {
71 warn "resetting random meta data for $file"; 73 warn "resetting random meta data for $file";
72 IO::AIO::aio_unlink "$cf::RANDOM_MAPS/$file"; 74 IO::AIO::aio_unlink "$cf::RANDOM_MAPS/$file";
73 } 75 }
74 } else { 76 } else {
75 if ($age > $MAP_TIMEOUT) { 77 if ($age > $MAP_TIMEOUT) {
76 warn "resetting random map $file"; 78 warn "resetting random map $file";
77 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$cf::RANDOM_MAPS/$file"; 79 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$cf::RANDOM_MAPS/$file";
78 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$cf::RANDOM_MAPS/$file.pst"; 80 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$cf::RANDOM_MAPS/$file.pst";
79 }
80 } 81 }
81 } 82 }
82 }; 83 }
83} 84}
84 85
85# clean up old temp maps regularly 86# clean up old temp maps regularly
86Event->timer ( 87Event->timer (
88 reentrant => 0,
87 data => cf::WF_AUTOCANCEL, 89 data => cf::WF_AUTOCANCEL,
88 interval => 3600, 90 interval => 3600,
89 after => 600, 91 after => 60,
90 cb => \&clean_random_maps, 92 cb => Coro::unblock_sub { clean_random_maps },
91); 93);
92 94
931 951
94 96

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines