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.15 by root, Sat Apr 21 17:34:24 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 {
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
23} 34}
24 35
25sub save_path { 36sub save_path {
26 my ($self) = @_; 37 my ($self) = @_;
27 38
28 sprintf "%s/%s.map", $cf::RANDOM_MAPS, $self->{random_id} 39 sprintf "%s/%s.map", $cf::RANDOMDIR, $self->{random_id}
29} 40}
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});
52 $self->activate;
41 53
42 1 54 1
43} 55}
44 56
45sub clean_random_maps { 57sub clean_random_maps {
58 my $files = Coro::AIO::aio_readdir $cf::RANDOMDIR
59 or return;
60
61 my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7;
62 my $MAP_TIMEOUT = $cf::CFG{map_random_map_timeout} || 3600 * 6;
63
64 for my $file (@$files) {
65 next if $file =~ /\.pst$/;
66
67 Coro::AIO::aio_stat "$cf::RANDOMDIR/$file"
68 and next;
69
70 my $age = $cf::NOW - (stat _)[8];
71
72 if ($file =~ /\.meta$/) {
73 if ($age > $META_TIMEOUT) {
74 warn "resetting random meta data for $file";
75 IO::AIO::aio_unlink "$cf::RANDOMDIR/$file";
76 }
77 } else {
78 if ($age > $MAP_TIMEOUT) {
79 warn "resetting random map $file";
80 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$cf::RANDOMDIR/$file";
81 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$cf::RANDOMDIR/$file.pst";
82 }
83 }
84 }
85}
86
87# clean up old temp maps regularly
88Event->timer (
89 reentrant => 0,
90 data => cf::WF_AUTOCANCEL,
91 interval => 3600,
92 after => 60,
93 cb => Coro::unblock_sub { clean_random_maps },
94);
95
96# map generator stresstest, never enable under normal circumstances
97if (0) {
46 cf::async { 98 cf::async {
47 my $files = Coro::AIO::aio_readdir $cf::RANDOM_MAPS 99 my $seed = 0;
48 or return; 100 while () {
49 101 my $map = cf::map::new;
50 my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7; 102 $map->generate_random_map ({
51 my $MAP_TIMEOUT = $cf::CFG{map_random_map_timeout} || 3600 * 6; 103 region => "scorn",
52 104 random_seed => $seed++,
53 for my $file (@$files) { 105 xsize => 12,
54 next if $file =~ /\.pst$/; 106 ysize => 12,
55
56 Coro::AIO::aio_stat "$cf::RANDOM_MAPS/$file"
57 and next;
58
59 my $age = $cf::NOW - (stat _)[8];
60
61 if ($file =~ /\.meta$/) {
62 if ($age > $META_TIMEOUT) {
63 warn "resetting random meta data for $file";
64 IO::AIO::aio_unlink "$cf::RANDOM_MAPS/$file";
65 }
66 } else {
67 if ($age > $MAP_TIMEOUT) {
68 warn "resetting random map $file";
69 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";
71 }
72 } 107 });
108 warn sprintf "%d: %d %d\n", $seed, $map->width, $map->height;#d#
109 $map->destroy;
73 } 110 }
74 }; 111 };
75} 112}
76 113
77# clean up old temp maps regularly
78Event->timer (
79 data => cf::WF_AUTOCANCEL,
80 interval => 3600,
81 after => 600,
82 cb => \&clean_random_maps,
83);
84
851 1141
86 115

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines