ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.561 by root, Fri Apr 22 06:10:33 2011 UTC vs.
Revision 1.579 by root, Wed Jan 4 03:22:28 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
… …
108our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
109our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112 112
113our %RESOURCE; # unused 113#our %RESOURCE; # unused
114 114
115our $OUTPUT_RATE_MIN = 3000; 115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000; 116our $OUTPUT_RATE_MAX = 1000000;
117 117
118our $MAX_LINKS = 32; # how many chained exits to follow 118our $MAX_LINKS = 32; # how many chained exits to follow
… …
131our @EXTRA_MODULES = qw(pod match mapscript incloader); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132 132
133our %CFG; 133our %CFG;
134 134
135our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
136our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
137our $NOW; 138our $NOW;
138 139
139our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
140our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
141our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
… …
150 151
151our @POST_INIT; 152our @POST_INIT;
152 153
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :) 155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
155 159
156binmode STDOUT; 160binmode STDOUT;
157binmode STDERR; 161binmode STDERR;
158 162
159# read virtual server time, if available 163# read virtual server time, if available
… …
193 197
194=over 4 198=over 4
195 199
196=item $cf::UPTIME 200=item $cf::UPTIME
197 201
198The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
199 218
200=item $cf::RUNTIME 219=item $cf::RUNTIME
201 220
202The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
203every server tick. 222every server tick.
… …
209Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
210directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
211unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
212database environment. 231database environment.
213 232
214=item $cf::NOW
215
216The time of the last (current) server tick.
217
218=item $cf::TICK
219
220The interval between server ticks, in seconds.
221
222=item $cf::LOADAVG 233=item $cf::LOADAVG
223 234
224The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
225(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
226objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
… …
237=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
238 249
239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
240returns directly I<after> the tick processing (and consequently, can only wake one thread 251returns directly I<after> the tick processing (and consequently, can only wake one thread
241per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
242 265
243=cut 266=cut
244 267
245sub wait_for_tick(); 268sub wait_for_tick();
246sub wait_for_tick_begin(); 269sub wait_for_tick_begin();
… …
545 } 568 }
546 } 569 }
547 570
548 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
549 # we do not use wait_for_tick() as it returns immediately when tick is inactive 572 # we do not use wait_for_tick() as it returns immediately when tick is inactive
550 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
551 $signal->wait;
552 } else { 574 } else {
553 $busy = 0; 575 $busy = 0;
554 Coro::schedule; 576 Coro::schedule;
555 } 577 }
556 } 578 }
… …
1439 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1440 1462
1441 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1442 1464
1443 if (ref $msg) { 1465 if (ref $msg) {
1444 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1445 "ARRAY" eq ref $msg
1446 ? @$msg
1447 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1448 1467
1449 my @reply; 1468 my @reply;
1450 1469
1451 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1452 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
… …
2069 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
2070 2089
2071 1 2090 1
2072} 2091}
2073 2092
2093# used to laod the header of an original map
2074sub load_header_orig { 2094sub load_header_orig {
2075 my ($self) = @_; 2095 my ($self) = @_;
2076 2096
2077 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
2078} 2098}
2079 2099
2100# used to laod the header of an instantiated map
2080sub load_header_temp { 2101sub load_header_temp {
2081 my ($self) = @_; 2102 my ($self) = @_;
2082 2103
2083 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
2084} 2105}
2085 2106
2107# called after loading the header from an instantiated map
2086sub prepare_temp { 2108sub prepare_temp {
2087 my ($self) = @_; 2109 my ($self) = @_;
2088 2110
2089 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
2090 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
2091 # safety 2113 # safety
2092 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
2093 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
2094} 2116}
2095 2117
2118# called after loading the header from an original map
2096sub prepare_orig { 2119sub prepare_orig {
2097 my ($self) = @_; 2120 my ($self) = @_;
2098 2121
2099 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
2100 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
… …
2126sub find { 2149sub find {
2127 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
2128 2151
2129 cf::cede_to_tick; 2152 cf::cede_to_tick;
2130 2153
2131 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
2132 2155
2133 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2134 my $guard2 = cf::lock_acquire "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
2135 2158
2136 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
… …
2167 2190
2168 { 2191 {
2169 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
2170 2193
2171 return unless $self->valid; 2194 return unless $self->valid;
2172 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2173
2174 $self->in_memory (cf::MAP_LOADING);
2175 2196
2176 $self->alloc; 2197 $self->alloc;
2177 2198
2178 $self->pre_load; 2199 $self->pre_load;
2179 cf::cede_to_tick; 2200 cf::cede_to_tick;
2180 2201
2202 if (exists $self->{load_path}) {
2181 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2182 $f->skip_block; 2204 $f->skip_block;
2183 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2184 or return; 2206 or return;
2185 2207
2186 $self->post_load_original 2208 $self->post_load_original
2187 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2188 2210
2189 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2190 utf8::encode $uniq; 2212 utf8::encode $uniq;
2191 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2192 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2193 $self->clear_unique_items; 2215 $self->clear_unique_items;
2194 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2195 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2196 } 2219 }
2197 } 2220 }
2198 }
2199 2221
2200 $f->resolve_delayed_derefs; 2222 $f->resolve_delayed_derefs;
2223 } else {
2224 $self->post_load_original
2225 if delete $self->{load_original};
2226 }
2227
2228 $self->state (cf::MAP_INACTIVE);
2201 2229
2202 cf::cede_to_tick; 2230 cf::cede_to_tick;
2203 # now do the right thing for maps 2231 # now do the right thing for maps
2204 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2205 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
… …
2209 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2210 $self->decay_objects; 2238 $self->decay_objects;
2211 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2212 $self->update_buttons; 2240 $self->update_buttons;
2213 cf::cede_to_tick; 2241 cf::cede_to_tick;
2214 $self->activate; 2242 #$self->activate; # no longer activate maps automatically
2215 } 2243 }
2216 2244
2217 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2218 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2219
2220 $self->in_memory (cf::MAP_ACTIVE);
2221 } 2247 }
2222 2248
2223 $self->post_load; 2249 $self->post_load;
2224 2250
2225 1 2251 1
… …
2238# if $self->per_party; 2264# if $self->per_party;
2239 2265
2240 $self 2266 $self
2241} 2267}
2242 2268
2243# find and load all maps in the 3x3 area around a map
2244sub load_neighbours {
2245 my ($map) = @_;
2246
2247 my @neigh; # diagonal neighbours
2248
2249 for (0 .. 3) {
2250 my $neigh = $map->tile_path ($_)
2251 or next;
2252 $neigh = find $neigh, $map
2253 or next;
2254 $neigh->load;
2255
2256 # now find the diagonal neighbours
2257 push @neigh,
2258 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2259 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2260 }
2261
2262 for (grep defined $_->[0], @neigh) {
2263 my ($path, $origin) = @$_;
2264 my $neigh = find $path, $origin
2265 or next;
2266 $neigh->load;
2267 }
2268}
2269
2270sub find_sync { 2269sub find_sync {
2271 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2272 2271
2272 # it's a bug to call this from the main context
2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2274 if $Coro::current == $Coro::main; 2274 if $Coro::current == $Coro::main;
2275 2275
2276 find $path, $origin 2276 find $path, $origin
2277} 2277}
2278 2278
2279sub do_load_sync { 2279sub do_load_sync {
2280 my ($map) = @_; 2280 my ($map) = @_;
2281 2281
2282 # it's a bug to call this from the main context
2282 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2283 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2284 2285
2285 $map->load; 2286 $map->load;
2286} 2287}
… …
2289our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2290 2291
2291sub find_async { 2292sub find_async {
2292 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2293 2294
2294 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2295 2296
2296 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2297 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2298 } 2299 }
2299 2300
2300 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2301 2302
2302 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
… …
2361sub swap_out { 2362sub swap_out {
2362 my ($self) = @_; 2363 my ($self) = @_;
2363 2364
2364 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2365 2366
2366 return if $self->in_memory != cf::MAP_ACTIVE; 2367 return if !$self->linkable;
2367 return if $self->{deny_save}; 2368 return if $self->{deny_save};
2368 return if $self->players; 2369 return if $self->players;
2369 2370
2370 # first deactivate the map and "unlink" it from the core 2371 # first deactivate the map and "unlink" it from the core
2371 $self->deactivate; 2372 $self->deactivate;
2372 $_->clear_links_to ($self) for values %cf::MAP; 2373 $_->clear_links_to ($self) for values %cf::MAP;
2373 $self->in_memory (cf::MAP_SWAPPED); 2374 $self->state (cf::MAP_SWAPPED);
2374 2375
2375 # then atomically save 2376 # then atomically save
2376 $self->_save; 2377 $self->_save;
2377 2378
2378 # then free the map 2379 # then free the map
… …
2404 2405
2405 return if $self->players; 2406 return if $self->players;
2406 2407
2407 cf::trace "resetting map ", $self->path, "\n"; 2408 cf::trace "resetting map ", $self->path, "\n";
2408 2409
2409 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2410 2411
2411 # need to save uniques path 2412 # need to save uniques path
2412 unless ($self->{deny_save}) { 2413 unless ($self->{deny_save}) {
2413 my $uniq = $self->uniq_path; utf8::encode $uniq; 2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2414 2415
… …
2744 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2745 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2746 if $x <= 0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2747 2748
2748 $map->load; 2749 $map->load;
2749 $map->load_neighbours;
2750 2750
2751 return unless $self->contr->active; 2751 return unless $self->contr->active;
2752 2752
2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2754 if ($self->enter_map ($map, $x, $y)) { 2754 if ($self->enter_map ($map, $x, $y)) {
… …
2810 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2811 } 2811 }
2812 } 2812 }
2813 2813
2814 my $map = eval { 2814 my $map = eval {
2815 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2816 2816
2817 if ($map) { 2817 if ($map) {
2818 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2819 $map = $check->($map, $x, $y, $self) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2820 } else { 2820 } else {
… …
2910 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2911 2911
2912 unless (eval { 2912 unless (eval {
2913 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2914 2914
2915 # random map handling
2916 {
2917 my $guard = cf::lock_acquire "exit_prepare:$exit";
2918
2919 prepare_random_map $exit
2920 if $exit->slaying eq "/!";
2921 }
2922
2923 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2924 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2925 my $y = $exit->stats->sp; 2917 my $y = $exit->stats->sp;
2918
2919 # special map handling
2920 my $slaying = $exit->slaying;
2921
2922 # special map handling
2923 if ($slaying eq "/!") {
2924 my $guard = cf::lock_acquire "exit_prepare:$exit";
2925
2926 prepare_random_map $exit
2927 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2928
2929 $map = $exit->slaying;
2930
2931 } elsif ($slaying eq '!up') {
2932 $map = $exit->map->tile_path (cf::TILE_UP);
2933 $x = $exit->x;
2934 $y = $exit->y;
2935
2936 } elsif ($slaying eq '!down') {
2937 $map = $exit->map->tile_path (cf::TILE_DOWN);
2938 $x = $exit->x;
2939 $y = $exit->y;
2940 }
2926 2941
2927 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2928 2943
2929 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2930 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
… …
3172=cut 3187=cut
3173 3188
3174sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
3175 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
3176 3191
3177 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
3178 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3179 } elsif ($self->extcmd == 1) {
3180 #TODO: version 1, remove
3181 unshift @msg, msgtype => "reply", msgid => $id;
3182 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3183 }
3184} 3195}
3185 3196
3186=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
3187 3198
3188Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
… …
3243 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
3244 3255
3245 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3246 3257
3247 if (ref $msg) { 3258 if (ref $msg) {
3248 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3249 "ARRAY" eq ref $msg
3250 ? @$msg
3251 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3252 3260
3253 my @reply; 3261 my @reply;
3254 3262
3255 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
3256 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
… …
3506 3514
3507 { 3515 {
3508 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3509 3517
3510 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3511 if (defined $info->{type}) { 3519 if (defined (my $type = $info->{type})) {
3520 # TODO: different hash - must free and use new index, or cache ixface data queue
3512 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3521 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3513 3522
3514 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3523 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3515 cf::face::set_type $idx, $info->{type}; 3524 cf::face::set_type $idx, $type;
3525 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # any keys left are stashed into meta unless prepended
3516 } else { 3526 } else {
3517 $RESOURCE{$name} = $info; # unused 3527# $RESOURCE{$name} = $info; # unused
3518 } 3528 }
3519 3529
3520 cf::cede_to_tick; 3530 cf::cede_to_tick;
3521 } 3531 }
3522 } 3532 }
… …
3658 3668
3659sub main { 3669sub main {
3660 cf::init_globals; # initialise logging 3670 cf::init_globals; # initialise logging
3661 3671
3662 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3672 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3663 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3673 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3664 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3674 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3665 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3675 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3666 3676
3667 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3677 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3668 3678
… …
3710 }; 3720 };
3711 3721
3712 cf::object::thawer::errors_are_fatal 0; 3722 cf::object::thawer::errors_are_fatal 0;
3713 info "parse errors in files are no longer fatal from this point on.\n"; 3723 info "parse errors in files are no longer fatal from this point on.\n";
3714 3724
3715 my $free_main; $free_main = EV::idle sub { 3725 AE::postpone {
3716 undef $free_main;
3717 undef &main; # free gobs of memory :) 3726 undef &main; # free gobs of memory :)
3718 }; 3727 };
3719 3728
3720 goto &main_loop; 3729 goto &main_loop;
3721} 3730}
… …
3878 3887
3879 cf::write_runtime_sync; # external watchdog should not bark 3888 cf::write_runtime_sync; # external watchdog should not bark
3880 3889
3881 trace "emergency_perl_save: flushing outstanding aio requests"; 3890 trace "emergency_perl_save: flushing outstanding aio requests";
3882 while (IO::AIO::nreqs || BDB::nreqs) { 3891 while (IO::AIO::nreqs || BDB::nreqs) {
3883 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3892 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3884 } 3893 }
3885 3894
3886 cf::write_runtime_sync; # external watchdog should not bark 3895 cf::write_runtime_sync; # external watchdog should not bark
3887 }; 3896 };
3888 3897
… …
4069 4078
4070############################################################################# 4079#############################################################################
4071 4080
4072my $bug_warning = 0; 4081my $bug_warning = 0;
4073 4082
4074our @WAIT_FOR_TICK;
4075our @WAIT_FOR_TICK_BEGIN;
4076
4077sub wait_for_tick() { 4083sub wait_for_tick() {
4078 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4084 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4079 4085
4080 my $signal = new Coro::Signal; 4086 $WAIT_FOR_TICK->wait;
4081 push @WAIT_FOR_TICK, $signal;
4082 $signal->wait;
4083} 4087}
4084 4088
4085sub wait_for_tick_begin() { 4089sub wait_for_tick_begin() {
4086 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4090 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4087 4091
4088 my $signal = new Coro::Signal; 4092 my $signal = new Coro::Signal;
4089 push @WAIT_FOR_TICK_BEGIN, $signal; 4093 push @WAIT_FOR_TICK_BEGIN, $signal;
4090 $signal->wait; 4094 $signal->wait;
4091} 4095}
… …
4095 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4099 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4096 unless ++$bug_warning > 10; 4100 unless ++$bug_warning > 10;
4097 return; 4101 return;
4098 } 4102 }
4099 4103
4100 cf::server_tick; # one server iteration 4104 cf::one_tick; # one server iteration
4101 4105
4102 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4106 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4103 4107
4104 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4108 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4105 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4109 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4111 } 4115 }
4112 4116
4113 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4117 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4114 $sig->send; 4118 $sig->send;
4115 } 4119 }
4116 while (my $sig = shift @WAIT_FOR_TICK) { 4120 $WAIT_FOR_TICK->broadcast;
4117 $sig->send;
4118 }
4119 4121
4120 $LOAD = ($NOW - $TICK_START) / $TICK; 4122 $LOAD = ($NOW - $TICK_START) / $TICK;
4121 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4122 4124
4123 if (0) { 4125 if (0) {
… …
4132{ 4134{
4133 # configure BDB 4135 # configure BDB
4134 4136
4135 BDB::min_parallel 16; 4137 BDB::min_parallel 16;
4136 BDB::max_poll_reqs $TICK * 0.1; 4138 BDB::max_poll_reqs $TICK * 0.1;
4137 $AnyEvent::BDB::WATCHER->priority (1); 4139 #$AnyEvent::BDB::WATCHER->priority (1);
4138 4140
4139 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
4140 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
4141 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4142 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4144 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;

Diff Legend

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