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.373 by root, Sat Sep 15 15:58:06 2007 UTC vs.
Revision 1.533 by root, Thu Apr 29 07:59:17 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 3.64 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
18use Coro::Event; 44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
24use Coro::Util (); 53use Coro::Util ();
25 54
26use JSON::XS (); 55use JSON::XS 2.01 ();
27use BDB (); 56use BDB ();
28use Data::Dumper; 57use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 58use Fcntl;
31use YAML::Syck (); 59use YAML::XS ();
32use IO::AIO 2.32 (); 60use IO::AIO ();
33use Time::HiRes; 61use Time::HiRes;
34use Compress::LZF; 62use Compress::LZF;
35use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
36 66
37# configure various modules to our taste 67# configure various modules to our taste
38# 68#
39$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 77
43$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
44 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 80
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
65our $DATADIR = datadir; 98our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
75 118
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 121our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
83 123
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 127our $DB_ENV;
89 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
90our %CFG; 131our %CFG;
91 132
92our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 134our $RUNTIME;
135our $NOW;
94 136
95our (%PLAYER, %PLAYER_LOADING); # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 138our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 139our $LINK_MAP; # the special {link} map, which is always available
98 140
99# used to convert map paths into valid unix filenames by replacing / by ∕ 141# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 143
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
105 153
106binmode STDOUT; 154binmode STDOUT;
107binmode STDERR; 155binmode STDERR;
108 156
109# read virtual server time, if available 157# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
114} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
115 165
116mkdir $_ 166mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 168
119our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
120 170
121sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 187
123############################################################################# 188#############################################################################
124 189
125=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
126 191
162 227
163The raw value load value from the last tick. 228The raw value load value from the last tick.
164 229
165=item %cf::CFG 230=item %cf::CFG
166 231
167Configuration for the server, loaded from C</etc/crossfire/config>, or 232Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 233from wherever your confdir points to.
169 234
170=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
171 236
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
173returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
174per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 240
176=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
177 242
178This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 245that call.
181 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
182=back 253=back
183 254
184=cut 255=cut
185 256
186BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
187 *CORE::GLOBAL::warn = sub { 258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
263$Coro::State::WARNHOOK = sub {
188 my $msg = join "", @_; 264 my $msg = join "", @_;
189 265
190 $msg .= "\n" 266 $msg .= "\n"
191 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
192 268
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 270
195 LOG llevError, $msg; 271 LOG llevWarn, $msg;
196 }; 272};
197} 273
274$Coro::State::DIEHOOK = sub {
275 return unless $^S eq 0; # "eq", not "=="
276
277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
280 error "DIEHOOK called in main context, Coro bug?\n";#d#
281 return;#d#
282 }#d#
283
284 # kill coroutine otherwise
285 Coro::terminate
286};
198 287
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 298for my $pkg (qw(
210 cf::global cf::attachable 299 cf::global cf::attachable
211 cf::object cf::object::player 300 cf::object cf::object::player
212 cf::client cf::player 301 cf::client cf::player
213 cf::arch cf::living 302 cf::arch cf::living
303 cf::map cf::mapspace
214 cf::map cf::party cf::region 304 cf::party cf::region
215)) { 305)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 307}
219 308
220$Event::DIED = sub { 309$EV::DIED = sub {
221 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
222}; 311};
223 312
224############################################################################# 313#############################################################################
225 314
226=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 337 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 338 $d
250 } || "[unable to dump $_[0]: '$@']"; 339 } || "[unable to dump $_[0]: '$@']";
251} 340}
252 341
253=item $ref = cf::from_json $json 342=item $ref = cf::decode_json $json
254 343
255Converts a JSON string into the corresponding perl data structure. 344Converts a JSON string into the corresponding perl data structure.
256 345
257=item $json = cf::to_json $ref 346=item $json = cf::encode_json $ref
258 347
259Converts a perl data structure into its JSON representation. 348Converts a perl data structure into its JSON representation.
260 349
261=cut 350=cut
262 351
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 353
265sub to_json ($) { $json_coder->encode ($_[0]) } 354sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 355sub decode_json($) { $json_coder->decode ($_[0]) }
356
357=item cf::post_init { BLOCK }
358
359Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again.
361
362The cdoeblock will have a single boolean argument to indicate whether this
363is a reload or not.
364
365=cut
366
367sub post_init(&) {
368 push @POST_INIT, shift;
369}
267 370
268=item cf::lock_wait $string 371=item cf::lock_wait $string
269 372
270Wait until the given lock is available. See cf::lock_acquire. 373Wait until the given lock is available. See cf::lock_acquire.
271 374
272=item my $lock = cf::lock_acquire $string 375=item my $lock = cf::lock_acquire $string
273 376
274Wait until the given lock is available and then acquires it and returns 377Wait until the given lock is available and then acquires it and returns
275a Coro::guard object. If the guard object gets destroyed (goes out of scope, 378a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 379for example when the coroutine gets canceled), the lock is automatically
277returned. 380returned.
278 381
279Locks are *not* recursive, locking from the same coro twice results in a 382Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 383deadlocked coro.
286 389
287Return true if the lock is currently active, i.e. somebody has locked it. 390Return true if the lock is currently active, i.e. somebody has locked it.
288 391
289=cut 392=cut
290 393
291our %LOCK; 394our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 395
294sub lock_wait($) { 396sub lock_wait($) {
295 my ($key) = @_; 397 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 398}
308 399
309sub lock_acquire($) { 400sub lock_acquire($) {
310 my ($key) = @_; 401 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 402}
324 403
325sub lock_active($) { 404sub lock_active($) {
326 my ($key) = @_; 405 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 406}
330 407
331sub freeze_mainloop { 408sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 409 tick_inhibit_inc;
333 410
334 my $guard = Coro::guard { 411 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 412}
336 }; 413
337 $TICK_WATCHER->stop; 414=item cf::periodic $interval, $cb
338 $guard 415
416Like EV::periodic, but randomly selects a starting point so that the actions
417get spread over time.
418
419=cut
420
421sub periodic($$) {
422 my ($interval, $cb) = @_;
423
424 my $start = rand List::Util::min 180, $interval;
425
426 EV::periodic $start, $interval, 0, $cb
339} 427}
340 428
341=item cf::get_slot $time[, $priority[, $name]] 429=item cf::get_slot $time[, $priority[, $name]]
342 430
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 431Allocate $time seconds of blocking CPU time at priority C<$priority>:
351 439
352=cut 440=cut
353 441
354our @SLOT_QUEUE; 442our @SLOT_QUEUE;
355our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
356 445
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
448 $Coro::current->desc ("timeslot manager");
449
359 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
360 452
361 while () { 453 while () {
362 next_job: 454 next_job:
455
363 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
364 if ($avail > 0.01) { 457
365 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
366 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
367 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
368 $job->[2]->send; 462 $job->[2]->send;
369 Coro::cede; 463 Coro::cede;
370 goto next_job; 464 goto next_job;
371 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
372 } 467 }
373 } 468 }
374 469
375 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive 471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 473 $signal->wait;
379 } else { 474 } else {
475 $busy = 0;
380 Coro::schedule; 476 Coro::schedule;
381 } 477 }
382 } 478 }
383}; 479};
384 480
385sub get_slot($;$$) { 481sub get_slot($;$$) {
482 return if tick_inhibit || $Coro::current == $Coro::main;
483
386 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
387 485
388 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
389 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
390 489
391 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
392 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
393 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
404 503
405BEGIN { *async = \&Coro::async_pool } 504BEGIN { *async = \&Coro::async_pool }
406 505
407=item cf::sync_job { BLOCK } 506=item cf::sync_job { BLOCK }
408 507
409The design of Crossfire TRT requires that the main coroutine ($Coro::main) 508The design of Deliantra requires that the main coroutine ($Coro::main)
410is always able to handle events or runnable, as Crossfire TRT is only 509is always able to handle events or runnable, as Deliantra is only
411partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 510partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412acceptable. 511acceptable.
413 512
414If it must be done, put the blocking parts into C<sync_job>. This will run 513If it must be done, put the blocking parts into C<sync_job>. This will run
415the given BLOCK in another coroutine while waiting for the result. The 514the given BLOCK in another coroutine while waiting for the result. The
420 519
421sub sync_job(&) { 520sub sync_job(&) {
422 my ($job) = @_; 521 my ($job) = @_;
423 522
424 if ($Coro::current == $Coro::main) { 523 if ($Coro::current == $Coro::main) {
425 my $time = Event::time; 524 my $time = AE::time;
426 525
427 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
429 528
430 # TODO: use suspend/resume instead 529 LOG llevError, Carp::longmess "sync job";#d#
431 # (but this is cancel-safe) 530
432 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
433 532
434 my $busy = 1; 533 my $busy = 1;
435 my @res; 534 my @res;
436 535
437 (async { 536 (async {
537 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 538 @res = eval { $job->() };
439 warn $@ if $@; 539 error $@ if $@;
440 undef $busy; 540 undef $busy;
441 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
442 542
443 while ($busy) { 543 while ($busy) {
444 Coro::cede or Event::one_event; 544 if (Coro::nready) {
545 Coro::cede_notself;
546 } else {
547 EV::loop EV::LOOP_ONESHOT;
445 } 548 }
549 }
446 550
447 $time = Event::time - $time; 551 my $time = AE::time - $time;
448 552
449 LOG llevError | logBacktrace, Carp::longmess "long sync job"
450 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
451
452 $tick_start += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
453 554
454 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
455 } else { 556 } else {
456 # we are in another coroutine, how wonderful, everything just works 557 # we are in another coroutine, how wonderful, everything just works
457 558
482=item fork_call { }, $args 583=item fork_call { }, $args
483 584
484Executes the given code block with the given arguments in a seperate 585Executes the given code block with the given arguments in a seperate
485process, returning the results. Everything must be serialisable with 586process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may 587Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling. 588never block itself or use any form of event handling.
488 589
489=cut 590=cut
490 591
491sub fork_call(&@) { 592sub fork_call(&@) {
492 my ($cb, @args) = @_; 593 my ($cb, @args) = @_;
499 reset_signals; 600 reset_signals;
500 &$cb 601 &$cb
501 }, @args; 602 }, @args;
502 603
503 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
605}
606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
616}
617
618=item $coin = coin_from_name $name
619
620=cut
621
622our %coin_alias = (
623 "silver" => "silvercoin",
624 "silvercoin" => "silvercoin",
625 "silvercoins" => "silvercoin",
626 "gold" => "goldcoin",
627 "goldcoin" => "goldcoin",
628 "goldcoins" => "goldcoin",
629 "platinum" => "platinacoin",
630 "platinumcoin" => "platinacoin",
631 "platinumcoins" => "platinacoin",
632 "platina" => "platinacoin",
633 "platinacoin" => "platinacoin",
634 "platinacoins" => "platinacoin",
635 "royalty" => "royalty",
636 "royalties" => "royalty",
637);
638
639sub coin_from_name($) {
640 $coin_alias{$_[0]}
641 ? cf::arch::find $coin_alias{$_[0]}
642 : undef
504} 643}
505 644
506=item $value = cf::db_get $family => $key 645=item $value = cf::db_get $family => $key
507 646
508Returns a single value from the environment database. 647Returns a single value from the environment database.
616 755
617 my $t1 = Time::HiRes::time; 756 my $t1 = Time::HiRes::time;
618 my $data = $process->(\@data); 757 my $data = $process->(\@data);
619 my $t2 = Time::HiRes::time; 758 my $t2 = Time::HiRes::time;
620 759
621 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 760 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
622 761
623 db_put cache => "$id/data", $data; 762 db_put cache => "$id/data", $data;
624 db_put cache => "$id/md5" , $md5; 763 db_put cache => "$id/md5" , $md5;
625 db_put cache => "$id/meta", $meta; 764 db_put cache => "$id/meta", $meta;
626 765
636 775
637=cut 776=cut
638 777
639sub datalog($@) { 778sub datalog($@) {
640 my ($type, %kv) = @_; 779 my ($type, %kv) = @_;
641 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 780 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
642} 781}
643 782
644=back 783=back
645 784
646=cut 785=cut
647 786
648############################################################################# 787#############################################################################
649 788
650=head2 ATTACHABLE OBJECTS 789=head2 ATTACHABLE OBJECTS
651 790
652Many objects in crossfire are so-called attachable objects. That means you can 791Many objects in deliantra are so-called attachable objects. That means you can
653attach callbacks/event handlers (a collection of which is called an "attachment") 792attach callbacks/event handlers (a collection of which is called an "attachment")
654to it. All such attachable objects support the following methods. 793to it. All such attachable objects support the following methods.
655 794
656In the following description, CLASS can be any of C<global>, C<object> 795In the following description, CLASS can be any of C<global>, C<object>
657C<player>, C<client> or C<map> (i.e. the attachable objects in 796C<player>, C<client> or C<map> (i.e. the attachable objects in
658Crossfire TRT). 797Deliantra).
659 798
660=over 4 799=over 4
661 800
662=item $attachable->attach ($attachment, key => $value...) 801=item $attachable->attach ($attachment, key => $value...)
663 802
707=item cf::CLASS::attachment $name, ... 846=item cf::CLASS::attachment $name, ...
708 847
709Register an attachment by C<$name> through which attachable objects of the 848Register an attachment by C<$name> through which attachable objects of the
710given CLASS can refer to this attachment. 849given CLASS can refer to this attachment.
711 850
712Some classes such as crossfire maps and objects can specify attachments 851Some classes such as deliantra maps and objects can specify attachments
713that are attached at load/instantiate time, thus the need for a name. 852that are attached at load/instantiate time, thus the need for a name.
714 853
715These calls expect any number of the following handler/hook descriptions: 854These calls expect any number of the following handler/hook descriptions:
716 855
717=over 4 856=over 4
841 980
842 } elsif (exists $cb_id{$type}) { 981 } elsif (exists $cb_id{$type}) {
843 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 982 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
844 983
845 } elsif (ref $type) { 984 } elsif (ref $type) {
846 warn "attaching objects not supported, ignoring.\n"; 985 error "attaching objects not supported, ignoring.\n";
847 986
848 } else { 987 } else {
849 shift @arg; 988 shift @arg;
850 warn "attach argument '$type' not supported, ignoring.\n"; 989 error "attach argument '$type' not supported, ignoring.\n";
851 } 990 }
852 } 991 }
853} 992}
854 993
855sub _object_attach { 994sub _object_attach {
865 _attach $registry, $klass, @attach; 1004 _attach $registry, $klass, @attach;
866 } 1005 }
867 1006
868 $obj->{$name} = \%arg; 1007 $obj->{$name} = \%arg;
869 } else { 1008 } else {
870 warn "object uses attachment '$name' which is not available, postponing.\n"; 1009 info "object uses attachment '$name' which is not available, postponing.\n";
871 } 1010 }
872 1011
873 $obj->{_attachment}{$name} = undef; 1012 $obj->{_attachment}{$name} = undef;
874} 1013}
875 1014
934 1073
935 for (@$callbacks) { 1074 for (@$callbacks) {
936 eval { &{$_->[1]} }; 1075 eval { &{$_->[1]} };
937 1076
938 if ($@) { 1077 if ($@) {
939 warn "$@";
940 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1078 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
941 override; 1079 override;
942 } 1080 }
943 1081
944 return 1 if $override; 1082 return 1 if $override;
945 } 1083 }
946 1084
947 0 1085 0
948} 1086}
949 1087
950=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1088=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
951 1089
952=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1090=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
953 1091
954Generate an object-specific event with the given arguments. 1092Generate an object-specific event with the given arguments.
955 1093
961 1099
962=cut 1100=cut
963 1101
964############################################################################# 1102#############################################################################
965# object support 1103# object support
966#
967 1104
1105sub _object_equal($$);
1106sub _object_equal($$) {
1107 my ($a, $b) = @_;
1108
1109 return 0 unless (ref $a) eq (ref $b);
1110
1111 if ("HASH" eq ref $a) {
1112 my @ka = keys %$a;
1113 my @kb = keys %$b;
1114
1115 return 0 if @ka != @kb;
1116
1117 for (0 .. $#ka) {
1118 return 0 unless $ka[$_] eq $kb[$_];
1119 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1120 }
1121
1122 } elsif ("ARRAY" eq ref $a) {
1123
1124 return 0 if @$a != @$b;
1125
1126 for (0 .. $#$a) {
1127 return 0 unless _object_equal $a->[$_], $b->[$_];
1128 }
1129
1130 } elsif ($a ne $b) {
1131 return 0;
1132 }
1133
1134 1
1135}
1136
1137our $SLOW_MERGES;#d#
968sub _can_merge { 1138sub _can_merge {
969 my ($ob1, $ob2) = @_; 1139 my ($ob1, $ob2) = @_;
970 1140
971 local $Storable::canonical = 1; 1141 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1142
975 $fob1 eq $fob2 1143 # we do the slow way here
1144 return _object_equal $ob1, $ob2
976} 1145}
977 1146
978sub reattach { 1147sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1148 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1149 my ($obj) = @_;
981 1150
1151 # no longer needed after getting rid of delete_package?
982 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1152 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
983 1153
984 my $registry = $obj->registry; 1154 my $registry = $obj->registry;
985 1155
986 @$registry = (); 1156 @$registry = ();
987 1157
992 for (@$attach) { 1162 for (@$attach) {
993 my ($klass, @attach) = @$_; 1163 my ($klass, @attach) = @$_;
994 _attach $registry, $klass, @attach; 1164 _attach $registry, $klass, @attach;
995 } 1165 }
996 } else { 1166 } else {
997 warn "object uses attachment '$name' that is not available, postponing.\n"; 1167 info "object uses attachment '$name' that is not available, postponing.\n";
998 } 1168 }
999 } 1169 }
1000} 1170}
1001 1171
1002cf::attachable->attach ( 1172cf::attachable->attach (
1003 prio => -1000000, 1173 prio => -1000000,
1004 on_instantiate => sub { 1174 on_instantiate => sub {
1005 my ($obj, $data) = @_; 1175 my ($obj, $data) = @_;
1006 1176
1007 $data = from_json $data; 1177 $data = decode_json $data;
1008 1178
1009 for (@$data) { 1179 for (@$data) {
1010 my ($name, $args) = @$_; 1180 my ($name, $args) = @$_;
1011 1181
1012 $obj->attach ($name, %{$args || {} }); 1182 $obj->attach ($name, %{$args || {} });
1029 my ($filename, $rdata, $objs) = @_; 1199 my ($filename, $rdata, $objs) = @_;
1030 1200
1031 sync_job { 1201 sync_job {
1032 if (length $$rdata) { 1202 if (length $$rdata) {
1033 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1034 warn sprintf "saving %s (%d,%d)\n", 1204 trace sprintf "saving %s (%d,%d)\n",
1035 $decname, length $$rdata, scalar @$objs; 1205 $decname, length $$rdata, scalar @$objs
1206 if $VERBOSE_IO;
1036 1207
1037 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1208 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1038 chmod SAVE_MODE, $fh; 1209 aio_chmod $fh, SAVE_MODE;
1039 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1210 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1040 aio_fsync $fh if $cf::USE_FSYNC; 1211 if ($cf::USE_FSYNC) {
1212 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;
1213 aio_fsync $fh;
1214 }
1041 close $fh; 1215 aio_close $fh;
1042 1216
1043 if (@$objs) { 1217 if (@$objs) {
1044 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1218 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1045 chmod SAVE_MODE, $fh; 1219 aio_chmod $fh, SAVE_MODE;
1046 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1220 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1047 aio_write $fh, 0, (length $data), $data, 0; 1221 aio_write $fh, 0, (length $data), $data, 0;
1048 aio_fsync $fh if $cf::USE_FSYNC; 1222 if ($cf::USE_FSYNC) {
1223 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;
1224 aio_fsync $fh;
1225 }
1049 close $fh; 1226 aio_close $fh;
1050 aio_rename "$filename.pst~", "$filename.pst"; 1227 aio_rename "$filename.pst~", "$filename.pst";
1051 } 1228 }
1052 } else { 1229 } else {
1053 aio_unlink "$filename.pst"; 1230 aio_unlink "$filename.pst";
1054 } 1231 }
1055 1232
1056 aio_rename "$filename~", $filename; 1233 aio_rename "$filename~", $filename;
1234
1235 $filename =~ s%/[^/]+$%%;
1236 aio_pathsync $filename if $cf::USE_FSYNC;
1057 } else { 1237 } else {
1058 warn "FATAL: $filename~: $!\n"; 1238 error "unable to save objects: $filename~: $!\n";
1059 } 1239 }
1060 } else { 1240 } else {
1061 aio_unlink $filename; 1241 aio_unlink $filename;
1062 aio_unlink "$filename.pst"; 1242 aio_unlink "$filename.pst";
1063 } 1243 }
1082 1262
1083 unless (aio_stat "$filename.pst") { 1263 unless (aio_stat "$filename.pst") {
1084 (aio_load "$filename.pst", $av) >= 0 1264 (aio_load "$filename.pst", $av) >= 0
1085 or return; 1265 or return;
1086 1266
1087 $av = eval { (Storable::thaw $av)->{objs} }; 1267 my $st = eval { Coro::Storable::thaw $av };
1268 $av = $st->{objs};
1088 } 1269 }
1089 1270
1090 utf8::decode (my $decname = $filename); 1271 utf8::decode (my $decname = $filename);
1091 warn sprintf "loading %s (%d,%d)\n", 1272 trace sprintf "loading %s (%d,%d)\n",
1092 $decname, length $data, scalar @{$av || []}; 1273 $decname, length $data, scalar @{$av || []}
1274 if $VERBOSE_IO;
1093 1275
1094 ($data, $av) 1276 ($data, $av)
1095} 1277}
1096 1278
1097=head2 COMMAND CALLBACKS 1279=head2 COMMAND CALLBACKS
1153 my ($name, $cb) = @_; 1335 my ($name, $cb) = @_;
1154 1336
1155 $EXTICMD{$name} = $cb; 1337 $EXTICMD{$name} = $cb;
1156} 1338}
1157 1339
1340use File::Glob ();
1341
1158cf::player->attach ( 1342cf::player->attach (
1159 on_command => sub { 1343 on_unknown_command => sub {
1160 my ($pl, $name, $params) = @_; 1344 my ($pl, $name, $params) = @_;
1161 1345
1162 my $cb = $COMMAND{$name} 1346 my $cb = $COMMAND{$name}
1163 or return; 1347 or return;
1164 1348
1187 1371
1188 $pl->ext_reply ($reply, @reply) 1372 $pl->ext_reply ($reply, @reply)
1189 if $reply; 1373 if $reply;
1190 1374
1191 } else { 1375 } else {
1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1193 } 1377 }
1194 1378
1195 cf::override; 1379 cf::override;
1196 }, 1380 },
1197); 1381);
1198 1382
1383# "readahead" all extensions
1384sub cache_extensions {
1385 my $grp = IO::AIO::aio_group;
1386
1387 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1388 for (grep /\.ext$/, @{$_[0]}) {
1389 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1390 }
1391 };
1392
1393 $grp
1394}
1395
1199sub load_extensions { 1396sub load_extensions {
1397 info "loading extensions...";
1398
1200 cf::sync_job { 1399 cf::sync_job {
1201 my %todo; 1400 my %todo;
1202 1401
1203 for my $path (<$LIBDIR/*.ext>) { 1402 for my $path (<$LIBDIR/*.ext>) {
1204 next unless -r $path; 1403 next unless -r $path;
1222 1421
1223 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1422 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1224 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1423 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1225 1424
1226 $ext{source} = 1425 $ext{source} =
1227 "package $pkg; use strict; use utf8;\n" 1426 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1228 . "#line 1 \"$path\"\n{\n" 1427 . "#line 1 \"$path\"\n{\n"
1229 . $source 1428 . $source
1230 . "\n};\n1"; 1429 . "\n};\n1";
1231 1430
1232 $todo{$base} = \%ext; 1431 $todo{$base} = \%ext;
1233 } 1432 }
1234 1433
1434 my $pass = 0;
1235 my %done; 1435 my %done;
1236 while (%todo) { 1436 while (%todo) {
1237 my $progress; 1437 my $progress;
1238 1438
1439 ++$pass;
1440
1441 ext:
1239 while (my ($k, $v) = each %todo) { 1442 while (my ($k, $v) = each %todo) {
1240 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1241 goto skip 1444 next ext
1242 unless exists $done{$_}; 1445 unless exists $done{$_};
1243 } 1446 }
1244 1447
1245 warn "... loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1246 1449
1247 unless (eval $v->{source}) { 1450 my $active = eval $v->{source};
1451
1452 if (length $@) {
1248 my $msg = $@ ? "$v->{path}: $@\n" 1453 error "$v->{path}: $@\n";
1249 : "$v->{base}: extension inactive.\n";
1250 1454
1455 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1251 if (exists $v->{meta}{mandatory}) { 1456 if exists $v->{meta}{mandatory};
1252 warn $msg; 1457
1253 warn "mandatory extension failed to load, exiting.\n"; 1458 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1254 exit 1; 1459 delete $todo{$k};
1255 } 1460 } else {
1256 1461 $done{$k} = delete $todo{$k};
1257 warn $msg; 1462 push @EXTS, $v->{pkg};
1463 $progress = 1;
1464
1465 info "$v->{base}: extension inactive.\n"
1466 unless $active;
1258 } 1467 }
1259
1260 $done{$k} = delete $todo{$k};
1261 push @EXTS, $v->{pkg};
1262 $progress = 1;
1263 } 1468 }
1264 1469
1265 skip: 1470 unless ($progress) {
1266 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1471 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1267 unless $progress; 1472
1473 while (my ($k, $v) = each %todo) {
1474 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1475 if exists $v->{meta}{mandatory};
1476 }
1477 }
1268 } 1478 }
1269 }; 1479 };
1270} 1480}
1271 1481
1272############################################################################# 1482#############################################################################
1273 1483
1274=back 1484=back
1275 1485
1276=head2 CORE EXTENSIONS 1486=head2 CORE EXTENSIONS
1277 1487
1278Functions and methods that extend core crossfire objects. 1488Functions and methods that extend core deliantra objects.
1279 1489
1280=cut 1490=cut
1281 1491
1282package cf::player; 1492package cf::player;
1283 1493
1326 1536
1327sub exists($) { 1537sub exists($) {
1328 my ($login) = @_; 1538 my ($login) = @_;
1329 1539
1330 $cf::PLAYER{$login} 1540 $cf::PLAYER{$login}
1331 or cf::sync_job { !aio_stat path $login } 1541 or !aio_stat path $login
1332} 1542}
1333 1543
1334sub find($) { 1544sub find($) {
1335 return $cf::PLAYER{$_[0]} || do { 1545 return $cf::PLAYER{$_[0]} || do {
1336 my $login = $_[0]; 1546 my $login = $_[0];
1348 my $f = new_from_file cf::object::thawer path $login 1558 my $f = new_from_file cf::object::thawer path $login
1349 or return; 1559 or return;
1350 1560
1351 my $pl = cf::player::load_pl $f 1561 my $pl = cf::player::load_pl $f
1352 or return; 1562 or return;
1563
1353 local $cf::PLAYER_LOADING{$login} = $pl; 1564 local $cf::PLAYER_LOADING{$login} = $pl;
1354 $f->resolve_delayed_derefs; 1565 $f->resolve_delayed_derefs;
1355 $cf::PLAYER{$login} = $pl 1566 $cf::PLAYER{$login} = $pl
1356 } 1567 }
1357 } 1568 }
1358} 1569}
1359 1570
1571cf::player->attach (
1572 on_load => sub {
1573 my ($pl, $path) = @_;
1574
1575 # restore slots saved in save, below
1576 my $slots = delete $pl->{_slots};
1577
1578 $pl->ob->current_weapon ($slots->[0]);
1579 $pl->combat_ob ($slots->[1]);
1580 $pl->ranged_ob ($slots->[2]);
1581 },
1582);
1583
1360sub save($) { 1584sub save($) {
1361 my ($pl) = @_; 1585 my ($pl) = @_;
1362 1586
1363 return if $pl->{deny_save}; 1587 return if $pl->{deny_save};
1364 1588
1367 1591
1368 return if $pl->{deny_save}; 1592 return if $pl->{deny_save};
1369 1593
1370 aio_mkdir playerdir $pl, 0770; 1594 aio_mkdir playerdir $pl, 0770;
1371 $pl->{last_save} = $cf::RUNTIME; 1595 $pl->{last_save} = $cf::RUNTIME;
1596
1597 cf::get_slot 0.01;
1598
1599 # save slots, to be restored later
1600 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1372 1601
1373 $pl->save_pl ($path); 1602 $pl->save_pl ($path);
1374 cf::cede_to_tick; 1603 cf::cede_to_tick;
1375} 1604}
1376 1605
1408 my ($pl) = @_; 1637 my ($pl) = @_;
1409 1638
1410 my $name = $pl->ob->name; 1639 my $name = $pl->ob->name;
1411 1640
1412 $pl->{deny_save} = 1; 1641 $pl->{deny_save} = 1;
1413 $pl->password ("*"); # this should lock out the player until we nuked the dir 1642 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1414 1643
1415 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1644 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1416 $pl->deactivate; 1645 $pl->deactivate;
1646 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1417 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1647 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1418 $pl->ns->destroy if $pl->ns; 1648 $pl->ns->destroy if $pl->ns;
1419 1649
1420 my $path = playerdir $pl; 1650 my $path = playerdir $pl;
1421 my $temp = "$path~$cf::RUNTIME~deleting~"; 1651 my $temp = "$path~$cf::RUNTIME~deleting~";
1460 1690
1461 for my $login (@$dirs) { 1691 for my $login (@$dirs) {
1462 my $path = path $login; 1692 my $path = path $login;
1463 1693
1464 # a .pst is a dead give-away for a valid player 1694 # a .pst is a dead give-away for a valid player
1465 unless (-e "$path.pst") { 1695 # if no pst file found, open and chekc for blocked users
1696 if (aio_stat "$path.pst") {
1466 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1697 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1467 aio_read $fh, 0, 512, my $buf, 0 or next; 1698 aio_read $fh, 0, 512, my $buf, 0 or next;
1468 $buf !~ /^password -------------$/m or next; # official not-valid tag 1699 $buf !~ /^password -------------$/m or next; # official not-valid tag
1469 } 1700 }
1470 1701
1474 1705
1475 \@logins 1706 \@logins
1476} 1707}
1477 1708
1478=item $player->maps 1709=item $player->maps
1710
1711=item cf::player::maps $login
1479 1712
1480Returns an arrayref of map paths that are private for this 1713Returns an arrayref of map paths that are private for this
1481player. May block. 1714player. May block.
1482 1715
1483=cut 1716=cut
1501 } 1734 }
1502 1735
1503 \@paths 1736 \@paths
1504} 1737}
1505 1738
1506=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1739=item $protocol_xml = $player->expand_cfpod ($cfpod)
1507 1740
1508Expand crossfire pod fragments into protocol xml. 1741Expand deliantra pod fragments into protocol xml.
1509
1510=cut
1511
1512sub expand_cfpod {
1513 ((my $self), (local $_)) = @_;
1514
1515 # escape & and <
1516 s/&/&amp;/g;
1517 s/(?<![BIUGHT])</&lt;/g;
1518
1519 # this is buggy, it needs to properly take care of nested <'s
1520
1521 1 while
1522 # replace B<>, I<>, U<> etc.
1523 s/B<([^\>]*)>/<b>$1<\/b>/
1524 || s/I<([^\>]*)>/<i>$1<\/i>/
1525 || s/U<([^\>]*)>/<u>$1<\/u>/
1526 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1527 # replace G<male|female> tags
1528 || s{G<([^>|]*)\|([^>]*)>}{
1529 $self->gender ? $2 : $1
1530 }ge
1531 # replace H<hint text>
1532 || s{H<([^\>]*)>}
1533 {
1534 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1535 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1536 "")
1537 [$self->{hintmode}]
1538 }ge;
1539
1540 # create single paragraphs (very hackish)
1541 s/(?<=\S)\n(?=\w)/ /g;
1542
1543 # compress some whitespace
1544 s/\s+\n/\n/g; # ws line-ends
1545 s/\n\n+/\n/g; # double lines
1546 s/^\n+//; # beginning lines
1547 s/\n+$//; # ending lines
1548
1549 $_
1550}
1551
1552sub hintmode {
1553 $_[0]{hintmode} = $_[1] if @_ > 1;
1554 $_[0]{hintmode}
1555}
1556 1742
1557=item $player->ext_reply ($msgid, @msg) 1743=item $player->ext_reply ($msgid, @msg)
1558 1744
1559Sends an ext reply to the player. 1745Sends an ext reply to the player.
1560 1746
1592 1778
1593=cut 1779=cut
1594 1780
1595sub find_by_path($) { 1781sub find_by_path($) {
1596 my ($path) = @_; 1782 my ($path) = @_;
1783
1784 $path =~ s/^~[^\/]*//; # skip ~login
1597 1785
1598 my ($match, $specificity); 1786 my ($match, $specificity);
1599 1787
1600 for my $region (list) { 1788 for my $region (list) {
1601 if ($region->{match} && $path =~ $region->{match}) { 1789 if ($region->{match} && $path =~ $region->{match}) {
1627our $MAX_RESET = 3600; 1815our $MAX_RESET = 3600;
1628our $DEFAULT_RESET = 3000; 1816our $DEFAULT_RESET = 3000;
1629 1817
1630sub generate_random_map { 1818sub generate_random_map {
1631 my ($self, $rmp) = @_; 1819 my ($self, $rmp) = @_;
1820
1821 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1822
1632 # mit "rum" bekleckern, nicht 1823 # mit "rum" bekleckern, nicht
1633 $self->_create_random_map ( 1824 $self->_create_random_map (
1634 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1825 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1635 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1826 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1636 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1827 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1637 $rmp->{exit_on_final_map}, 1828 $rmp->{exit_on_final_map},
1638 $rmp->{xsize}, $rmp->{ysize}, 1829 $rmp->{xsize}, $rmp->{ysize},
1639 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1830 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1640 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1831 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1662 1853
1663 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1664} 1855}
1665 1856
1666# also paths starting with '/' 1857# also paths starting with '/'
1667$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1668 1859
1669sub thawer_merge { 1860sub thawer_merge {
1670 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1671 1862
1672 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
1758 1949
1759# the temporary/swap location 1950# the temporary/swap location
1760sub save_path { 1951sub save_path {
1761 my ($self) = @_; 1952 my ($self) = @_;
1762 1953
1763 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1954 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1764 "$TMPDIR/$path.map" 1955 "$TMPDIR/$path.map"
1765} 1956}
1766 1957
1767# the unique path, undef == no special unique path 1958# the unique path, undef == no special unique path
1768sub uniq_path { 1959sub uniq_path {
1769 my ($self) = @_; 1960 my ($self) = @_;
1770 1961
1771 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1962 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1772 "$UNIQUEDIR/$path" 1963 "$UNIQUEDIR/$path"
1773}
1774
1775# and all this just because we cannot iterate over
1776# all maps in C++...
1777sub change_all_map_light {
1778 my ($change) = @_;
1779
1780 $_->change_map_light ($change)
1781 for grep $_->outdoor, values %cf::MAP;
1782} 1964}
1783 1965
1784sub decay_objects { 1966sub decay_objects {
1785 my ($self) = @_; 1967 my ($self) = @_;
1786 1968
1870sub find { 2052sub find {
1871 my ($path, $origin) = @_; 2053 my ($path, $origin) = @_;
1872 2054
1873 $path = normalise $path, $origin && $origin->path; 2055 $path = normalise $path, $origin && $origin->path;
1874 2056
1875 cf::lock_wait "map_data:$path";#d#remove 2057 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1876 cf::lock_wait "map_find:$path"; 2058 my $guard2 = cf::lock_acquire "map_find:$path";
1877 2059
1878 $cf::MAP{$path} || do { 2060 $cf::MAP{$path} || do {
1879 my $guard1 = cf::lock_acquire "map_find:$path";
1880 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1881
1882 my $map = new_from_path cf::map $path 2061 my $map = new_from_path cf::map $path
1883 or return; 2062 or return;
1884 2063
1885 $map->{last_save} = $cf::RUNTIME; 2064 $map->{last_save} = $cf::RUNTIME;
1886 2065
1888 or return; 2067 or return;
1889 2068
1890 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2069 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1891 # doing this can freeze the server in a sync job, obviously 2070 # doing this can freeze the server in a sync job, obviously
1892 #$cf::WAIT_FOR_TICK->wait; 2071 #$cf::WAIT_FOR_TICK->wait;
2072 undef $guard2;
1893 undef $guard1; 2073 undef $guard1;
1894 undef $guard2;
1895 $map->reset; 2074 $map->reset;
1896 return find $path; 2075 return find $path;
1897 } 2076 }
1898 2077
1899 $cf::MAP{$path} = $map 2078 $cf::MAP{$path} = $map
1900 } 2079 }
1901} 2080}
1902 2081
1903sub pre_load { } 2082sub pre_load { }
1904sub post_load { } 2083#sub post_load { } # XS
1905 2084
1906sub load { 2085sub load {
1907 my ($self) = @_; 2086 my ($self) = @_;
1908 2087
1909 local $self->{deny_reset} = 1; # loading can take a long time 2088 local $self->{deny_reset} = 1; # loading can take a long time
1926 my $f = new_from_file cf::object::thawer $self->{load_path}; 2105 my $f = new_from_file cf::object::thawer $self->{load_path};
1927 $f->skip_block; 2106 $f->skip_block;
1928 $self->_load_objects ($f) 2107 $self->_load_objects ($f)
1929 or return; 2108 or return;
1930 2109
1931 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2110 $self->post_load_original
1932 if delete $self->{load_original}; 2111 if delete $self->{load_original};
1933 2112
1934 if (my $uniq = $self->uniq_path) { 2113 if (my $uniq = $self->uniq_path) {
1935 utf8::encode $uniq; 2114 utf8::encode $uniq;
1936 unless (aio_stat $uniq) { 2115 unless (aio_stat $uniq) {
1954 unless ($self->{deny_activate}) { 2133 unless ($self->{deny_activate}) {
1955 $self->decay_objects; 2134 $self->decay_objects;
1956 $self->fix_auto_apply; 2135 $self->fix_auto_apply;
1957 $self->update_buttons; 2136 $self->update_buttons;
1958 cf::cede_to_tick; 2137 cf::cede_to_tick;
1959 $self->set_darkness_map;
1960 cf::cede_to_tick;
1961 $self->activate; 2138 $self->activate;
1962 } 2139 }
1963 2140
1964 $self->{last_save} = $cf::RUNTIME; 2141 $self->{last_save} = $cf::RUNTIME;
1965 $self->last_access ($cf::RUNTIME); 2142 $self->last_access ($cf::RUNTIME);
1966 2143
1967 $self->in_memory (cf::MAP_IN_MEMORY); 2144 $self->in_memory (cf::MAP_ACTIVE);
1968 } 2145 }
1969 2146
1970 $self->post_load; 2147 $self->post_load;
1971} 2148}
1972 2149
2150# customize the map for a given player, i.e.
2151# return the _real_ map. used by e.g. per-player
2152# maps to change the path to ~playername/mappath
1973sub customise_for { 2153sub customise_for {
1974 my ($self, $ob) = @_; 2154 my ($self, $ob) = @_;
1975 2155
1976 return find "~" . $ob->name . "/" . $self->{path} 2156 return find "~" . $ob->name . "/" . $self->{path}
1977 if $self->per_player; 2157 if $self->per_player;
1993 or next; 2173 or next;
1994 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
1995 or next; 2175 or next;
1996 $neigh->load; 2176 $neigh->load;
1997 2177
2178 # now find the diagonal neighbours
1998 push @neigh, 2179 push @neigh,
1999 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2000 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2001 } 2182 }
2002 2183
2030 my ($path, $origin, $load) = @_; 2211 my ($path, $origin, $load) = @_;
2031 2212
2032 $path = normalise $path, $origin && $origin->{path}; 2213 $path = normalise $path, $origin && $origin->{path};
2033 2214
2034 if (my $map = $cf::MAP{$path}) { 2215 if (my $map = $cf::MAP{$path}) {
2035 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2216 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2036 } 2217 }
2037 2218
2038 $MAP_PREFETCH{$path} |= $load; 2219 $MAP_PREFETCH{$path} |= $load;
2039 2220
2040 $MAP_PREFETCHER ||= cf::async { 2221 $MAP_PREFETCHER ||= cf::async {
2222 $Coro::current->{desc} = "map prefetcher";
2223
2041 while (%MAP_PREFETCH) { 2224 while (%MAP_PREFETCH) {
2042 while (my ($k, $v) = each %MAP_PREFETCH) { 2225 while (my ($k, $v) = each %MAP_PREFETCH) {
2043 if (my $map = find $k) { 2226 if (my $map = find $k) {
2044 $map->load if $v; 2227 $map->load if $v;
2045 } 2228 }
2052 $MAP_PREFETCHER->prio (6); 2235 $MAP_PREFETCHER->prio (6);
2053 2236
2054 () 2237 ()
2055} 2238}
2056 2239
2240# common code, used by both ->save and ->swapout
2057sub save { 2241sub _save {
2058 my ($self) = @_; 2242 my ($self) = @_;
2059
2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
2061 2243
2062 $self->{last_save} = $cf::RUNTIME; 2244 $self->{last_save} = $cf::RUNTIME;
2063 2245
2064 return unless $self->dirty; 2246 return unless $self->dirty;
2065 2247
2071 return if $self->{deny_save}; 2253 return if $self->{deny_save};
2072 2254
2073 local $self->{last_access} = $self->last_access;#d# 2255 local $self->{last_access} = $self->last_access;#d#
2074 2256
2075 cf::async { 2257 cf::async {
2258 $Coro::current->{desc} = "map player save";
2076 $_->contr->save for $self->players; 2259 $_->contr->save for $self->players;
2077 }; 2260 };
2261
2262 cf::get_slot 0.02;
2078 2263
2079 if ($uniq) { 2264 if ($uniq) {
2080 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2265 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2081 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2266 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2082 } else { 2267 } else {
2083 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2268 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2084 } 2269 }
2085} 2270}
2086 2271
2272sub save {
2273 my ($self) = @_;
2274
2275 my $lock = cf::lock_acquire "map_data:$self->{path}";
2276
2277 $self->_save;
2278}
2279
2087sub swap_out { 2280sub swap_out {
2088 my ($self) = @_; 2281 my ($self) = @_;
2089 2282
2090 # save first because save cedes
2091 $self->save;
2092
2093 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2283 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094 2284
2285 return if $self->in_memory != cf::MAP_ACTIVE;
2286 return if $self->{deny_save};
2095 return if $self->players; 2287 return if $self->players;
2096 return if $self->in_memory != cf::MAP_IN_MEMORY;
2097 return if $self->{deny_save};
2098 2288
2289 # first deactivate the map and "unlink" it from the core
2290 $self->deactivate;
2291 $_->clear_links_to ($self) for values %cf::MAP;
2099 $self->in_memory (cf::MAP_SWAPPED); 2292 $self->in_memory (cf::MAP_SWAPPED);
2293
2294 # then atomically save
2295 $self->_save;
2296
2297 # then free the map
2298 $self->clear;
2299}
2300
2301sub reset_at {
2302 my ($self) = @_;
2303
2304 # TODO: safety, remove and allow resettable per-player maps
2305 return 1e99 if $self->{deny_reset};
2306
2307 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2308 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2309
2310 $time + $to
2311}
2312
2313sub should_reset {
2314 my ($self) = @_;
2315
2316 $self->reset_at <= $cf::RUNTIME
2317}
2318
2319sub reset {
2320 my ($self) = @_;
2321
2322 my $lock = cf::lock_acquire "map_data:$self->{path}";
2323
2324 return if $self->players;
2325
2326 cf::trace "resetting map ", $self->path, "\n";
2327
2328 $self->in_memory (cf::MAP_SWAPPED);
2329
2330 # need to save uniques path
2331 unless ($self->{deny_save}) {
2332 my $uniq = $self->uniq_path; utf8::encode $uniq;
2333
2334 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2335 if $uniq;
2336 }
2337
2338 delete $cf::MAP{$self->path};
2100 2339
2101 $self->deactivate; 2340 $self->deactivate;
2102 $_->clear_links_to ($self) for values %cf::MAP; 2341 $_->clear_links_to ($self) for values %cf::MAP;
2103 $self->clear; 2342 $self->clear;
2104}
2105
2106sub reset_at {
2107 my ($self) = @_;
2108
2109 # TODO: safety, remove and allow resettable per-player maps
2110 return 1e99 if $self->{deny_reset};
2111
2112 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2113 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2114
2115 $time + $to
2116}
2117
2118sub should_reset {
2119 my ($self) = @_;
2120
2121 $self->reset_at <= $cf::RUNTIME
2122}
2123
2124sub reset {
2125 my ($self) = @_;
2126
2127 my $lock = cf::lock_acquire "map_data:$self->{path}";
2128
2129 return if $self->players;
2130
2131 warn "resetting map ", $self->path;
2132
2133 $self->in_memory (cf::MAP_SWAPPED);
2134
2135 # need to save uniques path
2136 unless ($self->{deny_save}) {
2137 my $uniq = $self->uniq_path; utf8::encode $uniq;
2138
2139 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2140 if $uniq;
2141 }
2142
2143 delete $cf::MAP{$self->path};
2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
2147 $self->clear;
2148 2343
2149 $self->unlink_save; 2344 $self->unlink_save;
2150 $self->destroy; 2345 $self->destroy;
2151} 2346}
2152 2347
2160 2355
2161 delete $cf::MAP{$self->path}; 2356 delete $cf::MAP{$self->path};
2162 2357
2163 $self->unlink_save; 2358 $self->unlink_save;
2164 2359
2165 bless $self, "cf::map"; 2360 bless $self, "cf::map::wrap";
2166 delete $self->{deny_reset}; 2361 delete $self->{deny_reset};
2167 $self->{deny_save} = 1; 2362 $self->{deny_save} = 1;
2168 $self->reset_timeout (1); 2363 $self->reset_timeout (1);
2169 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2364 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2170 2365
2219 2414
2220sub unique_maps() { 2415sub unique_maps() {
2221 [ 2416 [
2222 map { 2417 map {
2223 utf8::decode $_; 2418 utf8::decode $_;
2224 /\.map$/ 2419 s/\.map$//; # TODO future compatibility hack
2420 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2421 ? ()
2225 ? normalise $_ 2422 : normalise $_
2226 : ()
2227 } @{ aio_readdir $UNIQUEDIR or [] } 2423 } @{ aio_readdir $UNIQUEDIR or [] }
2228 ] 2424 ]
2229} 2425}
2230 2426
2231package cf; 2427=item cf::map::static_maps
2428
2429Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2430file in the shared directory excluding F</styles> and F</editor>). May
2431block.
2432
2433=cut
2434
2435sub static_maps() {
2436 my @dirs = "";
2437 my @maps;
2438
2439 while (@dirs) {
2440 my $dir = shift @dirs;
2441
2442 next if $dir eq "/styles" || $dir eq "/editor";
2443
2444 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2445 or return;
2446
2447 for (@$files) {
2448 s/\.map$// or next;
2449 utf8::decode $_;
2450 push @maps, "$dir/$_";
2451 }
2452
2453 push @dirs, map "$dir/$_", @$dirs;
2454 }
2455
2456 \@maps
2457}
2232 2458
2233=back 2459=back
2234 2460
2235=head3 cf::object 2461=head3 cf::object
2236 2462
2240 2466
2241=over 4 2467=over 4
2242 2468
2243=item $ob->inv_recursive 2469=item $ob->inv_recursive
2244 2470
2245Returns the inventory of the object _and_ their inventories, recursively. 2471Returns the inventory of the object I<and> their inventories, recursively,
2472but I<not> the object itself.
2246 2473
2247=cut 2474=cut
2248 2475
2249sub inv_recursive_; 2476sub inv_recursive_;
2250sub inv_recursive_ { 2477sub inv_recursive_ {
2255 inv_recursive_ inv $_[0] 2482 inv_recursive_ inv $_[0]
2256} 2483}
2257 2484
2258=item $ref = $ob->ref 2485=item $ref = $ob->ref
2259 2486
2260creates and returns a persistent reference to an objetc that can be stored as a string. 2487Creates and returns a persistent reference to an object that can be stored as a string.
2261 2488
2262=item $ob = cf::object::deref ($refstring) 2489=item $ob = cf::object::deref ($refstring)
2263 2490
2264returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2491returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2265even if the object actually exists. May block. 2492even if the object actually exists. May block.
2267=cut 2494=cut
2268 2495
2269sub deref { 2496sub deref {
2270 my ($ref) = @_; 2497 my ($ref) = @_;
2271 2498
2272 # temporary compatibility#TODO#remove
2273 $ref =~ s{^<}{player/<};
2274
2275 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2499 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2276 my ($uuid, $name) = ($1, $2); 2500 my ($uuid, $name) = ($1, $2);
2277 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2501 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2278 or return; 2502 or return;
2279 $pl->ob->uuid eq $uuid 2503 $pl->ob->uuid eq $uuid
2280 or return; 2504 or return;
2300can be C<undef>. Does the right thing when the player is currently in a 2524can be C<undef>. Does the right thing when the player is currently in a
2301dialogue with the given NPC character. 2525dialogue with the given NPC character.
2302 2526
2303=cut 2527=cut
2304 2528
2529our $SAY_CHANNEL = {
2530 id => "say",
2531 title => "Map",
2532 reply => "say ",
2533 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2534};
2535
2536our $CHAT_CHANNEL = {
2537 id => "chat",
2538 title => "Chat",
2539 reply => "chat ",
2540 tooltip => "Player chat and shouts, global to the server.",
2541};
2542
2305# rough implementation of a future "reply" method that works 2543# rough implementation of a future "reply" method that works
2306# with dialog boxes. 2544# with dialog boxes.
2307#TODO: the first argument must go, split into a $npc->reply_to ( method 2545#TODO: the first argument must go, split into a $npc->reply_to ( method
2308sub cf::object::player::reply($$$;$) { 2546sub cf::object::player::reply($$$;$) {
2309 my ($self, $npc, $msg, $flags) = @_; 2547 my ($self, $npc, $msg, $flags) = @_;
2320 my $dialog = $pl->{npc_dialog}; 2558 my $dialog = $pl->{npc_dialog};
2321 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2559 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2322 2560
2323 } else { 2561 } else {
2324 $msg = $npc->name . " says: $msg" if $npc; 2562 $msg = $npc->name . " says: $msg" if $npc;
2325 $self->message ($msg, $flags); 2563 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2326 } 2564 }
2327 } 2565 }
2328} 2566}
2329 2567
2330=item $object->send_msg ($channel, $msg, $color, [extra...]) 2568=item $object->send_msg ($channel, $msg, $color, [extra...])
2355 2593
2356=item $player_object->enter_link 2594=item $player_object->enter_link
2357 2595
2358Freezes the player and moves him/her to a special map (C<{link}>). 2596Freezes the player and moves him/her to a special map (C<{link}>).
2359 2597
2360The player should be reasonably safe there for short amounts of time. You 2598The player should be reasonably safe there for short amounts of time (e.g.
2361I<MUST> call C<leave_link> as soon as possible, though. 2599for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2600though, as the player cannot control the character while it is on the link
2601map.
2362 2602
2363Will never block. 2603Will never block.
2364 2604
2365=item $player_object->leave_link ($map, $x, $y) 2605=item $player_object->leave_link ($map, $x, $y)
2366 2606
2386sub cf::object::player::enter_link { 2626sub cf::object::player::enter_link {
2387 my ($self) = @_; 2627 my ($self) = @_;
2388 2628
2389 $self->deactivate_recursive; 2629 $self->deactivate_recursive;
2390 2630
2631 ++$self->{_link_recursion};
2632
2391 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2633 return if UNIVERSAL::isa $self->map, "ext::map_link";
2392 2634
2393 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2635 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2394 if $self->map && $self->map->{path} ne "{link}"; 2636 if $self->map && $self->map->{path} ne "{link}";
2395 2637
2396 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2638 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2397} 2639}
2398 2640
2399sub cf::object::player::leave_link { 2641sub cf::object::player::leave_link {
2400 my ($self, $map, $x, $y) = @_; 2642 my ($self, $map, $x, $y) = @_;
2401 2643
2418 ($x, $y) = (-1, -1) 2660 ($x, $y) = (-1, -1)
2419 unless (defined $x) && (defined $y); 2661 unless (defined $x) && (defined $y);
2420 2662
2421 # use -1 or undef as default coordinates, not 0, 0 2663 # use -1 or undef as default coordinates, not 0, 0
2422 ($x, $y) = ($map->enter_x, $map->enter_y) 2664 ($x, $y) = ($map->enter_x, $map->enter_y)
2423 if $x <=0 && $y <= 0; 2665 if $x <= 0 && $y <= 0;
2424 2666
2425 $map->load; 2667 $map->load;
2426 $map->load_neighbours; 2668 $map->load_neighbours;
2427 2669
2428 return unless $self->contr->active; 2670 return unless $self->contr->active;
2429 $self->activate_recursive;
2430 2671
2431 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2672 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2432 $self->enter_map ($map, $x, $y); 2673 if ($self->enter_map ($map, $x, $y)) {
2433} 2674 # entering was successful
2675 delete $self->{_link_recursion};
2676 # only activate afterwards, to support waiting in hooks
2677 $self->activate_recursive;
2678 }
2434 2679
2680}
2681
2435=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2682=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2436 2683
2437Moves the player to the given map-path and coordinates by first freezing 2684Moves the player to the given map-path and coordinates by first freezing
2438her, loading and preparing them map, calling the provided $check callback 2685her, loading and preparing them map, calling the provided $check callback
2439that has to return the map if sucecssful, and then unfreezes the player on 2686that has to return the map if sucecssful, and then unfreezes the player on
2440the new (success) or old (failed) map position. In either case, $done will 2687the new (success) or old (failed) map position. In either case, $done will
2441be called at the end of this process. 2688be called at the end of this process.
2442 2689
2690Note that $check will be called with a potentially non-loaded map, so if
2691it needs a loaded map it has to call C<< ->load >>.
2692
2443=cut 2693=cut
2444 2694
2445our $GOTOGEN; 2695our $GOTOGEN;
2446 2696
2447sub cf::object::player::goto { 2697sub cf::object::player::goto {
2448 my ($self, $path, $x, $y, $check, $done) = @_; 2698 my ($self, $path, $x, $y, $check, $done) = @_;
2449 2699
2700 if ($self->{_link_recursion} >= $MAX_LINKS) {
2701 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2702 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2703 ($path, $x, $y) = @$EMERGENCY_POSITION;
2704 }
2705
2450 # do generation counting so two concurrent goto's will be executed in-order 2706 # do generation counting so two concurrent goto's will be executed in-order
2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2707 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2452 2708
2453 $self->enter_link; 2709 $self->enter_link;
2454 2710
2455 (async { 2711 (async {
2712 $Coro::current->{desc} = "player::goto $path $x $y";
2713
2456 # *tag paths override both path and x|y 2714 # *tag paths override both path and x|y
2457 if ($path =~ /^\*(.*)$/) { 2715 if ($path =~ /^\*(.*)$/) {
2458 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2716 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2459 my $ob = $obs[rand @obs]; 2717 my $ob = $obs[rand @obs];
2460 2718
2475 my $map = eval { 2733 my $map = eval {
2476 my $map = defined $path ? cf::map::find $path : undef; 2734 my $map = defined $path ? cf::map::find $path : undef;
2477 2735
2478 if ($map) { 2736 if ($map) {
2479 $map = $map->customise_for ($self); 2737 $map = $map->customise_for ($self);
2480 $map = $check->($map) if $check && $map; 2738 $map = $check->($map, $x, $y, $self) if $check && $map;
2481 } else { 2739 } else {
2482 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2740 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2483 } 2741 }
2484 2742
2485 $map 2743 $map
2493 if ($gen == $self->{_goto_generation}) { 2751 if ($gen == $self->{_goto_generation}) {
2494 delete $self->{_goto_generation}; 2752 delete $self->{_goto_generation};
2495 $self->leave_link ($map, $x, $y); 2753 $self->leave_link ($map, $x, $y);
2496 } 2754 }
2497 2755
2498 $done->() if $done; 2756 $done->($self) if $done;
2499 })->prio (1); 2757 })->prio (1);
2500} 2758}
2501 2759
2502=item $player_object->enter_exit ($exit_object) 2760=item $player_object->enter_exit ($exit_object)
2503 2761
2523} 2781}
2524 2782
2525sub prepare_random_map { 2783sub prepare_random_map {
2526 my ($exit) = @_; 2784 my ($exit) = @_;
2527 2785
2528 my $guard = cf::lock_acquire "exit_prepare:$exit";
2529
2530 # all this does is basically replace the /! path by 2786 # all this does is basically replace the /! path by
2531 # a new random map path (?random/...) with a seed 2787 # a new random map path (?random/...) with a seed
2532 # that depends on the exit object 2788 # that depends on the exit object
2533 2789
2534 my $rmp = parse_random_map_params $exit->msg; 2790 my $rmp = parse_random_map_params $exit->msg;
2536 if ($exit->map) { 2792 if ($exit->map) {
2537 $rmp->{region} = $exit->region->name; 2793 $rmp->{region} = $exit->region->name;
2538 $rmp->{origin_map} = $exit->map->path; 2794 $rmp->{origin_map} = $exit->map->path;
2539 $rmp->{origin_x} = $exit->x; 2795 $rmp->{origin_x} = $exit->x;
2540 $rmp->{origin_y} = $exit->y; 2796 $rmp->{origin_y} = $exit->y;
2797
2798 $exit->map->touch;
2541 } 2799 }
2542 2800
2543 $rmp->{random_seed} ||= $exit->random_seed; 2801 $rmp->{random_seed} ||= $exit->random_seed;
2544 2802
2545 my $data = cf::to_json $rmp; 2803 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2546 my $md5 = Digest::MD5::md5_hex $data; 2804 my $md5 = Digest::MD5::md5_hex $data;
2547 my $meta = "$RANDOMDIR/$md5.meta"; 2805 my $meta = "$RANDOMDIR/$md5.meta";
2548 2806
2549 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2807 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2550 aio_write $fh, 0, (length $data), $data, 0; 2808 aio_write $fh, 0, (length $data), $data, 0;
2551 undef $fh; 2809 undef $fh;
2552 aio_rename "$meta~", $meta; 2810 aio_rename "$meta~", $meta;
2553 2811
2812 my $slaying = "?random/$md5";
2813
2814 if ($exit->valid) {
2554 $exit->slaying ("?random/$md5"); 2815 $exit->slaying ("?random/$md5");
2555 $exit->msg (undef); 2816 $exit->msg (undef);
2817 }
2556 } 2818 }
2557} 2819}
2558 2820
2559sub cf::object::player::enter_exit { 2821sub cf::object::player::enter_exit {
2560 my ($self, $exit) = @_; 2822 my ($self, $exit) = @_;
2561 2823
2562 return unless $self->type == cf::PLAYER; 2824 return unless $self->type == cf::PLAYER;
2563 2825
2564 if ($exit->slaying eq "/!") {
2565 #TODO: this should de-fi-ni-te-ly not be a sync-job
2566 # the problem is that $exit might not survive long enough
2567 # so it needs to be done right now, right here
2568 cf::sync_job { prepare_random_map $exit };
2569 }
2570
2571 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2572 my $hp = $exit->stats->hp;
2573 my $sp = $exit->stats->sp;
2574
2575 $self->enter_link; 2826 $self->enter_link;
2576 2827
2577 # if exit is damned, update players death & WoR home-position
2578 $self->contr->savebed ($slaying, $hp, $sp)
2579 if $exit->flag (FLAG_DAMNED);
2580
2581 (async { 2828 (async {
2582 $self->deactivate_recursive; # just to be sure 2829 $Coro::current->{desc} = "enter_exit";
2830
2583 unless (eval { 2831 unless (eval {
2832 $self->deactivate_recursive; # just to be sure
2833
2834 # random map handling
2835 {
2836 my $guard = cf::lock_acquire "exit_prepare:$exit";
2837
2838 prepare_random_map $exit
2839 if $exit->slaying eq "/!";
2840 }
2841
2842 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2843 my $x = $exit->stats->hp;
2844 my $y = $exit->stats->sp;
2845
2584 $self->goto ($slaying, $hp, $sp); 2846 $self->goto ($map, $x, $y);
2585 2847
2848 # if exit is damned, update players death & WoR home-position
2849 $self->contr->savebed ($map, $x, $y)
2850 if $exit->flag (cf::FLAG_DAMNED);
2851
2586 1; 2852 1
2587 }) { 2853 }) {
2588 $self->message ("Something went wrong deep within the crossfire server. " 2854 $self->message ("Something went wrong deep within the deliantra server. "
2589 . "I'll try to bring you back to the map you were before. " 2855 . "I'll try to bring you back to the map you were before. "
2590 . "Please report this to the dungeon master!", 2856 . "Please report this to the dungeon master!",
2591 cf::NDI_UNIQUE | cf::NDI_RED); 2857 cf::NDI_UNIQUE | cf::NDI_RED);
2592 2858
2593 warn "ERROR in enter_exit: $@"; 2859 error "ERROR in enter_exit: $@";
2594 $self->leave_link; 2860 $self->leave_link;
2595 } 2861 }
2596 })->prio (1); 2862 })->prio (1);
2597} 2863}
2598 2864
2610sub cf::client::send_drawinfo { 2876sub cf::client::send_drawinfo {
2611 my ($self, $text, $flags) = @_; 2877 my ($self, $text, $flags) = @_;
2612 2878
2613 utf8::encode $text; 2879 utf8::encode $text;
2614 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2880 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2881}
2882
2883=item $client->send_big_packet ($pkt)
2884
2885Like C<send_packet>, but tries to compress large packets, and fragments
2886them as required.
2887
2888=cut
2889
2890our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2891
2892sub cf::client::send_big_packet {
2893 my ($self, $pkt) = @_;
2894
2895 # try lzf for large packets
2896 $pkt = "lzf " . Compress::LZF::compress $pkt
2897 if 1024 <= length $pkt and $self->{can_lzf};
2898
2899 # split very large packets
2900 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2901 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2902 $pkt = "frag";
2903 }
2904
2905 $self->send_packet ($pkt);
2615} 2906}
2616 2907
2617=item $client->send_msg ($channel, $msg, $color, [extra...]) 2908=item $client->send_msg ($channel, $msg, $color, [extra...])
2618 2909
2619Send a drawinfo or msg packet to the client, formatting the msg for the 2910Send a drawinfo or msg packet to the client, formatting the msg for the
2621the message, with C<log> being the default. If C<$color> is negative, suppress 2912the message, with C<log> being the default. If C<$color> is negative, suppress
2622the message unless the client supports the msg packet. 2913the message unless the client supports the msg packet.
2623 2914
2624=cut 2915=cut
2625 2916
2917# non-persistent channels (usually the info channel)
2626our %CHANNEL = ( 2918our %CHANNEL = (
2919 "c/motd" => {
2920 id => "infobox",
2921 title => "MOTD",
2922 reply => undef,
2923 tooltip => "The message of the day",
2924 },
2627 "c/identify" => { 2925 "c/identify" => {
2628 id => "identify", 2926 id => "infobox",
2629 title => "Identify", 2927 title => "Identify",
2630 reply => undef, 2928 reply => undef,
2631 tooltip => "Items recently identified", 2929 tooltip => "Items recently identified",
2632 }, 2930 },
2633 "c/examine" => { 2931 "c/examine" => {
2634 id => "examine", 2932 id => "infobox",
2635 title => "Examine", 2933 title => "Examine",
2636 reply => undef, 2934 reply => undef,
2637 tooltip => "Signs and other items you examined", 2935 tooltip => "Signs and other items you examined",
2638 }, 2936 },
2937 "c/shopinfo" => {
2938 id => "infobox",
2939 title => "Shop Info",
2940 reply => undef,
2941 tooltip => "What your bargaining skill tells you about the shop",
2942 },
2943 "c/book" => {
2944 id => "infobox",
2945 title => "Book",
2946 reply => undef,
2947 tooltip => "The contents of a note or book",
2948 },
2949 "c/lookat" => {
2950 id => "infobox",
2951 title => "Look",
2952 reply => undef,
2953 tooltip => "What you saw there",
2954 },
2955 "c/who" => {
2956 id => "infobox",
2957 title => "Players",
2958 reply => undef,
2959 tooltip => "Shows players who are currently online",
2960 },
2961 "c/body" => {
2962 id => "infobox",
2963 title => "Body Parts",
2964 reply => undef,
2965 tooltip => "Shows which body parts you posess and are available",
2966 },
2967 "c/statistics" => {
2968 id => "infobox",
2969 title => "Statistics",
2970 reply => undef,
2971 tooltip => "Shows your primary statistics",
2972 },
2973 "c/skills" => {
2974 id => "infobox",
2975 title => "Skills",
2976 reply => undef,
2977 tooltip => "Shows your experience per skill and item power",
2978 },
2979 "c/shopitems" => {
2980 id => "infobox",
2981 title => "Shop Items",
2982 reply => undef,
2983 tooltip => "Shows the items currently for sale in this shop",
2984 },
2985 "c/resistances" => {
2986 id => "infobox",
2987 title => "Resistances",
2988 reply => undef,
2989 tooltip => "Shows your resistances",
2990 },
2991 "c/pets" => {
2992 id => "infobox",
2993 title => "Pets",
2994 reply => undef,
2995 tooltip => "Shows information abotu your pets/a specific pet",
2996 },
2997 "c/perceiveself" => {
2998 id => "infobox",
2999 title => "Perceive Self",
3000 reply => undef,
3001 tooltip => "You gained detailed knowledge about yourself",
3002 },
3003 "c/uptime" => {
3004 id => "infobox",
3005 title => "Uptime",
3006 reply => undef,
3007 tooltip => "How long the server has been running since last restart",
3008 },
3009 "c/mapinfo" => {
3010 id => "infobox",
3011 title => "Map Info",
3012 reply => undef,
3013 tooltip => "Information related to the maps",
3014 },
3015 "c/party" => {
3016 id => "party",
3017 title => "Party",
3018 reply => "gsay ",
3019 tooltip => "Messages and chat related to your party",
3020 },
3021 "c/death" => {
3022 id => "death",
3023 title => "Death",
3024 reply => undef,
3025 tooltip => "Reason for and more info about your most recent death",
3026 },
3027 "c/say" => $SAY_CHANNEL,
3028 "c/chat" => $CHAT_CHANNEL,
2639); 3029);
2640 3030
2641sub cf::client::send_msg { 3031sub cf::client::send_msg {
2642 my ($self, $channel, $msg, $color, @extra) = @_; 3032 my ($self, $channel, $msg, $color, @extra) = @_;
2643 3033
2644 $msg = $self->pl->expand_cfpod ($msg); 3034 $msg = $self->pl->expand_cfpod ($msg)
3035 unless $color & cf::NDI_VERBATIM;
2645 3036
2646 $color &= cf::NDI_CLIENT_MASK; # just in case... 3037 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647 3038
2648 # check predefined channels, for the benefit of C 3039 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3040 if ($CHANNEL{$channel}) {
3041 $channel = $CHANNEL{$channel};
2650 3042
3043 $self->ext_msg (channel_info => $channel);
3044 $channel = $channel->{id};
3045
2651 if (ref $channel) { 3046 } elsif (ref $channel) {
2652 # send meta info to client, if not yet sent 3047 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) { 3048 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel; 3049 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel) 3050 $self->ext_msg (channel_info => $channel);
2656 if $self->can_msg;
2657 } 3051 }
2658 3052
2659 $channel = $channel->{id}; 3053 $channel = $channel->{id};
2660 } 3054 }
2661 3055
2662 return unless @extra || length $msg; 3056 return unless @extra || length $msg;
2663 3057
2664 if ($self->can_msg) {
2665 # default colour, mask it out 3058 # default colour, mask it out
2666 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3059 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2667 if $color & cf::NDI_DEF; 3060 if $color & cf::NDI_DEF;
2668 3061
2669 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3062 my $pkt = "msg "
3063 . $self->{json_coder}->encode (
2670 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3064 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2671 } else { 3065 );
2672 if ($color >= 0) {
2673 # replace some tags by gcfclient-compatible ones
2674 for ($msg) {
2675 1 while
2676 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2677 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2678 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2679 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2680 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2681 }
2682 3066
2683 $color &= cf::NDI_COLOR_MASK; 3067 $self->send_big_packet ($pkt);
2684
2685 utf8::encode $msg;
2686
2687 if (0 && $msg =~ /\[/) {
2688 # COMMAND/INFO
2689 $self->send_packet ("drawextinfo $color 10 8 $msg")
2690 } else {
2691 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2692 $self->send_packet ("drawinfo $color $msg")
2693 }
2694 }
2695 }
2696} 3068}
2697 3069
2698=item $client->ext_msg ($type, @msg) 3070=item $client->ext_msg ($type, @msg)
2699 3071
2700Sends an ext event to the client. 3072Sends an ext event to the client.
2703 3075
2704sub cf::client::ext_msg($$@) { 3076sub cf::client::ext_msg($$@) {
2705 my ($self, $type, @msg) = @_; 3077 my ($self, $type, @msg) = @_;
2706 3078
2707 if ($self->extcmd == 2) { 3079 if ($self->extcmd == 2) {
2708 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3080 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2709 } elsif ($self->extcmd == 1) { # TODO: remove 3081 } elsif ($self->extcmd == 1) { # TODO: remove
2710 push @msg, msgtype => "event_$type"; 3082 push @msg, msgtype => "event_$type";
2711 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3083 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2712 } 3084 }
2713} 3085}
2714 3086
2715=item $client->ext_reply ($msgid, @msg) 3087=item $client->ext_reply ($msgid, @msg)
2716 3088
2720 3092
2721sub cf::client::ext_reply($$@) { 3093sub cf::client::ext_reply($$@) {
2722 my ($self, $id, @msg) = @_; 3094 my ($self, $id, @msg) = @_;
2723 3095
2724 if ($self->extcmd == 2) { 3096 if ($self->extcmd == 2) {
2725 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3097 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2726 } elsif ($self->extcmd == 1) { 3098 } elsif ($self->extcmd == 1) {
2727 #TODO: version 1, remove 3099 #TODO: version 1, remove
2728 unshift @msg, msgtype => "reply", msgid => $id; 3100 unshift @msg, msgtype => "reply", msgid => $id;
2729 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2730 } 3102 }
2731} 3103}
2732 3104
2733=item $success = $client->query ($flags, "text", \&cb) 3105=item $success = $client->query ($flags, "text", \&cb)
2734 3106
2805 3177
2806 $ns->ext_reply ($reply, @reply) 3178 $ns->ext_reply ($reply, @reply)
2807 if $reply; 3179 if $reply;
2808 3180
2809 } else { 3181 } else {
2810 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3182 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2811 } 3183 }
2812 3184
2813 cf::override; 3185 cf::override;
2814 }, 3186 },
2815); 3187);
2835 3207
2836 $coro 3208 $coro
2837} 3209}
2838 3210
2839cf::client->attach ( 3211cf::client->attach (
2840 on_destroy => sub { 3212 on_client_destroy => sub {
2841 my ($ns) = @_; 3213 my ($ns) = @_;
2842 3214
2843 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3215 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2844 }, 3216 },
2845); 3217);
2861our $safe_hole = new Safe::Hole; 3233our $safe_hole = new Safe::Hole;
2862 3234
2863$SIG{FPE} = 'IGNORE'; 3235$SIG{FPE} = 'IGNORE';
2864 3236
2865$safe->permit_only (Opcode::opset qw( 3237$safe->permit_only (Opcode::opset qw(
2866 :base_core :base_mem :base_orig :base_math 3238 :base_core :base_mem :base_orig :base_math :base_loop
2867 grepstart grepwhile mapstart mapwhile 3239 grepstart grepwhile mapstart mapwhile
2868 sort time 3240 sort time
2869)); 3241));
2870 3242
2871# here we export the classes and methods available to script code 3243# here we export the classes and methods available to script code
2873=pod 3245=pod
2874 3246
2875The following functions and methods are available within a safe environment: 3247The following functions and methods are available within a safe environment:
2876 3248
2877 cf::object 3249 cf::object
2878 contr pay_amount pay_player map x y force_find force_add 3250 contr pay_amount pay_player map x y force_find force_add destroy
2879 insert remove name archname title slaying race decrease_ob_nr 3251 insert remove name archname title slaying race decrease split
3252 value
2880 3253
2881 cf::object::player 3254 cf::object::player
2882 player 3255 player
2883 3256
2884 cf::player 3257 cf::player
2889 3262
2890=cut 3263=cut
2891 3264
2892for ( 3265for (
2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3266 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2894 insert remove inv name archname title slaying race 3267 insert remove inv nrof name archname title slaying race
2895 decrease_ob_nr)], 3268 decrease split destroy change_exp value msg lore send_msg)],
2896 ["cf::object::player" => qw(player)], 3269 ["cf::object::player" => qw(player)],
2897 ["cf::player" => qw(peaceful)], 3270 ["cf::player" => qw(peaceful send_msg)],
2898 ["cf::map" => qw(trigger)], 3271 ["cf::map" => qw(trigger)],
2899) { 3272) {
2900 no strict 'refs'; 3273 no strict 'refs';
2901 my ($pkg, @funs) = @$_; 3274 my ($pkg, @funs) = @$_;
2902 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3275 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2920 3293
2921 my $qcode = $code; 3294 my $qcode = $code;
2922 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3295 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2923 $qcode =~ s/\n/\\n/g; 3296 $qcode =~ s/\n/\\n/g;
2924 3297
3298 %vars = (_dummy => 0) unless %vars;
3299
3300 my @res;
2925 local $_; 3301 local $_;
2926 local @safe::cf::_safe_eval_args = values %vars;
2927 3302
2928 my $eval = 3303 my $eval =
2929 "do {\n" 3304 "do {\n"
2930 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3305 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2931 . "#line 0 \"{$qcode}\"\n" 3306 . "#line 0 \"{$qcode}\"\n"
2932 . $code 3307 . $code
2933 . "\n}" 3308 . "\n}"
2934 ; 3309 ;
2935 3310
3311 if ($CFG{safe_eval}) {
2936 sub_generation_inc; 3312 sub_generation_inc;
3313 local @safe::cf::_safe_eval_args = values %vars;
2937 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3314 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2938 sub_generation_inc; 3315 sub_generation_inc;
3316 } else {
3317 local @cf::_safe_eval_args = values %vars;
3318 @res = wantarray ? eval eval : scalar eval $eval;
3319 }
2939 3320
2940 if ($@) { 3321 if ($@) {
2941 warn "$@"; 3322 warn "$@",
2942 warn "while executing safe code '$code'\n"; 3323 "while executing safe code '$code'\n",
2943 warn "with arguments " . (join " ", %vars) . "\n"; 3324 "with arguments " . (join " ", %vars) . "\n";
2944 } 3325 }
2945 3326
2946 wantarray ? @res : $res[0] 3327 wantarray ? @res : $res[0]
2947} 3328}
2948 3329
2962=cut 3343=cut
2963 3344
2964sub register_script_function { 3345sub register_script_function {
2965 my ($fun, $cb) = @_; 3346 my ($fun, $cb) = @_;
2966 3347
2967 no strict 'refs'; 3348 $fun = "safe::$fun" if $CFG{safe_eval};
2968 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3349 *$fun = $safe_hole->wrap ($cb);
2969} 3350}
2970 3351
2971=back 3352=back
2972 3353
2973=cut 3354=cut
2982 # for this (global event?) 3363 # for this (global event?)
2983 %ext::player_env::MUSIC_FACE_CACHE = (); 3364 %ext::player_env::MUSIC_FACE_CACHE = ();
2984 3365
2985 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3366 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2986 3367
2987 warn "loading facedata from $path\n"; 3368 trace "loading facedata from $path\n";
2988 3369
2989 my $facedata; 3370 my $facedata;
2990 0 < aio_load $path, $facedata 3371 0 < aio_load $path, $facedata
2991 or die "$path: $!"; 3372 or die "$path: $!";
2992 3373
2994 3375
2995 $facedata->{version} == 2 3376 $facedata->{version} == 2
2996 or cf::cleanup "$path: version mismatch, cannot proceed."; 3377 or cf::cleanup "$path: version mismatch, cannot proceed.";
2997 3378
2998 # patch in the exptable 3379 # patch in the exptable
3380 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2999 $facedata->{resource}{"res/exp_table"} = { 3381 $facedata->{resource}{"res/exp_table"} = {
3000 type => FT_RSRC, 3382 type => FT_RSRC,
3001 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3383 data => $exp_table,
3384 hash => (Digest::MD5::md5 $exp_table),
3002 }; 3385 };
3003 cf::cede_to_tick; 3386 cf::cede_to_tick;
3004 3387
3005 { 3388 {
3006 my $faces = $facedata->{faceinfo}; 3389 my $faces = $facedata->{faceinfo};
3007 3390
3008 while (my ($face, $info) = each %$faces) { 3391 while (my ($face, $info) = each %$faces) {
3009 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3392 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3393
3010 cf::face::set_visibility $idx, $info->{visibility}; 3394 cf::face::set_visibility $idx, $info->{visibility};
3011 cf::face::set_magicmap $idx, $info->{magicmap}; 3395 cf::face::set_magicmap $idx, $info->{magicmap};
3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3396 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3013 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3397 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3014 3398
3015 cf::cede_to_tick; 3399 cf::cede_to_tick;
3016 } 3400 }
3017 3401
3018 while (my ($face, $info) = each %$faces) { 3402 while (my ($face, $info) = each %$faces) {
3019 next unless $info->{smooth}; 3403 next unless $info->{smooth};
3404
3020 my $idx = cf::face::find $face 3405 my $idx = cf::face::find $face
3021 or next; 3406 or next;
3407
3022 if (my $smooth = cf::face::find $info->{smooth}) { 3408 if (my $smooth = cf::face::find $info->{smooth}) {
3023 cf::face::set_smooth $idx, $smooth; 3409 cf::face::set_smooth $idx, $smooth;
3024 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3410 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3025 } else { 3411 } else {
3026 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3412 error "smooth face '$info->{smooth}' not found for face '$face'";
3027 } 3413 }
3028 3414
3029 cf::cede_to_tick; 3415 cf::cede_to_tick;
3030 } 3416 }
3031 } 3417 }
3040 3426
3041 cf::anim::invalidate_all; # d'oh 3427 cf::anim::invalidate_all; # d'oh
3042 } 3428 }
3043 3429
3044 { 3430 {
3045 # TODO: for gcfclient pleasure, we should give resources
3046 # that gcfclient doesn't grok a >10000 face index.
3047 my $res = $facedata->{resource}; 3431 my $res = $facedata->{resource};
3048 3432
3049 my $soundconf = delete $res->{"res/sound.conf"};
3050
3051 while (my ($name, $info) = each %$res) { 3433 while (my ($name, $info) = each %$res) {
3434 if (defined $info->{type}) {
3052 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3435 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3053 my $data;
3054 3436
3055 if ($info->{type} & 1) { 3437 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3056 # prepend meta info 3438 cf::face::set_type $idx, $info->{type};
3057
3058 my $meta = $enc->encode ({
3059 name => $name,
3060 %{ $info->{meta} || {} },
3061 });
3062
3063 $data = pack "(w/a*)*", $meta, $info->{data};
3064 } else { 3439 } else {
3065 $data = $info->{data}; 3440 $RESOURCE{$name} = $info; # unused
3066 } 3441 }
3067 3442
3068 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3069 cf::face::set_type $idx, $info->{type};
3070
3071 cf::cede_to_tick; 3443 cf::cede_to_tick;
3072 } 3444 }
3073
3074 if ($soundconf) {
3075 $soundconf = $enc->decode (delete $soundconf->{data});
3076
3077 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3078 my $sound = $soundconf->{compat}[$_]
3079 or next;
3080
3081 my $face = cf::face::find "sound/$sound->[1]";
3082 cf::sound::set $sound->[0] => $face;
3083 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3084 }
3085
3086 while (my ($k, $v) = each %{$soundconf->{event}}) {
3087 my $face = cf::face::find "sound/$v";
3088 cf::sound::set $k => $face;
3089 }
3090 }
3091 } 3445 }
3446
3447 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3092 3448
3093 1 3449 1
3094} 3450}
3095 3451
3096register_exticmd fx_want => sub { 3452register_exticmd fx_want => sub {
3098 3454
3099 while (my ($k, $v) = each %$want) { 3455 while (my ($k, $v) = each %$want) {
3100 $ns->fx_want ($k, $v); 3456 $ns->fx_want ($k, $v);
3101 } 3457 }
3102}; 3458};
3459
3460sub load_resource_file($) {
3461 my $guard = lock_acquire "load_resource_file";
3462
3463 my $status = load_resource_file_ $_[0];
3464 get_slot 0.1, 100;
3465 cf::arch::commit_load;
3466
3467 $status
3468}
3103 3469
3104sub reload_regions { 3470sub reload_regions {
3105 # HACK to clear player env face cache, we need some signal framework 3471 # HACK to clear player env face cache, we need some signal framework
3106 # for this (global event?) 3472 # for this (global event?)
3107 %ext::player_env::MUSIC_FACE_CACHE = (); 3473 %ext::player_env::MUSIC_FACE_CACHE = ();
3121} 3487}
3122 3488
3123sub reload_archetypes { 3489sub reload_archetypes {
3124 load_resource_file "$DATADIR/archetypes" 3490 load_resource_file "$DATADIR/archetypes"
3125 or die "unable to load archetypes\n"; 3491 or die "unable to load archetypes\n";
3126 #d# NEED to laod twice to resolve forward references
3127 # this really needs to be done in an extra post-pass
3128 # (which needs to be synchronous, so solve it differently)
3129 load_resource_file "$DATADIR/archetypes"
3130 or die "unable to load archetypes\n";
3131} 3492}
3132 3493
3133sub reload_treasures { 3494sub reload_treasures {
3134 load_resource_file "$DATADIR/treasures" 3495 load_resource_file "$DATADIR/treasures"
3135 or die "unable to load treasurelists\n"; 3496 or die "unable to load treasurelists\n";
3136} 3497}
3137 3498
3499sub reload_sound {
3500 trace "loading sound config from $DATADIR/sound\n";
3501
3502 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3503 or die "$DATADIR/sound $!";
3504
3505 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3506
3507 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3508 my $sound = $soundconf->{compat}[$_]
3509 or next;
3510
3511 my $face = cf::face::find "sound/$sound->[1]";
3512 cf::sound::set $sound->[0] => $face;
3513 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3514 }
3515
3516 while (my ($k, $v) = each %{$soundconf->{event}}) {
3517 my $face = cf::face::find "sound/$v";
3518 cf::sound::set $k => $face;
3519 }
3520}
3521
3138sub reload_resources { 3522sub reload_resources {
3139 warn "reloading resource files...\n"; 3523 trace "reloading resource files...\n";
3140 3524
3525 reload_facedata;
3526 reload_sound;
3527 reload_archetypes;
3141 reload_regions; 3528 reload_regions;
3142 reload_facedata;
3143 #reload_archetypes;#d#
3144 reload_archetypes;
3145 reload_treasures; 3529 reload_treasures;
3146 3530
3147 warn "finished reloading resource files\n"; 3531 trace "finished reloading resource files\n";
3148}
3149
3150sub init {
3151 reload_resources;
3152} 3532}
3153 3533
3154sub reload_config { 3534sub reload_config {
3535 trace "reloading config file...\n";
3536
3155 open my $fh, "<:utf8", "$CONFDIR/config" 3537 open my $fh, "<:utf8", "$CONFDIR/config"
3156 or return; 3538 or return;
3157 3539
3158 local $/; 3540 local $/;
3159 *CFG = YAML::Syck::Load <$fh>; 3541 *CFG = YAML::XS::Load scalar <$fh>;
3160 3542
3161 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3543 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3162 3544
3163 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3545 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3164 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3546 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3165 3547
3166 if (exists $CFG{mlockall}) { 3548 if (exists $CFG{mlockall}) {
3168 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3550 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3169 and die "WARNING: m(un)lockall failed: $!\n"; 3551 and die "WARNING: m(un)lockall failed: $!\n";
3170 }; 3552 };
3171 warn $@ if $@; 3553 warn $@ if $@;
3172 } 3554 }
3555
3556 trace "finished reloading resource files\n";
3557}
3558
3559sub pidfile() {
3560 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3561 or die "$PIDFILE: $!";
3562 flock $fh, &Fcntl::LOCK_EX
3563 or die "$PIDFILE: flock: $!";
3564 $fh
3565}
3566
3567# make sure only one server instance is running at any one time
3568sub atomic {
3569 my $fh = pidfile;
3570
3571 my $pid = <$fh>;
3572 kill 9, $pid if $pid > 0;
3573
3574 seek $fh, 0, 0;
3575 print $fh $$;
3576}
3577
3578sub main_loop {
3579 trace "EV::loop starting\n";
3580 if (1) {
3581 EV::loop;
3582 }
3583 trace "EV::loop returned\n";
3584 goto &main_loop unless $REALLY_UNLOOP;
3173} 3585}
3174 3586
3175sub main { 3587sub main {
3588 cf::init_globals; # initialise logging
3589
3590 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3591 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3592 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3593 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3594
3595 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3596
3176 # we must not ever block the main coroutine 3597 # we must not ever block the main coroutine
3177 local $Coro::idle = sub { 3598 local $Coro::idle = sub {
3178 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3599 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3179 (async { 3600 (async {
3180 Event::one_event; 3601 $Coro::current->{desc} = "IDLE BUG HANDLER";
3602 EV::loop EV::LOOP_ONESHOT;
3181 })->prio (Coro::PRIO_MAX); 3603 })->prio (Coro::PRIO_MAX);
3182 }; 3604 };
3183 3605
3606 evthread_start IO::AIO::poll_fileno;
3607
3608 cf::sync_job {
3609 cf::init_experience;
3610 cf::init_anim;
3611 cf::init_attackmess;
3612 cf::init_dynamic;
3613
3614 cf::load_settings;
3615 cf::load_materials;
3616
3617 reload_resources;
3184 reload_config; 3618 reload_config;
3185 db_init; 3619 db_init;
3620
3621 cf::init_uuid;
3622 cf::init_signals;
3623 cf::init_skills;
3624
3625 cf::init_beforeplay;
3626
3627 atomic;
3628
3186 load_extensions; 3629 load_extensions;
3187 3630
3188 $TICK_WATCHER->start; 3631 utime time, time, $RUNTIMEFILE;
3189 Event::loop; 3632
3633 # no (long-running) fork's whatsoever before this point(!)
3634 use POSIX ();
3635 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3636
3637 (pop @POST_INIT)->(0) while @POST_INIT;
3638 };
3639
3640 cf::object::thawer::errors_are_fatal 0;
3641 info "parse errors in files are no longer fatal from this point on.\n";
3642
3643 main_loop;
3190} 3644}
3191 3645
3192############################################################################# 3646#############################################################################
3193# initialisation and cleanup 3647# initialisation and cleanup
3194 3648
3195# install some emergency cleanup handlers 3649# install some emergency cleanup handlers
3196BEGIN { 3650BEGIN {
3651 our %SIGWATCHER = ();
3197 for my $signal (qw(INT HUP TERM)) { 3652 for my $signal (qw(INT HUP TERM)) {
3198 Event->signal ( 3653 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3199 reentrant => 0,
3200 data => WF_AUTOCANCEL,
3201 signal => $signal,
3202 prio => 0,
3203 cb => sub {
3204 cf::cleanup "SIG$signal"; 3654 cf::cleanup "SIG$signal";
3205 },
3206 ); 3655 };
3207 } 3656 }
3208} 3657}
3209 3658
3210sub write_runtime { 3659sub write_runtime_sync {
3211 my $runtime = "$LOCALDIR/runtime"; 3660 my $t0 = AE::time;
3212 3661
3213 # first touch the runtime file to show we are still running: 3662 # first touch the runtime file to show we are still running:
3214 # the fsync below can take a very very long time. 3663 # the fsync below can take a very very long time.
3215 3664
3216 IO::AIO::aio_utime $runtime, undef, undef; 3665 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3217 3666
3218 my $guard = cf::lock_acquire "write_runtime"; 3667 my $guard = cf::lock_acquire "write_runtime";
3219 3668
3220 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3669 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3221 or return; 3670 or return;
3222 3671
3223 my $value = $cf::RUNTIME + 90 + 10; 3672 my $value = $cf::RUNTIME + 90 + 10;
3224 # 10 is the runtime save interval, for a monotonic clock 3673 # 10 is the runtime save interval, for a monotonic clock
3225 # 60 allows for the watchdog to kill the server. 3674 # 60 allows for the watchdog to kill the server.
3235 aio_utime $fh, undef, undef; 3684 aio_utime $fh, undef, undef;
3236 3685
3237 close $fh 3686 close $fh
3238 or return; 3687 or return;
3239 3688
3240 aio_rename "$runtime~", $runtime 3689 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3241 and return; 3690 and return;
3242 3691
3243 warn "runtime file written.\n"; 3692 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3244 3693
3245 1 3694 1
3695}
3696
3697our $uuid_lock;
3698our $uuid_skip;
3699
3700sub write_uuid_sync($) {
3701 $uuid_skip ||= $_[0];
3702
3703 return if $uuid_lock;
3704 local $uuid_lock = 1;
3705
3706 my $uuid = "$LOCALDIR/uuid";
3707
3708 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3709 or return;
3710
3711 my $value = uuid_seq uuid_cur;
3712
3713 unless ($value) {
3714 info "cowardly refusing to write zero uuid value!\n";
3715 return;
3716 }
3717
3718 my $value = uuid_str $value + $uuid_skip;
3719 $uuid_skip = 0;
3720
3721 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3722 and return;
3723
3724 # always fsync - this file is important
3725 aio_fsync $fh
3726 and return;
3727
3728 close $fh
3729 or return;
3730
3731 aio_rename "$uuid~", $uuid
3732 and return;
3733
3734 trace "uuid file written ($value).\n";
3735
3736 1
3737
3738}
3739
3740sub write_uuid($$) {
3741 my ($skip, $sync) = @_;
3742
3743 $sync ? write_uuid_sync $skip
3744 : async { write_uuid_sync $skip };
3246} 3745}
3247 3746
3248sub emergency_save() { 3747sub emergency_save() {
3249 my $freeze_guard = cf::freeze_mainloop; 3748 my $freeze_guard = cf::freeze_mainloop;
3250 3749
3251 warn "enter emergency perl save\n"; 3750 info "emergency_perl_save: enter\n";
3252 3751
3253 cf::sync_job { 3752 cf::sync_job {
3753 # this is a trade-off: we want to be very quick here, so
3754 # save all maps without fsync, and later call a global sync
3755 # (which in turn might be very very slow)
3756 local $USE_FSYNC = 0;
3757
3254 # use a peculiar iteration method to avoid tripping on perl 3758 # use a peculiar iteration method to avoid tripping on perl
3255 # refcount bugs in for. also avoids problems with players 3759 # refcount bugs in for. also avoids problems with players
3256 # and maps saved/destroyed asynchronously. 3760 # and maps saved/destroyed asynchronously.
3257 warn "begin emergency player save\n"; 3761 info "emergency_perl_save: begin player save\n";
3258 for my $login (keys %cf::PLAYER) { 3762 for my $login (keys %cf::PLAYER) {
3259 my $pl = $cf::PLAYER{$login} or next; 3763 my $pl = $cf::PLAYER{$login} or next;
3260 $pl->valid or next; 3764 $pl->valid or next;
3765 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3261 $pl->save; 3766 $pl->save;
3262 } 3767 }
3263 warn "end emergency player save\n"; 3768 info "emergency_perl_save: end player save\n";
3264 3769
3265 warn "begin emergency map save\n"; 3770 info "emergency_perl_save: begin map save\n";
3266 for my $path (keys %cf::MAP) { 3771 for my $path (keys %cf::MAP) {
3267 my $map = $cf::MAP{$path} or next; 3772 my $map = $cf::MAP{$path} or next;
3268 $map->valid or next; 3773 $map->valid or next;
3269 $map->save; 3774 $map->save;
3270 } 3775 }
3271 warn "end emergency map save\n"; 3776 info "emergency_perl_save: end map save\n";
3272 3777
3273 warn "begin emergency database checkpoint\n"; 3778 info "emergency_perl_save: begin database checkpoint\n";
3274 BDB::db_env_txn_checkpoint $DB_ENV; 3779 BDB::db_env_txn_checkpoint $DB_ENV;
3275 warn "end emergency database checkpoint\n"; 3780 info "emergency_perl_save: end database checkpoint\n";
3781
3782 info "emergency_perl_save: begin write uuid\n";
3783 write_uuid_sync 1;
3784 info "emergency_perl_save: end write uuid\n";
3276 }; 3785 };
3277 3786
3278 warn "leave emergency perl save\n"; 3787 info "emergency_perl_save: starting sync()\n";
3788 IO::AIO::aio_sync sub {
3789 info "emergency_perl_save: finished sync()\n";
3790 };
3791
3792 info "emergency_perl_save: leave\n";
3279} 3793}
3280 3794
3281sub post_cleanup { 3795sub post_cleanup {
3282 my ($make_core) = @_; 3796 my ($make_core) = @_;
3283 3797
3284 warn Carp::longmess "post_cleanup backtrace" 3798 error Carp::longmess "post_cleanup backtrace"
3285 if $make_core; 3799 if $make_core;
3800
3801 my $fh = pidfile;
3802 unlink $PIDFILE if <$fh> == $$;
3803}
3804
3805# a safer delete_package, copied from Symbol
3806sub clear_package($) {
3807 my $pkg = shift;
3808
3809 # expand to full symbol table name if needed
3810 unless ($pkg =~ /^main::.*::$/) {
3811 $pkg = "main$pkg" if $pkg =~ /^::/;
3812 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3813 $pkg .= '::' unless $pkg =~ /::$/;
3814 }
3815
3816 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3817 my $stem_symtab = *{$stem}{HASH};
3818
3819 defined $stem_symtab and exists $stem_symtab->{$leaf}
3820 or return;
3821
3822 # clear all symbols
3823 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3824 for my $name (keys %$leaf_symtab) {
3825 _gv_clear *{"$pkg$name"};
3826# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3827 }
3286} 3828}
3287 3829
3288sub do_reload_perl() { 3830sub do_reload_perl() {
3289 # can/must only be called in main 3831 # can/must only be called in main
3290 if ($Coro::current != $Coro::main) { 3832 if (in_main) {
3291 warn "can only reload from main coroutine"; 3833 error "can only reload from main coroutine";
3292 return; 3834 return;
3293 } 3835 }
3294 3836
3837 return if $RELOAD++;
3838
3839 my $t1 = AE::time;
3840
3841 while ($RELOAD) {
3295 warn "reloading..."; 3842 info "reloading...";
3296 3843
3297 warn "entering sync_job"; 3844 trace "entering sync_job";
3298 3845
3299 cf::sync_job { 3846 cf::sync_job {
3300 cf::write_runtime; # external watchdog should not bark 3847 cf::write_runtime_sync; # external watchdog should not bark
3301 cf::emergency_save; 3848 cf::emergency_save;
3302 cf::write_runtime; # external watchdog should not bark 3849 cf::write_runtime_sync; # external watchdog should not bark
3303 3850
3304 warn "syncing database to disk"; 3851 trace "syncing database to disk";
3305 BDB::db_env_txn_checkpoint $DB_ENV; 3852 BDB::db_env_txn_checkpoint $DB_ENV;
3306 3853
3307 # if anything goes wrong in here, we should simply crash as we already saved 3854 # if anything goes wrong in here, we should simply crash as we already saved
3308 3855
3309 warn "cancelling all WF_AUTOCANCEL watchers";
3310 for (Event::all_watchers) {
3311 $_->cancel if $_->data & WF_AUTOCANCEL;
3312 }
3313
3314 warn "flushing outstanding aio requests"; 3856 trace "flushing outstanding aio requests";
3315 for (;;) {
3316 BDB::flush;
3317 IO::AIO::flush;
3318 Coro::cede;
3319 last unless IO::AIO::nreqs || BDB::nreqs; 3857 while (IO::AIO::nreqs || BDB::nreqs) {
3320 warn "iterate..."; 3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3321 }
3322
3323 ++$RELOAD;
3324
3325 warn "cancelling all extension coros";
3326 $_->cancel for values %EXT_CORO;
3327 %EXT_CORO = ();
3328
3329 warn "removing commands";
3330 %COMMAND = ();
3331
3332 warn "removing ext/exti commands";
3333 %EXTCMD = ();
3334 %EXTICMD = ();
3335
3336 warn "unloading/nuking all extensions";
3337 for my $pkg (@EXTS) {
3338 warn "... unloading $pkg";
3339
3340 if (my $cb = $pkg->can ("unload")) {
3341 eval {
3342 $cb->($pkg);
3343 1
3344 } or warn "$pkg unloaded, but with errors: $@";
3345 } 3859 }
3346 3860
3347 warn "... nuking $pkg"; 3861 trace "cancelling all extension coros";
3348 Symbol::delete_package $pkg; 3862 $_->cancel for values %EXT_CORO;
3349 } 3863 %EXT_CORO = ();
3350 3864
3351 warn "unloading all perl modules loaded from $LIBDIR"; 3865 trace "removing commands";
3352 while (my ($k, $v) = each %INC) { 3866 %COMMAND = ();
3353 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3354 3867
3868 trace "removing ext/exti commands";
3869 %EXTCMD = ();
3870 %EXTICMD = ();
3871
3872 trace "unloading/nuking all extensions";
3873 for my $pkg (@EXTS) {
3355 warn "... unloading $k"; 3874 trace "... unloading $pkg";
3356 delete $INC{$k};
3357 3875
3358 $k =~ s/\.pm$//;
3359 $k =~ s/\//::/g;
3360
3361 if (my $cb = $k->can ("unload_module")) { 3876 if (my $cb = $pkg->can ("unload")) {
3877 eval {
3362 $cb->(); 3878 $cb->($pkg);
3879 1
3880 } or error "$pkg unloaded, but with errors: $@";
3881 }
3882
3883 trace "... clearing $pkg";
3884 clear_package $pkg;
3363 } 3885 }
3364 3886
3365 Symbol::delete_package $k; 3887 trace "unloading all perl modules loaded from $LIBDIR";
3888 while (my ($k, $v) = each %INC) {
3889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3890
3891 trace "... unloading $k";
3892 delete $INC{$k};
3893
3894 $k =~ s/\.pm$//;
3895 $k =~ s/\//::/g;
3896
3897 if (my $cb = $k->can ("unload_module")) {
3898 $cb->();
3899 }
3900
3901 clear_package $k;
3366 } 3902 }
3367 3903
3368 warn "getting rid of safe::, as good as possible"; 3904 trace "getting rid of safe::, as good as possible";
3369 Symbol::delete_package "safe::$_" 3905 clear_package "safe::$_"
3370 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3906 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3371 3907
3372 warn "unloading cf.pm \"a bit\""; 3908 trace "unloading cf.pm \"a bit\"";
3373 delete $INC{"cf.pm"}; 3909 delete $INC{"cf.pm"};
3374 delete $INC{"cf/pod.pm"}; 3910 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3375 3911
3376 # don't, removes xs symbols, too, 3912 # don't, removes xs symbols, too,
3377 # and global variables created in xs 3913 # and global variables created in xs
3378 #Symbol::delete_package __PACKAGE__; 3914 #clear_package __PACKAGE__;
3379 3915
3380 warn "unload completed, starting to reload now"; 3916 info "unload completed, starting to reload now";
3381 3917
3382 warn "reloading cf.pm"; 3918 trace "reloading cf.pm";
3383 require cf; 3919 require cf;
3384 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3920 cf::_connect_to_perl_1;
3385 3921
3386 warn "loading config and database again"; 3922 trace "loading config and database again";
3387 cf::reload_config; 3923 cf::reload_config;
3388 3924
3389 warn "loading extensions"; 3925 trace "loading extensions";
3390 cf::load_extensions; 3926 cf::load_extensions;
3391 3927
3928 if ($REATTACH_ON_RELOAD) {
3392 warn "reattaching attachments to objects/players"; 3929 trace "reattaching attachments to objects/players";
3393 _global_reattach; # objects, sockets 3930 _global_reattach; # objects, sockets
3394 warn "reattaching attachments to maps"; 3931 trace "reattaching attachments to maps";
3395 reattach $_ for values %MAP; 3932 reattach $_ for values %MAP;
3396 warn "reattaching attachments to players"; 3933 trace "reattaching attachments to players";
3397 reattach $_ for values %PLAYER; 3934 reattach $_ for values %PLAYER;
3935 }
3398 3936
3937 trace "running post_init jobs";
3938 (pop @POST_INIT)->(1) while @POST_INIT;
3939
3399 warn "leaving sync_job"; 3940 trace "leaving sync_job";
3400 3941
3401 1 3942 1
3402 } or do { 3943 } or do {
3403 warn $@; 3944 error $@;
3404 warn "error while reloading, exiting."; 3945 cf::cleanup "error while reloading, exiting.";
3405 exit 1; 3946 };
3947
3948 info "reloaded";
3949 --$RELOAD;
3406 }; 3950 }
3407 3951
3408 warn "reloaded"; 3952 $t1 = AE::time - $t1;
3953 info "reload completed in ${t1}s\n";
3409}; 3954};
3410 3955
3411our $RELOAD_WATCHER; # used only during reload 3956our $RELOAD_WATCHER; # used only during reload
3412 3957
3413sub reload_perl() { 3958sub reload_perl() {
3414 # doing reload synchronously and two reloads happen back-to-back, 3959 # doing reload synchronously and two reloads happen back-to-back,
3415 # coro crashes during coro_state_free->destroy here. 3960 # coro crashes during coro_state_free->destroy here.
3416 3961
3417 $RELOAD_WATCHER ||= Event->timer ( 3962 $RELOAD_WATCHER ||= cf::async {
3418 reentrant => 0, 3963 Coro::AIO::aio_wait cache_extensions;
3419 after => 0, 3964
3420 data => WF_AUTOCANCEL, 3965 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3421 cb => sub {
3422 do_reload_perl; 3966 do_reload_perl;
3423 undef $RELOAD_WATCHER; 3967 undef $RELOAD_WATCHER;
3424 }, 3968 };
3425 ); 3969 };
3426} 3970}
3427 3971
3428register_command "reload" => sub { 3972register_command "reload" => sub {
3429 my ($who, $arg) = @_; 3973 my ($who, $arg) = @_;
3430 3974
3431 if ($who->flag (FLAG_WIZ)) { 3975 if ($who->flag (FLAG_WIZ)) {
3432 $who->message ("reloading server."); 3976 $who->message ("reloading server.");
3977 async {
3978 $Coro::current->{desc} = "perl_reload";
3433 async { reload_perl }; 3979 reload_perl;
3980 };
3434 } 3981 }
3435}; 3982};
3436 3983
3437unshift @INC, $LIBDIR; 3984unshift @INC, $LIBDIR;
3438 3985
3440 3987
3441our @WAIT_FOR_TICK; 3988our @WAIT_FOR_TICK;
3442our @WAIT_FOR_TICK_BEGIN; 3989our @WAIT_FOR_TICK_BEGIN;
3443 3990
3444sub wait_for_tick { 3991sub wait_for_tick {
3445 return unless $TICK_WATCHER->is_active;
3446 return if $Coro::current == $Coro::main; 3992 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3447 3993
3448 my $signal = new Coro::Signal; 3994 my $signal = new Coro::Signal;
3449 push @WAIT_FOR_TICK, $signal; 3995 push @WAIT_FOR_TICK, $signal;
3450 $signal->wait; 3996 $signal->wait;
3451} 3997}
3452 3998
3453sub wait_for_tick_begin { 3999sub wait_for_tick_begin {
3454 return unless $TICK_WATCHER->is_active;
3455 return if $Coro::current == $Coro::main; 4000 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3456 4001
3457 my $signal = new Coro::Signal; 4002 my $signal = new Coro::Signal;
3458 push @WAIT_FOR_TICK_BEGIN, $signal; 4003 push @WAIT_FOR_TICK_BEGIN, $signal;
3459 $signal->wait; 4004 $signal->wait;
3460} 4005}
3461 4006
3462$TICK_WATCHER = Event->timer ( 4007sub tick {
3463 reentrant => 0,
3464 parked => 1,
3465 prio => 0,
3466 at => $NEXT_TICK || $TICK,
3467 data => WF_AUTOCANCEL,
3468 cb => sub {
3469 if ($Coro::current != $Coro::main) { 4008 if ($Coro::current != $Coro::main) {
3470 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4009 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3471 unless ++$bug_warning > 10; 4010 unless ++$bug_warning > 10;
3472 return; 4011 return;
3473 } 4012 }
3474 4013
3475 $NOW = $tick_start = Event::time;
3476
3477 cf::server_tick; # one server iteration 4014 cf::server_tick; # one server iteration
3478 4015
3479 $RUNTIME += $TICK; 4016 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3480 $NEXT_TICK += $TICK;
3481 4017
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4018 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10; 4019 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3484 Coro::async_pool { 4020 Coro::async_pool {
4021 $Coro::current->{desc} = "runtime saver";
3485 write_runtime 4022 write_runtime_sync
3486 or warn "ERROR: unable to write runtime file: $!"; 4023 or error "ERROR: unable to write runtime file: $!";
3487 };
3488 } 4024 };
4025 }
3489 4026
3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4027 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3491 $sig->send; 4028 $sig->send;
3492 } 4029 }
3493 while (my $sig = shift @WAIT_FOR_TICK) { 4030 while (my $sig = shift @WAIT_FOR_TICK) {
3494 $sig->send; 4031 $sig->send;
3495 } 4032 }
3496 4033
3497 $NOW = Event::time; 4034 $LOAD = ($NOW - $TICK_START) / $TICK;
3498
3499 # if we are delayed by four ticks or more, skip them all
3500 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3501
3502 $TICK_WATCHER->at ($NEXT_TICK);
3503 $TICK_WATCHER->start;
3504
3505 $LOAD = ($NOW - $tick_start) / $TICK;
3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4035 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3507 4036
3508 _post_tick; 4037 if (0) {
4038 if ($NEXT_TICK) {
4039 my $jitter = $TICK_START - $NEXT_TICK;
4040 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4041 debug "jitter $JITTER\n";#d#
4042 }
3509 }, 4043 }
3510); 4044}
3511 4045
3512{ 4046{
4047 # configure BDB
4048
3513 BDB::min_parallel 8; 4049 BDB::min_parallel 16;
3514 BDB::max_poll_time $TICK * 0.1; 4050 BDB::max_poll_reqs $TICK * 0.1;
3515 $BDB_POLL_WATCHER = Event->io ( 4051 $AnyEvent::BDB::WATCHER->priority (1);
3516 reentrant => 0,
3517 fd => BDB::poll_fileno,
3518 poll => 'r',
3519 prio => 0,
3520 data => WF_AUTOCANCEL,
3521 cb => \&BDB::poll_cb,
3522 );
3523
3524 BDB::set_sync_prepare {
3525 my $status;
3526 my $current = $Coro::current;
3527 (
3528 sub {
3529 $status = $!;
3530 $current->ready; undef $current;
3531 },
3532 sub {
3533 Coro::schedule while defined $current;
3534 $! = $status;
3535 },
3536 )
3537 };
3538 4052
3539 unless ($DB_ENV) { 4053 unless ($DB_ENV) {
3540 $DB_ENV = BDB::db_env_create; 4054 $DB_ENV = BDB::db_env_create;
3541 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4055 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3542 | BDB::LOG_AUTOREMOVE, 1); 4056 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4057 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3543 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4058 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3544 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4059 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3545 4060
4061 (Coro::async { # async to keep sync_job from complaining
3546 cf::sync_job { 4062 cf::sync_job {
3547 eval { 4063 eval {
3548 BDB::db_env_open 4064 BDB::db_env_open
3549 $DB_ENV, 4065 $DB_ENV,
3550 $BDBDIR, 4066 $BDBDIR,
3551 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4067 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4068 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3553 0666; 4069 0666;
3554 4070
3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4071 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
4072 };
4073
4074 cf::cleanup "db_env_open(db): $@" if $@;
3556 }; 4075 };
3557 4076 })->join;
3558 cf::cleanup "db_env_open(db): $@" if $@;
3559 };
3560 } 4077 }
3561 4078
3562 $BDB_DEADLOCK_WATCHER = Event->timer ( 4079 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3563 after => 3,
3564 interval => 1,
3565 hard => 1,
3566 prio => 0,
3567 data => WF_AUTOCANCEL,
3568 cb => sub {
3569 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4080 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3570 },
3571 ); 4081 };
3572 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4082 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3573 after => 11,
3574 interval => 60,
3575 hard => 1,
3576 prio => 0,
3577 data => WF_AUTOCANCEL,
3578 cb => sub {
3579 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4083 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3580 },
3581 ); 4084 };
3582 $BDB_TRICKLE_WATCHER = Event->timer ( 4085 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3583 after => 5,
3584 interval => 10,
3585 hard => 1,
3586 prio => 0,
3587 data => WF_AUTOCANCEL,
3588 cb => sub {
3589 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4086 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3590 },
3591 ); 4087 };
3592} 4088}
3593 4089
3594{ 4090{
4091 # configure IO::AIO
4092
3595 IO::AIO::min_parallel 8; 4093 IO::AIO::min_parallel 8;
3596
3597 undef $Coro::AIO::WATCHER;
3598 IO::AIO::max_poll_time $TICK * 0.1; 4094 IO::AIO::max_poll_time $TICK * 0.1;
3599 $AIO_POLL_WATCHER = Event->io ( 4095 undef $AnyEvent::AIO::WATCHER;
3600 reentrant => 0,
3601 data => WF_AUTOCANCEL,
3602 fd => IO::AIO::poll_fileno,
3603 poll => 'r',
3604 prio => 6,
3605 cb => \&IO::AIO::poll_cb,
3606 );
3607} 4096}
3608 4097
3609my $_log_backtrace; 4098my $_log_backtrace;
3610 4099
3611sub _log_backtrace { 4100sub _log_backtrace {
3614 $msg =~ s/\n//; 4103 $msg =~ s/\n//;
3615 4104
3616 # limit the # of concurrent backtraces 4105 # limit the # of concurrent backtraces
3617 if ($_log_backtrace < 2) { 4106 if ($_log_backtrace < 2) {
3618 ++$_log_backtrace; 4107 ++$_log_backtrace;
4108 my $perl_bt = Carp::longmess $msg;
3619 async { 4109 async {
4110 $Coro::current->{desc} = "abt $msg";
4111
3620 my @bt = fork_call { 4112 my @bt = fork_call {
3621 @addr = map { sprintf "%x", $_ } @addr; 4113 @addr = map { sprintf "%x", $_ } @addr;
3622 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4114 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3623 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4115 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3624 or die "addr2line: $!"; 4116 or die "addr2line: $!";
3632 } 4124 }
3633 4125
3634 @funcs 4126 @funcs
3635 }; 4127 };
3636 4128
3637 LOG llevInfo, "[ABT] $msg\n"; 4129 LOG llevInfo, "[ABT] $perl_bt\n";
4130 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3638 LOG llevInfo, "[ABT] $_\n" for @bt; 4131 LOG llevInfo, "[ABT] $_\n" for @bt;
3639 --$_log_backtrace; 4132 --$_log_backtrace;
3640 }; 4133 };
3641 } else { 4134 } else {
3642 LOG llevInfo, "[ABT] $msg\n"; 4135 LOG llevInfo, "[ABT] $msg\n";
3643 LOG llevInfo, "[ABT] [suppressed]\n"; 4136 LOG llevInfo, "[ABT] [suppressed]\n";
3644 } 4137 }
3645} 4138}
3646 4139
3647# load additional modules 4140# load additional modules
3648use cf::pod; 4141require "cf/$_.pm" for @EXTRA_MODULES;
4142cf::_connect_to_perl_2;
3649 4143
3650END { cf::emergency_save } 4144END { cf::emergency_save }
3651 4145
36521 41461
3653 4147

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines