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.465 by root, Thu Jan 8 00:54:55 2009 UTC vs.
Revision 1.467 by root, Thu Jan 8 04:35:04 2009 UTC

… …
21 21
22package cf; 22package cf;
23 23
24use 5.10.0; 24use 5.10.0;
25use utf8; 25use utf8;
26use strict "vars", "subs"; 26use strict qw(vars subs);
27 27
28use Symbol; 28use Symbol;
29use List::Util; 29use List::Util;
30use Socket; 30use Socket;
31use EV; 31use EV;
… …
112our $BDB_DEADLOCK_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 115our $DB_ENV;
116 116
117our @EXTRA_MODULES = qw(pod mapscript);
118
117our %CFG; 119our %CFG;
118 120
119our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 122our $RUNTIME;
121our $NOW; 123our $NOW;
… …
143unless ($RUNTIME || !-e $RUNTIMEFILE) { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
144 open my $fh, "<", $RUNTIMEFILE 146 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
147} 149}
150
151eval "sub TICK() { $TICK } 1" or die;
148 152
149mkdir $_ 153mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 154 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 155
152our $EMERGENCY_POSITION; 156our $EMERGENCY_POSITION;
… …
3052The following functions and methods are available within a safe environment: 3056The following functions and methods are available within a safe environment:
3053 3057
3054 cf::object 3058 cf::object
3055 contr pay_amount pay_player map x y force_find force_add destroy 3059 contr pay_amount pay_player map x y force_find force_add destroy
3056 insert remove name archname title slaying race decrease split 3060 insert remove name archname title slaying race decrease split
3061 value
3057 3062
3058 cf::object::player 3063 cf::object::player
3059 player 3064 player
3060 3065
3061 cf::player 3066 cf::player
… …
3067=cut 3072=cut
3068 3073
3069for ( 3074for (
3070 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3071 insert remove inv nrof name archname title slaying race 3076 insert remove inv nrof name archname title slaying race
3072 decrease split destroy change_exp)], 3077 decrease split destroy change_exp value msg lore send_msg)],
3073 ["cf::object::player" => qw(player)], 3078 ["cf::object::player" => qw(player)],
3074 ["cf::player" => qw(peaceful)], 3079 ["cf::player" => qw(peaceful send_msg)],
3075 ["cf::map" => qw(trigger)], 3080 ["cf::map" => qw(trigger)],
3076) { 3081) {
3077 no strict 'refs'; 3082 no strict 'refs';
3078 my ($pkg, @funs) = @$_; 3083 my ($pkg, @funs) = @$_;
3079 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3096 my ($code, %vars) = @_; 3101 my ($code, %vars) = @_;
3097 3102
3098 my $qcode = $code; 3103 my $qcode = $code;
3099 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3100 $qcode =~ s/\n/\\n/g; 3105 $qcode =~ s/\n/\\n/g;
3106
3107 %vars = (_dummy => 0) unless %vars;
3101 3108
3102 local $_; 3109 local $_;
3103 local @safe::cf::_safe_eval_args = values %vars; 3110 local @safe::cf::_safe_eval_args = values %vars;
3104 3111
3105 my $eval = 3112 my $eval =
… …
3693 clear_package "safe::$_" 3700 clear_package "safe::$_"
3694 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3701 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3695 3702
3696 warn "unloading cf.pm \"a bit\""; 3703 warn "unloading cf.pm \"a bit\"";
3697 delete $INC{"cf.pm"}; 3704 delete $INC{"cf.pm"};
3698 delete $INC{"cf/pod.pm"}; 3705 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3699 3706
3700 # don't, removes xs symbols, too, 3707 # don't, removes xs symbols, too,
3701 # and global variables created in xs 3708 # and global variables created in xs
3702 #clear_package __PACKAGE__; 3709 #clear_package __PACKAGE__;
3703 3710
… …
3920 LOG llevInfo, "[ABT] [suppressed]\n"; 3927 LOG llevInfo, "[ABT] [suppressed]\n";
3921 } 3928 }
3922} 3929}
3923 3930
3924# load additional modules 3931# load additional modules
3925use cf::pod; 3932require "cf/$_.pm" for @EXTRA_MODULES;
3926 3933
3927END { cf::emergency_save } 3934END { cf::emergency_save }
3928 3935
39291 39361
3930 3937

Diff Legend

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