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.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;
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 ();
… …
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
74 76
77# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
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 = ();
79 84
… …
83our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
85 90
86our $RELOAD; # number of reloads so far, non-zero while in reload 91our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 92our @EVENT;
93our @REFLECT; # set by XS
94our %REFLECT; # set by us
88 95
89our $CONFDIR = confdir; 96our $CONFDIR = confdir;
90our $DATADIR = datadir; 97our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 98our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 99our $PODDIR = "$DATADIR/pod";
… …
103our %RESOURCE; 110our %RESOURCE;
104 111
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 114our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 115our $USE_FSYNC = 1; # use fsync to write maps - default on
109 116
110our $BDB_DEADLOCK_WATCHER; 117our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 118our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 119our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 120our $DB_ENV;
114 121
122our @EXTRA_MODULES = qw(pod mapscript);
123
115our %CFG; 124our %CFG;
116 125
117our $UPTIME; $UPTIME ||= time; 126our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 127our $RUNTIME;
119our $NOW; 128our $NOW;
… …
129our $LOADAVG; # same thing, but with alpha-smoothing 138our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 139our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 140our $TICK_START; # for load detecting purposes
132 141
133our @POST_INIT; 142our @POST_INIT;
143
144our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
145our $REALLY_UNLOOP; # never set to true, please :)
134 146
135binmode STDOUT; 147binmode STDOUT;
136binmode STDERR; 148binmode STDERR;
137 149
138# read virtual server time, if available 150# read virtual server time, if available
… …
140 open my $fh, "<", $RUNTIMEFILE 152 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 153 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 154 $RUNTIME = <$fh> + 0.;
143} 155}
144 156
157eval "sub TICK() { $TICK } 1" or die;
158
145mkdir $_ 159mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 160 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 161
148our $EMERGENCY_POSITION; 162our $EMERGENCY_POSITION;
149 163
150sub 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}
151 173
152############################################################################# 174#############################################################################
153 175
154=head2 GLOBAL VARIABLES 176=head2 GLOBAL VARIABLES
155 177
… …
206 228
207This array contains the results of the last C<invoke ()> call. When 229This array contains the results of the last C<invoke ()> call. When
208C<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
209that call. 231that call.
210 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
211=back 239=back
212 240
213=cut 241=cut
214 242
215BEGIN { 243$Coro::State::WARNHOOK = sub {
216 *CORE::GLOBAL::warn = sub {
217 my $msg = join "", @_; 244 my $msg = join "", @_;
218 245
219 $msg .= "\n" 246 $msg .= "\n"
220 unless $msg =~ /\n$/; 247 unless $msg =~ /\n$/;
221 248
222 $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;
223 250
224 LOG llevError, $msg; 251 LOG llevError, $msg;
225 }; 252};
226}
227 253
228$Coro::State::DIEHOOK = sub { 254$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 255 return unless $^S eq 0; # "eq", not "=="
256
257 warn Carp::longmess $_[0];
230 258
231 if ($Coro::current == $Coro::main) {#d# 259 if ($Coro::current == $Coro::main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 260 warn "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 261 return;#d#
234 }#d# 262 }#d#
235 263
236 # kill coroutine otherwise 264 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 265 Coro::terminate
239}; 266};
240
241$SIG{__DIE__} = sub { }; #d#?
242 267
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 268@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 269@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 270@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 271@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
328Wait until the given lock is available. See cf::lock_acquire. 353Wait until the given lock is available. See cf::lock_acquire.
329 354
330=item my $lock = cf::lock_acquire $string 355=item my $lock = cf::lock_acquire $string
331 356
332Wait until the given lock is available and then acquires it and returns 357Wait 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, 358a L<Guard> object. If the guard object gets destroyed (goes out of scope,
334for example when the coroutine gets canceled), the lock is automatically 359for example when the coroutine gets canceled), the lock is automatically
335returned. 360returned.
336 361
337Locks are *not* recursive, locking from the same coro twice results in a 362Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro. 363deadlocked coro.
… …
344 369
345Return true if the lock is currently active, i.e. somebody has locked it. 370Return true if the lock is currently active, i.e. somebody has locked it.
346 371
347=cut 372=cut
348 373
349our %LOCK; 374our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 375
352sub lock_wait($) { 376sub lock_wait($) {
353 my ($key) = @_; 377 $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} 378}
367 379
368sub lock_acquire($) { 380sub lock_acquire($) {
369 my ($key) = @_; 381 $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} 382}
383 383
384sub lock_active($) { 384sub lock_active($) {
385 my ($key) = @_; 385 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 386}
389 387
390sub freeze_mainloop { 388sub freeze_mainloop {
391 tick_inhibit_inc; 389 tick_inhibit_inc;
392 390
393 Coro::guard \&tick_inhibit_dec; 391 &Guard::guard (\&tick_inhibit_dec);
394} 392}
395 393
396=item cf::periodic $interval, $cb 394=item cf::periodic $interval, $cb
397 395
398Like EV::periodic, but randomly selects a starting point so that the actions 396Like EV::periodic, but randomly selects a starting point so that the actions
… …
1170 $decname, length $$rdata, scalar @$objs; 1168 $decname, length $$rdata, scalar @$objs;
1171 1169
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1170 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1171 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1172 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 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 }
1176 aio_close $fh; 1177 aio_close $fh;
1177 1178
1178 if (@$objs) { 1179 if (@$objs) {
1179 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) {
1180 aio_chmod $fh, SAVE_MODE; 1181 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1182 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1183 aio_write $fh, 0, (length $data), $data, 0;
1183 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 }
1184 aio_close $fh; 1188 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1189 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1190 }
1187 } else { 1191 } else {
1188 aio_unlink "$filename.pst"; 1192 aio_unlink "$filename.pst";
1189 } 1193 }
1190 1194
1191 aio_rename "$filename~", $filename; 1195 aio_rename "$filename~", $filename;
1196
1197 $filename =~ s%/[^/]+$%%;
1198 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1199 } else {
1193 warn "FATAL: $filename~: $!\n"; 1200 warn "unable to save objects: $filename~: $!\n";
1194 } 1201 }
1195 } else { 1202 } else {
1196 aio_unlink $filename; 1203 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1204 aio_unlink "$filename.pst";
1198 } 1205 }
… …
1289 my ($name, $cb) = @_; 1296 my ($name, $cb) = @_;
1290 1297
1291 $EXTICMD{$name} = $cb; 1298 $EXTICMD{$name} = $cb;
1292} 1299}
1293 1300
1301use File::Glob ();
1302
1294cf::player->attach ( 1303cf::player->attach (
1295 on_command => sub { 1304 on_command => sub {
1296 my ($pl, $name, $params) = @_; 1305 my ($pl, $name, $params) = @_;
1297 1306
1298 my $cb = $COMMAND{$name} 1307 my $cb = $COMMAND{$name}
… …
1329 } 1338 }
1330 1339
1331 cf::override; 1340 cf::override;
1332 }, 1341 },
1333); 1342);
1343
1344# "readahead" all extensions
1345sub cache_extensions {
1346 my $grp = IO::AIO::aio_group;
1347
1348 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1349 for (grep /\.ext$/, @{$_[0]}) {
1350 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1351 }
1352 };
1353
1354 $grp
1355}
1334 1356
1335sub load_extensions { 1357sub load_extensions {
1336 cf::sync_job { 1358 cf::sync_job {
1337 my %todo; 1359 my %todo;
1338 1360
… …
1867 1889
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1890 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1891 "$UNIQUEDIR/$path"
1870} 1892}
1871 1893
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 { 1894sub decay_objects {
1882 my ($self) = @_; 1895 my ($self) = @_;
1883 1896
1884 return if $self->{deny_reset}; 1897 return if $self->{deny_reset};
1885 1898
… …
1967sub find { 1980sub find {
1968 my ($path, $origin) = @_; 1981 my ($path, $origin) = @_;
1969 1982
1970 $path = normalise $path, $origin && $origin->path; 1983 $path = normalise $path, $origin && $origin->path;
1971 1984
1972 cf::lock_wait "map_data:$path";#d#remove 1985 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 1986 my $guard2 = cf::lock_acquire "map_find:$path";
1974 1987
1975 $cf::MAP{$path} || do { 1988 $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 1989 my $map = new_from_path cf::map $path
1980 or return; 1990 or return;
1981 1991
1982 $map->{last_save} = $cf::RUNTIME; 1992 $map->{last_save} = $cf::RUNTIME;
1983 1993
… …
2051 unless ($self->{deny_activate}) { 2061 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2062 $self->decay_objects;
2053 $self->fix_auto_apply; 2063 $self->fix_auto_apply;
2054 $self->update_buttons; 2064 $self->update_buttons;
2055 cf::cede_to_tick; 2065 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2066 $self->activate;
2059 } 2067 }
2060 2068
2061 $self->{last_save} = $cf::RUNTIME; 2069 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2070 $self->last_access ($cf::RUNTIME);
… …
2228 2236
2229 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2237 my $lock = cf::lock_acquire "map_data:$self->{path}";
2230 2238
2231 return if $self->players; 2239 return if $self->players;
2232 2240
2233 warn "resetting map ", $self->path; 2241 warn "resetting map ", $self->path, "\n";
2234 2242
2235 $self->in_memory (cf::MAP_SWAPPED); 2243 $self->in_memory (cf::MAP_SWAPPED);
2236 2244
2237 # need to save uniques path 2245 # need to save uniques path
2238 unless ($self->{deny_save}) { 2246 unless ($self->{deny_save}) {
… …
2403 2411
2404our $SAY_CHANNEL = { 2412our $SAY_CHANNEL = {
2405 id => "say", 2413 id => "say",
2406 title => "Map", 2414 title => "Map",
2407 reply => "say ", 2415 reply => "say ",
2408 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.",
2409}; 2417};
2410 2418
2411our $CHAT_CHANNEL = { 2419our $CHAT_CHANNEL = {
2412 id => "chat", 2420 id => "chat",
2413 title => "Chat", 2421 title => "Chat",
… …
2539 2547
2540 $map->load; 2548 $map->load;
2541 $map->load_neighbours; 2549 $map->load_neighbours;
2542 2550
2543 return unless $self->contr->active; 2551 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2552
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2553 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $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;
2549} 2558}
2550 2559
2551=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2560=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2552 2561
2553Moves 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
… …
2788 id => "infobox", 2797 id => "infobox",
2789 title => "Body Parts", 2798 title => "Body Parts",
2790 reply => undef, 2799 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 2800 tooltip => "Shows which body parts you posess and are available",
2792 }, 2801 },
2802 "c/statistics" => {
2803 id => "infobox",
2804 title => "Statistics",
2805 reply => undef,
2806 tooltip => "Shows your primary statistics",
2807 },
2793 "c/skills" => { 2808 "c/skills" => {
2794 id => "infobox", 2809 id => "infobox",
2795 title => "Skills", 2810 title => "Skills",
2796 reply => undef, 2811 reply => undef,
2797 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",
2798 }, 2837 },
2799 "c/uptime" => { 2838 "c/uptime" => {
2800 id => "infobox", 2839 id => "infobox",
2801 title => "Uptime", 2840 title => "Uptime",
2802 reply => undef, 2841 reply => undef,
… …
2812 id => "party", 2851 id => "party",
2813 title => "Party", 2852 title => "Party",
2814 reply => "gsay ", 2853 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 2854 tooltip => "Messages and chat related to your party",
2816 }, 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 },
2862 "c/say" => $SAY_CHANNEL,
2863 "c/chat" => $CHAT_CHANNEL,
2817); 2864);
2818 2865
2819sub cf::client::send_msg { 2866sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 2867 my ($self, $channel, $msg, $color, @extra) = @_;
2821 2868
… …
2826 2873
2827 # check predefined channels, for the benefit of C 2874 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 2875 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 2876 $channel = $CHANNEL{$channel};
2830 2877
2831 $self->ext_msg (channel_info => $channel) 2878 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 2879 $channel = $channel->{id};
2835 2880
2836 } elsif (ref $channel) { 2881 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 2882 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 2883 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 2884 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 2885 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 2886 }
2843 2887
2844 $channel = $channel->{id}; 2888 $channel = $channel->{id};
2845 } 2889 }
2846 2890
2847 return unless @extra || length $msg; 2891 return unless @extra || length $msg;
2848 2892
2849 if ($self->can_msg) {
2850 # default colour, mask it out 2893 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2894 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 2895 if $color & cf::NDI_DEF;
2853 2896
2854 my $pkt = "msg " 2897 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 2898 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2899 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 2900 );
2858 2901
2859 # try lzf for large packets 2902 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt 2903 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf}; 2904 if 1024 <= length $pkt and $self->{can_lzf};
2862 2905
2863 # split very large packets 2906 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) { 2907 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2908 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag"; 2909 $pkt = "frag";
2867 } 2910 }
2868 2911
2869 $self->send_packet ($pkt); 2912 $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} 2913}
2896 2914
2897=item $client->ext_msg ($type, @msg) 2915=item $client->ext_msg ($type, @msg)
2898 2916
2899Sends an ext event to the client. 2917Sends an ext event to the client.
… …
3074The following functions and methods are available within a safe environment: 3092The following functions and methods are available within a safe environment:
3075 3093
3076 cf::object 3094 cf::object
3077 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
3078 insert remove name archname title slaying race decrease split 3096 insert remove name archname title slaying race decrease split
3097 value
3079 3098
3080 cf::object::player 3099 cf::object::player
3081 player 3100 player
3082 3101
3083 cf::player 3102 cf::player
… …
3089=cut 3108=cut
3090 3109
3091for ( 3110for (
3092 ["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
3093 insert remove inv nrof name archname title slaying race 3112 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3113 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3114 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3115 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3116 ["cf::map" => qw(trigger)],
3098) { 3117) {
3099 no strict 'refs'; 3118 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3119 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3120 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3118 my ($code, %vars) = @_; 3137 my ($code, %vars) = @_;
3119 3138
3120 my $qcode = $code; 3139 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3140 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3141 $qcode =~ s/\n/\\n/g;
3142
3143 %vars = (_dummy => 0) unless %vars;
3123 3144
3124 local $_; 3145 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars; 3146 local @safe::cf::_safe_eval_args = values %vars;
3126 3147
3127 my $eval = 3148 my $eval =
… …
3397 3418
3398 seek $fh, 0, 0; 3419 seek $fh, 0, 0;
3399 print $fh $$; 3420 print $fh $$;
3400} 3421}
3401 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;
3430}
3431
3402sub main { 3432sub main {
3403 cf::init_globals; # initialise logging 3433 cf::init_globals; # initialise logging
3404 3434
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3435 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3436 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
… …
3409 3439
3410 cf::init_experience; 3440 cf::init_experience;
3411 cf::init_anim; 3441 cf::init_anim;
3412 cf::init_attackmess; 3442 cf::init_attackmess;
3413 cf::init_dynamic; 3443 cf::init_dynamic;
3414 cf::init_block;
3415 3444
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3445 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3446
3418 # we must not ever block the main coroutine 3447 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3448 local $Coro::idle = sub {
… …
3445 load_extensions; 3474 load_extensions;
3446 3475
3447 utime time, time, $RUNTIMEFILE; 3476 utime time, time, $RUNTIMEFILE;
3448 3477
3449 # no (long-running) fork's whatsoever before this point(!) 3478 # no (long-running) fork's whatsoever before this point(!)
3479 use POSIX ();
3450 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};
3451 3481
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3482 (pop @POST_INIT)->(0) while @POST_INIT;
3453 }; 3483 };
3454 3484
3455 EV::loop; 3485 main_loop;
3456} 3486}
3457 3487
3458############################################################################# 3488#############################################################################
3459# initialisation and cleanup 3489# initialisation and cleanup
3460 3490
… …
3516 my $uuid = "$LOCALDIR/uuid"; 3546 my $uuid = "$LOCALDIR/uuid";
3517 3547
3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3548 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519 or return; 3549 or return;
3520 3550
3521 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3551 my $value = uuid_seq uuid_cur;
3552
3553 unless ($value) {
3554 warn "cowardly refusing to write zero uuid value!\n";
3555 return;
3556 }
3557
3558 my $value = uuid_str $value + $uuid_skip;
3522 $uuid_skip = 0; 3559 $uuid_skip = 0;
3523 3560
3524 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3561 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3525 and return; 3562 and return;
3526 3563
… …
3548} 3585}
3549 3586
3550sub emergency_save() { 3587sub emergency_save() {
3551 my $freeze_guard = cf::freeze_mainloop; 3588 my $freeze_guard = cf::freeze_mainloop;
3552 3589
3553 warn "enter emergency perl save\n"; 3590 warn "emergency_perl_save: enter\n";
3554 3591
3555 cf::sync_job { 3592 cf::sync_job {
3593 # this is a trade-off: we want to be very quick here, so
3594 # save all maps without fsync, and later call a global sync
3595 # (which in turn might be very very slow)
3596 local $USE_FSYNC = 0;
3597
3556 # use a peculiar iteration method to avoid tripping on perl 3598 # use a peculiar iteration method to avoid tripping on perl
3557 # refcount bugs in for. also avoids problems with players 3599 # refcount bugs in for. also avoids problems with players
3558 # and maps saved/destroyed asynchronously. 3600 # and maps saved/destroyed asynchronously.
3559 warn "begin emergency player save\n"; 3601 warn "emergency_perl_save: begin player save\n";
3560 for my $login (keys %cf::PLAYER) { 3602 for my $login (keys %cf::PLAYER) {
3561 my $pl = $cf::PLAYER{$login} or next; 3603 my $pl = $cf::PLAYER{$login} or next;
3562 $pl->valid or next; 3604 $pl->valid or next;
3563 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3605 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3564 $pl->save; 3606 $pl->save;
3565 } 3607 }
3566 warn "end emergency player save\n"; 3608 warn "emergency_perl_save: end player save\n";
3567 3609
3568 warn "begin emergency map save\n"; 3610 warn "emergency_perl_save: begin map save\n";
3569 for my $path (keys %cf::MAP) { 3611 for my $path (keys %cf::MAP) {
3570 my $map = $cf::MAP{$path} or next; 3612 my $map = $cf::MAP{$path} or next;
3571 $map->valid or next; 3613 $map->valid or next;
3572 $map->save; 3614 $map->save;
3573 } 3615 }
3574 warn "end emergency map save\n"; 3616 warn "emergency_perl_save: end map save\n";
3575 3617
3576 warn "begin emergency database checkpoint\n"; 3618 warn "emergency_perl_save: begin database checkpoint\n";
3577 BDB::db_env_txn_checkpoint $DB_ENV; 3619 BDB::db_env_txn_checkpoint $DB_ENV;
3578 warn "end emergency database checkpoint\n"; 3620 warn "emergency_perl_save: end database checkpoint\n";
3579 3621
3580 warn "begin write uuid\n"; 3622 warn "emergency_perl_save: begin write uuid\n";
3581 write_uuid_sync 1; 3623 write_uuid_sync 1;
3582 warn "end write uuid\n"; 3624 warn "emergency_perl_save: end write uuid\n";
3583 }; 3625 };
3584 3626
3627 warn "emergency_perl_save: starting sync()\n";
3628 IO::AIO::aio_sync sub {
3629 warn "emergency_perl_save: finished sync()\n";
3630 };
3631
3585 warn "leave emergency perl save\n"; 3632 warn "emergency_perl_save: leave\n";
3586} 3633}
3587 3634
3588sub post_cleanup { 3635sub post_cleanup {
3589 my ($make_core) = @_; 3636 my ($make_core) = @_;
3590 3637
… …
3627 warn "can only reload from main coroutine"; 3674 warn "can only reload from main coroutine";
3628 return; 3675 return;
3629 } 3676 }
3630 3677
3631 return if $RELOAD++; 3678 return if $RELOAD++;
3679
3680 my $t1 = EV::time;
3632 3681
3633 while ($RELOAD) { 3682 while ($RELOAD) {
3634 warn "reloading..."; 3683 warn "reloading...";
3635 3684
3636 warn "entering sync_job"; 3685 warn "entering sync_job";
… …
3697 clear_package "safe::$_" 3746 clear_package "safe::$_"
3698 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);
3699 3748
3700 warn "unloading cf.pm \"a bit\""; 3749 warn "unloading cf.pm \"a bit\"";
3701 delete $INC{"cf.pm"}; 3750 delete $INC{"cf.pm"};
3702 delete $INC{"cf/pod.pm"}; 3751 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3703 3752
3704 # don't, removes xs symbols, too, 3753 # don't, removes xs symbols, too,
3705 # and global variables created in xs 3754 # and global variables created in xs
3706 #clear_package __PACKAGE__; 3755 #clear_package __PACKAGE__;
3707 3756
… …
3715 cf::reload_config; 3764 cf::reload_config;
3716 3765
3717 warn "loading extensions"; 3766 warn "loading extensions";
3718 cf::load_extensions; 3767 cf::load_extensions;
3719 3768
3769 if ($REATTACH_ON_RELOAD) {
3720 warn "reattaching attachments to objects/players"; 3770 warn "reattaching attachments to objects/players";
3721 _global_reattach; # objects, sockets 3771 _global_reattach; # objects, sockets
3722 warn "reattaching attachments to maps"; 3772 warn "reattaching attachments to maps";
3723 reattach $_ for values %MAP; 3773 reattach $_ for values %MAP;
3724 warn "reattaching attachments to players"; 3774 warn "reattaching attachments to players";
3725 reattach $_ for values %PLAYER; 3775 reattach $_ for values %PLAYER;
3776 }
3726 3777
3727 warn "running post_load"; 3778 warn "running post_init jobs";
3728 (pop @POST_INIT)->(1) while @POST_INIT; 3779 (pop @POST_INIT)->(1) while @POST_INIT;
3729 3780
3730 warn "leaving sync_job"; 3781 warn "leaving sync_job";
3731 3782
3732 1 3783 1
… …
3736 }; 3787 };
3737 3788
3738 warn "reloaded"; 3789 warn "reloaded";
3739 --$RELOAD; 3790 --$RELOAD;
3740 } 3791 }
3792
3793 $t1 = EV::time - $t1;
3794 warn "reload completed in ${t1}s\n";
3741}; 3795};
3742 3796
3743our $RELOAD_WATCHER; # used only during reload 3797our $RELOAD_WATCHER; # used only during reload
3744 3798
3745sub reload_perl() { 3799sub reload_perl() {
3746 # doing reload synchronously and two reloads happen back-to-back, 3800 # doing reload synchronously and two reloads happen back-to-back,
3747 # coro crashes during coro_state_free->destroy here. 3801 # coro crashes during coro_state_free->destroy here.
3748 3802
3803 $RELOAD_WATCHER ||= cf::async {
3804 Coro::AIO::aio_wait cache_extensions;
3805
3749 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3806 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3750 do_reload_perl; 3807 do_reload_perl;
3751 undef $RELOAD_WATCHER; 3808 undef $RELOAD_WATCHER;
3809 };
3752 }; 3810 };
3753} 3811}
3754 3812
3755register_command "reload" => sub { 3813register_command "reload" => sub {
3756 my ($who, $arg) = @_; 3814 my ($who, $arg) = @_;
… …
3915 LOG llevInfo, "[ABT] [suppressed]\n"; 3973 LOG llevInfo, "[ABT] [suppressed]\n";
3916 } 3974 }
3917} 3975}
3918 3976
3919# load additional modules 3977# load additional modules
3920use cf::pod; 3978require "cf/$_.pm" for @EXTRA_MODULES;
3921 3979
3922END { cf::emergency_save } 3980END { cf::emergency_save }
3923 3981
39241 39821
3925 3983

Diff Legend

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