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.463 by root, Sun Dec 28 06:59:27 2008 UTC vs.
Revision 1.479 by root, Thu Oct 8 05:04:27 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;
… …
72 72
73# make sure c-lzf reinitialises itself 73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76 76
77# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
78 81
79our %COMMAND = (); 82our %COMMAND = ();
80our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
81 84
… …
85our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
87 90
88our $RELOAD; # number of reloads so far, non-zero while in reload 91our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 92our @EVENT;
93our @REFLECT; # set by XS
94our %REFLECT; # set by us
90 95
91our $CONFDIR = confdir; 96our $CONFDIR = confdir;
92our $DATADIR = datadir; 97our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 98our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 99our $PODDIR = "$DATADIR/pod";
… …
105our %RESOURCE; 110our %RESOURCE;
106 111
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 114our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 115our $USE_FSYNC = 1; # use fsync to write maps - default on
111 116
112our $BDB_DEADLOCK_WATCHER; 117our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 118our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 119our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 120our $DB_ENV;
116 121
122our @EXTRA_MODULES = qw(pod mapscript);
123
117our %CFG; 124our %CFG;
118 125
119our $UPTIME; $UPTIME ||= time; 126our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 127our $RUNTIME;
121our $NOW; 128our $NOW;
… …
132our $JITTER; # average jitter 139our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 140our $TICK_START; # for load detecting purposes
134 141
135our @POST_INIT; 142our @POST_INIT;
136 143
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 144our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
145our $REALLY_UNLOOP; # never set to true, please :)
138 146
139binmode STDOUT; 147binmode STDOUT;
140binmode STDERR; 148binmode STDERR;
141 149
142# read virtual server time, if available 150# read virtual server time, if available
… …
144 open my $fh, "<", $RUNTIMEFILE 152 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 153 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 154 $RUNTIME = <$fh> + 0.;
147} 155}
148 156
157eval "sub TICK() { $TICK } 1" or die;
158
149mkdir $_ 159mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 160 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 161
152our $EMERGENCY_POSITION; 162our $EMERGENCY_POSITION;
153 163
154sub cf::map::normalise; 164sub cf::map::normalise;
165
166#############################################################################
167
168%REFLECT = ();
169for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect;
172}
155 173
156############################################################################# 174#############################################################################
157 175
158=head2 GLOBAL VARIABLES 176=head2 GLOBAL VARIABLES
159 177
… …
210 228
211This array contains the results of the last C<invoke ()> call. When 229This array contains the results of the last C<invoke ()> call. When
212C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 230C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
213that call. 231that call.
214 232
233=item %cf::REFLECT
234
235Contains, for each (C++) class name, a hash reference with information
236about object members (methods, scalars and arrays) and other metadata,
237which is useful for introspection.
238
215=back 239=back
216 240
217=cut 241=cut
218 242
219BEGIN { 243$Coro::State::WARNHOOK = sub {
220 *CORE::GLOBAL::warn = sub {
221 my $msg = join "", @_; 244 my $msg = join "", @_;
222 245
223 $msg .= "\n" 246 $msg .= "\n"
224 unless $msg =~ /\n$/; 247 unless $msg =~ /\n$/;
225 248
226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 249 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
227 250
228 LOG llevError, $msg; 251 LOG llevError, $msg;
229 }; 252};
230}
231 253
232$Coro::State::DIEHOOK = sub { 254$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 255 return unless $^S eq 0; # "eq", not "=="
256
257 warn Carp::longmess $_[0];
234 258
235 if ($Coro::current == $Coro::main) {#d# 259 if ($Coro::current == $Coro::main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 260 warn "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 261 return;#d#
238 }#d# 262 }#d#
239 263
240 # kill coroutine otherwise 264 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 265 Coro::terminate
243}; 266};
244
245$SIG{__DIE__} = sub { }; #d#?
246 267
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 268@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 269@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 270@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 271@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
1147 $decname, length $$rdata, scalar @$objs; 1168 $decname, length $$rdata, scalar @$objs;
1148 1169
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1170 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1171 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1172 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1173 if ($cf::USE_FSYNC) {
1174 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;
1175 aio_fsync $fh;
1176 }
1153 aio_close $fh; 1177 aio_close $fh;
1154 1178
1155 if (@$objs) { 1179 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1180 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1181 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1182 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1183 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 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;
1186 aio_fsync $fh;
1187 }
1161 aio_close $fh; 1188 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1189 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1190 }
1164 } else { 1191 } else {
1165 aio_unlink "$filename.pst"; 1192 aio_unlink "$filename.pst";
… …
1316 1343
1317# "readahead" all extensions 1344# "readahead" all extensions
1318sub cache_extensions { 1345sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1346 my $grp = IO::AIO::aio_group;
1320 1347
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1348 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1349 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1350 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1351 }
1325 }; 1352 };
1326 1353
… …
2209 2236
2210 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2237 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211 2238
2212 return if $self->players; 2239 return if $self->players;
2213 2240
2214 warn "resetting map ", $self->path; 2241 warn "resetting map ", $self->path, "\n";
2215 2242
2216 $self->in_memory (cf::MAP_SWAPPED); 2243 $self->in_memory (cf::MAP_SWAPPED);
2217 2244
2218 # need to save uniques path 2245 # need to save uniques path
2219 unless ($self->{deny_save}) { 2246 unless ($self->{deny_save}) {
… …
2384 2411
2385our $SAY_CHANNEL = { 2412our $SAY_CHANNEL = {
2386 id => "say", 2413 id => "say",
2387 title => "Map", 2414 title => "Map",
2388 reply => "say ", 2415 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2416 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2390}; 2417};
2391 2418
2392our $CHAT_CHANNEL = { 2419our $CHAT_CHANNEL = {
2393 id => "chat", 2420 id => "chat",
2394 title => "Chat", 2421 title => "Chat",
… …
2520 2547
2521 $map->load; 2548 $map->load;
2522 $map->load_neighbours; 2549 $map->load_neighbours;
2523 2550
2524 return unless $self->contr->active; 2551 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive;
2527 2552
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2553 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2554 $self->enter_map ($map, $x, $y);
2555
2556 # only activate afterwards, to support waiting in hooks
2557 $self->activate_recursive;
2530} 2558}
2531 2559
2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2560=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2533 2561
2534Moves the player to the given map-path and coordinates by first freezing 2562Moves the player to the given map-path and coordinates by first freezing
… …
2769 id => "infobox", 2797 id => "infobox",
2770 title => "Body Parts", 2798 title => "Body Parts",
2771 reply => undef, 2799 reply => undef,
2772 tooltip => "Shows which body parts you posess and are available", 2800 tooltip => "Shows which body parts you posess and are available",
2773 }, 2801 },
2802 "c/statistics" => {
2803 id => "infobox",
2804 title => "Statistics",
2805 reply => undef,
2806 tooltip => "Shows your primary statistics",
2807 },
2774 "c/skills" => { 2808 "c/skills" => {
2775 id => "infobox", 2809 id => "infobox",
2776 title => "Skills", 2810 title => "Skills",
2777 reply => undef, 2811 reply => undef,
2778 tooltip => "Shows your experience per skill and item power", 2812 tooltip => "Shows your experience per skill and item power",
2813 },
2814 "c/shopitems" => {
2815 id => "infobox",
2816 title => "Shop Items",
2817 reply => undef,
2818 tooltip => "Shows the items currently for sale in this shop",
2819 },
2820 "c/resistances" => {
2821 id => "infobox",
2822 title => "Resistances",
2823 reply => undef,
2824 tooltip => "Shows your resistances",
2825 },
2826 "c/pets" => {
2827 id => "infobox",
2828 title => "Pets",
2829 reply => undef,
2830 tooltip => "Shows information abotu your pets/a specific pet",
2831 },
2832 "c/perceiveself" => {
2833 id => "infobox",
2834 title => "Perceive Self",
2835 reply => undef,
2836 tooltip => "You gained detailed knowledge about yourself",
2779 }, 2837 },
2780 "c/uptime" => { 2838 "c/uptime" => {
2781 id => "infobox", 2839 id => "infobox",
2782 title => "Uptime", 2840 title => "Uptime",
2783 reply => undef, 2841 reply => undef,
… …
2793 id => "party", 2851 id => "party",
2794 title => "Party", 2852 title => "Party",
2795 reply => "gsay ", 2853 reply => "gsay ",
2796 tooltip => "Messages and chat related to your party", 2854 tooltip => "Messages and chat related to your party",
2797 }, 2855 },
2856 "c/death" => {
2857 id => "death",
2858 title => "Death",
2859 reply => undef,
2860 tooltip => "Reason for and more info about your most recent death",
2861 },
2798 "c/say" => $SAY_CHANNEL, 2862 "c/say" => $SAY_CHANNEL,
2799 "c/chat" => $CHAT_CHANNEL, 2863 "c/chat" => $CHAT_CHANNEL,
2800); 2864);
2801 2865
2802sub cf::client::send_msg { 2866sub cf::client::send_msg {
… …
3028The following functions and methods are available within a safe environment: 3092The following functions and methods are available within a safe environment:
3029 3093
3030 cf::object 3094 cf::object
3031 contr pay_amount pay_player map x y force_find force_add destroy 3095 contr pay_amount pay_player map x y force_find force_add destroy
3032 insert remove name archname title slaying race decrease split 3096 insert remove name archname title slaying race decrease split
3097 value
3033 3098
3034 cf::object::player 3099 cf::object::player
3035 player 3100 player
3036 3101
3037 cf::player 3102 cf::player
… …
3043=cut 3108=cut
3044 3109
3045for ( 3110for (
3046 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3111 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3047 insert remove inv nrof name archname title slaying race 3112 insert remove inv nrof name archname title slaying race
3048 decrease split destroy change_exp)], 3113 decrease split destroy change_exp value msg lore send_msg)],
3049 ["cf::object::player" => qw(player)], 3114 ["cf::object::player" => qw(player)],
3050 ["cf::player" => qw(peaceful)], 3115 ["cf::player" => qw(peaceful send_msg)],
3051 ["cf::map" => qw(trigger)], 3116 ["cf::map" => qw(trigger)],
3052) { 3117) {
3053 no strict 'refs'; 3118 no strict 'refs';
3054 my ($pkg, @funs) = @$_; 3119 my ($pkg, @funs) = @$_;
3055 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3120 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3072 my ($code, %vars) = @_; 3137 my ($code, %vars) = @_;
3073 3138
3074 my $qcode = $code; 3139 my $qcode = $code;
3075 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3140 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3076 $qcode =~ s/\n/\\n/g; 3141 $qcode =~ s/\n/\\n/g;
3142
3143 %vars = (_dummy => 0) unless %vars;
3077 3144
3078 local $_; 3145 local $_;
3079 local @safe::cf::_safe_eval_args = values %vars; 3146 local @safe::cf::_safe_eval_args = values %vars;
3080 3147
3081 my $eval = 3148 my $eval =
… …
3349 my $pid = <$fh>; 3416 my $pid = <$fh>;
3350 kill 9, $pid if $pid > 0; 3417 kill 9, $pid if $pid > 0;
3351 3418
3352 seek $fh, 0, 0; 3419 seek $fh, 0, 0;
3353 print $fh $$; 3420 print $fh $$;
3421}
3422
3423sub main_loop {
3424 warn "EV::loop starting\n";
3425 if (1) {
3426 EV::loop;
3427 }
3428 warn "EV::loop returned\n";
3429 goto &main_loop unless $REALLY_UNLOOP;
3354} 3430}
3355 3431
3356sub main { 3432sub main {
3357 cf::init_globals; # initialise logging 3433 cf::init_globals; # initialise logging
3358 3434
… …
3398 load_extensions; 3474 load_extensions;
3399 3475
3400 utime time, time, $RUNTIMEFILE; 3476 utime time, time, $RUNTIMEFILE;
3401 3477
3402 # no (long-running) fork's whatsoever before this point(!) 3478 # no (long-running) fork's whatsoever before this point(!)
3479 use POSIX ();
3403 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3480 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3404 3481
3405 (pop @POST_INIT)->(0) while @POST_INIT; 3482 (pop @POST_INIT)->(0) while @POST_INIT;
3406 }; 3483 };
3407 3484
3408 EV::loop; 3485 main_loop;
3409} 3486}
3410 3487
3411############################################################################# 3488#############################################################################
3412# initialisation and cleanup 3489# initialisation and cleanup
3413 3490
… …
3669 clear_package "safe::$_" 3746 clear_package "safe::$_"
3670 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3747 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3671 3748
3672 warn "unloading cf.pm \"a bit\""; 3749 warn "unloading cf.pm \"a bit\"";
3673 delete $INC{"cf.pm"}; 3750 delete $INC{"cf.pm"};
3674 delete $INC{"cf/pod.pm"}; 3751 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3675 3752
3676 # don't, removes xs symbols, too, 3753 # don't, removes xs symbols, too,
3677 # and global variables created in xs 3754 # and global variables created in xs
3678 #clear_package __PACKAGE__; 3755 #clear_package __PACKAGE__;
3679 3756
… …
3896 LOG llevInfo, "[ABT] [suppressed]\n"; 3973 LOG llevInfo, "[ABT] [suppressed]\n";
3897 } 3974 }
3898} 3975}
3899 3976
3900# load additional modules 3977# load additional modules
3901use cf::pod; 3978require "cf/$_.pm" for @EXTRA_MODULES;
3902 3979
3903END { cf::emergency_save } 3980END { cf::emergency_save }
3904 3981
39051 39821
3906 3983

Diff Legend

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