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.559 by root, Sat Feb 26 12:50:27 2011 UTC vs.
Revision 1.578 by root, Wed Jan 4 02:48:57 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.
… …
108our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
109our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112 112
113our %RESOURCE; # unused 113#our %RESOURCE; # unused
114 114
115our $OUTPUT_RATE_MIN = 3000; 115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000; 116our $OUTPUT_RATE_MAX = 1000000;
117 117
118our $MAX_LINKS = 32; # how many chained exits to follow 118our $MAX_LINKS = 32; # how many chained exits to follow
… …
131our @EXTRA_MODULES = qw(pod match mapscript incloader); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132 132
133our %CFG; 133our %CFG;
134 134
135our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
136our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
137our $NOW; 138our $NOW;
138 139
139our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
140our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
141our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
… …
150 151
151our @POST_INIT; 152our @POST_INIT;
152 153
153our $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)
154our $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;
155 159
156binmode STDOUT; 160binmode STDOUT;
157binmode STDERR; 161binmode STDERR;
158 162
159# read virtual server time, if available 163# read virtual server time, if available
… …
193 197
194=over 4 198=over 4
195 199
196=item $cf::UPTIME 200=item $cf::UPTIME
197 201
198The 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.
199 218
200=item $cf::RUNTIME 219=item $cf::RUNTIME
201 220
202The 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
203every server tick. 222every server tick.
… …
209Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
210directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
211unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
212database environment. 231database environment.
213 232
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 233=item $cf::LOADAVG
223 234
224The 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
225(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
226objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
… …
237=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
238 249
239These 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
240returns 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
241per 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.
242 265
243=cut 266=cut
244 267
245sub wait_for_tick(); 268sub wait_for_tick();
246sub wait_for_tick_begin(); 269sub wait_for_tick_begin();
… …
314} 337}
315 338
316$EV::DIED = sub { 339$EV::DIED = sub {
317 Carp::cluck "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
318}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
319 347
320############################################################################# 348#############################################################################
321 349
322=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
323 351
… …
344 $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;
345 $d 373 $d
346 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
347} 375}
348 376
377=item $scalar = 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
349=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
350 392
351Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
352 394
353=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
… …
359our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 401our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
360 402
361sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
362sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
363 405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
364=item $ref = cf::yaml_load $scalar 414=item $ref = cf::decode_yaml $scalar
365 415
366Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks). 416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
367 417
368=cut 418=cut
369 419
370sub fork_call(&@); 420sub decode_yaml($) {
371
372sub yaml_load($) {
373 fork_call { YAML::XS::Load $_[0] } @_ 421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
374} 435}
375 436
376=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
377 438
378Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
… …
462 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
463} 524}
464 525
465=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
466 527
467Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
468This call blocks and returns only when you have at least C<$time> seconds 529(default: 0): This call blocks and returns only when you have at least
469of cpu time till the next tick. The slot is only valid till the next cede. 530C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede.
532
533Background jobs should use a priority les than zero, interactive jobs
534should use 100 or more.
470 535
471The optional C<$name> can be used to identify the job to run. It might be 536The optional C<$name> can be used to identify the job to run. It might be
472used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
473 538
474Useful for short background jobs. 539Useful for short background jobs.
… …
503 } 568 }
504 } 569 }
505 570
506 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
507 # we do not use wait_for_tick() as it returns immediately when tick is inactive 572 # we do not use wait_for_tick() as it returns immediately when tick is inactive
508 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
509 $signal->wait;
510 } else { 574 } else {
511 $busy = 0; 575 $busy = 0;
512 Coro::schedule; 576 Coro::schedule;
513 } 577 }
514 } 578 }
… …
769 833
770 my @data; 834 my @data;
771 my $md5; 835 my $md5;
772 836
773 for (0 .. $#$src) { 837 for (0 .. $#$src) {
774 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
775 or Carp::croak "$src->[$_]: $!";
776 } 839 }
777 840
778 # if processing is expensive, check 841 # if processing is expensive, check
779 # checksum first 842 # checksum first
780 if (1) { 843 if (1) {
… …
1398 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1399 1462
1400 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1401 1464
1402 if (ref $msg) { 1465 if (ref $msg) {
1403 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1404 "ARRAY" eq ref $msg
1405 ? @$msg
1406 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1407 1467
1408 my @reply; 1468 my @reply;
1409 1469
1410 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1411 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
… …
1514 1574
1515 while (my ($k, $v) = each %todo) { 1575 while (my ($k, $v) = each %todo) {
1516 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1576 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1517 if exists $v->{meta}{mandatory}; 1577 if exists $v->{meta}{mandatory};
1518 } 1578 }
1579
1580 last;
1519 } 1581 }
1520 } 1582 }
1521 }; 1583 };
1522} 1584}
1523 1585
… …
1951 2013
1952 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1953 () 2015 ()
1954} 2016}
1955 2017
2018# may re-bless or do other evil things
1956sub init { 2019sub init {
1957 my ($self) = @_; 2020 my ($self) = @_;
1958 2021
1959 $self 2022 $self
1960} 2023}
… …
2025 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
2026 2089
2027 1 2090 1
2028} 2091}
2029 2092
2093# used to laod the header of an original map
2030sub load_header_orig { 2094sub load_header_orig {
2031 my ($self) = @_; 2095 my ($self) = @_;
2032 2096
2033 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
2034} 2098}
2035 2099
2100# used to laod the header of an instantiated map
2036sub load_header_temp { 2101sub load_header_temp {
2037 my ($self) = @_; 2102 my ($self) = @_;
2038 2103
2039 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
2040} 2105}
2041 2106
2107# called after loading the header from an instantiated map
2042sub prepare_temp { 2108sub prepare_temp {
2043 my ($self) = @_; 2109 my ($self) = @_;
2044 2110
2045 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
2046 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
2047 # safety 2113 # safety
2048 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
2049 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
2050} 2116}
2051 2117
2118# called after loading the header from an original map
2052sub prepare_orig { 2119sub prepare_orig {
2053 my ($self) = @_; 2120 my ($self) = @_;
2054 2121
2055 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
2056 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
… …
2082sub find { 2149sub find {
2083 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
2084 2151
2085 cf::cede_to_tick; 2152 cf::cede_to_tick;
2086 2153
2087 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
2088 2155
2089 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2090 my $guard2 = cf::lock_acquire "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
2091 2158
2092 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
… …
2123 2190
2124 { 2191 {
2125 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
2126 2193
2127 return unless $self->valid; 2194 return unless $self->valid;
2128 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2129
2130 $self->in_memory (cf::MAP_LOADING);
2131 2196
2132 $self->alloc; 2197 $self->alloc;
2133 2198
2134 $self->pre_load; 2199 $self->pre_load;
2135 cf::cede_to_tick; 2200 cf::cede_to_tick;
2136 2201
2202 if (exists $self->{load_path}) {
2137 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2138 $f->skip_block; 2204 $f->skip_block;
2139 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2140 or return; 2206 or return;
2141 2207
2142 $self->post_load_original 2208 $self->post_load_original
2143 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2144 2210
2145 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2146 utf8::encode $uniq; 2212 utf8::encode $uniq;
2147 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2148 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2149 $self->clear_unique_items; 2215 $self->clear_unique_items;
2150 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2151 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2152 } 2219 }
2153 } 2220 }
2154 }
2155 2221
2156 $f->resolve_delayed_derefs; 2222 $f->resolve_delayed_derefs;
2223 } else {
2224 $self->post_load_original
2225 if delete $self->{load_original};
2226 }
2227
2228 $self->state (cf::MAP_INACTIVE);
2157 2229
2158 cf::cede_to_tick; 2230 cf::cede_to_tick;
2159 # now do the right thing for maps 2231 # now do the right thing for maps
2160 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2161 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
… …
2165 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2166 $self->decay_objects; 2238 $self->decay_objects;
2167 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2168 $self->update_buttons; 2240 $self->update_buttons;
2169 cf::cede_to_tick; 2241 cf::cede_to_tick;
2170 $self->activate; 2242 #$self->activate; # no longer activate maps automatically
2171 } 2243 }
2172 2244
2173 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2174 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2175
2176 $self->in_memory (cf::MAP_ACTIVE);
2177 } 2247 }
2178 2248
2179 $self->post_load; 2249 $self->post_load;
2180 2250
2181 1 2251 1
… …
2194# if $self->per_party; 2264# if $self->per_party;
2195 2265
2196 $self 2266 $self
2197} 2267}
2198 2268
2199# find and load all maps in the 3x3 area around a map
2200sub load_neighbours {
2201 my ($map) = @_;
2202
2203 my @neigh; # diagonal neighbours
2204
2205 for (0 .. 3) {
2206 my $neigh = $map->tile_path ($_)
2207 or next;
2208 $neigh = find $neigh, $map
2209 or next;
2210 $neigh->load;
2211
2212 # now find the diagonal neighbours
2213 push @neigh,
2214 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2215 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2216 }
2217
2218 for (grep defined $_->[0], @neigh) {
2219 my ($path, $origin) = @$_;
2220 my $neigh = find $path, $origin
2221 or next;
2222 $neigh->load;
2223 }
2224}
2225
2226sub find_sync { 2269sub find_sync {
2227 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2228 2271
2272 # it's a bug to call this from the main context
2229 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2230 if $Coro::current == $Coro::main; 2274 if $Coro::current == $Coro::main;
2231 2275
2232 find $path, $origin 2276 find $path, $origin
2233} 2277}
2234 2278
2235sub do_load_sync { 2279sub do_load_sync {
2236 my ($map) = @_; 2280 my ($map) = @_;
2237 2281
2282 # it's a bug to call this from the main context
2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2239 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2240 2285
2241 $map->load; 2286 $map->load;
2242} 2287}
… …
2245our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2246 2291
2247sub find_async { 2292sub find_async {
2248 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2249 2294
2250 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2251 2296
2252 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2253 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2254 } 2299 }
2255 2300
2256 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2257 2302
2258 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
… …
2317sub swap_out { 2362sub swap_out {
2318 my ($self) = @_; 2363 my ($self) = @_;
2319 2364
2320 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2321 2366
2322 return if $self->in_memory != cf::MAP_ACTIVE; 2367 return if !$self->linkable;
2323 return if $self->{deny_save}; 2368 return if $self->{deny_save};
2324 return if $self->players; 2369 return if $self->players;
2325 2370
2326 # first deactivate the map and "unlink" it from the core 2371 # first deactivate the map and "unlink" it from the core
2327 $self->deactivate; 2372 $self->deactivate;
2328 $_->clear_links_to ($self) for values %cf::MAP; 2373 $_->clear_links_to ($self) for values %cf::MAP;
2329 $self->in_memory (cf::MAP_SWAPPED); 2374 $self->state (cf::MAP_SWAPPED);
2330 2375
2331 # then atomically save 2376 # then atomically save
2332 $self->_save; 2377 $self->_save;
2333 2378
2334 # then free the map 2379 # then free the map
… …
2360 2405
2361 return if $self->players; 2406 return if $self->players;
2362 2407
2363 cf::trace "resetting map ", $self->path, "\n"; 2408 cf::trace "resetting map ", $self->path, "\n";
2364 2409
2365 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2366 2411
2367 # need to save uniques path 2412 # need to save uniques path
2368 unless ($self->{deny_save}) { 2413 unless ($self->{deny_save}) {
2369 my $uniq = $self->uniq_path; utf8::encode $uniq; 2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2370 2415
… …
2700 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2701 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2702 if $x <= 0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2703 2748
2704 $map->load; 2749 $map->load;
2705 $map->load_neighbours;
2706 2750
2707 return unless $self->contr->active; 2751 return unless $self->contr->active;
2708 2752
2709 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2710 if ($self->enter_map ($map, $x, $y)) { 2754 if ($self->enter_map ($map, $x, $y)) {
… …
2766 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2767 } 2811 }
2768 } 2812 }
2769 2813
2770 my $map = eval { 2814 my $map = eval {
2771 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2772 2816
2773 if ($map) { 2817 if ($map) {
2774 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2775 $map = $check->($map, $x, $y, $self) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2776 } else { 2820 } else {
… …
2866 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2867 2911
2868 unless (eval { 2912 unless (eval {
2869 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2870 2914
2871 # random map handling
2872 {
2873 my $guard = cf::lock_acquire "exit_prepare:$exit";
2874
2875 prepare_random_map $exit
2876 if $exit->slaying eq "/!";
2877 }
2878
2879 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2880 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2881 my $y = $exit->stats->sp; 2917 my $y = $exit->stats->sp;
2918
2919 # special map handling
2920 my $slaying = $exit->slaying;
2921
2922 # special map handling
2923 if ($slaying eq "/!") {
2924 my $guard = cf::lock_acquire "exit_prepare:$exit";
2925
2926 prepare_random_map $exit
2927 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2928
2929 $map = $exit->slaying;
2930
2931 } elsif ($slaying eq '!up') {
2932 $map = $exit->map->tile_path (cf::TILE_UP);
2933 $x = $exit->x;
2934 $y = $exit->y;
2935
2936 } elsif ($slaying eq '!down') {
2937 $map = $exit->map->tile_path (cf::TILE_DOWN);
2938 $x = $exit->x;
2939 $y = $exit->y;
2940 }
2882 2941
2883 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2884 2943
2885 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2886 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
… …
3128=cut 3187=cut
3129 3188
3130sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
3131 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
3132 3191
3133 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
3134 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3135 } elsif ($self->extcmd == 1) {
3136 #TODO: version 1, remove
3137 unshift @msg, msgtype => "reply", msgid => $id;
3138 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3139 }
3140} 3195}
3141 3196
3142=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
3143 3198
3144Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
… …
3199 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
3200 3255
3201 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3202 3257
3203 if (ref $msg) { 3258 if (ref $msg) {
3204 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3205 "ARRAY" eq ref $msg
3206 ? @$msg
3207 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3208 3260
3209 my @reply; 3261 my @reply;
3210 3262
3211 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
3212 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
… …
3401 3453
3402 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3403 3455
3404 trace "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3405 3457
3406 0 < aio_load $path, my $facedata 3458 my $facedata = decode_storable load_file $path;
3407 or die "$path: $!";
3408
3409 $facedata = Coro::Storable::thaw $facedata;
3410 3459
3411 $facedata->{version} == 2 3460 $facedata->{version} == 2
3412 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3413 3462
3414 # patch in the exptable 3463 # patch in the exptable
… …
3465 3514
3466 { 3515 {
3467 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3468 3517
3469 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3470 if (defined $info->{type}) { 3519 if (defined (my $type = delete $info->{type})) {
3520 # TODO: different hash - must free and use new index, or cache ixface data queue
3471 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3521 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3472 3522
3473 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3523 cf::face::set_data $idx, 0, delete $info->{data}, delete $info->{hash};
3474 cf::face::set_type $idx, $info->{type}; 3524 cf::face::set_type $idx, $type;
3525 cf::face::set_meta $idx, (keys %$info && (~$type & 1)) ? $info : undef; # any keys left are stashed into meta unless prepended
3475 } else { 3526 } else {
3476 $RESOURCE{$name} = $info; # unused 3527# $RESOURCE{$name} = $info; # unused
3477 } 3528 }
3478 3529
3479 cf::cede_to_tick; 3530 cf::cede_to_tick;
3480 } 3531 }
3481 } 3532 }
… …
3533} 3584}
3534 3585
3535sub reload_sound { 3586sub reload_sound {
3536 trace "loading sound config from $DATADIR/sound\n"; 3587 trace "loading sound config from $DATADIR/sound\n";
3537 3588
3538 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3539 or die "$DATADIR/sound $!";
3540
3541 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3589 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3542 3590
3543 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3591 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3544 my $sound = $soundconf->{compat}[$_] 3592 my $sound = $soundconf->{compat}[$_]
3545 or next; 3593 or next;
3546 3594
… …
3570} 3618}
3571 3619
3572sub reload_config { 3620sub reload_config {
3573 trace "reloading config file...\n"; 3621 trace "reloading config file...\n";
3574 3622
3575 0 < aio_load "$CONFDIR/config", my $config 3623 my $config = load_file "$CONFDIR/config";
3576 or die "$CONFDIR/config: $!";
3577
3578 utf8::decode $config; 3624 utf8::decode $config;
3579 *CFG = yaml_load $config; 3625 *CFG = decode_yaml $config;
3580 3626
3581 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3627 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3582 3628
3583 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3629 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3584 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3630 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3622 3668
3623sub main { 3669sub main {
3624 cf::init_globals; # initialise logging 3670 cf::init_globals; # initialise logging
3625 3671
3626 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3672 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3627 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3673 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3628 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3674 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3629 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3675 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3630 3676
3631 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3677 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3632 3678
… …
3674 }; 3720 };
3675 3721
3676 cf::object::thawer::errors_are_fatal 0; 3722 cf::object::thawer::errors_are_fatal 0;
3677 info "parse errors in files are no longer fatal from this point on.\n"; 3723 info "parse errors in files are no longer fatal from this point on.\n";
3678 3724
3679 my $free_main; $free_main = EV::idle sub { 3725 AE::postpone {
3680 undef $free_main;
3681 undef &main; # free gobs of memory :) 3726 undef &main; # free gobs of memory :)
3682 }; 3727 };
3683 3728
3684 goto &main_loop; 3729 goto &main_loop;
3685} 3730}
… …
3842 3887
3843 cf::write_runtime_sync; # external watchdog should not bark 3888 cf::write_runtime_sync; # external watchdog should not bark
3844 3889
3845 trace "emergency_perl_save: flushing outstanding aio requests"; 3890 trace "emergency_perl_save: flushing outstanding aio requests";
3846 while (IO::AIO::nreqs || BDB::nreqs) { 3891 while (IO::AIO::nreqs || BDB::nreqs) {
3847 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3892 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3848 } 3893 }
3849 3894
3850 cf::write_runtime_sync; # external watchdog should not bark 3895 cf::write_runtime_sync; # external watchdog should not bark
3851 }; 3896 };
3852 3897
… …
4033 4078
4034############################################################################# 4079#############################################################################
4035 4080
4036my $bug_warning = 0; 4081my $bug_warning = 0;
4037 4082
4038our @WAIT_FOR_TICK;
4039our @WAIT_FOR_TICK_BEGIN;
4040
4041sub wait_for_tick() { 4083sub wait_for_tick() {
4042 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4084 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4043 4085
4044 my $signal = new Coro::Signal; 4086 $WAIT_FOR_TICK->wait;
4045 push @WAIT_FOR_TICK, $signal;
4046 $signal->wait;
4047} 4087}
4048 4088
4049sub wait_for_tick_begin() { 4089sub wait_for_tick_begin() {
4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4090 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4051 4091
4052 my $signal = new Coro::Signal; 4092 my $signal = new Coro::Signal;
4053 push @WAIT_FOR_TICK_BEGIN, $signal; 4093 push @WAIT_FOR_TICK_BEGIN, $signal;
4054 $signal->wait; 4094 $signal->wait;
4055} 4095}
… …
4059 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4099 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4060 unless ++$bug_warning > 10; 4100 unless ++$bug_warning > 10;
4061 return; 4101 return;
4062 } 4102 }
4063 4103
4064 cf::server_tick; # one server iteration 4104 cf::one_tick; # one server iteration
4065 4105
4066 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4106 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4067 4107
4068 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4108 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4069 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4109 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4075 } 4115 }
4076 4116
4077 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4117 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4078 $sig->send; 4118 $sig->send;
4079 } 4119 }
4080 while (my $sig = shift @WAIT_FOR_TICK) { 4120 $WAIT_FOR_TICK->broadcast;
4081 $sig->send;
4082 }
4083 4121
4084 $LOAD = ($NOW - $TICK_START) / $TICK; 4122 $LOAD = ($NOW - $TICK_START) / $TICK;
4085 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4086 4124
4087 if (0) { 4125 if (0) {
… …
4096{ 4134{
4097 # configure BDB 4135 # configure BDB
4098 4136
4099 BDB::min_parallel 16; 4137 BDB::min_parallel 16;
4100 BDB::max_poll_reqs $TICK * 0.1; 4138 BDB::max_poll_reqs $TICK * 0.1;
4101 $AnyEvent::BDB::WATCHER->priority (1); 4139 #$AnyEvent::BDB::WATCHER->priority (1);
4102 4140
4103 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
4104 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
4105 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4106 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4144 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;

Diff Legend

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