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.5 by root, Sat Jan 13 23:06:13 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
19}
20
21sub thawer_merge {
22 # we have to keep some variables in memory intact
23 local $_[0]{random_id};
24 local $_[0]{random};
25
26 $_[0]->SUPER::thawer_merge ($_[1]);
16} 27}
17 28
18sub visible_name { 29sub visible_name {
19 my ($self) = @_; 30 my ($self) = @_;
20 31
30 41
31sub uniq_path { 42sub uniq_path {
32 undef 43 undef
33} 44}
34 45
35sub load_orig { 46sub load_header_orig {
36 my ($self) = @_; 47 my ($self) = @_;
37 48
38 return unless $self->{random}; 49 return unless $self->{random};
39 50
40 $self->generate_random_map ($self->{random}); 51 $self->generate_random_map ($self->{random});
41 52
42 1 53 1
43} 54}
44 55
45sub clean_random_maps { 56sub clean_random_maps {
46 cf::async {
47 my $files = Coro::AIO::aio_readdir $cf::RANDOM_MAPS 57 my $files = Coro::AIO::aio_readdir $cf::RANDOM_MAPS
48 or return; 58 or return;
49 59
50 my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7; 60 my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7;
51 my $MAP_TIMEOUT = $cf::CFG{map_random_map_timeout} || 3600 * 6; 61 my $MAP_TIMEOUT = $cf::CFG{map_random_map_timeout} || 3600 * 6;
52 62
53 for my $file (@$files) { 63 for my $file (@$files) {
54 next if $file =~ /\.pst$/; 64 next if $file =~ /\.pst$/;
55 65
56 Coro::AIO::aio_stat "$cf::RANDOM_MAPS/$file" 66 Coro::AIO::aio_stat "$cf::RANDOM_MAPS/$file"
57 and next; 67 and next;
58 68
59 my $age = $cf::NOW - (stat _)[8]; 69 my $age = $cf::NOW - (stat _)[8];
60 70
61 if ($file =~ /\.meta$/) { 71 if ($file =~ /\.meta$/) {
62 if ($age > $META_TIMEOUT) { 72 if ($age > $META_TIMEOUT) {
63 warn "resetting random meta data for $file"; 73 warn "resetting random meta data for $file";
64 IO::AIO::aio_unlink "$cf::RANDOM_MAPS/$file"; 74 IO::AIO::aio_unlink "$cf::RANDOM_MAPS/$file";
65 } 75 }
66 } else { 76 } else {
67 if ($age > $MAP_TIMEOUT) { 77 if ($age > $MAP_TIMEOUT) {
68 warn "resetting random map $file"; 78 warn "resetting random map $file";
69 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";
70 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";
71 }
72 } 81 }
73 } 82 }
74 }; 83 }
75} 84}
76 85
77# clean up old temp maps regularly 86# clean up old temp maps regularly
78Event->timer ( 87Event->timer (
88 reentrant => 0,
79 data => cf::WF_AUTOCANCEL, 89 data => cf::WF_AUTOCANCEL,
80 interval => 3600, 90 interval => 3600,
81 after => 600, 91 after => 60,
82 cb => \&clean_random_maps, 92 cb => Coro::unblock_sub { clean_random_maps },
83); 93);
84 94
851 951
86 96

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines