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.556 by root, Sat Jul 3 01:49:18 2010 UTC vs.
Revision 1.581 by root, Fri Feb 3 02:04:11 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
… …
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 112
111our %RESOURCE; # unused 113#our %RESOURCE; # unused
112 114
113our $OUTPUT_RATE_MIN = 3000; 115our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 116our $OUTPUT_RATE_MAX = 1000000;
115 117
116our $MAX_LINKS = 32; # how many chained exits to follow 118our $MAX_LINKS = 32; # how many chained exits to follow
… …
129our @EXTRA_MODULES = qw(pod match mapscript incloader); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 132
131our %CFG; 133our %CFG;
132 134
133our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
135our $NOW; 138our $NOW;
136 139
137our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
… …
148 151
149our @POST_INIT; 152our @POST_INIT;
150 153
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :) 155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
153 159
154binmode STDOUT; 160binmode STDOUT;
155binmode STDERR; 161binmode STDERR;
156 162
157# read virtual server time, if available 163# read virtual server time, if available
… …
191 197
192=over 4 198=over 4
193 199
194=item $cf::UPTIME 200=item $cf::UPTIME
195 201
196The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
197 218
198=item $cf::RUNTIME 219=item $cf::RUNTIME
199 220
200The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
201every server tick. 222every server tick.
… …
207Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
210database environment. 231database environment.
211 232
212=item $cf::NOW
213
214The time of the last (current) server tick.
215
216=item $cf::TICK
217
218The interval between server ticks, in seconds.
219
220=item $cf::LOADAVG 233=item $cf::LOADAVG
221 234
222The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
223(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
224objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
… …
235=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
236 249
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
238returns directly I<after> the tick processing (and consequently, can only wake one thread 251returns directly I<after> the tick processing (and consequently, can only wake one thread
239per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
240 265
241=cut 266=cut
242 267
243sub wait_for_tick(); 268sub wait_for_tick();
244sub wait_for_tick_begin(); 269sub wait_for_tick_begin();
… …
312} 337}
313 338
314$EV::DIED = sub { 339$EV::DIED = sub {
315 Carp::cluck "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
316}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
317 347
318############################################################################# 348#############################################################################
319 349
320=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
321 351
… …
342 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
343 $d 373 $d
344 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
345} 375}
346 376
377=item $scalar = cf::load_file $path
378
379Loads the given file from path and returns its contents. Croaks on error
380and can block.
381
382=cut
383
384sub load_file($) {
385 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!";
387
388 $data
389}
390
391=item $success = cf::replace_file $path, $data, $sync
392
393Atomically replaces the file at the given $path with new $data, and
394optionally $sync the data to disk before replacing the file.
395
396=cut
397
398sub replace_file($$;$) {
399 my ($path, $data, $sync) = @_;
400
401 my $lock = cf::lock_acquire ("replace_file:$path");
402
403 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
404 or return;
405
406 $data = $data->() if ref $data;
407
408 length $data == aio_write $fh, 0, (length $data), $data, 0
409 or return;
410
411 !$sync
412 or !aio_fsync $fh
413 or return;
414
415 aio_close $fh
416 and return;
417
418 aio_rename "$path~", $path
419 and return;
420
421 if ($sync) {
422 $path =~ s%/[^/]*$%%;
423 aio_pathsync $path;
424 }
425
426 1
427}
428
347=item $ref = cf::decode_json $json 429=item $ref = cf::decode_json $json
348 430
349Converts a JSON string into the corresponding perl data structure. 431Converts a JSON string into the corresponding perl data structure.
350 432
351=item $json = cf::encode_json $ref 433=item $json = cf::encode_json $ref
… …
357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 439our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
358 440
359sub encode_json($) { $json_coder->encode ($_[0]) } 441sub encode_json($) { $json_coder->encode ($_[0]) }
360sub decode_json($) { $json_coder->decode ($_[0]) } 442sub decode_json($) { $json_coder->decode ($_[0]) }
361 443
444=item $ref = cf::decode_storable $scalar
445
446Same as Coro::Storable::thaw, so blocks.
447
448=cut
449
450BEGIN { *decode_storable = \&Coro::Storable::thaw }
451
362=item $ref = cf::yaml_load $scalar 452=item $ref = cf::decode_yaml $scalar
363 453
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks). 454Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365 455
366=cut 456=cut
367 457
368sub fork_call(&@); 458sub decode_yaml($) {
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_ 459 fork_call { YAML::XS::Load $_[0] } @_
460}
461
462=item $scalar = cf::unlzf $scalar
463
464Same as Compress::LZF::compress, but takes server ticks into account, so
465blocks.
466
467=cut
468
469sub unlzf($) {
470 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
471 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
472 Compress::LZF::decompress $_[0]
372} 473}
373 474
374=item cf::post_init { BLOCK } 475=item cf::post_init { BLOCK }
375 476
376Execute the given codeblock, I<after> all extensions have been (re-)loaded, 477Execute the given codeblock, I<after> all extensions have been (re-)loaded,
… …
460 EV::periodic $start, $interval, 0, $cb 561 EV::periodic $start, $interval, 0, $cb
461} 562}
462 563
463=item cf::get_slot $time[, $priority[, $name]] 564=item cf::get_slot $time[, $priority[, $name]]
464 565
465Allocate $time seconds of blocking CPU time at priority C<$priority>: 566Allocate $time seconds of blocking CPU time at priority C<$priority>
466This call blocks and returns only when you have at least C<$time> seconds 567(default: 0): This call blocks and returns only when you have at least
467of cpu time till the next tick. The slot is only valid till the next cede. 568C<$time> seconds of cpu time till the next tick. The slot is only valid
569till the next cede.
570
571Background jobs should use a priority les than zero, interactive jobs
572should use 100 or more.
468 573
469The optional C<$name> can be used to identify the job to run. It might be 574The optional C<$name> can be used to identify the job to run. It might be
470used for statistical purposes and should identify the same time-class. 575used for statistical purposes and should identify the same time-class.
471 576
472Useful for short background jobs. 577Useful for short background jobs.
… …
501 } 606 }
502 } 607 }
503 608
504 if (@SLOT_QUEUE) { 609 if (@SLOT_QUEUE) {
505 # we do not use wait_for_tick() as it returns immediately when tick is inactive 610 # we do not use wait_for_tick() as it returns immediately when tick is inactive
506 push @cf::WAIT_FOR_TICK, $signal; 611 $WAIT_FOR_TICK->wait;
507 $signal->wait;
508 } else { 612 } else {
509 $busy = 0; 613 $busy = 0;
510 Coro::schedule; 614 Coro::schedule;
511 } 615 }
512 } 616 }
… …
767 871
768 my @data; 872 my @data;
769 my $md5; 873 my $md5;
770 874
771 for (0 .. $#$src) { 875 for (0 .. $#$src) {
772 0 <= aio_load $src->[$_], $data[$_] 876 $data[$_] = load_file $src->[$_];
773 or Carp::croak "$src->[$_]: $!";
774 } 877 }
775 878
776 # if processing is expensive, check 879 # if processing is expensive, check
777 # checksum first 880 # checksum first
778 if (1) { 881 if (1) {
… …
1396 my ($pl, $buf) = @_; 1499 my ($pl, $buf) = @_;
1397 1500
1398 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1501 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1399 1502
1400 if (ref $msg) { 1503 if (ref $msg) {
1401 my ($type, $reply, @payload) = 1504 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1402 "ARRAY" eq ref $msg
1403 ? @$msg
1404 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1405 1505
1406 my @reply; 1506 my @reply;
1407 1507
1408 if (my $cb = $EXTCMD{$type}) { 1508 if (my $cb = $EXTCMD{$type}) {
1409 @reply = $cb->($pl, @payload); 1509 @reply = $cb->($pl, @payload);
… …
1512 1612
1513 while (my ($k, $v) = each %todo) { 1613 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1614 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory}; 1615 if exists $v->{meta}{mandatory};
1516 } 1616 }
1617
1618 last;
1517 } 1619 }
1518 } 1620 }
1519 }; 1621 };
1520} 1622}
1521 1623
… …
1949 2051
1950 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2052 Carp::cluck "unable to resolve path '$path' (base '$base')";
1951 () 2053 ()
1952} 2054}
1953 2055
2056# may re-bless or do other evil things
1954sub init { 2057sub init {
1955 my ($self) = @_; 2058 my ($self) = @_;
1956 2059
1957 $self 2060 $self
1958} 2061}
… …
2023 $self->{load_path} = $path; 2126 $self->{load_path} = $path;
2024 2127
2025 1 2128 1
2026} 2129}
2027 2130
2131# used to laod the header of an original map
2028sub load_header_orig { 2132sub load_header_orig {
2029 my ($self) = @_; 2133 my ($self) = @_;
2030 2134
2031 $self->load_header_from ($self->load_path) 2135 $self->load_header_from ($self->load_path)
2032} 2136}
2033 2137
2138# used to laod the header of an instantiated map
2034sub load_header_temp { 2139sub load_header_temp {
2035 my ($self) = @_; 2140 my ($self) = @_;
2036 2141
2037 $self->load_header_from ($self->save_path) 2142 $self->load_header_from ($self->save_path)
2038} 2143}
2039 2144
2145# called after loading the header from an instantiated map
2040sub prepare_temp { 2146sub prepare_temp {
2041 my ($self) = @_; 2147 my ($self) = @_;
2042 2148
2043 $self->last_access ((delete $self->{last_access}) 2149 $self->last_access ((delete $self->{last_access})
2044 || $cf::RUNTIME); #d# 2150 || $cf::RUNTIME); #d#
2045 # safety 2151 # safety
2046 $self->{instantiate_time} = $cf::RUNTIME 2152 $self->{instantiate_time} = $cf::RUNTIME
2047 if $self->{instantiate_time} > $cf::RUNTIME; 2153 if $self->{instantiate_time} > $cf::RUNTIME;
2048} 2154}
2049 2155
2156# called after loading the header from an original map
2050sub prepare_orig { 2157sub prepare_orig {
2051 my ($self) = @_; 2158 my ($self) = @_;
2052 2159
2053 $self->{load_original} = 1; 2160 $self->{load_original} = 1;
2054 $self->{instantiate_time} = $cf::RUNTIME; 2161 $self->{instantiate_time} = $cf::RUNTIME;
… …
2080sub find { 2187sub find {
2081 my ($path, $origin) = @_; 2188 my ($path, $origin) = @_;
2082 2189
2083 cf::cede_to_tick; 2190 cf::cede_to_tick;
2084 2191
2085 $path = normalise $path, $origin && $origin->path; 2192 $path = normalise $path, $origin;
2086 2193
2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2194 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2088 my $guard2 = cf::lock_acquire "map_find:$path"; 2195 my $guard2 = cf::lock_acquire "map_find:$path";
2089 2196
2090 $cf::MAP{$path} || do { 2197 $cf::MAP{$path} || do {
… …
2121 2228
2122 { 2229 {
2123 my $guard = cf::lock_acquire "map_data:$path"; 2230 my $guard = cf::lock_acquire "map_data:$path";
2124 2231
2125 return unless $self->valid; 2232 return unless $self->valid;
2126 return unless $self->in_memory == cf::MAP_SWAPPED; 2233 return unless $self->state == cf::MAP_SWAPPED;
2127
2128 $self->in_memory (cf::MAP_LOADING);
2129 2234
2130 $self->alloc; 2235 $self->alloc;
2131 2236
2132 $self->pre_load; 2237 $self->pre_load;
2133 cf::cede_to_tick; 2238 cf::cede_to_tick;
2134 2239
2240 if (exists $self->{load_path}) {
2135 my $f = new_from_file cf::object::thawer $self->{load_path}; 2241 my $f = new_from_file cf::object::thawer $self->{load_path};
2136 $f->skip_block; 2242 $f->skip_block;
2137 $self->_load_objects ($f) 2243 $self->_load_objects ($f)
2138 or return; 2244 or return;
2139 2245
2140 $self->post_load_original 2246 $self->post_load_original
2141 if delete $self->{load_original}; 2247 if delete $self->{load_original};
2142 2248
2143 if (my $uniq = $self->uniq_path) { 2249 if (my $uniq = $self->uniq_path) {
2144 utf8::encode $uniq; 2250 utf8::encode $uniq;
2145 unless (aio_stat $uniq) { 2251 unless (aio_stat $uniq) {
2146 if (my $f = new_from_file cf::object::thawer $uniq) { 2252 if (my $f = new_from_file cf::object::thawer $uniq) {
2147 $self->clear_unique_items; 2253 $self->clear_unique_items;
2148 $self->_load_objects ($f); 2254 $self->_load_objects ($f);
2149 $f->resolve_delayed_derefs; 2255 $f->resolve_delayed_derefs;
2256 }
2150 } 2257 }
2151 } 2258 }
2152 }
2153 2259
2154 $f->resolve_delayed_derefs; 2260 $f->resolve_delayed_derefs;
2261 } else {
2262 $self->post_load_original
2263 if delete $self->{load_original};
2264 }
2265
2266 $self->state (cf::MAP_INACTIVE);
2155 2267
2156 cf::cede_to_tick; 2268 cf::cede_to_tick;
2157 # now do the right thing for maps 2269 # now do the right thing for maps
2158 $self->link_multipart_objects; 2270 $self->link_multipart_objects;
2159 $self->difficulty ($self->estimate_difficulty) 2271 $self->difficulty ($self->estimate_difficulty)
… …
2163 unless ($self->{deny_activate}) { 2275 unless ($self->{deny_activate}) {
2164 $self->decay_objects; 2276 $self->decay_objects;
2165 $self->fix_auto_apply; 2277 $self->fix_auto_apply;
2166 $self->update_buttons; 2278 $self->update_buttons;
2167 cf::cede_to_tick; 2279 cf::cede_to_tick;
2168 $self->activate; 2280 #$self->activate; # no longer activate maps automatically
2169 } 2281 }
2170 2282
2171 $self->{last_save} = $cf::RUNTIME; 2283 $self->{last_save} = $cf::RUNTIME;
2172 $self->last_access ($cf::RUNTIME); 2284 $self->last_access ($cf::RUNTIME);
2173
2174 $self->in_memory (cf::MAP_ACTIVE);
2175 } 2285 }
2176 2286
2177 $self->post_load; 2287 $self->post_load;
2178 2288
2179 1 2289 1
… …
2192# if $self->per_party; 2302# if $self->per_party;
2193 2303
2194 $self 2304 $self
2195} 2305}
2196 2306
2197# find and load all maps in the 3x3 area around a map
2198sub load_neighbours {
2199 my ($map) = @_;
2200
2201 my @neigh; # diagonal neighbours
2202
2203 for (0 .. 3) {
2204 my $neigh = $map->tile_path ($_)
2205 or next;
2206 $neigh = find $neigh, $map
2207 or next;
2208 $neigh->load;
2209
2210 # now find the diagonal neighbours
2211 push @neigh,
2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2214 }
2215
2216 for (grep defined $_->[0], @neigh) {
2217 my ($path, $origin) = @$_;
2218 my $neigh = find $path, $origin
2219 or next;
2220 $neigh->load;
2221 }
2222}
2223
2224sub find_sync { 2307sub find_sync {
2225 my ($path, $origin) = @_; 2308 my ($path, $origin) = @_;
2226 2309
2310 # it's a bug to call this from the main context
2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2311 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main; 2312 if $Coro::current == $Coro::main;
2229 2313
2230 find $path, $origin 2314 find $path, $origin
2231} 2315}
2232 2316
2233sub do_load_sync { 2317sub do_load_sync {
2234 my ($map) = @_; 2318 my ($map) = @_;
2235 2319
2320 # it's a bug to call this from the main context
2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2321 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2237 if $Coro::current == $Coro::main; 2322 if $Coro::current == $Coro::main;
2238 2323
2239 $map->load; 2324 $map->load;
2240} 2325}
… …
2243our $MAP_PREFETCHER = undef; 2328our $MAP_PREFETCHER = undef;
2244 2329
2245sub find_async { 2330sub find_async {
2246 my ($path, $origin, $load) = @_; 2331 my ($path, $origin, $load) = @_;
2247 2332
2248 $path = normalise $path, $origin && $origin->{path}; 2333 $path = normalise $path, $origin;
2249 2334
2250 if (my $map = $cf::MAP{$path}) { 2335 if (my $map = $cf::MAP{$path}) {
2251 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2336 return $map if !$load || $map->linkable;
2252 } 2337 }
2253 2338
2254 $MAP_PREFETCH{$path} |= $load; 2339 $MAP_PREFETCH{$path} |= $load;
2255 2340
2256 $MAP_PREFETCHER ||= cf::async { 2341 $MAP_PREFETCHER ||= cf::async {
… …
2315sub swap_out { 2400sub swap_out {
2316 my ($self) = @_; 2401 my ($self) = @_;
2317 2402
2318 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2403 my $lock = cf::lock_acquire "map_data:$self->{path}";
2319 2404
2320 return if $self->in_memory != cf::MAP_ACTIVE; 2405 return if !$self->linkable;
2321 return if $self->{deny_save}; 2406 return if $self->{deny_save};
2322 return if $self->players; 2407 return if $self->players;
2323 2408
2324 # first deactivate the map and "unlink" it from the core 2409 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate; 2410 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP; 2411 $_->clear_links_to ($self) for values %cf::MAP;
2327 $self->in_memory (cf::MAP_SWAPPED); 2412 $self->state (cf::MAP_SWAPPED);
2328 2413
2329 # then atomically save 2414 # then atomically save
2330 $self->_save; 2415 $self->_save;
2331 2416
2332 # then free the map 2417 # then free the map
… …
2358 2443
2359 return if $self->players; 2444 return if $self->players;
2360 2445
2361 cf::trace "resetting map ", $self->path, "\n"; 2446 cf::trace "resetting map ", $self->path, "\n";
2362 2447
2363 $self->in_memory (cf::MAP_SWAPPED); 2448 $self->state (cf::MAP_SWAPPED);
2364 2449
2365 # need to save uniques path 2450 # need to save uniques path
2366 unless ($self->{deny_save}) { 2451 unless ($self->{deny_save}) {
2367 my $uniq = $self->uniq_path; utf8::encode $uniq; 2452 my $uniq = $self->uniq_path; utf8::encode $uniq;
2368 2453
… …
2698 # use -1 or undef as default coordinates, not 0, 0 2783 # use -1 or undef as default coordinates, not 0, 0
2699 ($x, $y) = ($map->enter_x, $map->enter_y) 2784 ($x, $y) = ($map->enter_x, $map->enter_y)
2700 if $x <= 0 && $y <= 0; 2785 if $x <= 0 && $y <= 0;
2701 2786
2702 $map->load; 2787 $map->load;
2703 $map->load_neighbours;
2704 2788
2705 return unless $self->contr->active; 2789 return unless $self->contr->active;
2706 2790
2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2791 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2708 if ($self->enter_map ($map, $x, $y)) { 2792 if ($self->enter_map ($map, $x, $y)) {
… …
2764 ($path, $x, $y) = (undef, undef, undef); 2848 ($path, $x, $y) = (undef, undef, undef);
2765 } 2849 }
2766 } 2850 }
2767 2851
2768 my $map = eval { 2852 my $map = eval {
2769 my $map = defined $path ? cf::map::find $path : undef; 2853 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2770 2854
2771 if ($map) { 2855 if ($map) {
2772 $map = $map->customise_for ($self); 2856 $map = $map->customise_for ($self);
2773 $map = $check->($map, $x, $y, $self) if $check && $map; 2857 $map = $check->($map, $x, $y, $self) if $check && $map;
2774 } else { 2858 } else {
… …
2864 $Coro::current->{desc} = "enter_exit"; 2948 $Coro::current->{desc} = "enter_exit";
2865 2949
2866 unless (eval { 2950 unless (eval {
2867 $self->deactivate_recursive; # just to be sure 2951 $self->deactivate_recursive; # just to be sure
2868 2952
2869 # random map handling
2870 {
2871 my $guard = cf::lock_acquire "exit_prepare:$exit";
2872
2873 prepare_random_map $exit
2874 if $exit->slaying eq "/!";
2875 }
2876
2877 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2953 my $map = cf::map::normalise $exit->slaying, $exit->map;
2878 my $x = $exit->stats->hp; 2954 my $x = $exit->stats->hp;
2879 my $y = $exit->stats->sp; 2955 my $y = $exit->stats->sp;
2956
2957 # special map handling
2958 my $slaying = $exit->slaying;
2959
2960 # special map handling
2961 if ($slaying eq "/!") {
2962 my $guard = cf::lock_acquire "exit_prepare:$exit";
2963
2964 prepare_random_map $exit
2965 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2966
2967 $map = $exit->slaying;
2968
2969 } elsif ($slaying eq '!up') {
2970 $map = $exit->map->tile_path (cf::TILE_UP);
2971 $x = $exit->x;
2972 $y = $exit->y;
2973
2974 } elsif ($slaying eq '!down') {
2975 $map = $exit->map->tile_path (cf::TILE_DOWN);
2976 $x = $exit->x;
2977 $y = $exit->y;
2978 }
2880 2979
2881 $self->goto ($map, $x, $y); 2980 $self->goto ($map, $x, $y);
2882 2981
2883 # if exit is damned, update players death & WoR home-position 2982 # if exit is damned, update players death & WoR home-position
2884 $self->contr->savebed ($map, $x, $y) 2983 $self->contr->savebed ($map, $x, $y)
… …
3126=cut 3225=cut
3127 3226
3128sub cf::client::ext_reply($$@) { 3227sub cf::client::ext_reply($$@) {
3129 my ($self, $id, @msg) = @_; 3228 my ($self, $id, @msg) = @_;
3130 3229
3131 if ($self->extcmd == 2) { 3230 return unless $self->extcmd == 2;
3231
3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3232 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3133 } elsif ($self->extcmd == 1) {
3134 #TODO: version 1, remove
3135 unshift @msg, msgtype => "reply", msgid => $id;
3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3137 }
3138} 3233}
3139 3234
3140=item $success = $client->query ($flags, "text", \&cb) 3235=item $success = $client->query ($flags, "text", \&cb)
3141 3236
3142Queues a query to the client, calling the given callback with 3237Queues a query to the client, calling the given callback with
… …
3197 my ($ns, $buf) = @_; 3292 my ($ns, $buf) = @_;
3198 3293
3199 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3294 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3200 3295
3201 if (ref $msg) { 3296 if (ref $msg) {
3202 my ($type, $reply, @payload) = 3297 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3203 "ARRAY" eq ref $msg
3204 ? @$msg
3205 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3206 3298
3207 my @reply; 3299 my @reply;
3208 3300
3209 if (my $cb = $EXTICMD{$type}) { 3301 if (my $cb = $EXTICMD{$type}) {
3210 @reply = $cb->($ns, @payload); 3302 @reply = $cb->($ns, @payload);
… …
3399 3491
3400 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3492 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3401 3493
3402 trace "loading facedata from $path\n"; 3494 trace "loading facedata from $path\n";
3403 3495
3404 0 < aio_load $path, my $facedata 3496 my $facedata = decode_storable load_file $path;
3405 or die "$path: $!";
3406
3407 $facedata = Coro::Storable::thaw $facedata;
3408 3497
3409 $facedata->{version} == 2 3498 $facedata->{version} == 2
3410 or cf::cleanup "$path: version mismatch, cannot proceed."; 3499 or cf::cleanup "$path: version mismatch, cannot proceed.";
3411 3500
3412 # patch in the exptable 3501 # patch in the exptable
… …
3426 3515
3427 cf::face::set_visibility $idx, $info->{visibility}; 3516 cf::face::set_visibility $idx, $info->{visibility};
3428 cf::face::set_magicmap $idx, $info->{magicmap}; 3517 cf::face::set_magicmap $idx, $info->{magicmap};
3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3518 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3519 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3520 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3431 3521
3432 cf::cede_to_tick; 3522 cf::cede_to_tick;
3433 } 3523 }
3434 3524
3435 while (my ($face, $info) = each %$faces) { 3525 while (my ($face, $info) = each %$faces) {
… …
3462 3552
3463 { 3553 {
3464 my $res = $facedata->{resource}; 3554 my $res = $facedata->{resource};
3465 3555
3466 while (my ($name, $info) = each %$res) { 3556 while (my ($name, $info) = each %$res) {
3467 if (defined $info->{type}) { 3557 if (defined (my $type = $info->{type})) {
3558 # TODO: different hash - must free and use new index, or cache ixface data queue
3468 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3559 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3469 3560
3470 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3561 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3471 cf::face::set_type $idx, $info->{type}; 3562 cf::face::set_type $idx, $type;
3563 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3472 } else { 3564 } else {
3473 $RESOURCE{$name} = $info; # unused 3565# $RESOURCE{$name} = $info; # unused
3474 } 3566 }
3475 3567
3476 cf::cede_to_tick; 3568 cf::cede_to_tick;
3477 } 3569 }
3478 } 3570 }
… …
3530} 3622}
3531 3623
3532sub reload_sound { 3624sub reload_sound {
3533 trace "loading sound config from $DATADIR/sound\n"; 3625 trace "loading sound config from $DATADIR/sound\n";
3534 3626
3535 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3536 or die "$DATADIR/sound $!";
3537
3538 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3627 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3539 3628
3540 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3629 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3541 my $sound = $soundconf->{compat}[$_] 3630 my $sound = $soundconf->{compat}[$_]
3542 or next; 3631 or next;
3543 3632
… …
3567} 3656}
3568 3657
3569sub reload_config { 3658sub reload_config {
3570 trace "reloading config file...\n"; 3659 trace "reloading config file...\n";
3571 3660
3572 0 < aio_load "$CONFDIR/config", my $config 3661 my $config = load_file "$CONFDIR/config";
3573 or die "$CONFDIR/config: $!";
3574
3575 utf8::decode $config; 3662 utf8::decode $config;
3576 *CFG = yaml_load $config; 3663 *CFG = decode_yaml $config;
3577 3664
3578 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3665 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3579 3666
3580 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3667 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3581 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3668 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3619 3706
3620sub main { 3707sub main {
3621 cf::init_globals; # initialise logging 3708 cf::init_globals; # initialise logging
3622 3709
3623 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3710 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3624 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3711 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3625 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3712 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3626 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3713 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3627 3714
3628 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3715 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3629 3716
… …
3671 }; 3758 };
3672 3759
3673 cf::object::thawer::errors_are_fatal 0; 3760 cf::object::thawer::errors_are_fatal 0;
3674 info "parse errors in files are no longer fatal from this point on.\n"; 3761 info "parse errors in files are no longer fatal from this point on.\n";
3675 3762
3676 my $free_main; $free_main = EV::idle sub { 3763 AE::postpone {
3677 undef $free_main;
3678 undef &main; # free gobs of memory :) 3764 undef &main; # free gobs of memory :)
3679 }; 3765 };
3680 3766
3681 goto &main_loop; 3767 goto &main_loop;
3682} 3768}
… …
3839 3925
3840 cf::write_runtime_sync; # external watchdog should not bark 3926 cf::write_runtime_sync; # external watchdog should not bark
3841 3927
3842 trace "emergency_perl_save: flushing outstanding aio requests"; 3928 trace "emergency_perl_save: flushing outstanding aio requests";
3843 while (IO::AIO::nreqs || BDB::nreqs) { 3929 while (IO::AIO::nreqs || BDB::nreqs) {
3844 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3930 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3845 } 3931 }
3846 3932
3847 cf::write_runtime_sync; # external watchdog should not bark 3933 cf::write_runtime_sync; # external watchdog should not bark
3848 }; 3934 };
3849 3935
… …
4030 4116
4031############################################################################# 4117#############################################################################
4032 4118
4033my $bug_warning = 0; 4119my $bug_warning = 0;
4034 4120
4035our @WAIT_FOR_TICK;
4036our @WAIT_FOR_TICK_BEGIN;
4037
4038sub wait_for_tick() { 4121sub wait_for_tick() {
4039 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4122 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4040 4123
4041 my $signal = new Coro::Signal; 4124 $WAIT_FOR_TICK->wait;
4042 push @WAIT_FOR_TICK, $signal;
4043 $signal->wait;
4044} 4125}
4045 4126
4046sub wait_for_tick_begin() { 4127sub wait_for_tick_begin() {
4047 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4128 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4048 4129
4049 my $signal = new Coro::Signal; 4130 my $signal = new Coro::Signal;
4050 push @WAIT_FOR_TICK_BEGIN, $signal; 4131 push @WAIT_FOR_TICK_BEGIN, $signal;
4051 $signal->wait; 4132 $signal->wait;
4052} 4133}
… …
4056 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4137 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4057 unless ++$bug_warning > 10; 4138 unless ++$bug_warning > 10;
4058 return; 4139 return;
4059 } 4140 }
4060 4141
4061 cf::server_tick; # one server iteration 4142 cf::one_tick; # one server iteration
4062 4143
4063 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4144 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4064 4145
4065 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4066 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4147 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4072 } 4153 }
4073 4154
4074 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4155 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4075 $sig->send; 4156 $sig->send;
4076 } 4157 }
4077 while (my $sig = shift @WAIT_FOR_TICK) { 4158 $WAIT_FOR_TICK->broadcast;
4078 $sig->send;
4079 }
4080 4159
4081 $LOAD = ($NOW - $TICK_START) / $TICK; 4160 $LOAD = ($NOW - $TICK_START) / $TICK;
4082 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4161 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4083 4162
4084 if (0) { 4163 if (0) {
… …
4093{ 4172{
4094 # configure BDB 4173 # configure BDB
4095 4174
4096 BDB::min_parallel 16; 4175 BDB::min_parallel 16;
4097 BDB::max_poll_reqs $TICK * 0.1; 4176 BDB::max_poll_reqs $TICK * 0.1;
4098 $AnyEvent::BDB::WATCHER->priority (1); 4177 #$AnyEvent::BDB::WATCHER->priority (1);
4099 4178
4100 unless ($DB_ENV) { 4179 unless ($DB_ENV) {
4101 $DB_ENV = BDB::db_env_create; 4180 $DB_ENV = BDB::db_env_create;
4102 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4181 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4103 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4182 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;

Diff Legend

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