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.12 by root, Sat Jan 27 12:45:04 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 {
57 my $files = Coro::AIO::aio_readdir $cf::RANDOM_MAPS
58 or return;
59
60 my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7;
61 my $MAP_TIMEOUT = $cf::CFG{map_random_map_timeout} || 3600 * 6;
62
63 for my $file (@$files) {
64 next if $file =~ /\.pst$/;
65
66 Coro::AIO::aio_stat "$cf::RANDOM_MAPS/$file"
67 and next;
68
69 my $age = $cf::NOW - (stat _)[8];
70
71 if ($file =~ /\.meta$/) {
72 if ($age > $META_TIMEOUT) {
73 warn "resetting random meta data for $file";
74 IO::AIO::aio_unlink "$cf::RANDOM_MAPS/$file";
75 }
76 } else {
77 if ($age > $MAP_TIMEOUT) {
78 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::RANDOM_MAPS/$file.pst";
81 }
82 }
83 }
84}
85
86# clean up old temp maps regularly
87Event->timer (
88 reentrant => 0,
89 data => cf::WF_AUTOCANCEL,
90 interval => 3600,
91 after => 60,
92 cb => Coro::unblock_sub { clean_random_maps },
93);
94
95# map generator stresstest, never enable under normal circumstances
96if (1) {
54 cf::async { 97 cf::async {
55 my $files = Coro::AIO::aio_readdir $cf::RANDOM_MAPS 98 my $seed = 0;
56 or return; 99 while () {
57 100 my $map = cf::map::new;
58 my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7; 101 $map->generate_random_map ({
59 my $MAP_TIMEOUT = $cf::CFG{map_random_map_timeout} || 3600 * 6; 102 region => "scorn",
60 103 random_seed => $seed++,
61 for my $file (@$files) { 104 xsize => 12,
62 next if $file =~ /\.pst$/; 105 ysize => 12,
63
64 Coro::AIO::aio_stat "$cf::RANDOM_MAPS/$file"
65 and next;
66
67 my $age = $cf::NOW - (stat _)[8];
68
69 if ($file =~ /\.meta$/) {
70 if ($age > $META_TIMEOUT) {
71 warn "resetting random meta data for $file";
72 IO::AIO::aio_unlink "$cf::RANDOM_MAPS/$file";
73 }
74 } else {
75 if ($age > $MAP_TIMEOUT) {
76 warn "resetting random map $file";
77 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";
79 }
80 } 106 });
107 warn sprintf "%d: %d %d\n", $seed, $map->width, $map->height;#d#
108 $map->destroy;
81 } 109 }
82 }; 110 };
83} 111}
84 112
85# clean up old temp maps regularly
86Event->timer (
87 data => cf::WF_AUTOCANCEL,
88 interval => 3600,
89 after => 600,
90 cb => \&clean_random_maps,
91);
92
931 1131
94 114

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines