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.550 by root, Fri May 14 22:56:47 2010 UTC vs.
Revision 1.580 by root, Wed Jan 4 03:22:48 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 = 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
347=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
348 392
349Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
350 394
351=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
… …
357our $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
358 402
359sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
360sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
361 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
362=item $ref = cf::yaml_load $scalar 414=item $ref = cf::decode_yaml $scalar
363 415
364Same 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).
365 417
366=cut 418=cut
367 419
368sub fork_call(&@); 420sub decode_yaml($) {
369
370sub yaml_load($) {
371 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]
372} 435}
373 436
374=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
375 438
376Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
… …
460 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
461} 524}
462 525
463=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
464 527
465Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
466This 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
467of 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.
468 535
469The 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
470used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
471 538
472Useful for short background jobs. 539Useful for short background jobs.
… …
501 } 568 }
502 } 569 }
503 570
504 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
505 # 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
506 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
507 $signal->wait;
508 } else { 574 } else {
509 $busy = 0; 575 $busy = 0;
510 Coro::schedule; 576 Coro::schedule;
511 } 577 }
512 } 578 }
… …
767 833
768 my @data; 834 my @data;
769 my $md5; 835 my $md5;
770 836
771 for (0 .. $#$src) { 837 for (0 .. $#$src) {
772 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
773 or Carp::croak "$src->[$_]: $!";
774 } 839 }
775 840
776 # if processing is expensive, check 841 # if processing is expensive, check
777 # checksum first 842 # checksum first
778 if (1) { 843 if (1) {
… …
1396 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1397 1462
1398 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1399 1464
1400 if (ref $msg) { 1465 if (ref $msg) {
1401 my ($type, $reply, @payload) = 1466 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 1467
1406 my @reply; 1468 my @reply;
1407 1469
1408 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1409 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
… …
1512 1574
1513 while (my ($k, $v) = each %todo) { 1575 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1576 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory}; 1577 if exists $v->{meta}{mandatory};
1516 } 1578 }
1579
1580 last;
1517 } 1581 }
1518 } 1582 }
1519 }; 1583 };
1520} 1584}
1521 1585
… …
1861sub generate_random_map { 1925sub generate_random_map {
1862 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1863 1927
1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1928 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1865 1929
1866 # mit "rum" bekleckern, nicht
1867 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1868 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1869 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1870 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1871 $rmp->{exit_on_final_map},
1872 $rmp->{xsize}, $rmp->{ysize},
1873 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1874 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1875 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1876 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1877 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1878 (cf::region::find $rmp->{region}), $rmp->{custom}
1879 )
1880} 1931}
1881 1932
1882=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1883 1934
1884Register a handler for the map path matching the given regex at the 1935Register a handler for the map path matching the given regex at the
… …
1935 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1936 $path = "$base/$path"; 1987 $path = "$base/$path";
1937 } 1988 }
1938 1989
1939 for ($path) { 1990 for ($path) {
1940 redo if s{//}{/};
1941 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1942 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1943 } 1993 }
1944 1994
1945 $path 1995 $path
… …
1963 2013
1964 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1965 () 2015 ()
1966} 2016}
1967 2017
2018# may re-bless or do other evil things
1968sub init { 2019sub init {
1969 my ($self) = @_; 2020 my ($self) = @_;
1970 2021
1971 $self 2022 $self
1972} 2023}
… …
2037 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
2038 2089
2039 1 2090 1
2040} 2091}
2041 2092
2093# used to laod the header of an original map
2042sub load_header_orig { 2094sub load_header_orig {
2043 my ($self) = @_; 2095 my ($self) = @_;
2044 2096
2045 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
2046} 2098}
2047 2099
2100# used to laod the header of an instantiated map
2048sub load_header_temp { 2101sub load_header_temp {
2049 my ($self) = @_; 2102 my ($self) = @_;
2050 2103
2051 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
2052} 2105}
2053 2106
2107# called after loading the header from an instantiated map
2054sub prepare_temp { 2108sub prepare_temp {
2055 my ($self) = @_; 2109 my ($self) = @_;
2056 2110
2057 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
2058 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
2059 # safety 2113 # safety
2060 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
2061 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
2062} 2116}
2063 2117
2118# called after loading the header from an original map
2064sub prepare_orig { 2119sub prepare_orig {
2065 my ($self) = @_; 2120 my ($self) = @_;
2066 2121
2067 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
2068 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
… …
2094sub find { 2149sub find {
2095 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
2096 2151
2097 cf::cede_to_tick; 2152 cf::cede_to_tick;
2098 2153
2099 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
2100 2155
2101 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2102 my $guard2 = cf::lock_acquire "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
2103 2158
2104 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
… …
2135 2190
2136 { 2191 {
2137 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
2138 2193
2139 return unless $self->valid; 2194 return unless $self->valid;
2140 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2141
2142 $self->in_memory (cf::MAP_LOADING);
2143 2196
2144 $self->alloc; 2197 $self->alloc;
2145 2198
2146 $self->pre_load; 2199 $self->pre_load;
2147 cf::cede_to_tick; 2200 cf::cede_to_tick;
2148 2201
2202 if (exists $self->{load_path}) {
2149 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2150 $f->skip_block; 2204 $f->skip_block;
2151 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2152 or return; 2206 or return;
2153 2207
2154 $self->post_load_original 2208 $self->post_load_original
2155 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2156 2210
2157 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2158 utf8::encode $uniq; 2212 utf8::encode $uniq;
2159 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2160 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2161 $self->clear_unique_items; 2215 $self->clear_unique_items;
2162 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2163 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2164 } 2219 }
2165 } 2220 }
2166 }
2167 2221
2168 $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);
2169 2229
2170 cf::cede_to_tick; 2230 cf::cede_to_tick;
2171 # now do the right thing for maps 2231 # now do the right thing for maps
2172 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2173 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
… …
2177 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2178 $self->decay_objects; 2238 $self->decay_objects;
2179 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2180 $self->update_buttons; 2240 $self->update_buttons;
2181 cf::cede_to_tick; 2241 cf::cede_to_tick;
2182 $self->activate; 2242 #$self->activate; # no longer activate maps automatically
2183 } 2243 }
2184 2244
2185 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2186 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2187
2188 $self->in_memory (cf::MAP_ACTIVE);
2189 } 2247 }
2190 2248
2191 $self->post_load; 2249 $self->post_load;
2250
2251 1
2192} 2252}
2193 2253
2194# customize the map for a given player, i.e. 2254# customize the map for a given player, i.e.
2195# return the _real_ map. used by e.g. per-player 2255# return the _real_ map. used by e.g. per-player
2196# maps to change the path to ~playername/mappath 2256# maps to change the path to ~playername/mappath
… …
2204# if $self->per_party; 2264# if $self->per_party;
2205 2265
2206 $self 2266 $self
2207} 2267}
2208 2268
2209# find and load all maps in the 3x3 area around a map
2210sub load_neighbours {
2211 my ($map) = @_;
2212
2213 my @neigh; # diagonal neighbours
2214
2215 for (0 .. 3) {
2216 my $neigh = $map->tile_path ($_)
2217 or next;
2218 $neigh = find $neigh, $map
2219 or next;
2220 $neigh->load;
2221
2222 # now find the diagonal neighbours
2223 push @neigh,
2224 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2225 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2226 }
2227
2228 for (grep defined $_->[0], @neigh) {
2229 my ($path, $origin) = @$_;
2230 my $neigh = find $path, $origin
2231 or next;
2232 $neigh->load;
2233 }
2234}
2235
2236sub find_sync { 2269sub find_sync {
2237 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2238 2271
2272 # it's a bug to call this from the main context
2239 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2240 if $Coro::current == $Coro::main; 2274 if $Coro::current == $Coro::main;
2241 2275
2242 find $path, $origin 2276 find $path, $origin
2243} 2277}
2244 2278
2245sub do_load_sync { 2279sub do_load_sync {
2246 my ($map) = @_; 2280 my ($map) = @_;
2247 2281
2282 # it's a bug to call this from the main context
2248 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2249 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2250 2285
2251 $map->load; 2286 $map->load;
2252} 2287}
… …
2255our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2256 2291
2257sub find_async { 2292sub find_async {
2258 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2259 2294
2260 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2261 2296
2262 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2263 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2264 } 2299 }
2265 2300
2266 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2267 2302
2268 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
… …
2327sub swap_out { 2362sub swap_out {
2328 my ($self) = @_; 2363 my ($self) = @_;
2329 2364
2330 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2331 2366
2332 return if $self->in_memory != cf::MAP_ACTIVE; 2367 return if !$self->linkable;
2333 return if $self->{deny_save}; 2368 return if $self->{deny_save};
2334 return if $self->players; 2369 return if $self->players;
2335 2370
2336 # first deactivate the map and "unlink" it from the core 2371 # first deactivate the map and "unlink" it from the core
2337 $self->deactivate; 2372 $self->deactivate;
2338 $_->clear_links_to ($self) for values %cf::MAP; 2373 $_->clear_links_to ($self) for values %cf::MAP;
2339 $self->in_memory (cf::MAP_SWAPPED); 2374 $self->state (cf::MAP_SWAPPED);
2340 2375
2341 # then atomically save 2376 # then atomically save
2342 $self->_save; 2377 $self->_save;
2343 2378
2344 # then free the map 2379 # then free the map
… …
2370 2405
2371 return if $self->players; 2406 return if $self->players;
2372 2407
2373 cf::trace "resetting map ", $self->path, "\n"; 2408 cf::trace "resetting map ", $self->path, "\n";
2374 2409
2375 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2376 2411
2377 # need to save uniques path 2412 # need to save uniques path
2378 unless ($self->{deny_save}) { 2413 unless ($self->{deny_save}) {
2379 my $uniq = $self->uniq_path; utf8::encode $uniq; 2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2380 2415
… …
2710 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2711 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2712 if $x <= 0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2713 2748
2714 $map->load; 2749 $map->load;
2715 $map->load_neighbours;
2716 2750
2717 return unless $self->contr->active; 2751 return unless $self->contr->active;
2718 2752
2719 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2720 if ($self->enter_map ($map, $x, $y)) { 2754 if ($self->enter_map ($map, $x, $y)) {
… …
2776 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2777 } 2811 }
2778 } 2812 }
2779 2813
2780 my $map = eval { 2814 my $map = eval {
2781 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2782 2816
2783 if ($map) { 2817 if ($map) {
2784 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2785 $map = $check->($map, $x, $y, $self) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2786 } else { 2820 } else {
… …
2876 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2877 2911
2878 unless (eval { 2912 unless (eval {
2879 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2880 2914
2881 # random map handling
2882 {
2883 my $guard = cf::lock_acquire "exit_prepare:$exit";
2884
2885 prepare_random_map $exit
2886 if $exit->slaying eq "/!";
2887 }
2888
2889 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2890 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2891 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 }
2892 2941
2893 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2894 2943
2895 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2896 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
… …
3138=cut 3187=cut
3139 3188
3140sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
3141 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
3142 3191
3143 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
3144 $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]));
3145 } elsif ($self->extcmd == 1) {
3146 #TODO: version 1, remove
3147 unshift @msg, msgtype => "reply", msgid => $id;
3148 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3149 }
3150} 3195}
3151 3196
3152=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
3153 3198
3154Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
… …
3209 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
3210 3255
3211 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3212 3257
3213 if (ref $msg) { 3258 if (ref $msg) {
3214 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3215 "ARRAY" eq ref $msg
3216 ? @$msg
3217 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3218 3260
3219 my @reply; 3261 my @reply;
3220 3262
3221 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
3222 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
… …
3411 3453
3412 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3413 3455
3414 trace "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3415 3457
3416 0 < aio_load $path, my $facedata 3458 my $facedata = decode_storable load_file $path;
3417 or die "$path: $!";
3418
3419 $facedata = Coro::Storable::thaw $facedata;
3420 3459
3421 $facedata->{version} == 2 3460 $facedata->{version} == 2
3422 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3423 3462
3424 # patch in the exptable 3463 # patch in the exptable
… …
3438 3477
3439 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3440 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3441 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3442 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3481 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3482 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3443 3483
3444 cf::cede_to_tick; 3484 cf::cede_to_tick;
3445 } 3485 }
3446 3486
3447 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
… …
3474 3514
3475 { 3515 {
3476 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3477 3517
3478 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3479 if (defined $info->{type}) { 3519 if (defined (my $type = $info->{type})) {
3520 # TODO: different hash - must free and use new index, or cache ixface data queue
3480 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3521 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3481 3522
3482 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3523 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3483 cf::face::set_type $idx, $info->{type}; 3524 cf::face::set_type $idx, $type;
3525 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3484 } else { 3526 } else {
3485 $RESOURCE{$name} = $info; # unused 3527# $RESOURCE{$name} = $info; # unused
3486 } 3528 }
3487 3529
3488 cf::cede_to_tick; 3530 cf::cede_to_tick;
3489 } 3531 }
3490 } 3532 }
… …
3542} 3584}
3543 3585
3544sub reload_sound { 3586sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n"; 3587 trace "loading sound config from $DATADIR/sound\n";
3546 3588
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3589 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3551 3590
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3591 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_] 3592 my $sound = $soundconf->{compat}[$_]
3554 or next; 3593 or next;
3555 3594
… …
3579} 3618}
3580 3619
3581sub reload_config { 3620sub reload_config {
3582 trace "reloading config file...\n"; 3621 trace "reloading config file...\n";
3583 3622
3584 0 < aio_load "$CONFDIR/config", my $config 3623 my $config = load_file "$CONFDIR/config";
3585 or die "$CONFDIR/config: $!";
3586
3587 utf8::decode $config; 3624 utf8::decode $config;
3588 *CFG = yaml_load $config; 3625 *CFG = decode_yaml $config;
3589 3626
3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3627 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3591 3628
3592 $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};
3593 $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};
… …
3631 3668
3632sub main { 3669sub main {
3633 cf::init_globals; # initialise logging 3670 cf::init_globals; # initialise logging
3634 3671
3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3672 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3636 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.";
3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3674 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3638 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3675 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3639 3676
3640 $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
3641 3678
… …
3683 }; 3720 };
3684 3721
3685 cf::object::thawer::errors_are_fatal 0; 3722 cf::object::thawer::errors_are_fatal 0;
3686 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";
3687 3724
3688 my $free_main; $free_main = EV::idle sub { 3725 AE::postpone {
3689 undef $free_main;
3690 undef &main; # free gobs of memory :) 3726 undef &main; # free gobs of memory :)
3691 }; 3727 };
3692 3728
3693 goto &main_loop; 3729 goto &main_loop;
3694} 3730}
… …
3851 3887
3852 cf::write_runtime_sync; # external watchdog should not bark 3888 cf::write_runtime_sync; # external watchdog should not bark
3853 3889
3854 trace "emergency_perl_save: flushing outstanding aio requests"; 3890 trace "emergency_perl_save: flushing outstanding aio requests";
3855 while (IO::AIO::nreqs || BDB::nreqs) { 3891 while (IO::AIO::nreqs || BDB::nreqs) {
3856 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
3857 } 3893 }
3858 3894
3859 cf::write_runtime_sync; # external watchdog should not bark 3895 cf::write_runtime_sync; # external watchdog should not bark
3860 }; 3896 };
3861 3897
… …
4042 4078
4043############################################################################# 4079#############################################################################
4044 4080
4045my $bug_warning = 0; 4081my $bug_warning = 0;
4046 4082
4047our @WAIT_FOR_TICK;
4048our @WAIT_FOR_TICK_BEGIN;
4049
4050sub wait_for_tick() { 4083sub wait_for_tick() {
4051 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4084 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4052 4085
4053 my $signal = new Coro::Signal; 4086 $WAIT_FOR_TICK->wait;
4054 push @WAIT_FOR_TICK, $signal;
4055 $signal->wait;
4056} 4087}
4057 4088
4058sub wait_for_tick_begin() { 4089sub wait_for_tick_begin() {
4059 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4090 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4060 4091
4061 my $signal = new Coro::Signal; 4092 my $signal = new Coro::Signal;
4062 push @WAIT_FOR_TICK_BEGIN, $signal; 4093 push @WAIT_FOR_TICK_BEGIN, $signal;
4063 $signal->wait; 4094 $signal->wait;
4064} 4095}
… …
4068 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"
4069 unless ++$bug_warning > 10; 4100 unless ++$bug_warning > 10;
4070 return; 4101 return;
4071 } 4102 }
4072 4103
4073 cf::server_tick; # one server iteration 4104 cf::one_tick; # one server iteration
4074 4105
4075 #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#
4076 4107
4077 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4108 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4078 $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.;
… …
4084 } 4115 }
4085 4116
4086 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4117 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4087 $sig->send; 4118 $sig->send;
4088 } 4119 }
4089 while (my $sig = shift @WAIT_FOR_TICK) { 4120 $WAIT_FOR_TICK->broadcast;
4090 $sig->send;
4091 }
4092 4121
4093 $LOAD = ($NOW - $TICK_START) / $TICK; 4122 $LOAD = ($NOW - $TICK_START) / $TICK;
4094 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4095 4124
4096 if (0) { 4125 if (0) {
… …
4105{ 4134{
4106 # configure BDB 4135 # configure BDB
4107 4136
4108 BDB::min_parallel 16; 4137 BDB::min_parallel 16;
4109 BDB::max_poll_reqs $TICK * 0.1; 4138 BDB::max_poll_reqs $TICK * 0.1;
4110 $AnyEvent::BDB::WATCHER->priority (1); 4139 #$AnyEvent::BDB::WATCHER->priority (1);
4111 4140
4112 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
4113 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
4114 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4115 $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;
… …
4150 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
4151 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
4152 undef $AnyEvent::AIO::WATCHER; 4181 undef $AnyEvent::AIO::WATCHER;
4153} 4182}
4154 4183
4155my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
4156 4186
4157sub _log_backtrace { 4187sub _log_backtrace {
4158 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
4159 4189
4160 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
4161 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4162 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
4163 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
4164 ++$_log_backtrace; 4198 ++$_log_backtrace;
4165 my $perl_bt = Carp::longmess $msg; 4199 my $perl_bt = Carp::longmess $msg;
4166 async { 4200 async {
4167 $Coro::current->{desc} = "abt $msg"; 4201 $Coro::current->{desc} = "abt $msg";
4168 4202
… …
4188 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
4189 --$_log_backtrace; 4223 --$_log_backtrace;
4190 }; 4224 };
4191 } else { 4225 } else {
4192 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
4193 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4194 } 4228 }
4195} 4229}
4196 4230
4197# load additional modules 4231# load additional modules
4198require "cf/$_.pm" for @EXTRA_MODULES; 4232require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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