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.462 by root, Tue Dec 23 06:58:23 2008 UTC vs.
Revision 1.475 by root, Tue Jul 21 06:17:00 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,
… …
2793 id => "party", 2837 id => "party",
2794 title => "Party", 2838 title => "Party",
2795 reply => "gsay ", 2839 reply => "gsay ",
2796 tooltip => "Messages and chat related to your party", 2840 tooltip => "Messages and chat related to your party",
2797 }, 2841 },
2842 "c/death" => {
2843 id => "death",
2844 title => "Death",
2845 reply => undef,
2846 tooltip => "Reason for and more info about your most recent death",
2847 },
2798 "c/say" => $SAY_CHANNEL, 2848 "c/say" => $SAY_CHANNEL,
2799 "c/chat" => $CHAT_CHANNEL, 2849 "c/chat" => $CHAT_CHANNEL,
2800); 2850);
2801 2851
2802sub cf::client::send_msg { 2852sub cf::client::send_msg {
… …
2809 2859
2810 # check predefined channels, for the benefit of C 2860 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 2861 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 2862 $channel = $CHANNEL{$channel};
2813 2863
2814 $self->ext_msg (channel_info => $channel) 2864 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 2865 $channel = $channel->{id};
2818 2866
2819 } elsif (ref $channel) { 2867 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 2868 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 2869 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 2870 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 2871 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 2872 }
2826 2873
2827 $channel = $channel->{id}; 2874 $channel = $channel->{id};
2828 } 2875 }
2829 2876
2830 return unless @extra || length $msg; 2877 return unless @extra || length $msg;
2831 2878
2832 if ($self->can_msg) {
2833 # default colour, mask it out 2879 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2880 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 2881 if $color & cf::NDI_DEF;
2836 2882
2837 my $pkt = "msg " 2883 my $pkt = "msg "
2838 . $self->{json_coder}->encode ( 2884 . $self->{json_coder}->encode (
2839 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840 ); 2886 );
2841 2887
2842 # try lzf for large packets 2888 # try lzf for large packets
2843 $pkt = "lzf " . Compress::LZF::compress $pkt 2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2844 if 1024 <= length $pkt and $self->{can_lzf}; 2890 if 1024 <= length $pkt and $self->{can_lzf};
2845 2891
2846 # split very large packets 2892 # split very large packets
2847 if (8192 < length $pkt and $self->{can_lzf}) { 2893 if (8192 < length $pkt and $self->{can_lzf}) {
2848 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849 $pkt = "frag"; 2895 $pkt = "frag";
2850 } 2896 }
2851 2897
2852 $self->send_packet ($pkt); 2898 $self->send_packet ($pkt);
2853 } else {
2854 if ($color >= 0) {
2855 # replace some tags by gcfclient-compatible ones
2856 for ($msg) {
2857 1 while
2858 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2859 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2860 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2861 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2862 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2863 }
2864
2865 $color &= cf::NDI_COLOR_MASK;
2866
2867 utf8::encode $msg;
2868
2869 if (0 && $msg =~ /\[/) {
2870 # COMMAND/INFO
2871 $self->send_packet ("drawextinfo $color 10 8 $msg")
2872 } else {
2873 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2874 $self->send_packet ("drawinfo $color $msg")
2875 }
2876 }
2877 }
2878} 2899}
2879 2900
2880=item $client->ext_msg ($type, @msg) 2901=item $client->ext_msg ($type, @msg)
2881 2902
2882Sends an ext event to the client. 2903Sends an ext event to the client.
… …
3057The following functions and methods are available within a safe environment: 3078The following functions and methods are available within a safe environment:
3058 3079
3059 cf::object 3080 cf::object
3060 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
3061 insert remove name archname title slaying race decrease split 3082 insert remove name archname title slaying race decrease split
3083 value
3062 3084
3063 cf::object::player 3085 cf::object::player
3064 player 3086 player
3065 3087
3066 cf::player 3088 cf::player
… …
3072=cut 3094=cut
3073 3095
3074for ( 3096for (
3075 ["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
3076 insert remove inv nrof name archname title slaying race 3098 insert remove inv nrof name archname title slaying race
3077 decrease split destroy change_exp)], 3099 decrease split destroy change_exp value msg lore send_msg)],
3078 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
3079 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful send_msg)],
3080 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
3081) { 3103) {
3082 no strict 'refs'; 3104 no strict 'refs';
3083 my ($pkg, @funs) = @$_; 3105 my ($pkg, @funs) = @$_;
3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3101 my ($code, %vars) = @_; 3123 my ($code, %vars) = @_;
3102 3124
3103 my $qcode = $code; 3125 my $qcode = $code;
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3127 $qcode =~ s/\n/\\n/g;
3128
3129 %vars = (_dummy => 0) unless %vars;
3106 3130
3107 local $_; 3131 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars; 3132 local @safe::cf::_safe_eval_args = values %vars;
3109 3133
3110 my $eval = 3134 my $eval =
… …
3378 my $pid = <$fh>; 3402 my $pid = <$fh>;
3379 kill 9, $pid if $pid > 0; 3403 kill 9, $pid if $pid > 0;
3380 3404
3381 seek $fh, 0, 0; 3405 seek $fh, 0, 0;
3382 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;
3383} 3416}
3384 3417
3385sub main { 3418sub main {
3386 cf::init_globals; # initialise logging 3419 cf::init_globals; # initialise logging
3387 3420
… …
3427 load_extensions; 3460 load_extensions;
3428 3461
3429 utime time, time, $RUNTIMEFILE; 3462 utime time, time, $RUNTIMEFILE;
3430 3463
3431 # no (long-running) fork's whatsoever before this point(!) 3464 # no (long-running) fork's whatsoever before this point(!)
3465 use POSIX ();
3432 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3466 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3433 3467
3434 (pop @POST_INIT)->(0) while @POST_INIT; 3468 (pop @POST_INIT)->(0) while @POST_INIT;
3435 }; 3469 };
3436 3470
3437 EV::loop; 3471 main_loop;
3438} 3472}
3439 3473
3440############################################################################# 3474#############################################################################
3441# initialisation and cleanup 3475# initialisation and cleanup
3442 3476
… …
3698 clear_package "safe::$_" 3732 clear_package "safe::$_"
3699 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3733 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3700 3734
3701 warn "unloading cf.pm \"a bit\""; 3735 warn "unloading cf.pm \"a bit\"";
3702 delete $INC{"cf.pm"}; 3736 delete $INC{"cf.pm"};
3703 delete $INC{"cf/pod.pm"}; 3737 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3704 3738
3705 # don't, removes xs symbols, too, 3739 # don't, removes xs symbols, too,
3706 # and global variables created in xs 3740 # and global variables created in xs
3707 #clear_package __PACKAGE__; 3741 #clear_package __PACKAGE__;
3708 3742
… …
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 3959 LOG llevInfo, "[ABT] [suppressed]\n";
3926 } 3960 }
3927} 3961}
3928 3962
3929# load additional modules 3963# load additional modules
3930use cf::pod; 3964require "cf/$_.pm" for @EXTRA_MODULES;
3931 3965
3932END { cf::emergency_save } 3966END { cf::emergency_save }
3933 3967
39341 39681
3935 3969

Diff Legend

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