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.565 by root, Sat Apr 30 05:41:17 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,2011 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);
… …
1954 # {... are special paths that are not being touched 1973 # {... are special paths that are not being touched
1955 # ?xxx/... are special absolute paths 1974 # ?xxx/... are special absolute paths
1956 # ?random/... random maps 1975 # ?random/... random maps
1957 # /... normal maps 1976 # /... normal maps
1958 # ~user/... per-player map of a specific user 1977 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1960 1978
1961 $path =~ s/$PATH_SEP/\//go; 1979 $path =~ s/$PATH_SEP/\//go;
1962 1980
1963 # treat it as relative path if it starts with 1981 # treat it as relative path if it starts with
1964 # something that looks reasonable 1982 # something that looks reasonable
1965 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1983 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1966 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 1984 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1967 1985
1968 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1969 $path = "$base/$path"; 1987 $path = "$base/$path";
1970
1971 } elsif ($path eq '!up') {
1972 $base && ref $base
1973 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1974
1975 my $uppth = $base->tile_path (cf::TILE_UP);
1976 $path = $uppth if $uppth;
1977
1978 } elsif ($path eq '!down') {
1979 $base && ref $base
1980 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1981
1982 my $dpth = $base->tile_path (cf::TILE_DOWN);
1983 $path = $dpth if $dpth;
1984 } 1988 }
1985 1989
1986 for ($path) { 1990 for ($path) {
1987 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1988 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
… …
2084 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
2085 2089
2086 1 2090 1
2087} 2091}
2088 2092
2093# used to laod the header of an original map
2089sub load_header_orig { 2094sub load_header_orig {
2090 my ($self) = @_; 2095 my ($self) = @_;
2091 2096
2092 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
2093} 2098}
2094 2099
2100# used to laod the header of an instantiated map
2095sub load_header_temp { 2101sub load_header_temp {
2096 my ($self) = @_; 2102 my ($self) = @_;
2097 2103
2098 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
2099} 2105}
2100 2106
2107# called after loading the header from an instantiated map
2101sub prepare_temp { 2108sub prepare_temp {
2102 my ($self) = @_; 2109 my ($self) = @_;
2103 2110
2104 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
2105 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
2106 # safety 2113 # safety
2107 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
2108 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
2109} 2116}
2110 2117
2118# called after loading the header from an original map
2111sub prepare_orig { 2119sub prepare_orig {
2112 my ($self) = @_; 2120 my ($self) = @_;
2113 2121
2114 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
2115 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
… …
2182 2190
2183 { 2191 {
2184 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
2185 2193
2186 return unless $self->valid; 2194 return unless $self->valid;
2187 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2188
2189 $self->in_memory (cf::MAP_LOADING);
2190 2196
2191 $self->alloc; 2197 $self->alloc;
2192 2198
2193 $self->pre_load; 2199 $self->pre_load;
2194 cf::cede_to_tick; 2200 cf::cede_to_tick;
… …
2212 } 2218 }
2213 } 2219 }
2214 } 2220 }
2215 2221
2216 $f->resolve_delayed_derefs; 2222 $f->resolve_delayed_derefs;
2223 } else {
2224 $self->post_load_original
2225 if delete $self->{load_original};
2217 } 2226 }
2227
2228 $self->state (cf::MAP_INACTIVE);
2218 2229
2219 cf::cede_to_tick; 2230 cf::cede_to_tick;
2220 # now do the right thing for maps 2231 # now do the right thing for maps
2221 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2222 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
… …
2226 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2227 $self->decay_objects; 2238 $self->decay_objects;
2228 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2229 $self->update_buttons; 2240 $self->update_buttons;
2230 cf::cede_to_tick; 2241 cf::cede_to_tick;
2231 $self->activate; 2242 #$self->activate; # no longer activate maps automatically
2232 } 2243 }
2233 2244
2234 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2235 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2236
2237 $self->in_memory (cf::MAP_ACTIVE);
2238 } 2247 }
2239 2248
2240 $self->post_load; 2249 $self->post_load;
2241 2250
2242 1 2251 1
… …
2255# if $self->per_party; 2264# if $self->per_party;
2256 2265
2257 $self 2266 $self
2258} 2267}
2259 2268
2260# find and load all maps in the 3x3 area around a map
2261sub load_neighbours {
2262 my ($map) = @_;
2263
2264 my @neigh; # diagonal neighbours
2265
2266 for (0 .. 3) {
2267 my $neigh = $map->tile_path ($_)
2268 or next;
2269 $neigh = find $neigh, $map
2270 or next;
2271 $neigh->load;
2272
2273 # now find the diagonal neighbours
2274 push @neigh,
2275 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2276 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2277 }
2278
2279 for (grep defined $_->[0], @neigh) {
2280 my ($path, $origin) = @$_;
2281 my $neigh = find $path, $origin
2282 or next;
2283 $neigh->load;
2284 }
2285}
2286
2287sub find_sync { 2269sub find_sync {
2288 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2289 2271
2272 # it's a bug to call this from the main context
2290 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2291 if $Coro::current == $Coro::main; 2274 if $Coro::current == $Coro::main;
2292 2275
2293 find $path, $origin 2276 find $path, $origin
2294} 2277}
2295 2278
2296sub do_load_sync { 2279sub do_load_sync {
2297 my ($map) = @_; 2280 my ($map) = @_;
2298 2281
2282 # it's a bug to call this from the main context
2299 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2300 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2301 2285
2302 $map->load; 2286 $map->load;
2303} 2287}
… …
2309 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2310 2294
2311 $path = normalise $path, $origin; 2295 $path = normalise $path, $origin;
2312 2296
2313 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2314 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2315 } 2299 }
2316 2300
2317 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2318 2302
2319 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
… …
2378sub swap_out { 2362sub swap_out {
2379 my ($self) = @_; 2363 my ($self) = @_;
2380 2364
2381 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2382 2366
2383 return if $self->in_memory != cf::MAP_ACTIVE; 2367 return if !$self->linkable;
2384 return if $self->{deny_save}; 2368 return if $self->{deny_save};
2385 return if $self->players; 2369 return if $self->players;
2386 2370
2387 # first deactivate the map and "unlink" it from the core 2371 # first deactivate the map and "unlink" it from the core
2388 $self->deactivate; 2372 $self->deactivate;
2389 $_->clear_links_to ($self) for values %cf::MAP; 2373 $_->clear_links_to ($self) for values %cf::MAP;
2390 $self->in_memory (cf::MAP_SWAPPED); 2374 $self->state (cf::MAP_SWAPPED);
2391 2375
2392 # then atomically save 2376 # then atomically save
2393 $self->_save; 2377 $self->_save;
2394 2378
2395 # then free the map 2379 # then free the map
… …
2421 2405
2422 return if $self->players; 2406 return if $self->players;
2423 2407
2424 cf::trace "resetting map ", $self->path, "\n"; 2408 cf::trace "resetting map ", $self->path, "\n";
2425 2409
2426 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2427 2411
2428 # need to save uniques path 2412 # need to save uniques path
2429 unless ($self->{deny_save}) { 2413 unless ($self->{deny_save}) {
2430 my $uniq = $self->uniq_path; utf8::encode $uniq; 2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2431 2415
… …
2761 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2762 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2763 if $x <= 0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2764 2748
2765 $map->load; 2749 $map->load;
2766 $map->load_neighbours;
2767 2750
2768 return unless $self->contr->active; 2751 return unless $self->contr->active;
2769 2752
2770 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2771 if ($self->enter_map ($map, $x, $y)) { 2754 if ($self->enter_map ($map, $x, $y)) {
… …
2927 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2928 2911
2929 unless (eval { 2912 unless (eval {
2930 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2931 2914
2932 # random map handling
2933 {
2934 my $guard = cf::lock_acquire "exit_prepare:$exit";
2935
2936 prepare_random_map $exit
2937 if $exit->slaying eq "/!";
2938 }
2939
2940 my $map = cf::map::normalise $exit->slaying, $exit->map; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2941 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2942 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 }
2943 2941
2944 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2945 2943
2946 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2947 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
… …
3189=cut 3187=cut
3190 3188
3191sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
3192 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
3193 3191
3194 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
3195 $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]));
3196 } elsif ($self->extcmd == 1) {
3197 #TODO: version 1, remove
3198 unshift @msg, msgtype => "reply", msgid => $id;
3199 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3200 }
3201} 3195}
3202 3196
3203=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
3204 3198
3205Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
… …
3260 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
3261 3255
3262 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3263 3257
3264 if (ref $msg) { 3258 if (ref $msg) {
3265 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3266 "ARRAY" eq ref $msg
3267 ? @$msg
3268 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3269 3260
3270 my @reply; 3261 my @reply;
3271 3262
3272 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
3273 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
… …
3523 3514
3524 { 3515 {
3525 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3526 3517
3527 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3528 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
3529 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3521 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3530 3522
3531 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3523 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3532 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
3533 } else { 3526 } else {
3534 $RESOURCE{$name} = $info; # unused 3527# $RESOURCE{$name} = $info; # unused
3535 } 3528 }
3536 3529
3537 cf::cede_to_tick; 3530 cf::cede_to_tick;
3538 } 3531 }
3539 } 3532 }
… …
3675 3668
3676sub main { 3669sub main {
3677 cf::init_globals; # initialise logging 3670 cf::init_globals; # initialise logging
3678 3671
3679 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3672 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3680 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.";
3681 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3674 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3682 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3675 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3683 3676
3684 $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
3685 3678
… …
3727 }; 3720 };
3728 3721
3729 cf::object::thawer::errors_are_fatal 0; 3722 cf::object::thawer::errors_are_fatal 0;
3730 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";
3731 3724
3732 my $free_main; $free_main = EV::idle sub { 3725 AE::postpone {
3733 undef $free_main;
3734 undef &main; # free gobs of memory :) 3726 undef &main; # free gobs of memory :)
3735 }; 3727 };
3736 3728
3737 goto &main_loop; 3729 goto &main_loop;
3738} 3730}
… …
3895 3887
3896 cf::write_runtime_sync; # external watchdog should not bark 3888 cf::write_runtime_sync; # external watchdog should not bark
3897 3889
3898 trace "emergency_perl_save: flushing outstanding aio requests"; 3890 trace "emergency_perl_save: flushing outstanding aio requests";
3899 while (IO::AIO::nreqs || BDB::nreqs) { 3891 while (IO::AIO::nreqs || BDB::nreqs) {
3900 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
3901 } 3893 }
3902 3894
3903 cf::write_runtime_sync; # external watchdog should not bark 3895 cf::write_runtime_sync; # external watchdog should not bark
3904 }; 3896 };
3905 3897
… …
4086 4078
4087############################################################################# 4079#############################################################################
4088 4080
4089my $bug_warning = 0; 4081my $bug_warning = 0;
4090 4082
4091our @WAIT_FOR_TICK;
4092our @WAIT_FOR_TICK_BEGIN;
4093
4094sub wait_for_tick() { 4083sub wait_for_tick() {
4095 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4084 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4096 4085
4097 my $signal = new Coro::Signal; 4086 $WAIT_FOR_TICK->wait;
4098 push @WAIT_FOR_TICK, $signal;
4099 $signal->wait;
4100} 4087}
4101 4088
4102sub wait_for_tick_begin() { 4089sub wait_for_tick_begin() {
4103 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4090 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4104 4091
4105 my $signal = new Coro::Signal; 4092 my $signal = new Coro::Signal;
4106 push @WAIT_FOR_TICK_BEGIN, $signal; 4093 push @WAIT_FOR_TICK_BEGIN, $signal;
4107 $signal->wait; 4094 $signal->wait;
4108} 4095}
… …
4112 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"
4113 unless ++$bug_warning > 10; 4100 unless ++$bug_warning > 10;
4114 return; 4101 return;
4115 } 4102 }
4116 4103
4117 cf::server_tick; # one server iteration 4104 cf::one_tick; # one server iteration
4118 4105
4119 #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#
4120 4107
4121 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4108 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4122 $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.;
… …
4128 } 4115 }
4129 4116
4130 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4117 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4131 $sig->send; 4118 $sig->send;
4132 } 4119 }
4133 while (my $sig = shift @WAIT_FOR_TICK) { 4120 $WAIT_FOR_TICK->broadcast;
4134 $sig->send;
4135 }
4136 4121
4137 $LOAD = ($NOW - $TICK_START) / $TICK; 4122 $LOAD = ($NOW - $TICK_START) / $TICK;
4138 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4139 4124
4140 if (0) { 4125 if (0) {
… …
4149{ 4134{
4150 # configure BDB 4135 # configure BDB
4151 4136
4152 BDB::min_parallel 16; 4137 BDB::min_parallel 16;
4153 BDB::max_poll_reqs $TICK * 0.1; 4138 BDB::max_poll_reqs $TICK * 0.1;
4154 $AnyEvent::BDB::WATCHER->priority (1); 4139 #$AnyEvent::BDB::WATCHER->priority (1);
4155 4140
4156 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
4157 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
4158 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4159 $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