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.464 by root, Thu Jan 1 18:35:48 2009 UTC vs.
Revision 1.474 by root, Thu Jul 16 21:42:56 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;
… …
72 72
73# make sure c-lzf reinitialises itself 73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76 76
77# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
78 81
79our %COMMAND = (); 82our %COMMAND = ();
80our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
81 84
… …
105our %RESOURCE; 108our %RESOURCE;
106 109
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 112our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 113our $USE_FSYNC = 1; # use fsync to write maps - default on
111 114
112our $BDB_DEADLOCK_WATCHER; 115our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 116our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 117our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 118our $DB_ENV;
116 119
120our @EXTRA_MODULES = qw(pod mapscript);
121
117our %CFG; 122our %CFG;
118 123
119our $UPTIME; $UPTIME ||= time; 124our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 125our $RUNTIME;
121our $NOW; 126our $NOW;
… …
132our $JITTER; # average jitter 137our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 138our $TICK_START; # for load detecting purposes
134 139
135our @POST_INIT; 140our @POST_INIT;
136 141
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :)
138 144
139binmode STDOUT; 145binmode STDOUT;
140binmode STDERR; 146binmode STDERR;
141 147
142# read virtual server time, if available 148# read virtual server time, if available
143unless ($RUNTIME || !-e $RUNTIMEFILE) { 149unless ($RUNTIME || !-e $RUNTIMEFILE) {
144 open my $fh, "<", $RUNTIMEFILE 150 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 151 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 152 $RUNTIME = <$fh> + 0.;
147} 153}
154
155eval "sub TICK() { $TICK } 1" or die;
148 156
149mkdir $_ 157mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 158 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 159
152our $EMERGENCY_POSITION; 160our $EMERGENCY_POSITION;
… …
1147 $decname, length $$rdata, scalar @$objs; 1155 $decname, length $$rdata, scalar @$objs;
1148 1156
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1158 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1160 if ($cf::USE_FSYNC) {
1161 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1162 aio_fsync $fh;
1163 }
1153 aio_close $fh; 1164 aio_close $fh;
1154 1165
1155 if (@$objs) { 1166 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1167 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1168 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1169 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1170 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1171 if ($cf::USE_FSYNC) {
1172 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1173 aio_fsync $fh;
1174 }
1161 aio_close $fh; 1175 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1176 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1177 }
1164 } else { 1178 } else {
1165 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
… …
1316 1330
1317# "readahead" all extensions 1331# "readahead" all extensions
1318sub cache_extensions { 1332sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1333 my $grp = IO::AIO::aio_group;
1320 1334
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1335 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1336 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1337 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1338 }
1325 }; 1339 };
1326 1340
… …
2384 2398
2385our $SAY_CHANNEL = { 2399our $SAY_CHANNEL = {
2386 id => "say", 2400 id => "say",
2387 title => "Map", 2401 title => "Map",
2388 reply => "say ", 2402 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2403 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2390}; 2404};
2391 2405
2392our $CHAT_CHANNEL = { 2406our $CHAT_CHANNEL = {
2393 id => "chat", 2407 id => "chat",
2394 title => "Chat", 2408 title => "Chat",
… …
2769 id => "infobox", 2783 id => "infobox",
2770 title => "Body Parts", 2784 title => "Body Parts",
2771 reply => undef, 2785 reply => undef,
2772 tooltip => "Shows which body parts you posess and are available", 2786 tooltip => "Shows which body parts you posess and are available",
2773 }, 2787 },
2788 "c/statistics" => {
2789 id => "infobox",
2790 title => "Statistics",
2791 reply => undef,
2792 tooltip => "Shows your primary statistics",
2793 },
2774 "c/skills" => { 2794 "c/skills" => {
2775 id => "infobox", 2795 id => "infobox",
2776 title => "Skills", 2796 title => "Skills",
2777 reply => undef, 2797 reply => undef,
2778 tooltip => "Shows your experience per skill and item power", 2798 tooltip => "Shows your experience per skill and item power",
2799 },
2800 "c/shopitems" => {
2801 id => "infobox",
2802 title => "Shop Items",
2803 reply => undef,
2804 tooltip => "Shows the items currently for sale in this shop",
2805 },
2806 "c/resistances" => {
2807 id => "infobox",
2808 title => "Resistances",
2809 reply => undef,
2810 tooltip => "Shows your resistances",
2811 },
2812 "c/pets" => {
2813 id => "infobox",
2814 title => "Pets",
2815 reply => undef,
2816 tooltip => "Shows information abotu your pets/a specific pet",
2817 },
2818 "c/perceiveself" => {
2819 id => "infobox",
2820 title => "Perceive Self",
2821 reply => undef,
2822 tooltip => "You gained detailed knowledge about yourself",
2779 }, 2823 },
2780 "c/uptime" => { 2824 "c/uptime" => {
2781 id => "infobox", 2825 id => "infobox",
2782 title => "Uptime", 2826 title => "Uptime",
2783 reply => undef, 2827 reply => undef,
… …
3034The following functions and methods are available within a safe environment: 3078The following functions and methods are available within a safe environment:
3035 3079
3036 cf::object 3080 cf::object
3037 contr pay_amount pay_player map x y force_find force_add destroy 3081 contr pay_amount pay_player map x y force_find force_add destroy
3038 insert remove name archname title slaying race decrease split 3082 insert remove name archname title slaying race decrease split
3083 value
3039 3084
3040 cf::object::player 3085 cf::object::player
3041 player 3086 player
3042 3087
3043 cf::player 3088 cf::player
… …
3049=cut 3094=cut
3050 3095
3051for ( 3096for (
3052 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3053 insert remove inv nrof name archname title slaying race 3098 insert remove inv nrof name archname title slaying race
3054 decrease split destroy change_exp)], 3099 decrease split destroy change_exp value msg lore send_msg)],
3055 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
3056 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful send_msg)],
3057 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
3058) { 3103) {
3059 no strict 'refs'; 3104 no strict 'refs';
3060 my ($pkg, @funs) = @$_; 3105 my ($pkg, @funs) = @$_;
3061 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3078 my ($code, %vars) = @_; 3123 my ($code, %vars) = @_;
3079 3124
3080 my $qcode = $code; 3125 my $qcode = $code;
3081 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3082 $qcode =~ s/\n/\\n/g; 3127 $qcode =~ s/\n/\\n/g;
3128
3129 %vars = (_dummy => 0) unless %vars;
3083 3130
3084 local $_; 3131 local $_;
3085 local @safe::cf::_safe_eval_args = values %vars; 3132 local @safe::cf::_safe_eval_args = values %vars;
3086 3133
3087 my $eval = 3134 my $eval =
… …
3355 my $pid = <$fh>; 3402 my $pid = <$fh>;
3356 kill 9, $pid if $pid > 0; 3403 kill 9, $pid if $pid > 0;
3357 3404
3358 seek $fh, 0, 0; 3405 seek $fh, 0, 0;
3359 print $fh $$; 3406 print $fh $$;
3407}
3408
3409sub main_loop {
3410 warn "EV::loop starting\n";
3411 if (1) {
3412 EV::loop;
3413 }
3414 warn "EV::loop returned\n";
3415 goto &main_loop unless $REALLY_UNLOOP;
3360} 3416}
3361 3417
3362sub main { 3418sub main {
3363 cf::init_globals; # initialise logging 3419 cf::init_globals; # initialise logging
3364 3420
… …
3409 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3465 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3410 3466
3411 (pop @POST_INIT)->(0) while @POST_INIT; 3467 (pop @POST_INIT)->(0) while @POST_INIT;
3412 }; 3468 };
3413 3469
3414 EV::loop; 3470 main_loop;
3415} 3471}
3416 3472
3417############################################################################# 3473#############################################################################
3418# initialisation and cleanup 3474# initialisation and cleanup
3419 3475
… …
3675 clear_package "safe::$_" 3731 clear_package "safe::$_"
3676 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3732 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3677 3733
3678 warn "unloading cf.pm \"a bit\""; 3734 warn "unloading cf.pm \"a bit\"";
3679 delete $INC{"cf.pm"}; 3735 delete $INC{"cf.pm"};
3680 delete $INC{"cf/pod.pm"}; 3736 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3681 3737
3682 # don't, removes xs symbols, too, 3738 # don't, removes xs symbols, too,
3683 # and global variables created in xs 3739 # and global variables created in xs
3684 #clear_package __PACKAGE__; 3740 #clear_package __PACKAGE__;
3685 3741
… …
3902 LOG llevInfo, "[ABT] [suppressed]\n"; 3958 LOG llevInfo, "[ABT] [suppressed]\n";
3903 } 3959 }
3904} 3960}
3905 3961
3906# load additional modules 3962# load additional modules
3907use cf::pod; 3963require "cf/$_.pm" for @EXTRA_MODULES;
3908 3964
3909END { cf::emergency_save } 3965END { cf::emergency_save }
3910 3966
39111 39671
3912 3968

Diff Legend

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