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.562 by root, Sat Apr 23 04:46:26 2011 UTC vs.
Revision 1.581 by root, Fri Feb 3 02:04:11 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();
… …
349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
350 $d 373 $d
351 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
352} 375}
353 376
354=item $scalar = load_file $path 377=item $scalar = cf::load_file $path
355 378
356Loads the given file from path and returns its contents. Croaks on error 379Loads the given file from path and returns its contents. Croaks on error
357and can block. 380and can block.
358 381
359=cut 382=cut
… …
361sub load_file($) { 384sub load_file($) {
362 0 <= aio_load $_[0], my $data 385 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!"; 386 or Carp::croak "$_[0]: $!";
364 387
365 $data 388 $data
389}
390
391=item $success = cf::replace_file $path, $data, $sync
392
393Atomically replaces the file at the given $path with new $data, and
394optionally $sync the data to disk before replacing the file.
395
396=cut
397
398sub replace_file($$;$) {
399 my ($path, $data, $sync) = @_;
400
401 my $lock = cf::lock_acquire ("replace_file:$path");
402
403 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
404 or return;
405
406 $data = $data->() if ref $data;
407
408 length $data == aio_write $fh, 0, (length $data), $data, 0
409 or return;
410
411 !$sync
412 or !aio_fsync $fh
413 or return;
414
415 aio_close $fh
416 and return;
417
418 aio_rename "$path~", $path
419 and return;
420
421 if ($sync) {
422 $path =~ s%/[^/]*$%%;
423 aio_pathsync $path;
424 }
425
426 1
366} 427}
367 428
368=item $ref = cf::decode_json $json 429=item $ref = cf::decode_json $json
369 430
370Converts a JSON string into the corresponding perl data structure. 431Converts a JSON string into the corresponding perl data structure.
… …
545 } 606 }
546 } 607 }
547 608
548 if (@SLOT_QUEUE) { 609 if (@SLOT_QUEUE) {
549 # we do not use wait_for_tick() as it returns immediately when tick is inactive 610 # we do not use wait_for_tick() as it returns immediately when tick is inactive
550 push @cf::WAIT_FOR_TICK, $signal; 611 $WAIT_FOR_TICK->wait;
551 $signal->wait;
552 } else { 612 } else {
553 $busy = 0; 613 $busy = 0;
554 Coro::schedule; 614 Coro::schedule;
555 } 615 }
556 } 616 }
… …
1439 my ($pl, $buf) = @_; 1499 my ($pl, $buf) = @_;
1440 1500
1441 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1501 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1442 1502
1443 if (ref $msg) { 1503 if (ref $msg) {
1444 my ($type, $reply, @payload) = 1504 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 1505
1449 my @reply; 1506 my @reply;
1450 1507
1451 if (my $cb = $EXTCMD{$type}) { 1508 if (my $cb = $EXTCMD{$type}) {
1452 @reply = $cb->($pl, @payload); 1509 @reply = $cb->($pl, @payload);
… …
2069 $self->{load_path} = $path; 2126 $self->{load_path} = $path;
2070 2127
2071 1 2128 1
2072} 2129}
2073 2130
2131# used to laod the header of an original map
2074sub load_header_orig { 2132sub load_header_orig {
2075 my ($self) = @_; 2133 my ($self) = @_;
2076 2134
2077 $self->load_header_from ($self->load_path) 2135 $self->load_header_from ($self->load_path)
2078} 2136}
2079 2137
2138# used to laod the header of an instantiated map
2080sub load_header_temp { 2139sub load_header_temp {
2081 my ($self) = @_; 2140 my ($self) = @_;
2082 2141
2083 $self->load_header_from ($self->save_path) 2142 $self->load_header_from ($self->save_path)
2084} 2143}
2085 2144
2145# called after loading the header from an instantiated map
2086sub prepare_temp { 2146sub prepare_temp {
2087 my ($self) = @_; 2147 my ($self) = @_;
2088 2148
2089 $self->last_access ((delete $self->{last_access}) 2149 $self->last_access ((delete $self->{last_access})
2090 || $cf::RUNTIME); #d# 2150 || $cf::RUNTIME); #d#
2091 # safety 2151 # safety
2092 $self->{instantiate_time} = $cf::RUNTIME 2152 $self->{instantiate_time} = $cf::RUNTIME
2093 if $self->{instantiate_time} > $cf::RUNTIME; 2153 if $self->{instantiate_time} > $cf::RUNTIME;
2094} 2154}
2095 2155
2156# called after loading the header from an original map
2096sub prepare_orig { 2157sub prepare_orig {
2097 my ($self) = @_; 2158 my ($self) = @_;
2098 2159
2099 $self->{load_original} = 1; 2160 $self->{load_original} = 1;
2100 $self->{instantiate_time} = $cf::RUNTIME; 2161 $self->{instantiate_time} = $cf::RUNTIME;
… …
2126sub find { 2187sub find {
2127 my ($path, $origin) = @_; 2188 my ($path, $origin) = @_;
2128 2189
2129 cf::cede_to_tick; 2190 cf::cede_to_tick;
2130 2191
2131 $path = normalise $path, $origin && $origin->path; 2192 $path = normalise $path, $origin;
2132 2193
2133 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2194 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2134 my $guard2 = cf::lock_acquire "map_find:$path"; 2195 my $guard2 = cf::lock_acquire "map_find:$path";
2135 2196
2136 $cf::MAP{$path} || do { 2197 $cf::MAP{$path} || do {
… …
2167 2228
2168 { 2229 {
2169 my $guard = cf::lock_acquire "map_data:$path"; 2230 my $guard = cf::lock_acquire "map_data:$path";
2170 2231
2171 return unless $self->valid; 2232 return unless $self->valid;
2172 return unless $self->in_memory == cf::MAP_SWAPPED; 2233 return unless $self->state == cf::MAP_SWAPPED;
2173
2174 $self->in_memory (cf::MAP_LOADING);
2175 2234
2176 $self->alloc; 2235 $self->alloc;
2177 2236
2178 $self->pre_load; 2237 $self->pre_load;
2179 cf::cede_to_tick; 2238 cf::cede_to_tick;
… …
2197 } 2256 }
2198 } 2257 }
2199 } 2258 }
2200 2259
2201 $f->resolve_delayed_derefs; 2260 $f->resolve_delayed_derefs;
2261 } else {
2262 $self->post_load_original
2263 if delete $self->{load_original};
2202 } 2264 }
2265
2266 $self->state (cf::MAP_INACTIVE);
2203 2267
2204 cf::cede_to_tick; 2268 cf::cede_to_tick;
2205 # now do the right thing for maps 2269 # now do the right thing for maps
2206 $self->link_multipart_objects; 2270 $self->link_multipart_objects;
2207 $self->difficulty ($self->estimate_difficulty) 2271 $self->difficulty ($self->estimate_difficulty)
… …
2211 unless ($self->{deny_activate}) { 2275 unless ($self->{deny_activate}) {
2212 $self->decay_objects; 2276 $self->decay_objects;
2213 $self->fix_auto_apply; 2277 $self->fix_auto_apply;
2214 $self->update_buttons; 2278 $self->update_buttons;
2215 cf::cede_to_tick; 2279 cf::cede_to_tick;
2216 $self->activate; 2280 #$self->activate; # no longer activate maps automatically
2217 } 2281 }
2218 2282
2219 $self->{last_save} = $cf::RUNTIME; 2283 $self->{last_save} = $cf::RUNTIME;
2220 $self->last_access ($cf::RUNTIME); 2284 $self->last_access ($cf::RUNTIME);
2221
2222 $self->in_memory (cf::MAP_ACTIVE);
2223 } 2285 }
2224 2286
2225 $self->post_load; 2287 $self->post_load;
2226 2288
2227 1 2289 1
… …
2240# if $self->per_party; 2302# if $self->per_party;
2241 2303
2242 $self 2304 $self
2243} 2305}
2244 2306
2245# find and load all maps in the 3x3 area around a map
2246sub load_neighbours {
2247 my ($map) = @_;
2248
2249 my @neigh; # diagonal neighbours
2250
2251 for (0 .. 3) {
2252 my $neigh = $map->tile_path ($_)
2253 or next;
2254 $neigh = find $neigh, $map
2255 or next;
2256 $neigh->load;
2257
2258 # now find the diagonal neighbours
2259 push @neigh,
2260 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2261 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2262 }
2263
2264 for (grep defined $_->[0], @neigh) {
2265 my ($path, $origin) = @$_;
2266 my $neigh = find $path, $origin
2267 or next;
2268 $neigh->load;
2269 }
2270}
2271
2272sub find_sync { 2307sub find_sync {
2273 my ($path, $origin) = @_; 2308 my ($path, $origin) = @_;
2274 2309
2310 # it's a bug to call this from the main context
2275 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2311 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2276 if $Coro::current == $Coro::main; 2312 if $Coro::current == $Coro::main;
2277 2313
2278 find $path, $origin 2314 find $path, $origin
2279} 2315}
2280 2316
2281sub do_load_sync { 2317sub do_load_sync {
2282 my ($map) = @_; 2318 my ($map) = @_;
2283 2319
2320 # it's a bug to call this from the main context
2284 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2321 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2285 if $Coro::current == $Coro::main; 2322 if $Coro::current == $Coro::main;
2286 2323
2287 $map->load; 2324 $map->load;
2288} 2325}
… …
2291our $MAP_PREFETCHER = undef; 2328our $MAP_PREFETCHER = undef;
2292 2329
2293sub find_async { 2330sub find_async {
2294 my ($path, $origin, $load) = @_; 2331 my ($path, $origin, $load) = @_;
2295 2332
2296 $path = normalise $path, $origin && $origin->{path}; 2333 $path = normalise $path, $origin;
2297 2334
2298 if (my $map = $cf::MAP{$path}) { 2335 if (my $map = $cf::MAP{$path}) {
2299 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2336 return $map if !$load || $map->linkable;
2300 } 2337 }
2301 2338
2302 $MAP_PREFETCH{$path} |= $load; 2339 $MAP_PREFETCH{$path} |= $load;
2303 2340
2304 $MAP_PREFETCHER ||= cf::async { 2341 $MAP_PREFETCHER ||= cf::async {
… …
2363sub swap_out { 2400sub swap_out {
2364 my ($self) = @_; 2401 my ($self) = @_;
2365 2402
2366 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2403 my $lock = cf::lock_acquire "map_data:$self->{path}";
2367 2404
2368 return if $self->in_memory != cf::MAP_ACTIVE; 2405 return if !$self->linkable;
2369 return if $self->{deny_save}; 2406 return if $self->{deny_save};
2370 return if $self->players; 2407 return if $self->players;
2371 2408
2372 # first deactivate the map and "unlink" it from the core 2409 # first deactivate the map and "unlink" it from the core
2373 $self->deactivate; 2410 $self->deactivate;
2374 $_->clear_links_to ($self) for values %cf::MAP; 2411 $_->clear_links_to ($self) for values %cf::MAP;
2375 $self->in_memory (cf::MAP_SWAPPED); 2412 $self->state (cf::MAP_SWAPPED);
2376 2413
2377 # then atomically save 2414 # then atomically save
2378 $self->_save; 2415 $self->_save;
2379 2416
2380 # then free the map 2417 # then free the map
… …
2406 2443
2407 return if $self->players; 2444 return if $self->players;
2408 2445
2409 cf::trace "resetting map ", $self->path, "\n"; 2446 cf::trace "resetting map ", $self->path, "\n";
2410 2447
2411 $self->in_memory (cf::MAP_SWAPPED); 2448 $self->state (cf::MAP_SWAPPED);
2412 2449
2413 # need to save uniques path 2450 # need to save uniques path
2414 unless ($self->{deny_save}) { 2451 unless ($self->{deny_save}) {
2415 my $uniq = $self->uniq_path; utf8::encode $uniq; 2452 my $uniq = $self->uniq_path; utf8::encode $uniq;
2416 2453
… …
2746 # use -1 or undef as default coordinates, not 0, 0 2783 # use -1 or undef as default coordinates, not 0, 0
2747 ($x, $y) = ($map->enter_x, $map->enter_y) 2784 ($x, $y) = ($map->enter_x, $map->enter_y)
2748 if $x <= 0 && $y <= 0; 2785 if $x <= 0 && $y <= 0;
2749 2786
2750 $map->load; 2787 $map->load;
2751 $map->load_neighbours;
2752 2788
2753 return unless $self->contr->active; 2789 return unless $self->contr->active;
2754 2790
2755 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2791 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2756 if ($self->enter_map ($map, $x, $y)) { 2792 if ($self->enter_map ($map, $x, $y)) {
… …
2812 ($path, $x, $y) = (undef, undef, undef); 2848 ($path, $x, $y) = (undef, undef, undef);
2813 } 2849 }
2814 } 2850 }
2815 2851
2816 my $map = eval { 2852 my $map = eval {
2817 my $map = defined $path ? cf::map::find $path : undef; 2853 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2818 2854
2819 if ($map) { 2855 if ($map) {
2820 $map = $map->customise_for ($self); 2856 $map = $map->customise_for ($self);
2821 $map = $check->($map, $x, $y, $self) if $check && $map; 2857 $map = $check->($map, $x, $y, $self) if $check && $map;
2822 } else { 2858 } else {
… …
2912 $Coro::current->{desc} = "enter_exit"; 2948 $Coro::current->{desc} = "enter_exit";
2913 2949
2914 unless (eval { 2950 unless (eval {
2915 $self->deactivate_recursive; # just to be sure 2951 $self->deactivate_recursive; # just to be sure
2916 2952
2917 # random map handling
2918 {
2919 my $guard = cf::lock_acquire "exit_prepare:$exit";
2920
2921 prepare_random_map $exit
2922 if $exit->slaying eq "/!";
2923 }
2924
2925 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2953 my $map = cf::map::normalise $exit->slaying, $exit->map;
2926 my $x = $exit->stats->hp; 2954 my $x = $exit->stats->hp;
2927 my $y = $exit->stats->sp; 2955 my $y = $exit->stats->sp;
2956
2957 # special map handling
2958 my $slaying = $exit->slaying;
2959
2960 # special map handling
2961 if ($slaying eq "/!") {
2962 my $guard = cf::lock_acquire "exit_prepare:$exit";
2963
2964 prepare_random_map $exit
2965 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2966
2967 $map = $exit->slaying;
2968
2969 } elsif ($slaying eq '!up') {
2970 $map = $exit->map->tile_path (cf::TILE_UP);
2971 $x = $exit->x;
2972 $y = $exit->y;
2973
2974 } elsif ($slaying eq '!down') {
2975 $map = $exit->map->tile_path (cf::TILE_DOWN);
2976 $x = $exit->x;
2977 $y = $exit->y;
2978 }
2928 2979
2929 $self->goto ($map, $x, $y); 2980 $self->goto ($map, $x, $y);
2930 2981
2931 # if exit is damned, update players death & WoR home-position 2982 # if exit is damned, update players death & WoR home-position
2932 $self->contr->savebed ($map, $x, $y) 2983 $self->contr->savebed ($map, $x, $y)
… …
3174=cut 3225=cut
3175 3226
3176sub cf::client::ext_reply($$@) { 3227sub cf::client::ext_reply($$@) {
3177 my ($self, $id, @msg) = @_; 3228 my ($self, $id, @msg) = @_;
3178 3229
3179 if ($self->extcmd == 2) { 3230 return unless $self->extcmd == 2;
3231
3180 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3232 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3181 } elsif ($self->extcmd == 1) {
3182 #TODO: version 1, remove
3183 unshift @msg, msgtype => "reply", msgid => $id;
3184 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3185 }
3186} 3233}
3187 3234
3188=item $success = $client->query ($flags, "text", \&cb) 3235=item $success = $client->query ($flags, "text", \&cb)
3189 3236
3190Queues a query to the client, calling the given callback with 3237Queues a query to the client, calling the given callback with
… …
3245 my ($ns, $buf) = @_; 3292 my ($ns, $buf) = @_;
3246 3293
3247 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3294 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3248 3295
3249 if (ref $msg) { 3296 if (ref $msg) {
3250 my ($type, $reply, @payload) = 3297 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3251 "ARRAY" eq ref $msg
3252 ? @$msg
3253 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3254 3298
3255 my @reply; 3299 my @reply;
3256 3300
3257 if (my $cb = $EXTICMD{$type}) { 3301 if (my $cb = $EXTICMD{$type}) {
3258 @reply = $cb->($ns, @payload); 3302 @reply = $cb->($ns, @payload);
… …
3508 3552
3509 { 3553 {
3510 my $res = $facedata->{resource}; 3554 my $res = $facedata->{resource};
3511 3555
3512 while (my ($name, $info) = each %$res) { 3556 while (my ($name, $info) = each %$res) {
3513 if (defined $info->{type}) { 3557 if (defined (my $type = $info->{type})) {
3558 # TODO: different hash - must free and use new index, or cache ixface data queue
3514 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3559 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3515 3560
3516 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3561 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3517 cf::face::set_type $idx, $info->{type}; 3562 cf::face::set_type $idx, $type;
3563 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3518 } else { 3564 } else {
3519 $RESOURCE{$name} = $info; # unused 3565# $RESOURCE{$name} = $info; # unused
3520 } 3566 }
3521 3567
3522 cf::cede_to_tick; 3568 cf::cede_to_tick;
3523 } 3569 }
3524 } 3570 }
… …
3660 3706
3661sub main { 3707sub main {
3662 cf::init_globals; # initialise logging 3708 cf::init_globals; # initialise logging
3663 3709
3664 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3710 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3665 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3711 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3666 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3712 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3667 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3713 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3668 3714
3669 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3715 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3670 3716
… …
3712 }; 3758 };
3713 3759
3714 cf::object::thawer::errors_are_fatal 0; 3760 cf::object::thawer::errors_are_fatal 0;
3715 info "parse errors in files are no longer fatal from this point on.\n"; 3761 info "parse errors in files are no longer fatal from this point on.\n";
3716 3762
3717 my $free_main; $free_main = EV::idle sub { 3763 AE::postpone {
3718 undef $free_main;
3719 undef &main; # free gobs of memory :) 3764 undef &main; # free gobs of memory :)
3720 }; 3765 };
3721 3766
3722 goto &main_loop; 3767 goto &main_loop;
3723} 3768}
… …
3880 3925
3881 cf::write_runtime_sync; # external watchdog should not bark 3926 cf::write_runtime_sync; # external watchdog should not bark
3882 3927
3883 trace "emergency_perl_save: flushing outstanding aio requests"; 3928 trace "emergency_perl_save: flushing outstanding aio requests";
3884 while (IO::AIO::nreqs || BDB::nreqs) { 3929 while (IO::AIO::nreqs || BDB::nreqs) {
3885 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3930 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3886 } 3931 }
3887 3932
3888 cf::write_runtime_sync; # external watchdog should not bark 3933 cf::write_runtime_sync; # external watchdog should not bark
3889 }; 3934 };
3890 3935
… …
4071 4116
4072############################################################################# 4117#############################################################################
4073 4118
4074my $bug_warning = 0; 4119my $bug_warning = 0;
4075 4120
4076our @WAIT_FOR_TICK;
4077our @WAIT_FOR_TICK_BEGIN;
4078
4079sub wait_for_tick() { 4121sub wait_for_tick() {
4080 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4122 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4081 4123
4082 my $signal = new Coro::Signal; 4124 $WAIT_FOR_TICK->wait;
4083 push @WAIT_FOR_TICK, $signal;
4084 $signal->wait;
4085} 4125}
4086 4126
4087sub wait_for_tick_begin() { 4127sub wait_for_tick_begin() {
4088 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4128 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4089 4129
4090 my $signal = new Coro::Signal; 4130 my $signal = new Coro::Signal;
4091 push @WAIT_FOR_TICK_BEGIN, $signal; 4131 push @WAIT_FOR_TICK_BEGIN, $signal;
4092 $signal->wait; 4132 $signal->wait;
4093} 4133}
… …
4097 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4137 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4098 unless ++$bug_warning > 10; 4138 unless ++$bug_warning > 10;
4099 return; 4139 return;
4100 } 4140 }
4101 4141
4102 cf::server_tick; # one server iteration 4142 cf::one_tick; # one server iteration
4103 4143
4104 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4144 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4105 4145
4106 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4147 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4113 } 4153 }
4114 4154
4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4155 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4116 $sig->send; 4156 $sig->send;
4117 } 4157 }
4118 while (my $sig = shift @WAIT_FOR_TICK) { 4158 $WAIT_FOR_TICK->broadcast;
4119 $sig->send;
4120 }
4121 4159
4122 $LOAD = ($NOW - $TICK_START) / $TICK; 4160 $LOAD = ($NOW - $TICK_START) / $TICK;
4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4161 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4124 4162
4125 if (0) { 4163 if (0) {
… …
4134{ 4172{
4135 # configure BDB 4173 # configure BDB
4136 4174
4137 BDB::min_parallel 16; 4175 BDB::min_parallel 16;
4138 BDB::max_poll_reqs $TICK * 0.1; 4176 BDB::max_poll_reqs $TICK * 0.1;
4139 $AnyEvent::BDB::WATCHER->priority (1); 4177 #$AnyEvent::BDB::WATCHER->priority (1);
4140 4178
4141 unless ($DB_ENV) { 4179 unless ($DB_ENV) {
4142 $DB_ENV = BDB::db_env_create; 4180 $DB_ENV = BDB::db_env_create;
4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4181 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4144 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4182 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;

Diff Legend

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