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.427 by root, Sat Apr 26 12:25:45 2008 UTC vs.
Revision 1.573 by root, Sun May 8 12:40:42 2011 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,2009,2010,2011 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 utf8; 25use common::sense;
25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV 3.2; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp ();
35 36
37use Guard ();
36use Coro 4.50 (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
39use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
43use Coro::AIO; 48use Coro::AIO;
44use Coro::BDB; 49use Coro::BDB 1.6;
45use Coro::Storable; 50use Coro::Storable;
46use Coro::Util (); 51use Coro::Util ();
47 52
48use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
49use BDB (); 54use BDB ();
50use Data::Dumper; 55use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 56use Fcntl;
53use YAML (); 57use YAML::XS ();
54use IO::AIO 2.51 (); 58use IO::AIO ();
55use Time::HiRes; 59use Time::HiRes;
56use Compress::LZF; 60use Compress::LZF;
57use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
58 64
59# configure various modules to our taste 65# configure various modules to our taste
60# 66#
61$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64 75
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66 78
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
71 85
72our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
82our $DATADIR = datadir; 99our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
86our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
92our %RESOURCE; 113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
93 120
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 123our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
99 125
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 129our $DB_ENV;
105 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
106our %CFG; 133our %CFG;
107 134
108our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
110our $NOW; 138our $NOW;
111 139
112our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
113our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
114our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 147our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 148our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 149our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 150our $TICK_START; # for load detecting purposes
123 151
152our @POST_INIT;
153
154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
159
124binmode STDOUT; 160binmode STDOUT;
125binmode STDERR; 161binmode STDERR;
126 162
127# read virtual server time, if available 163# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 164unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 165 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 166 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 167 $RUNTIME = <$fh> + 0.;
132} 168}
169
170eval "sub TICK() { $TICK } 1" or die;
133 171
134mkdir $_ 172mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 173 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 174
137our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
138 176
139sub cf::map::normalise; 177sub cf::map::normalise;
140 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
141############################################################################# 183#############################################################################
142 184
185%REFLECT = ();
186for (@REFLECT) {
187 my $reflect = JSON::XS::decode_json $_;
188 $REFLECT{$reflect->{class}} = $reflect;
189}
190
191# this is decidedly evil
192$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
193
194#############################################################################
195
143=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
144 197
145=over 4 198=over 4
146 199
147=item $cf::UPTIME 200=item $cf::UPTIME
148 201
149The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
150 218
151=item $cf::RUNTIME 219=item $cf::RUNTIME
152 220
153The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
154every server tick. 222every server tick.
160Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
161directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
162unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
163database environment. 231database environment.
164 232
165=item $cf::NOW
166
167The time of the last (current) server tick.
168
169=item $cf::TICK
170
171The interval between server ticks, in seconds.
172
173=item $cf::LOADAVG 233=item $cf::LOADAVG
174 234
175The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
176(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
177objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
186from wherever your confdir points to. 246from wherever your confdir points to.
187 247
188=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
189 249
190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
191returns directly I<after> the tick processing (and consequently, can only wake one process 251returns directly I<after> the tick processing (and consequently, can only wake one thread
192per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
193 253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
265
266=cut
267
268sub wait_for_tick();
269sub wait_for_tick_begin();
270
194=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
195 272
196This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 274C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 275that call.
199 276
277=item %cf::REFLECT
278
279Contains, for each (C++) class name, a hash reference with information
280about object members (methods, scalars, arrays and flags) and other
281metadata, which is useful for introspection.
282
200=back 283=back
201 284
202=cut 285=cut
203 286
204BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
205 *CORE::GLOBAL::warn = sub { 288sub warn (@) { LOG llevWarn , join "", @_ }
289sub info (@) { LOG llevInfo , join "", @_ }
290sub debug(@) { LOG llevDebug, join "", @_ }
291sub trace(@) { LOG llevTrace, join "", @_ }
292
293$Coro::State::WARNHOOK = sub {
206 my $msg = join "", @_; 294 my $msg = join "", @_;
207 295
208 $msg .= "\n" 296 $msg .= "\n"
209 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
210 298
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 299 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 300
213 LOG llevError, $msg; 301 LOG llevWarn, $msg;
214 }; 302};
215}
216 303
217$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
219 306
220 if ($Coro::current == $Coro::main) {#d# 307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 311 return;#d#
223 }#d# 312 }#d#
224 313
225 # kill coroutine otherwise 314 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 315 Coro::terminate
228}; 316};
229
230$SIG{__DIE__} = sub { }; #d#?
231 317
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 328for my $pkg (qw(
243 cf::global cf::attachable 329 cf::global cf::attachable
244 cf::object cf::object::player 330 cf::object cf::object::player
245 cf::client cf::player 331 cf::client cf::player
246 cf::arch cf::living 332 cf::arch cf::living
333 cf::map cf::mapspace
247 cf::map cf::party cf::region 334 cf::party cf::region
248)) { 335)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 337}
252 338
253$EV::DIED = sub { 339$EV::DIED = sub {
254 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
255}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
256 347
257############################################################################# 348#############################################################################
258 349
259=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
260 351
281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
282 $d 373 $d
283 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
284} 375}
285 376
377=item $scalar = load_file $path
378
379Loads the given file from path and returns its contents. Croaks on error
380and can block.
381
382=cut
383
384sub load_file($) {
385 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!";
387
388 $data
389}
390
286=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
287 392
288Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
289 394
290=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 401our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 402
298sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
300 405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
414=item $ref = cf::decode_yaml $scalar
415
416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
417
418=cut
419
420sub decode_yaml($) {
421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
435}
436
437=item cf::post_init { BLOCK }
438
439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
440but I<before> the server starts ticking again.
441
442The codeblock will have a single boolean argument to indicate whether this
443is a reload or not.
444
445=cut
446
447sub post_init(&) {
448 push @POST_INIT, shift;
449}
450
451sub _post_init {
452 trace "running post_init jobs";
453
454 # run them in parallel...
455
456 my @join;
457
458 while () {
459 push @join, map &Coro::async ($_, 0), @POST_INIT;
460 @POST_INIT = ();
461
462 @join or last;
463
464 (pop @join)->join;
465 }
466}
467
301=item cf::lock_wait $string 468=item cf::lock_wait $string
302 469
303Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
304 471
305=item my $lock = cf::lock_acquire $string 472=item my $lock = cf::lock_acquire $string
306 473
307Wait until the given lock is available and then acquires it and returns 474Wait until the given lock is available and then acquires it and returns
308a Coro::guard object. If the guard object gets destroyed (goes out of scope, 475a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 476for example when the coroutine gets canceled), the lock is automatically
310returned. 477returned.
311 478
312Locks are *not* recursive, locking from the same coro twice results in a 479Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 480deadlocked coro.
319 486
320Return true if the lock is currently active, i.e. somebody has locked it. 487Return true if the lock is currently active, i.e. somebody has locked it.
321 488
322=cut 489=cut
323 490
324our %LOCK; 491our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 492
327sub lock_wait($) { 493sub lock_wait($) {
328 my ($key) = @_; 494 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 495}
341 496
342sub lock_acquire($) { 497sub lock_acquire($) {
343 my ($key) = @_; 498 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 499}
357 500
358sub lock_active($) { 501sub lock_active($) {
359 my ($key) = @_; 502 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 503}
363 504
364sub freeze_mainloop { 505sub freeze_mainloop {
365 tick_inhibit_inc; 506 tick_inhibit_inc;
366 507
367 Coro::guard \&tick_inhibit_dec; 508 &Guard::guard (\&tick_inhibit_dec);
368} 509}
369 510
370=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
371 512
372Like EV::periodic, but randomly selects a starting point so that the actions 513Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer. 514get spread over time.
374 515
375=cut 516=cut
376 517
377sub periodic($$) { 518sub periodic($$) {
378 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
382 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
383} 524}
384 525
385=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
386 527
387Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
388This call blocks and returns only when you have at least C<$time> seconds 529(default: 0): This call blocks and returns only when you have at least
389of cpu time till the next tick. The slot is only valid till the next cede. 530C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede.
532
533Background jobs should use a priority les than zero, interactive jobs
534should use 100 or more.
390 535
391The optional C<$name> can be used to identify the job to run. It might be 536The optional C<$name> can be used to identify the job to run. It might be
392used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
393 538
394Useful for short background jobs. 539Useful for short background jobs.
395 540
396=cut 541=cut
397 542
398our @SLOT_QUEUE; 543our @SLOT_QUEUE;
399our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
400 546
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
404 550
405 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
406 553
407 while () { 554 while () {
408 next_job: 555 next_job:
556
409 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 558
411 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 563 $job->[2]->send;
415 Coro::cede; 564 Coro::cede;
416 goto next_job; 565 goto next_job;
417 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 568 }
419 } 569 }
420 570
421 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 572 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
424 $signal->wait;
425 } else { 574 } else {
575 $busy = 0;
426 Coro::schedule; 576 Coro::schedule;
427 } 577 }
428 } 578 }
429}; 579};
430 580
431sub get_slot($;$$) { 581sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main; 582 return if tick_inhibit || $Coro::current == $Coro::main;
433 583
434 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
435 585
436 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
437 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
438 589
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
467=cut 618=cut
468 619
469sub sync_job(&) { 620sub sync_job(&) {
470 my ($job) = @_; 621 my ($job) = @_;
471 622
472 if ($Coro::current == $Coro::main) { 623 if (in_main) {
473 my $time = EV::time; 624 my $time = AE::time;
474 625
475 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
476 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
477 628
478 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
479 630
480 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
481 632
482 my $busy = 1; 633 my $busy = 1;
483 my @res; 634 my @res;
484 635
485 (async { 636 (async {
486 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
487 @res = eval { $job->() }; 638 @res = eval { $job->() };
488 warn $@ if $@; 639 error $@ if $@;
489 undef $busy; 640 undef $busy;
490 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
491 642
492 while ($busy) { 643 while ($busy) {
493 if (Coro::nready) { 644 if (Coro::nready) {
495 } else { 646 } else {
496 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
497 } 648 }
498 } 649 }
499 650
500 my $time = EV::time - $time; 651 my $time = AE::time - $time;
501 652
502 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
503 654
504 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
505 } else { 656 } else {
527 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
528 679
529 $coro 680 $coro
530} 681}
531 682
532=item fork_call { }, $args 683=item fork_call { }, @args
533 684
534Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
535process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
536Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
537never block itself or use any form of event handling. 688never block itself or use any form of event handling.
538 689
539=cut 690=cut
540 691
692sub post_fork {
693 reset_signals;
694}
695
541sub fork_call(&@) { 696sub fork_call(&@) {
542 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
543 698
544 # we seemingly have to make a local copy of the whole thing, 699 # we seemingly have to make a local copy of the whole thing,
545 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
546 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
547 702
548 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
549 reset_signals; 704 cf::post_fork;
550 &$cb 705 &$cb
551 }, @args; 706 } @args;
552 707
553 wantarray ? @res : $res[-1] 708 wantarray ? @res : $res[-1]
709}
710
711sub objinfo {
712 (
713 "counter value" => cf::object::object_count,
714 "objects created" => cf::object::create_count,
715 "objects destroyed" => cf::object::destroy_count,
716 "freelist size" => cf::object::free_count,
717 "allocated objects" => cf::object::objects_size,
718 "active objects" => cf::object::actives_size,
719 )
554} 720}
555 721
556=item $coin = coin_from_name $name 722=item $coin = coin_from_name $name
557 723
558=cut 724=cut
595within each server. 761within each server.
596 762
597=cut 763=cut
598 764
599sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
600 my ($name) = @_; 769 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
602 771
603 eval { 772 eval {
604 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
614} 783}
615 784
616our $DB; 785our $DB;
617 786
618sub db_init { 787sub db_init {
619 cf::sync_job {
620 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
621 };
622} 789}
623 790
624sub db_get($$) { 791sub db_get($$) {
625 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
626 793
627 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
628 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
629 798
630 $! ? () 799 $! ? ()
631 : $data 800 : $data
632 }
633} 801}
634 802
635sub db_put($$$) { 803sub db_put($$$) {
636 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
637 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
665 833
666 my @data; 834 my @data;
667 my $md5; 835 my $md5;
668 836
669 for (0 .. $#$src) { 837 for (0 .. $#$src) {
670 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
671 or Carp::croak "$src->[$_]: $!";
672 } 839 }
673 840
674 # if processing is expensive, check 841 # if processing is expensive, check
675 # checksum first 842 # checksum first
676 if (1) { 843 if (1) {
693 860
694 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
695 my $data = $process->(\@data); 862 my $data = $process->(\@data);
696 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
697 864
698 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
699 866
700 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
701 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
702 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
703 870
713 880
714=cut 881=cut
715 882
716sub datalog($@) { 883sub datalog($@) {
717 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
718 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
719} 886}
720 887
721=back 888=back
722 889
723=cut 890=cut
724 891
725############################################################################# 892#############################################################################
726 893
727=head2 ATTACHABLE OBJECTS 894=head2 ATTACHABLE OBJECTS
728 895
729Many objects in crossfire are so-called attachable objects. That means you can 896Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 897attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 898to it. All such attachable objects support the following methods.
732 899
733In the following description, CLASS can be any of C<global>, C<object> 900In the following description, CLASS can be any of C<global>, C<object>
734C<player>, C<client> or C<map> (i.e. the attachable objects in 901C<player>, C<client> or C<map> (i.e. the attachable objects in
784=item cf::CLASS::attachment $name, ... 951=item cf::CLASS::attachment $name, ...
785 952
786Register an attachment by C<$name> through which attachable objects of the 953Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 954given CLASS can refer to this attachment.
788 955
789Some classes such as crossfire maps and objects can specify attachments 956Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 957that are attached at load/instantiate time, thus the need for a name.
791 958
792These calls expect any number of the following handler/hook descriptions: 959These calls expect any number of the following handler/hook descriptions:
793 960
794=over 4 961=over 4
918 1085
919 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
920 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
921 1088
922 } elsif (ref $type) { 1089 } elsif (ref $type) {
923 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
924 1091
925 } else { 1092 } else {
926 shift @arg; 1093 shift @arg;
927 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
928 } 1095 }
929 } 1096 }
930} 1097}
931 1098
932sub _object_attach { 1099sub _object_attach {
942 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
943 } 1110 }
944 1111
945 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
946 } else { 1113 } else {
947 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
948 } 1115 }
949 1116
950 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
951} 1118}
952 1119
1011 1178
1012 for (@$callbacks) { 1179 for (@$callbacks) {
1013 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1014 1181
1015 if ($@) { 1182 if ($@) {
1016 warn "$@";
1017 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1018 override; 1184 override;
1019 } 1185 }
1020 1186
1021 return 1 if $override; 1187 return 1 if $override;
1022 } 1188 }
1085 1251
1086sub reattach { 1252sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1253 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1254 my ($obj) = @_;
1089 1255
1256 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1257 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1258
1092 my $registry = $obj->registry; 1259 my $registry = $obj->registry;
1093 1260
1094 @$registry = (); 1261 @$registry = ();
1095 1262
1100 for (@$attach) { 1267 for (@$attach) {
1101 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1102 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1103 } 1270 }
1104 } else { 1271 } else {
1105 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1106 } 1273 }
1107 } 1274 }
1108} 1275}
1109 1276
1110cf::attachable->attach ( 1277cf::attachable->attach (
1137 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1138 1305
1139 sync_job { 1306 sync_job {
1140 if (length $$rdata) { 1307 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1144 1312
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1316 if ($cf::USE_FSYNC) {
1317 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;
1318 aio_fsync $fh;
1319 }
1149 aio_close $fh; 1320 aio_close $fh;
1150 1321
1151 if (@$objs) { 1322 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1323 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1324 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1327 if ($cf::USE_FSYNC) {
1328 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;
1329 aio_fsync $fh;
1330 }
1157 aio_close $fh; 1331 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1333 }
1160 } else { 1334 } else {
1161 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
1162 } 1336 }
1163 1337
1164 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1339
1340 $filename =~ s%/[^/]+$%%;
1341 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1342 } else {
1166 warn "FATAL: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1167 } 1344 }
1168 } else { 1345 } else {
1169 aio_unlink $filename; 1346 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1171 } 1348 }
1195 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs}; 1373 $av = $st->{objs};
1197 } 1374 }
1198 1375
1199 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1200 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1201 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1202 1380
1203 ($data, $av) 1381 ($data, $av)
1204} 1382}
1205 1383
1206=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1262 my ($name, $cb) = @_; 1440 my ($name, $cb) = @_;
1263 1441
1264 $EXTICMD{$name} = $cb; 1442 $EXTICMD{$name} = $cb;
1265} 1443}
1266 1444
1445use File::Glob ();
1446
1267cf::player->attach ( 1447cf::player->attach (
1268 on_command => sub { 1448 on_unknown_command => sub {
1269 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1270 1450
1271 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1272 or return; 1452 or return;
1273 1453
1296 1476
1297 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1298 if $reply; 1478 if $reply;
1299 1479
1300 } else { 1480 } else {
1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1302 } 1482 }
1303 1483
1304 cf::override; 1484 cf::override;
1305 }, 1485 },
1306); 1486);
1307 1487
1488# "readahead" all extensions
1489sub cache_extensions {
1490 my $grp = IO::AIO::aio_group;
1491
1492 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1493 for (grep /\.ext$/, @{$_[0]}) {
1494 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1495 }
1496 };
1497
1498 $grp
1499}
1500
1308sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1309 cf::sync_job { 1504 cf::sync_job {
1310 my %todo; 1505 my %todo;
1311 1506
1312 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1313 next unless -r $path; 1508 next unless -r $path;
1331 1526
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1529
1335 $ext{source} = 1530 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1337 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1338 . $source 1533 . $source
1339 . "\n};\n1"; 1534 . "\n};\n1";
1340 1535
1341 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
1342 } 1537 }
1343 1538
1539 my $pass = 0;
1344 my %done; 1540 my %done;
1345 while (%todo) { 1541 while (%todo) {
1346 my $progress; 1542 my $progress;
1347 1543
1544 ++$pass;
1545
1546 ext:
1348 while (my ($k, $v) = each %todo) { 1547 while (my ($k, $v) = each %todo) {
1349 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1350 goto skip 1549 next ext
1351 unless exists $done{$_}; 1550 unless exists $done{$_};
1352 } 1551 }
1353 1552
1354 warn "... loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1355 1554
1356 unless (eval $v->{source}) { 1555 my $active = eval $v->{source};
1556
1557 if (length $@) {
1357 my $msg = $@ ? "$v->{path}: $@\n" 1558 error "$v->{path}: $@\n";
1358 : "$v->{base}: extension inactive.\n";
1359 1559
1360 if (exists $v->{meta}{mandatory}) {
1361 warn $msg;
1362 cf::cleanup "mandatory extension failed to load, exiting."; 1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1363 } 1561 if exists $v->{meta}{mandatory};
1364 1562
1365 warn $msg; 1563 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1564 delete $todo{$k};
1565 } else {
1566 $done{$k} = delete $todo{$k};
1567 push @EXTS, $v->{pkg};
1568 $progress = 1;
1569
1570 info "$v->{base}: extension inactive.\n"
1571 unless $active;
1366 } 1572 }
1367
1368 $done{$k} = delete $todo{$k};
1369 push @EXTS, $v->{pkg};
1370 $progress = 1;
1371 } 1573 }
1372 1574
1373 skip: 1575 unless ($progress) {
1374 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1576 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1375 unless $progress; 1577
1578 while (my ($k, $v) = each %todo) {
1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1580 if exists $v->{meta}{mandatory};
1581 }
1582
1583 last;
1584 }
1376 } 1585 }
1377 }; 1586 };
1378} 1587}
1379 1588
1380############################################################################# 1589#############################################################################
1381 1590
1382=back 1591=back
1383 1592
1384=head2 CORE EXTENSIONS 1593=head2 CORE EXTENSIONS
1385 1594
1386Functions and methods that extend core crossfire objects. 1595Functions and methods that extend core deliantra objects.
1387 1596
1388=cut 1597=cut
1389 1598
1390package cf::player; 1599package cf::player;
1391 1600
1434 1643
1435sub exists($) { 1644sub exists($) {
1436 my ($login) = @_; 1645 my ($login) = @_;
1437 1646
1438 $cf::PLAYER{$login} 1647 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1648 or !aio_stat path $login
1440} 1649}
1441 1650
1442sub find($) { 1651sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1652 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1653 my $login = $_[0];
1464 $cf::PLAYER{$login} = $pl 1673 $cf::PLAYER{$login} = $pl
1465 } 1674 }
1466 } 1675 }
1467} 1676}
1468 1677
1678cf::player->attach (
1679 on_load => sub {
1680 my ($pl, $path) = @_;
1681
1682 # restore slots saved in save, below
1683 my $slots = delete $pl->{_slots};
1684
1685 $pl->ob->current_weapon ($slots->[0]);
1686 $pl->combat_ob ($slots->[1]);
1687 $pl->ranged_ob ($slots->[2]);
1688 },
1689);
1690
1469sub save($) { 1691sub save($) {
1470 my ($pl) = @_; 1692 my ($pl) = @_;
1471 1693
1472 return if $pl->{deny_save}; 1694 return if $pl->{deny_save};
1473 1695
1478 1700
1479 aio_mkdir playerdir $pl, 0770; 1701 aio_mkdir playerdir $pl, 0770;
1480 $pl->{last_save} = $cf::RUNTIME; 1702 $pl->{last_save} = $cf::RUNTIME;
1481 1703
1482 cf::get_slot 0.01; 1704 cf::get_slot 0.01;
1705
1706 # save slots, to be restored later
1707 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1483 1708
1484 $pl->save_pl ($path); 1709 $pl->save_pl ($path);
1485 cf::cede_to_tick; 1710 cf::cede_to_tick;
1486} 1711}
1487 1712
1519 my ($pl) = @_; 1744 my ($pl) = @_;
1520 1745
1521 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1522 1747
1523 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1524 $pl->password ("*"); # this should lock out the player until we nuked the dir 1749 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1525 1750
1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1527 $pl->deactivate; 1752 $pl->deactivate;
1753
1754 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1528 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1529 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1530 1759
1531 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1532 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1533 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
1587 \@logins 1816 \@logins
1588} 1817}
1589 1818
1590=item $player->maps 1819=item $player->maps
1591 1820
1821=item cf::player::maps $login
1822
1592Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1593player. May block. 1824player. May block.
1594 1825
1595=cut 1826=cut
1596 1827
1613 } 1844 }
1614 1845
1615 \@paths 1846 \@paths
1616} 1847}
1617 1848
1618=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1849=item $protocol_xml = $player->expand_cfpod ($cfpod)
1619 1850
1620Expand crossfire pod fragments into protocol xml. 1851Expand deliantra pod fragments into protocol xml.
1621
1622=cut
1623
1624use re 'eval';
1625
1626my $group;
1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1629 (?:
1630 \ (.*?)\ (?{ $group = $^N })
1631 | < (??{$interior}) >
1632 )
1633}x;
1634
1635sub expand_cfpod {
1636 my ($self, $pod) = @_;
1637
1638 my $xml;
1639
1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1643
1644 $group =~ s/&/&amp;/g;
1645 $group =~ s/</&lt;/g;
1646
1647 $xml .= $group;
1648 } elsif ($pod =~ m%\G
1649 ([BCGHITU])
1650 <
1651 (?:
1652 ([^<>]*) (?{ $group = $^N })
1653 | < $interior >
1654 )
1655 >
1656 %gcsx
1657 ) {
1658 my ($code, $data) = ($1, $group);
1659
1660 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662 } elsif ($code eq "I") {
1663 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664 } elsif ($code eq "U") {
1665 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668 } elsif ($code eq "T") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670 } elsif ($code eq "G") {
1671 my ($male, $female) = split /\|/, $data;
1672 $data = $self->gender ? $female : $male;
1673 $xml .= expand_cfpod ($self, $data);
1674 } elsif ($code eq "H") {
1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1677 "")
1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1689
1690 for ($xml) {
1691 # create single paragraphs (very hackish)
1692 s/(?<=\S)\n(?=\w)/ /g;
1693
1694 # compress some whitespace
1695 s/\s+\n/\n/g; # ws line-ends
1696 s/\n\n+/\n/g; # double lines
1697 s/^\n+//; # beginning lines
1698 s/\n+$//; # ending lines
1699 }
1700
1701 $xml
1702}
1703
1704no re 'eval';
1705
1706sub hintmode {
1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1708 $_[0]{hintmode}
1709}
1710 1852
1711=item $player->ext_reply ($msgid, @msg) 1853=item $player->ext_reply ($msgid, @msg)
1712 1854
1713Sends an ext reply to the player. 1855Sends an ext reply to the player.
1714 1856
1746 1888
1747=cut 1889=cut
1748 1890
1749sub find_by_path($) { 1891sub find_by_path($) {
1750 my ($path) = @_; 1892 my ($path) = @_;
1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1751 1895
1752 my ($match, $specificity); 1896 my ($match, $specificity);
1753 1897
1754 for my $region (list) { 1898 for my $region (list) {
1755 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1784sub generate_random_map { 1928sub generate_random_map {
1785 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1786 1930
1787 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1788 1932
1789 # mit "rum" bekleckern, nicht
1790 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1794 $rmp->{exit_on_final_map},
1795 $rmp->{xsize}, $rmp->{ysize},
1796 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1797 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1798 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1799 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1800 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1801 (cf::region::find $rmp->{region}), $rmp->{custom}
1802 )
1803} 1934}
1804 1935
1805=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1806 1937
1807Register a handler for the map path matching the given regex at the 1938Register a handler for the map path matching the given regex at the
1812 1943
1813sub register { 1944sub register {
1814 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1815 my $pkg = caller; 1946 my $pkg = caller;
1816 1947
1817 no strict;
1818 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1819 1949
1820 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1821} 1951}
1822 1952
1823# also paths starting with '/' 1953# also paths starting with '/'
1824$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1825 1955
1826sub thawer_merge { 1956sub thawer_merge {
1827 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1828 1958
1829 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
1834} 1964}
1835 1965
1836sub normalise { 1966sub normalise {
1837 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1838 1968
1839 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1840 1970
1841 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1842 1972
1843 # map plan: 1973 # map plan:
1844 # 1974 #
1859 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1860 $path = "$base/$path"; 1990 $path = "$base/$path";
1861 } 1991 }
1862 1992
1863 for ($path) { 1993 for ($path) {
1864 redo if s{//}{/};
1865 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1866 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1867 } 1996 }
1868 1997
1869 $path 1998 $path
1883 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1884 return $self; 2013 return $self;
1885 } 2014 }
1886 } 2015 }
1887 2016
1888 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1889 () 2018 ()
1890} 2019}
1891 2020
2021# may re-bless or do other evil things
1892sub init { 2022sub init {
1893 my ($self) = @_; 2023 my ($self) = @_;
1894 2024
1895 $self 2025 $self
1896} 2026}
1927 2057
1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2058 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1929 "$UNIQUEDIR/$path" 2059 "$UNIQUEDIR/$path"
1930} 2060}
1931 2061
1932# and all this just because we cannot iterate over
1933# all maps in C++...
1934sub change_all_map_light {
1935 my ($change) = @_;
1936
1937 $_->change_map_light ($change)
1938 for grep $_->outdoor, values %cf::MAP;
1939}
1940
1941sub decay_objects { 2062sub decay_objects {
1942 my ($self) = @_; 2063 my ($self) = @_;
1943 2064
1944 return if $self->{deny_reset}; 2065 return if $self->{deny_reset};
1945 2066
1970 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1971 2092
1972 1 2093 1
1973} 2094}
1974 2095
2096# used to laod the header of an original map
1975sub load_header_orig { 2097sub load_header_orig {
1976 my ($self) = @_; 2098 my ($self) = @_;
1977 2099
1978 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1979} 2101}
1980 2102
2103# used to laod the header of an instantiated map
1981sub load_header_temp { 2104sub load_header_temp {
1982 my ($self) = @_; 2105 my ($self) = @_;
1983 2106
1984 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1985} 2108}
1986 2109
2110# called after loading the header from an instantiated map
1987sub prepare_temp { 2111sub prepare_temp {
1988 my ($self) = @_; 2112 my ($self) = @_;
1989 2113
1990 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1991 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1992 # safety 2116 # safety
1993 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1994 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1995} 2119}
1996 2120
2121# called after loading the header from an original map
1997sub prepare_orig { 2122sub prepare_orig {
1998 my ($self) = @_; 2123 my ($self) = @_;
1999 2124
2000 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
2001 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
2025 2150
2026sub find; 2151sub find;
2027sub find { 2152sub find {
2028 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
2029 2154
2155 cf::cede_to_tick;
2156
2030 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
2031 2158
2032 cf::lock_wait "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2033 cf::lock_wait "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
2034 2161
2035 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
2036 my $guard1 = cf::lock_acquire "map_find:$path";
2037 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2038
2039 my $map = new_from_path cf::map $path 2163 my $map = new_from_path cf::map $path
2040 or return; 2164 or return;
2041 2165
2042 $map->{last_save} = $cf::RUNTIME; 2166 $map->{last_save} = $cf::RUNTIME;
2043 2167
2045 or return; 2169 or return;
2046 2170
2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2171 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2048 # doing this can freeze the server in a sync job, obviously 2172 # doing this can freeze the server in a sync job, obviously
2049 #$cf::WAIT_FOR_TICK->wait; 2173 #$cf::WAIT_FOR_TICK->wait;
2174 undef $guard2;
2050 undef $guard1; 2175 undef $guard1;
2051 undef $guard2;
2052 $map->reset; 2176 $map->reset;
2053 return find $path; 2177 return find $path;
2054 } 2178 }
2055 2179
2056 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
2057 } 2181 }
2058} 2182}
2059 2183
2060sub pre_load { } 2184sub pre_load { }
2061sub post_load { } 2185#sub post_load { } # XS
2062 2186
2063sub load { 2187sub load {
2064 my ($self) = @_; 2188 my ($self) = @_;
2065 2189
2066 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
2069 2193
2070 { 2194 {
2071 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2072 2196
2073 return unless $self->valid; 2197 return unless $self->valid;
2074 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2075
2076 $self->in_memory (cf::MAP_LOADING);
2077 2199
2078 $self->alloc; 2200 $self->alloc;
2079 2201
2080 $self->pre_load; 2202 $self->pre_load;
2081 cf::cede_to_tick; 2203 cf::cede_to_tick;
2082 2204
2205 if (exists $self->{load_path}) {
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2207 $f->skip_block;
2085 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2086 or return; 2209 or return;
2087 2210
2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2211 $self->post_load_original
2089 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2090 2213
2091 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2215 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2094 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2095 $self->clear_unique_items; 2218 $self->clear_unique_items;
2096 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2097 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2098 } 2222 }
2099 } 2223 }
2100 }
2101 2224
2102 $f->resolve_delayed_derefs; 2225 $f->resolve_delayed_derefs;
2226 } else {
2227 $self->post_load_original
2228 if delete $self->{load_original};
2229 }
2230
2231 $self->state (cf::MAP_INACTIVE);
2103 2232
2104 cf::cede_to_tick; 2233 cf::cede_to_tick;
2105 # now do the right thing for maps 2234 # now do the right thing for maps
2106 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2107 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
2111 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2112 $self->decay_objects; 2241 $self->decay_objects;
2113 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2114 $self->update_buttons; 2243 $self->update_buttons;
2115 cf::cede_to_tick; 2244 cf::cede_to_tick;
2116 $self->set_darkness_map; 2245 #$self->activate; # no longer activate maps automatically
2117 cf::cede_to_tick;
2118 $self->activate;
2119 } 2246 }
2120 2247
2121 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2122 $self->last_access ($cf::RUNTIME); 2249 $self->last_access ($cf::RUNTIME);
2123
2124 $self->in_memory (cf::MAP_ACTIVE);
2125 } 2250 }
2126 2251
2127 $self->post_load; 2252 $self->post_load;
2128}
2129 2253
2254 1
2255}
2256
2257# customize the map for a given player, i.e.
2258# return the _real_ map. used by e.g. per-player
2259# maps to change the path to ~playername/mappath
2130sub customise_for { 2260sub customise_for {
2131 my ($self, $ob) = @_; 2261 my ($self, $ob) = @_;
2132 2262
2133 return find "~" . $ob->name . "/" . $self->{path} 2263 return find "~" . $ob->name . "/" . $self->{path}
2134 if $self->per_player; 2264 if $self->per_player;
2150 or next; 2280 or next;
2151 $neigh = find $neigh, $map 2281 $neigh = find $neigh, $map
2152 or next; 2282 or next;
2153 $neigh->load; 2283 $neigh->load;
2154 2284
2285 # now find the diagonal neighbours
2155 push @neigh, 2286 push @neigh,
2156 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2287 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2157 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2288 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2158 } 2289 }
2159 2290
2166} 2297}
2167 2298
2168sub find_sync { 2299sub find_sync {
2169 my ($path, $origin) = @_; 2300 my ($path, $origin) = @_;
2170 2301
2171 cf::sync_job { find $path, $origin } 2302 # it's a bug to call this from the main context
2303 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2304 if $Coro::current == $Coro::main;
2305
2306 find $path, $origin
2172} 2307}
2173 2308
2174sub do_load_sync { 2309sub do_load_sync {
2175 my ($map) = @_; 2310 my ($map) = @_;
2176 2311
2312 # it's a bug to call this from the main context
2177 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2313 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2178 if $Coro::current == $Coro::main; 2314 if $Coro::current == $Coro::main;
2179 2315
2180 cf::sync_job { $map->load }; 2316 $map->load;
2181} 2317}
2182 2318
2183our %MAP_PREFETCH; 2319our %MAP_PREFETCH;
2184our $MAP_PREFETCHER = undef; 2320our $MAP_PREFETCHER = undef;
2185 2321
2186sub find_async { 2322sub find_async {
2187 my ($path, $origin, $load) = @_; 2323 my ($path, $origin, $load) = @_;
2188 2324
2189 $path = normalise $path, $origin && $origin->{path}; 2325 $path = normalise $path, $origin;
2190 2326
2191 if (my $map = $cf::MAP{$path}) { 2327 if (my $map = $cf::MAP{$path}) {
2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2328 return $map if !$load || $map->linkable;
2193 } 2329 }
2194 2330
2195 $MAP_PREFETCH{$path} |= $load; 2331 $MAP_PREFETCH{$path} |= $load;
2196 2332
2197 $MAP_PREFETCHER ||= cf::async { 2333 $MAP_PREFETCHER ||= cf::async {
2211 $MAP_PREFETCHER->prio (6); 2347 $MAP_PREFETCHER->prio (6);
2212 2348
2213 () 2349 ()
2214} 2350}
2215 2351
2352# common code, used by both ->save and ->swapout
2216sub save { 2353sub _save {
2217 my ($self) = @_; 2354 my ($self) = @_;
2218
2219 my $lock = cf::lock_acquire "map_data:$self->{path}";
2220 2355
2221 $self->{last_save} = $cf::RUNTIME; 2356 $self->{last_save} = $cf::RUNTIME;
2222 2357
2223 return unless $self->dirty; 2358 return unless $self->dirty;
2224 2359
2244 } else { 2379 } else {
2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2380 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2246 } 2381 }
2247} 2382}
2248 2383
2384sub save {
2385 my ($self) = @_;
2386
2387 my $lock = cf::lock_acquire "map_data:$self->{path}";
2388
2389 $self->_save;
2390}
2391
2249sub swap_out { 2392sub swap_out {
2250 my ($self) = @_; 2393 my ($self) = @_;
2251 2394
2252 # save first because save cedes
2253 $self->save;
2254
2255 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2395 my $lock = cf::lock_acquire "map_data:$self->{path}";
2256 2396
2397 return if !$self->linkable;
2398 return if $self->{deny_save};
2257 return if $self->players; 2399 return if $self->players;
2258 return if $self->in_memory != cf::MAP_ACTIVE; 2400
2401 # first deactivate the map and "unlink" it from the core
2402 $self->deactivate;
2403 $_->clear_links_to ($self) for values %cf::MAP;
2404 $self->state (cf::MAP_SWAPPED);
2405
2406 # then atomically save
2407 $self->_save;
2408
2409 # then free the map
2410 $self->clear;
2411}
2412
2413sub reset_at {
2414 my ($self) = @_;
2415
2416 # TODO: safety, remove and allow resettable per-player maps
2259 return if $self->{deny_save}; 2417 return 1e99 if $self->{deny_reset};
2260 2418
2419 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2420 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2421
2422 $time + $to
2423}
2424
2425sub should_reset {
2426 my ($self) = @_;
2427
2428 $self->reset_at <= $cf::RUNTIME
2429}
2430
2431sub reset {
2432 my ($self) = @_;
2433
2434 my $lock = cf::lock_acquire "map_data:$self->{path}";
2435
2436 return if $self->players;
2437
2438 cf::trace "resetting map ", $self->path, "\n";
2439
2261 $self->in_memory (cf::MAP_SWAPPED); 2440 $self->state (cf::MAP_SWAPPED);
2441
2442 # need to save uniques path
2443 unless ($self->{deny_save}) {
2444 my $uniq = $self->uniq_path; utf8::encode $uniq;
2445
2446 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2447 if $uniq;
2448 }
2449
2450 delete $cf::MAP{$self->path};
2262 2451
2263 $self->deactivate; 2452 $self->deactivate;
2264 $_->clear_links_to ($self) for values %cf::MAP; 2453 $_->clear_links_to ($self) for values %cf::MAP;
2265 $self->clear; 2454 $self->clear;
2266}
2267
2268sub reset_at {
2269 my ($self) = @_;
2270
2271 # TODO: safety, remove and allow resettable per-player maps
2272 return 1e99 if $self->{deny_reset};
2273
2274 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2275 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2276
2277 $time + $to
2278}
2279
2280sub should_reset {
2281 my ($self) = @_;
2282
2283 $self->reset_at <= $cf::RUNTIME
2284}
2285
2286sub reset {
2287 my ($self) = @_;
2288
2289 my $lock = cf::lock_acquire "map_data:$self->{path}";
2290
2291 return if $self->players;
2292
2293 warn "resetting map ", $self->path;
2294
2295 $self->in_memory (cf::MAP_SWAPPED);
2296
2297 # need to save uniques path
2298 unless ($self->{deny_save}) {
2299 my $uniq = $self->uniq_path; utf8::encode $uniq;
2300
2301 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2302 if $uniq;
2303 }
2304
2305 delete $cf::MAP{$self->path};
2306
2307 $self->deactivate;
2308 $_->clear_links_to ($self) for values %cf::MAP;
2309 $self->clear;
2310 2455
2311 $self->unlink_save; 2456 $self->unlink_save;
2312 $self->destroy; 2457 $self->destroy;
2313} 2458}
2314 2459
2322 2467
2323 delete $cf::MAP{$self->path}; 2468 delete $cf::MAP{$self->path};
2324 2469
2325 $self->unlink_save; 2470 $self->unlink_save;
2326 2471
2327 bless $self, "cf::map"; 2472 bless $self, "cf::map::wrap";
2328 delete $self->{deny_reset}; 2473 delete $self->{deny_reset};
2329 $self->{deny_save} = 1; 2474 $self->{deny_save} = 1;
2330 $self->reset_timeout (1); 2475 $self->reset_timeout (1);
2331 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2476 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2332 2477
2389 : normalise $_ 2534 : normalise $_
2390 } @{ aio_readdir $UNIQUEDIR or [] } 2535 } @{ aio_readdir $UNIQUEDIR or [] }
2391 ] 2536 ]
2392} 2537}
2393 2538
2539=item cf::map::static_maps
2540
2541Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2542file in the shared directory excluding F</styles> and F</editor>). May
2543block.
2544
2545=cut
2546
2547sub static_maps() {
2548 my @dirs = "";
2549 my @maps;
2550
2551 while (@dirs) {
2552 my $dir = shift @dirs;
2553
2554 next if $dir eq "/styles" || $dir eq "/editor";
2555
2556 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2557 or return;
2558
2559 for (@$files) {
2560 s/\.map$// or next;
2561 utf8::decode $_;
2562 push @maps, "$dir/$_";
2563 }
2564
2565 push @dirs, map "$dir/$_", @$dirs;
2566 }
2567
2568 \@maps
2569}
2570
2394=back 2571=back
2395 2572
2396=head3 cf::object 2573=head3 cf::object
2397 2574
2398=cut 2575=cut
2459can be C<undef>. Does the right thing when the player is currently in a 2636can be C<undef>. Does the right thing when the player is currently in a
2460dialogue with the given NPC character. 2637dialogue with the given NPC character.
2461 2638
2462=cut 2639=cut
2463 2640
2641our $SAY_CHANNEL = {
2642 id => "say",
2643 title => "Map",
2644 reply => "say ",
2645 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2646};
2647
2648our $CHAT_CHANNEL = {
2649 id => "chat",
2650 title => "Chat",
2651 reply => "chat ",
2652 tooltip => "Player chat and shouts, global to the server.",
2653};
2654
2464# rough implementation of a future "reply" method that works 2655# rough implementation of a future "reply" method that works
2465# with dialog boxes. 2656# with dialog boxes.
2466#TODO: the first argument must go, split into a $npc->reply_to ( method 2657#TODO: the first argument must go, split into a $npc->reply_to ( method
2467sub cf::object::player::reply($$$;$) { 2658sub cf::object::player::reply($$$;$) {
2468 my ($self, $npc, $msg, $flags) = @_; 2659 my ($self, $npc, $msg, $flags) = @_;
2479 my $dialog = $pl->{npc_dialog}; 2670 my $dialog = $pl->{npc_dialog};
2480 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2671 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2481 2672
2482 } else { 2673 } else {
2483 $msg = $npc->name . " says: $msg" if $npc; 2674 $msg = $npc->name . " says: $msg" if $npc;
2484 $self->message ($msg, $flags); 2675 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2485 } 2676 }
2486 } 2677 }
2487} 2678}
2488 2679
2489=item $object->send_msg ($channel, $msg, $color, [extra...]) 2680=item $object->send_msg ($channel, $msg, $color, [extra...])
2514 2705
2515=item $player_object->enter_link 2706=item $player_object->enter_link
2516 2707
2517Freezes the player and moves him/her to a special map (C<{link}>). 2708Freezes the player and moves him/her to a special map (C<{link}>).
2518 2709
2519The player should be reasonably safe there for short amounts of time. You 2710The player should be reasonably safe there for short amounts of time (e.g.
2520I<MUST> call C<leave_link> as soon as possible, though. 2711for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2712though, as the player cannot control the character while it is on the link
2713map.
2521 2714
2522Will never block. 2715Will never block.
2523 2716
2524=item $player_object->leave_link ($map, $x, $y) 2717=item $player_object->leave_link ($map, $x, $y)
2525 2718
2545sub cf::object::player::enter_link { 2738sub cf::object::player::enter_link {
2546 my ($self) = @_; 2739 my ($self) = @_;
2547 2740
2548 $self->deactivate_recursive; 2741 $self->deactivate_recursive;
2549 2742
2743 ++$self->{_link_recursion};
2744
2550 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2745 return if UNIVERSAL::isa $self->map, "ext::map_link";
2551 2746
2552 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2747 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2553 if $self->map && $self->map->{path} ne "{link}"; 2748 if $self->map && $self->map->{path} ne "{link}";
2554 2749
2555 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2750 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2556} 2751}
2557 2752
2558sub cf::object::player::leave_link { 2753sub cf::object::player::leave_link {
2559 my ($self, $map, $x, $y) = @_; 2754 my ($self, $map, $x, $y) = @_;
2560 2755
2577 ($x, $y) = (-1, -1) 2772 ($x, $y) = (-1, -1)
2578 unless (defined $x) && (defined $y); 2773 unless (defined $x) && (defined $y);
2579 2774
2580 # use -1 or undef as default coordinates, not 0, 0 2775 # use -1 or undef as default coordinates, not 0, 0
2581 ($x, $y) = ($map->enter_x, $map->enter_y) 2776 ($x, $y) = ($map->enter_x, $map->enter_y)
2582 if $x <=0 && $y <= 0; 2777 if $x <= 0 && $y <= 0;
2583 2778
2584 $map->load; 2779 $map->load;
2585 $map->load_neighbours; 2780 $map->load_neighbours;
2586 2781
2587 return unless $self->contr->active; 2782 return unless $self->contr->active;
2588 $self->activate_recursive;
2589 2783
2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2784 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2591 $self->enter_map ($map, $x, $y); 2785 if ($self->enter_map ($map, $x, $y)) {
2592} 2786 # entering was successful
2787 delete $self->{_link_recursion};
2788 # only activate afterwards, to support waiting in hooks
2789 $self->activate_recursive;
2790 }
2593 2791
2792}
2793
2594=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2794=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2595 2795
2596Moves the player to the given map-path and coordinates by first freezing 2796Moves the player to the given map-path and coordinates by first freezing
2597her, loading and preparing them map, calling the provided $check callback 2797her, loading and preparing them map, calling the provided $check callback
2598that has to return the map if sucecssful, and then unfreezes the player on 2798that has to return the map if sucecssful, and then unfreezes the player on
2599the new (success) or old (failed) map position. In either case, $done will 2799the new (success) or old (failed) map position. In either case, $done will
2600be called at the end of this process. 2800be called at the end of this process.
2601 2801
2802Note that $check will be called with a potentially non-loaded map, so if
2803it needs a loaded map it has to call C<< ->load >>.
2804
2602=cut 2805=cut
2603 2806
2604our $GOTOGEN; 2807our $GOTOGEN;
2605 2808
2606sub cf::object::player::goto { 2809sub cf::object::player::goto {
2607 my ($self, $path, $x, $y, $check, $done) = @_; 2810 my ($self, $path, $x, $y, $check, $done) = @_;
2811
2812 if ($self->{_link_recursion} >= $MAX_LINKS) {
2813 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2814 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2815 ($path, $x, $y) = @$EMERGENCY_POSITION;
2816 }
2608 2817
2609 # do generation counting so two concurrent goto's will be executed in-order 2818 # do generation counting so two concurrent goto's will be executed in-order
2610 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2819 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2611 2820
2612 $self->enter_link; 2821 $self->enter_link;
2632 ($path, $x, $y) = (undef, undef, undef); 2841 ($path, $x, $y) = (undef, undef, undef);
2633 } 2842 }
2634 } 2843 }
2635 2844
2636 my $map = eval { 2845 my $map = eval {
2637 my $map = defined $path ? cf::map::find $path : undef; 2846 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2638 2847
2639 if ($map) { 2848 if ($map) {
2640 $map = $map->customise_for ($self); 2849 $map = $map->customise_for ($self);
2641 $map = $check->($map) if $check && $map; 2850 $map = $check->($map, $x, $y, $self) if $check && $map;
2642 } else { 2851 } else {
2643 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2852 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2644 } 2853 }
2645 2854
2646 $map 2855 $map
2654 if ($gen == $self->{_goto_generation}) { 2863 if ($gen == $self->{_goto_generation}) {
2655 delete $self->{_goto_generation}; 2864 delete $self->{_goto_generation};
2656 $self->leave_link ($map, $x, $y); 2865 $self->leave_link ($map, $x, $y);
2657 } 2866 }
2658 2867
2659 $done->() if $done; 2868 $done->($self) if $done;
2660 })->prio (1); 2869 })->prio (1);
2661} 2870}
2662 2871
2663=item $player_object->enter_exit ($exit_object) 2872=item $player_object->enter_exit ($exit_object)
2664 2873
2684} 2893}
2685 2894
2686sub prepare_random_map { 2895sub prepare_random_map {
2687 my ($exit) = @_; 2896 my ($exit) = @_;
2688 2897
2689 my $guard = cf::lock_acquire "exit_prepare:$exit";
2690
2691 # all this does is basically replace the /! path by 2898 # all this does is basically replace the /! path by
2692 # a new random map path (?random/...) with a seed 2899 # a new random map path (?random/...) with a seed
2693 # that depends on the exit object 2900 # that depends on the exit object
2694 2901
2695 my $rmp = parse_random_map_params $exit->msg; 2902 my $rmp = parse_random_map_params $exit->msg;
2697 if ($exit->map) { 2904 if ($exit->map) {
2698 $rmp->{region} = $exit->region->name; 2905 $rmp->{region} = $exit->region->name;
2699 $rmp->{origin_map} = $exit->map->path; 2906 $rmp->{origin_map} = $exit->map->path;
2700 $rmp->{origin_x} = $exit->x; 2907 $rmp->{origin_x} = $exit->x;
2701 $rmp->{origin_y} = $exit->y; 2908 $rmp->{origin_y} = $exit->y;
2909
2910 $exit->map->touch;
2702 } 2911 }
2703 2912
2704 $rmp->{random_seed} ||= $exit->random_seed; 2913 $rmp->{random_seed} ||= $exit->random_seed;
2705 2914
2706 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2915 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2710 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2919 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2711 aio_write $fh, 0, (length $data), $data, 0; 2920 aio_write $fh, 0, (length $data), $data, 0;
2712 undef $fh; 2921 undef $fh;
2713 aio_rename "$meta~", $meta; 2922 aio_rename "$meta~", $meta;
2714 2923
2924 my $slaying = "?random/$md5";
2925
2926 if ($exit->valid) {
2715 $exit->slaying ("?random/$md5"); 2927 $exit->slaying ("?random/$md5");
2716 $exit->msg (undef); 2928 $exit->msg (undef);
2929 }
2717 } 2930 }
2718} 2931}
2719 2932
2720sub cf::object::player::enter_exit { 2933sub cf::object::player::enter_exit {
2721 my ($self, $exit) = @_; 2934 my ($self, $exit) = @_;
2722 2935
2723 return unless $self->type == cf::PLAYER; 2936 return unless $self->type == cf::PLAYER;
2724 2937
2725 if ($exit->slaying eq "/!") {
2726 #TODO: this should de-fi-ni-te-ly not be a sync-job
2727 # the problem is that $exit might not survive long enough
2728 # so it needs to be done right now, right here
2729 cf::sync_job { prepare_random_map $exit };
2730 }
2731
2732 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2733 my $hp = $exit->stats->hp;
2734 my $sp = $exit->stats->sp;
2735
2736 $self->enter_link; 2938 $self->enter_link;
2737 2939
2738 # if exit is damned, update players death & WoR home-position
2739 $self->contr->savebed ($slaying, $hp, $sp)
2740 if $exit->flag (FLAG_DAMNED);
2741
2742 (async { 2940 (async {
2743 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2941 $Coro::current->{desc} = "enter_exit";
2744 2942
2745 $self->deactivate_recursive; # just to be sure
2746 unless (eval { 2943 unless (eval {
2944 $self->deactivate_recursive; # just to be sure
2945
2946 my $map = cf::map::normalise $exit->slaying, $exit->map;
2947 my $x = $exit->stats->hp;
2948 my $y = $exit->stats->sp;
2949
2950 # special map handling
2951 my $slaying = $exit->slaying;
2952
2953 # special map handling
2954 if ($slaying eq "/!") {
2955 my $guard = cf::lock_acquire "exit_prepare:$exit";
2956
2957 prepare_random_map $exit
2958 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2959
2960 $map = $exit->slaying;
2961
2962 } elsif ($slaying eq '!up') {
2963 $map = $exit->map->tile_path (cf::TILE_UP);
2964 $x = $exit->x;
2965 $y = $exit->y;
2966
2967 } elsif ($slaying eq '!down') {
2968 $map = $exit->map->tile_path (cf::TILE_DOWN);
2969 $x = $exit->x;
2970 $y = $exit->y;
2971 }
2972
2747 $self->goto ($slaying, $hp, $sp); 2973 $self->goto ($map, $x, $y);
2748 2974
2975 # if exit is damned, update players death & WoR home-position
2976 $self->contr->savebed ($map, $x, $y)
2977 if $exit->flag (cf::FLAG_DAMNED);
2978
2749 1; 2979 1
2750 }) { 2980 }) {
2751 $self->message ("Something went wrong deep within the crossfire server. " 2981 $self->message ("Something went wrong deep within the deliantra server. "
2752 . "I'll try to bring you back to the map you were before. " 2982 . "I'll try to bring you back to the map you were before. "
2753 . "Please report this to the dungeon master!", 2983 . "Please report this to the dungeon master!",
2754 cf::NDI_UNIQUE | cf::NDI_RED); 2984 cf::NDI_UNIQUE | cf::NDI_RED);
2755 2985
2756 warn "ERROR in enter_exit: $@"; 2986 error "ERROR in enter_exit: $@";
2757 $self->leave_link; 2987 $self->leave_link;
2758 } 2988 }
2759 })->prio (1); 2989 })->prio (1);
2760} 2990}
2761 2991
2773sub cf::client::send_drawinfo { 3003sub cf::client::send_drawinfo {
2774 my ($self, $text, $flags) = @_; 3004 my ($self, $text, $flags) = @_;
2775 3005
2776 utf8::encode $text; 3006 utf8::encode $text;
2777 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3007 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3008}
3009
3010=item $client->send_big_packet ($pkt)
3011
3012Like C<send_packet>, but tries to compress large packets, and fragments
3013them as required.
3014
3015=cut
3016
3017our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3018
3019sub cf::client::send_big_packet {
3020 my ($self, $pkt) = @_;
3021
3022 # try lzf for large packets
3023 $pkt = "lzf " . Compress::LZF::compress $pkt
3024 if 1024 <= length $pkt and $self->{can_lzf};
3025
3026 # split very large packets
3027 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3028 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3029 $pkt = "frag";
3030 }
3031
3032 $self->send_packet ($pkt);
2778} 3033}
2779 3034
2780=item $client->send_msg ($channel, $msg, $color, [extra...]) 3035=item $client->send_msg ($channel, $msg, $color, [extra...])
2781 3036
2782Send a drawinfo or msg packet to the client, formatting the msg for the 3037Send a drawinfo or msg packet to the client, formatting the msg for the
2786 3041
2787=cut 3042=cut
2788 3043
2789# non-persistent channels (usually the info channel) 3044# non-persistent channels (usually the info channel)
2790our %CHANNEL = ( 3045our %CHANNEL = (
3046 "c/motd" => {
3047 id => "infobox",
3048 title => "MOTD",
3049 reply => undef,
3050 tooltip => "The message of the day",
3051 },
2791 "c/identify" => { 3052 "c/identify" => {
2792 id => "infobox", 3053 id => "infobox",
2793 title => "Identify", 3054 title => "Identify",
2794 reply => undef, 3055 reply => undef,
2795 tooltip => "Items recently identified", 3056 tooltip => "Items recently identified",
2797 "c/examine" => { 3058 "c/examine" => {
2798 id => "infobox", 3059 id => "infobox",
2799 title => "Examine", 3060 title => "Examine",
2800 reply => undef, 3061 reply => undef,
2801 tooltip => "Signs and other items you examined", 3062 tooltip => "Signs and other items you examined",
3063 },
3064 "c/shopinfo" => {
3065 id => "infobox",
3066 title => "Shop Info",
3067 reply => undef,
3068 tooltip => "What your bargaining skill tells you about the shop",
2802 }, 3069 },
2803 "c/book" => { 3070 "c/book" => {
2804 id => "infobox", 3071 id => "infobox",
2805 title => "Book", 3072 title => "Book",
2806 reply => undef, 3073 reply => undef,
2822 id => "infobox", 3089 id => "infobox",
2823 title => "Body Parts", 3090 title => "Body Parts",
2824 reply => undef, 3091 reply => undef,
2825 tooltip => "Shows which body parts you posess and are available", 3092 tooltip => "Shows which body parts you posess and are available",
2826 }, 3093 },
3094 "c/statistics" => {
3095 id => "infobox",
3096 title => "Statistics",
3097 reply => undef,
3098 tooltip => "Shows your primary statistics",
3099 },
3100 "c/skills" => {
3101 id => "infobox",
3102 title => "Skills",
3103 reply => undef,
3104 tooltip => "Shows your experience per skill and item power",
3105 },
3106 "c/shopitems" => {
3107 id => "infobox",
3108 title => "Shop Items",
3109 reply => undef,
3110 tooltip => "Shows the items currently for sale in this shop",
3111 },
3112 "c/resistances" => {
3113 id => "infobox",
3114 title => "Resistances",
3115 reply => undef,
3116 tooltip => "Shows your resistances",
3117 },
3118 "c/pets" => {
3119 id => "infobox",
3120 title => "Pets",
3121 reply => undef,
3122 tooltip => "Shows information abotu your pets/a specific pet",
3123 },
3124 "c/perceiveself" => {
3125 id => "infobox",
3126 title => "Perceive Self",
3127 reply => undef,
3128 tooltip => "You gained detailed knowledge about yourself",
3129 },
2827 "c/uptime" => { 3130 "c/uptime" => {
2828 id => "infobox", 3131 id => "infobox",
2829 title => "Uptime", 3132 title => "Uptime",
2830 reply => undef, 3133 reply => undef,
2831 tooltip => "How long the server has been running since last restart", 3134 tooltip => "How long the server has been running since last restart",
2840 id => "party", 3143 id => "party",
2841 title => "Party", 3144 title => "Party",
2842 reply => "gsay ", 3145 reply => "gsay ",
2843 tooltip => "Messages and chat related to your party", 3146 tooltip => "Messages and chat related to your party",
2844 }, 3147 },
3148 "c/death" => {
3149 id => "death",
3150 title => "Death",
3151 reply => undef,
3152 tooltip => "Reason for and more info about your most recent death",
3153 },
3154 "c/say" => $SAY_CHANNEL,
3155 "c/chat" => $CHAT_CHANNEL,
2845); 3156);
2846 3157
2847sub cf::client::send_msg { 3158sub cf::client::send_msg {
2848 my ($self, $channel, $msg, $color, @extra) = @_; 3159 my ($self, $channel, $msg, $color, @extra) = @_;
2849 3160
2850 $msg = $self->pl->expand_cfpod ($msg); 3161 $msg = $self->pl->expand_cfpod ($msg)
3162 unless $color & cf::NDI_VERBATIM;
2851 3163
2852 $color &= cf::NDI_CLIENT_MASK; # just in case... 3164 $color &= cf::NDI_CLIENT_MASK; # just in case...
2853 3165
2854 # check predefined channels, for the benefit of C 3166 # check predefined channels, for the benefit of C
2855 if ($CHANNEL{$channel}) { 3167 if ($CHANNEL{$channel}) {
2856 $channel = $CHANNEL{$channel}; 3168 $channel = $CHANNEL{$channel};
2857 3169
2858 $self->ext_msg (channel_info => $channel) 3170 $self->ext_msg (channel_info => $channel);
2859 if $self->can_msg;
2860
2861 $channel = $channel->{id}; 3171 $channel = $channel->{id};
2862 3172
2863 } elsif (ref $channel) { 3173 } elsif (ref $channel) {
2864 # send meta info to client, if not yet sent 3174 # send meta info to client, if not yet sent
2865 unless (exists $self->{channel}{$channel->{id}}) { 3175 unless (exists $self->{channel}{$channel->{id}}) {
2866 $self->{channel}{$channel->{id}} = $channel; 3176 $self->{channel}{$channel->{id}} = $channel;
2867 $self->ext_msg (channel_info => $channel) 3177 $self->ext_msg (channel_info => $channel);
2868 if $self->can_msg;
2869 } 3178 }
2870 3179
2871 $channel = $channel->{id}; 3180 $channel = $channel->{id};
2872 } 3181 }
2873 3182
2874 return unless @extra || length $msg; 3183 return unless @extra || length $msg;
2875 3184
2876 if ($self->can_msg) {
2877 # default colour, mask it out 3185 # default colour, mask it out
2878 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3186 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2879 if $color & cf::NDI_DEF; 3187 if $color & cf::NDI_DEF;
2880 3188
2881 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3189 my $pkt = "msg "
3190 . $self->{json_coder}->encode (
2882 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3191 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2883 } else { 3192 );
2884 if ($color >= 0) {
2885 # replace some tags by gcfclient-compatible ones
2886 for ($msg) {
2887 1 while
2888 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2889 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2890 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2891 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2892 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2893 }
2894 3193
2895 $color &= cf::NDI_COLOR_MASK; 3194 $self->send_big_packet ($pkt);
2896
2897 utf8::encode $msg;
2898
2899 if (0 && $msg =~ /\[/) {
2900 # COMMAND/INFO
2901 $self->send_packet ("drawextinfo $color 10 8 $msg")
2902 } else {
2903 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2904 $self->send_packet ("drawinfo $color $msg")
2905 }
2906 }
2907 }
2908} 3195}
2909 3196
2910=item $client->ext_msg ($type, @msg) 3197=item $client->ext_msg ($type, @msg)
2911 3198
2912Sends an ext event to the client. 3199Sends an ext event to the client.
2915 3202
2916sub cf::client::ext_msg($$@) { 3203sub cf::client::ext_msg($$@) {
2917 my ($self, $type, @msg) = @_; 3204 my ($self, $type, @msg) = @_;
2918 3205
2919 if ($self->extcmd == 2) { 3206 if ($self->extcmd == 2) {
2920 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3207 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2921 } elsif ($self->extcmd == 1) { # TODO: remove 3208 } elsif ($self->extcmd == 1) { # TODO: remove
2922 push @msg, msgtype => "event_$type"; 3209 push @msg, msgtype => "event_$type";
2923 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3210 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2924 } 3211 }
2925} 3212}
2926 3213
2927=item $client->ext_reply ($msgid, @msg) 3214=item $client->ext_reply ($msgid, @msg)
2928 3215
2932 3219
2933sub cf::client::ext_reply($$@) { 3220sub cf::client::ext_reply($$@) {
2934 my ($self, $id, @msg) = @_; 3221 my ($self, $id, @msg) = @_;
2935 3222
2936 if ($self->extcmd == 2) { 3223 if ($self->extcmd == 2) {
2937 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3224 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2938 } elsif ($self->extcmd == 1) { 3225 } elsif ($self->extcmd == 1) {
2939 #TODO: version 1, remove 3226 #TODO: version 1, remove
2940 unshift @msg, msgtype => "reply", msgid => $id; 3227 unshift @msg, msgtype => "reply", msgid => $id;
2941 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3228 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2942 } 3229 }
2943} 3230}
2944 3231
2945=item $success = $client->query ($flags, "text", \&cb) 3232=item $success = $client->query ($flags, "text", \&cb)
2946 3233
3017 3304
3018 $ns->ext_reply ($reply, @reply) 3305 $ns->ext_reply ($reply, @reply)
3019 if $reply; 3306 if $reply;
3020 3307
3021 } else { 3308 } else {
3022 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3309 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3023 } 3310 }
3024 3311
3025 cf::override; 3312 cf::override;
3026 }, 3313 },
3027); 3314);
3047 3334
3048 $coro 3335 $coro
3049} 3336}
3050 3337
3051cf::client->attach ( 3338cf::client->attach (
3052 on_destroy => sub { 3339 on_client_destroy => sub {
3053 my ($ns) = @_; 3340 my ($ns) = @_;
3054 3341
3055 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3342 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3056 }, 3343 },
3057); 3344);
3073our $safe_hole = new Safe::Hole; 3360our $safe_hole = new Safe::Hole;
3074 3361
3075$SIG{FPE} = 'IGNORE'; 3362$SIG{FPE} = 'IGNORE';
3076 3363
3077$safe->permit_only (Opcode::opset qw( 3364$safe->permit_only (Opcode::opset qw(
3078 :base_core :base_mem :base_orig :base_math 3365 :base_core :base_mem :base_orig :base_math :base_loop
3079 grepstart grepwhile mapstart mapwhile 3366 grepstart grepwhile mapstart mapwhile
3080 sort time 3367 sort time
3081)); 3368));
3082 3369
3083# here we export the classes and methods available to script code 3370# here we export the classes and methods available to script code
3087The following functions and methods are available within a safe environment: 3374The following functions and methods are available within a safe environment:
3088 3375
3089 cf::object 3376 cf::object
3090 contr pay_amount pay_player map x y force_find force_add destroy 3377 contr pay_amount pay_player map x y force_find force_add destroy
3091 insert remove name archname title slaying race decrease split 3378 insert remove name archname title slaying race decrease split
3379 value
3092 3380
3093 cf::object::player 3381 cf::object::player
3094 player 3382 player
3095 3383
3096 cf::player 3384 cf::player
3101 3389
3102=cut 3390=cut
3103 3391
3104for ( 3392for (
3105 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3393 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3106 insert remove inv name archname title slaying race 3394 insert remove inv nrof name archname title slaying race
3107 decrease split destroy)], 3395 decrease split destroy change_exp value msg lore send_msg)],
3108 ["cf::object::player" => qw(player)], 3396 ["cf::object::player" => qw(player)],
3109 ["cf::player" => qw(peaceful)], 3397 ["cf::player" => qw(peaceful send_msg)],
3110 ["cf::map" => qw(trigger)], 3398 ["cf::map" => qw(trigger)],
3111) { 3399) {
3112 no strict 'refs';
3113 my ($pkg, @funs) = @$_; 3400 my ($pkg, @funs) = @$_;
3114 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3401 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3115 for @funs; 3402 for @funs;
3116} 3403}
3117 3404
3132 3419
3133 my $qcode = $code; 3420 my $qcode = $code;
3134 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3421 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3135 $qcode =~ s/\n/\\n/g; 3422 $qcode =~ s/\n/\\n/g;
3136 3423
3424 %vars = (_dummy => 0) unless %vars;
3425
3426 my @res;
3137 local $_; 3427 local $_;
3138 local @safe::cf::_safe_eval_args = values %vars;
3139 3428
3140 my $eval = 3429 my $eval =
3141 "do {\n" 3430 "do {\n"
3142 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3431 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3143 . "#line 0 \"{$qcode}\"\n" 3432 . "#line 0 \"{$qcode}\"\n"
3144 . $code 3433 . $code
3145 . "\n}" 3434 . "\n}"
3146 ; 3435 ;
3147 3436
3437 if ($CFG{safe_eval}) {
3148 sub_generation_inc; 3438 sub_generation_inc;
3439 local @safe::cf::_safe_eval_args = values %vars;
3149 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3440 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3150 sub_generation_inc; 3441 sub_generation_inc;
3442 } else {
3443 local @cf::_safe_eval_args = values %vars;
3444 @res = wantarray ? eval eval : scalar eval $eval;
3445 }
3151 3446
3152 if ($@) { 3447 if ($@) {
3153 warn "$@"; 3448 warn "$@",
3154 warn "while executing safe code '$code'\n"; 3449 "while executing safe code '$code'\n",
3155 warn "with arguments " . (join " ", %vars) . "\n"; 3450 "with arguments " . (join " ", %vars) . "\n";
3156 } 3451 }
3157 3452
3158 wantarray ? @res : $res[0] 3453 wantarray ? @res : $res[0]
3159} 3454}
3160 3455
3174=cut 3469=cut
3175 3470
3176sub register_script_function { 3471sub register_script_function {
3177 my ($fun, $cb) = @_; 3472 my ($fun, $cb) = @_;
3178 3473
3179 no strict 'refs'; 3474 $fun = "safe::$fun" if $CFG{safe_eval};
3180 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3475 *$fun = $safe_hole->wrap ($cb);
3181} 3476}
3182 3477
3183=back 3478=back
3184 3479
3185=cut 3480=cut
3194 # for this (global event?) 3489 # for this (global event?)
3195 %ext::player_env::MUSIC_FACE_CACHE = (); 3490 %ext::player_env::MUSIC_FACE_CACHE = ();
3196 3491
3197 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3492 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3198 3493
3199 warn "loading facedata from $path\n"; 3494 trace "loading facedata from $path\n";
3200 3495
3201 my $facedata; 3496 my $facedata = decode_storable load_file $path;
3202 0 < aio_load $path, $facedata
3203 or die "$path: $!";
3204
3205 $facedata = Coro::Storable::thaw $facedata;
3206 3497
3207 $facedata->{version} == 2 3498 $facedata->{version} == 2
3208 or cf::cleanup "$path: version mismatch, cannot proceed."; 3499 or cf::cleanup "$path: version mismatch, cannot proceed.";
3209 3500
3210 # patch in the exptable 3501 # patch in the exptable
3502 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3211 $facedata->{resource}{"res/exp_table"} = { 3503 $facedata->{resource}{"res/exp_table"} = {
3212 type => FT_RSRC, 3504 type => FT_RSRC,
3213 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3505 data => $exp_table,
3506 hash => (Digest::MD5::md5 $exp_table),
3214 }; 3507 };
3215 cf::cede_to_tick; 3508 cf::cede_to_tick;
3216 3509
3217 { 3510 {
3218 my $faces = $facedata->{faceinfo}; 3511 my $faces = $facedata->{faceinfo};
3220 while (my ($face, $info) = each %$faces) { 3513 while (my ($face, $info) = each %$faces) {
3221 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3514 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3222 3515
3223 cf::face::set_visibility $idx, $info->{visibility}; 3516 cf::face::set_visibility $idx, $info->{visibility};
3224 cf::face::set_magicmap $idx, $info->{magicmap}; 3517 cf::face::set_magicmap $idx, $info->{magicmap};
3225 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3518 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3226 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3519 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3520 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3227 3521
3228 cf::cede_to_tick; 3522 cf::cede_to_tick;
3229 } 3523 }
3230 3524
3231 while (my ($face, $info) = each %$faces) { 3525 while (my ($face, $info) = each %$faces) {
3236 3530
3237 if (my $smooth = cf::face::find $info->{smooth}) { 3531 if (my $smooth = cf::face::find $info->{smooth}) {
3238 cf::face::set_smooth $idx, $smooth; 3532 cf::face::set_smooth $idx, $smooth;
3239 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3533 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3240 } else { 3534 } else {
3241 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3535 error "smooth face '$info->{smooth}' not found for face '$face'";
3242 } 3536 }
3243 3537
3244 cf::cede_to_tick; 3538 cf::cede_to_tick;
3245 } 3539 }
3246 } 3540 }
3255 3549
3256 cf::anim::invalidate_all; # d'oh 3550 cf::anim::invalidate_all; # d'oh
3257 } 3551 }
3258 3552
3259 { 3553 {
3260 # TODO: for gcfclient pleasure, we should give resources
3261 # that gcfclient doesn't grok a >10000 face index.
3262 my $res = $facedata->{resource}; 3554 my $res = $facedata->{resource};
3263 3555
3264 while (my ($name, $info) = each %$res) { 3556 while (my ($name, $info) = each %$res) {
3265 if (defined $info->{type}) { 3557 if (defined $info->{type}) {
3266 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3558 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3267 my $data;
3268 3559
3269 if ($info->{type} & 1) { 3560 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3270 # prepend meta info
3271
3272 my $meta = $enc->encode ({
3273 name => $name,
3274 %{ $info->{meta} || {} },
3275 });
3276
3277 $data = pack "(w/a*)*", $meta, $info->{data};
3278 } else {
3279 $data = $info->{data};
3280 }
3281
3282 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3283 cf::face::set_type $idx, $info->{type}; 3561 cf::face::set_type $idx, $info->{type};
3284 } else { 3562 } else {
3285 $RESOURCE{$name} = $info; 3563 $RESOURCE{$name} = $info; # unused
3286 } 3564 }
3287 3565
3288 cf::cede_to_tick; 3566 cf::cede_to_tick;
3289 } 3567 }
3290 } 3568 }
3291 3569
3292 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3570 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3293 3571
3294 1 3572 1
3295} 3573}
3296
3297cf::global->attach (on_resource_update => sub {
3298 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3299 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3300
3301 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3302 my $sound = $soundconf->{compat}[$_]
3303 or next;
3304
3305 my $face = cf::face::find "sound/$sound->[1]";
3306 cf::sound::set $sound->[0] => $face;
3307 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3308 }
3309
3310 while (my ($k, $v) = each %{$soundconf->{event}}) {
3311 my $face = cf::face::find "sound/$v";
3312 cf::sound::set $k => $face;
3313 }
3314 }
3315});
3316 3574
3317register_exticmd fx_want => sub { 3575register_exticmd fx_want => sub {
3318 my ($ns, $want) = @_; 3576 my ($ns, $want) = @_;
3319 3577
3320 while (my ($k, $v) = each %$want) { 3578 while (my ($k, $v) = each %$want) {
3359sub reload_treasures { 3617sub reload_treasures {
3360 load_resource_file "$DATADIR/treasures" 3618 load_resource_file "$DATADIR/treasures"
3361 or die "unable to load treasurelists\n"; 3619 or die "unable to load treasurelists\n";
3362} 3620}
3363 3621
3622sub reload_sound {
3623 trace "loading sound config from $DATADIR/sound\n";
3624
3625 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3626
3627 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3628 my $sound = $soundconf->{compat}[$_]
3629 or next;
3630
3631 my $face = cf::face::find "sound/$sound->[1]";
3632 cf::sound::set $sound->[0] => $face;
3633 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3634 }
3635
3636 while (my ($k, $v) = each %{$soundconf->{event}}) {
3637 my $face = cf::face::find "sound/$v";
3638 cf::sound::set $k => $face;
3639 }
3640}
3641
3364sub reload_resources { 3642sub reload_resources {
3365 warn "reloading resource files...\n"; 3643 trace "reloading resource files...\n";
3366 3644
3645 reload_exp_table;
3646 reload_materials;
3367 reload_facedata; 3647 reload_facedata;
3648 reload_sound;
3368 reload_archetypes; 3649 reload_archetypes;
3369 reload_regions; 3650 reload_regions;
3370 reload_treasures; 3651 reload_treasures;
3371 3652
3372 warn "finished reloading resource files\n"; 3653 trace "finished reloading resource files\n";
3373}
3374
3375sub init {
3376 my $guard = freeze_mainloop;
3377
3378 reload_resources;
3379} 3654}
3380 3655
3381sub reload_config { 3656sub reload_config {
3382 open my $fh, "<:utf8", "$CONFDIR/config" 3657 trace "reloading config file...\n";
3383 or return;
3384 3658
3385 local $/; 3659 my $config = load_file "$CONFDIR/config";
3386 *CFG = YAML::Load <$fh>; 3660 utf8::decode $config;
3661 *CFG = decode_yaml $config;
3387 3662
3388 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3663 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3389 3664
3390 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3665 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3391 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3666 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3392 3667
3393 if (exists $CFG{mlockall}) { 3668 if (exists $CFG{mlockall}) {
3397 }; 3672 };
3398 warn $@ if $@; 3673 warn $@ if $@;
3399 } 3674 }
3400} 3675}
3401 3676
3677sub pidfile() {
3678 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3679 or die "$PIDFILE: $!";
3680 flock $fh, &Fcntl::LOCK_EX
3681 or die "$PIDFILE: flock: $!";
3682 $fh
3683}
3684
3685# make sure only one server instance is running at any one time
3686sub atomic {
3687 my $fh = pidfile;
3688
3689 my $pid = <$fh>;
3690 kill 9, $pid if $pid > 0;
3691
3692 seek $fh, 0, 0;
3693 print $fh $$;
3694}
3695
3696sub main_loop {
3697 trace "EV::loop starting\n";
3698 if (1) {
3699 EV::loop;
3700 }
3701 trace "EV::loop returned\n";
3702 goto &main_loop unless $REALLY_UNLOOP;
3703}
3704
3402sub main { 3705sub main {
3706 cf::init_globals; # initialise logging
3707
3708 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3709 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3710 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3711 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3712
3713 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3714
3403 # we must not ever block the main coroutine 3715 # we must not ever block the main coroutine
3404 local $Coro::idle = sub { 3716 local $Coro::idle = sub {
3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3717 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3406 (async { 3718 (async {
3407 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3719 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT; 3720 EV::loop EV::LOOP_ONESHOT;
3409 })->prio (Coro::PRIO_MAX); 3721 })->prio (Coro::PRIO_MAX);
3410 }; 3722 };
3411 3723
3412 { 3724 evthread_start IO::AIO::poll_fileno;
3413 my $guard = freeze_mainloop; 3725
3726 cf::sync_job {
3727 cf::incloader::init ();
3728
3729 cf::init_anim;
3730 cf::init_attackmess;
3731 cf::init_dynamic;
3732
3733 cf::load_settings;
3734
3735 reload_resources;
3414 reload_config; 3736 reload_config;
3415 db_init; 3737 db_init;
3738
3739 cf::init_uuid;
3740 cf::init_signals;
3741 cf::init_skills;
3742
3743 cf::init_beforeplay;
3744
3745 atomic;
3746
3416 load_extensions; 3747 load_extensions;
3417 3748
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3749 utime time, time, $RUNTIMEFILE;
3419 evthread_start IO::AIO::poll_fileno; 3750
3751 # no (long-running) fork's whatsoever before this point(!)
3752 use POSIX ();
3753 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3754
3755 cf::_post_init 0;
3420 } 3756 };
3421 3757
3422 EV::loop; 3758 cf::object::thawer::errors_are_fatal 0;
3759 info "parse errors in files are no longer fatal from this point on.\n";
3760
3761 my $free_main; $free_main = EV::idle sub {
3762 undef $free_main;
3763 undef &main; # free gobs of memory :)
3764 };
3765
3766 goto &main_loop;
3423} 3767}
3424 3768
3425############################################################################# 3769#############################################################################
3426# initialisation and cleanup 3770# initialisation and cleanup
3427 3771
3428# install some emergency cleanup handlers 3772# install some emergency cleanup handlers
3429BEGIN { 3773BEGIN {
3430 our %SIGWATCHER = (); 3774 our %SIGWATCHER = ();
3431 for my $signal (qw(INT HUP TERM)) { 3775 for my $signal (qw(INT HUP TERM)) {
3432 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3776 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3433 cf::cleanup "SIG$signal"; 3777 cf::cleanup "SIG$signal";
3434 }; 3778 };
3435 } 3779 }
3436} 3780}
3437 3781
3438sub write_runtime_sync { 3782sub write_runtime_sync {
3439 my $runtime = "$LOCALDIR/runtime"; 3783 my $t0 = AE::time;
3440 3784
3441 # first touch the runtime file to show we are still running: 3785 # first touch the runtime file to show we are still running:
3442 # the fsync below can take a very very long time. 3786 # the fsync below can take a very very long time.
3443 3787
3444 IO::AIO::aio_utime $runtime, undef, undef; 3788 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3445 3789
3446 my $guard = cf::lock_acquire "write_runtime"; 3790 my $guard = cf::lock_acquire "write_runtime";
3447 3791
3448 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3792 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3449 or return; 3793 or return;
3450 3794
3451 my $value = $cf::RUNTIME + 90 + 10; 3795 my $value = $cf::RUNTIME + 90 + 10;
3452 # 10 is the runtime save interval, for a monotonic clock 3796 # 10 is the runtime save interval, for a monotonic clock
3453 # 60 allows for the watchdog to kill the server. 3797 # 60 allows for the watchdog to kill the server.
3463 aio_utime $fh, undef, undef; 3807 aio_utime $fh, undef, undef;
3464 3808
3465 close $fh 3809 close $fh
3466 or return; 3810 or return;
3467 3811
3468 aio_rename "$runtime~", $runtime 3812 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3469 and return; 3813 and return;
3470 3814
3471 warn "runtime file written.\n"; 3815 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3472 3816
3473 1 3817 1
3474} 3818}
3475 3819
3476our $uuid_lock; 3820our $uuid_lock;
3485 my $uuid = "$LOCALDIR/uuid"; 3829 my $uuid = "$LOCALDIR/uuid";
3486 3830
3487 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3831 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3488 or return; 3832 or return;
3489 3833
3490 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3834 my $value = uuid_seq uuid_cur;
3835
3836 unless ($value) {
3837 info "cowardly refusing to write zero uuid value!\n";
3838 return;
3839 }
3840
3841 my $value = uuid_str $value + $uuid_skip;
3491 $uuid_skip = 0; 3842 $uuid_skip = 0;
3492 3843
3493 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3844 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3494 and return; 3845 and return;
3495 3846
3501 or return; 3852 or return;
3502 3853
3503 aio_rename "$uuid~", $uuid 3854 aio_rename "$uuid~", $uuid
3504 and return; 3855 and return;
3505 3856
3506 warn "uuid file written ($value).\n"; 3857 trace "uuid file written ($value).\n";
3507 3858
3508 1 3859 1
3509 3860
3510} 3861}
3511 3862
3517} 3868}
3518 3869
3519sub emergency_save() { 3870sub emergency_save() {
3520 my $freeze_guard = cf::freeze_mainloop; 3871 my $freeze_guard = cf::freeze_mainloop;
3521 3872
3522 warn "enter emergency perl save\n"; 3873 info "emergency_perl_save: enter\n";
3874
3875 # this is a trade-off: we want to be very quick here, so
3876 # save all maps without fsync, and later call a global sync
3877 # (which in turn might be very very slow)
3878 local $USE_FSYNC = 0;
3523 3879
3524 cf::sync_job { 3880 cf::sync_job {
3881 cf::write_runtime_sync; # external watchdog should not bark
3882
3525 # use a peculiar iteration method to avoid tripping on perl 3883 # use a peculiar iteration method to avoid tripping on perl
3526 # refcount bugs in for. also avoids problems with players 3884 # refcount bugs in for. also avoids problems with players
3527 # and maps saved/destroyed asynchronously. 3885 # and maps saved/destroyed asynchronously.
3528 warn "begin emergency player save\n"; 3886 info "emergency_perl_save: begin player save\n";
3529 for my $login (keys %cf::PLAYER) { 3887 for my $login (keys %cf::PLAYER) {
3530 my $pl = $cf::PLAYER{$login} or next; 3888 my $pl = $cf::PLAYER{$login} or next;
3531 $pl->valid or next; 3889 $pl->valid or next;
3532 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3890 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3533 $pl->save; 3891 $pl->save;
3534 } 3892 }
3535 warn "end emergency player save\n"; 3893 info "emergency_perl_save: end player save\n";
3536 3894
3537 warn "begin emergency map save\n"; 3895 cf::write_runtime_sync; # external watchdog should not bark
3896
3897 info "emergency_perl_save: begin map save\n";
3538 for my $path (keys %cf::MAP) { 3898 for my $path (keys %cf::MAP) {
3539 my $map = $cf::MAP{$path} or next; 3899 my $map = $cf::MAP{$path} or next;
3540 $map->valid or next; 3900 $map->valid or next;
3541 $map->save; 3901 $map->save;
3542 } 3902 }
3543 warn "end emergency map save\n"; 3903 info "emergency_perl_save: end map save\n";
3544 3904
3545 warn "begin emergency database checkpoint\n"; 3905 cf::write_runtime_sync; # external watchdog should not bark
3906
3907 info "emergency_perl_save: begin database checkpoint\n";
3546 BDB::db_env_txn_checkpoint $DB_ENV; 3908 BDB::db_env_txn_checkpoint $DB_ENV;
3547 warn "end emergency database checkpoint\n"; 3909 info "emergency_perl_save: end database checkpoint\n";
3548 3910
3549 warn "begin write uuid\n"; 3911 info "emergency_perl_save: begin write uuid\n";
3550 write_uuid_sync 1; 3912 write_uuid_sync 1;
3551 warn "end write uuid\n"; 3913 info "emergency_perl_save: end write uuid\n";
3914
3915 cf::write_runtime_sync; # external watchdog should not bark
3916
3917 trace "emergency_perl_save: syncing database to disk";
3918 BDB::db_env_txn_checkpoint $DB_ENV;
3919
3920 info "emergency_perl_save: starting sync\n";
3921 IO::AIO::aio_sync sub {
3922 info "emergency_perl_save: finished sync\n";
3923 };
3924
3925 cf::write_runtime_sync; # external watchdog should not bark
3926
3927 trace "emergency_perl_save: flushing outstanding aio requests";
3928 while (IO::AIO::nreqs || BDB::nreqs) {
3929 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3930 }
3931
3932 cf::write_runtime_sync; # external watchdog should not bark
3552 }; 3933 };
3553 3934
3554 warn "leave emergency perl save\n"; 3935 info "emergency_perl_save: leave\n";
3555} 3936}
3556 3937
3557sub post_cleanup { 3938sub post_cleanup {
3558 my ($make_core) = @_; 3939 my ($make_core) = @_;
3559 3940
3941 IO::AIO::flush;
3942
3560 warn Carp::longmess "post_cleanup backtrace" 3943 error Carp::longmess "post_cleanup backtrace"
3561 if $make_core; 3944 if $make_core;
3945
3946 my $fh = pidfile;
3947 unlink $PIDFILE if <$fh> == $$;
3948}
3949
3950# a safer delete_package, copied from Symbol
3951sub clear_package($) {
3952 my $pkg = shift;
3953
3954 # expand to full symbol table name if needed
3955 unless ($pkg =~ /^main::.*::$/) {
3956 $pkg = "main$pkg" if $pkg =~ /^::/;
3957 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3958 $pkg .= '::' unless $pkg =~ /::$/;
3959 }
3960
3961 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3962 my $stem_symtab = *{$stem}{HASH};
3963
3964 defined $stem_symtab and exists $stem_symtab->{$leaf}
3965 or return;
3966
3967 # clear all symbols
3968 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3969 for my $name (keys %$leaf_symtab) {
3970 _gv_clear *{"$pkg$name"};
3971# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3972 }
3562} 3973}
3563 3974
3564sub do_reload_perl() { 3975sub do_reload_perl() {
3565 # can/must only be called in main 3976 # can/must only be called in main
3566 if ($Coro::current != $Coro::main) { 3977 unless (in_main) {
3567 warn "can only reload from main coroutine"; 3978 error "can only reload from main coroutine";
3568 return; 3979 return;
3569 } 3980 }
3570 3981
3571 warn "reloading..."; 3982 return if $RELOAD++;
3572 3983
3573 warn "entering sync_job"; 3984 my $t1 = AE::time;
3574 3985
3986 while ($RELOAD) {
3987 cf::get_slot 0.1, -1, "reload_perl";
3988 info "perl_reload: reloading...";
3989
3990 trace "perl_reload: entering sync_job";
3991
3575 cf::sync_job { 3992 cf::sync_job {
3576 cf::write_runtime_sync; # external watchdog should not bark
3577 cf::emergency_save; 3993 #cf::emergency_save;
3578 cf::write_runtime_sync; # external watchdog should not bark
3579 3994
3580 warn "syncing database to disk";
3581 BDB::db_env_txn_checkpoint $DB_ENV;
3582
3583 # if anything goes wrong in here, we should simply crash as we already saved
3584
3585 warn "flushing outstanding aio requests";
3586 for (;;) {
3587 BDB::flush;
3588 IO::AIO::flush;
3589 Coro::cede_notself;
3590 last unless IO::AIO::nreqs || BDB::nreqs;
3591 warn "iterate...";
3592 }
3593
3594 ++$RELOAD;
3595
3596 warn "cancelling all extension coros"; 3995 trace "perl_reload: cancelling all extension coros";
3597 $_->cancel for values %EXT_CORO; 3996 $_->cancel for values %EXT_CORO;
3598 %EXT_CORO = (); 3997 %EXT_CORO = ();
3599 3998
3600 warn "removing commands"; 3999 trace "perl_reload: removing commands";
3601 %COMMAND = (); 4000 %COMMAND = ();
3602 4001
3603 warn "removing ext/exti commands"; 4002 trace "perl_reload: removing ext/exti commands";
3604 %EXTCMD = (); 4003 %EXTCMD = ();
3605 %EXTICMD = (); 4004 %EXTICMD = ();
3606 4005
3607 warn "unloading/nuking all extensions"; 4006 trace "perl_reload: unloading/nuking all extensions";
3608 for my $pkg (@EXTS) { 4007 for my $pkg (@EXTS) {
3609 warn "... unloading $pkg"; 4008 trace "... unloading $pkg";
3610 4009
3611 if (my $cb = $pkg->can ("unload")) { 4010 if (my $cb = $pkg->can ("unload")) {
3612 eval { 4011 eval {
3613 $cb->($pkg); 4012 $cb->($pkg);
3614 1 4013 1
3615 } or warn "$pkg unloaded, but with errors: $@"; 4014 } or error "$pkg unloaded, but with errors: $@";
4015 }
4016
4017 trace "... clearing $pkg";
4018 clear_package $pkg;
3616 } 4019 }
3617 4020
3618 warn "... nuking $pkg";
3619 Symbol::delete_package $pkg;
3620 }
3621
3622 warn "unloading all perl modules loaded from $LIBDIR"; 4021 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3623 while (my ($k, $v) = each %INC) { 4022 while (my ($k, $v) = each %INC) {
3624 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4023 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3625 4024
3626 warn "... unloading $k"; 4025 trace "... unloading $k";
3627 delete $INC{$k}; 4026 delete $INC{$k};
3628 4027
3629 $k =~ s/\.pm$//; 4028 $k =~ s/\.pm$//;
3630 $k =~ s/\//::/g; 4029 $k =~ s/\//::/g;
3631 4030
3632 if (my $cb = $k->can ("unload_module")) { 4031 if (my $cb = $k->can ("unload_module")) {
3633 $cb->(); 4032 $cb->();
4033 }
4034
4035 clear_package $k;
3634 } 4036 }
3635 4037
3636 Symbol::delete_package $k;
3637 }
3638
3639 warn "getting rid of safe::, as good as possible"; 4038 trace "perl_reload: getting rid of safe::, as good as possible";
3640 Symbol::delete_package "safe::$_" 4039 clear_package "safe::$_"
3641 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4040 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3642 4041
3643 warn "unloading cf.pm \"a bit\""; 4042 trace "perl_reload: unloading cf.pm \"a bit\"";
3644 delete $INC{"cf.pm"}; 4043 delete $INC{"cf.pm"};
3645 delete $INC{"cf/pod.pm"}; 4044 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3646 4045
3647 # don't, removes xs symbols, too, 4046 # don't, removes xs symbols, too,
3648 # and global variables created in xs 4047 # and global variables created in xs
3649 #Symbol::delete_package __PACKAGE__; 4048 #clear_package __PACKAGE__;
3650 4049
3651 warn "unload completed, starting to reload now"; 4050 info "perl_reload: unload completed, starting to reload now";
3652 4051
3653 warn "reloading cf.pm"; 4052 trace "perl_reload: reloading cf.pm";
3654 require cf; 4053 require cf;
3655 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4054 cf::_connect_to_perl_1;
3656 4055
3657 warn "loading config and database again"; 4056 trace "perl_reload: loading config and database again";
3658 cf::reload_config; 4057 cf::reload_config;
3659 4058
3660 warn "loading extensions"; 4059 trace "perl_reload: loading extensions";
3661 cf::load_extensions; 4060 cf::load_extensions;
3662 4061
4062 if ($REATTACH_ON_RELOAD) {
3663 warn "reattaching attachments to objects/players"; 4063 trace "perl_reload: reattaching attachments to objects/players";
3664 _global_reattach; # objects, sockets 4064 _global_reattach; # objects, sockets
3665 warn "reattaching attachments to maps"; 4065 trace "perl_reload: reattaching attachments to maps";
3666 reattach $_ for values %MAP; 4066 reattach $_ for values %MAP;
3667 warn "reattaching attachments to players"; 4067 trace "perl_reload: reattaching attachments to players";
3668 reattach $_ for values %PLAYER; 4068 reattach $_ for values %PLAYER;
4069 }
3669 4070
3670 warn "leaving sync_job"; 4071 cf::_post_init 1;
3671 4072
4073 trace "perl_reload: leaving sync_job";
4074
3672 1 4075 1
3673 } or do { 4076 } or do {
3674 warn $@; 4077 error $@;
3675 cf::cleanup "error while reloading, exiting."; 4078 cf::cleanup "perl_reload: error, exiting.";
4079 };
4080
4081 --$RELOAD;
3676 }; 4082 }
3677 4083
3678 warn "reloaded"; 4084 $t1 = AE::time - $t1;
4085 info "perl_reload: completed in ${t1}s\n";
3679}; 4086};
3680 4087
3681our $RELOAD_WATCHER; # used only during reload 4088our $RELOAD_WATCHER; # used only during reload
3682 4089
3683sub reload_perl() { 4090sub reload_perl() {
3684 # doing reload synchronously and two reloads happen back-to-back, 4091 # doing reload synchronously and two reloads happen back-to-back,
3685 # coro crashes during coro_state_free->destroy here. 4092 # coro crashes during coro_state_free->destroy here.
3686 4093
4094 $RELOAD_WATCHER ||= cf::async {
4095 Coro::AIO::aio_wait cache_extensions;
4096
3687 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4097 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3688 do_reload_perl; 4098 do_reload_perl;
3689 undef $RELOAD_WATCHER; 4099 undef $RELOAD_WATCHER;
4100 };
3690 }; 4101 };
3691} 4102}
3692 4103
3693register_command "reload" => sub { 4104register_command "reload" => sub {
3694 my ($who, $arg) = @_; 4105 my ($who, $arg) = @_;
3700 reload_perl; 4111 reload_perl;
3701 }; 4112 };
3702 } 4113 }
3703}; 4114};
3704 4115
3705unshift @INC, $LIBDIR; 4116#############################################################################
3706 4117
3707my $bug_warning = 0; 4118my $bug_warning = 0;
3708 4119
3709our @WAIT_FOR_TICK;
3710our @WAIT_FOR_TICK_BEGIN;
3711
3712sub wait_for_tick { 4120sub wait_for_tick() {
3713 return if tick_inhibit || $Coro::current == $Coro::main; 4121 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3714 4122
3715 my $signal = new Coro::Signal; 4123 $WAIT_FOR_TICK->wait;
3716 push @WAIT_FOR_TICK, $signal;
3717 $signal->wait;
3718} 4124}
3719 4125
3720sub wait_for_tick_begin { 4126sub wait_for_tick_begin() {
3721 return if tick_inhibit || $Coro::current == $Coro::main; 4127 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3722 4128
3723 my $signal = new Coro::Signal; 4129 my $signal = new Coro::Signal;
3724 push @WAIT_FOR_TICK_BEGIN, $signal; 4130 push @WAIT_FOR_TICK_BEGIN, $signal;
3725 $signal->wait; 4131 $signal->wait;
3726} 4132}
3730 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4136 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3731 unless ++$bug_warning > 10; 4137 unless ++$bug_warning > 10;
3732 return; 4138 return;
3733 } 4139 }
3734 4140
3735 cf::server_tick; # one server iteration 4141 cf::one_tick; # one server iteration
4142
4143 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3736 4144
3737 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4145 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3738 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4146 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3739 Coro::async_pool { 4147 Coro::async_pool {
3740 $Coro::current->{desc} = "runtime saver"; 4148 $Coro::current->{desc} = "runtime saver";
3741 write_runtime_sync 4149 write_runtime_sync
3742 or warn "ERROR: unable to write runtime file: $!"; 4150 or error "ERROR: unable to write runtime file: $!";
3743 }; 4151 };
3744 } 4152 }
3745 4153
3746 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4154 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3747 $sig->send; 4155 $sig->send;
3748 } 4156 }
3749 while (my $sig = shift @WAIT_FOR_TICK) { 4157 $WAIT_FOR_TICK->broadcast;
3750 $sig->send;
3751 }
3752 4158
3753 $LOAD = ($NOW - $TICK_START) / $TICK; 4159 $LOAD = ($NOW - $TICK_START) / $TICK;
3754 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4160 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3755 4161
3756 if (0) { 4162 if (0) {
3757 if ($NEXT_TICK) { 4163 if ($NEXT_TICK) {
3758 my $jitter = $TICK_START - $NEXT_TICK; 4164 my $jitter = $TICK_START - $NEXT_TICK;
3759 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4165 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3760 warn "jitter $JITTER\n";#d# 4166 debug "jitter $JITTER\n";#d#
3761 } 4167 }
3762 } 4168 }
3763} 4169}
3764 4170
3765{ 4171{
3766 # configure BDB 4172 # configure BDB
3767 4173
3768 BDB::min_parallel 8; 4174 BDB::min_parallel 16;
3769 BDB::max_poll_reqs $TICK * 0.1; 4175 BDB::max_poll_reqs $TICK * 0.1;
3770 $Coro::BDB::WATCHER->priority (1); 4176 $AnyEvent::BDB::WATCHER->priority (1);
3771 4177
3772 unless ($DB_ENV) { 4178 unless ($DB_ENV) {
3773 $DB_ENV = BDB::db_env_create; 4179 $DB_ENV = BDB::db_env_create;
3774 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4180 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3775 | BDB::LOG_AUTOREMOVE, 1); 4181 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4182 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3776 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4183 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3777 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4184 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3778 4185
3779 cf::sync_job { 4186 cf::sync_job {
3780 eval { 4187 eval {
3806{ 4213{
3807 # configure IO::AIO 4214 # configure IO::AIO
3808 4215
3809 IO::AIO::min_parallel 8; 4216 IO::AIO::min_parallel 8;
3810 IO::AIO::max_poll_time $TICK * 0.1; 4217 IO::AIO::max_poll_time $TICK * 0.1;
3811 $Coro::AIO::WATCHER->priority (1); 4218 undef $AnyEvent::AIO::WATCHER;
3812} 4219}
3813 4220
3814my $_log_backtrace; 4221our $_log_backtrace;
4222our $_log_backtrace_last;
3815 4223
3816sub _log_backtrace { 4224sub _log_backtrace {
3817 my ($msg, @addr) = @_; 4225 my ($msg, @addr) = @_;
3818 4226
3819 $msg =~ s/\n//; 4227 $msg =~ s/\n$//;
3820 4228
4229 if ($_log_backtrace_last eq $msg) {
4230 LOG llevInfo, "[ABT] $msg\n";
4231 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3821 # limit the # of concurrent backtraces 4232 # limit the # of concurrent backtraces
3822 if ($_log_backtrace < 2) { 4233 } elsif ($_log_backtrace < 2) {
4234 $_log_backtrace_last = $msg;
3823 ++$_log_backtrace; 4235 ++$_log_backtrace;
4236 my $perl_bt = Carp::longmess $msg;
3824 async { 4237 async {
3825 $Coro::current->{desc} = "abt $msg"; 4238 $Coro::current->{desc} = "abt $msg";
3826 4239
3827 my @bt = fork_call { 4240 my @bt = fork_call {
3828 @addr = map { sprintf "%x", $_ } @addr; 4241 @addr = map { sprintf "%x", $_ } @addr;
3839 } 4252 }
3840 4253
3841 @funcs 4254 @funcs
3842 }; 4255 };
3843 4256
3844 LOG llevInfo, "[ABT] $msg\n"; 4257 LOG llevInfo, "[ABT] $perl_bt\n";
4258 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3845 LOG llevInfo, "[ABT] $_\n" for @bt; 4259 LOG llevInfo, "[ABT] $_\n" for @bt;
3846 --$_log_backtrace; 4260 --$_log_backtrace;
3847 }; 4261 };
3848 } else { 4262 } else {
3849 LOG llevInfo, "[ABT] $msg\n"; 4263 LOG llevInfo, "[ABT] $msg\n";
3850 LOG llevInfo, "[ABT] [suppressed]\n"; 4264 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3851 } 4265 }
3852} 4266}
3853 4267
3854# load additional modules 4268# load additional modules
3855use cf::pod; 4269require "cf/$_.pm" for @EXTRA_MODULES;
4270cf::_connect_to_perl_2;
3856 4271
3857END { cf::emergency_save } 4272END { cf::emergency_save }
3858 4273
38591 42741
3860 4275

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines