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.13 by root, Sat Jan 27 12:47:02 2007 UTC vs.
Revision 1.24 by root, Sat May 3 08:50:30 2008 UTC

1#! perl # MANDATORY 1#! perl # mandatory
2 2
3cf::map->register (qr{^\?random/([0-9a-f]{32})}); 3cf::map->register (qr{^\?random/([0-9a-f]{32})});
4 4
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::decode_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;
16 } 16 }
… …
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 62
63 for my $file (@$files) { 63 for my $file (@$files) {
64 next if $file =~ /\.pst$/; 64 next unless $file =~ /\.meta$/;
65 65
66 Coro::AIO::aio_stat "$cf::RANDOM_MAPS/$file" 66 Coro::AIO::aio_stat "$cf::RANDOMDIR/$file"
67 and next; 67 and next;
68 68
69 my $age = $cf::NOW - (stat _)[8]; 69 my $age = $cf::NOW - (stat _)[8];
70 70
71 if ($file =~ /\.meta$/) {
72 if ($age > $META_TIMEOUT) { 71 if ($age > $META_TIMEOUT) {
73 warn "resetting random meta data for $file"; 72 warn "resetting random meta data for $file";
74 IO::AIO::aio_unlink "$cf::RANDOM_MAPS/$file"; 73 IO::AIO::aio_unlink "$cf::RANDOMDIR/$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 } 74 }
83 } 75 }
84} 76}
85 77
86# clean up old temp maps regularly 78# clean up old temp maps regularly
87Event->timer ( 79our $CLEAN_RANDOM_MAPS = cf::periodic 3600, Coro::unblock_sub {
88 reentrant => 0, 80 clean_random_maps;
89 data => cf::WF_AUTOCANCEL, 81};
90 interval => 3600,
91 after => 60,
92 cb => Coro::unblock_sub { clean_random_maps },
93);
94 82
95# map generator stresstest, never enable under normal circumstances 83# map generator stresstest, NEVER enable under normal circumstances
96if (0) { 84if (0) {
97 cf::async { 85 cf::async {
98 my $seed = 0; 86 my $seed = 0;
99 while () { 87 while () {
100 my $map = cf::map::new; 88 my $map = cf::map::new;
101 $map->generate_random_map ({ 89 $map->generate_random_map ({
102 region => "scorn", 90 region => "scorn",
103 random_seed => $seed++, 91 random_seed => $seed++,
104 xsize => 12, 92 xsize => (int rand 90) + 3,
105 ysize => 12, 93 ysize => (int rand 90) + 3,
106 }); 94 });
107 warn sprintf "%d: %d %d\n", $seed, $map->width, $map->height;#d# 95# warn sprintf "%d: %d %d\n", $seed, $map->width, $map->height;#d#
108 $map->destroy; 96 $map->destroy;
109 } 97 }
110 }; 98 };
111} 99}
112 100

Diff Legend

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