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.571 by root, Wed May 4 19:04:45 2011 UTC vs.
Revision 1.587 by root, Wed Oct 31 19:09:47 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010,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 = 0; 141our $RUNTIME = 0;
137our $SERVER_TICK = 0; 142our $SERVER_TICK = 0;
138our $NOW; 143our $NOW;
… …
335)) { 340)) {
336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
337} 342}
338 343
339$EV::DIED = sub { 344$EV::DIED = sub {
340 Carp::cluck "error in event callback: @_"; 345 warn "error in event callback: $@";
341}; 346};
342 347
343############################################################################# 348#############################################################################
344 349
345sub fork_call(&@); 350sub fork_call(&@);
… …
372 $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;
373 $d 378 $d
374 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
375} 380}
376 381
377=item $scalar = load_file $path 382=item $scalar = cf::load_file $path
378 383
379Loads 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
380and can block. 385and can block.
381 386
382=cut 387=cut
… …
384sub load_file($) { 389sub load_file($) {
385 0 <= aio_load $_[0], my $data 390 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!"; 391 or Carp::croak "$_[0]: $!";
387 392
388 $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
389} 432}
390 433
391=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
392 435
393Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
… …
1461 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1462 1505
1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1464 1507
1465 if (ref $msg) { 1508 if (ref $msg) {
1466 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1467 "ARRAY" eq ref $msg
1468 ? @$msg
1469 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1470 1510
1471 my @reply; 1511 my @reply;
1472 1512
1473 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1474 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
… …
1496 }; 1536 };
1497 1537
1498 $grp 1538 $grp
1499} 1539}
1500 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
1501sub load_extensions { 1552sub load_extensions {
1502 info "loading extensions..."; 1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1503 1556
1504 cf::sync_job { 1557 cf::sync_job {
1505 my %todo; 1558 my %todo;
1506 1559
1507 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
… …
1550 unless exists $done{$_}; 1603 unless exists $done{$_};
1551 } 1604 }
1552 1605
1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1554 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
1555 my $active = eval $v->{source}; 1617 my $active = eval $source;
1556 1618
1557 if (length $@) { 1619 if (length $@) {
1558 error "$v->{path}: $@\n"; 1620 error "$v->{path}: $@\n";
1559 1621
1560 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
… …
2239 2301
2240 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2241 $self->decay_objects; 2303 $self->decay_objects;
2242 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2243 $self->update_buttons; 2305 $self->update_buttons;
2244 $self->post_load_physics;
2245 cf::cede_to_tick; 2306 cf::cede_to_tick;
2246 #$self->activate; # no longer activate maps automatically 2307 #$self->activate; # no longer activate maps automatically
2247 } 2308 }
2248 2309
2249 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
… …
2268# if $self->per_party; 2329# if $self->per_party;
2269 2330
2270 $self 2331 $self
2271} 2332}
2272 2333
2273# find and load all maps in the 3x3 area around a map
2274sub load_neighbours {
2275 my ($map) = @_;
2276
2277 my @neigh; # diagonal neighbours
2278
2279 for (0 .. 3) {
2280 my $neigh = $map->tile_path ($_)
2281 or next;
2282 $neigh = find $neigh, $map
2283 or next;
2284 $neigh->load;
2285
2286 # now find the diagonal neighbours
2287 push @neigh,
2288 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2289 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2290 }
2291
2292 for (grep defined $_->[0], @neigh) {
2293 my ($path, $origin) = @$_;
2294 my $neigh = find $path, $origin
2295 or next;
2296 $neigh->load;
2297 }
2298}
2299
2300sub find_sync { 2334sub find_sync {
2301 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2302 2336
2303 # it's a bug to call this from the main context 2337 # it's a bug to call this from the main context
2304 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
… …
2322 2356
2323sub find_async { 2357sub find_async {
2324 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2325 2359
2326 $path = normalise $path, $origin; 2360 $path = normalise $path, $origin;
2327 2361
2328 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2329 return $map if !$load || $map->linkable; 2363 return $map if !$load || $map->linkable;
2330 } 2364 }
2331 2365
2332 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
… …
2776 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2777 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2778 if $x <= 0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2779 2813
2780 $map->load; 2814 $map->load;
2781 $map->load_neighbours;
2782 2815
2783 return unless $self->contr->active; 2816 return unless $self->contr->active;
2784 2817
2785 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2786 if ($self->enter_map ($map, $x, $y)) { 2819 if ($self->enter_map ($map, $x, $y)) {
… …
3219=cut 3252=cut
3220 3253
3221sub cf::client::ext_reply($$@) { 3254sub cf::client::ext_reply($$@) {
3222 my ($self, $id, @msg) = @_; 3255 my ($self, $id, @msg) = @_;
3223 3256
3224 if ($self->extcmd == 2) { 3257 return unless $self->extcmd == 2;
3258
3225 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3259 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3226 } elsif ($self->extcmd == 1) {
3227 #TODO: version 1, remove
3228 unshift @msg, msgtype => "reply", msgid => $id;
3229 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3230 }
3231} 3260}
3232 3261
3233=item $success = $client->query ($flags, "text", \&cb) 3262=item $success = $client->query ($flags, "text", \&cb)
3234 3263
3235Queues a query to the client, calling the given callback with 3264Queues a query to the client, calling the given callback with
… …
3290 my ($ns, $buf) = @_; 3319 my ($ns, $buf) = @_;
3291 3320
3292 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3321 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3293 3322
3294 if (ref $msg) { 3323 if (ref $msg) {
3295 my ($type, $reply, @payload) = 3324 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3296 "ARRAY" eq ref $msg
3297 ? @$msg
3298 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3299 3325
3300 my @reply; 3326 my @reply;
3301 3327
3302 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTICMD{$type}) {
3303 @reply = $cb->($ns, @payload); 3329 @reply = $cb->($ns, @payload);
… …
3481=cut 3507=cut
3482 3508
3483############################################################################# 3509#############################################################################
3484# the server's init and main functions 3510# the server's init and main functions
3485 3511
3512our %FACEHASH; # hash => idx, #d# HACK for http server
3513
3486sub load_facedata($) { 3514sub load_facedata($) {
3487 my ($path) = @_; 3515 my ($path) = @_;
3488 3516
3489 # HACK to clear player env face cache, we need some signal framework 3517 # HACK to clear player env face cache, we need some signal framework
3490 # for this (global event?) 3518 # for this (global event?)
… …
3509 cf::cede_to_tick; 3537 cf::cede_to_tick;
3510 3538
3511 { 3539 {
3512 my $faces = $facedata->{faceinfo}; 3540 my $faces = $facedata->{faceinfo};
3513 3541
3514 while (my ($face, $info) = each %$faces) { 3542 for my $face (sort keys %$faces) {
3543 my $info = $faces->{$face};
3515 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3544 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3516 3545
3517 cf::face::set_visibility $idx, $info->{visibility}; 3546 cf::face::set_visibility $idx, $info->{visibility};
3518 cf::face::set_magicmap $idx, $info->{magicmap}; 3547 cf::face::set_magicmap $idx, $info->{magicmap};
3519 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3548 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3520 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3549 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3521 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3550 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3551 $FACEHASH{$info->{hash64}} = $idx;#d#
3522 3552
3523 cf::cede_to_tick; 3553 cf::cede_to_tick;
3524 } 3554 }
3525 3555
3526 while (my ($face, $info) = each %$faces) { 3556 while (my ($face, $info) = each %$faces) {
… …
3553 3583
3554 { 3584 {
3555 my $res = $facedata->{resource}; 3585 my $res = $facedata->{resource};
3556 3586
3557 while (my ($name, $info) = each %$res) { 3587 while (my ($name, $info) = each %$res) {
3558 if (defined $info->{type}) { 3588 if (defined (my $type = $info->{type})) {
3589 # TODO: different hash - must free and use new index, or cache ixface data queue
3559 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3590 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3560 3591
3561 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3592 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3562 cf::face::set_type $idx, $info->{type}; 3593 cf::face::set_type $idx, $type;
3594 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3595 $FACEHASH{$info->{hash}} = $idx;#d#
3563 } else { 3596 } else {
3564 $RESOURCE{$name} = $info; # unused 3597# $RESOURCE{$name} = $info; # unused
3565 } 3598 }
3566 3599
3567 cf::cede_to_tick; 3600 cf::cede_to_tick;
3568 } 3601 }
3569 } 3602 }
… …
3705 3738
3706sub main { 3739sub main {
3707 cf::init_globals; # initialise logging 3740 cf::init_globals; # initialise logging
3708 3741
3709 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3742 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3710 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3743 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3711 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3744 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3712 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3745 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3713 3746
3714 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3747 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3715 3748
3716 # we must not ever block the main coroutine 3749 # we must not ever block the main coroutine
3717 local $Coro::idle = sub { 3750 $Coro::idle = sub {
3718 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3751 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3719 (async { 3752 (async {
3720 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3753 $Coro::current->{desc} = "IDLE BUG HANDLER";
3721 EV::loop EV::LOOP_ONESHOT; 3754 EV::loop EV::LOOP_ONESHOT;
3722 })->prio (Coro::PRIO_MAX); 3755 })->prio (Coro::PRIO_MAX);
… …
3757 }; 3790 };
3758 3791
3759 cf::object::thawer::errors_are_fatal 0; 3792 cf::object::thawer::errors_are_fatal 0;
3760 info "parse errors in files are no longer fatal from this point on.\n"; 3793 info "parse errors in files are no longer fatal from this point on.\n";
3761 3794
3762 my $free_main; $free_main = EV::idle sub { 3795 AE::postpone {
3763 undef $free_main;
3764 undef &main; # free gobs of memory :) 3796 undef &main; # free gobs of memory :)
3765 }; 3797 };
3766 3798
3767 goto &main_loop; 3799 goto &main_loop;
3768} 3800}
… …
3925 3957
3926 cf::write_runtime_sync; # external watchdog should not bark 3958 cf::write_runtime_sync; # external watchdog should not bark
3927 3959
3928 trace "emergency_perl_save: flushing outstanding aio requests"; 3960 trace "emergency_perl_save: flushing outstanding aio requests";
3929 while (IO::AIO::nreqs || BDB::nreqs) { 3961 while (IO::AIO::nreqs || BDB::nreqs) {
3930 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3962 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3931 } 3963 }
3932 3964
3933 cf::write_runtime_sync; # external watchdog should not bark 3965 cf::write_runtime_sync; # external watchdog should not bark
3934 }; 3966 };
3935 3967
… …
4172{ 4204{
4173 # configure BDB 4205 # configure BDB
4174 4206
4175 BDB::min_parallel 16; 4207 BDB::min_parallel 16;
4176 BDB::max_poll_reqs $TICK * 0.1; 4208 BDB::max_poll_reqs $TICK * 0.1;
4177 $AnyEvent::BDB::WATCHER->priority (1); 4209 #$AnyEvent::BDB::WATCHER->priority (1);
4178 4210
4179 unless ($DB_ENV) { 4211 unless ($DB_ENV) {
4180 $DB_ENV = BDB::db_env_create; 4212 $DB_ENV = BDB::db_env_create;
4181 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4213 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4182 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4214 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;

Diff Legend

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