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

Diff Legend

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