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.456 by root, Tue Sep 30 04:00:35 2008 UTC vs.
Revision 1.480 by root, Thu Oct 8 05:09:43 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}
173
174# this is decidedly evil
175$REFLECT{object}{flags} = [grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"}];
151 176
152############################################################################# 177#############################################################################
153 178
154=head2 GLOBAL VARIABLES 179=head2 GLOBAL VARIABLES
155 180
… …
206 231
207This array contains the results of the last C<invoke ()> call. When 232This 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 233C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
209that call. 234that call.
210 235
236=item %cf::REFLECT
237
238Contains, for each (C++) class name, a hash reference with information
239about object members (methods, scalars, arrays and flags) and other
240metadata, which is useful for introspection.
241
211=back 242=back
212 243
213=cut 244=cut
214 245
215BEGIN { 246$Coro::State::WARNHOOK = sub {
216 *CORE::GLOBAL::warn = sub {
217 my $msg = join "", @_; 247 my $msg = join "", @_;
218 248
219 $msg .= "\n" 249 $msg .= "\n"
220 unless $msg =~ /\n$/; 250 unless $msg =~ /\n$/;
221 251
222 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 252 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
223 253
224 LOG llevError, $msg; 254 LOG llevError, $msg;
225 }; 255};
226}
227 256
228$Coro::State::DIEHOOK = sub { 257$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 258 return unless $^S eq 0; # "eq", not "=="
259
260 warn Carp::longmess $_[0];
230 261
231 if ($Coro::current == $Coro::main) {#d# 262 if ($Coro::current == $Coro::main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 263 warn "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 264 return;#d#
234 }#d# 265 }#d#
235 266
236 # kill coroutine otherwise 267 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 268 Coro::terminate
239}; 269};
240
241$SIG{__DIE__} = sub { }; #d#?
242 270
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 271@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 272@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 273@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 274@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
328Wait until the given lock is available. See cf::lock_acquire. 356Wait until the given lock is available. See cf::lock_acquire.
329 357
330=item my $lock = cf::lock_acquire $string 358=item my $lock = cf::lock_acquire $string
331 359
332Wait until the given lock is available and then acquires it and returns 360Wait 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, 361a L<Guard> object. If the guard object gets destroyed (goes out of scope,
334for example when the coroutine gets canceled), the lock is automatically 362for example when the coroutine gets canceled), the lock is automatically
335returned. 363returned.
336 364
337Locks are *not* recursive, locking from the same coro twice results in a 365Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro. 366deadlocked coro.
… …
344 372
345Return true if the lock is currently active, i.e. somebody has locked it. 373Return true if the lock is currently active, i.e. somebody has locked it.
346 374
347=cut 375=cut
348 376
349our %LOCK; 377our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 378
352sub lock_wait($) { 379sub lock_wait($) {
353 my ($key) = @_; 380 $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} 381}
367 382
368sub lock_acquire($) { 383sub lock_acquire($) {
369 my ($key) = @_; 384 $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} 385}
383 386
384sub lock_active($) { 387sub lock_active($) {
385 my ($key) = @_; 388 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 389}
389 390
390sub freeze_mainloop { 391sub freeze_mainloop {
391 tick_inhibit_inc; 392 tick_inhibit_inc;
392 393
393 Coro::guard \&tick_inhibit_dec; 394 &Guard::guard (\&tick_inhibit_dec);
394} 395}
395 396
396=item cf::periodic $interval, $cb 397=item cf::periodic $interval, $cb
397 398
398Like EV::periodic, but randomly selects a starting point so that the actions 399Like EV::periodic, but randomly selects a starting point so that the actions
… …
1170 $decname, length $$rdata, scalar @$objs; 1171 $decname, length $$rdata, scalar @$objs;
1171 1172
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1174 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 aio_fsync $fh if $cf::USE_FSYNC; 1176 if ($cf::USE_FSYNC) {
1177 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;
1178 aio_fsync $fh;
1179 }
1176 aio_close $fh; 1180 aio_close $fh;
1177 1181
1178 if (@$objs) { 1182 if (@$objs) {
1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1183 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1180 aio_chmod $fh, SAVE_MODE; 1184 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1185 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1186 aio_write $fh, 0, (length $data), $data, 0;
1183 aio_fsync $fh if $cf::USE_FSYNC; 1187 if ($cf::USE_FSYNC) {
1188 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;
1189 aio_fsync $fh;
1190 }
1184 aio_close $fh; 1191 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1192 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1193 }
1187 } else { 1194 } else {
1188 aio_unlink "$filename.pst"; 1195 aio_unlink "$filename.pst";
1189 } 1196 }
1190 1197
1191 aio_rename "$filename~", $filename; 1198 aio_rename "$filename~", $filename;
1192 1199
1193 $filename =~ s%/[^/]+$%%; 1200 $filename =~ s%/[^/]+$%%;
1194 aio_pathsync $filename; 1201 aio_pathsync $filename if $cf::USE_FSYNC;
1195 } else { 1202 } else {
1196 warn "FATAL: $filename~: $!\n"; 1203 warn "unable to save objects: $filename~: $!\n";
1197 } 1204 }
1198 } else { 1205 } else {
1199 aio_unlink $filename; 1206 aio_unlink $filename;
1200 aio_unlink "$filename.pst"; 1207 aio_unlink "$filename.pst";
1201 } 1208 }
… …
1292 my ($name, $cb) = @_; 1299 my ($name, $cb) = @_;
1293 1300
1294 $EXTICMD{$name} = $cb; 1301 $EXTICMD{$name} = $cb;
1295} 1302}
1296 1303
1304use File::Glob ();
1305
1297cf::player->attach ( 1306cf::player->attach (
1298 on_command => sub { 1307 on_command => sub {
1299 my ($pl, $name, $params) = @_; 1308 my ($pl, $name, $params) = @_;
1300 1309
1301 my $cb = $COMMAND{$name} 1310 my $cb = $COMMAND{$name}
… …
1332 } 1341 }
1333 1342
1334 cf::override; 1343 cf::override;
1335 }, 1344 },
1336); 1345);
1346
1347# "readahead" all extensions
1348sub cache_extensions {
1349 my $grp = IO::AIO::aio_group;
1350
1351 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1352 for (grep /\.ext$/, @{$_[0]}) {
1353 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1354 }
1355 };
1356
1357 $grp
1358}
1337 1359
1338sub load_extensions { 1360sub load_extensions {
1339 cf::sync_job { 1361 cf::sync_job {
1340 my %todo; 1362 my %todo;
1341 1363
… …
1870 1892
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1893 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 1894 "$UNIQUEDIR/$path"
1873} 1895}
1874 1896
1875# and all this just because we cannot iterate over
1876# all maps in C++...
1877sub change_all_map_light {
1878 my ($change) = @_;
1879
1880 $_->change_map_light ($change)
1881 for grep $_->outdoor, values %cf::MAP;
1882}
1883
1884sub decay_objects { 1897sub decay_objects {
1885 my ($self) = @_; 1898 my ($self) = @_;
1886 1899
1887 return if $self->{deny_reset}; 1900 return if $self->{deny_reset};
1888 1901
… …
1970sub find { 1983sub find {
1971 my ($path, $origin) = @_; 1984 my ($path, $origin) = @_;
1972 1985
1973 $path = normalise $path, $origin && $origin->path; 1986 $path = normalise $path, $origin && $origin->path;
1974 1987
1975 cf::lock_wait "map_data:$path";#d#remove 1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 1989 my $guard2 = cf::lock_acquire "map_find:$path";
1977 1990
1978 $cf::MAP{$path} || do { 1991 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1980 my $guard2 = cf::lock_acquire "map_find:$path";
1981
1982 my $map = new_from_path cf::map $path 1992 my $map = new_from_path cf::map $path
1983 or return; 1993 or return;
1984 1994
1985 $map->{last_save} = $cf::RUNTIME; 1995 $map->{last_save} = $cf::RUNTIME;
1986 1996
… …
2054 unless ($self->{deny_activate}) { 2064 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2065 $self->decay_objects;
2056 $self->fix_auto_apply; 2066 $self->fix_auto_apply;
2057 $self->update_buttons; 2067 $self->update_buttons;
2058 cf::cede_to_tick; 2068 cf::cede_to_tick;
2059 $self->set_darkness_map;
2060 cf::cede_to_tick;
2061 $self->activate; 2069 $self->activate;
2062 } 2070 }
2063 2071
2064 $self->{last_save} = $cf::RUNTIME; 2072 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2073 $self->last_access ($cf::RUNTIME);
… …
2231 2239
2232 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2233 2241
2234 return if $self->players; 2242 return if $self->players;
2235 2243
2236 warn "resetting map ", $self->path; 2244 warn "resetting map ", $self->path, "\n";
2237 2245
2238 $self->in_memory (cf::MAP_SWAPPED); 2246 $self->in_memory (cf::MAP_SWAPPED);
2239 2247
2240 # need to save uniques path 2248 # need to save uniques path
2241 unless ($self->{deny_save}) { 2249 unless ($self->{deny_save}) {
… …
2406 2414
2407our $SAY_CHANNEL = { 2415our $SAY_CHANNEL = {
2408 id => "say", 2416 id => "say",
2409 title => "Map", 2417 title => "Map",
2410 reply => "say ", 2418 reply => "say ",
2411 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2419 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2412}; 2420};
2413 2421
2414our $CHAT_CHANNEL = { 2422our $CHAT_CHANNEL = {
2415 id => "chat", 2423 id => "chat",
2416 title => "Chat", 2424 title => "Chat",
… …
2542 2550
2543 $map->load; 2551 $map->load;
2544 $map->load_neighbours; 2552 $map->load_neighbours;
2545 2553
2546 return unless $self->contr->active; 2554 return unless $self->contr->active;
2547 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2548 $self->activate_recursive;
2549 2555
2550 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2551 $self->enter_map ($map, $x, $y); 2557 $self->enter_map ($map, $x, $y);
2558
2559 # only activate afterwards, to support waiting in hooks
2560 $self->activate_recursive;
2552} 2561}
2553 2562
2554=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2555 2564
2556Moves the player to the given map-path and coordinates by first freezing 2565Moves the player to the given map-path and coordinates by first freezing
… …
2791 id => "infobox", 2800 id => "infobox",
2792 title => "Body Parts", 2801 title => "Body Parts",
2793 reply => undef, 2802 reply => undef,
2794 tooltip => "Shows which body parts you posess and are available", 2803 tooltip => "Shows which body parts you posess and are available",
2795 }, 2804 },
2805 "c/statistics" => {
2806 id => "infobox",
2807 title => "Statistics",
2808 reply => undef,
2809 tooltip => "Shows your primary statistics",
2810 },
2796 "c/skills" => { 2811 "c/skills" => {
2797 id => "infobox", 2812 id => "infobox",
2798 title => "Skills", 2813 title => "Skills",
2799 reply => undef, 2814 reply => undef,
2800 tooltip => "Shows your experience per skill and item power", 2815 tooltip => "Shows your experience per skill and item power",
2816 },
2817 "c/shopitems" => {
2818 id => "infobox",
2819 title => "Shop Items",
2820 reply => undef,
2821 tooltip => "Shows the items currently for sale in this shop",
2822 },
2823 "c/resistances" => {
2824 id => "infobox",
2825 title => "Resistances",
2826 reply => undef,
2827 tooltip => "Shows your resistances",
2828 },
2829 "c/pets" => {
2830 id => "infobox",
2831 title => "Pets",
2832 reply => undef,
2833 tooltip => "Shows information abotu your pets/a specific pet",
2834 },
2835 "c/perceiveself" => {
2836 id => "infobox",
2837 title => "Perceive Self",
2838 reply => undef,
2839 tooltip => "You gained detailed knowledge about yourself",
2801 }, 2840 },
2802 "c/uptime" => { 2841 "c/uptime" => {
2803 id => "infobox", 2842 id => "infobox",
2804 title => "Uptime", 2843 title => "Uptime",
2805 reply => undef, 2844 reply => undef,
… …
2815 id => "party", 2854 id => "party",
2816 title => "Party", 2855 title => "Party",
2817 reply => "gsay ", 2856 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party", 2857 tooltip => "Messages and chat related to your party",
2819 }, 2858 },
2859 "c/death" => {
2860 id => "death",
2861 title => "Death",
2862 reply => undef,
2863 tooltip => "Reason for and more info about your most recent death",
2864 },
2865 "c/say" => $SAY_CHANNEL,
2866 "c/chat" => $CHAT_CHANNEL,
2820); 2867);
2821 2868
2822sub cf::client::send_msg { 2869sub cf::client::send_msg {
2823 my ($self, $channel, $msg, $color, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2824 2871
… …
2829 2876
2830 # check predefined channels, for the benefit of C 2877 # check predefined channels, for the benefit of C
2831 if ($CHANNEL{$channel}) { 2878 if ($CHANNEL{$channel}) {
2832 $channel = $CHANNEL{$channel}; 2879 $channel = $CHANNEL{$channel};
2833 2880
2834 $self->ext_msg (channel_info => $channel) 2881 $self->ext_msg (channel_info => $channel);
2835 if $self->can_msg;
2836
2837 $channel = $channel->{id}; 2882 $channel = $channel->{id};
2838 2883
2839 } elsif (ref $channel) { 2884 } elsif (ref $channel) {
2840 # send meta info to client, if not yet sent 2885 # send meta info to client, if not yet sent
2841 unless (exists $self->{channel}{$channel->{id}}) { 2886 unless (exists $self->{channel}{$channel->{id}}) {
2842 $self->{channel}{$channel->{id}} = $channel; 2887 $self->{channel}{$channel->{id}} = $channel;
2843 $self->ext_msg (channel_info => $channel) 2888 $self->ext_msg (channel_info => $channel);
2844 if $self->can_msg;
2845 } 2889 }
2846 2890
2847 $channel = $channel->{id}; 2891 $channel = $channel->{id};
2848 } 2892 }
2849 2893
2850 return unless @extra || length $msg; 2894 return unless @extra || length $msg;
2851 2895
2852 if ($self->can_msg) {
2853 # default colour, mask it out 2896 # default colour, mask it out
2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2897 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2855 if $color & cf::NDI_DEF; 2898 if $color & cf::NDI_DEF;
2856 2899
2857 my $pkt = "msg " 2900 my $pkt = "msg "
2858 . $self->{json_coder}->encode ( 2901 . $self->{json_coder}->encode (
2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 ); 2903 );
2861 2904
2862 # try lzf for large packets 2905 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt 2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf}; 2907 if 1024 <= length $pkt and $self->{can_lzf};
2865 2908
2866 # split very large packets 2909 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) { 2910 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag"; 2912 $pkt = "frag";
2870 } 2913 }
2871 2914
2872 $self->send_packet ($pkt); 2915 $self->send_packet ($pkt);
2873 } else {
2874 if ($color >= 0) {
2875 # replace some tags by gcfclient-compatible ones
2876 for ($msg) {
2877 1 while
2878 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2879 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2880 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2881 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2882 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2883 }
2884
2885 $color &= cf::NDI_COLOR_MASK;
2886
2887 utf8::encode $msg;
2888
2889 if (0 && $msg =~ /\[/) {
2890 # COMMAND/INFO
2891 $self->send_packet ("drawextinfo $color 10 8 $msg")
2892 } else {
2893 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2894 $self->send_packet ("drawinfo $color $msg")
2895 }
2896 }
2897 }
2898} 2916}
2899 2917
2900=item $client->ext_msg ($type, @msg) 2918=item $client->ext_msg ($type, @msg)
2901 2919
2902Sends an ext event to the client. 2920Sends an ext event to the client.
… …
3077The following functions and methods are available within a safe environment: 3095The following functions and methods are available within a safe environment:
3078 3096
3079 cf::object 3097 cf::object
3080 contr pay_amount pay_player map x y force_find force_add destroy 3098 contr pay_amount pay_player map x y force_find force_add destroy
3081 insert remove name archname title slaying race decrease split 3099 insert remove name archname title slaying race decrease split
3100 value
3082 3101
3083 cf::object::player 3102 cf::object::player
3084 player 3103 player
3085 3104
3086 cf::player 3105 cf::player
… …
3092=cut 3111=cut
3093 3112
3094for ( 3113for (
3095 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3114 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3096 insert remove inv nrof name archname title slaying race 3115 insert remove inv nrof name archname title slaying race
3097 decrease split destroy change_exp)], 3116 decrease split destroy change_exp value msg lore send_msg)],
3098 ["cf::object::player" => qw(player)], 3117 ["cf::object::player" => qw(player)],
3099 ["cf::player" => qw(peaceful)], 3118 ["cf::player" => qw(peaceful send_msg)],
3100 ["cf::map" => qw(trigger)], 3119 ["cf::map" => qw(trigger)],
3101) { 3120) {
3102 no strict 'refs'; 3121 no strict 'refs';
3103 my ($pkg, @funs) = @$_; 3122 my ($pkg, @funs) = @$_;
3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3121 my ($code, %vars) = @_; 3140 my ($code, %vars) = @_;
3122 3141
3123 my $qcode = $code; 3142 my $qcode = $code;
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3144 $qcode =~ s/\n/\\n/g;
3145
3146 %vars = (_dummy => 0) unless %vars;
3126 3147
3127 local $_; 3148 local $_;
3128 local @safe::cf::_safe_eval_args = values %vars; 3149 local @safe::cf::_safe_eval_args = values %vars;
3129 3150
3130 my $eval = 3151 my $eval =
… …
3400 3421
3401 seek $fh, 0, 0; 3422 seek $fh, 0, 0;
3402 print $fh $$; 3423 print $fh $$;
3403} 3424}
3404 3425
3426sub main_loop {
3427 warn "EV::loop starting\n";
3428 if (1) {
3429 EV::loop;
3430 }
3431 warn "EV::loop returned\n";
3432 goto &main_loop unless $REALLY_UNLOOP;
3433}
3434
3405sub main { 3435sub main {
3406 cf::init_globals; # initialise logging 3436 cf::init_globals; # initialise logging
3407 3437
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3439 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
… …
3412 3442
3413 cf::init_experience; 3443 cf::init_experience;
3414 cf::init_anim; 3444 cf::init_anim;
3415 cf::init_attackmess; 3445 cf::init_attackmess;
3416 cf::init_dynamic; 3446 cf::init_dynamic;
3417 cf::init_block;
3418 3447
3419 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3448 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3420 3449
3421 # we must not ever block the main coroutine 3450 # we must not ever block the main coroutine
3422 local $Coro::idle = sub { 3451 local $Coro::idle = sub {
… …
3448 load_extensions; 3477 load_extensions;
3449 3478
3450 utime time, time, $RUNTIMEFILE; 3479 utime time, time, $RUNTIMEFILE;
3451 3480
3452 # no (long-running) fork's whatsoever before this point(!) 3481 # no (long-running) fork's whatsoever before this point(!)
3482 use POSIX ();
3453 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3483 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3454 3484
3455 (pop @POST_INIT)->(0) while @POST_INIT; 3485 (pop @POST_INIT)->(0) while @POST_INIT;
3456 }; 3486 };
3457 3487
3458 EV::loop; 3488 main_loop;
3459} 3489}
3460 3490
3461############################################################################# 3491#############################################################################
3462# initialisation and cleanup 3492# initialisation and cleanup
3463 3493
… …
3558} 3588}
3559 3589
3560sub emergency_save() { 3590sub emergency_save() {
3561 my $freeze_guard = cf::freeze_mainloop; 3591 my $freeze_guard = cf::freeze_mainloop;
3562 3592
3563 warn "enter emergency perl save\n"; 3593 warn "emergency_perl_save: enter\n";
3564 3594
3565 cf::sync_job { 3595 cf::sync_job {
3596 # this is a trade-off: we want to be very quick here, so
3597 # save all maps without fsync, and later call a global sync
3598 # (which in turn might be very very slow)
3599 local $USE_FSYNC = 0;
3600
3566 # use a peculiar iteration method to avoid tripping on perl 3601 # use a peculiar iteration method to avoid tripping on perl
3567 # refcount bugs in for. also avoids problems with players 3602 # refcount bugs in for. also avoids problems with players
3568 # and maps saved/destroyed asynchronously. 3603 # and maps saved/destroyed asynchronously.
3569 warn "begin emergency player save\n"; 3604 warn "emergency_perl_save: begin player save\n";
3570 for my $login (keys %cf::PLAYER) { 3605 for my $login (keys %cf::PLAYER) {
3571 my $pl = $cf::PLAYER{$login} or next; 3606 my $pl = $cf::PLAYER{$login} or next;
3572 $pl->valid or next; 3607 $pl->valid or next;
3573 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3574 $pl->save; 3609 $pl->save;
3575 } 3610 }
3576 warn "end emergency player save\n"; 3611 warn "emergency_perl_save: end player save\n";
3577 3612
3578 warn "begin emergency map save\n"; 3613 warn "emergency_perl_save: begin map save\n";
3579 for my $path (keys %cf::MAP) { 3614 for my $path (keys %cf::MAP) {
3580 my $map = $cf::MAP{$path} or next; 3615 my $map = $cf::MAP{$path} or next;
3581 $map->valid or next; 3616 $map->valid or next;
3582 $map->save; 3617 $map->save;
3583 } 3618 }
3584 warn "end emergency map save\n"; 3619 warn "emergency_perl_save: end map save\n";
3585 3620
3586 warn "begin emergency database checkpoint\n"; 3621 warn "emergency_perl_save: begin database checkpoint\n";
3587 BDB::db_env_txn_checkpoint $DB_ENV; 3622 BDB::db_env_txn_checkpoint $DB_ENV;
3588 warn "end emergency database checkpoint\n"; 3623 warn "emergency_perl_save: end database checkpoint\n";
3589 3624
3590 warn "begin write uuid\n"; 3625 warn "emergency_perl_save: begin write uuid\n";
3591 write_uuid_sync 1; 3626 write_uuid_sync 1;
3592 warn "end write uuid\n"; 3627 warn "emergency_perl_save: end write uuid\n";
3593 }; 3628 };
3594 3629
3630 warn "emergency_perl_save: starting sync()\n";
3631 IO::AIO::aio_sync sub {
3632 warn "emergency_perl_save: finished sync()\n";
3633 };
3634
3595 warn "leave emergency perl save\n"; 3635 warn "emergency_perl_save: leave\n";
3596} 3636}
3597 3637
3598sub post_cleanup { 3638sub post_cleanup {
3599 my ($make_core) = @_; 3639 my ($make_core) = @_;
3600 3640
… …
3637 warn "can only reload from main coroutine"; 3677 warn "can only reload from main coroutine";
3638 return; 3678 return;
3639 } 3679 }
3640 3680
3641 return if $RELOAD++; 3681 return if $RELOAD++;
3682
3683 my $t1 = EV::time;
3642 3684
3643 while ($RELOAD) { 3685 while ($RELOAD) {
3644 warn "reloading..."; 3686 warn "reloading...";
3645 3687
3646 warn "entering sync_job"; 3688 warn "entering sync_job";
… …
3707 clear_package "safe::$_" 3749 clear_package "safe::$_"
3708 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3750 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3709 3751
3710 warn "unloading cf.pm \"a bit\""; 3752 warn "unloading cf.pm \"a bit\"";
3711 delete $INC{"cf.pm"}; 3753 delete $INC{"cf.pm"};
3712 delete $INC{"cf/pod.pm"}; 3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3713 3755
3714 # don't, removes xs symbols, too, 3756 # don't, removes xs symbols, too,
3715 # and global variables created in xs 3757 # and global variables created in xs
3716 #clear_package __PACKAGE__; 3758 #clear_package __PACKAGE__;
3717 3759
… …
3725 cf::reload_config; 3767 cf::reload_config;
3726 3768
3727 warn "loading extensions"; 3769 warn "loading extensions";
3728 cf::load_extensions; 3770 cf::load_extensions;
3729 3771
3772 if ($REATTACH_ON_RELOAD) {
3730 warn "reattaching attachments to objects/players"; 3773 warn "reattaching attachments to objects/players";
3731 _global_reattach; # objects, sockets 3774 _global_reattach; # objects, sockets
3732 warn "reattaching attachments to maps"; 3775 warn "reattaching attachments to maps";
3733 reattach $_ for values %MAP; 3776 reattach $_ for values %MAP;
3734 warn "reattaching attachments to players"; 3777 warn "reattaching attachments to players";
3735 reattach $_ for values %PLAYER; 3778 reattach $_ for values %PLAYER;
3779 }
3736 3780
3737 warn "running post_load"; 3781 warn "running post_init jobs";
3738 (pop @POST_INIT)->(1) while @POST_INIT; 3782 (pop @POST_INIT)->(1) while @POST_INIT;
3739 3783
3740 warn "leaving sync_job"; 3784 warn "leaving sync_job";
3741 3785
3742 1 3786 1
… …
3746 }; 3790 };
3747 3791
3748 warn "reloaded"; 3792 warn "reloaded";
3749 --$RELOAD; 3793 --$RELOAD;
3750 } 3794 }
3795
3796 $t1 = EV::time - $t1;
3797 warn "reload completed in ${t1}s\n";
3751}; 3798};
3752 3799
3753our $RELOAD_WATCHER; # used only during reload 3800our $RELOAD_WATCHER; # used only during reload
3754 3801
3755sub reload_perl() { 3802sub reload_perl() {
3756 # doing reload synchronously and two reloads happen back-to-back, 3803 # doing reload synchronously and two reloads happen back-to-back,
3757 # coro crashes during coro_state_free->destroy here. 3804 # coro crashes during coro_state_free->destroy here.
3758 3805
3806 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions;
3808
3759 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3760 do_reload_perl; 3810 do_reload_perl;
3761 undef $RELOAD_WATCHER; 3811 undef $RELOAD_WATCHER;
3812 };
3762 }; 3813 };
3763} 3814}
3764 3815
3765register_command "reload" => sub { 3816register_command "reload" => sub {
3766 my ($who, $arg) = @_; 3817 my ($who, $arg) = @_;
… …
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 3976 LOG llevInfo, "[ABT] [suppressed]\n";
3926 } 3977 }
3927} 3978}
3928 3979
3929# load additional modules 3980# load additional modules
3930use cf::pod; 3981require "cf/$_.pm" for @EXTRA_MODULES;
3931 3982
3932END { cf::emergency_save } 3983END { cf::emergency_save }
3933 3984
39341 39851
3935 3986

Diff Legend

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