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

Diff Legend

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