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.472 by root, Sat Jun 6 21:43:13 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 ();
… …
103our %RESOURCE; 105our %RESOURCE;
104 106
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 109our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default on
109 111
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;
116
117our @EXTRA_MODULES = qw(pod mapscript);
114 118
115our %CFG; 119our %CFG;
116 120
117our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 122our $RUNTIME;
… …
141unless ($RUNTIME || !-e $RUNTIMEFILE) { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
142 open my $fh, "<", $RUNTIMEFILE 146 open my $fh, "<", $RUNTIMEFILE
143 or die "unable to read $RUNTIMEFILE file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
144 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
145} 149}
150
151eval "sub TICK() { $TICK } 1" or die;
146 152
147mkdir $_ 153mkdir $_
148 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 154 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
149 155
150our $EMERGENCY_POSITION; 156our $EMERGENCY_POSITION;
… …
330Wait until the given lock is available. See cf::lock_acquire. 336Wait until the given lock is available. See cf::lock_acquire.
331 337
332=item my $lock = cf::lock_acquire $string 338=item my $lock = cf::lock_acquire $string
333 339
334Wait until the given lock is available and then acquires it and returns 340Wait 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, 341a L<Guard> object. If the guard object gets destroyed (goes out of scope,
336for example when the coroutine gets canceled), the lock is automatically 342for example when the coroutine gets canceled), the lock is automatically
337returned. 343returned.
338 344
339Locks are *not* recursive, locking from the same coro twice results in a 345Locks are *not* recursive, locking from the same coro twice results in a
340deadlocked coro. 346deadlocked coro.
… …
346 352
347Return 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.
348 354
349=cut 355=cut
350 356
351our %LOCK; 357our $LOCKS = new Coro::SemaphoreSet;
352our %LOCKER;#d#
353 358
354sub lock_wait($) { 359sub lock_wait($) {
355 my ($key) = @_; 360 $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} 361}
369 362
370sub lock_acquire($) { 363sub lock_acquire($) {
371 my ($key) = @_; 364 $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} 365}
385 366
386sub lock_active($) { 367sub lock_active($) {
387 my ($key) = @_; 368 $LOCKS->count ($_[0]) < 1
388
389 ! ! $LOCK{$key}
390} 369}
391 370
392sub freeze_mainloop { 371sub freeze_mainloop {
393 tick_inhibit_inc; 372 tick_inhibit_inc;
394 373
395 Coro::guard \&tick_inhibit_dec; 374 &Guard::guard (\&tick_inhibit_dec);
396} 375}
397 376
398=item cf::periodic $interval, $cb 377=item cf::periodic $interval, $cb
399 378
400Like EV::periodic, but randomly selects a starting point so that the actions 379Like EV::periodic, but randomly selects a starting point so that the actions
… …
1193 aio_rename "$filename~", $filename; 1172 aio_rename "$filename~", $filename;
1194 1173
1195 $filename =~ s%/[^/]+$%%; 1174 $filename =~ s%/[^/]+$%%;
1196 aio_pathsync $filename if $cf::USE_FSYNC; 1175 aio_pathsync $filename if $cf::USE_FSYNC;
1197 } else { 1176 } else {
1198 warn "FATAL: $filename~: $!\n"; 1177 warn "unable to save objects: $filename~: $!\n";
1199 } 1178 }
1200 } else { 1179 } else {
1201 aio_unlink $filename; 1180 aio_unlink $filename;
1202 aio_unlink "$filename.pst"; 1181 aio_unlink "$filename.pst";
1203 } 1182 }
… …
1341 1320
1342# "readahead" all extensions 1321# "readahead" all extensions
1343sub cache_extensions { 1322sub cache_extensions {
1344 my $grp = IO::AIO::aio_group; 1323 my $grp = IO::AIO::aio_group;
1345 1324
1346 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1325 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1347 for (grep /\.ext$/, @{$_[0]}) { 1326 for (grep /\.ext$/, @{$_[0]}) {
1348 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1349 } 1328 }
1350 }; 1329 };
1351 1330
… …
1887 1866
1888 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1889 "$UNIQUEDIR/$path" 1868 "$UNIQUEDIR/$path"
1890} 1869}
1891 1870
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 { 1871sub decay_objects {
1902 my ($self) = @_; 1872 my ($self) = @_;
1903 1873
1904 return if $self->{deny_reset}; 1874 return if $self->{deny_reset};
1905 1875
… …
1987sub find { 1957sub find {
1988 my ($path, $origin) = @_; 1958 my ($path, $origin) = @_;
1989 1959
1990 $path = normalise $path, $origin && $origin->path; 1960 $path = normalise $path, $origin && $origin->path;
1991 1961
1992 cf::lock_wait "map_data:$path";#d#remove 1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1993 cf::lock_wait "map_find:$path"; 1963 my $guard2 = cf::lock_acquire "map_find:$path";
1994 1964
1995 $cf::MAP{$path} || do { 1965 $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 1966 my $map = new_from_path cf::map $path
2000 or return; 1967 or return;
2001 1968
2002 $map->{last_save} = $cf::RUNTIME; 1969 $map->{last_save} = $cf::RUNTIME;
2003 1970
… …
2070 2037
2071 unless ($self->{deny_activate}) { 2038 unless ($self->{deny_activate}) {
2072 $self->decay_objects; 2039 $self->decay_objects;
2073 $self->fix_auto_apply; 2040 $self->fix_auto_apply;
2074 $self->update_buttons; 2041 $self->update_buttons;
2075 cf::cede_to_tick;
2076 $self->set_darkness_map;
2077 cf::cede_to_tick; 2042 cf::cede_to_tick;
2078 $self->activate; 2043 $self->activate;
2079 } 2044 }
2080 2045
2081 $self->{last_save} = $cf::RUNTIME; 2046 $self->{last_save} = $cf::RUNTIME;
… …
2423 2388
2424our $SAY_CHANNEL = { 2389our $SAY_CHANNEL = {
2425 id => "say", 2390 id => "say",
2426 title => "Map", 2391 title => "Map",
2427 reply => "say ", 2392 reply => "say ",
2428 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.",
2429}; 2394};
2430 2395
2431our $CHAT_CHANNEL = { 2396our $CHAT_CHANNEL = {
2432 id => "chat", 2397 id => "chat",
2433 title => "Chat", 2398 title => "Chat",
… …
2808 id => "infobox", 2773 id => "infobox",
2809 title => "Body Parts", 2774 title => "Body Parts",
2810 reply => undef, 2775 reply => undef,
2811 tooltip => "Shows which body parts you posess and are available", 2776 tooltip => "Shows which body parts you posess and are available",
2812 }, 2777 },
2778 "c/statistics" => {
2779 id => "infobox",
2780 title => "Statistics",
2781 reply => undef,
2782 tooltip => "Shows your primary statistics",
2783 },
2813 "c/skills" => { 2784 "c/skills" => {
2814 id => "infobox", 2785 id => "infobox",
2815 title => "Skills", 2786 title => "Skills",
2816 reply => undef, 2787 reply => undef,
2817 tooltip => "Shows your experience per skill and item power", 2788 tooltip => "Shows your experience per skill and item power",
2789 },
2790 "c/shopitems" => {
2791 id => "infobox",
2792 title => "Shop Items",
2793 reply => undef,
2794 tooltip => "Shows the items currently for sale in this shop",
2795 },
2796 "c/resistances" => {
2797 id => "infobox",
2798 title => "Resistances",
2799 reply => undef,
2800 tooltip => "Shows your resistances",
2801 },
2802 "c/pets" => {
2803 id => "infobox",
2804 title => "Pets",
2805 reply => undef,
2806 tooltip => "Shows information abotu your pets/a specific pet",
2807 },
2808 "c/perceiveself" => {
2809 id => "infobox",
2810 title => "Perceive Self",
2811 reply => undef,
2812 tooltip => "You gained detailed knowledge about yourself",
2818 }, 2813 },
2819 "c/uptime" => { 2814 "c/uptime" => {
2820 id => "infobox", 2815 id => "infobox",
2821 title => "Uptime", 2816 title => "Uptime",
2822 reply => undef, 2817 reply => undef,
… …
2832 id => "party", 2827 id => "party",
2833 title => "Party", 2828 title => "Party",
2834 reply => "gsay ", 2829 reply => "gsay ",
2835 tooltip => "Messages and chat related to your party", 2830 tooltip => "Messages and chat related to your party",
2836 }, 2831 },
2832 "c/death" => {
2833 id => "death",
2834 title => "Death",
2835 reply => undef,
2836 tooltip => "Reason for and more info about your most recent death",
2837 },
2838 "c/say" => $SAY_CHANNEL,
2839 "c/chat" => $CHAT_CHANNEL,
2837); 2840);
2838 2841
2839sub cf::client::send_msg { 2842sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 2843 my ($self, $channel, $msg, $color, @extra) = @_;
2841 2844
… …
2846 2849
2847 # check predefined channels, for the benefit of C 2850 # check predefined channels, for the benefit of C
2848 if ($CHANNEL{$channel}) { 2851 if ($CHANNEL{$channel}) {
2849 $channel = $CHANNEL{$channel}; 2852 $channel = $CHANNEL{$channel};
2850 2853
2851 $self->ext_msg (channel_info => $channel) 2854 $self->ext_msg (channel_info => $channel);
2852 if $self->can_msg;
2853
2854 $channel = $channel->{id}; 2855 $channel = $channel->{id};
2855 2856
2856 } elsif (ref $channel) { 2857 } elsif (ref $channel) {
2857 # send meta info to client, if not yet sent 2858 # send meta info to client, if not yet sent
2858 unless (exists $self->{channel}{$channel->{id}}) { 2859 unless (exists $self->{channel}{$channel->{id}}) {
2859 $self->{channel}{$channel->{id}} = $channel; 2860 $self->{channel}{$channel->{id}} = $channel;
2860 $self->ext_msg (channel_info => $channel) 2861 $self->ext_msg (channel_info => $channel);
2861 if $self->can_msg;
2862 } 2862 }
2863 2863
2864 $channel = $channel->{id}; 2864 $channel = $channel->{id};
2865 } 2865 }
2866 2866
2867 return unless @extra || length $msg; 2867 return unless @extra || length $msg;
2868 2868
2869 if ($self->can_msg) {
2870 # default colour, mask it out 2869 # default colour, mask it out
2871 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2872 if $color & cf::NDI_DEF; 2871 if $color & cf::NDI_DEF;
2873 2872
2874 my $pkt = "msg " 2873 my $pkt = "msg "
2875 . $self->{json_coder}->encode ( 2874 . $self->{json_coder}->encode (
2876 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2875 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2877 ); 2876 );
2878 2877
2879 # try lzf for large packets 2878 # try lzf for large packets
2880 $pkt = "lzf " . Compress::LZF::compress $pkt 2879 $pkt = "lzf " . Compress::LZF::compress $pkt
2881 if 1024 <= length $pkt and $self->{can_lzf}; 2880 if 1024 <= length $pkt and $self->{can_lzf};
2882 2881
2883 # split very large packets 2882 # split very large packets
2884 if (8192 < length $pkt and $self->{can_lzf}) { 2883 if (8192 < length $pkt and $self->{can_lzf}) {
2885 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2884 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2886 $pkt = "frag"; 2885 $pkt = "frag";
2887 } 2886 }
2888 2887
2889 $self->send_packet ($pkt); 2888 $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} 2889}
2916 2890
2917=item $client->ext_msg ($type, @msg) 2891=item $client->ext_msg ($type, @msg)
2918 2892
2919Sends an ext event to the client. 2893Sends an ext event to the client.
… …
3094The following functions and methods are available within a safe environment: 3068The following functions and methods are available within a safe environment:
3095 3069
3096 cf::object 3070 cf::object
3097 contr pay_amount pay_player map x y force_find force_add destroy 3071 contr pay_amount pay_player map x y force_find force_add destroy
3098 insert remove name archname title slaying race decrease split 3072 insert remove name archname title slaying race decrease split
3073 value
3099 3074
3100 cf::object::player 3075 cf::object::player
3101 player 3076 player
3102 3077
3103 cf::player 3078 cf::player
… …
3109=cut 3084=cut
3110 3085
3111for ( 3086for (
3112 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3087 ["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 3088 insert remove inv nrof name archname title slaying race
3114 decrease split destroy change_exp)], 3089 decrease split destroy change_exp value msg lore send_msg)],
3115 ["cf::object::player" => qw(player)], 3090 ["cf::object::player" => qw(player)],
3116 ["cf::player" => qw(peaceful)], 3091 ["cf::player" => qw(peaceful send_msg)],
3117 ["cf::map" => qw(trigger)], 3092 ["cf::map" => qw(trigger)],
3118) { 3093) {
3119 no strict 'refs'; 3094 no strict 'refs';
3120 my ($pkg, @funs) = @$_; 3095 my ($pkg, @funs) = @$_;
3121 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3096 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3138 my ($code, %vars) = @_; 3113 my ($code, %vars) = @_;
3139 3114
3140 my $qcode = $code; 3115 my $qcode = $code;
3141 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3116 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3142 $qcode =~ s/\n/\\n/g; 3117 $qcode =~ s/\n/\\n/g;
3118
3119 %vars = (_dummy => 0) unless %vars;
3143 3120
3144 local $_; 3121 local $_;
3145 local @safe::cf::_safe_eval_args = values %vars; 3122 local @safe::cf::_safe_eval_args = values %vars;
3146 3123
3147 my $eval = 3124 my $eval =
… …
3429 3406
3430 cf::init_experience; 3407 cf::init_experience;
3431 cf::init_anim; 3408 cf::init_anim;
3432 cf::init_attackmess; 3409 cf::init_attackmess;
3433 cf::init_dynamic; 3410 cf::init_dynamic;
3434 cf::init_block;
3435 3411
3436 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3437 3413
3438 # we must not ever block the main coroutine 3414 # we must not ever block the main coroutine
3439 local $Coro::idle = sub { 3415 local $Coro::idle = sub {
… …
3736 clear_package "safe::$_" 3712 clear_package "safe::$_"
3737 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3713 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3738 3714
3739 warn "unloading cf.pm \"a bit\""; 3715 warn "unloading cf.pm \"a bit\"";
3740 delete $INC{"cf.pm"}; 3716 delete $INC{"cf.pm"};
3741 delete $INC{"cf/pod.pm"}; 3717 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3742 3718
3743 # don't, removes xs symbols, too, 3719 # don't, removes xs symbols, too,
3744 # and global variables created in xs 3720 # and global variables created in xs
3745 #clear_package __PACKAGE__; 3721 #clear_package __PACKAGE__;
3746 3722
… …
3963 LOG llevInfo, "[ABT] [suppressed]\n"; 3939 LOG llevInfo, "[ABT] [suppressed]\n";
3964 } 3940 }
3965} 3941}
3966 3942
3967# load additional modules 3943# load additional modules
3968use cf::pod; 3944require "cf/$_.pm" for @EXTRA_MODULES;
3969 3945
3970END { cf::emergency_save } 3946END { cf::emergency_save }
3971 3947
39721 39481
3973 3949

Diff Legend

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