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.587 by root, Wed Oct 31 19:09:47 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.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
… …
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp (); 35use Carp ();
36 36
37use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
… …
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Fcntl; 60use Fcntl;
57use YAML::XS (); 61use YAML::XS ();
… …
108our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
109our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid"; 114our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime"; 115our $RUNTIMEFILE = "$LOCALDIR/runtime";
112 116
113our %RESOURCE; # unused 117#our %RESOURCE; # unused
114 118
115our $OUTPUT_RATE_MIN = 3000; 119our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000; 120our $OUTPUT_RATE_MAX = 1000000;
117 121
118our $MAX_LINKS = 32; # how many chained exits to follow 122our $MAX_LINKS = 32; # how many chained exits to follow
… …
129our $DB_ENV; 133our $DB_ENV;
130 134
131our @EXTRA_MODULES = qw(pod match mapscript incloader); 135our @EXTRA_MODULES = qw(pod match mapscript incloader);
132 136
133our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
134 139
135our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
136our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
137our $NOW; 143our $NOW;
138 144
139our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
140our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
141our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
… …
150 156
151our @POST_INIT; 157our @POST_INIT;
152 158
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 159our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :) 160our $REALLY_UNLOOP; # never set to true, please :)
161
162our $WAIT_FOR_TICK = new Coro::Signal;
163our @WAIT_FOR_TICK_BEGIN;
155 164
156binmode STDOUT; 165binmode STDOUT;
157binmode STDERR; 166binmode STDERR;
158 167
159# read virtual server time, if available 168# read virtual server time, if available
… …
193 202
194=over 4 203=over 4
195 204
196=item $cf::UPTIME 205=item $cf::UPTIME
197 206
198The timestamp of the server start (so not actually an uptime). 207The timestamp of the server start (so not actually an "uptime").
208
209=item $cf::SERVER_TICK
210
211An unsigned integer that starts at zero when the server is started and is
212incremented on every tick.
213
214=item $cf::NOW
215
216The (real) time of the last (current) server tick - updated before and
217after tick processing, so this is useful only as a rough "what time is it
218now" estimate.
219
220=item $cf::TICK
221
222The interval between each server tick, in seconds.
199 223
200=item $cf::RUNTIME 224=item $cf::RUNTIME
201 225
202The time this server has run, starts at 0 and is increased by $cf::TICK on 226The time this server has run, starts at 0 and is increased by $cf::TICK on
203every server tick. 227every server tick.
… …
209Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
210directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
211unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
212database environment. 236database environment.
213 237
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 238=item $cf::LOADAVG
223 239
224The current CPU load on the server (alpha-smoothed), as a value between 0 240The 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 241(none) and 1 (overloaded), indicating how much time is spent on processing
226objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
… …
237=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
238 254
239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 255These 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 256returns 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. 257per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
258
259Note that cf::Wait_for_tick will immediately return when the server is not
260ticking, making it suitable for small pauses in threads that need to run
261when the server is paused. If that is not applicable (i.e. you I<really>
262want to wait, use C<$cf::WAIT_FOR_TICK>).
263
264=item $cf::WAIT_FOR_TICK
265
266Note that C<cf::wait_for_tick> is probably the correct thing to use. This
267variable contains a L<Coro::Signal> that is broadcats after every server
268tick. Calling C<< ->wait >> on it will suspend the caller until after the
269next server tick.
242 270
243=cut 271=cut
244 272
245sub wait_for_tick(); 273sub wait_for_tick();
246sub wait_for_tick_begin(); 274sub wait_for_tick_begin();
… …
312)) { 340)) {
313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
314} 342}
315 343
316$EV::DIED = sub { 344$EV::DIED = sub {
317 Carp::cluck "error in event callback: @_"; 345 warn "error in event callback: $@";
318}; 346};
319 347
320############################################################################# 348#############################################################################
321 349
322sub fork_call(&@); 350sub fork_call(&@);
… …
349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 377 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
350 $d 378 $d
351 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
352} 380}
353 381
354=item $scalar = load_file $path 382=item $scalar = cf::load_file $path
355 383
356Loads the given file from path and returns its contents. Croaks on error 384Loads the given file from path and returns its contents. Croaks on error
357and can block. 385and can block.
358 386
359=cut 387=cut
… …
361sub load_file($) { 389sub load_file($) {
362 0 <= aio_load $_[0], my $data 390 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!"; 391 or Carp::croak "$_[0]: $!";
364 392
365 $data 393 $data
394}
395
396=item $success = cf::replace_file $path, $data, $sync
397
398Atomically replaces the file at the given $path with new $data, and
399optionally $sync the data to disk before replacing the file.
400
401=cut
402
403sub replace_file($$;$) {
404 my ($path, $data, $sync) = @_;
405
406 my $lock = cf::lock_acquire ("replace_file:$path");
407
408 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
409 or return;
410
411 $data = $data->() if ref $data;
412
413 length $data == aio_write $fh, 0, (length $data), $data, 0
414 or return;
415
416 !$sync
417 or !aio_fsync $fh
418 or return;
419
420 aio_close $fh
421 and return;
422
423 aio_rename "$path~", $path
424 and return;
425
426 if ($sync) {
427 $path =~ s%/[^/]*$%%;
428 aio_pathsync $path;
429 }
430
431 1
366} 432}
367 433
368=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
369 435
370Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
… …
545 } 611 }
546 } 612 }
547 613
548 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
549 # we do not use wait_for_tick() as it returns immediately when tick is inactive 615 # we do not use wait_for_tick() as it returns immediately when tick is inactive
550 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
551 $signal->wait;
552 } else { 617 } else {
553 $busy = 0; 618 $busy = 0;
554 Coro::schedule; 619 Coro::schedule;
555 } 620 }
556 } 621 }
… …
1439 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1440 1505
1441 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1442 1507
1443 if (ref $msg) { 1508 if (ref $msg) {
1444 my ($type, $reply, @payload) = 1509 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 1510
1449 my @reply; 1511 my @reply;
1450 1512
1451 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1452 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
… …
1474 }; 1536 };
1475 1537
1476 $grp 1538 $grp
1477} 1539}
1478 1540
1541sub _ext_cfg_reg($$$$) {
1542 my ($rvar, $varname, $cfgname, $default) = @_;
1543
1544 $cfgname = lc $varname
1545 unless length $cfgname;
1546
1547 $EXT_CFG{$cfgname} = [$rvar, $default];
1548
1549 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1550}
1551
1479sub load_extensions { 1552sub load_extensions {
1480 info "loading extensions..."; 1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1481 1556
1482 cf::sync_job { 1557 cf::sync_job {
1483 my %todo; 1558 my %todo;
1484 1559
1485 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
… …
1528 unless exists $done{$_}; 1603 unless exists $done{$_};
1529 } 1604 }
1530 1605
1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1532 1607
1608 my $source = $v->{source};
1609
1610 # support "CONF varname :confname = default" pseudo-statements
1611 $source =~ s{
1612 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1613 }{
1614 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1615 }gmxe;
1616
1533 my $active = eval $v->{source}; 1617 my $active = eval $source;
1534 1618
1535 if (length $@) { 1619 if (length $@) {
1536 error "$v->{path}: $@\n"; 1620 error "$v->{path}: $@\n";
1537 1621
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
… …
1954 # {... are special paths that are not being touched 2038 # {... are special paths that are not being touched
1955 # ?xxx/... are special absolute paths 2039 # ?xxx/... are special absolute paths
1956 # ?random/... random maps 2040 # ?random/... random maps
1957 # /... normal maps 2041 # /... normal maps
1958 # ~user/... per-player map of a specific user 2042 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1960 2043
1961 $path =~ s/$PATH_SEP/\//go; 2044 $path =~ s/$PATH_SEP/\//go;
1962 2045
1963 # treat it as relative path if it starts with 2046 # treat it as relative path if it starts with
1964 # something that looks reasonable 2047 # something that looks reasonable
1965 if ($path =~ m{^(?:\./|\.\./|\w)}) { 2048 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1966 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 2049 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1967 2050
1968 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1969 $path = "$base/$path"; 2052 $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 } 2053 }
1985 2054
1986 for ($path) { 2055 for ($path) {
1987 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1988 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
… …
2186 2255
2187 { 2256 {
2188 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2189 2258
2190 return unless $self->valid; 2259 return unless $self->valid;
2191 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2192
2193 $self->in_memory (cf::MAP_LOADING);
2194 2261
2195 $self->alloc; 2262 $self->alloc;
2196 2263
2197 $self->pre_load; 2264 $self->pre_load;
2198 cf::cede_to_tick; 2265 cf::cede_to_tick;
… …
2221 } else { 2288 } else {
2222 $self->post_load_original 2289 $self->post_load_original
2223 if delete $self->{load_original}; 2290 if delete $self->{load_original};
2224 } 2291 }
2225 2292
2293 $self->state (cf::MAP_INACTIVE);
2294
2226 cf::cede_to_tick; 2295 cf::cede_to_tick;
2227 # now do the right thing for maps 2296 # now do the right thing for maps
2228 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2229 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
2230 unless $self->difficulty; 2299 unless $self->difficulty;
… …
2233 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2234 $self->decay_objects; 2303 $self->decay_objects;
2235 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2236 $self->update_buttons; 2305 $self->update_buttons;
2237 cf::cede_to_tick; 2306 cf::cede_to_tick;
2238 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2239 } 2308 }
2240 2309
2241 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2242 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2243
2244 $self->in_memory (cf::MAP_ACTIVE);
2245 } 2312 }
2246 2313
2247 $self->post_load; 2314 $self->post_load;
2248 2315
2249 1 2316 1
… …
2262# if $self->per_party; 2329# if $self->per_party;
2263 2330
2264 $self 2331 $self
2265} 2332}
2266 2333
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 { 2334sub find_sync {
2295 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2296 2336
2337 # it's a bug to call this from the main context
2297 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2298 if $Coro::current == $Coro::main; 2339 if $Coro::current == $Coro::main;
2299 2340
2300 find $path, $origin 2341 find $path, $origin
2301} 2342}
2302 2343
2303sub do_load_sync { 2344sub do_load_sync {
2304 my ($map) = @_; 2345 my ($map) = @_;
2305 2346
2347 # it's a bug to call this from the main context
2306 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2307 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2308 2350
2309 $map->load; 2351 $map->load;
2310} 2352}
… …
2316 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2317 2359
2318 $path = normalise $path, $origin; 2360 $path = normalise $path, $origin;
2319 2361
2320 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2321 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2322 } 2364 }
2323 2365
2324 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2325 2367
2326 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
… …
2385sub swap_out { 2427sub swap_out {
2386 my ($self) = @_; 2428 my ($self) = @_;
2387 2429
2388 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2389 2431
2390 return if $self->in_memory != cf::MAP_ACTIVE; 2432 return if !$self->linkable;
2391 return if $self->{deny_save}; 2433 return if $self->{deny_save};
2392 return if $self->players; 2434 return if $self->players;
2393 2435
2394 # first deactivate the map and "unlink" it from the core 2436 # first deactivate the map and "unlink" it from the core
2395 $self->deactivate; 2437 $self->deactivate;
2396 $_->clear_links_to ($self) for values %cf::MAP; 2438 $_->clear_links_to ($self) for values %cf::MAP;
2397 $self->in_memory (cf::MAP_SWAPPED); 2439 $self->state (cf::MAP_SWAPPED);
2398 2440
2399 # then atomically save 2441 # then atomically save
2400 $self->_save; 2442 $self->_save;
2401 2443
2402 # then free the map 2444 # then free the map
… …
2428 2470
2429 return if $self->players; 2471 return if $self->players;
2430 2472
2431 cf::trace "resetting map ", $self->path, "\n"; 2473 cf::trace "resetting map ", $self->path, "\n";
2432 2474
2433 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2434 2476
2435 # need to save uniques path 2477 # need to save uniques path
2436 unless ($self->{deny_save}) { 2478 unless ($self->{deny_save}) {
2437 my $uniq = $self->uniq_path; utf8::encode $uniq; 2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2438 2480
… …
2768 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2769 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2770 if $x <= 0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2771 2813
2772 $map->load; 2814 $map->load;
2773 $map->load_neighbours;
2774 2815
2775 return unless $self->contr->active; 2816 return unless $self->contr->active;
2776 2817
2777 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2778 if ($self->enter_map ($map, $x, $y)) { 2819 if ($self->enter_map ($map, $x, $y)) {
… …
2934 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2935 2976
2936 unless (eval { 2977 unless (eval {
2937 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2938 2979
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; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2948 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2949 my $y = $exit->stats->sp; 2982 my $y = $exit->stats->sp;
2983
2984 # special map handling
2985 my $slaying = $exit->slaying;
2986
2987 # special map handling
2988 if ($slaying eq "/!") {
2989 my $guard = cf::lock_acquire "exit_prepare:$exit";
2990
2991 prepare_random_map $exit
2992 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2993
2994 $map = $exit->slaying;
2995
2996 } elsif ($slaying eq '!up') {
2997 $map = $exit->map->tile_path (cf::TILE_UP);
2998 $x = $exit->x;
2999 $y = $exit->y;
3000
3001 } elsif ($slaying eq '!down') {
3002 $map = $exit->map->tile_path (cf::TILE_DOWN);
3003 $x = $exit->x;
3004 $y = $exit->y;
3005 }
2950 3006
2951 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2952 3008
2953 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2954 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
… …
3196=cut 3252=cut
3197 3253
3198sub cf::client::ext_reply($$@) { 3254sub cf::client::ext_reply($$@) {
3199 my ($self, $id, @msg) = @_; 3255 my ($self, $id, @msg) = @_;
3200 3256
3201 if ($self->extcmd == 2) { 3257 return unless $self->extcmd == 2;
3258
3202 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3259 $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} 3260}
3209 3261
3210=item $success = $client->query ($flags, "text", \&cb) 3262=item $success = $client->query ($flags, "text", \&cb)
3211 3263
3212Queues a query to the client, calling the given callback with 3264Queues a query to the client, calling the given callback with
… …
3267 my ($ns, $buf) = @_; 3319 my ($ns, $buf) = @_;
3268 3320
3269 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3321 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3270 3322
3271 if (ref $msg) { 3323 if (ref $msg) {
3272 my ($type, $reply, @payload) = 3324 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 3325
3277 my @reply; 3326 my @reply;
3278 3327
3279 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTICMD{$type}) {
3280 @reply = $cb->($ns, @payload); 3329 @reply = $cb->($ns, @payload);
… …
3458=cut 3507=cut
3459 3508
3460############################################################################# 3509#############################################################################
3461# the server's init and main functions 3510# the server's init and main functions
3462 3511
3512our %FACEHASH; # hash => idx, #d# HACK for http server
3513
3463sub load_facedata($) { 3514sub load_facedata($) {
3464 my ($path) = @_; 3515 my ($path) = @_;
3465 3516
3466 # HACK to clear player env face cache, we need some signal framework 3517 # HACK to clear player env face cache, we need some signal framework
3467 # for this (global event?) 3518 # for this (global event?)
… …
3486 cf::cede_to_tick; 3537 cf::cede_to_tick;
3487 3538
3488 { 3539 {
3489 my $faces = $facedata->{faceinfo}; 3540 my $faces = $facedata->{faceinfo};
3490 3541
3491 while (my ($face, $info) = each %$faces) { 3542 for my $face (sort keys %$faces) {
3543 my $info = $faces->{$face};
3492 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3544 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3493 3545
3494 cf::face::set_visibility $idx, $info->{visibility}; 3546 cf::face::set_visibility $idx, $info->{visibility};
3495 cf::face::set_magicmap $idx, $info->{magicmap}; 3547 cf::face::set_magicmap $idx, $info->{magicmap};
3496 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3548 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3497 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3549 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3498 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3550 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3551 $FACEHASH{$info->{hash64}} = $idx;#d#
3499 3552
3500 cf::cede_to_tick; 3553 cf::cede_to_tick;
3501 } 3554 }
3502 3555
3503 while (my ($face, $info) = each %$faces) { 3556 while (my ($face, $info) = each %$faces) {
… …
3530 3583
3531 { 3584 {
3532 my $res = $facedata->{resource}; 3585 my $res = $facedata->{resource};
3533 3586
3534 while (my ($name, $info) = each %$res) { 3587 while (my ($name, $info) = each %$res) {
3535 if (defined $info->{type}) { 3588 if (defined (my $type = $info->{type})) {
3589 # 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; 3590 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3537 3591
3538 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3592 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3539 cf::face::set_type $idx, $info->{type}; 3593 cf::face::set_type $idx, $type;
3594 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3595 $FACEHASH{$info->{hash}} = $idx;#d#
3540 } else { 3596 } else {
3541 $RESOURCE{$name} = $info; # unused 3597# $RESOURCE{$name} = $info; # unused
3542 } 3598 }
3543 3599
3544 cf::cede_to_tick; 3600 cf::cede_to_tick;
3545 } 3601 }
3546 } 3602 }
… …
3682 3738
3683sub main { 3739sub main {
3684 cf::init_globals; # initialise logging 3740 cf::init_globals; # initialise logging
3685 3741
3686 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3742 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3687 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3743 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3688 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3744 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3689 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3745 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3690 3746
3691 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3747 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3692 3748
3693 # we must not ever block the main coroutine 3749 # we must not ever block the main coroutine
3694 local $Coro::idle = sub { 3750 $Coro::idle = sub {
3695 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3751 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3696 (async { 3752 (async {
3697 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3753 $Coro::current->{desc} = "IDLE BUG HANDLER";
3698 EV::loop EV::LOOP_ONESHOT; 3754 EV::loop EV::LOOP_ONESHOT;
3699 })->prio (Coro::PRIO_MAX); 3755 })->prio (Coro::PRIO_MAX);
… …
3734 }; 3790 };
3735 3791
3736 cf::object::thawer::errors_are_fatal 0; 3792 cf::object::thawer::errors_are_fatal 0;
3737 info "parse errors in files are no longer fatal from this point on.\n"; 3793 info "parse errors in files are no longer fatal from this point on.\n";
3738 3794
3739 my $free_main; $free_main = EV::idle sub { 3795 AE::postpone {
3740 undef $free_main;
3741 undef &main; # free gobs of memory :) 3796 undef &main; # free gobs of memory :)
3742 }; 3797 };
3743 3798
3744 goto &main_loop; 3799 goto &main_loop;
3745} 3800}
… …
3902 3957
3903 cf::write_runtime_sync; # external watchdog should not bark 3958 cf::write_runtime_sync; # external watchdog should not bark
3904 3959
3905 trace "emergency_perl_save: flushing outstanding aio requests"; 3960 trace "emergency_perl_save: flushing outstanding aio requests";
3906 while (IO::AIO::nreqs || BDB::nreqs) { 3961 while (IO::AIO::nreqs || BDB::nreqs) {
3907 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3962 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3908 } 3963 }
3909 3964
3910 cf::write_runtime_sync; # external watchdog should not bark 3965 cf::write_runtime_sync; # external watchdog should not bark
3911 }; 3966 };
3912 3967
… …
4093 4148
4094############################################################################# 4149#############################################################################
4095 4150
4096my $bug_warning = 0; 4151my $bug_warning = 0;
4097 4152
4098our @WAIT_FOR_TICK;
4099our @WAIT_FOR_TICK_BEGIN;
4100
4101sub wait_for_tick() { 4153sub wait_for_tick() {
4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4154 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4103 4155
4104 my $signal = new Coro::Signal; 4156 $WAIT_FOR_TICK->wait;
4105 push @WAIT_FOR_TICK, $signal;
4106 $signal->wait;
4107} 4157}
4108 4158
4109sub wait_for_tick_begin() { 4159sub wait_for_tick_begin() {
4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4160 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4111 4161
4112 my $signal = new Coro::Signal; 4162 my $signal = new Coro::Signal;
4113 push @WAIT_FOR_TICK_BEGIN, $signal; 4163 push @WAIT_FOR_TICK_BEGIN, $signal;
4114 $signal->wait; 4164 $signal->wait;
4115} 4165}
… …
4119 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4169 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4120 unless ++$bug_warning > 10; 4170 unless ++$bug_warning > 10;
4121 return; 4171 return;
4122 } 4172 }
4123 4173
4124 cf::server_tick; # one server iteration 4174 cf::one_tick; # one server iteration
4125 4175
4126 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4176 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4127 4177
4128 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4178 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4129 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4179 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4135 } 4185 }
4136 4186
4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4187 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4138 $sig->send; 4188 $sig->send;
4139 } 4189 }
4140 while (my $sig = shift @WAIT_FOR_TICK) { 4190 $WAIT_FOR_TICK->broadcast;
4141 $sig->send;
4142 }
4143 4191
4144 $LOAD = ($NOW - $TICK_START) / $TICK; 4192 $LOAD = ($NOW - $TICK_START) / $TICK;
4145 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4193 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4146 4194
4147 if (0) { 4195 if (0) {
… …
4156{ 4204{
4157 # configure BDB 4205 # configure BDB
4158 4206
4159 BDB::min_parallel 16; 4207 BDB::min_parallel 16;
4160 BDB::max_poll_reqs $TICK * 0.1; 4208 BDB::max_poll_reqs $TICK * 0.1;
4161 $AnyEvent::BDB::WATCHER->priority (1); 4209 #$AnyEvent::BDB::WATCHER->priority (1);
4162 4210
4163 unless ($DB_ENV) { 4211 unless ($DB_ENV) {
4164 $DB_ENV = BDB::db_env_create; 4212 $DB_ENV = BDB::db_env_create;
4165 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4213 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4166 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4214 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;

Diff Legend

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