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.474 by root, Thu Jul 16 21:42:56 2009 UTC vs.
Revision 1.487 by root, Fri Oct 16 01:56:41 2009 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your 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 GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# 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>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
… …
53use JSON::XS 2.01 (); 54use JSON::XS 2.01 ();
54use BDB (); 55use BDB ();
55use Data::Dumper; 56use Data::Dumper;
56use Digest::MD5; 57use Digest::MD5;
57use Fcntl; 58use Fcntl;
58use YAML (); 59use YAML::XS ();
59use IO::AIO (); 60use IO::AIO ();
60use Time::HiRes; 61use Time::HiRes;
61use Compress::LZF; 62use Compress::LZF;
62use Digest::MD5 (); 63use Digest::MD5 ();
63 64
… …
88our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
90 91
91our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
93 96
94our $CONFDIR = confdir; 97our $CONFDIR = confdir;
95our $DATADIR = datadir; 98our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
115our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 121our $DB_ENV;
119 122
120our @EXTRA_MODULES = qw(pod mapscript); 123our @EXTRA_MODULES = qw(pod match mapscript);
121 124
122our %CFG; 125our %CFG;
123 126
124our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 128our $RUNTIME;
… …
161 164
162sub cf::map::normalise; 165sub cf::map::normalise;
163 166
164############################################################################# 167#############################################################################
165 168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
177
178#############################################################################
179
166=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
167 181
168=over 4 182=over 4
169 183
170=item $cf::UPTIME 184=item $cf::UPTIME
… …
218 232
219This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
220C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
221that call. 235that call.
222 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
223=back 243=back
224 244
225=cut 245=cut
226 246
227BEGIN { 247$Coro::State::WARNHOOK = sub {
228 *CORE::GLOBAL::warn = sub {
229 my $msg = join "", @_; 248 my $msg = join "", @_;
230 249
231 $msg .= "\n" 250 $msg .= "\n"
232 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
233 252
234 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
235 254
236 LOG llevError, $msg; 255 LOG llevError, $msg;
237 }; 256};
238}
239 257
240$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
241 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
242 262
243 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 265 return;#d#
246 }#d# 266 }#d#
247 267
248 # kill coroutine otherwise 268 # kill coroutine otherwise
249 warn Carp::longmess $_[0];
250 Coro::terminate 269 Coro::terminate
251}; 270};
252
253$SIG{__DIE__} = sub { }; #d#?
254 271
255@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
256@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
257@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
258@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
2223 2240
2224 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2225 2242
2226 return if $self->players; 2243 return if $self->players;
2227 2244
2228 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2229 2246
2230 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2231 2248
2232 # need to save uniques path 2249 # need to save uniques path
2233 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
… …
2534 2551
2535 $map->load; 2552 $map->load;
2536 $map->load_neighbours; 2553 $map->load_neighbours;
2537 2554
2538 return unless $self->contr->active; 2555 return unless $self->contr->active;
2539 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2540 $self->activate_recursive;
2541 2556
2542 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2557 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2543 $self->enter_map ($map, $x, $y); 2558 $self->enter_map ($map, $x, $y);
2559
2560 # only activate afterwards, to support waiting in hooks
2561 $self->activate_recursive;
2544} 2562}
2545 2563
2546=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2564=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2547 2565
2548Moves the player to the given map-path and coordinates by first freezing 2566Moves the player to the given map-path and coordinates by first freezing
… …
2747 2765
2748=cut 2766=cut
2749 2767
2750# non-persistent channels (usually the info channel) 2768# non-persistent channels (usually the info channel)
2751our %CHANNEL = ( 2769our %CHANNEL = (
2770 "c/motd" => {
2771 id => "infobox",
2772 title => "MOTD",
2773 reply => undef,
2774 tooltip => "The message of the day",
2775 },
2752 "c/identify" => { 2776 "c/identify" => {
2753 id => "infobox", 2777 id => "infobox",
2754 title => "Identify", 2778 title => "Identify",
2755 reply => undef, 2779 reply => undef,
2756 tooltip => "Items recently identified", 2780 tooltip => "Items recently identified",
… …
2758 "c/examine" => { 2782 "c/examine" => {
2759 id => "infobox", 2783 id => "infobox",
2760 title => "Examine", 2784 title => "Examine",
2761 reply => undef, 2785 reply => undef,
2762 tooltip => "Signs and other items you examined", 2786 tooltip => "Signs and other items you examined",
2787 },
2788 "c/shopinfo" => {
2789 id => "infobox",
2790 title => "Shop Info",
2791 reply => undef,
2792 tooltip => "What your bargaining skill tells you about the shop",
2763 }, 2793 },
2764 "c/book" => { 2794 "c/book" => {
2765 id => "infobox", 2795 id => "infobox",
2766 title => "Book", 2796 title => "Book",
2767 reply => undef, 2797 reply => undef,
… …
3365 3395
3366 warn "finished reloading resource files\n"; 3396 warn "finished reloading resource files\n";
3367} 3397}
3368 3398
3369sub reload_config { 3399sub reload_config {
3400 warn "reloading config file...\n";
3401
3370 open my $fh, "<:utf8", "$CONFDIR/config" 3402 open my $fh, "<:utf8", "$CONFDIR/config"
3371 or return; 3403 or return;
3372 3404
3373 local $/; 3405 local $/;
3374 *CFG = YAML::Load <$fh>; 3406 *CFG = YAML::XS::Load scalar <$fh>;
3375 3407
3376 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3408 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3377 3409
3378 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3410 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3379 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3411 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3383 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3415 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3384 and die "WARNING: m(un)lockall failed: $!\n"; 3416 and die "WARNING: m(un)lockall failed: $!\n";
3385 }; 3417 };
3386 warn $@ if $@; 3418 warn $@ if $@;
3387 } 3419 }
3420
3421 warn "finished reloading resource files\n";
3388} 3422}
3389 3423
3390sub pidfile() { 3424sub pidfile() {
3391 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3425 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3392 or die "$PIDFILE: $!"; 3426 or die "$PIDFILE: $!";
… …
3460 load_extensions; 3494 load_extensions;
3461 3495
3462 utime time, time, $RUNTIMEFILE; 3496 utime time, time, $RUNTIMEFILE;
3463 3497
3464 # no (long-running) fork's whatsoever before this point(!) 3498 # no (long-running) fork's whatsoever before this point(!)
3499 use POSIX ();
3465 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3500 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3466 3501
3467 (pop @POST_INIT)->(0) while @POST_INIT; 3502 (pop @POST_INIT)->(0) while @POST_INIT;
3468 }; 3503 };
3469 3504
… …
3741 3776
3742 warn "unload completed, starting to reload now"; 3777 warn "unload completed, starting to reload now";
3743 3778
3744 warn "reloading cf.pm"; 3779 warn "reloading cf.pm";
3745 require cf; 3780 require cf;
3746 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3781 cf::_connect_to_perl_1;
3747 3782
3748 warn "loading config and database again"; 3783 warn "loading config and database again";
3749 cf::reload_config; 3784 cf::reload_config;
3750 3785
3751 warn "loading extensions"; 3786 warn "loading extensions";
… …
3959 } 3994 }
3960} 3995}
3961 3996
3962# load additional modules 3997# load additional modules
3963require "cf/$_.pm" for @EXTRA_MODULES; 3998require "cf/$_.pm" for @EXTRA_MODULES;
3999cf::_connect_to_perl_2;
3964 4000
3965END { cf::emergency_save } 4001END { cf::emergency_save }
3966 4002
39671 40031
3968 4004

Diff Legend

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