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.566 by root, Sun May 1 16:58:16 2011 UTC vs.
Revision 1.582 by root, Fri Feb 3 03:01:45 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
… …
129our $DB_ENV; 129our $DB_ENV;
130 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132 132
133our %CFG; 133our %CFG;
134our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
134 135
135our $UPTIME; $UPTIME ||= time; 136our $UPTIME; $UPTIME ||= time;
136our $RUNTIME; 137our $RUNTIME = 0;
138our $SERVER_TICK = 0;
137our $NOW; 139our $NOW;
138 140
139our (%PLAYER, %PLAYER_LOADING); # all users 141our (%PLAYER, %PLAYER_LOADING); # all users
140our (%MAP, %MAP_LOADING ); # all maps 142our (%MAP, %MAP_LOADING ); # all maps
141our $LINK_MAP; # the special {link} map, which is always available 143our $LINK_MAP; # the special {link} map, which is always available
… …
150 152
151our @POST_INIT; 153our @POST_INIT;
152 154
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 155our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :) 156our $REALLY_UNLOOP; # never set to true, please :)
157
158our $WAIT_FOR_TICK = new Coro::Signal;
159our @WAIT_FOR_TICK_BEGIN;
155 160
156binmode STDOUT; 161binmode STDOUT;
157binmode STDERR; 162binmode STDERR;
158 163
159# read virtual server time, if available 164# read virtual server time, if available
… …
193 198
194=over 4 199=over 4
195 200
196=item $cf::UPTIME 201=item $cf::UPTIME
197 202
198The timestamp of the server start (so not actually an uptime). 203The timestamp of the server start (so not actually an "uptime").
204
205=item $cf::SERVER_TICK
206
207An unsigned integer that starts at zero when the server is started and is
208incremented on every tick.
209
210=item $cf::NOW
211
212The (real) time of the last (current) server tick - updated before and
213after tick processing, so this is useful only as a rough "what time is it
214now" estimate.
215
216=item $cf::TICK
217
218The interval between each server tick, in seconds.
199 219
200=item $cf::RUNTIME 220=item $cf::RUNTIME
201 221
202The time this server has run, starts at 0 and is increased by $cf::TICK on 222The time this server has run, starts at 0 and is increased by $cf::TICK on
203every server tick. 223every server tick.
… …
209Various directories - "/etc", read-only install directory, perl-library 229Various directories - "/etc", read-only install directory, perl-library
210directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 230directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
211unique-items directory, player file directory, random maps directory and 231unique-items directory, player file directory, random maps directory and
212database environment. 232database environment.
213 233
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 234=item $cf::LOADAVG
223 235
224The current CPU load on the server (alpha-smoothed), as a value between 0 236The 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 237(none) and 1 (overloaded), indicating how much time is spent on processing
226objects per tick. Healthy values are < 0.5. 238objects per tick. Healthy values are < 0.5.
… …
237=item cf::wait_for_tick, cf::wait_for_tick_begin 249=item cf::wait_for_tick, cf::wait_for_tick_begin
238 250
239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 251These 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 252returns 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. 253per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
254
255Note that cf::Wait_for_tick will immediately return when the server is not
256ticking, making it suitable for small pauses in threads that need to run
257when the server is paused. If that is not applicable (i.e. you I<really>
258want to wait, use C<$cf::WAIT_FOR_TICK>).
259
260=item $cf::WAIT_FOR_TICK
261
262Note that C<cf::wait_for_tick> is probably the correct thing to use. This
263variable contains a L<Coro::Signal> that is broadcats after every server
264tick. Calling C<< ->wait >> on it will suspend the caller until after the
265next server tick.
242 266
243=cut 267=cut
244 268
245sub wait_for_tick(); 269sub wait_for_tick();
246sub wait_for_tick_begin(); 270sub wait_for_tick_begin();
… …
349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 373 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
350 $d 374 $d
351 } || "[unable to dump $_[0]: '$@']"; 375 } || "[unable to dump $_[0]: '$@']";
352} 376}
353 377
354=item $scalar = load_file $path 378=item $scalar = cf::load_file $path
355 379
356Loads the given file from path and returns its contents. Croaks on error 380Loads the given file from path and returns its contents. Croaks on error
357and can block. 381and can block.
358 382
359=cut 383=cut
… …
361sub load_file($) { 385sub load_file($) {
362 0 <= aio_load $_[0], my $data 386 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!"; 387 or Carp::croak "$_[0]: $!";
364 388
365 $data 389 $data
390}
391
392=item $success = cf::replace_file $path, $data, $sync
393
394Atomically replaces the file at the given $path with new $data, and
395optionally $sync the data to disk before replacing the file.
396
397=cut
398
399sub replace_file($$;$) {
400 my ($path, $data, $sync) = @_;
401
402 my $lock = cf::lock_acquire ("replace_file:$path");
403
404 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
405 or return;
406
407 $data = $data->() if ref $data;
408
409 length $data == aio_write $fh, 0, (length $data), $data, 0
410 or return;
411
412 !$sync
413 or !aio_fsync $fh
414 or return;
415
416 aio_close $fh
417 and return;
418
419 aio_rename "$path~", $path
420 and return;
421
422 if ($sync) {
423 $path =~ s%/[^/]*$%%;
424 aio_pathsync $path;
425 }
426
427 1
366} 428}
367 429
368=item $ref = cf::decode_json $json 430=item $ref = cf::decode_json $json
369 431
370Converts a JSON string into the corresponding perl data structure. 432Converts a JSON string into the corresponding perl data structure.
… …
545 } 607 }
546 } 608 }
547 609
548 if (@SLOT_QUEUE) { 610 if (@SLOT_QUEUE) {
549 # we do not use wait_for_tick() as it returns immediately when tick is inactive 611 # we do not use wait_for_tick() as it returns immediately when tick is inactive
550 push @cf::WAIT_FOR_TICK, $signal; 612 $WAIT_FOR_TICK->wait;
551 $signal->wait;
552 } else { 613 } else {
553 $busy = 0; 614 $busy = 0;
554 Coro::schedule; 615 Coro::schedule;
555 } 616 }
556 } 617 }
… …
1439 my ($pl, $buf) = @_; 1500 my ($pl, $buf) = @_;
1440 1501
1441 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1442 1503
1443 if (ref $msg) { 1504 if (ref $msg) {
1444 my ($type, $reply, @payload) = 1505 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 1506
1449 my @reply; 1507 my @reply;
1450 1508
1451 if (my $cb = $EXTCMD{$type}) { 1509 if (my $cb = $EXTCMD{$type}) {
1452 @reply = $cb->($pl, @payload); 1510 @reply = $cb->($pl, @payload);
… …
1474 }; 1532 };
1475 1533
1476 $grp 1534 $grp
1477} 1535}
1478 1536
1537sub _ext_cfg_reg($$$$) {
1538 my ($rvar, $varname, $cfgname, $default) = @_;
1539
1540 $cfgname = lc $varname
1541 unless length $cfgname;
1542
1543 $EXT_CFG{$cfgname} = [$rvar, $default];
1544
1545 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1546}
1547
1479sub load_extensions { 1548sub load_extensions {
1480 info "loading extensions..."; 1549 info "loading extensions...";
1550
1551 %EXT_CFG = ();
1481 1552
1482 cf::sync_job { 1553 cf::sync_job {
1483 my %todo; 1554 my %todo;
1484 1555
1485 for my $path (<$LIBDIR/*.ext>) { 1556 for my $path (<$LIBDIR/*.ext>) {
… …
1528 unless exists $done{$_}; 1599 unless exists $done{$_};
1529 } 1600 }
1530 1601
1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1602 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1532 1603
1604 my $source = $v->{source};
1605
1606 # support "CONF varname :confname = default" pseudo-statements
1607 $source =~ s{
1608 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1609 }{
1610 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1611 }gmxe;
1612
1533 my $active = eval $v->{source}; 1613 my $active = eval $source;
1534 1614
1535 if (length $@) { 1615 if (length $@) {
1536 error "$v->{path}: $@\n"; 1616 error "$v->{path}: $@\n";
1537 1617
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1618 cf::cleanup "mandatory extension '$k' failed to load, exiting."
… …
1954 # {... are special paths that are not being touched 2034 # {... are special paths that are not being touched
1955 # ?xxx/... are special absolute paths 2035 # ?xxx/... are special absolute paths
1956 # ?random/... random maps 2036 # ?random/... random maps
1957 # /... normal maps 2037 # /... normal maps
1958 # ~user/... per-player map of a specific user 2038 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1960 2039
1961 $path =~ s/$PATH_SEP/\//go; 2040 $path =~ s/$PATH_SEP/\//go;
1962 2041
1963 # treat it as relative path if it starts with 2042 # treat it as relative path if it starts with
1964 # something that looks reasonable 2043 # something that looks reasonable
1965 if ($path =~ m{^(?:\./|\.\./|\w)}) { 2044 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1966 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 2045 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1967 2046
1968 $base =~ s{[^/]+/?$}{}; 2047 $base =~ s{[^/]+/?$}{};
1969 $path = "$base/$path"; 2048 $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 } 2049 }
1985 2050
1986 for ($path) { 2051 for ($path) {
1987 redo if s{/\.?/}{/}; 2052 redo if s{/\.?/}{/};
1988 redo if s{/[^/]+/\.\./}{/}; 2053 redo if s{/[^/]+/\.\./}{/};
… …
2186 2251
2187 { 2252 {
2188 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
2189 2254
2190 return unless $self->valid; 2255 return unless $self->valid;
2191 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
2192
2193 $self->in_memory (cf::MAP_LOADING);
2194 2257
2195 $self->alloc; 2258 $self->alloc;
2196 2259
2197 $self->pre_load; 2260 $self->pre_load;
2198 cf::cede_to_tick; 2261 cf::cede_to_tick;
… …
2221 } else { 2284 } else {
2222 $self->post_load_original 2285 $self->post_load_original
2223 if delete $self->{load_original}; 2286 if delete $self->{load_original};
2224 } 2287 }
2225 2288
2289 $self->state (cf::MAP_INACTIVE);
2290
2226 cf::cede_to_tick; 2291 cf::cede_to_tick;
2227 # now do the right thing for maps 2292 # now do the right thing for maps
2228 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2229 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
2230 unless $self->difficulty; 2295 unless $self->difficulty;
… …
2233 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2234 $self->decay_objects; 2299 $self->decay_objects;
2235 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2236 $self->update_buttons; 2301 $self->update_buttons;
2237 cf::cede_to_tick; 2302 cf::cede_to_tick;
2238 $self->activate; 2303 #$self->activate; # no longer activate maps automatically
2239 } 2304 }
2240 2305
2241 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2242 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2243
2244 $self->in_memory (cf::MAP_ACTIVE);
2245 } 2308 }
2246 2309
2247 $self->post_load; 2310 $self->post_load;
2248 2311
2249 1 2312 1
… …
2262# if $self->per_party; 2325# if $self->per_party;
2263 2326
2264 $self 2327 $self
2265} 2328}
2266 2329
2267# find and load all maps in the 3x3 area around a map
2268sub load_neighbours {
2269 my ($map) = @_;
2270
2271 my @neigh; # diagonal neighbours
2272
2273 for (0 .. 3) {
2274 my $neigh = $map->tile_path ($_)
2275 or next;
2276 $neigh = find $neigh, $map
2277 or next;
2278 $neigh->load;
2279
2280 # now find the diagonal neighbours
2281 push @neigh,
2282 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2283 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2284 }
2285
2286 for (grep defined $_->[0], @neigh) {
2287 my ($path, $origin) = @$_;
2288 my $neigh = find $path, $origin
2289 or next;
2290 $neigh->load;
2291 }
2292}
2293
2294sub find_sync { 2330sub find_sync {
2295 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2296 2332
2333 # it's a bug to call this from the main context
2297 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2334 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2298 if $Coro::current == $Coro::main; 2335 if $Coro::current == $Coro::main;
2299 2336
2300 find $path, $origin 2337 find $path, $origin
2301} 2338}
2302 2339
2303sub do_load_sync { 2340sub do_load_sync {
2304 my ($map) = @_; 2341 my ($map) = @_;
2305 2342
2343 # it's a bug to call this from the main context
2306 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2307 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2308 2346
2309 $map->load; 2347 $map->load;
2310} 2348}
… …
2316 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2317 2355
2318 $path = normalise $path, $origin; 2356 $path = normalise $path, $origin;
2319 2357
2320 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2321 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2359 return $map if !$load || $map->linkable;
2322 } 2360 }
2323 2361
2324 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2325 2363
2326 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
… …
2385sub swap_out { 2423sub swap_out {
2386 my ($self) = @_; 2424 my ($self) = @_;
2387 2425
2388 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2389 2427
2390 return if $self->in_memory != cf::MAP_ACTIVE; 2428 return if !$self->linkable;
2391 return if $self->{deny_save}; 2429 return if $self->{deny_save};
2392 return if $self->players; 2430 return if $self->players;
2393 2431
2394 # first deactivate the map and "unlink" it from the core 2432 # first deactivate the map and "unlink" it from the core
2395 $self->deactivate; 2433 $self->deactivate;
2396 $_->clear_links_to ($self) for values %cf::MAP; 2434 $_->clear_links_to ($self) for values %cf::MAP;
2397 $self->in_memory (cf::MAP_SWAPPED); 2435 $self->state (cf::MAP_SWAPPED);
2398 2436
2399 # then atomically save 2437 # then atomically save
2400 $self->_save; 2438 $self->_save;
2401 2439
2402 # then free the map 2440 # then free the map
… …
2428 2466
2429 return if $self->players; 2467 return if $self->players;
2430 2468
2431 cf::trace "resetting map ", $self->path, "\n"; 2469 cf::trace "resetting map ", $self->path, "\n";
2432 2470
2433 $self->in_memory (cf::MAP_SWAPPED); 2471 $self->state (cf::MAP_SWAPPED);
2434 2472
2435 # need to save uniques path 2473 # need to save uniques path
2436 unless ($self->{deny_save}) { 2474 unless ($self->{deny_save}) {
2437 my $uniq = $self->uniq_path; utf8::encode $uniq; 2475 my $uniq = $self->uniq_path; utf8::encode $uniq;
2438 2476
… …
2768 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2769 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2770 if $x <= 0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2771 2809
2772 $map->load; 2810 $map->load;
2773 $map->load_neighbours;
2774 2811
2775 return unless $self->contr->active; 2812 return unless $self->contr->active;
2776 2813
2777 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2778 if ($self->enter_map ($map, $x, $y)) { 2815 if ($self->enter_map ($map, $x, $y)) {
… …
2934 $Coro::current->{desc} = "enter_exit"; 2971 $Coro::current->{desc} = "enter_exit";
2935 2972
2936 unless (eval { 2973 unless (eval {
2937 $self->deactivate_recursive; # just to be sure 2974 $self->deactivate_recursive; # just to be sure
2938 2975
2939 # random map handling
2940 {
2941 my $guard = cf::lock_acquire "exit_prepare:$exit";
2942
2943 prepare_random_map $exit
2944 if $exit->slaying eq "/!";
2945 }
2946
2947 my $map = cf::map::normalise $exit->slaying, $exit->map; 2976 my $map = cf::map::normalise $exit->slaying, $exit->map;
2948 my $x = $exit->stats->hp; 2977 my $x = $exit->stats->hp;
2949 my $y = $exit->stats->sp; 2978 my $y = $exit->stats->sp;
2979
2980 # special map handling
2981 my $slaying = $exit->slaying;
2982
2983 # special map handling
2984 if ($slaying eq "/!") {
2985 my $guard = cf::lock_acquire "exit_prepare:$exit";
2986
2987 prepare_random_map $exit
2988 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2989
2990 $map = $exit->slaying;
2991
2992 } elsif ($slaying eq '!up') {
2993 $map = $exit->map->tile_path (cf::TILE_UP);
2994 $x = $exit->x;
2995 $y = $exit->y;
2996
2997 } elsif ($slaying eq '!down') {
2998 $map = $exit->map->tile_path (cf::TILE_DOWN);
2999 $x = $exit->x;
3000 $y = $exit->y;
3001 }
2950 3002
2951 $self->goto ($map, $x, $y); 3003 $self->goto ($map, $x, $y);
2952 3004
2953 # if exit is damned, update players death & WoR home-position 3005 # if exit is damned, update players death & WoR home-position
2954 $self->contr->savebed ($map, $x, $y) 3006 $self->contr->savebed ($map, $x, $y)
… …
3196=cut 3248=cut
3197 3249
3198sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
3199 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
3200 3252
3201 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
3202 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3255 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3203 } elsif ($self->extcmd == 1) {
3204 #TODO: version 1, remove
3205 unshift @msg, msgtype => "reply", msgid => $id;
3206 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3207 }
3208} 3256}
3209 3257
3210=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
3211 3259
3212Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
… …
3267 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
3268 3316
3269 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3270 3318
3271 if (ref $msg) { 3319 if (ref $msg) {
3272 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3273 "ARRAY" eq ref $msg
3274 ? @$msg
3275 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3276 3321
3277 my @reply; 3322 my @reply;
3278 3323
3279 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
3280 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
… …
3530 3575
3531 { 3576 {
3532 my $res = $facedata->{resource}; 3577 my $res = $facedata->{resource};
3533 3578
3534 while (my ($name, $info) = each %$res) { 3579 while (my ($name, $info) = each %$res) {
3535 if (defined $info->{type}) { 3580 if (defined (my $type = $info->{type})) {
3581 # TODO: different hash - must free and use new index, or cache ixface data queue
3536 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3582 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3537 3583
3538 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3584 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3539 cf::face::set_type $idx, $info->{type}; 3585 cf::face::set_type $idx, $type;
3586 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3540 } else { 3587 } else {
3541 $RESOURCE{$name} = $info; # unused 3588# $RESOURCE{$name} = $info; # unused
3542 } 3589 }
3543 3590
3544 cf::cede_to_tick; 3591 cf::cede_to_tick;
3545 } 3592 }
3546 } 3593 }
… …
3682 3729
3683sub main { 3730sub main {
3684 cf::init_globals; # initialise logging 3731 cf::init_globals; # initialise logging
3685 3732
3686 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3733 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3687 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3734 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3688 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3735 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3689 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3736 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3690 3737
3691 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3738 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3692 3739
… …
3734 }; 3781 };
3735 3782
3736 cf::object::thawer::errors_are_fatal 0; 3783 cf::object::thawer::errors_are_fatal 0;
3737 info "parse errors in files are no longer fatal from this point on.\n"; 3784 info "parse errors in files are no longer fatal from this point on.\n";
3738 3785
3739 my $free_main; $free_main = EV::idle sub { 3786 AE::postpone {
3740 undef $free_main;
3741 undef &main; # free gobs of memory :) 3787 undef &main; # free gobs of memory :)
3742 }; 3788 };
3743 3789
3744 goto &main_loop; 3790 goto &main_loop;
3745} 3791}
… …
3902 3948
3903 cf::write_runtime_sync; # external watchdog should not bark 3949 cf::write_runtime_sync; # external watchdog should not bark
3904 3950
3905 trace "emergency_perl_save: flushing outstanding aio requests"; 3951 trace "emergency_perl_save: flushing outstanding aio requests";
3906 while (IO::AIO::nreqs || BDB::nreqs) { 3952 while (IO::AIO::nreqs || BDB::nreqs) {
3907 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3953 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3908 } 3954 }
3909 3955
3910 cf::write_runtime_sync; # external watchdog should not bark 3956 cf::write_runtime_sync; # external watchdog should not bark
3911 }; 3957 };
3912 3958
… …
4093 4139
4094############################################################################# 4140#############################################################################
4095 4141
4096my $bug_warning = 0; 4142my $bug_warning = 0;
4097 4143
4098our @WAIT_FOR_TICK;
4099our @WAIT_FOR_TICK_BEGIN;
4100
4101sub wait_for_tick() { 4144sub wait_for_tick() {
4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4145 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4103 4146
4104 my $signal = new Coro::Signal; 4147 $WAIT_FOR_TICK->wait;
4105 push @WAIT_FOR_TICK, $signal;
4106 $signal->wait;
4107} 4148}
4108 4149
4109sub wait_for_tick_begin() { 4150sub wait_for_tick_begin() {
4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4151 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4111 4152
4112 my $signal = new Coro::Signal; 4153 my $signal = new Coro::Signal;
4113 push @WAIT_FOR_TICK_BEGIN, $signal; 4154 push @WAIT_FOR_TICK_BEGIN, $signal;
4114 $signal->wait; 4155 $signal->wait;
4115} 4156}
… …
4119 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4160 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4120 unless ++$bug_warning > 10; 4161 unless ++$bug_warning > 10;
4121 return; 4162 return;
4122 } 4163 }
4123 4164
4124 cf::server_tick; # one server iteration 4165 cf::one_tick; # one server iteration
4125 4166
4126 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4167 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4127 4168
4128 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4169 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4129 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4170 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4135 } 4176 }
4136 4177
4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4178 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4138 $sig->send; 4179 $sig->send;
4139 } 4180 }
4140 while (my $sig = shift @WAIT_FOR_TICK) { 4181 $WAIT_FOR_TICK->broadcast;
4141 $sig->send;
4142 }
4143 4182
4144 $LOAD = ($NOW - $TICK_START) / $TICK; 4183 $LOAD = ($NOW - $TICK_START) / $TICK;
4145 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4184 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4146 4185
4147 if (0) { 4186 if (0) {
… …
4156{ 4195{
4157 # configure BDB 4196 # configure BDB
4158 4197
4159 BDB::min_parallel 16; 4198 BDB::min_parallel 16;
4160 BDB::max_poll_reqs $TICK * 0.1; 4199 BDB::max_poll_reqs $TICK * 0.1;
4161 $AnyEvent::BDB::WATCHER->priority (1); 4200 #$AnyEvent::BDB::WATCHER->priority (1);
4162 4201
4163 unless ($DB_ENV) { 4202 unless ($DB_ENV) {
4164 $DB_ENV = BDB::db_env_create; 4203 $DB_ENV = BDB::db_env_create;
4165 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4204 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4166 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4205 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;

Diff Legend

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