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.453 by root, Tue Sep 23 04:29:11 2008 UTC vs.
Revision 1.477 by root, Wed Sep 2 22:52:36 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 ();
… …
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 72
71# make sure c-lzf reinitialises itself 73# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::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
77# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
74 79
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
76 81
77our %COMMAND = (); 82our %COMMAND = ();
78our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
… …
103our %RESOURCE; 108our %RESOURCE;
104 109
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 112our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 113our $USE_FSYNC = 1; # use fsync to write maps - default on
109 114
110our $BDB_DEADLOCK_WATCHER; 115our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 116our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 117our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 118our $DB_ENV;
114 119
120our @EXTRA_MODULES = qw(pod mapscript);
121
115our %CFG; 122our %CFG;
116 123
117our $UPTIME; $UPTIME ||= time; 124our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 125our $RUNTIME;
119our $NOW; 126our $NOW;
… …
129our $LOADAVG; # same thing, but with alpha-smoothing 136our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 137our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 138our $TICK_START; # for load detecting purposes
132 139
133our @POST_INIT; 140our @POST_INIT;
141
142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :)
134 144
135binmode STDOUT; 145binmode STDOUT;
136binmode STDERR; 146binmode STDERR;
137 147
138# read virtual server time, if available 148# read virtual server time, if available
… …
140 open my $fh, "<", $RUNTIMEFILE 150 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 151 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 152 $RUNTIME = <$fh> + 0.;
143} 153}
144 154
155eval "sub TICK() { $TICK } 1" or die;
156
145mkdir $_ 157mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 158 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 159
148our $EMERGENCY_POSITION; 160our $EMERGENCY_POSITION;
149 161
… …
210 222
211=back 223=back
212 224
213=cut 225=cut
214 226
215BEGIN { 227$Coro::State::WARNHOOK = sub {
216 *CORE::GLOBAL::warn = sub {
217 my $msg = join "", @_; 228 my $msg = join "", @_;
218 229
219 $msg .= "\n" 230 $msg .= "\n"
220 unless $msg =~ /\n$/; 231 unless $msg =~ /\n$/;
221 232
222 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 233 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
223 234
224 LOG llevError, $msg; 235 LOG llevError, $msg;
225 }; 236};
226}
227 237
228$Coro::State::DIEHOOK = sub { 238$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 239 return unless $^S eq 0; # "eq", not "=="
240
241 warn Carp::longmess $_[0];
230 242
231 if ($Coro::current == $Coro::main) {#d# 243 if ($Coro::current == $Coro::main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 244 warn "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 245 return;#d#
234 }#d# 246 }#d#
235 247
236 # kill coroutine otherwise 248 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 249 Coro::terminate
239}; 250};
240
241$SIG{__DIE__} = sub { }; #d#?
242 251
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 252@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 253@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 254@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 255@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
328Wait until the given lock is available. See cf::lock_acquire. 337Wait until the given lock is available. See cf::lock_acquire.
329 338
330=item my $lock = cf::lock_acquire $string 339=item my $lock = cf::lock_acquire $string
331 340
332Wait until the given lock is available and then acquires it and returns 341Wait until the given lock is available and then acquires it and returns
333a Coro::guard object. If the guard object gets destroyed (goes out of scope, 342a L<Guard> object. If the guard object gets destroyed (goes out of scope,
334for example when the coroutine gets canceled), the lock is automatically 343for example when the coroutine gets canceled), the lock is automatically
335returned. 344returned.
336 345
337Locks are *not* recursive, locking from the same coro twice results in a 346Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro. 347deadlocked coro.
… …
344 353
345Return true if the lock is currently active, i.e. somebody has locked it. 354Return true if the lock is currently active, i.e. somebody has locked it.
346 355
347=cut 356=cut
348 357
349our %LOCK; 358our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 359
352sub lock_wait($) { 360sub lock_wait($) {
353 my ($key) = @_; 361 $LOCKS->wait ($_[0]);
354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
360 # wait for lock, if any
361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363 push @{ $LOCK{$key} }, $Coro::current;
364 Coro::schedule;
365 }
366} 362}
367 363
368sub lock_acquire($) { 364sub lock_acquire($) {
369 my ($key) = @_; 365 $LOCKS->guard ($_[0])
370
371 # wait, to be sure we are not locked
372 lock_wait $key;
373
374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
376
377 Coro::guard {
378 delete $LOCKER{$key};#d#
379 # wake up all waiters, to be on the safe side
380 $_->ready for @{ delete $LOCK{$key} };
381 }
382} 366}
383 367
384sub lock_active($) { 368sub lock_active($) {
385 my ($key) = @_; 369 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 370}
389 371
390sub freeze_mainloop { 372sub freeze_mainloop {
391 tick_inhibit_inc; 373 tick_inhibit_inc;
392 374
393 Coro::guard \&tick_inhibit_dec; 375 &Guard::guard (\&tick_inhibit_dec);
394} 376}
395 377
396=item cf::periodic $interval, $cb 378=item cf::periodic $interval, $cb
397 379
398Like EV::periodic, but randomly selects a starting point so that the actions 380Like EV::periodic, but randomly selects a starting point so that the actions
… …
1170 $decname, length $$rdata, scalar @$objs; 1152 $decname, length $$rdata, scalar @$objs;
1171 1153
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1154 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1155 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1156 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 aio_fsync $fh if $cf::USE_FSYNC; 1157 if ($cf::USE_FSYNC) {
1158 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;
1159 aio_fsync $fh;
1160 }
1176 aio_close $fh; 1161 aio_close $fh;
1177 1162
1178 if (@$objs) { 1163 if (@$objs) {
1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1164 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1180 aio_chmod $fh, SAVE_MODE; 1165 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1166 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1167 aio_write $fh, 0, (length $data), $data, 0;
1183 aio_fsync $fh if $cf::USE_FSYNC; 1168 if ($cf::USE_FSYNC) {
1169 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;
1170 aio_fsync $fh;
1171 }
1184 aio_close $fh; 1172 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1173 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1174 }
1187 } else { 1175 } else {
1188 aio_unlink "$filename.pst"; 1176 aio_unlink "$filename.pst";
1189 } 1177 }
1190 1178
1191 aio_rename "$filename~", $filename; 1179 aio_rename "$filename~", $filename;
1180
1181 $filename =~ s%/[^/]+$%%;
1182 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1183 } else {
1193 warn "FATAL: $filename~: $!\n"; 1184 warn "unable to save objects: $filename~: $!\n";
1194 } 1185 }
1195 } else { 1186 } else {
1196 aio_unlink $filename; 1187 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
1198 } 1189 }
… …
1289 my ($name, $cb) = @_; 1280 my ($name, $cb) = @_;
1290 1281
1291 $EXTICMD{$name} = $cb; 1282 $EXTICMD{$name} = $cb;
1292} 1283}
1293 1284
1285use File::Glob ();
1286
1294cf::player->attach ( 1287cf::player->attach (
1295 on_command => sub { 1288 on_command => sub {
1296 my ($pl, $name, $params) = @_; 1289 my ($pl, $name, $params) = @_;
1297 1290
1298 my $cb = $COMMAND{$name} 1291 my $cb = $COMMAND{$name}
… …
1329 } 1322 }
1330 1323
1331 cf::override; 1324 cf::override;
1332 }, 1325 },
1333); 1326);
1327
1328# "readahead" all extensions
1329sub cache_extensions {
1330 my $grp = IO::AIO::aio_group;
1331
1332 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1333 for (grep /\.ext$/, @{$_[0]}) {
1334 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1335 }
1336 };
1337
1338 $grp
1339}
1334 1340
1335sub load_extensions { 1341sub load_extensions {
1336 cf::sync_job { 1342 cf::sync_job {
1337 my %todo; 1343 my %todo;
1338 1344
… …
1867 1873
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1874 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1875 "$UNIQUEDIR/$path"
1870} 1876}
1871 1877
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879}
1880
1881sub decay_objects { 1878sub decay_objects {
1882 my ($self) = @_; 1879 my ($self) = @_;
1883 1880
1884 return if $self->{deny_reset}; 1881 return if $self->{deny_reset};
1885 1882
… …
1967sub find { 1964sub find {
1968 my ($path, $origin) = @_; 1965 my ($path, $origin) = @_;
1969 1966
1970 $path = normalise $path, $origin && $origin->path; 1967 $path = normalise $path, $origin && $origin->path;
1971 1968
1972 cf::lock_wait "map_data:$path";#d#remove 1969 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 1970 my $guard2 = cf::lock_acquire "map_find:$path";
1974 1971
1975 $cf::MAP{$path} || do { 1972 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1979 my $map = new_from_path cf::map $path 1973 my $map = new_from_path cf::map $path
1980 or return; 1974 or return;
1981 1975
1982 $map->{last_save} = $cf::RUNTIME; 1976 $map->{last_save} = $cf::RUNTIME;
1983 1977
… …
2050 2044
2051 unless ($self->{deny_activate}) { 2045 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2046 $self->decay_objects;
2053 $self->fix_auto_apply; 2047 $self->fix_auto_apply;
2054 $self->update_buttons; 2048 $self->update_buttons;
2055 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick; 2049 cf::cede_to_tick;
2058 $self->activate; 2050 $self->activate;
2059 } 2051 }
2060 2052
2061 $self->{last_save} = $cf::RUNTIME; 2053 $self->{last_save} = $cf::RUNTIME;
… …
2403 2395
2404our $SAY_CHANNEL = { 2396our $SAY_CHANNEL = {
2405 id => "say", 2397 id => "say",
2406 title => "Map", 2398 title => "Map",
2407 reply => "say ", 2399 reply => "say ",
2408 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2400 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2409}; 2401};
2410 2402
2411our $CHAT_CHANNEL = { 2403our $CHAT_CHANNEL = {
2412 id => "chat", 2404 id => "chat",
2413 title => "Chat", 2405 title => "Chat",
… …
2539 2531
2540 $map->load; 2532 $map->load;
2541 $map->load_neighbours; 2533 $map->load_neighbours;
2542 2534
2543 return unless $self->contr->active; 2535 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2536
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2537 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $self->enter_map ($map, $x, $y); 2538 $self->enter_map ($map, $x, $y);
2539
2540 # only activate afterwards, to support waiting in hooks
2541 $self->activate_recursive;
2549} 2542}
2550 2543
2551=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2544=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2552 2545
2553Moves the player to the given map-path and coordinates by first freezing 2546Moves the player to the given map-path and coordinates by first freezing
… …
2788 id => "infobox", 2781 id => "infobox",
2789 title => "Body Parts", 2782 title => "Body Parts",
2790 reply => undef, 2783 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 2784 tooltip => "Shows which body parts you posess and are available",
2792 }, 2785 },
2786 "c/statistics" => {
2787 id => "infobox",
2788 title => "Statistics",
2789 reply => undef,
2790 tooltip => "Shows your primary statistics",
2791 },
2793 "c/skills" => { 2792 "c/skills" => {
2794 id => "infobox", 2793 id => "infobox",
2795 title => "Skills", 2794 title => "Skills",
2796 reply => undef, 2795 reply => undef,
2797 tooltip => "Shows your experience per skill and item power", 2796 tooltip => "Shows your experience per skill and item power",
2797 },
2798 "c/shopitems" => {
2799 id => "infobox",
2800 title => "Shop Items",
2801 reply => undef,
2802 tooltip => "Shows the items currently for sale in this shop",
2803 },
2804 "c/resistances" => {
2805 id => "infobox",
2806 title => "Resistances",
2807 reply => undef,
2808 tooltip => "Shows your resistances",
2809 },
2810 "c/pets" => {
2811 id => "infobox",
2812 title => "Pets",
2813 reply => undef,
2814 tooltip => "Shows information abotu your pets/a specific pet",
2815 },
2816 "c/perceiveself" => {
2817 id => "infobox",
2818 title => "Perceive Self",
2819 reply => undef,
2820 tooltip => "You gained detailed knowledge about yourself",
2798 }, 2821 },
2799 "c/uptime" => { 2822 "c/uptime" => {
2800 id => "infobox", 2823 id => "infobox",
2801 title => "Uptime", 2824 title => "Uptime",
2802 reply => undef, 2825 reply => undef,
… …
2812 id => "party", 2835 id => "party",
2813 title => "Party", 2836 title => "Party",
2814 reply => "gsay ", 2837 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 2838 tooltip => "Messages and chat related to your party",
2816 }, 2839 },
2840 "c/death" => {
2841 id => "death",
2842 title => "Death",
2843 reply => undef,
2844 tooltip => "Reason for and more info about your most recent death",
2845 },
2846 "c/say" => $SAY_CHANNEL,
2847 "c/chat" => $CHAT_CHANNEL,
2817); 2848);
2818 2849
2819sub cf::client::send_msg { 2850sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 2851 my ($self, $channel, $msg, $color, @extra) = @_;
2821 2852
… …
2826 2857
2827 # check predefined channels, for the benefit of C 2858 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 2859 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 2860 $channel = $CHANNEL{$channel};
2830 2861
2831 $self->ext_msg (channel_info => $channel) 2862 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 2863 $channel = $channel->{id};
2835 2864
2836 } elsif (ref $channel) { 2865 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 2866 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 2867 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 2868 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 2869 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 2870 }
2843 2871
2844 $channel = $channel->{id}; 2872 $channel = $channel->{id};
2845 } 2873 }
2846 2874
2847 return unless @extra || length $msg; 2875 return unless @extra || length $msg;
2848 2876
2849 if ($self->can_msg) {
2850 # default colour, mask it out 2877 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2878 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 2879 if $color & cf::NDI_DEF;
2853 2880
2854 my $pkt = "msg " 2881 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 2882 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2883 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 2884 );
2858 2885
2859 # try lzf for large packets 2886 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt 2887 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf}; 2888 if 1024 <= length $pkt and $self->{can_lzf};
2862 2889
2863 # split very large packets 2890 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) { 2891 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2892 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag"; 2893 $pkt = "frag";
2867 } 2894 }
2868 2895
2869 $self->send_packet ($pkt); 2896 $self->send_packet ($pkt);
2870 } else {
2871 if ($color >= 0) {
2872 # replace some tags by gcfclient-compatible ones
2873 for ($msg) {
2874 1 while
2875 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880 }
2881
2882 $color &= cf::NDI_COLOR_MASK;
2883
2884 utf8::encode $msg;
2885
2886 if (0 && $msg =~ /\[/) {
2887 # COMMAND/INFO
2888 $self->send_packet ("drawextinfo $color 10 8 $msg")
2889 } else {
2890 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2891 $self->send_packet ("drawinfo $color $msg")
2892 }
2893 }
2894 }
2895} 2897}
2896 2898
2897=item $client->ext_msg ($type, @msg) 2899=item $client->ext_msg ($type, @msg)
2898 2900
2899Sends an ext event to the client. 2901Sends an ext event to the client.
… …
3074The following functions and methods are available within a safe environment: 3076The following functions and methods are available within a safe environment:
3075 3077
3076 cf::object 3078 cf::object
3077 contr pay_amount pay_player map x y force_find force_add destroy 3079 contr pay_amount pay_player map x y force_find force_add destroy
3078 insert remove name archname title slaying race decrease split 3080 insert remove name archname title slaying race decrease split
3081 value
3079 3082
3080 cf::object::player 3083 cf::object::player
3081 player 3084 player
3082 3085
3083 cf::player 3086 cf::player
… …
3089=cut 3092=cut
3090 3093
3091for ( 3094for (
3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3095 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3093 insert remove inv nrof name archname title slaying race 3096 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3097 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3098 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3099 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3100 ["cf::map" => qw(trigger)],
3098) { 3101) {
3099 no strict 'refs'; 3102 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3103 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3118 my ($code, %vars) = @_; 3121 my ($code, %vars) = @_;
3119 3122
3120 my $qcode = $code; 3123 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3125 $qcode =~ s/\n/\\n/g;
3126
3127 %vars = (_dummy => 0) unless %vars;
3123 3128
3124 local $_; 3129 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars; 3130 local @safe::cf::_safe_eval_args = values %vars;
3126 3131
3127 my $eval = 3132 my $eval =
… …
3397 3402
3398 seek $fh, 0, 0; 3403 seek $fh, 0, 0;
3399 print $fh $$; 3404 print $fh $$;
3400} 3405}
3401 3406
3407sub main_loop {
3408 warn "EV::loop starting\n";
3409 if (1) {
3410 EV::loop;
3411 }
3412 warn "EV::loop returned\n";
3413 goto &main_loop unless $REALLY_UNLOOP;
3414}
3415
3402sub main { 3416sub main {
3403 cf::init_globals; # initialise logging 3417 cf::init_globals; # initialise logging
3404 3418
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3419 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3420 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
… …
3409 3423
3410 cf::init_experience; 3424 cf::init_experience;
3411 cf::init_anim; 3425 cf::init_anim;
3412 cf::init_attackmess; 3426 cf::init_attackmess;
3413 cf::init_dynamic; 3427 cf::init_dynamic;
3414 cf::init_block;
3415 3428
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3429 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3430
3418 # we must not ever block the main coroutine 3431 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3432 local $Coro::idle = sub {
… …
3445 load_extensions; 3458 load_extensions;
3446 3459
3447 utime time, time, $RUNTIMEFILE; 3460 utime time, time, $RUNTIMEFILE;
3448 3461
3449 # no (long-running) fork's whatsoever before this point(!) 3462 # no (long-running) fork's whatsoever before this point(!)
3463 use POSIX ();
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3464 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451 3465
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3466 (pop @POST_INIT)->(0) while @POST_INIT;
3453 }; 3467 };
3454 3468
3455 EV::loop; 3469 main_loop;
3456} 3470}
3457 3471
3458############################################################################# 3472#############################################################################
3459# initialisation and cleanup 3473# initialisation and cleanup
3460 3474
… …
3516 my $uuid = "$LOCALDIR/uuid"; 3530 my $uuid = "$LOCALDIR/uuid";
3517 3531
3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3532 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519 or return; 3533 or return;
3520 3534
3521 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3535 my $value = uuid_seq uuid_cur;
3536
3537 unless ($value) {
3538 warn "cowardly refusing to write zero uuid value!\n";
3539 return;
3540 }
3541
3542 my $value = uuid_str $value + $uuid_skip;
3522 $uuid_skip = 0; 3543 $uuid_skip = 0;
3523 3544
3524 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3545 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3525 and return; 3546 and return;
3526 3547
… …
3548} 3569}
3549 3570
3550sub emergency_save() { 3571sub emergency_save() {
3551 my $freeze_guard = cf::freeze_mainloop; 3572 my $freeze_guard = cf::freeze_mainloop;
3552 3573
3553 warn "enter emergency perl save\n"; 3574 warn "emergency_perl_save: enter\n";
3554 3575
3555 cf::sync_job { 3576 cf::sync_job {
3577 # this is a trade-off: we want to be very quick here, so
3578 # save all maps without fsync, and later call a global sync
3579 # (which in turn might be very very slow)
3580 local $USE_FSYNC = 0;
3581
3556 # use a peculiar iteration method to avoid tripping on perl 3582 # use a peculiar iteration method to avoid tripping on perl
3557 # refcount bugs in for. also avoids problems with players 3583 # refcount bugs in for. also avoids problems with players
3558 # and maps saved/destroyed asynchronously. 3584 # and maps saved/destroyed asynchronously.
3559 warn "begin emergency player save\n"; 3585 warn "emergency_perl_save: begin player save\n";
3560 for my $login (keys %cf::PLAYER) { 3586 for my $login (keys %cf::PLAYER) {
3561 my $pl = $cf::PLAYER{$login} or next; 3587 my $pl = $cf::PLAYER{$login} or next;
3562 $pl->valid or next; 3588 $pl->valid or next;
3563 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3589 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3564 $pl->save; 3590 $pl->save;
3565 } 3591 }
3566 warn "end emergency player save\n"; 3592 warn "emergency_perl_save: end player save\n";
3567 3593
3568 warn "begin emergency map save\n"; 3594 warn "emergency_perl_save: begin map save\n";
3569 for my $path (keys %cf::MAP) { 3595 for my $path (keys %cf::MAP) {
3570 my $map = $cf::MAP{$path} or next; 3596 my $map = $cf::MAP{$path} or next;
3571 $map->valid or next; 3597 $map->valid or next;
3572 $map->save; 3598 $map->save;
3573 } 3599 }
3574 warn "end emergency map save\n"; 3600 warn "emergency_perl_save: end map save\n";
3575 3601
3576 warn "begin emergency database checkpoint\n"; 3602 warn "emergency_perl_save: begin database checkpoint\n";
3577 BDB::db_env_txn_checkpoint $DB_ENV; 3603 BDB::db_env_txn_checkpoint $DB_ENV;
3578 warn "end emergency database checkpoint\n"; 3604 warn "emergency_perl_save: end database checkpoint\n";
3579 3605
3580 warn "begin write uuid\n"; 3606 warn "emergency_perl_save: begin write uuid\n";
3581 write_uuid_sync 1; 3607 write_uuid_sync 1;
3582 warn "end write uuid\n"; 3608 warn "emergency_perl_save: end write uuid\n";
3583 }; 3609 };
3584 3610
3611 warn "emergency_perl_save: starting sync()\n";
3612 IO::AIO::aio_sync sub {
3613 warn "emergency_perl_save: finished sync()\n";
3614 };
3615
3585 warn "leave emergency perl save\n"; 3616 warn "emergency_perl_save: leave\n";
3586} 3617}
3587 3618
3588sub post_cleanup { 3619sub post_cleanup {
3589 my ($make_core) = @_; 3620 my ($make_core) = @_;
3590 3621
… …
3627 warn "can only reload from main coroutine"; 3658 warn "can only reload from main coroutine";
3628 return; 3659 return;
3629 } 3660 }
3630 3661
3631 return if $RELOAD++; 3662 return if $RELOAD++;
3663
3664 my $t1 = EV::time;
3632 3665
3633 while ($RELOAD) { 3666 while ($RELOAD) {
3634 warn "reloading..."; 3667 warn "reloading...";
3635 3668
3636 warn "entering sync_job"; 3669 warn "entering sync_job";
… …
3697 clear_package "safe::$_" 3730 clear_package "safe::$_"
3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3731 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3699 3732
3700 warn "unloading cf.pm \"a bit\""; 3733 warn "unloading cf.pm \"a bit\"";
3701 delete $INC{"cf.pm"}; 3734 delete $INC{"cf.pm"};
3702 delete $INC{"cf/pod.pm"}; 3735 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3703 3736
3704 # don't, removes xs symbols, too, 3737 # don't, removes xs symbols, too,
3705 # and global variables created in xs 3738 # and global variables created in xs
3706 #clear_package __PACKAGE__; 3739 #clear_package __PACKAGE__;
3707 3740
… …
3715 cf::reload_config; 3748 cf::reload_config;
3716 3749
3717 warn "loading extensions"; 3750 warn "loading extensions";
3718 cf::load_extensions; 3751 cf::load_extensions;
3719 3752
3753 if ($REATTACH_ON_RELOAD) {
3720 warn "reattaching attachments to objects/players"; 3754 warn "reattaching attachments to objects/players";
3721 _global_reattach; # objects, sockets 3755 _global_reattach; # objects, sockets
3722 warn "reattaching attachments to maps"; 3756 warn "reattaching attachments to maps";
3723 reattach $_ for values %MAP; 3757 reattach $_ for values %MAP;
3724 warn "reattaching attachments to players"; 3758 warn "reattaching attachments to players";
3725 reattach $_ for values %PLAYER; 3759 reattach $_ for values %PLAYER;
3760 }
3726 3761
3727 warn "running post_load"; 3762 warn "running post_init jobs";
3728 (pop @POST_INIT)->(1) while @POST_INIT; 3763 (pop @POST_INIT)->(1) while @POST_INIT;
3729 3764
3730 warn "leaving sync_job"; 3765 warn "leaving sync_job";
3731 3766
3732 1 3767 1
… …
3736 }; 3771 };
3737 3772
3738 warn "reloaded"; 3773 warn "reloaded";
3739 --$RELOAD; 3774 --$RELOAD;
3740 } 3775 }
3776
3777 $t1 = EV::time - $t1;
3778 warn "reload completed in ${t1}s\n";
3741}; 3779};
3742 3780
3743our $RELOAD_WATCHER; # used only during reload 3781our $RELOAD_WATCHER; # used only during reload
3744 3782
3745sub reload_perl() { 3783sub reload_perl() {
3746 # doing reload synchronously and two reloads happen back-to-back, 3784 # doing reload synchronously and two reloads happen back-to-back,
3747 # coro crashes during coro_state_free->destroy here. 3785 # coro crashes during coro_state_free->destroy here.
3748 3786
3787 $RELOAD_WATCHER ||= cf::async {
3788 Coro::AIO::aio_wait cache_extensions;
3789
3749 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3790 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3750 do_reload_perl; 3791 do_reload_perl;
3751 undef $RELOAD_WATCHER; 3792 undef $RELOAD_WATCHER;
3793 };
3752 }; 3794 };
3753} 3795}
3754 3796
3755register_command "reload" => sub { 3797register_command "reload" => sub {
3756 my ($who, $arg) = @_; 3798 my ($who, $arg) = @_;
… …
3915 LOG llevInfo, "[ABT] [suppressed]\n"; 3957 LOG llevInfo, "[ABT] [suppressed]\n";
3916 } 3958 }
3917} 3959}
3918 3960
3919# load additional modules 3961# load additional modules
3920use cf::pod; 3962require "cf/$_.pm" for @EXTRA_MODULES;
3921 3963
3922END { cf::emergency_save } 3964END { cf::emergency_save }
3923 3965
39241 39661
3925 3967

Diff Legend

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