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.458 by root, Sat Dec 13 20:34:37 2008 UTC vs.
Revision 1.466 by root, Thu Jan 8 03:03:24 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;
… …
41use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent; 42use Coro::AnyEvent;
43use Coro::Timer; 43use Coro::Timer;
44use Coro::Signal; 44use Coro::Signal;
45use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
46use Coro::AnyEvent; 47use Coro::AnyEvent;
47use Coro::AIO; 48use Coro::AIO;
48use Coro::BDB 1.6; 49use Coro::BDB 1.6;
49use Coro::Storable; 50use Coro::Storable;
50use Coro::Util (); 51use Coro::Util ();
… …
111our $BDB_DEADLOCK_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
112our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
113our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
114our $DB_ENV; 115our $DB_ENV;
115 116
117our @EXTRA_MODULES = qw(pod mapscript);
118
116our %CFG; 119our %CFG;
117 120
118our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
119our $RUNTIME; 122our $RUNTIME;
120our $NOW; 123our $NOW;
… …
347 350
348Return true if the lock is currently active, i.e. somebody has locked it. 351Return true if the lock is currently active, i.e. somebody has locked it.
349 352
350=cut 353=cut
351 354
352our %LOCK; 355our $LOCKS = new Coro::SemaphoreSet;
353our %LOCKER;#d#
354 356
355sub lock_wait($) { 357sub lock_wait($) {
356 my ($key) = @_; 358 $LOCKS->wait ($_[0]);
357
358 if ($LOCKER{$key} == $Coro::current) {#d#
359 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
360 return;#d#
361 }#d#
362
363 # wait for lock, if any
364 while ($LOCK{$key}) {
365 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
366 push @{ $LOCK{$key} }, $Coro::current;
367 Coro::schedule;
368 }
369} 359}
370 360
371sub lock_acquire($) { 361sub lock_acquire($) {
372 my ($key) = @_; 362 $LOCKS->guard ($_[0])
373
374 # wait, to be sure we are not locked
375 lock_wait $key;
376
377 $LOCK{$key} = [];
378 $LOCKER{$key} = $Coro::current;#d#
379
380 Guard::guard {
381 delete $LOCKER{$key};#d#
382 # wake up all waiters, to be on the safe side
383 $_->ready for @{ delete $LOCK{$key} };
384 }
385} 363}
386 364
387sub lock_active($) { 365sub lock_active($) {
388 my ($key) = @_; 366 $LOCKS->count ($_[0]) < 1
389
390 ! ! $LOCK{$key}
391} 367}
392 368
393sub freeze_mainloop { 369sub freeze_mainloop {
394 tick_inhibit_inc; 370 tick_inhibit_inc;
395 371
… …
1194 aio_rename "$filename~", $filename; 1170 aio_rename "$filename~", $filename;
1195 1171
1196 $filename =~ s%/[^/]+$%%; 1172 $filename =~ s%/[^/]+$%%;
1197 aio_pathsync $filename if $cf::USE_FSYNC; 1173 aio_pathsync $filename if $cf::USE_FSYNC;
1198 } else { 1174 } else {
1199 warn "FATAL: $filename~: $!\n"; 1175 warn "unable to save objects: $filename~: $!\n";
1200 } 1176 }
1201 } else { 1177 } else {
1202 aio_unlink $filename; 1178 aio_unlink $filename;
1203 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
1204 } 1180 }
… …
1888 1864
1889 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1865 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1890 "$UNIQUEDIR/$path" 1866 "$UNIQUEDIR/$path"
1891} 1867}
1892 1868
1893# and all this just because we cannot iterate over
1894# all maps in C++...
1895sub change_all_map_light {
1896 my ($change) = @_;
1897
1898 $_->change_map_light ($change)
1899 for grep $_->outdoor, values %cf::MAP;
1900}
1901
1902sub decay_objects { 1869sub decay_objects {
1903 my ($self) = @_; 1870 my ($self) = @_;
1904 1871
1905 return if $self->{deny_reset}; 1872 return if $self->{deny_reset};
1906 1873
… …
1988sub find { 1955sub find {
1989 my ($path, $origin) = @_; 1956 my ($path, $origin) = @_;
1990 1957
1991 $path = normalise $path, $origin && $origin->path; 1958 $path = normalise $path, $origin && $origin->path;
1992 1959
1993 cf::lock_wait "map_data:$path";#d#remove 1960 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1994 cf::lock_wait "map_find:$path"; 1961 my $guard2 = cf::lock_acquire "map_find:$path";
1995 1962
1996 $cf::MAP{$path} || do { 1963 $cf::MAP{$path} || do {
1997 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1998 my $guard2 = cf::lock_acquire "map_find:$path";
1999
2000 my $map = new_from_path cf::map $path 1964 my $map = new_from_path cf::map $path
2001 or return; 1965 or return;
2002 1966
2003 $map->{last_save} = $cf::RUNTIME; 1967 $map->{last_save} = $cf::RUNTIME;
2004 1968
… …
2071 2035
2072 unless ($self->{deny_activate}) { 2036 unless ($self->{deny_activate}) {
2073 $self->decay_objects; 2037 $self->decay_objects;
2074 $self->fix_auto_apply; 2038 $self->fix_auto_apply;
2075 $self->update_buttons; 2039 $self->update_buttons;
2076 cf::cede_to_tick;
2077 $self->set_darkness_map;
2078 cf::cede_to_tick; 2040 cf::cede_to_tick;
2079 $self->activate; 2041 $self->activate;
2080 } 2042 }
2081 2043
2082 $self->{last_save} = $cf::RUNTIME; 2044 $self->{last_save} = $cf::RUNTIME;
… …
2809 id => "infobox", 2771 id => "infobox",
2810 title => "Body Parts", 2772 title => "Body Parts",
2811 reply => undef, 2773 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 2774 tooltip => "Shows which body parts you posess and are available",
2813 }, 2775 },
2776 "c/statistics" => {
2777 id => "infobox",
2778 title => "Statistics",
2779 reply => undef,
2780 tooltip => "Shows your primary statistics",
2781 },
2814 "c/skills" => { 2782 "c/skills" => {
2815 id => "infobox", 2783 id => "infobox",
2816 title => "Skills", 2784 title => "Skills",
2817 reply => undef, 2785 reply => undef,
2818 tooltip => "Shows your experience per skill and item power", 2786 tooltip => "Shows your experience per skill and item power",
2787 },
2788 "c/resistances" => {
2789 id => "infobox",
2790 title => "Resistances",
2791 reply => undef,
2792 tooltip => "Shows your resistances",
2793 },
2794 "c/pets" => {
2795 id => "infobox",
2796 title => "Pets",
2797 reply => undef,
2798 tooltip => "Shows information abotu your pets/a specific pet",
2819 }, 2799 },
2820 "c/uptime" => { 2800 "c/uptime" => {
2821 id => "infobox", 2801 id => "infobox",
2822 title => "Uptime", 2802 title => "Uptime",
2823 reply => undef, 2803 reply => undef,
… …
2833 id => "party", 2813 id => "party",
2834 title => "Party", 2814 title => "Party",
2835 reply => "gsay ", 2815 reply => "gsay ",
2836 tooltip => "Messages and chat related to your party", 2816 tooltip => "Messages and chat related to your party",
2837 }, 2817 },
2818 "c/death" => {
2819 id => "death",
2820 title => "Death",
2821 reply => undef,
2822 tooltip => "Reason for and more info about your most recent death",
2823 },
2824 "c/say" => $SAY_CHANNEL,
2825 "c/chat" => $CHAT_CHANNEL,
2838); 2826);
2839 2827
2840sub cf::client::send_msg { 2828sub cf::client::send_msg {
2841 my ($self, $channel, $msg, $color, @extra) = @_; 2829 my ($self, $channel, $msg, $color, @extra) = @_;
2842 2830
… …
2847 2835
2848 # check predefined channels, for the benefit of C 2836 # check predefined channels, for the benefit of C
2849 if ($CHANNEL{$channel}) { 2837 if ($CHANNEL{$channel}) {
2850 $channel = $CHANNEL{$channel}; 2838 $channel = $CHANNEL{$channel};
2851 2839
2852 $self->ext_msg (channel_info => $channel) 2840 $self->ext_msg (channel_info => $channel);
2853 if $self->can_msg;
2854
2855 $channel = $channel->{id}; 2841 $channel = $channel->{id};
2856 2842
2857 } elsif (ref $channel) { 2843 } elsif (ref $channel) {
2858 # send meta info to client, if not yet sent 2844 # send meta info to client, if not yet sent
2859 unless (exists $self->{channel}{$channel->{id}}) { 2845 unless (exists $self->{channel}{$channel->{id}}) {
2860 $self->{channel}{$channel->{id}} = $channel; 2846 $self->{channel}{$channel->{id}} = $channel;
2861 $self->ext_msg (channel_info => $channel) 2847 $self->ext_msg (channel_info => $channel);
2862 if $self->can_msg;
2863 } 2848 }
2864 2849
2865 $channel = $channel->{id}; 2850 $channel = $channel->{id};
2866 } 2851 }
2867 2852
2868 return unless @extra || length $msg; 2853 return unless @extra || length $msg;
2869 2854
2870 if ($self->can_msg) {
2871 # default colour, mask it out 2855 # default colour, mask it out
2872 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2856 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2873 if $color & cf::NDI_DEF; 2857 if $color & cf::NDI_DEF;
2874 2858
2875 my $pkt = "msg " 2859 my $pkt = "msg "
2876 . $self->{json_coder}->encode ( 2860 . $self->{json_coder}->encode (
2877 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2861 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2878 ); 2862 );
2879 2863
2880 # try lzf for large packets 2864 # try lzf for large packets
2881 $pkt = "lzf " . Compress::LZF::compress $pkt 2865 $pkt = "lzf " . Compress::LZF::compress $pkt
2882 if 1024 <= length $pkt and $self->{can_lzf}; 2866 if 1024 <= length $pkt and $self->{can_lzf};
2883 2867
2884 # split very large packets 2868 # split very large packets
2885 if (8192 < length $pkt and $self->{can_lzf}) { 2869 if (8192 < length $pkt and $self->{can_lzf}) {
2886 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2870 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2887 $pkt = "frag"; 2871 $pkt = "frag";
2888 } 2872 }
2889 2873
2890 $self->send_packet ($pkt); 2874 $self->send_packet ($pkt);
2891 } else {
2892 if ($color >= 0) {
2893 # replace some tags by gcfclient-compatible ones
2894 for ($msg) {
2895 1 while
2896 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2897 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2898 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2899 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2900 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2901 }
2902
2903 $color &= cf::NDI_COLOR_MASK;
2904
2905 utf8::encode $msg;
2906
2907 if (0 && $msg =~ /\[/) {
2908 # COMMAND/INFO
2909 $self->send_packet ("drawextinfo $color 10 8 $msg")
2910 } else {
2911 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2912 $self->send_packet ("drawinfo $color $msg")
2913 }
2914 }
2915 }
2916} 2875}
2917 2876
2918=item $client->ext_msg ($type, @msg) 2877=item $client->ext_msg ($type, @msg)
2919 2878
2920Sends an ext event to the client. 2879Sends an ext event to the client.
… …
3095The following functions and methods are available within a safe environment: 3054The following functions and methods are available within a safe environment:
3096 3055
3097 cf::object 3056 cf::object
3098 contr pay_amount pay_player map x y force_find force_add destroy 3057 contr pay_amount pay_player map x y force_find force_add destroy
3099 insert remove name archname title slaying race decrease split 3058 insert remove name archname title slaying race decrease split
3059 value
3100 3060
3101 cf::object::player 3061 cf::object::player
3102 player 3062 player
3103 3063
3104 cf::player 3064 cf::player
… …
3110=cut 3070=cut
3111 3071
3112for ( 3072for (
3113 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3073 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3114 insert remove inv nrof name archname title slaying race 3074 insert remove inv nrof name archname title slaying race
3115 decrease split destroy change_exp)], 3075 decrease split destroy change_exp value msg lore send_msg)],
3116 ["cf::object::player" => qw(player)], 3076 ["cf::object::player" => qw(player)],
3117 ["cf::player" => qw(peaceful)], 3077 ["cf::player" => qw(peaceful send_msg)],
3118 ["cf::map" => qw(trigger)], 3078 ["cf::map" => qw(trigger)],
3119) { 3079) {
3120 no strict 'refs'; 3080 no strict 'refs';
3121 my ($pkg, @funs) = @$_; 3081 my ($pkg, @funs) = @$_;
3122 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3082 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3139 my ($code, %vars) = @_; 3099 my ($code, %vars) = @_;
3140 3100
3141 my $qcode = $code; 3101 my $qcode = $code;
3142 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3102 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3143 $qcode =~ s/\n/\\n/g; 3103 $qcode =~ s/\n/\\n/g;
3104
3105 %vars = (_dummy => 0) unless %vars;
3144 3106
3145 local $_; 3107 local $_;
3146 local @safe::cf::_safe_eval_args = values %vars; 3108 local @safe::cf::_safe_eval_args = values %vars;
3147 3109
3148 my $eval = 3110 my $eval =
… …
3430 3392
3431 cf::init_experience; 3393 cf::init_experience;
3432 cf::init_anim; 3394 cf::init_anim;
3433 cf::init_attackmess; 3395 cf::init_attackmess;
3434 cf::init_dynamic; 3396 cf::init_dynamic;
3435 cf::init_block;
3436 3397
3437 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3438 3399
3439 # we must not ever block the main coroutine 3400 # we must not ever block the main coroutine
3440 local $Coro::idle = sub { 3401 local $Coro::idle = sub {
… …
3737 clear_package "safe::$_" 3698 clear_package "safe::$_"
3738 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3699 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3739 3700
3740 warn "unloading cf.pm \"a bit\""; 3701 warn "unloading cf.pm \"a bit\"";
3741 delete $INC{"cf.pm"}; 3702 delete $INC{"cf.pm"};
3742 delete $INC{"cf/pod.pm"}; 3703 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3743 3704
3744 # don't, removes xs symbols, too, 3705 # don't, removes xs symbols, too,
3745 # and global variables created in xs 3706 # and global variables created in xs
3746 #clear_package __PACKAGE__; 3707 #clear_package __PACKAGE__;
3747 3708
… …
3964 LOG llevInfo, "[ABT] [suppressed]\n"; 3925 LOG llevInfo, "[ABT] [suppressed]\n";
3965 } 3926 }
3966} 3927}
3967 3928
3968# load additional modules 3929# load additional modules
3969use cf::pod; 3930eval "use cf::$_" for @EXTRA_MODULES;
3970 3931
3971END { cf::emergency_save } 3932END { cf::emergency_save }
3972 3933
39731 39341
3974 3935

Diff Legend

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