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.468 by root, Thu Jan 8 19:23:44 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;
… …
142unless ($RUNTIME || !-e $RUNTIMEFILE) { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
143 open my $fh, "<", $RUNTIMEFILE 146 open my $fh, "<", $RUNTIMEFILE
144 or die "unable to read $RUNTIMEFILE file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
145 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
146} 149}
150
151eval "sub TICK() { $TICK } 1" or die;
147 152
148mkdir $_ 153mkdir $_
149 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 154 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
150 155
151our $EMERGENCY_POSITION; 156our $EMERGENCY_POSITION;
… …
347 352
348Return true if the lock is currently active, i.e. somebody has locked it. 353Return true if the lock is currently active, i.e. somebody has locked it.
349 354
350=cut 355=cut
351 356
352our %LOCK; 357our $LOCKS = new Coro::SemaphoreSet;
353our %LOCKER;#d#
354 358
355sub lock_wait($) { 359sub lock_wait($) {
356 my ($key) = @_; 360 $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} 361}
370 362
371sub lock_acquire($) { 363sub lock_acquire($) {
372 my ($key) = @_; 364 $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} 365}
386 366
387sub lock_active($) { 367sub lock_active($) {
388 my ($key) = @_; 368 $LOCKS->count ($_[0]) < 1
389
390 ! ! $LOCK{$key}
391} 369}
392 370
393sub freeze_mainloop { 371sub freeze_mainloop {
394 tick_inhibit_inc; 372 tick_inhibit_inc;
395 373
… …
1194 aio_rename "$filename~", $filename; 1172 aio_rename "$filename~", $filename;
1195 1173
1196 $filename =~ s%/[^/]+$%%; 1174 $filename =~ s%/[^/]+$%%;
1197 aio_pathsync $filename if $cf::USE_FSYNC; 1175 aio_pathsync $filename if $cf::USE_FSYNC;
1198 } else { 1176 } else {
1199 warn "FATAL: $filename~: $!\n"; 1177 warn "unable to save objects: $filename~: $!\n";
1200 } 1178 }
1201 } else { 1179 } else {
1202 aio_unlink $filename; 1180 aio_unlink $filename;
1203 aio_unlink "$filename.pst"; 1181 aio_unlink "$filename.pst";
1204 } 1182 }
… …
1888 1866
1889 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1890 "$UNIQUEDIR/$path" 1868 "$UNIQUEDIR/$path"
1891} 1869}
1892 1870
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 { 1871sub decay_objects {
1903 my ($self) = @_; 1872 my ($self) = @_;
1904 1873
1905 return if $self->{deny_reset}; 1874 return if $self->{deny_reset};
1906 1875
… …
1988sub find { 1957sub find {
1989 my ($path, $origin) = @_; 1958 my ($path, $origin) = @_;
1990 1959
1991 $path = normalise $path, $origin && $origin->path; 1960 $path = normalise $path, $origin && $origin->path;
1992 1961
1993 cf::lock_wait "map_data:$path";#d#remove 1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1994 cf::lock_wait "map_find:$path"; 1963 my $guard2 = cf::lock_acquire "map_find:$path";
1995 1964
1996 $cf::MAP{$path} || do { 1965 $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 1966 my $map = new_from_path cf::map $path
2001 or return; 1967 or return;
2002 1968
2003 $map->{last_save} = $cf::RUNTIME; 1969 $map->{last_save} = $cf::RUNTIME;
2004 1970
… …
2071 2037
2072 unless ($self->{deny_activate}) { 2038 unless ($self->{deny_activate}) {
2073 $self->decay_objects; 2039 $self->decay_objects;
2074 $self->fix_auto_apply; 2040 $self->fix_auto_apply;
2075 $self->update_buttons; 2041 $self->update_buttons;
2076 cf::cede_to_tick;
2077 $self->set_darkness_map;
2078 cf::cede_to_tick; 2042 cf::cede_to_tick;
2079 $self->activate; 2043 $self->activate;
2080 } 2044 }
2081 2045
2082 $self->{last_save} = $cf::RUNTIME; 2046 $self->{last_save} = $cf::RUNTIME;
… …
2424 2388
2425our $SAY_CHANNEL = { 2389our $SAY_CHANNEL = {
2426 id => "say", 2390 id => "say",
2427 title => "Map", 2391 title => "Map",
2428 reply => "say ", 2392 reply => "say ",
2429 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2393 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2430}; 2394};
2431 2395
2432our $CHAT_CHANNEL = { 2396our $CHAT_CHANNEL = {
2433 id => "chat", 2397 id => "chat",
2434 title => "Chat", 2398 title => "Chat",
… …
2809 id => "infobox", 2773 id => "infobox",
2810 title => "Body Parts", 2774 title => "Body Parts",
2811 reply => undef, 2775 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 2776 tooltip => "Shows which body parts you posess and are available",
2813 }, 2777 },
2778 "c/statistics" => {
2779 id => "infobox",
2780 title => "Statistics",
2781 reply => undef,
2782 tooltip => "Shows your primary statistics",
2783 },
2814 "c/skills" => { 2784 "c/skills" => {
2815 id => "infobox", 2785 id => "infobox",
2816 title => "Skills", 2786 title => "Skills",
2817 reply => undef, 2787 reply => undef,
2818 tooltip => "Shows your experience per skill and item power", 2788 tooltip => "Shows your experience per skill and item power",
2789 },
2790 "c/resistances" => {
2791 id => "infobox",
2792 title => "Resistances",
2793 reply => undef,
2794 tooltip => "Shows your resistances",
2795 },
2796 "c/pets" => {
2797 id => "infobox",
2798 title => "Pets",
2799 reply => undef,
2800 tooltip => "Shows information abotu your pets/a specific pet",
2819 }, 2801 },
2820 "c/uptime" => { 2802 "c/uptime" => {
2821 id => "infobox", 2803 id => "infobox",
2822 title => "Uptime", 2804 title => "Uptime",
2823 reply => undef, 2805 reply => undef,
… …
2833 id => "party", 2815 id => "party",
2834 title => "Party", 2816 title => "Party",
2835 reply => "gsay ", 2817 reply => "gsay ",
2836 tooltip => "Messages and chat related to your party", 2818 tooltip => "Messages and chat related to your party",
2837 }, 2819 },
2820 "c/death" => {
2821 id => "death",
2822 title => "Death",
2823 reply => undef,
2824 tooltip => "Reason for and more info about your most recent death",
2825 },
2826 "c/say" => $SAY_CHANNEL,
2827 "c/chat" => $CHAT_CHANNEL,
2838); 2828);
2839 2829
2840sub cf::client::send_msg { 2830sub cf::client::send_msg {
2841 my ($self, $channel, $msg, $color, @extra) = @_; 2831 my ($self, $channel, $msg, $color, @extra) = @_;
2842 2832
… …
2847 2837
2848 # check predefined channels, for the benefit of C 2838 # check predefined channels, for the benefit of C
2849 if ($CHANNEL{$channel}) { 2839 if ($CHANNEL{$channel}) {
2850 $channel = $CHANNEL{$channel}; 2840 $channel = $CHANNEL{$channel};
2851 2841
2852 $self->ext_msg (channel_info => $channel) 2842 $self->ext_msg (channel_info => $channel);
2853 if $self->can_msg;
2854
2855 $channel = $channel->{id}; 2843 $channel = $channel->{id};
2856 2844
2857 } elsif (ref $channel) { 2845 } elsif (ref $channel) {
2858 # send meta info to client, if not yet sent 2846 # send meta info to client, if not yet sent
2859 unless (exists $self->{channel}{$channel->{id}}) { 2847 unless (exists $self->{channel}{$channel->{id}}) {
2860 $self->{channel}{$channel->{id}} = $channel; 2848 $self->{channel}{$channel->{id}} = $channel;
2861 $self->ext_msg (channel_info => $channel) 2849 $self->ext_msg (channel_info => $channel);
2862 if $self->can_msg;
2863 } 2850 }
2864 2851
2865 $channel = $channel->{id}; 2852 $channel = $channel->{id};
2866 } 2853 }
2867 2854
2868 return unless @extra || length $msg; 2855 return unless @extra || length $msg;
2869 2856
2870 if ($self->can_msg) {
2871 # default colour, mask it out 2857 # default colour, mask it out
2872 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2858 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2873 if $color & cf::NDI_DEF; 2859 if $color & cf::NDI_DEF;
2874 2860
2875 my $pkt = "msg " 2861 my $pkt = "msg "
2876 . $self->{json_coder}->encode ( 2862 . $self->{json_coder}->encode (
2877 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2878 ); 2864 );
2879 2865
2880 # try lzf for large packets 2866 # try lzf for large packets
2881 $pkt = "lzf " . Compress::LZF::compress $pkt 2867 $pkt = "lzf " . Compress::LZF::compress $pkt
2882 if 1024 <= length $pkt and $self->{can_lzf}; 2868 if 1024 <= length $pkt and $self->{can_lzf};
2883 2869
2884 # split very large packets 2870 # split very large packets
2885 if (8192 < length $pkt and $self->{can_lzf}) { 2871 if (8192 < length $pkt and $self->{can_lzf}) {
2886 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2872 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2887 $pkt = "frag"; 2873 $pkt = "frag";
2888 } 2874 }
2889 2875
2890 $self->send_packet ($pkt); 2876 $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} 2877}
2917 2878
2918=item $client->ext_msg ($type, @msg) 2879=item $client->ext_msg ($type, @msg)
2919 2880
2920Sends an ext event to the client. 2881Sends an ext event to the client.
… …
3095The following functions and methods are available within a safe environment: 3056The following functions and methods are available within a safe environment:
3096 3057
3097 cf::object 3058 cf::object
3098 contr pay_amount pay_player map x y force_find force_add destroy 3059 contr pay_amount pay_player map x y force_find force_add destroy
3099 insert remove name archname title slaying race decrease split 3060 insert remove name archname title slaying race decrease split
3061 value
3100 3062
3101 cf::object::player 3063 cf::object::player
3102 player 3064 player
3103 3065
3104 cf::player 3066 cf::player
… …
3110=cut 3072=cut
3111 3073
3112for ( 3074for (
3113 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3075 ["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 3076 insert remove inv nrof name archname title slaying race
3115 decrease split destroy change_exp)], 3077 decrease split destroy change_exp value msg lore send_msg)],
3116 ["cf::object::player" => qw(player)], 3078 ["cf::object::player" => qw(player)],
3117 ["cf::player" => qw(peaceful)], 3079 ["cf::player" => qw(peaceful send_msg)],
3118 ["cf::map" => qw(trigger)], 3080 ["cf::map" => qw(trigger)],
3119) { 3081) {
3120 no strict 'refs'; 3082 no strict 'refs';
3121 my ($pkg, @funs) = @$_; 3083 my ($pkg, @funs) = @$_;
3122 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3139 my ($code, %vars) = @_; 3101 my ($code, %vars) = @_;
3140 3102
3141 my $qcode = $code; 3103 my $qcode = $code;
3142 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3143 $qcode =~ s/\n/\\n/g; 3105 $qcode =~ s/\n/\\n/g;
3106
3107 %vars = (_dummy => 0) unless %vars;
3144 3108
3145 local $_; 3109 local $_;
3146 local @safe::cf::_safe_eval_args = values %vars; 3110 local @safe::cf::_safe_eval_args = values %vars;
3147 3111
3148 my $eval = 3112 my $eval =
… …
3430 3394
3431 cf::init_experience; 3395 cf::init_experience;
3432 cf::init_anim; 3396 cf::init_anim;
3433 cf::init_attackmess; 3397 cf::init_attackmess;
3434 cf::init_dynamic; 3398 cf::init_dynamic;
3435 cf::init_block;
3436 3399
3437 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3400 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3438 3401
3439 # we must not ever block the main coroutine 3402 # we must not ever block the main coroutine
3440 local $Coro::idle = sub { 3403 local $Coro::idle = sub {
… …
3737 clear_package "safe::$_" 3700 clear_package "safe::$_"
3738 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3701 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3739 3702
3740 warn "unloading cf.pm \"a bit\""; 3703 warn "unloading cf.pm \"a bit\"";
3741 delete $INC{"cf.pm"}; 3704 delete $INC{"cf.pm"};
3742 delete $INC{"cf/pod.pm"}; 3705 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3743 3706
3744 # don't, removes xs symbols, too, 3707 # don't, removes xs symbols, too,
3745 # and global variables created in xs 3708 # and global variables created in xs
3746 #clear_package __PACKAGE__; 3709 #clear_package __PACKAGE__;
3747 3710
… …
3964 LOG llevInfo, "[ABT] [suppressed]\n"; 3927 LOG llevInfo, "[ABT] [suppressed]\n";
3965 } 3928 }
3966} 3929}
3967 3930
3968# load additional modules 3931# load additional modules
3969use cf::pod; 3932require "cf/$_.pm" for @EXTRA_MODULES;
3970 3933
3971END { cf::emergency_save } 3934END { cf::emergency_save }
3972 3935
39731 39361
3974 3937

Diff Legend

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