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.460 by root, Mon Dec 15 17:04:53 2008 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
… …
1862 1876
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1877 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$UNIQUEDIR/$path" 1878 "$UNIQUEDIR/$path"
1865} 1879}
1866 1880
1867# and all this just because we cannot iterate over
1868# all maps in C++...
1869sub change_all_map_light {
1870 my ($change) = @_;
1871
1872 $_->change_map_light ($change)
1873 for grep $_->outdoor, values %cf::MAP;
1874}
1875
1876sub decay_objects { 1881sub decay_objects {
1877 my ($self) = @_; 1882 my ($self) = @_;
1878 1883
1879 return if $self->{deny_reset}; 1884 return if $self->{deny_reset};
1880 1885
… …
2042 2047
2043 unless ($self->{deny_activate}) { 2048 unless ($self->{deny_activate}) {
2044 $self->decay_objects; 2049 $self->decay_objects;
2045 $self->fix_auto_apply; 2050 $self->fix_auto_apply;
2046 $self->update_buttons; 2051 $self->update_buttons;
2047 cf::cede_to_tick;
2048 $self->set_darkness_map;
2049 cf::cede_to_tick; 2052 cf::cede_to_tick;
2050 $self->activate; 2053 $self->activate;
2051 } 2054 }
2052 2055
2053 $self->{last_save} = $cf::RUNTIME; 2056 $self->{last_save} = $cf::RUNTIME;
… …
2395 2398
2396our $SAY_CHANNEL = { 2399our $SAY_CHANNEL = {
2397 id => "say", 2400 id => "say",
2398 title => "Map", 2401 title => "Map",
2399 reply => "say ", 2402 reply => "say ",
2400 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.",
2401}; 2404};
2402 2405
2403our $CHAT_CHANNEL = { 2406our $CHAT_CHANNEL = {
2404 id => "chat", 2407 id => "chat",
2405 title => "Chat", 2408 title => "Chat",
… …
2780 id => "infobox", 2783 id => "infobox",
2781 title => "Body Parts", 2784 title => "Body Parts",
2782 reply => undef, 2785 reply => undef,
2783 tooltip => "Shows which body parts you posess and are available", 2786 tooltip => "Shows which body parts you posess and are available",
2784 }, 2787 },
2788 "c/statistics" => {
2789 id => "infobox",
2790 title => "Statistics",
2791 reply => undef,
2792 tooltip => "Shows your primary statistics",
2793 },
2785 "c/skills" => { 2794 "c/skills" => {
2786 id => "infobox", 2795 id => "infobox",
2787 title => "Skills", 2796 title => "Skills",
2788 reply => undef, 2797 reply => undef,
2789 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",
2790 }, 2823 },
2791 "c/uptime" => { 2824 "c/uptime" => {
2792 id => "infobox", 2825 id => "infobox",
2793 title => "Uptime", 2826 title => "Uptime",
2794 reply => undef, 2827 reply => undef,
… …
2804 id => "party", 2837 id => "party",
2805 title => "Party", 2838 title => "Party",
2806 reply => "gsay ", 2839 reply => "gsay ",
2807 tooltip => "Messages and chat related to your party", 2840 tooltip => "Messages and chat related to your party",
2808 }, 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 },
2848 "c/say" => $SAY_CHANNEL,
2849 "c/chat" => $CHAT_CHANNEL,
2809); 2850);
2810 2851
2811sub cf::client::send_msg { 2852sub cf::client::send_msg {
2812 my ($self, $channel, $msg, $color, @extra) = @_; 2853 my ($self, $channel, $msg, $color, @extra) = @_;
2813 2854
… …
2818 2859
2819 # check predefined channels, for the benefit of C 2860 # check predefined channels, for the benefit of C
2820 if ($CHANNEL{$channel}) { 2861 if ($CHANNEL{$channel}) {
2821 $channel = $CHANNEL{$channel}; 2862 $channel = $CHANNEL{$channel};
2822 2863
2823 $self->ext_msg (channel_info => $channel) 2864 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825
2826 $channel = $channel->{id}; 2865 $channel = $channel->{id};
2827 2866
2828 } elsif (ref $channel) { 2867 } elsif (ref $channel) {
2829 # send meta info to client, if not yet sent 2868 # send meta info to client, if not yet sent
2830 unless (exists $self->{channel}{$channel->{id}}) { 2869 unless (exists $self->{channel}{$channel->{id}}) {
2831 $self->{channel}{$channel->{id}} = $channel; 2870 $self->{channel}{$channel->{id}} = $channel;
2832 $self->ext_msg (channel_info => $channel) 2871 $self->ext_msg (channel_info => $channel);
2833 if $self->can_msg;
2834 } 2872 }
2835 2873
2836 $channel = $channel->{id}; 2874 $channel = $channel->{id};
2837 } 2875 }
2838 2876
2839 return unless @extra || length $msg; 2877 return unless @extra || length $msg;
2840 2878
2841 if ($self->can_msg) {
2842 # default colour, mask it out 2879 # default colour, mask it out
2843 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2880 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2844 if $color & cf::NDI_DEF; 2881 if $color & cf::NDI_DEF;
2845 2882
2846 my $pkt = "msg " 2883 my $pkt = "msg "
2847 . $self->{json_coder}->encode ( 2884 . $self->{json_coder}->encode (
2848 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2849 ); 2886 );
2850 2887
2851 # try lzf for large packets 2888 # try lzf for large packets
2852 $pkt = "lzf " . Compress::LZF::compress $pkt 2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2853 if 1024 <= length $pkt and $self->{can_lzf}; 2890 if 1024 <= length $pkt and $self->{can_lzf};
2854 2891
2855 # split very large packets 2892 # split very large packets
2856 if (8192 < length $pkt and $self->{can_lzf}) { 2893 if (8192 < length $pkt and $self->{can_lzf}) {
2857 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2858 $pkt = "frag"; 2895 $pkt = "frag";
2859 } 2896 }
2860 2897
2861 $self->send_packet ($pkt); 2898 $self->send_packet ($pkt);
2862 } else {
2863 if ($color >= 0) {
2864 # replace some tags by gcfclient-compatible ones
2865 for ($msg) {
2866 1 while
2867 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2868 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2869 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2870 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2871 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2872 }
2873
2874 $color &= cf::NDI_COLOR_MASK;
2875
2876 utf8::encode $msg;
2877
2878 if (0 && $msg =~ /\[/) {
2879 # COMMAND/INFO
2880 $self->send_packet ("drawextinfo $color 10 8 $msg")
2881 } else {
2882 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2883 $self->send_packet ("drawinfo $color $msg")
2884 }
2885 }
2886 }
2887} 2899}
2888 2900
2889=item $client->ext_msg ($type, @msg) 2901=item $client->ext_msg ($type, @msg)
2890 2902
2891Sends an ext event to the client. 2903Sends an ext event to the client.
… …
3066The following functions and methods are available within a safe environment: 3078The following functions and methods are available within a safe environment:
3067 3079
3068 cf::object 3080 cf::object
3069 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
3070 insert remove name archname title slaying race decrease split 3082 insert remove name archname title slaying race decrease split
3083 value
3071 3084
3072 cf::object::player 3085 cf::object::player
3073 player 3086 player
3074 3087
3075 cf::player 3088 cf::player
… …
3081=cut 3094=cut
3082 3095
3083for ( 3096for (
3084 ["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
3085 insert remove inv nrof name archname title slaying race 3098 insert remove inv nrof name archname title slaying race
3086 decrease split destroy change_exp)], 3099 decrease split destroy change_exp value msg lore send_msg)],
3087 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
3088 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful send_msg)],
3089 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
3090) { 3103) {
3091 no strict 'refs'; 3104 no strict 'refs';
3092 my ($pkg, @funs) = @$_; 3105 my ($pkg, @funs) = @$_;
3093 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3110 my ($code, %vars) = @_; 3123 my ($code, %vars) = @_;
3111 3124
3112 my $qcode = $code; 3125 my $qcode = $code;
3113 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3114 $qcode =~ s/\n/\\n/g; 3127 $qcode =~ s/\n/\\n/g;
3128
3129 %vars = (_dummy => 0) unless %vars;
3115 3130
3116 local $_; 3131 local $_;
3117 local @safe::cf::_safe_eval_args = values %vars; 3132 local @safe::cf::_safe_eval_args = values %vars;
3118 3133
3119 my $eval = 3134 my $eval =
… …
3389 3404
3390 seek $fh, 0, 0; 3405 seek $fh, 0, 0;
3391 print $fh $$; 3406 print $fh $$;
3392} 3407}
3393 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;
3416}
3417
3394sub main { 3418sub main {
3395 cf::init_globals; # initialise logging 3419 cf::init_globals; # initialise logging
3396 3420
3397 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3421 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3398 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3422 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
… …
3401 3425
3402 cf::init_experience; 3426 cf::init_experience;
3403 cf::init_anim; 3427 cf::init_anim;
3404 cf::init_attackmess; 3428 cf::init_attackmess;
3405 cf::init_dynamic; 3429 cf::init_dynamic;
3406 cf::init_block;
3407 3430
3408 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3431 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3409 3432
3410 # we must not ever block the main coroutine 3433 # we must not ever block the main coroutine
3411 local $Coro::idle = sub { 3434 local $Coro::idle = sub {
… …
3442 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};
3443 3466
3444 (pop @POST_INIT)->(0) while @POST_INIT; 3467 (pop @POST_INIT)->(0) while @POST_INIT;
3445 }; 3468 };
3446 3469
3447 EV::loop; 3470 main_loop;
3448} 3471}
3449 3472
3450############################################################################# 3473#############################################################################
3451# initialisation and cleanup 3474# initialisation and cleanup
3452 3475
… …
3708 clear_package "safe::$_" 3731 clear_package "safe::$_"
3709 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);
3710 3733
3711 warn "unloading cf.pm \"a bit\""; 3734 warn "unloading cf.pm \"a bit\"";
3712 delete $INC{"cf.pm"}; 3735 delete $INC{"cf.pm"};
3713 delete $INC{"cf/pod.pm"}; 3736 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3714 3737
3715 # don't, removes xs symbols, too, 3738 # don't, removes xs symbols, too,
3716 # and global variables created in xs 3739 # and global variables created in xs
3717 #clear_package __PACKAGE__; 3740 #clear_package __PACKAGE__;
3718 3741
… …
3935 LOG llevInfo, "[ABT] [suppressed]\n"; 3958 LOG llevInfo, "[ABT] [suppressed]\n";
3936 } 3959 }
3937} 3960}
3938 3961
3939# load additional modules 3962# load additional modules
3940use cf::pod; 3963require "cf/$_.pm" for @EXTRA_MODULES;
3941 3964
3942END { cf::emergency_save } 3965END { cf::emergency_save }
3943 3966
39441 39671
3945 3968

Diff Legend

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