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.563 by root, Sat Apr 23 04:56:51 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."
… …
2069 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
2070 2150
2071 1 2151 1
2072} 2152}
2073 2153
2154# used to laod the header of an original map
2074sub load_header_orig { 2155sub load_header_orig {
2075 my ($self) = @_; 2156 my ($self) = @_;
2076 2157
2077 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
2078} 2159}
2079 2160
2161# used to laod the header of an instantiated map
2080sub load_header_temp { 2162sub load_header_temp {
2081 my ($self) = @_; 2163 my ($self) = @_;
2082 2164
2083 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
2084} 2166}
2085 2167
2168# called after loading the header from an instantiated map
2086sub prepare_temp { 2169sub prepare_temp {
2087 my ($self) = @_; 2170 my ($self) = @_;
2088 2171
2089 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
2090 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
2091 # safety 2174 # safety
2092 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
2093 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
2094} 2177}
2095 2178
2179# called after loading the header from an original map
2096sub prepare_orig { 2180sub prepare_orig {
2097 my ($self) = @_; 2181 my ($self) = @_;
2098 2182
2099 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
2100 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
… …
2126sub find { 2210sub find {
2127 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
2128 2212
2129 cf::cede_to_tick; 2213 cf::cede_to_tick;
2130 2214
2131 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
2132 2216
2133 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2134 my $guard2 = cf::lock_acquire "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
2135 2219
2136 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
… …
2167 2251
2168 { 2252 {
2169 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
2170 2254
2171 return unless $self->valid; 2255 return unless $self->valid;
2172 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
2173
2174 $self->in_memory (cf::MAP_LOADING);
2175 2257
2176 $self->alloc; 2258 $self->alloc;
2177 2259
2178 $self->pre_load; 2260 $self->pre_load;
2179 cf::cede_to_tick; 2261 cf::cede_to_tick;
… …
2197 } 2279 }
2198 } 2280 }
2199 } 2281 }
2200 2282
2201 $f->resolve_delayed_derefs; 2283 $f->resolve_delayed_derefs;
2284 } else {
2285 $self->post_load_original
2286 if delete $self->{load_original};
2202 } 2287 }
2288
2289 $self->state (cf::MAP_INACTIVE);
2203 2290
2204 cf::cede_to_tick; 2291 cf::cede_to_tick;
2205 # now do the right thing for maps 2292 # now do the right thing for maps
2206 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2207 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
… …
2211 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2212 $self->decay_objects; 2299 $self->decay_objects;
2213 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2214 $self->update_buttons; 2301 $self->update_buttons;
2215 cf::cede_to_tick; 2302 cf::cede_to_tick;
2216 $self->activate; 2303 #$self->activate; # no longer activate maps automatically
2217 } 2304 }
2218 2305
2219 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2220 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2221
2222 $self->in_memory (cf::MAP_ACTIVE);
2223 } 2308 }
2224 2309
2225 $self->post_load; 2310 $self->post_load;
2226 2311
2227 1 2312 1
… …
2240# if $self->per_party; 2325# if $self->per_party;
2241 2326
2242 $self 2327 $self
2243} 2328}
2244 2329
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 { 2330sub find_sync {
2273 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2274 2332
2333 # it's a bug to call this from the main context
2275 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2334 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2276 if $Coro::current == $Coro::main; 2335 if $Coro::current == $Coro::main;
2277 2336
2278 find $path, $origin 2337 find $path, $origin
2279} 2338}
2280 2339
2281sub do_load_sync { 2340sub do_load_sync {
2282 my ($map) = @_; 2341 my ($map) = @_;
2283 2342
2343 # it's a bug to call this from the main context
2284 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2285 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2286 2346
2287 $map->load; 2347 $map->load;
2288} 2348}
… …
2291our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2292 2352
2293sub find_async { 2353sub find_async {
2294 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2295 2355
2296 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2297 2357
2298 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2299 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2359 return $map if !$load || $map->linkable;
2300 } 2360 }
2301 2361
2302 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2303 2363
2304 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
… …
2363sub swap_out { 2423sub swap_out {
2364 my ($self) = @_; 2424 my ($self) = @_;
2365 2425
2366 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2367 2427
2368 return if $self->in_memory != cf::MAP_ACTIVE; 2428 return if !$self->linkable;
2369 return if $self->{deny_save}; 2429 return if $self->{deny_save};
2370 return if $self->players; 2430 return if $self->players;
2371 2431
2372 # first deactivate the map and "unlink" it from the core 2432 # first deactivate the map and "unlink" it from the core
2373 $self->deactivate; 2433 $self->deactivate;
2374 $_->clear_links_to ($self) for values %cf::MAP; 2434 $_->clear_links_to ($self) for values %cf::MAP;
2375 $self->in_memory (cf::MAP_SWAPPED); 2435 $self->state (cf::MAP_SWAPPED);
2376 2436
2377 # then atomically save 2437 # then atomically save
2378 $self->_save; 2438 $self->_save;
2379 2439
2380 # then free the map 2440 # then free the map
… …
2406 2466
2407 return if $self->players; 2467 return if $self->players;
2408 2468
2409 cf::trace "resetting map ", $self->path, "\n"; 2469 cf::trace "resetting map ", $self->path, "\n";
2410 2470
2411 $self->in_memory (cf::MAP_SWAPPED); 2471 $self->state (cf::MAP_SWAPPED);
2412 2472
2413 # need to save uniques path 2473 # need to save uniques path
2414 unless ($self->{deny_save}) { 2474 unless ($self->{deny_save}) {
2415 my $uniq = $self->uniq_path; utf8::encode $uniq; 2475 my $uniq = $self->uniq_path; utf8::encode $uniq;
2416 2476
… …
2746 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2747 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2748 if $x <= 0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2749 2809
2750 $map->load; 2810 $map->load;
2751 $map->load_neighbours;
2752 2811
2753 return unless $self->contr->active; 2812 return unless $self->contr->active;
2754 2813
2755 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2756 if ($self->enter_map ($map, $x, $y)) { 2815 if ($self->enter_map ($map, $x, $y)) {
… …
2812 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2813 } 2872 }
2814 } 2873 }
2815 2874
2816 my $map = eval { 2875 my $map = eval {
2817 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2818 2877
2819 if ($map) { 2878 if ($map) {
2820 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2821 $map = $check->($map, $x, $y, $self) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2822 } else { 2881 } else {
… …
2912 $Coro::current->{desc} = "enter_exit"; 2971 $Coro::current->{desc} = "enter_exit";
2913 2972
2914 unless (eval { 2973 unless (eval {
2915 $self->deactivate_recursive; # just to be sure 2974 $self->deactivate_recursive; # just to be sure
2916 2975
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; 2976 my $map = cf::map::normalise $exit->slaying, $exit->map;
2926 my $x = $exit->stats->hp; 2977 my $x = $exit->stats->hp;
2927 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 }
2928 3002
2929 $self->goto ($map, $x, $y); 3003 $self->goto ($map, $x, $y);
2930 3004
2931 # if exit is damned, update players death & WoR home-position 3005 # if exit is damned, update players death & WoR home-position
2932 $self->contr->savebed ($map, $x, $y) 3006 $self->contr->savebed ($map, $x, $y)
… …
3174=cut 3248=cut
3175 3249
3176sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
3177 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
3178 3252
3179 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
3180 $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]));
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} 3256}
3187 3257
3188=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
3189 3259
3190Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
… …
3245 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
3246 3316
3247 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3248 3318
3249 if (ref $msg) { 3319 if (ref $msg) {
3250 my ($type, $reply, @payload) = 3320 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 3321
3255 my @reply; 3322 my @reply;
3256 3323
3257 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
3258 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
… …
3508 3575
3509 { 3576 {
3510 my $res = $facedata->{resource}; 3577 my $res = $facedata->{resource};
3511 3578
3512 while (my ($name, $info) = each %$res) { 3579 while (my ($name, $info) = each %$res) {
3513 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
3514 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3582 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3515 3583
3516 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3584 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3517 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
3518 } else { 3587 } else {
3519 $RESOURCE{$name} = $info; # unused 3588# $RESOURCE{$name} = $info; # unused
3520 } 3589 }
3521 3590
3522 cf::cede_to_tick; 3591 cf::cede_to_tick;
3523 } 3592 }
3524 } 3593 }
… …
3660 3729
3661sub main { 3730sub main {
3662 cf::init_globals; # initialise logging 3731 cf::init_globals; # initialise logging
3663 3732
3664 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3733 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3665 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.";
3666 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3735 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3667 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3736 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3668 3737
3669 $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
3670 3739
… …
3712 }; 3781 };
3713 3782
3714 cf::object::thawer::errors_are_fatal 0; 3783 cf::object::thawer::errors_are_fatal 0;
3715 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";
3716 3785
3717 my $free_main; $free_main = EV::idle sub { 3786 AE::postpone {
3718 undef $free_main;
3719 undef &main; # free gobs of memory :) 3787 undef &main; # free gobs of memory :)
3720 }; 3788 };
3721 3789
3722 goto &main_loop; 3790 goto &main_loop;
3723} 3791}
… …
3880 3948
3881 cf::write_runtime_sync; # external watchdog should not bark 3949 cf::write_runtime_sync; # external watchdog should not bark
3882 3950
3883 trace "emergency_perl_save: flushing outstanding aio requests"; 3951 trace "emergency_perl_save: flushing outstanding aio requests";
3884 while (IO::AIO::nreqs || BDB::nreqs) { 3952 while (IO::AIO::nreqs || BDB::nreqs) {
3885 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
3886 } 3954 }
3887 3955
3888 cf::write_runtime_sync; # external watchdog should not bark 3956 cf::write_runtime_sync; # external watchdog should not bark
3889 }; 3957 };
3890 3958
… …
4071 4139
4072############################################################################# 4140#############################################################################
4073 4141
4074my $bug_warning = 0; 4142my $bug_warning = 0;
4075 4143
4076our @WAIT_FOR_TICK;
4077our @WAIT_FOR_TICK_BEGIN;
4078
4079sub wait_for_tick() { 4144sub wait_for_tick() {
4080 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4145 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4081 4146
4082 my $signal = new Coro::Signal; 4147 $WAIT_FOR_TICK->wait;
4083 push @WAIT_FOR_TICK, $signal;
4084 $signal->wait;
4085} 4148}
4086 4149
4087sub wait_for_tick_begin() { 4150sub wait_for_tick_begin() {
4088 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4151 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4089 4152
4090 my $signal = new Coro::Signal; 4153 my $signal = new Coro::Signal;
4091 push @WAIT_FOR_TICK_BEGIN, $signal; 4154 push @WAIT_FOR_TICK_BEGIN, $signal;
4092 $signal->wait; 4155 $signal->wait;
4093} 4156}
… …
4097 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"
4098 unless ++$bug_warning > 10; 4161 unless ++$bug_warning > 10;
4099 return; 4162 return;
4100 } 4163 }
4101 4164
4102 cf::server_tick; # one server iteration 4165 cf::one_tick; # one server iteration
4103 4166
4104 #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#
4105 4168
4106 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4169 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4107 $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.;
… …
4113 } 4176 }
4114 4177
4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4178 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4116 $sig->send; 4179 $sig->send;
4117 } 4180 }
4118 while (my $sig = shift @WAIT_FOR_TICK) { 4181 $WAIT_FOR_TICK->broadcast;
4119 $sig->send;
4120 }
4121 4182
4122 $LOAD = ($NOW - $TICK_START) / $TICK; 4183 $LOAD = ($NOW - $TICK_START) / $TICK;
4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4184 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4124 4185
4125 if (0) { 4186 if (0) {
… …
4134{ 4195{
4135 # configure BDB 4196 # configure BDB
4136 4197
4137 BDB::min_parallel 16; 4198 BDB::min_parallel 16;
4138 BDB::max_poll_reqs $TICK * 0.1; 4199 BDB::max_poll_reqs $TICK * 0.1;
4139 $AnyEvent::BDB::WATCHER->priority (1); 4200 #$AnyEvent::BDB::WATCHER->priority (1);
4140 4201
4141 unless ($DB_ENV) { 4202 unless ($DB_ENV) {
4142 $DB_ENV = BDB::db_env_create; 4203 $DB_ENV = BDB::db_env_create;
4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4204 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4144 $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