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.473 by root, Fri Jun 26 16:32:10 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 ();
… …
104our %RESOURCE; 105our %RESOURCE;
105 106
106our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
107our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
108our $NEXT_TICK; 109our $NEXT_TICK;
109our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default on
110 111
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;
116
117our @EXTRA_MODULES = qw(pod mapscript);
115 118
116our %CFG; 119our %CFG;
117 120
118our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
119our $RUNTIME; 122our $RUNTIME;
… …
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
… …
1173 $decname, length $$rdata, scalar @$objs; 1151 $decname, length $$rdata, scalar @$objs;
1174 1152
1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1154 aio_chmod $fh, SAVE_MODE;
1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1178 aio_fsync $fh if $cf::USE_FSYNC; 1156 if ($cf::USE_FSYNC) {
1157 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;
1158 aio_fsync $fh;
1159 }
1179 aio_close $fh; 1160 aio_close $fh;
1180 1161
1181 if (@$objs) { 1162 if (@$objs) {
1182 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1163 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1183 aio_chmod $fh, SAVE_MODE; 1164 aio_chmod $fh, SAVE_MODE;
1184 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1185 aio_write $fh, 0, (length $data), $data, 0; 1166 aio_write $fh, 0, (length $data), $data, 0;
1186 aio_fsync $fh if $cf::USE_FSYNC; 1167 if ($cf::USE_FSYNC) {
1168 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;
1169 aio_fsync $fh;
1170 }
1187 aio_close $fh; 1171 aio_close $fh;
1188 aio_rename "$filename.pst~", "$filename.pst"; 1172 aio_rename "$filename.pst~", "$filename.pst";
1189 } 1173 }
1190 } else { 1174 } else {
1191 aio_unlink "$filename.pst"; 1175 aio_unlink "$filename.pst";
… …
1194 aio_rename "$filename~", $filename; 1178 aio_rename "$filename~", $filename;
1195 1179
1196 $filename =~ s%/[^/]+$%%; 1180 $filename =~ s%/[^/]+$%%;
1197 aio_pathsync $filename if $cf::USE_FSYNC; 1181 aio_pathsync $filename if $cf::USE_FSYNC;
1198 } else { 1182 } else {
1199 warn "FATAL: $filename~: $!\n"; 1183 warn "unable to save objects: $filename~: $!\n";
1200 } 1184 }
1201 } else { 1185 } else {
1202 aio_unlink $filename; 1186 aio_unlink $filename;
1203 aio_unlink "$filename.pst"; 1187 aio_unlink "$filename.pst";
1204 } 1188 }
… …
1342 1326
1343# "readahead" all extensions 1327# "readahead" all extensions
1344sub cache_extensions { 1328sub cache_extensions {
1345 my $grp = IO::AIO::aio_group; 1329 my $grp = IO::AIO::aio_group;
1346 1330
1347 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1331 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1348 for (grep /\.ext$/, @{$_[0]}) { 1332 for (grep /\.ext$/, @{$_[0]}) {
1349 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1333 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1350 } 1334 }
1351 }; 1335 };
1352 1336
… …
1888 1872
1889 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1890 "$UNIQUEDIR/$path" 1874 "$UNIQUEDIR/$path"
1891} 1875}
1892 1876
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 { 1877sub decay_objects {
1903 my ($self) = @_; 1878 my ($self) = @_;
1904 1879
1905 return if $self->{deny_reset}; 1880 return if $self->{deny_reset};
1906 1881
… …
1988sub find { 1963sub find {
1989 my ($path, $origin) = @_; 1964 my ($path, $origin) = @_;
1990 1965
1991 $path = normalise $path, $origin && $origin->path; 1966 $path = normalise $path, $origin && $origin->path;
1992 1967
1993 cf::lock_wait "map_data:$path";#d#remove 1968 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1994 cf::lock_wait "map_find:$path"; 1969 my $guard2 = cf::lock_acquire "map_find:$path";
1995 1970
1996 $cf::MAP{$path} || do { 1971 $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 1972 my $map = new_from_path cf::map $path
2001 or return; 1973 or return;
2002 1974
2003 $map->{last_save} = $cf::RUNTIME; 1975 $map->{last_save} = $cf::RUNTIME;
2004 1976
… …
2071 2043
2072 unless ($self->{deny_activate}) { 2044 unless ($self->{deny_activate}) {
2073 $self->decay_objects; 2045 $self->decay_objects;
2074 $self->fix_auto_apply; 2046 $self->fix_auto_apply;
2075 $self->update_buttons; 2047 $self->update_buttons;
2076 cf::cede_to_tick;
2077 $self->set_darkness_map;
2078 cf::cede_to_tick; 2048 cf::cede_to_tick;
2079 $self->activate; 2049 $self->activate;
2080 } 2050 }
2081 2051
2082 $self->{last_save} = $cf::RUNTIME; 2052 $self->{last_save} = $cf::RUNTIME;
… …
2424 2394
2425our $SAY_CHANNEL = { 2395our $SAY_CHANNEL = {
2426 id => "say", 2396 id => "say",
2427 title => "Map", 2397 title => "Map",
2428 reply => "say ", 2398 reply => "say ",
2429 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2399 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2430}; 2400};
2431 2401
2432our $CHAT_CHANNEL = { 2402our $CHAT_CHANNEL = {
2433 id => "chat", 2403 id => "chat",
2434 title => "Chat", 2404 title => "Chat",
… …
2809 id => "infobox", 2779 id => "infobox",
2810 title => "Body Parts", 2780 title => "Body Parts",
2811 reply => undef, 2781 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 2782 tooltip => "Shows which body parts you posess and are available",
2813 }, 2783 },
2784 "c/statistics" => {
2785 id => "infobox",
2786 title => "Statistics",
2787 reply => undef,
2788 tooltip => "Shows your primary statistics",
2789 },
2814 "c/skills" => { 2790 "c/skills" => {
2815 id => "infobox", 2791 id => "infobox",
2816 title => "Skills", 2792 title => "Skills",
2817 reply => undef, 2793 reply => undef,
2818 tooltip => "Shows your experience per skill and item power", 2794 tooltip => "Shows your experience per skill and item power",
2795 },
2796 "c/shopitems" => {
2797 id => "infobox",
2798 title => "Shop Items",
2799 reply => undef,
2800 tooltip => "Shows the items currently for sale in this shop",
2801 },
2802 "c/resistances" => {
2803 id => "infobox",
2804 title => "Resistances",
2805 reply => undef,
2806 tooltip => "Shows your resistances",
2807 },
2808 "c/pets" => {
2809 id => "infobox",
2810 title => "Pets",
2811 reply => undef,
2812 tooltip => "Shows information abotu your pets/a specific pet",
2813 },
2814 "c/perceiveself" => {
2815 id => "infobox",
2816 title => "Perceive Self",
2817 reply => undef,
2818 tooltip => "You gained detailed knowledge about yourself",
2819 }, 2819 },
2820 "c/uptime" => { 2820 "c/uptime" => {
2821 id => "infobox", 2821 id => "infobox",
2822 title => "Uptime", 2822 title => "Uptime",
2823 reply => undef, 2823 reply => undef,
… …
2833 id => "party", 2833 id => "party",
2834 title => "Party", 2834 title => "Party",
2835 reply => "gsay ", 2835 reply => "gsay ",
2836 tooltip => "Messages and chat related to your party", 2836 tooltip => "Messages and chat related to your party",
2837 }, 2837 },
2838 "c/death" => {
2839 id => "death",
2840 title => "Death",
2841 reply => undef,
2842 tooltip => "Reason for and more info about your most recent death",
2843 },
2844 "c/say" => $SAY_CHANNEL,
2845 "c/chat" => $CHAT_CHANNEL,
2838); 2846);
2839 2847
2840sub cf::client::send_msg { 2848sub cf::client::send_msg {
2841 my ($self, $channel, $msg, $color, @extra) = @_; 2849 my ($self, $channel, $msg, $color, @extra) = @_;
2842 2850
… …
2847 2855
2848 # check predefined channels, for the benefit of C 2856 # check predefined channels, for the benefit of C
2849 if ($CHANNEL{$channel}) { 2857 if ($CHANNEL{$channel}) {
2850 $channel = $CHANNEL{$channel}; 2858 $channel = $CHANNEL{$channel};
2851 2859
2852 $self->ext_msg (channel_info => $channel) 2860 $self->ext_msg (channel_info => $channel);
2853 if $self->can_msg;
2854
2855 $channel = $channel->{id}; 2861 $channel = $channel->{id};
2856 2862
2857 } elsif (ref $channel) { 2863 } elsif (ref $channel) {
2858 # send meta info to client, if not yet sent 2864 # send meta info to client, if not yet sent
2859 unless (exists $self->{channel}{$channel->{id}}) { 2865 unless (exists $self->{channel}{$channel->{id}}) {
2860 $self->{channel}{$channel->{id}} = $channel; 2866 $self->{channel}{$channel->{id}} = $channel;
2861 $self->ext_msg (channel_info => $channel) 2867 $self->ext_msg (channel_info => $channel);
2862 if $self->can_msg;
2863 } 2868 }
2864 2869
2865 $channel = $channel->{id}; 2870 $channel = $channel->{id};
2866 } 2871 }
2867 2872
2868 return unless @extra || length $msg; 2873 return unless @extra || length $msg;
2869 2874
2870 if ($self->can_msg) {
2871 # default colour, mask it out 2875 # default colour, mask it out
2872 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2876 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2873 if $color & cf::NDI_DEF; 2877 if $color & cf::NDI_DEF;
2874 2878
2875 my $pkt = "msg " 2879 my $pkt = "msg "
2876 . $self->{json_coder}->encode ( 2880 . $self->{json_coder}->encode (
2877 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2881 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2878 ); 2882 );
2879 2883
2880 # try lzf for large packets 2884 # try lzf for large packets
2881 $pkt = "lzf " . Compress::LZF::compress $pkt 2885 $pkt = "lzf " . Compress::LZF::compress $pkt
2882 if 1024 <= length $pkt and $self->{can_lzf}; 2886 if 1024 <= length $pkt and $self->{can_lzf};
2883 2887
2884 # split very large packets 2888 # split very large packets
2885 if (8192 < length $pkt and $self->{can_lzf}) { 2889 if (8192 < length $pkt and $self->{can_lzf}) {
2886 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2890 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2887 $pkt = "frag"; 2891 $pkt = "frag";
2888 } 2892 }
2889 2893
2890 $self->send_packet ($pkt); 2894 $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} 2895}
2917 2896
2918=item $client->ext_msg ($type, @msg) 2897=item $client->ext_msg ($type, @msg)
2919 2898
2920Sends an ext event to the client. 2899Sends an ext event to the client.
… …
3095The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
3096 3075
3097 cf::object 3076 cf::object
3098 contr pay_amount pay_player map x y force_find force_add destroy 3077 contr pay_amount pay_player map x y force_find force_add destroy
3099 insert remove name archname title slaying race decrease split 3078 insert remove name archname title slaying race decrease split
3079 value
3100 3080
3101 cf::object::player 3081 cf::object::player
3102 player 3082 player
3103 3083
3104 cf::player 3084 cf::player
… …
3110=cut 3090=cut
3111 3091
3112for ( 3092for (
3113 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3093 ["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 3094 insert remove inv nrof name archname title slaying race
3115 decrease split destroy change_exp)], 3095 decrease split destroy change_exp value msg lore send_msg)],
3116 ["cf::object::player" => qw(player)], 3096 ["cf::object::player" => qw(player)],
3117 ["cf::player" => qw(peaceful)], 3097 ["cf::player" => qw(peaceful send_msg)],
3118 ["cf::map" => qw(trigger)], 3098 ["cf::map" => qw(trigger)],
3119) { 3099) {
3120 no strict 'refs'; 3100 no strict 'refs';
3121 my ($pkg, @funs) = @$_; 3101 my ($pkg, @funs) = @$_;
3122 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3102 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3139 my ($code, %vars) = @_; 3119 my ($code, %vars) = @_;
3140 3120
3141 my $qcode = $code; 3121 my $qcode = $code;
3142 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3122 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3143 $qcode =~ s/\n/\\n/g; 3123 $qcode =~ s/\n/\\n/g;
3124
3125 %vars = (_dummy => 0) unless %vars;
3144 3126
3145 local $_; 3127 local $_;
3146 local @safe::cf::_safe_eval_args = values %vars; 3128 local @safe::cf::_safe_eval_args = values %vars;
3147 3129
3148 my $eval = 3130 my $eval =
… …
3430 3412
3431 cf::init_experience; 3413 cf::init_experience;
3432 cf::init_anim; 3414 cf::init_anim;
3433 cf::init_attackmess; 3415 cf::init_attackmess;
3434 cf::init_dynamic; 3416 cf::init_dynamic;
3435 cf::init_block;
3436 3417
3437 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3438 3419
3439 # we must not ever block the main coroutine 3420 # we must not ever block the main coroutine
3440 local $Coro::idle = sub { 3421 local $Coro::idle = sub {
… …
3737 clear_package "safe::$_" 3718 clear_package "safe::$_"
3738 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3719 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3739 3720
3740 warn "unloading cf.pm \"a bit\""; 3721 warn "unloading cf.pm \"a bit\"";
3741 delete $INC{"cf.pm"}; 3722 delete $INC{"cf.pm"};
3742 delete $INC{"cf/pod.pm"}; 3723 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3743 3724
3744 # don't, removes xs symbols, too, 3725 # don't, removes xs symbols, too,
3745 # and global variables created in xs 3726 # and global variables created in xs
3746 #clear_package __PACKAGE__; 3727 #clear_package __PACKAGE__;
3747 3728
… …
3964 LOG llevInfo, "[ABT] [suppressed]\n"; 3945 LOG llevInfo, "[ABT] [suppressed]\n";
3965 } 3946 }
3966} 3947}
3967 3948
3968# load additional modules 3949# load additional modules
3969use cf::pod; 3950require "cf/$_.pm" for @EXTRA_MODULES;
3970 3951
3971END { cf::emergency_save } 3952END { cf::emergency_save }
3972 3953
39731 39541
3974 3955

Diff Legend

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