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.570 by root, Wed May 4 07:41:14 2011 UTC vs.
Revision 1.592 by root, Fri Nov 9 00:11:49 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
… …
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp (); 35use Carp ();
36 36
37use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
… …
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Fcntl; 60use Fcntl;
57use YAML::XS (); 61use YAML::XS ();
… …
108our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
109our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid"; 114our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime"; 115our $RUNTIMEFILE = "$LOCALDIR/runtime";
112 116
113our %RESOURCE; # unused 117#our %RESOURCE; # unused
114 118
115our $OUTPUT_RATE_MIN = 3000; 119our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000; 120our $OUTPUT_RATE_MAX = 1000000;
117 121
118our $MAX_LINKS = 32; # how many chained exits to follow 122our $MAX_LINKS = 32; # how many chained exits to follow
… …
129our $DB_ENV; 133our $DB_ENV;
130 134
131our @EXTRA_MODULES = qw(pod match mapscript incloader); 135our @EXTRA_MODULES = qw(pod match mapscript incloader);
132 136
133our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
134 139
135our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
136our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
137our $NOW; 143our $NOW;
138 144
139our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
140our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
141our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
… …
150 156
151our @POST_INIT; 157our @POST_INIT;
152 158
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 159our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :) 160our $REALLY_UNLOOP; # never set to true, please :)
161
162our $WAIT_FOR_TICK = new Coro::Signal;
163our @WAIT_FOR_TICK_BEGIN;
155 164
156binmode STDOUT; 165binmode STDOUT;
157binmode STDERR; 166binmode STDERR;
158 167
159# read virtual server time, if available 168# read virtual server time, if available
… …
193 202
194=over 4 203=over 4
195 204
196=item $cf::UPTIME 205=item $cf::UPTIME
197 206
198The timestamp of the server start (so not actually an uptime). 207The timestamp of the server start (so not actually an "uptime").
208
209=item $cf::SERVER_TICK
210
211An unsigned integer that starts at zero when the server is started and is
212incremented on every tick.
213
214=item $cf::NOW
215
216The (real) time of the last (current) server tick - updated before and
217after tick processing, so this is useful only as a rough "what time is it
218now" estimate.
219
220=item $cf::TICK
221
222The interval between each server tick, in seconds.
199 223
200=item $cf::RUNTIME 224=item $cf::RUNTIME
201 225
202The time this server has run, starts at 0 and is increased by $cf::TICK on 226The time this server has run, starts at 0 and is increased by $cf::TICK on
203every server tick. 227every server tick.
204 228
205=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 229=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
206$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 230$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
207$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 231$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
208 232
209Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
210directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
211unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
212database environment. 236database environment.
213 237
214=item $cf::NOW
215
216The time of the last (current) server tick.
217
218=item $cf::TICK
219
220The interval between server ticks, in seconds.
221
222=item $cf::LOADAVG 238=item $cf::LOADAVG
223 239
224The current CPU load on the server (alpha-smoothed), as a value between 0 240The current CPU load on the server (alpha-smoothed), as a value between 0
225(none) and 1 (overloaded), indicating how much time is spent on processing 241(none) and 1 (overloaded), indicating how much time is spent on processing
226objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
… …
237=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
238 254
239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 255These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
240returns directly I<after> the tick processing (and consequently, can only wake one thread 256returns directly I<after> the tick processing (and consequently, can only wake one thread
241per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 257per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
258
259Note that cf::Wait_for_tick will immediately return when the server is not
260ticking, making it suitable for small pauses in threads that need to run
261when the server is paused. If that is not applicable (i.e. you I<really>
262want to wait, use C<$cf::WAIT_FOR_TICK>).
263
264=item $cf::WAIT_FOR_TICK
265
266Note that C<cf::wait_for_tick> is probably the correct thing to use. This
267variable contains a L<Coro::Signal> that is broadcats after every server
268tick. Calling C<< ->wait >> on it will suspend the caller until after the
269next server tick.
242 270
243=cut 271=cut
244 272
245sub wait_for_tick(); 273sub wait_for_tick();
246sub wait_for_tick_begin(); 274sub wait_for_tick_begin();
… …
312)) { 340)) {
313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
314} 342}
315 343
316$EV::DIED = sub { 344$EV::DIED = sub {
317 Carp::cluck "error in event callback: @_"; 345 warn "error in event callback: $@";
318}; 346};
319 347
320############################################################################# 348#############################################################################
321 349
322sub fork_call(&@); 350sub fork_call(&@);
… …
349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 377 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
350 $d 378 $d
351 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
352} 380}
353 381
354=item $scalar = load_file $path 382=item $scalar = cf::load_file $path
355 383
356Loads the given file from path and returns its contents. Croaks on error 384Loads the given file from path and returns its contents. Croaks on error
357and can block. 385and can block.
358 386
359=cut 387=cut
… …
361sub load_file($) { 389sub load_file($) {
362 0 <= aio_load $_[0], my $data 390 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!"; 391 or Carp::croak "$_[0]: $!";
364 392
365 $data 393 $data
394}
395
396=item $success = cf::replace_file $path, $data, $sync
397
398Atomically replaces the file at the given $path with new $data, and
399optionally $sync the data to disk before replacing the file.
400
401=cut
402
403sub replace_file($$;$) {
404 my ($path, $data, $sync) = @_;
405
406 my $lock = cf::lock_acquire ("replace_file:$path");
407
408 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
409 or return;
410
411 $data = $data->() if ref $data;
412
413 length $data == aio_write $fh, 0, (length $data), $data, 0
414 or return;
415
416 !$sync
417 or !aio_fsync $fh
418 or return;
419
420 aio_close $fh
421 and return;
422
423 aio_rename "$path~", $path
424 and return;
425
426 if ($sync) {
427 $path =~ s%/[^/]*$%%;
428 aio_pathsync $path;
429 }
430
431 1
366} 432}
367 433
368=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
369 435
370Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
… …
545 } 611 }
546 } 612 }
547 613
548 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
549 # we do not use wait_for_tick() as it returns immediately when tick is inactive 615 # we do not use wait_for_tick() as it returns immediately when tick is inactive
550 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
551 $signal->wait;
552 } else { 617 } else {
553 $busy = 0; 618 $busy = 0;
554 Coro::schedule; 619 Coro::schedule;
555 } 620 }
556 } 621 }
… …
1439 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1440 1505
1441 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1442 1507
1443 if (ref $msg) { 1508 if (ref $msg) {
1444 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1445 "ARRAY" eq ref $msg
1446 ? @$msg
1447 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1448 1510
1449 my @reply; 1511 my @reply;
1450 1512
1451 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1452 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
… …
1474 }; 1536 };
1475 1537
1476 $grp 1538 $grp
1477} 1539}
1478 1540
1541sub _ext_cfg_reg($$$$) {
1542 my ($rvar, $varname, $cfgname, $default) = @_;
1543
1544 $cfgname = lc $varname
1545 unless length $cfgname;
1546
1547 $EXT_CFG{$cfgname} = [$rvar, $default];
1548
1549 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1550}
1551
1479sub load_extensions { 1552sub load_extensions {
1480 info "loading extensions..."; 1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1481 1556
1482 cf::sync_job { 1557 cf::sync_job {
1483 my %todo; 1558 my %todo;
1484 1559
1485 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
… …
1528 unless exists $done{$_}; 1603 unless exists $done{$_};
1529 } 1604 }
1530 1605
1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1532 1607
1608 my $source = $v->{source};
1609
1610 # support "CONF varname :confname = default" pseudo-statements
1611 $source =~ s{
1612 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1613 }{
1614 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1615 }gmxe;
1616
1533 my $active = eval $v->{source}; 1617 my $active = eval $source;
1534 1618
1535 if (length $@) { 1619 if (length $@) {
1536 error "$v->{path}: $@\n"; 1620 error "$v->{path}: $@\n";
1537 1621
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
… …
2245# if $self->per_party; 2329# if $self->per_party;
2246 2330
2247 $self 2331 $self
2248} 2332}
2249 2333
2250# find and load all maps in the 3x3 area around a map
2251sub load_neighbours {
2252 my ($map) = @_;
2253
2254 my @neigh; # diagonal neighbours
2255
2256 for (0 .. 3) {
2257 my $neigh = $map->tile_path ($_)
2258 or next;
2259 $neigh = find $neigh, $map
2260 or next;
2261 $neigh->load;
2262
2263 # now find the diagonal neighbours
2264 push @neigh,
2265 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2266 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2267 }
2268
2269 for (grep defined $_->[0], @neigh) {
2270 my ($path, $origin) = @$_;
2271 my $neigh = find $path, $origin
2272 or next;
2273 $neigh->load;
2274 }
2275}
2276
2277sub find_sync { 2334sub find_sync {
2278 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2279 2336
2280 # it's a bug to call this from the main context 2337 # it's a bug to call this from the main context
2281 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
… …
2299 2356
2300sub find_async { 2357sub find_async {
2301 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2302 2359
2303 $path = normalise $path, $origin; 2360 $path = normalise $path, $origin;
2304 2361
2305 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2306 return $map if !$load || $map->linkable; 2363 return $map if !$load || $map->linkable;
2307 } 2364 }
2308 2365
2309 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
… …
2753 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2754 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2755 if $x <= 0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2756 2813
2757 $map->load; 2814 $map->load;
2758 $map->load_neighbours;
2759 2815
2760 return unless $self->contr->active; 2816 return unless $self->contr->active;
2761 2817
2762 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2763 if ($self->enter_map ($map, $x, $y)) { 2819 if ($self->enter_map ($map, $x, $y)) {
… …
3179=cut 3235=cut
3180 3236
3181sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
3182 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
3183 3239
3184 if ($self->extcmd == 2) {
3185 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3186 } elsif ($self->extcmd == 1) { # TODO: remove
3187 push @msg, msgtype => "event_$type";
3188 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3189 }
3190} 3241}
3191 3242
3192=item $client->ext_reply ($msgid, @msg) 3243=item $client->ext_reply ($msgid, @msg)
3193 3244
3194Sends an ext reply to the client. 3245Sends an ext reply to the client.
… …
3196=cut 3247=cut
3197 3248
3198sub cf::client::ext_reply($$@) { 3249sub cf::client::ext_reply($$@) {
3199 my ($self, $id, @msg) = @_; 3250 my ($self, $id, @msg) = @_;
3200 3251
3201 if ($self->extcmd == 2) {
3202 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3252 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3203 } elsif ($self->extcmd == 1) {
3204 #TODO: version 1, remove
3205 unshift @msg, msgtype => "reply", msgid => $id;
3206 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3207 }
3208} 3253}
3209 3254
3210=item $success = $client->query ($flags, "text", \&cb) 3255=item $success = $client->query ($flags, "text", \&cb)
3211 3256
3212Queues a query to the client, calling the given callback with 3257Queues a query to the client, calling the given callback with
… …
3267 my ($ns, $buf) = @_; 3312 my ($ns, $buf) = @_;
3268 3313
3269 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3314 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3270 3315
3271 if (ref $msg) { 3316 if (ref $msg) {
3272 my ($type, $reply, @payload) = 3317 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3273 "ARRAY" eq ref $msg
3274 ? @$msg
3275 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3276 3318
3277 my @reply; 3319 my @reply;
3278 3320
3279 if (my $cb = $EXTICMD{$type}) { 3321 if (my $cb = $EXTICMD{$type}) {
3280 @reply = $cb->($ns, @payload); 3322 @reply = $cb->($ns, @payload);
… …
3458=cut 3500=cut
3459 3501
3460############################################################################# 3502#############################################################################
3461# the server's init and main functions 3503# the server's init and main functions
3462 3504
3505our %FACEHASH; # hash => idx, #d# HACK for http server
3506
3507# internal api, not fianlised
3508sub add_face {
3509 my ($name, $type, $data) = @_;
3510
3511 my $idx = cf::face::find $name;
3512
3513 if ($idx) {
3514 delete $FACEHASH{cf::face::get_chksum $idx};
3515 } else {
3516 $idx = cf::face::alloc $name;
3517 }
3518
3519 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3520
3521 cf::face::set_type $idx, $type;
3522 cf::face::set_data $idx, 0, $data, $hash;
3523 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3524 $FACEHASH{$hash} = $idx;#d#
3525
3526 $idx
3527}
3528
3463sub load_facedata($) { 3529sub load_facedata($) {
3464 my ($path) = @_; 3530 my ($path) = @_;
3465 3531
3466 # HACK to clear player env face cache, we need some signal framework 3532 # HACK to clear player env face cache, we need some signal framework
3467 # for this (global event?) 3533 # for this (global event?)
… …
3474 my $facedata = decode_storable load_file $path; 3540 my $facedata = decode_storable load_file $path;
3475 3541
3476 $facedata->{version} == 2 3542 $facedata->{version} == 2
3477 or cf::cleanup "$path: version mismatch, cannot proceed."; 3543 or cf::cleanup "$path: version mismatch, cannot proceed.";
3478 3544
3479 # patch in the exptable
3480 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3481 $facedata->{resource}{"res/exp_table"} = {
3482 type => FT_RSRC,
3483 data => $exp_table,
3484 hash => (Digest::MD5::md5 $exp_table),
3485 };
3486 cf::cede_to_tick; 3545 cf::cede_to_tick;
3487 3546
3488 { 3547 {
3489 my $faces = $facedata->{faceinfo}; 3548 my $faces = $facedata->{faceinfo};
3490 3549
3491 while (my ($face, $info) = each %$faces) { 3550 for my $face (sort keys %$faces) {
3551 my $info = $faces->{$face};
3492 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3552 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3493 3553
3494 cf::face::set_visibility $idx, $info->{visibility}; 3554 cf::face::set_visibility $idx, $info->{visibility};
3495 cf::face::set_magicmap $idx, $info->{magicmap}; 3555 cf::face::set_magicmap $idx, $info->{magicmap};
3496 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3556 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3497 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3557 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3498 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3558 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3559 $FACEHASH{$info->{hash64}} = $idx;#d#
3499 3560
3500 cf::cede_to_tick; 3561 cf::cede_to_tick;
3501 } 3562 }
3502 3563
3503 while (my ($face, $info) = each %$faces) { 3564 while (my ($face, $info) = each %$faces) {
… …
3530 3591
3531 { 3592 {
3532 my $res = $facedata->{resource}; 3593 my $res = $facedata->{resource};
3533 3594
3534 while (my ($name, $info) = each %$res) { 3595 while (my ($name, $info) = each %$res) {
3535 if (defined $info->{type}) { 3596 if (defined (my $type = $info->{type})) {
3597 # TODO: different hash - must free and use new index, or cache ixface data queue
3536 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3598 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3537 3599
3600 cf::face::set_type $idx, $type;
3538 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3601 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3539 cf::face::set_type $idx, $info->{type}; 3602 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3603 $FACEHASH{$info->{hash}} = $idx;#d#
3540 } else { 3604 } else {
3541 $RESOURCE{$name} = $info; # unused 3605# $RESOURCE{$name} = $info; # unused
3542 } 3606 }
3543 3607
3544 cf::cede_to_tick; 3608 cf::cede_to_tick;
3545 } 3609 }
3546 } 3610 }
… …
3564 my $status = load_resource_file_ $_[0]; 3628 my $status = load_resource_file_ $_[0];
3565 get_slot 0.1, 100; 3629 get_slot 0.1, 100;
3566 cf::arch::commit_load; 3630 cf::arch::commit_load;
3567 3631
3568 $status 3632 $status
3633}
3634
3635sub reload_exp_table {
3636 _reload_exp_table;
3637
3638 add_face "res/exp_table" => FT_RSRC,
3639 JSON::XS->new->utf8->canonical->encode (
3640 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3641 );
3642}
3643
3644sub reload_materials {
3645 _reload_materials;
3569} 3646}
3570 3647
3571sub reload_regions { 3648sub reload_regions {
3572 # HACK to clear player env face cache, we need some signal framework 3649 # HACK to clear player env face cache, we need some signal framework
3573 # for this (global event?) 3650 # for this (global event?)
… …
3588} 3665}
3589 3666
3590sub reload_archetypes { 3667sub reload_archetypes {
3591 load_resource_file "$DATADIR/archetypes" 3668 load_resource_file "$DATADIR/archetypes"
3592 or die "unable to load archetypes\n"; 3669 or die "unable to load archetypes\n";
3670
3671 add_face "res/skill_info" => FT_RSRC,
3672 JSON::XS->new->utf8->canonical->encode (
3673 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3674 );
3675 add_face "res/spell_paths" => FT_RSRC,
3676 JSON::XS->new->utf8->canonical->encode (
3677 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3678 );
3593} 3679}
3594 3680
3595sub reload_treasures { 3681sub reload_treasures {
3596 load_resource_file "$DATADIR/treasures" 3682 load_resource_file "$DATADIR/treasures"
3597 or die "unable to load treasurelists\n"; 3683 or die "unable to load treasurelists\n";
… …
3615 my $face = cf::face::find "sound/$v"; 3701 my $face = cf::face::find "sound/$v";
3616 cf::sound::set $k => $face; 3702 cf::sound::set $k => $face;
3617 } 3703 }
3618} 3704}
3619 3705
3706#d# move docstuff to help or so
3707our %DOCSTRING;
3708
3709sub reload_pod {
3710 trace "loading pods $PODDIR\n";
3711
3712 %DOCSTRING = ();
3713 my @command_list;
3714
3715 for (
3716 [0, "command_help"],
3717 [1, "emote_help"],
3718 [2, "dmcommand_help"],
3719 ) {
3720 my ($type, $path) = @$_;
3721
3722 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3723 or die "unable to load $path";
3724
3725 my $level = 1e9;
3726 my $rpar;
3727
3728 for my $par (@$paragraphs) {
3729 if ($par->{type} eq "head2") {
3730 # this code taken almost verbatim from DC/Protocol.pm
3731
3732 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3733 my $cmd = $1;
3734 my @args = split /\|/, $2;
3735 @args = (".*") unless @args;
3736
3737 $_ = $_ eq ".*" ? "" : " $_"
3738 for @args;
3739
3740 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3741
3742 $rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par]));
3743
3744 push @command_list, [$type, \@variants];
3745 $level = $par->{level};
3746 } else {
3747 error "$par->{markup}: unparsable command heading";
3748 }
3749 } elsif ($par->{level} > $level) {
3750 $$rpar .= &cf::pod::as_cfpod ([$par]);
3751 }
3752
3753 cf::cede_to_tick;
3754 }
3755 }
3756
3757 @command_list = sort {
3758 $a->[0] <=> $b->[0]
3759 or $a->[1] cmp $b->[1]
3760 } @command_list;
3761
3762 cf::cede_to_tick;
3763
3764 add_face "res/command_list" => FT_RSRC,
3765 JSON::XS->new->utf8->encode (\@command_list);
3766}
3767
3620sub reload_resources { 3768sub reload_resources {
3621 trace "reloading resource files...\n"; 3769 trace "reloading resource files...\n";
3622 3770
3623 reload_exp_table;
3624 reload_materials; 3771 reload_materials;
3625 reload_facedata; 3772 reload_facedata;
3773 reload_exp_table;
3626 reload_sound; 3774 reload_sound;
3627 reload_archetypes; 3775 reload_archetypes;
3628 reload_regions; 3776 reload_regions;
3629 reload_treasures; 3777 reload_treasures;
3778 reload_pod;
3630 3779
3631 trace "finished reloading resource files\n"; 3780 trace "finished reloading resource files\n";
3632} 3781}
3633 3782
3634sub reload_config { 3783sub reload_config {
… …
3682 3831
3683sub main { 3832sub main {
3684 cf::init_globals; # initialise logging 3833 cf::init_globals; # initialise logging
3685 3834
3686 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3835 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3687 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3836 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3688 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3837 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3689 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3838 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3690 3839
3691 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3840 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3692 3841
3693 # we must not ever block the main coroutine 3842 # we must not ever block the main coroutine
3694 local $Coro::idle = sub { 3843 $Coro::idle = sub {
3695 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3844 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3696 (async { 3845 (async {
3697 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3846 $Coro::current->{desc} = "IDLE BUG HANDLER";
3698 EV::loop EV::LOOP_ONESHOT; 3847 EV::loop EV::LOOP_ONESHOT;
3699 })->prio (Coro::PRIO_MAX); 3848 })->prio (Coro::PRIO_MAX);
… …
3702 evthread_start IO::AIO::poll_fileno; 3851 evthread_start IO::AIO::poll_fileno;
3703 3852
3704 cf::sync_job { 3853 cf::sync_job {
3705 cf::incloader::init (); 3854 cf::incloader::init ();
3706 3855
3856 db_init;
3857
3707 cf::init_anim; 3858 cf::init_anim;
3708 cf::init_attackmess; 3859 cf::init_attackmess;
3709 cf::init_dynamic; 3860 cf::init_dynamic;
3710 3861
3711 cf::load_settings; 3862 cf::load_settings;
3712 3863
3713 reload_resources; 3864 reload_resources;
3714 reload_config; 3865 reload_config;
3715 db_init;
3716 3866
3717 cf::init_uuid; 3867 cf::init_uuid;
3718 cf::init_signals; 3868 cf::init_signals;
3719 cf::init_skills; 3869 cf::init_skills;
3720 3870
… …
3734 }; 3884 };
3735 3885
3736 cf::object::thawer::errors_are_fatal 0; 3886 cf::object::thawer::errors_are_fatal 0;
3737 info "parse errors in files are no longer fatal from this point on.\n"; 3887 info "parse errors in files are no longer fatal from this point on.\n";
3738 3888
3739 my $free_main; $free_main = EV::idle sub { 3889 AE::postpone {
3740 undef $free_main;
3741 undef &main; # free gobs of memory :) 3890 undef &main; # free gobs of memory :)
3742 }; 3891 };
3743 3892
3744 goto &main_loop; 3893 goto &main_loop;
3745} 3894}
… …
3902 4051
3903 cf::write_runtime_sync; # external watchdog should not bark 4052 cf::write_runtime_sync; # external watchdog should not bark
3904 4053
3905 trace "emergency_perl_save: flushing outstanding aio requests"; 4054 trace "emergency_perl_save: flushing outstanding aio requests";
3906 while (IO::AIO::nreqs || BDB::nreqs) { 4055 while (IO::AIO::nreqs || BDB::nreqs) {
3907 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 4056 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3908 } 4057 }
3909 4058
3910 cf::write_runtime_sync; # external watchdog should not bark 4059 cf::write_runtime_sync; # external watchdog should not bark
3911 }; 4060 };
3912 4061
… …
4093 4242
4094############################################################################# 4243#############################################################################
4095 4244
4096my $bug_warning = 0; 4245my $bug_warning = 0;
4097 4246
4098our @WAIT_FOR_TICK;
4099our @WAIT_FOR_TICK_BEGIN;
4100
4101sub wait_for_tick() { 4247sub wait_for_tick() {
4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4248 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4103 4249
4104 my $signal = new Coro::Signal; 4250 $WAIT_FOR_TICK->wait;
4105 push @WAIT_FOR_TICK, $signal;
4106 $signal->wait;
4107} 4251}
4108 4252
4109sub wait_for_tick_begin() { 4253sub wait_for_tick_begin() {
4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4254 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4111 4255
4112 my $signal = new Coro::Signal; 4256 my $signal = new Coro::Signal;
4113 push @WAIT_FOR_TICK_BEGIN, $signal; 4257 push @WAIT_FOR_TICK_BEGIN, $signal;
4114 $signal->wait; 4258 $signal->wait;
4115} 4259}
… …
4119 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4263 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4120 unless ++$bug_warning > 10; 4264 unless ++$bug_warning > 10;
4121 return; 4265 return;
4122 } 4266 }
4123 4267
4124 cf::server_tick; # one server iteration 4268 cf::one_tick; # one server iteration
4125 4269
4126 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4270 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4127 4271
4128 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4272 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4129 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4273 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4135 } 4279 }
4136 4280
4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4281 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4138 $sig->send; 4282 $sig->send;
4139 } 4283 }
4140 while (my $sig = shift @WAIT_FOR_TICK) { 4284 $WAIT_FOR_TICK->broadcast;
4141 $sig->send;
4142 }
4143 4285
4144 $LOAD = ($NOW - $TICK_START) / $TICK; 4286 $LOAD = ($NOW - $TICK_START) / $TICK;
4145 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4287 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4146 4288
4147 if (0) { 4289 if (0) {
… …
4153 } 4295 }
4154} 4296}
4155 4297
4156{ 4298{
4157 # configure BDB 4299 # configure BDB
4300 info "initialising database";
4158 4301
4159 BDB::min_parallel 16; 4302 BDB::min_parallel 16;
4160 BDB::max_poll_reqs $TICK * 0.1; 4303 BDB::max_poll_reqs $TICK * 0.1;
4161 $AnyEvent::BDB::WATCHER->priority (1); 4304 #$AnyEvent::BDB::WATCHER->priority (1);
4162 4305
4163 unless ($DB_ENV) { 4306 unless ($DB_ENV) {
4164 $DB_ENV = BDB::db_env_create; 4307 $DB_ENV = BDB::db_env_create;
4165 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4308 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4166 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4309 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4191 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4334 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4192 }; 4335 };
4193 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4336 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4194 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4337 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4195 }; 4338 };
4339
4340 info "database initialised";
4196} 4341}
4197 4342
4198{ 4343{
4199 # configure IO::AIO 4344 # configure IO::AIO
4200 4345
4346 info "initialising aio";
4201 IO::AIO::min_parallel 8; 4347 IO::AIO::min_parallel 8;
4202 IO::AIO::max_poll_time $TICK * 0.1; 4348 IO::AIO::max_poll_time $TICK * 0.1;
4203 undef $AnyEvent::AIO::WATCHER; 4349 undef $AnyEvent::AIO::WATCHER;
4350 info "aio initialised";
4204} 4351}
4205 4352
4206our $_log_backtrace; 4353our $_log_backtrace;
4207our $_log_backtrace_last; 4354our $_log_backtrace_last;
4208 4355

Diff Legend

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