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.561 by root, Fri Apr 22 06:10:33 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 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."
2069 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
2070 2154
2071 1 2155 1
2072} 2156}
2073 2157
2158# used to laod the header of an original map
2074sub load_header_orig { 2159sub load_header_orig {
2075 my ($self) = @_; 2160 my ($self) = @_;
2076 2161
2077 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
2078} 2163}
2079 2164
2165# used to laod the header of an instantiated map
2080sub load_header_temp { 2166sub load_header_temp {
2081 my ($self) = @_; 2167 my ($self) = @_;
2082 2168
2083 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
2084} 2170}
2085 2171
2172# called after loading the header from an instantiated map
2086sub prepare_temp { 2173sub prepare_temp {
2087 my ($self) = @_; 2174 my ($self) = @_;
2088 2175
2089 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
2090 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
2091 # safety 2178 # safety
2092 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
2093 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
2094} 2181}
2095 2182
2183# called after loading the header from an original map
2096sub prepare_orig { 2184sub prepare_orig {
2097 my ($self) = @_; 2185 my ($self) = @_;
2098 2186
2099 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
2100 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
2126sub find { 2214sub find {
2127 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
2128 2216
2129 cf::cede_to_tick; 2217 cf::cede_to_tick;
2130 2218
2131 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
2132 2220
2133 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2134 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
2135 2223
2136 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
2167 2255
2168 { 2256 {
2169 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2170 2258
2171 return unless $self->valid; 2259 return unless $self->valid;
2172 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2173
2174 $self->in_memory (cf::MAP_LOADING);
2175 2261
2176 $self->alloc; 2262 $self->alloc;
2177 2263
2178 $self->pre_load; 2264 $self->pre_load;
2179 cf::cede_to_tick; 2265 cf::cede_to_tick;
2180 2266
2267 if (exists $self->{load_path}) {
2181 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2182 $f->skip_block; 2269 $f->skip_block;
2183 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2184 or return; 2271 or return;
2185 2272
2186 $self->post_load_original 2273 $self->post_load_original
2187 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2188 2275
2189 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2190 utf8::encode $uniq; 2277 utf8::encode $uniq;
2191 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2192 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2193 $self->clear_unique_items; 2280 $self->clear_unique_items;
2194 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2195 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2196 } 2284 }
2197 } 2285 }
2198 }
2199 2286
2200 $f->resolve_delayed_derefs; 2287 $f->resolve_delayed_derefs;
2288 } else {
2289 $self->post_load_original
2290 if delete $self->{load_original};
2291 }
2292
2293 $self->state (cf::MAP_INACTIVE);
2201 2294
2202 cf::cede_to_tick; 2295 cf::cede_to_tick;
2203 # now do the right thing for maps 2296 # now do the right thing for maps
2204 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2205 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
2209 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2210 $self->decay_objects; 2303 $self->decay_objects;
2211 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2212 $self->update_buttons; 2305 $self->update_buttons;
2213 cf::cede_to_tick; 2306 cf::cede_to_tick;
2214 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2215 } 2308 }
2216 2309
2217 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2218 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2219
2220 $self->in_memory (cf::MAP_ACTIVE);
2221 } 2312 }
2222 2313
2223 $self->post_load; 2314 $self->post_load;
2224 2315
2225 1 2316 1
2238# if $self->per_party; 2329# if $self->per_party;
2239 2330
2240 $self 2331 $self
2241} 2332}
2242 2333
2243# find and load all maps in the 3x3 area around a map
2244sub load_neighbours {
2245 my ($map) = @_;
2246
2247 my @neigh; # diagonal neighbours
2248
2249 for (0 .. 3) {
2250 my $neigh = $map->tile_path ($_)
2251 or next;
2252 $neigh = find $neigh, $map
2253 or next;
2254 $neigh->load;
2255
2256 # now find the diagonal neighbours
2257 push @neigh,
2258 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2259 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2260 }
2261
2262 for (grep defined $_->[0], @neigh) {
2263 my ($path, $origin) = @$_;
2264 my $neigh = find $path, $origin
2265 or next;
2266 $neigh->load;
2267 }
2268}
2269
2270sub find_sync { 2334sub find_sync {
2271 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2272 2336
2337 # it's a bug to call this from the main context
2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2274 if $Coro::current == $Coro::main; 2339 if $Coro::current == $Coro::main;
2275 2340
2276 find $path, $origin 2341 find $path, $origin
2277} 2342}
2278 2343
2279sub do_load_sync { 2344sub do_load_sync {
2280 my ($map) = @_; 2345 my ($map) = @_;
2281 2346
2347 # it's a bug to call this from the main context
2282 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2283 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2284 2350
2285 $map->load; 2351 $map->load;
2286} 2352}
2289our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2290 2356
2291sub find_async { 2357sub find_async {
2292 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2293 2359
2294 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2295 2361
2296 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2297 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2298 } 2364 }
2299 2365
2300 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2301 2367
2302 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
2361sub swap_out { 2427sub swap_out {
2362 my ($self) = @_; 2428 my ($self) = @_;
2363 2429
2364 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2365 2431
2366 return if $self->in_memory != cf::MAP_ACTIVE; 2432 return if !$self->linkable;
2367 return if $self->{deny_save}; 2433 return if $self->{deny_save};
2368 return if $self->players; 2434 return if $self->players;
2369 2435
2370 # first deactivate the map and "unlink" it from the core 2436 # first deactivate the map and "unlink" it from the core
2371 $self->deactivate; 2437 $self->deactivate;
2372 $_->clear_links_to ($self) for values %cf::MAP; 2438 $_->clear_links_to ($self) for values %cf::MAP;
2373 $self->in_memory (cf::MAP_SWAPPED); 2439 $self->state (cf::MAP_SWAPPED);
2374 2440
2375 # then atomically save 2441 # then atomically save
2376 $self->_save; 2442 $self->_save;
2377 2443
2378 # then free the map 2444 # then free the map
2404 2470
2405 return if $self->players; 2471 return if $self->players;
2406 2472
2407 cf::trace "resetting map ", $self->path, "\n"; 2473 cf::trace "resetting map ", $self->path, "\n";
2408 2474
2409 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2410 2476
2411 # need to save uniques path 2477 # need to save uniques path
2412 unless ($self->{deny_save}) { 2478 unless ($self->{deny_save}) {
2413 my $uniq = $self->uniq_path; utf8::encode $uniq; 2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2414 2480
2744 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2745 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2746 if $x <= 0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2747 2813
2748 $map->load; 2814 $map->load;
2749 $map->load_neighbours;
2750 2815
2751 return unless $self->contr->active; 2816 return unless $self->contr->active;
2752 2817
2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2754 if ($self->enter_map ($map, $x, $y)) { 2819 if ($self->enter_map ($map, $x, $y)) {
2810 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2811 } 2876 }
2812 } 2877 }
2813 2878
2814 my $map = eval { 2879 my $map = eval {
2815 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2816 2881
2817 if ($map) { 2882 if ($map) {
2818 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2819 $map = $check->($map, $x, $y, $self) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2820 } else { 2885 } else {
2910 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2911 2976
2912 unless (eval { 2977 unless (eval {
2913 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2914 2979
2915 # random map handling
2916 {
2917 my $guard = cf::lock_acquire "exit_prepare:$exit";
2918
2919 prepare_random_map $exit
2920 if $exit->slaying eq "/!";
2921 }
2922
2923 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2924 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2925 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 }
2926 3006
2927 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2928 3008
2929 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2930 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
3172=cut 3252=cut
3173 3253
3174sub cf::client::ext_reply($$@) { 3254sub cf::client::ext_reply($$@) {
3175 my ($self, $id, @msg) = @_; 3255 my ($self, $id, @msg) = @_;
3176 3256
3177 if ($self->extcmd == 2) { 3257 return unless $self->extcmd == 2;
3258
3178 $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]));
3179 } elsif ($self->extcmd == 1) {
3180 #TODO: version 1, remove
3181 unshift @msg, msgtype => "reply", msgid => $id;
3182 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3183 }
3184} 3260}
3185 3261
3186=item $success = $client->query ($flags, "text", \&cb) 3262=item $success = $client->query ($flags, "text", \&cb)
3187 3263
3188Queues a query to the client, calling the given callback with 3264Queues a query to the client, calling the given callback with
3243 my ($ns, $buf) = @_; 3319 my ($ns, $buf) = @_;
3244 3320
3245 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3321 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3246 3322
3247 if (ref $msg) { 3323 if (ref $msg) {
3248 my ($type, $reply, @payload) = 3324 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3249 "ARRAY" eq ref $msg
3250 ? @$msg
3251 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3252 3325
3253 my @reply; 3326 my @reply;
3254 3327
3255 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTICMD{$type}) {
3256 @reply = $cb->($ns, @payload); 3329 @reply = $cb->($ns, @payload);
3434=cut 3507=cut
3435 3508
3436############################################################################# 3509#############################################################################
3437# the server's init and main functions 3510# the server's init and main functions
3438 3511
3512our %FACEHASH; # hash => idx, #d# HACK for http server
3513
3439sub load_facedata($) { 3514sub load_facedata($) {
3440 my ($path) = @_; 3515 my ($path) = @_;
3441 3516
3442 # 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
3443 # for this (global event?) 3518 # for this (global event?)
3462 cf::cede_to_tick; 3537 cf::cede_to_tick;
3463 3538
3464 { 3539 {
3465 my $faces = $facedata->{faceinfo}; 3540 my $faces = $facedata->{faceinfo};
3466 3541
3467 while (my ($face, $info) = each %$faces) { 3542 for my $face (sort keys %$faces) {
3543 my $info = $faces->{$face};
3468 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3544 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3469 3545
3470 cf::face::set_visibility $idx, $info->{visibility}; 3546 cf::face::set_visibility $idx, $info->{visibility};
3471 cf::face::set_magicmap $idx, $info->{magicmap}; 3547 cf::face::set_magicmap $idx, $info->{magicmap};
3472 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3548 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3473 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3549 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3474 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#
3475 3552
3476 cf::cede_to_tick; 3553 cf::cede_to_tick;
3477 } 3554 }
3478 3555
3479 while (my ($face, $info) = each %$faces) { 3556 while (my ($face, $info) = each %$faces) {
3506 3583
3507 { 3584 {
3508 my $res = $facedata->{resource}; 3585 my $res = $facedata->{resource};
3509 3586
3510 while (my ($name, $info) = each %$res) { 3587 while (my ($name, $info) = each %$res) {
3511 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
3512 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3590 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3513 3591
3514 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3592 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3515 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#
3516 } else { 3596 } else {
3517 $RESOURCE{$name} = $info; # unused 3597# $RESOURCE{$name} = $info; # unused
3518 } 3598 }
3519 3599
3520 cf::cede_to_tick; 3600 cf::cede_to_tick;
3521 } 3601 }
3522 } 3602 }
3658 3738
3659sub main { 3739sub main {
3660 cf::init_globals; # initialise logging 3740 cf::init_globals; # initialise logging
3661 3741
3662 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3742 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3663 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.";
3664 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3744 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3665 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3745 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3666 3746
3667 $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
3668 3748
3669 # we must not ever block the main coroutine 3749 # we must not ever block the main coroutine
3670 local $Coro::idle = sub { 3750 $Coro::idle = sub {
3671 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#
3672 (async { 3752 (async {
3673 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3753 $Coro::current->{desc} = "IDLE BUG HANDLER";
3674 EV::loop EV::LOOP_ONESHOT; 3754 EV::loop EV::LOOP_ONESHOT;
3675 })->prio (Coro::PRIO_MAX); 3755 })->prio (Coro::PRIO_MAX);
3710 }; 3790 };
3711 3791
3712 cf::object::thawer::errors_are_fatal 0; 3792 cf::object::thawer::errors_are_fatal 0;
3713 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";
3714 3794
3715 my $free_main; $free_main = EV::idle sub { 3795 AE::postpone {
3716 undef $free_main;
3717 undef &main; # free gobs of memory :) 3796 undef &main; # free gobs of memory :)
3718 }; 3797 };
3719 3798
3720 goto &main_loop; 3799 goto &main_loop;
3721} 3800}
3878 3957
3879 cf::write_runtime_sync; # external watchdog should not bark 3958 cf::write_runtime_sync; # external watchdog should not bark
3880 3959
3881 trace "emergency_perl_save: flushing outstanding aio requests"; 3960 trace "emergency_perl_save: flushing outstanding aio requests";
3882 while (IO::AIO::nreqs || BDB::nreqs) { 3961 while (IO::AIO::nreqs || BDB::nreqs) {
3883 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
3884 } 3963 }
3885 3964
3886 cf::write_runtime_sync; # external watchdog should not bark 3965 cf::write_runtime_sync; # external watchdog should not bark
3887 }; 3966 };
3888 3967
4069 4148
4070############################################################################# 4149#############################################################################
4071 4150
4072my $bug_warning = 0; 4151my $bug_warning = 0;
4073 4152
4074our @WAIT_FOR_TICK;
4075our @WAIT_FOR_TICK_BEGIN;
4076
4077sub wait_for_tick() { 4153sub wait_for_tick() {
4078 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4154 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4079 4155
4080 my $signal = new Coro::Signal; 4156 $WAIT_FOR_TICK->wait;
4081 push @WAIT_FOR_TICK, $signal;
4082 $signal->wait;
4083} 4157}
4084 4158
4085sub wait_for_tick_begin() { 4159sub wait_for_tick_begin() {
4086 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4160 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4087 4161
4088 my $signal = new Coro::Signal; 4162 my $signal = new Coro::Signal;
4089 push @WAIT_FOR_TICK_BEGIN, $signal; 4163 push @WAIT_FOR_TICK_BEGIN, $signal;
4090 $signal->wait; 4164 $signal->wait;
4091} 4165}
4095 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"
4096 unless ++$bug_warning > 10; 4170 unless ++$bug_warning > 10;
4097 return; 4171 return;
4098 } 4172 }
4099 4173
4100 cf::server_tick; # one server iteration 4174 cf::one_tick; # one server iteration
4101 4175
4102 #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#
4103 4177
4104 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4178 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4105 $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.;
4111 } 4185 }
4112 4186
4113 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4187 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4114 $sig->send; 4188 $sig->send;
4115 } 4189 }
4116 while (my $sig = shift @WAIT_FOR_TICK) { 4190 $WAIT_FOR_TICK->broadcast;
4117 $sig->send;
4118 }
4119 4191
4120 $LOAD = ($NOW - $TICK_START) / $TICK; 4192 $LOAD = ($NOW - $TICK_START) / $TICK;
4121 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4193 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4122 4194
4123 if (0) { 4195 if (0) {
4132{ 4204{
4133 # configure BDB 4205 # configure BDB
4134 4206
4135 BDB::min_parallel 16; 4207 BDB::min_parallel 16;
4136 BDB::max_poll_reqs $TICK * 0.1; 4208 BDB::max_poll_reqs $TICK * 0.1;
4137 $AnyEvent::BDB::WATCHER->priority (1); 4209 #$AnyEvent::BDB::WATCHER->priority (1);
4138 4210
4139 unless ($DB_ENV) { 4211 unless ($DB_ENV) {
4140 $DB_ENV = BDB::db_env_create; 4212 $DB_ENV = BDB::db_env_create;
4141 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4213 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4142 $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