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.457 by root, Wed Oct 1 05:50:19 2008 UTC vs.
Revision 1.497 by root, Fri Dec 18 03:49:46 2009 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
50 54
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
… …
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 73
71# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
74 80
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
90our $DATADIR = datadir; 98our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
103our %RESOURCE; 111our %RESOURCE;
104 112
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 115our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
109 117
110our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 121our $DB_ENV;
114 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
115our %CFG; 125our %CFG;
116 126
117our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 128our $RUNTIME;
119our $NOW; 129our $NOW;
… …
130our $JITTER; # average jitter 140our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
132 142
133our @POST_INIT; 143our @POST_INIT;
134 144
135our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
136 147
137binmode STDOUT; 148binmode STDOUT;
138binmode STDERR; 149binmode STDERR;
139 150
140# read virtual server time, if available 151# read virtual server time, if available
… …
142 open my $fh, "<", $RUNTIMEFILE 153 open my $fh, "<", $RUNTIMEFILE
143 or die "unable to read $RUNTIMEFILE file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
144 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
145} 156}
146 157
158eval "sub TICK() { $TICK } 1" or die;
159
147mkdir $_ 160mkdir $_
148 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
149 162
150our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
151 164
152sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
153 177
154############################################################################# 178#############################################################################
155 179
156=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
157 181
… …
204returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
205per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
206 230
207=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
208 232
209This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
210C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
211that call. 235that call.
212 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
213=back 243=back
214 244
215=cut 245=cut
216 246
217BEGIN { 247$Coro::State::WARNHOOK = sub {
218 *CORE::GLOBAL::warn = sub {
219 my $msg = join "", @_; 248 my $msg = join "", @_;
220 249
221 $msg .= "\n" 250 $msg .= "\n"
222 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
223 252
224 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
225 254
226 LOG llevError, $msg; 255 LOG llevError, $msg;
227 }; 256};
228}
229 257
230$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
231 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
232 262
233 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
234 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
235 return;#d# 265 return;#d#
236 }#d# 266 }#d#
237 267
238 # kill coroutine otherwise 268 # kill coroutine otherwise
239 warn Carp::longmess $_[0];
240 Coro::terminate 269 Coro::terminate
241}; 270};
242
243$SIG{__DIE__} = sub { }; #d#?
244 271
245@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
246@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
247@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
248@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
262)) { 289)) {
263 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
264} 291}
265 292
266$EV::DIED = sub { 293$EV::DIED = sub {
267 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
268}; 295};
269 296
270############################################################################# 297#############################################################################
271 298
272=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
330Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
331 358
332=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
333 360
334Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
335a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
336for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
337returned. 364returned.
338 365
339Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
340deadlocked coro. 367deadlocked coro.
… …
346 373
347Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
348 375
349=cut 376=cut
350 377
351our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
352our %LOCKER;#d#
353 379
354sub lock_wait($) { 380sub lock_wait($) {
355 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
356
357 if ($LOCKER{$key} == $Coro::current) {#d#
358 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
359 return;#d#
360 }#d#
361
362 # wait for lock, if any
363 while ($LOCK{$key}) {
364 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
365 push @{ $LOCK{$key} }, $Coro::current;
366 Coro::schedule;
367 }
368} 382}
369 383
370sub lock_acquire($) { 384sub lock_acquire($) {
371 my ($key) = @_; 385 $LOCKS->guard ($_[0])
372
373 # wait, to be sure we are not locked
374 lock_wait $key;
375
376 $LOCK{$key} = [];
377 $LOCKER{$key} = $Coro::current;#d#
378
379 Coro::guard {
380 delete $LOCKER{$key};#d#
381 # wake up all waiters, to be on the safe side
382 $_->ready for @{ delete $LOCK{$key} };
383 }
384} 386}
385 387
386sub lock_active($) { 388sub lock_active($) {
387 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
388
389 ! ! $LOCK{$key}
390} 390}
391 391
392sub freeze_mainloop { 392sub freeze_mainloop {
393 tick_inhibit_inc; 393 tick_inhibit_inc;
394 394
395 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
396} 396}
397 397
398=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
399 399
400Like EV::periodic, but randomly selects a starting point so that the actions 400Like EV::periodic, but randomly selects a starting point so that the actions
… …
1172 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1173 1173
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1175 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 aio_fsync $fh if $cf::USE_FSYNC; 1177 if ($cf::USE_FSYNC) {
1178 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;
1179 aio_fsync $fh;
1180 }
1178 aio_close $fh; 1181 aio_close $fh;
1179 1182
1180 if (@$objs) { 1183 if (@$objs) {
1181 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1185 aio_chmod $fh, SAVE_MODE;
1183 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1184 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1185 aio_fsync $fh if $cf::USE_FSYNC; 1188 if ($cf::USE_FSYNC) {
1189 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;
1190 aio_fsync $fh;
1191 }
1186 aio_close $fh; 1192 aio_close $fh;
1187 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1188 } 1194 }
1189 } else { 1195 } else {
1190 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
… …
1193 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1194 1200
1195 $filename =~ s%/[^/]+$%%; 1201 $filename =~ s%/[^/]+$%%;
1196 aio_pathsync $filename if $cf::USE_FSYNC; 1202 aio_pathsync $filename if $cf::USE_FSYNC;
1197 } else { 1203 } else {
1198 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1199 } 1205 }
1200 } else { 1206 } else {
1201 aio_unlink $filename; 1207 aio_unlink $filename;
1202 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1203 } 1209 }
… …
1341 1347
1342# "readahead" all extensions 1348# "readahead" all extensions
1343sub cache_extensions { 1349sub cache_extensions {
1344 my $grp = IO::AIO::aio_group; 1350 my $grp = IO::AIO::aio_group;
1345 1351
1346 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1352 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1347 for (grep /\.ext$/, @{$_[0]}) { 1353 for (grep /\.ext$/, @{$_[0]}) {
1348 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1354 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1349 } 1355 }
1350 }; 1356 };
1351 1357
… …
1887 1893
1888 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1889 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1890} 1896}
1891 1897
1892# and all this just because we cannot iterate over
1893# all maps in C++...
1894sub change_all_map_light {
1895 my ($change) = @_;
1896
1897 $_->change_map_light ($change)
1898 for grep $_->outdoor, values %cf::MAP;
1899}
1900
1901sub decay_objects { 1898sub decay_objects {
1902 my ($self) = @_; 1899 my ($self) = @_;
1903 1900
1904 return if $self->{deny_reset}; 1901 return if $self->{deny_reset};
1905 1902
… …
1987sub find { 1984sub find {
1988 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1989 1986
1990 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1991 1988
1992 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1993 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1994 1991
1995 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
1996 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1997 my $guard2 = cf::lock_acquire "map_find:$path";
1998
1999 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
2000 or return; 1994 or return;
2001 1995
2002 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
2003 1997
… …
2071 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
2072 $self->decay_objects; 2066 $self->decay_objects;
2073 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
2074 $self->update_buttons; 2068 $self->update_buttons;
2075 cf::cede_to_tick; 2069 cf::cede_to_tick;
2076 $self->set_darkness_map;
2077 cf::cede_to_tick;
2078 $self->activate; 2070 $self->activate;
2079 } 2071 }
2080 2072
2081 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
2082 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
… …
2248 2240
2249 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2250 2242
2251 return if $self->players; 2243 return if $self->players;
2252 2244
2253 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2254 2246
2255 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2256 2248
2257 # need to save uniques path 2249 # need to save uniques path
2258 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
… …
2349 : normalise $_ 2341 : normalise $_
2350 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2351 ] 2343 ]
2352} 2344}
2353 2345
2346=item cf::map::static_maps
2347
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory excluding F</styles> and F</editor>). May
2350block.
2351
2352=cut
2353
2354sub static_maps() {
2355 my @dirs = "";
2356 my @maps;
2357
2358 while (@dirs) {
2359 my $dir = shift @dirs;
2360
2361 next if $dir eq "/styles" || $dir eq "/editor";
2362
2363 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2364 or return;
2365
2366 for (@$files) {
2367 s/\.map$// or next;
2368 utf8::decode $_;
2369 push @maps, "$dir/$_";
2370 }
2371
2372 push @dirs, map "$dir/$_", @$dirs;
2373 }
2374
2375 \@maps
2376}
2377
2354=back 2378=back
2355 2379
2356=head3 cf::object 2380=head3 cf::object
2357 2381
2358=cut 2382=cut
… …
2423 2447
2424our $SAY_CHANNEL = { 2448our $SAY_CHANNEL = {
2425 id => "say", 2449 id => "say",
2426 title => "Map", 2450 title => "Map",
2427 reply => "say ", 2451 reply => "say ",
2428 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2452 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2429}; 2453};
2430 2454
2431our $CHAT_CHANNEL = { 2455our $CHAT_CHANNEL = {
2432 id => "chat", 2456 id => "chat",
2433 title => "Chat", 2457 title => "Chat",
… …
2553 ($x, $y) = (-1, -1) 2577 ($x, $y) = (-1, -1)
2554 unless (defined $x) && (defined $y); 2578 unless (defined $x) && (defined $y);
2555 2579
2556 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2557 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2558 if $x <=0 && $y <= 0; 2582 if $x <= 0 && $y <= 0;
2559 2583
2560 $map->load; 2584 $map->load;
2561 $map->load_neighbours; 2585 $map->load_neighbours;
2562 2586
2563 return unless $self->contr->active; 2587 return unless $self->contr->active;
2564 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2565 $self->activate_recursive;
2566 2588
2567 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2568 $self->enter_map ($map, $x, $y); 2590 $self->enter_map ($map, $x, $y);
2591
2592 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive;
2569} 2594}
2570 2595
2571=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2572 2597
2573Moves the player to the given map-path and coordinates by first freezing 2598Moves the player to the given map-path and coordinates by first freezing
… …
2761 2786
2762 utf8::encode $text; 2787 utf8::encode $text;
2763 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2788 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2764} 2789}
2765 2790
2791=item $client->send_big_packet ($pkt)
2792
2793Like C<send_packet>, but tries to compress large packets, and fragments
2794them as required.
2795
2796=cut
2797
2798our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2799
2800sub cf::client::send_big_packet {
2801 my ($self, $pkt) = @_;
2802
2803 # try lzf for large packets
2804 $pkt = "lzf " . Compress::LZF::compress $pkt
2805 if 1024 <= length $pkt and $self->{can_lzf};
2806
2807 # split very large packets
2808 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2809 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2810 $pkt = "frag";
2811 }
2812
2813 $self->send_packet ($pkt);
2814}
2815
2766=item $client->send_msg ($channel, $msg, $color, [extra...]) 2816=item $client->send_msg ($channel, $msg, $color, [extra...])
2767 2817
2768Send a drawinfo or msg packet to the client, formatting the msg for the 2818Send a drawinfo or msg packet to the client, formatting the msg for the
2769client if neccessary. C<$type> should be a string identifying the type of 2819client if neccessary. C<$type> should be a string identifying the type of
2770the message, with C<log> being the default. If C<$color> is negative, suppress 2820the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2772 2822
2773=cut 2823=cut
2774 2824
2775# non-persistent channels (usually the info channel) 2825# non-persistent channels (usually the info channel)
2776our %CHANNEL = ( 2826our %CHANNEL = (
2827 "c/motd" => {
2828 id => "infobox",
2829 title => "MOTD",
2830 reply => undef,
2831 tooltip => "The message of the day",
2832 },
2777 "c/identify" => { 2833 "c/identify" => {
2778 id => "infobox", 2834 id => "infobox",
2779 title => "Identify", 2835 title => "Identify",
2780 reply => undef, 2836 reply => undef,
2781 tooltip => "Items recently identified", 2837 tooltip => "Items recently identified",
… …
2783 "c/examine" => { 2839 "c/examine" => {
2784 id => "infobox", 2840 id => "infobox",
2785 title => "Examine", 2841 title => "Examine",
2786 reply => undef, 2842 reply => undef,
2787 tooltip => "Signs and other items you examined", 2843 tooltip => "Signs and other items you examined",
2844 },
2845 "c/shopinfo" => {
2846 id => "infobox",
2847 title => "Shop Info",
2848 reply => undef,
2849 tooltip => "What your bargaining skill tells you about the shop",
2788 }, 2850 },
2789 "c/book" => { 2851 "c/book" => {
2790 id => "infobox", 2852 id => "infobox",
2791 title => "Book", 2853 title => "Book",
2792 reply => undef, 2854 reply => undef,
… …
2808 id => "infobox", 2870 id => "infobox",
2809 title => "Body Parts", 2871 title => "Body Parts",
2810 reply => undef, 2872 reply => undef,
2811 tooltip => "Shows which body parts you posess and are available", 2873 tooltip => "Shows which body parts you posess and are available",
2812 }, 2874 },
2875 "c/statistics" => {
2876 id => "infobox",
2877 title => "Statistics",
2878 reply => undef,
2879 tooltip => "Shows your primary statistics",
2880 },
2813 "c/skills" => { 2881 "c/skills" => {
2814 id => "infobox", 2882 id => "infobox",
2815 title => "Skills", 2883 title => "Skills",
2816 reply => undef, 2884 reply => undef,
2817 tooltip => "Shows your experience per skill and item power", 2885 tooltip => "Shows your experience per skill and item power",
2886 },
2887 "c/shopitems" => {
2888 id => "infobox",
2889 title => "Shop Items",
2890 reply => undef,
2891 tooltip => "Shows the items currently for sale in this shop",
2892 },
2893 "c/resistances" => {
2894 id => "infobox",
2895 title => "Resistances",
2896 reply => undef,
2897 tooltip => "Shows your resistances",
2898 },
2899 "c/pets" => {
2900 id => "infobox",
2901 title => "Pets",
2902 reply => undef,
2903 tooltip => "Shows information abotu your pets/a specific pet",
2904 },
2905 "c/perceiveself" => {
2906 id => "infobox",
2907 title => "Perceive Self",
2908 reply => undef,
2909 tooltip => "You gained detailed knowledge about yourself",
2818 }, 2910 },
2819 "c/uptime" => { 2911 "c/uptime" => {
2820 id => "infobox", 2912 id => "infobox",
2821 title => "Uptime", 2913 title => "Uptime",
2822 reply => undef, 2914 reply => undef,
… …
2832 id => "party", 2924 id => "party",
2833 title => "Party", 2925 title => "Party",
2834 reply => "gsay ", 2926 reply => "gsay ",
2835 tooltip => "Messages and chat related to your party", 2927 tooltip => "Messages and chat related to your party",
2836 }, 2928 },
2929 "c/death" => {
2930 id => "death",
2931 title => "Death",
2932 reply => undef,
2933 tooltip => "Reason for and more info about your most recent death",
2934 },
2935 "c/say" => $SAY_CHANNEL,
2936 "c/chat" => $CHAT_CHANNEL,
2837); 2937);
2838 2938
2839sub cf::client::send_msg { 2939sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 2940 my ($self, $channel, $msg, $color, @extra) = @_;
2841 2941
… …
2846 2946
2847 # check predefined channels, for the benefit of C 2947 # check predefined channels, for the benefit of C
2848 if ($CHANNEL{$channel}) { 2948 if ($CHANNEL{$channel}) {
2849 $channel = $CHANNEL{$channel}; 2949 $channel = $CHANNEL{$channel};
2850 2950
2851 $self->ext_msg (channel_info => $channel) 2951 $self->ext_msg (channel_info => $channel);
2852 if $self->can_msg;
2853
2854 $channel = $channel->{id}; 2952 $channel = $channel->{id};
2855 2953
2856 } elsif (ref $channel) { 2954 } elsif (ref $channel) {
2857 # send meta info to client, if not yet sent 2955 # send meta info to client, if not yet sent
2858 unless (exists $self->{channel}{$channel->{id}}) { 2956 unless (exists $self->{channel}{$channel->{id}}) {
2859 $self->{channel}{$channel->{id}} = $channel; 2957 $self->{channel}{$channel->{id}} = $channel;
2860 $self->ext_msg (channel_info => $channel) 2958 $self->ext_msg (channel_info => $channel);
2861 if $self->can_msg;
2862 } 2959 }
2863 2960
2864 $channel = $channel->{id}; 2961 $channel = $channel->{id};
2865 } 2962 }
2866 2963
2867 return unless @extra || length $msg; 2964 return unless @extra || length $msg;
2868 2965
2869 if ($self->can_msg) {
2870 # default colour, mask it out 2966 # default colour, mask it out
2871 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2967 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2872 if $color & cf::NDI_DEF; 2968 if $color & cf::NDI_DEF;
2873 2969
2874 my $pkt = "msg " 2970 my $pkt = "msg "
2875 . $self->{json_coder}->encode ( 2971 . $self->{json_coder}->encode (
2876 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2972 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2877 ); 2973 );
2878 2974
2879 # try lzf for large packets
2880 $pkt = "lzf " . Compress::LZF::compress $pkt
2881 if 1024 <= length $pkt and $self->{can_lzf};
2882
2883 # split very large packets
2884 if (8192 < length $pkt and $self->{can_lzf}) {
2885 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2886 $pkt = "frag";
2887 }
2888
2889 $self->send_packet ($pkt); 2975 $self->send_big_packet ($pkt);
2890 } else {
2891 if ($color >= 0) {
2892 # replace some tags by gcfclient-compatible ones
2893 for ($msg) {
2894 1 while
2895 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2896 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2897 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2898 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2899 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2900 }
2901
2902 $color &= cf::NDI_COLOR_MASK;
2903
2904 utf8::encode $msg;
2905
2906 if (0 && $msg =~ /\[/) {
2907 # COMMAND/INFO
2908 $self->send_packet ("drawextinfo $color 10 8 $msg")
2909 } else {
2910 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2911 $self->send_packet ("drawinfo $color $msg")
2912 }
2913 }
2914 }
2915} 2976}
2916 2977
2917=item $client->ext_msg ($type, @msg) 2978=item $client->ext_msg ($type, @msg)
2918 2979
2919Sends an ext event to the client. 2980Sends an ext event to the client.
… …
2922 2983
2923sub cf::client::ext_msg($$@) { 2984sub cf::client::ext_msg($$@) {
2924 my ($self, $type, @msg) = @_; 2985 my ($self, $type, @msg) = @_;
2925 2986
2926 if ($self->extcmd == 2) { 2987 if ($self->extcmd == 2) {
2927 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2928 } elsif ($self->extcmd == 1) { # TODO: remove 2989 } elsif ($self->extcmd == 1) { # TODO: remove
2929 push @msg, msgtype => "event_$type"; 2990 push @msg, msgtype => "event_$type";
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 } 2992 }
2932} 2993}
2933 2994
2934=item $client->ext_reply ($msgid, @msg) 2995=item $client->ext_reply ($msgid, @msg)
2935 2996
… …
2939 3000
2940sub cf::client::ext_reply($$@) { 3001sub cf::client::ext_reply($$@) {
2941 my ($self, $id, @msg) = @_; 3002 my ($self, $id, @msg) = @_;
2942 3003
2943 if ($self->extcmd == 2) { 3004 if ($self->extcmd == 2) {
2944 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2945 } elsif ($self->extcmd == 1) { 3006 } elsif ($self->extcmd == 1) {
2946 #TODO: version 1, remove 3007 #TODO: version 1, remove
2947 unshift @msg, msgtype => "reply", msgid => $id; 3008 unshift @msg, msgtype => "reply", msgid => $id;
2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949 } 3010 }
2950} 3011}
2951 3012
2952=item $success = $client->query ($flags, "text", \&cb) 3013=item $success = $client->query ($flags, "text", \&cb)
2953 3014
… …
3094The following functions and methods are available within a safe environment: 3155The following functions and methods are available within a safe environment:
3095 3156
3096 cf::object 3157 cf::object
3097 contr pay_amount pay_player map x y force_find force_add destroy 3158 contr pay_amount pay_player map x y force_find force_add destroy
3098 insert remove name archname title slaying race decrease split 3159 insert remove name archname title slaying race decrease split
3160 value
3099 3161
3100 cf::object::player 3162 cf::object::player
3101 player 3163 player
3102 3164
3103 cf::player 3165 cf::player
… …
3109=cut 3171=cut
3110 3172
3111for ( 3173for (
3112 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3174 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3113 insert remove inv nrof name archname title slaying race 3175 insert remove inv nrof name archname title slaying race
3114 decrease split destroy change_exp)], 3176 decrease split destroy change_exp value msg lore send_msg)],
3115 ["cf::object::player" => qw(player)], 3177 ["cf::object::player" => qw(player)],
3116 ["cf::player" => qw(peaceful)], 3178 ["cf::player" => qw(peaceful send_msg)],
3117 ["cf::map" => qw(trigger)], 3179 ["cf::map" => qw(trigger)],
3118) { 3180) {
3119 no strict 'refs'; 3181 no strict 'refs';
3120 my ($pkg, @funs) = @$_; 3182 my ($pkg, @funs) = @$_;
3121 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3138 my ($code, %vars) = @_; 3200 my ($code, %vars) = @_;
3139 3201
3140 my $qcode = $code; 3202 my $qcode = $code;
3141 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3142 $qcode =~ s/\n/\\n/g; 3204 $qcode =~ s/\n/\\n/g;
3205
3206 %vars = (_dummy => 0) unless %vars;
3143 3207
3144 local $_; 3208 local $_;
3145 local @safe::cf::_safe_eval_args = values %vars; 3209 local @safe::cf::_safe_eval_args = values %vars;
3146 3210
3147 my $eval = 3211 my $eval =
… …
3227 while (my ($face, $info) = each %$faces) { 3291 while (my ($face, $info) = each %$faces) {
3228 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3292 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3229 3293
3230 cf::face::set_visibility $idx, $info->{visibility}; 3294 cf::face::set_visibility $idx, $info->{visibility};
3231 cf::face::set_magicmap $idx, $info->{magicmap}; 3295 cf::face::set_magicmap $idx, $info->{magicmap};
3232 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3296 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3233 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3297 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3234 3298
3235 cf::cede_to_tick; 3299 cf::cede_to_tick;
3236 } 3300 }
3237 3301
3238 while (my ($face, $info) = each %$faces) { 3302 while (my ($face, $info) = each %$faces) {
… …
3262 3326
3263 cf::anim::invalidate_all; # d'oh 3327 cf::anim::invalidate_all; # d'oh
3264 } 3328 }
3265 3329
3266 { 3330 {
3267 # TODO: for gcfclient pleasure, we should give resources
3268 # that gcfclient doesn't grok a >10000 face index.
3269 my $res = $facedata->{resource}; 3331 my $res = $facedata->{resource};
3270 3332
3271 while (my ($name, $info) = each %$res) { 3333 while (my ($name, $info) = each %$res) {
3272 if (defined $info->{type}) { 3334 if (defined $info->{type}) {
3273 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3335 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3274 my $data;
3275 3336
3276 if ($info->{type} & 1) { 3337 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3277 # prepend meta info
3278
3279 my $meta = $enc->encode ({
3280 name => $name,
3281 %{ $info->{meta} || {} },
3282 });
3283
3284 $data = pack "(w/a*)*", $meta, $info->{data};
3285 } else {
3286 $data = $info->{data};
3287 }
3288
3289 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3290 cf::face::set_type $idx, $info->{type}; 3338 cf::face::set_type $idx, $info->{type};
3291 } else { 3339 } else {
3292 $RESOURCE{$name} = $info; 3340 $RESOURCE{$name} = $info;
3293 } 3341 }
3294 3342
… …
3378 3426
3379 warn "finished reloading resource files\n"; 3427 warn "finished reloading resource files\n";
3380} 3428}
3381 3429
3382sub reload_config { 3430sub reload_config {
3431 warn "reloading config file...\n";
3432
3383 open my $fh, "<:utf8", "$CONFDIR/config" 3433 open my $fh, "<:utf8", "$CONFDIR/config"
3384 or return; 3434 or return;
3385 3435
3386 local $/; 3436 local $/;
3387 *CFG = YAML::Load <$fh>; 3437 *CFG = YAML::XS::Load scalar <$fh>;
3388 3438
3389 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3439 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3390 3440
3391 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3441 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3392 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3442 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3396 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3446 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3397 and die "WARNING: m(un)lockall failed: $!\n"; 3447 and die "WARNING: m(un)lockall failed: $!\n";
3398 }; 3448 };
3399 warn $@ if $@; 3449 warn $@ if $@;
3400 } 3450 }
3451
3452 warn "finished reloading resource files\n";
3401} 3453}
3402 3454
3403sub pidfile() { 3455sub pidfile() {
3404 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3456 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3405 or die "$PIDFILE: $!"; 3457 or die "$PIDFILE: $!";
… …
3417 3469
3418 seek $fh, 0, 0; 3470 seek $fh, 0, 0;
3419 print $fh $$; 3471 print $fh $$;
3420} 3472}
3421 3473
3474sub main_loop {
3475 warn "EV::loop starting\n";
3476 if (1) {
3477 EV::loop;
3478 }
3479 warn "EV::loop returned\n";
3480 goto &main_loop unless $REALLY_UNLOOP;
3481}
3482
3422sub main { 3483sub main {
3423 cf::init_globals; # initialise logging 3484 cf::init_globals; # initialise logging
3424 3485
3425 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3486 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3426 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3487 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
… …
3429 3490
3430 cf::init_experience; 3491 cf::init_experience;
3431 cf::init_anim; 3492 cf::init_anim;
3432 cf::init_attackmess; 3493 cf::init_attackmess;
3433 cf::init_dynamic; 3494 cf::init_dynamic;
3434 cf::init_block;
3435 3495
3436 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3496 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3437 3497
3438 # we must not ever block the main coroutine 3498 # we must not ever block the main coroutine
3439 local $Coro::idle = sub { 3499 local $Coro::idle = sub {
… …
3445 }; 3505 };
3446 3506
3447 evthread_start IO::AIO::poll_fileno; 3507 evthread_start IO::AIO::poll_fileno;
3448 3508
3449 cf::sync_job { 3509 cf::sync_job {
3510 cf::load_settings;
3511 cf::load_materials;
3512
3450 reload_resources; 3513 reload_resources;
3451 reload_config; 3514 reload_config;
3452 db_init; 3515 db_init;
3453 3516
3454 cf::load_settings;
3455 cf::load_materials;
3456 cf::init_uuid; 3517 cf::init_uuid;
3457 cf::init_signals; 3518 cf::init_signals;
3458 cf::init_commands; 3519 cf::init_commands;
3459 cf::init_skills; 3520 cf::init_skills;
3460 3521
… …
3465 load_extensions; 3526 load_extensions;
3466 3527
3467 utime time, time, $RUNTIMEFILE; 3528 utime time, time, $RUNTIMEFILE;
3468 3529
3469 # no (long-running) fork's whatsoever before this point(!) 3530 # no (long-running) fork's whatsoever before this point(!)
3531 use POSIX ();
3470 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3532 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3471 3533
3472 (pop @POST_INIT)->(0) while @POST_INIT; 3534 (pop @POST_INIT)->(0) while @POST_INIT;
3473 }; 3535 };
3474 3536
3475 EV::loop; 3537 main_loop;
3476} 3538}
3477 3539
3478############################################################################# 3540#############################################################################
3479# initialisation and cleanup 3541# initialisation and cleanup
3480 3542
… …
3736 clear_package "safe::$_" 3798 clear_package "safe::$_"
3737 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3799 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3738 3800
3739 warn "unloading cf.pm \"a bit\""; 3801 warn "unloading cf.pm \"a bit\"";
3740 delete $INC{"cf.pm"}; 3802 delete $INC{"cf.pm"};
3741 delete $INC{"cf/pod.pm"}; 3803 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3742 3804
3743 # don't, removes xs symbols, too, 3805 # don't, removes xs symbols, too,
3744 # and global variables created in xs 3806 # and global variables created in xs
3745 #clear_package __PACKAGE__; 3807 #clear_package __PACKAGE__;
3746 3808
3747 warn "unload completed, starting to reload now"; 3809 warn "unload completed, starting to reload now";
3748 3810
3749 warn "reloading cf.pm"; 3811 warn "reloading cf.pm";
3750 require cf; 3812 require cf;
3751 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3813 cf::_connect_to_perl_1;
3752 3814
3753 warn "loading config and database again"; 3815 warn "loading config and database again";
3754 cf::reload_config; 3816 cf::reload_config;
3755 3817
3756 warn "loading extensions"; 3818 warn "loading extensions";
… …
3818 3880
3819our @WAIT_FOR_TICK; 3881our @WAIT_FOR_TICK;
3820our @WAIT_FOR_TICK_BEGIN; 3882our @WAIT_FOR_TICK_BEGIN;
3821 3883
3822sub wait_for_tick { 3884sub wait_for_tick {
3823 return if tick_inhibit || $Coro::current == $Coro::main; 3885 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3824 3886
3825 my $signal = new Coro::Signal; 3887 my $signal = new Coro::Signal;
3826 push @WAIT_FOR_TICK, $signal; 3888 push @WAIT_FOR_TICK, $signal;
3827 $signal->wait; 3889 $signal->wait;
3828} 3890}
3829 3891
3830sub wait_for_tick_begin { 3892sub wait_for_tick_begin {
3831 return if tick_inhibit || $Coro::current == $Coro::main; 3893 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3832 3894
3833 my $signal = new Coro::Signal; 3895 my $signal = new Coro::Signal;
3834 push @WAIT_FOR_TICK_BEGIN, $signal; 3896 push @WAIT_FOR_TICK_BEGIN, $signal;
3835 $signal->wait; 3897 $signal->wait;
3836} 3898}
… …
3963 LOG llevInfo, "[ABT] [suppressed]\n"; 4025 LOG llevInfo, "[ABT] [suppressed]\n";
3964 } 4026 }
3965} 4027}
3966 4028
3967# load additional modules 4029# load additional modules
3968use cf::pod; 4030require "cf/$_.pm" for @EXTRA_MODULES;
4031cf::_connect_to_perl_2;
3969 4032
3970END { cf::emergency_save } 4033END { cf::emergency_save }
3971 4034
39721 40351
3973 4036

Diff Legend

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