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.387 by root, Mon Oct 15 23:49:10 2007 UTC vs.
Revision 1.535 by root, Thu Apr 29 08:21:28 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 Event; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 4.1 (); 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.51 (); 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 {
359 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
360 449
361 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
362 452
363 while () { 453 while () {
364 next_job: 454 next_job:
455
365 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
366 if ($avail > 0.01) { 457
367 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
369 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send; 462 $job->[2]->send;
371 Coro::cede; 463 Coro::cede;
372 goto next_job; 464 goto next_job;
373 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
374 } 467 }
375 } 468 }
376 469
377 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
378 # 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
379 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 473 $signal->wait;
381 } else { 474 } else {
475 $busy = 0;
382 Coro::schedule; 476 Coro::schedule;
383 } 477 }
384 } 478 }
385}; 479};
386 480
387sub get_slot($;$$) { 481sub get_slot($;$$) {
482 return if tick_inhibit || $Coro::current == $Coro::main;
483
388 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
389 485
390 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
391 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
392 489
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
406 503
407BEGIN { *async = \&Coro::async_pool } 504BEGIN { *async = \&Coro::async_pool }
408 505
409=item cf::sync_job { BLOCK } 506=item cf::sync_job { BLOCK }
410 507
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 508The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 509is always able to handle events or runnable, as Deliantra is only
413partly 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
414acceptable. 511acceptable.
415 512
416If 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
417the given BLOCK in another coroutine while waiting for the result. The 514the given BLOCK in another coroutine while waiting for the result. The
421=cut 518=cut
422 519
423sub sync_job(&) { 520sub sync_job(&) {
424 my ($job) = @_; 521 my ($job) = @_;
425 522
426 if ($Coro::current == $Coro::main) { 523 if (in_main) {
427 my $time = Event::time; 524 my $time = AE::time;
428 525
429 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
431 528
432 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
433 530
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
437 532
438 my $busy = 1; 533 my $busy = 1;
439 my @res; 534 my @res;
440 535
441 (async { 536 (async {
442 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
443 @res = eval { $job->() }; 538 @res = eval { $job->() };
444 warn $@ if $@; 539 error $@ if $@;
445 undef $busy; 540 undef $busy;
446 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
447 542
448 while ($busy) { 543 while ($busy) {
449 if (Coro::nready) { 544 if (Coro::nready) {
450 Coro::cede_notself; 545 Coro::cede_notself;
451 } else { 546 } else {
452 Event::one_event; 547 EV::loop EV::LOOP_ONESHOT;
453 } 548 }
454 } 549 }
455 550
456 $time = Event::time - $time; 551 my $time = AE::time - $time;
457 552
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
462 554
463 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
464 } else { 556 } else {
465 # we are in another coroutine, how wonderful, everything just works 557 # we are in another coroutine, how wonderful, everything just works
466 558
491=item fork_call { }, $args 583=item fork_call { }, $args
492 584
493Executes the given code block with the given arguments in a seperate 585Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 586process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 587Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 588never block itself or use any form of event handling.
497 589
498=cut 590=cut
499 591
500sub fork_call(&@) { 592sub fork_call(&@) {
501 my ($cb, @args) = @_; 593 my ($cb, @args) = @_;
510 }, @args; 602 }, @args;
511 603
512 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
513} 605}
514 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
643}
644
515=item $value = cf::db_get $family => $key 645=item $value = cf::db_get $family => $key
516 646
517Returns a single value from the environment database. 647Returns a single value from the environment database.
518 648
519=item cf::db_put $family => $key => $value 649=item cf::db_put $family => $key => $value
527within each server. 657within each server.
528 658
529=cut 659=cut
530 660
531sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
532 my ($name) = @_; 665 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
534 667
535 eval { 668 eval {
536 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
546} 679}
547 680
548our $DB; 681our $DB;
549 682
550sub db_init { 683sub db_init {
551 cf::sync_job {
552 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
553 };
554} 685}
555 686
556sub db_get($$) { 687sub db_get($$) {
557 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
558 689
559 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
560 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
561 694
562 $! ? () 695 $! ? ()
563 : $data 696 : $data
564 }
565} 697}
566 698
567sub db_put($$$) { 699sub db_put($$$) {
568 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
569 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
625 757
626 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
627 my $data = $process->(\@data); 759 my $data = $process->(\@data);
628 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
629 761
630 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
631 763
632 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
633 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
634 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
635 767
645 777
646=cut 778=cut
647 779
648sub datalog($@) { 780sub datalog($@) {
649 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
650 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
651} 783}
652 784
653=back 785=back
654 786
655=cut 787=cut
656 788
657############################################################################# 789#############################################################################
658 790
659=head2 ATTACHABLE OBJECTS 791=head2 ATTACHABLE OBJECTS
660 792
661Many objects in crossfire are so-called attachable objects. That means you can 793Many objects in deliantra are so-called attachable objects. That means you can
662attach callbacks/event handlers (a collection of which is called an "attachment") 794attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 795to it. All such attachable objects support the following methods.
664 796
665In the following description, CLASS can be any of C<global>, C<object> 797In the following description, CLASS can be any of C<global>, C<object>
666C<player>, C<client> or C<map> (i.e. the attachable objects in 798C<player>, C<client> or C<map> (i.e. the attachable objects in
667Crossfire TRT). 799Deliantra).
668 800
669=over 4 801=over 4
670 802
671=item $attachable->attach ($attachment, key => $value...) 803=item $attachable->attach ($attachment, key => $value...)
672 804
716=item cf::CLASS::attachment $name, ... 848=item cf::CLASS::attachment $name, ...
717 849
718Register an attachment by C<$name> through which attachable objects of the 850Register an attachment by C<$name> through which attachable objects of the
719given CLASS can refer to this attachment. 851given CLASS can refer to this attachment.
720 852
721Some classes such as crossfire maps and objects can specify attachments 853Some classes such as deliantra maps and objects can specify attachments
722that are attached at load/instantiate time, thus the need for a name. 854that are attached at load/instantiate time, thus the need for a name.
723 855
724These calls expect any number of the following handler/hook descriptions: 856These calls expect any number of the following handler/hook descriptions:
725 857
726=over 4 858=over 4
850 982
851 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
852 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
853 985
854 } elsif (ref $type) { 986 } elsif (ref $type) {
855 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
856 988
857 } else { 989 } else {
858 shift @arg; 990 shift @arg;
859 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
860 } 992 }
861 } 993 }
862} 994}
863 995
864sub _object_attach { 996sub _object_attach {
874 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
875 } 1007 }
876 1008
877 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
878 } else { 1010 } else {
879 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
880 } 1012 }
881 1013
882 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
883} 1015}
884 1016
943 1075
944 for (@$callbacks) { 1076 for (@$callbacks) {
945 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
946 1078
947 if ($@) { 1079 if ($@) {
948 warn "$@";
949 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
950 override; 1081 override;
951 } 1082 }
952 1083
953 return 1 if $override; 1084 return 1 if $override;
954 } 1085 }
955 1086
956 0 1087 0
957} 1088}
958 1089
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1090=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1091
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1092=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1093
963Generate an object-specific event with the given arguments. 1094Generate an object-specific event with the given arguments.
964 1095
1017 1148
1018sub reattach { 1149sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1150 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1151 my ($obj) = @_;
1021 1152
1153 # no longer needed after getting rid of delete_package?
1022 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1154 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1023 1155
1024 my $registry = $obj->registry; 1156 my $registry = $obj->registry;
1025 1157
1026 @$registry = (); 1158 @$registry = ();
1027 1159
1032 for (@$attach) { 1164 for (@$attach) {
1033 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1034 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1035 } 1167 }
1036 } else { 1168 } else {
1037 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1038 } 1170 }
1039 } 1171 }
1040} 1172}
1041 1173
1042cf::attachable->attach ( 1174cf::attachable->attach (
1043 prio => -1000000, 1175 prio => -1000000,
1044 on_instantiate => sub { 1176 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1177 my ($obj, $data) = @_;
1046 1178
1047 $data = from_json $data; 1179 $data = decode_json $data;
1048 1180
1049 for (@$data) { 1181 for (@$data) {
1050 my ($name, $args) = @$_; 1182 my ($name, $args) = @$_;
1051 1183
1052 $obj->attach ($name, %{$args || {} }); 1184 $obj->attach ($name, %{$args || {} });
1069 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1070 1202
1071 sync_job { 1203 sync_job {
1072 if (length $$rdata) { 1204 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1076 1209
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1211 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 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;
1215 aio_fsync $fh;
1216 }
1081 close $fh; 1217 aio_close $fh;
1082 1218
1083 if (@$objs) { 1219 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1220 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1221 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1222 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1223 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1224 if ($cf::USE_FSYNC) {
1225 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;
1226 aio_fsync $fh;
1227 }
1089 close $fh; 1228 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1229 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1230 }
1092 } else { 1231 } else {
1093 aio_unlink "$filename.pst"; 1232 aio_unlink "$filename.pst";
1094 } 1233 }
1095 1234
1096 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1236
1237 $filename =~ s%/[^/]+$%%;
1238 aio_pathsync $filename if $cf::USE_FSYNC;
1097 } else { 1239 } else {
1098 warn "FATAL: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1099 } 1241 }
1100 } else { 1242 } else {
1101 aio_unlink $filename; 1243 aio_unlink $filename;
1102 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1103 } 1245 }
1122 1264
1123 unless (aio_stat "$filename.pst") { 1265 unless (aio_stat "$filename.pst") {
1124 (aio_load "$filename.pst", $av) >= 0 1266 (aio_load "$filename.pst", $av) >= 0
1125 or return; 1267 or return;
1126 1268
1127 my $st = eval { Coro::Storable::thaw $av } 1269 my $st = eval { Coro::Storable::thaw $av };
1128 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1129 $av = $st->{objs}; 1270 $av = $st->{objs};
1130 } 1271 }
1131 1272
1132 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1133 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1134 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1135 1277
1136 ($data, $av) 1278 ($data, $av)
1137} 1279}
1138 1280
1139=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1195 my ($name, $cb) = @_; 1337 my ($name, $cb) = @_;
1196 1338
1197 $EXTICMD{$name} = $cb; 1339 $EXTICMD{$name} = $cb;
1198} 1340}
1199 1341
1342use File::Glob ();
1343
1200cf::player->attach ( 1344cf::player->attach (
1201 on_command => sub { 1345 on_unknown_command => sub {
1202 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1203 1347
1204 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1205 or return; 1349 or return;
1206 1350
1229 1373
1230 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1231 if $reply; 1375 if $reply;
1232 1376
1233 } else { 1377 } else {
1234 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1235 } 1379 }
1236 1380
1237 cf::override; 1381 cf::override;
1238 }, 1382 },
1239); 1383);
1240 1384
1385# "readahead" all extensions
1386sub cache_extensions {
1387 my $grp = IO::AIO::aio_group;
1388
1389 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1390 for (grep /\.ext$/, @{$_[0]}) {
1391 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1392 }
1393 };
1394
1395 $grp
1396}
1397
1241sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1242 cf::sync_job { 1401 cf::sync_job {
1243 my %todo; 1402 my %todo;
1244 1403
1245 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1246 next unless -r $path; 1405 next unless -r $path;
1264 1423
1265 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1266 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1267 1426
1268 $ext{source} = 1427 $ext{source} =
1269 "package $pkg; use strict; use utf8;\n" 1428 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1270 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1271 . $source 1430 . $source
1272 . "\n};\n1"; 1431 . "\n};\n1";
1273 1432
1274 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1275 } 1434 }
1276 1435
1436 my $pass = 0;
1277 my %done; 1437 my %done;
1278 while (%todo) { 1438 while (%todo) {
1279 my $progress; 1439 my $progress;
1280 1440
1441 ++$pass;
1442
1443 ext:
1281 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1282 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1283 goto skip 1446 next ext
1284 unless exists $done{$_}; 1447 unless exists $done{$_};
1285 } 1448 }
1286 1449
1287 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1288 1451
1289 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1290 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1291 : "$v->{base}: extension inactive.\n";
1292 1456
1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1293 if (exists $v->{meta}{mandatory}) { 1458 if exists $v->{meta}{mandatory};
1294 warn $msg; 1459
1295 warn "mandatory extension failed to load, exiting.\n"; 1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1296 exit 1; 1461 delete $todo{$k};
1297 } 1462 } else {
1298 1463 $done{$k} = delete $todo{$k};
1299 warn $msg; 1464 push @EXTS, $v->{pkg};
1465 $progress = 1;
1466
1467 info "$v->{base}: extension inactive.\n"
1468 unless $active;
1300 } 1469 }
1301
1302 $done{$k} = delete $todo{$k};
1303 push @EXTS, $v->{pkg};
1304 $progress = 1;
1305 } 1470 }
1306 1471
1307 skip: 1472 unless ($progress) {
1308 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1473 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1309 unless $progress; 1474
1475 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory};
1478 }
1479 }
1310 } 1480 }
1311 }; 1481 };
1312} 1482}
1313 1483
1314############################################################################# 1484#############################################################################
1315 1485
1316=back 1486=back
1317 1487
1318=head2 CORE EXTENSIONS 1488=head2 CORE EXTENSIONS
1319 1489
1320Functions and methods that extend core crossfire objects. 1490Functions and methods that extend core deliantra objects.
1321 1491
1322=cut 1492=cut
1323 1493
1324package cf::player; 1494package cf::player;
1325 1495
1368 1538
1369sub exists($) { 1539sub exists($) {
1370 my ($login) = @_; 1540 my ($login) = @_;
1371 1541
1372 $cf::PLAYER{$login} 1542 $cf::PLAYER{$login}
1373 or cf::sync_job { !aio_stat path $login } 1543 or !aio_stat path $login
1374} 1544}
1375 1545
1376sub find($) { 1546sub find($) {
1377 return $cf::PLAYER{$_[0]} || do { 1547 return $cf::PLAYER{$_[0]} || do {
1378 my $login = $_[0]; 1548 my $login = $_[0];
1390 my $f = new_from_file cf::object::thawer path $login 1560 my $f = new_from_file cf::object::thawer path $login
1391 or return; 1561 or return;
1392 1562
1393 my $pl = cf::player::load_pl $f 1563 my $pl = cf::player::load_pl $f
1394 or return; 1564 or return;
1565
1395 local $cf::PLAYER_LOADING{$login} = $pl; 1566 local $cf::PLAYER_LOADING{$login} = $pl;
1396 $f->resolve_delayed_derefs; 1567 $f->resolve_delayed_derefs;
1397 $cf::PLAYER{$login} = $pl 1568 $cf::PLAYER{$login} = $pl
1398 } 1569 }
1399 } 1570 }
1400} 1571}
1401 1572
1573cf::player->attach (
1574 on_load => sub {
1575 my ($pl, $path) = @_;
1576
1577 # restore slots saved in save, below
1578 my $slots = delete $pl->{_slots};
1579
1580 $pl->ob->current_weapon ($slots->[0]);
1581 $pl->combat_ob ($slots->[1]);
1582 $pl->ranged_ob ($slots->[2]);
1583 },
1584);
1585
1402sub save($) { 1586sub save($) {
1403 my ($pl) = @_; 1587 my ($pl) = @_;
1404 1588
1405 return if $pl->{deny_save}; 1589 return if $pl->{deny_save};
1406 1590
1409 1593
1410 return if $pl->{deny_save}; 1594 return if $pl->{deny_save};
1411 1595
1412 aio_mkdir playerdir $pl, 0770; 1596 aio_mkdir playerdir $pl, 0770;
1413 $pl->{last_save} = $cf::RUNTIME; 1597 $pl->{last_save} = $cf::RUNTIME;
1598
1599 cf::get_slot 0.01;
1600
1601 # save slots, to be restored later
1602 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1414 1603
1415 $pl->save_pl ($path); 1604 $pl->save_pl ($path);
1416 cf::cede_to_tick; 1605 cf::cede_to_tick;
1417} 1606}
1418 1607
1450 my ($pl) = @_; 1639 my ($pl) = @_;
1451 1640
1452 my $name = $pl->ob->name; 1641 my $name = $pl->ob->name;
1453 1642
1454 $pl->{deny_save} = 1; 1643 $pl->{deny_save} = 1;
1455 $pl->password ("*"); # this should lock out the player until we nuked the dir 1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1456 1645
1457 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1458 $pl->deactivate; 1647 $pl->deactivate;
1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1459 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1460 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1461 1651
1462 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1463 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
1502 1692
1503 for my $login (@$dirs) { 1693 for my $login (@$dirs) {
1504 my $path = path $login; 1694 my $path = path $login;
1505 1695
1506 # a .pst is a dead give-away for a valid player 1696 # a .pst is a dead give-away for a valid player
1507 unless (-e "$path.pst") { 1697 # if no pst file found, open and chekc for blocked users
1698 if (aio_stat "$path.pst") {
1508 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1699 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1509 aio_read $fh, 0, 512, my $buf, 0 or next; 1700 aio_read $fh, 0, 512, my $buf, 0 or next;
1510 $buf !~ /^password -------------$/m or next; # official not-valid tag 1701 $buf !~ /^password -------------$/m or next; # official not-valid tag
1511 } 1702 }
1512 1703
1516 1707
1517 \@logins 1708 \@logins
1518} 1709}
1519 1710
1520=item $player->maps 1711=item $player->maps
1712
1713=item cf::player::maps $login
1521 1714
1522Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1523player. May block. 1716player. May block.
1524 1717
1525=cut 1718=cut
1543 } 1736 }
1544 1737
1545 \@paths 1738 \@paths
1546} 1739}
1547 1740
1548=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1741=item $protocol_xml = $player->expand_cfpod ($cfpod)
1549 1742
1550Expand crossfire pod fragments into protocol xml. 1743Expand deliantra pod fragments into protocol xml.
1551
1552=cut
1553
1554sub expand_cfpod {
1555 ((my $self), (local $_)) = @_;
1556
1557 # escape & and <
1558 s/&/&amp;/g;
1559 s/(?<![BIUGHT])</&lt;/g;
1560
1561 # this is buggy, it needs to properly take care of nested <'s
1562
1563 1 while
1564 # replace B<>, I<>, U<> etc.
1565 s/B<([^\>]*)>/<b>$1<\/b>/
1566 || s/I<([^\>]*)>/<i>$1<\/i>/
1567 || s/U<([^\>]*)>/<u>$1<\/u>/
1568 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1569 # replace G<male|female> tags
1570 || s{G<([^>|]*)\|([^>]*)>}{
1571 $self->gender ? $2 : $1
1572 }ge
1573 # replace H<hint text>
1574 || s{H<([^\>]*)>}
1575 {
1576 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1577 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1578 "")
1579 [$self->{hintmode}]
1580 }ge;
1581
1582 # create single paragraphs (very hackish)
1583 s/(?<=\S)\n(?=\w)/ /g;
1584
1585 # compress some whitespace
1586 s/\s+\n/\n/g; # ws line-ends
1587 s/\n\n+/\n/g; # double lines
1588 s/^\n+//; # beginning lines
1589 s/\n+$//; # ending lines
1590
1591 $_
1592}
1593
1594sub hintmode {
1595 $_[0]{hintmode} = $_[1] if @_ > 1;
1596 $_[0]{hintmode}
1597}
1598 1744
1599=item $player->ext_reply ($msgid, @msg) 1745=item $player->ext_reply ($msgid, @msg)
1600 1746
1601Sends an ext reply to the player. 1747Sends an ext reply to the player.
1602 1748
1634 1780
1635=cut 1781=cut
1636 1782
1637sub find_by_path($) { 1783sub find_by_path($) {
1638 my ($path) = @_; 1784 my ($path) = @_;
1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1639 1787
1640 my ($match, $specificity); 1788 my ($match, $specificity);
1641 1789
1642 for my $region (list) { 1790 for my $region (list) {
1643 if ($region->{match} && $path =~ $region->{match}) { 1791 if ($region->{match} && $path =~ $region->{match}) {
1669our $MAX_RESET = 3600; 1817our $MAX_RESET = 3600;
1670our $DEFAULT_RESET = 3000; 1818our $DEFAULT_RESET = 3000;
1671 1819
1672sub generate_random_map { 1820sub generate_random_map {
1673 my ($self, $rmp) = @_; 1821 my ($self, $rmp) = @_;
1822
1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1824
1674 # mit "rum" bekleckern, nicht 1825 # mit "rum" bekleckern, nicht
1675 $self->_create_random_map ( 1826 $self->_create_random_map (
1676 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1677 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1678 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1679 $rmp->{exit_on_final_map}, 1830 $rmp->{exit_on_final_map},
1680 $rmp->{xsize}, $rmp->{ysize}, 1831 $rmp->{xsize}, $rmp->{ysize},
1681 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1682 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1704 1855
1705 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1706} 1857}
1707 1858
1708# also paths starting with '/' 1859# also paths starting with '/'
1709$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1710 1861
1711sub thawer_merge { 1862sub thawer_merge {
1712 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1713 1864
1714 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
1800 1951
1801# the temporary/swap location 1952# the temporary/swap location
1802sub save_path { 1953sub save_path {
1803 my ($self) = @_; 1954 my ($self) = @_;
1804 1955
1805 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1956 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1806 "$TMPDIR/$path.map" 1957 "$TMPDIR/$path.map"
1807} 1958}
1808 1959
1809# the unique path, undef == no special unique path 1960# the unique path, undef == no special unique path
1810sub uniq_path { 1961sub uniq_path {
1811 my ($self) = @_; 1962 my ($self) = @_;
1812 1963
1813 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1964 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1814 "$UNIQUEDIR/$path" 1965 "$UNIQUEDIR/$path"
1815}
1816
1817# and all this just because we cannot iterate over
1818# all maps in C++...
1819sub change_all_map_light {
1820 my ($change) = @_;
1821
1822 $_->change_map_light ($change)
1823 for grep $_->outdoor, values %cf::MAP;
1824} 1966}
1825 1967
1826sub decay_objects { 1968sub decay_objects {
1827 my ($self) = @_; 1969 my ($self) = @_;
1828 1970
1912sub find { 2054sub find {
1913 my ($path, $origin) = @_; 2055 my ($path, $origin) = @_;
1914 2056
1915 $path = normalise $path, $origin && $origin->path; 2057 $path = normalise $path, $origin && $origin->path;
1916 2058
1917 cf::lock_wait "map_data:$path";#d#remove 2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1918 cf::lock_wait "map_find:$path"; 2060 my $guard2 = cf::lock_acquire "map_find:$path";
1919 2061
1920 $cf::MAP{$path} || do { 2062 $cf::MAP{$path} || do {
1921 my $guard1 = cf::lock_acquire "map_find:$path";
1922 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1923
1924 my $map = new_from_path cf::map $path 2063 my $map = new_from_path cf::map $path
1925 or return; 2064 or return;
1926 2065
1927 $map->{last_save} = $cf::RUNTIME; 2066 $map->{last_save} = $cf::RUNTIME;
1928 2067
1930 or return; 2069 or return;
1931 2070
1932 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2071 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1933 # doing this can freeze the server in a sync job, obviously 2072 # doing this can freeze the server in a sync job, obviously
1934 #$cf::WAIT_FOR_TICK->wait; 2073 #$cf::WAIT_FOR_TICK->wait;
2074 undef $guard2;
1935 undef $guard1; 2075 undef $guard1;
1936 undef $guard2;
1937 $map->reset; 2076 $map->reset;
1938 return find $path; 2077 return find $path;
1939 } 2078 }
1940 2079
1941 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
1942 } 2081 }
1943} 2082}
1944 2083
1945sub pre_load { } 2084sub pre_load { }
1946sub post_load { } 2085#sub post_load { } # XS
1947 2086
1948sub load { 2087sub load {
1949 my ($self) = @_; 2088 my ($self) = @_;
1950 2089
1951 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
1968 my $f = new_from_file cf::object::thawer $self->{load_path}; 2107 my $f = new_from_file cf::object::thawer $self->{load_path};
1969 $f->skip_block; 2108 $f->skip_block;
1970 $self->_load_objects ($f) 2109 $self->_load_objects ($f)
1971 or return; 2110 or return;
1972 2111
1973 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2112 $self->post_load_original
1974 if delete $self->{load_original}; 2113 if delete $self->{load_original};
1975 2114
1976 if (my $uniq = $self->uniq_path) { 2115 if (my $uniq = $self->uniq_path) {
1977 utf8::encode $uniq; 2116 utf8::encode $uniq;
1978 unless (aio_stat $uniq) { 2117 unless (aio_stat $uniq) {
1996 unless ($self->{deny_activate}) { 2135 unless ($self->{deny_activate}) {
1997 $self->decay_objects; 2136 $self->decay_objects;
1998 $self->fix_auto_apply; 2137 $self->fix_auto_apply;
1999 $self->update_buttons; 2138 $self->update_buttons;
2000 cf::cede_to_tick; 2139 cf::cede_to_tick;
2001 $self->set_darkness_map;
2002 cf::cede_to_tick;
2003 $self->activate; 2140 $self->activate;
2004 } 2141 }
2005 2142
2006 $self->{last_save} = $cf::RUNTIME; 2143 $self->{last_save} = $cf::RUNTIME;
2007 $self->last_access ($cf::RUNTIME); 2144 $self->last_access ($cf::RUNTIME);
2008 2145
2009 $self->in_memory (cf::MAP_IN_MEMORY); 2146 $self->in_memory (cf::MAP_ACTIVE);
2010 } 2147 }
2011 2148
2012 $self->post_load; 2149 $self->post_load;
2013} 2150}
2014 2151
2152# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath
2015sub customise_for { 2155sub customise_for {
2016 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
2017 2157
2018 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
2019 if $self->per_player; 2159 if $self->per_player;
2035 or next; 2175 or next;
2036 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2037 or next; 2177 or next;
2038 $neigh->load; 2178 $neigh->load;
2039 2179
2180 # now find the diagonal neighbours
2040 push @neigh, 2181 push @neigh,
2041 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2042 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2043 } 2184 }
2044 2185
2051} 2192}
2052 2193
2053sub find_sync { 2194sub find_sync {
2054 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2055 2196
2056 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
2057} 2201}
2058 2202
2059sub do_load_sync { 2203sub do_load_sync {
2060 my ($map) = @_; 2204 my ($map) = @_;
2061 2205
2062 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2063 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2064 2208
2065 cf::sync_job { $map->load }; 2209 $map->load;
2066} 2210}
2067 2211
2068our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2069our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2070 2214
2072 my ($path, $origin, $load) = @_; 2216 my ($path, $origin, $load) = @_;
2073 2217
2074 $path = normalise $path, $origin && $origin->{path}; 2218 $path = normalise $path, $origin && $origin->{path};
2075 2219
2076 if (my $map = $cf::MAP{$path}) { 2220 if (my $map = $cf::MAP{$path}) {
2077 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2221 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2078 } 2222 }
2079 2223
2080 $MAP_PREFETCH{$path} |= $load; 2224 $MAP_PREFETCH{$path} |= $load;
2081 2225
2082 $MAP_PREFETCHER ||= cf::async { 2226 $MAP_PREFETCHER ||= cf::async {
2096 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2097 2241
2098 () 2242 ()
2099} 2243}
2100 2244
2245# common code, used by both ->save and ->swapout
2101sub save { 2246sub _save {
2102 my ($self) = @_; 2247 my ($self) = @_;
2103
2104 my $lock = cf::lock_acquire "map_data:$self->{path}";
2105 2248
2106 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2107 2250
2108 return unless $self->dirty; 2251 return unless $self->dirty;
2109 2252
2118 2261
2119 cf::async { 2262 cf::async {
2120 $Coro::current->{desc} = "map player save"; 2263 $Coro::current->{desc} = "map player save";
2121 $_->contr->save for $self->players; 2264 $_->contr->save for $self->players;
2122 }; 2265 };
2266
2267 cf::get_slot 0.02;
2123 2268
2124 if ($uniq) { 2269 if ($uniq) {
2125 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2270 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2126 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2271 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2127 } else { 2272 } else {
2128 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2273 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2129 } 2274 }
2130} 2275}
2131 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2132sub swap_out { 2285sub swap_out {
2133 my ($self) = @_; 2286 my ($self) = @_;
2134 2287
2135 # save first because save cedes
2136 $self->save;
2137
2138 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2139 2289
2290 return if $self->in_memory != cf::MAP_ACTIVE;
2291 return if $self->{deny_save};
2140 return if $self->players; 2292 return if $self->players;
2141 return if $self->in_memory != cf::MAP_IN_MEMORY;
2142 return if $self->{deny_save};
2143 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2144 $self->in_memory (cf::MAP_SWAPPED); 2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # then atomically save
2300 $self->_save;
2301
2302 # then free the map
2303 $self->clear;
2304}
2305
2306sub reset_at {
2307 my ($self) = @_;
2308
2309 # TODO: safety, remove and allow resettable per-player maps
2310 return 1e99 if $self->{deny_reset};
2311
2312 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2313 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2314
2315 $time + $to
2316}
2317
2318sub should_reset {
2319 my ($self) = @_;
2320
2321 $self->reset_at <= $cf::RUNTIME
2322}
2323
2324sub reset {
2325 my ($self) = @_;
2326
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
2329 return if $self->players;
2330
2331 cf::trace "resetting map ", $self->path, "\n";
2332
2333 $self->in_memory (cf::MAP_SWAPPED);
2334
2335 # need to save uniques path
2336 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338
2339 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2340 if $uniq;
2341 }
2342
2343 delete $cf::MAP{$self->path};
2145 2344
2146 $self->deactivate; 2345 $self->deactivate;
2147 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2148 $self->clear; 2347 $self->clear;
2149}
2150
2151sub reset_at {
2152 my ($self) = @_;
2153
2154 # TODO: safety, remove and allow resettable per-player maps
2155 return 1e99 if $self->{deny_reset};
2156
2157 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2158 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2159
2160 $time + $to
2161}
2162
2163sub should_reset {
2164 my ($self) = @_;
2165
2166 $self->reset_at <= $cf::RUNTIME
2167}
2168
2169sub reset {
2170 my ($self) = @_;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173
2174 return if $self->players;
2175
2176 warn "resetting map ", $self->path;
2177
2178 $self->in_memory (cf::MAP_SWAPPED);
2179
2180 # need to save uniques path
2181 unless ($self->{deny_save}) {
2182 my $uniq = $self->uniq_path; utf8::encode $uniq;
2183
2184 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2185 if $uniq;
2186 }
2187
2188 delete $cf::MAP{$self->path};
2189
2190 $self->deactivate;
2191 $_->clear_links_to ($self) for values %cf::MAP;
2192 $self->clear;
2193 2348
2194 $self->unlink_save; 2349 $self->unlink_save;
2195 $self->destroy; 2350 $self->destroy;
2196} 2351}
2197 2352
2205 2360
2206 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2207 2362
2208 $self->unlink_save; 2363 $self->unlink_save;
2209 2364
2210 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2211 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2212 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2213 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2214 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2215 2370
2264 2419
2265sub unique_maps() { 2420sub unique_maps() {
2266 [ 2421 [
2267 map { 2422 map {
2268 utf8::decode $_; 2423 utf8::decode $_;
2269 /\.map$/ 2424 s/\.map$//; # TODO future compatibility hack
2425 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2426 ? ()
2270 ? normalise $_ 2427 : normalise $_
2271 : ()
2272 } @{ aio_readdir $UNIQUEDIR or [] } 2428 } @{ aio_readdir $UNIQUEDIR or [] }
2273 ] 2429 ]
2274} 2430}
2275 2431
2276package cf; 2432=item cf::map::static_maps
2433
2434Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2435file in the shared directory excluding F</styles> and F</editor>). May
2436block.
2437
2438=cut
2439
2440sub static_maps() {
2441 my @dirs = "";
2442 my @maps;
2443
2444 while (@dirs) {
2445 my $dir = shift @dirs;
2446
2447 next if $dir eq "/styles" || $dir eq "/editor";
2448
2449 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2450 or return;
2451
2452 for (@$files) {
2453 s/\.map$// or next;
2454 utf8::decode $_;
2455 push @maps, "$dir/$_";
2456 }
2457
2458 push @dirs, map "$dir/$_", @$dirs;
2459 }
2460
2461 \@maps
2462}
2277 2463
2278=back 2464=back
2279 2465
2280=head3 cf::object 2466=head3 cf::object
2281 2467
2285 2471
2286=over 4 2472=over 4
2287 2473
2288=item $ob->inv_recursive 2474=item $ob->inv_recursive
2289 2475
2290Returns the inventory of the object _and_ their inventories, recursively. 2476Returns the inventory of the object I<and> their inventories, recursively,
2477but I<not> the object itself.
2291 2478
2292=cut 2479=cut
2293 2480
2294sub inv_recursive_; 2481sub inv_recursive_;
2295sub inv_recursive_ { 2482sub inv_recursive_ {
2300 inv_recursive_ inv $_[0] 2487 inv_recursive_ inv $_[0]
2301} 2488}
2302 2489
2303=item $ref = $ob->ref 2490=item $ref = $ob->ref
2304 2491
2305creates and returns a persistent reference to an objetc that can be stored as a string. 2492Creates and returns a persistent reference to an object that can be stored as a string.
2306 2493
2307=item $ob = cf::object::deref ($refstring) 2494=item $ob = cf::object::deref ($refstring)
2308 2495
2309returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2496returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2310even if the object actually exists. May block. 2497even if the object actually exists. May block.
2342can be C<undef>. Does the right thing when the player is currently in a 2529can be C<undef>. Does the right thing when the player is currently in a
2343dialogue with the given NPC character. 2530dialogue with the given NPC character.
2344 2531
2345=cut 2532=cut
2346 2533
2534our $SAY_CHANNEL = {
2535 id => "say",
2536 title => "Map",
2537 reply => "say ",
2538 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2539};
2540
2541our $CHAT_CHANNEL = {
2542 id => "chat",
2543 title => "Chat",
2544 reply => "chat ",
2545 tooltip => "Player chat and shouts, global to the server.",
2546};
2547
2347# rough implementation of a future "reply" method that works 2548# rough implementation of a future "reply" method that works
2348# with dialog boxes. 2549# with dialog boxes.
2349#TODO: the first argument must go, split into a $npc->reply_to ( method 2550#TODO: the first argument must go, split into a $npc->reply_to ( method
2350sub cf::object::player::reply($$$;$) { 2551sub cf::object::player::reply($$$;$) {
2351 my ($self, $npc, $msg, $flags) = @_; 2552 my ($self, $npc, $msg, $flags) = @_;
2362 my $dialog = $pl->{npc_dialog}; 2563 my $dialog = $pl->{npc_dialog};
2363 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2564 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2364 2565
2365 } else { 2566 } else {
2366 $msg = $npc->name . " says: $msg" if $npc; 2567 $msg = $npc->name . " says: $msg" if $npc;
2367 $self->message ($msg, $flags); 2568 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2368 } 2569 }
2369 } 2570 }
2370} 2571}
2371 2572
2372=item $object->send_msg ($channel, $msg, $color, [extra...]) 2573=item $object->send_msg ($channel, $msg, $color, [extra...])
2397 2598
2398=item $player_object->enter_link 2599=item $player_object->enter_link
2399 2600
2400Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2401 2602
2402The player should be reasonably safe there for short amounts of time. You 2603The player should be reasonably safe there for short amounts of time (e.g.
2403I<MUST> call C<leave_link> as soon as possible, though. 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2605though, as the player cannot control the character while it is on the link
2606map.
2404 2607
2405Will never block. 2608Will never block.
2406 2609
2407=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
2408 2611
2428sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2429 my ($self) = @_; 2632 my ($self) = @_;
2430 2633
2431 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2432 2635
2636 ++$self->{_link_recursion};
2637
2433 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2434 2639
2435 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2436 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2437 2642
2438 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2439} 2644}
2440 2645
2441sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2442 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2443 2648
2460 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
2461 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
2462 2667
2463 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
2464 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
2465 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
2466 2671
2467 $map->load; 2672 $map->load;
2468 $map->load_neighbours; 2673 $map->load_neighbours;
2469 2674
2470 return unless $self->contr->active; 2675 return unless $self->contr->active;
2471 $self->activate_recursive;
2472 2676
2473 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2474 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2475} 2679 # entering was successful
2680 delete $self->{_link_recursion};
2681 # only activate afterwards, to support waiting in hooks
2682 $self->activate_recursive;
2683 }
2476 2684
2685}
2686
2477=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2478 2688
2479Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2480her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2481that has to return the map if sucecssful, and then unfreezes the player on 2691that has to return the map if sucecssful, and then unfreezes the player on
2482the new (success) or old (failed) map position. In either case, $done will 2692the new (success) or old (failed) map position. In either case, $done will
2483be called at the end of this process. 2693be called at the end of this process.
2484 2694
2695Note that $check will be called with a potentially non-loaded map, so if
2696it needs a loaded map it has to call C<< ->load >>.
2697
2485=cut 2698=cut
2486 2699
2487our $GOTOGEN; 2700our $GOTOGEN;
2488 2701
2489sub cf::object::player::goto { 2702sub cf::object::player::goto {
2490 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2491 2710
2492 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
2493 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2494 2713
2495 $self->enter_link; 2714 $self->enter_link;
2519 my $map = eval { 2738 my $map = eval {
2520 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2521 2740
2522 if ($map) { 2741 if ($map) {
2523 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2524 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2525 } else { 2744 } else {
2526 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2527 } 2746 }
2528 2747
2529 $map 2748 $map
2537 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2538 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2539 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2540 } 2759 }
2541 2760
2542 $done->() if $done; 2761 $done->($self) if $done;
2543 })->prio (1); 2762 })->prio (1);
2544} 2763}
2545 2764
2546=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2547 2766
2567} 2786}
2568 2787
2569sub prepare_random_map { 2788sub prepare_random_map {
2570 my ($exit) = @_; 2789 my ($exit) = @_;
2571 2790
2572 my $guard = cf::lock_acquire "exit_prepare:$exit";
2573
2574 # all this does is basically replace the /! path by 2791 # all this does is basically replace the /! path by
2575 # a new random map path (?random/...) with a seed 2792 # a new random map path (?random/...) with a seed
2576 # that depends on the exit object 2793 # that depends on the exit object
2577 2794
2578 my $rmp = parse_random_map_params $exit->msg; 2795 my $rmp = parse_random_map_params $exit->msg;
2580 if ($exit->map) { 2797 if ($exit->map) {
2581 $rmp->{region} = $exit->region->name; 2798 $rmp->{region} = $exit->region->name;
2582 $rmp->{origin_map} = $exit->map->path; 2799 $rmp->{origin_map} = $exit->map->path;
2583 $rmp->{origin_x} = $exit->x; 2800 $rmp->{origin_x} = $exit->x;
2584 $rmp->{origin_y} = $exit->y; 2801 $rmp->{origin_y} = $exit->y;
2802
2803 $exit->map->touch;
2585 } 2804 }
2586 2805
2587 $rmp->{random_seed} ||= $exit->random_seed; 2806 $rmp->{random_seed} ||= $exit->random_seed;
2588 2807
2589 my $data = cf::to_json $rmp; 2808 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2590 my $md5 = Digest::MD5::md5_hex $data; 2809 my $md5 = Digest::MD5::md5_hex $data;
2591 my $meta = "$RANDOMDIR/$md5.meta"; 2810 my $meta = "$RANDOMDIR/$md5.meta";
2592 2811
2593 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2812 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2594 aio_write $fh, 0, (length $data), $data, 0; 2813 aio_write $fh, 0, (length $data), $data, 0;
2595 undef $fh; 2814 undef $fh;
2596 aio_rename "$meta~", $meta; 2815 aio_rename "$meta~", $meta;
2597 2816
2817 my $slaying = "?random/$md5";
2818
2819 if ($exit->valid) {
2598 $exit->slaying ("?random/$md5"); 2820 $exit->slaying ("?random/$md5");
2599 $exit->msg (undef); 2821 $exit->msg (undef);
2822 }
2600 } 2823 }
2601} 2824}
2602 2825
2603sub cf::object::player::enter_exit { 2826sub cf::object::player::enter_exit {
2604 my ($self, $exit) = @_; 2827 my ($self, $exit) = @_;
2605 2828
2606 return unless $self->type == cf::PLAYER; 2829 return unless $self->type == cf::PLAYER;
2607 2830
2608 if ($exit->slaying eq "/!") {
2609 #TODO: this should de-fi-ni-te-ly not be a sync-job
2610 # the problem is that $exit might not survive long enough
2611 # so it needs to be done right now, right here
2612 cf::sync_job { prepare_random_map $exit };
2613 }
2614
2615 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2616 my $hp = $exit->stats->hp;
2617 my $sp = $exit->stats->sp;
2618
2619 $self->enter_link; 2831 $self->enter_link;
2620 2832
2621 # if exit is damned, update players death & WoR home-position
2622 $self->contr->savebed ($slaying, $hp, $sp)
2623 if $exit->flag (FLAG_DAMNED);
2624
2625 (async { 2833 (async {
2626 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2834 $Coro::current->{desc} = "enter_exit";
2627 2835
2628 $self->deactivate_recursive; # just to be sure
2629 unless (eval { 2836 unless (eval {
2837 $self->deactivate_recursive; # just to be sure
2838
2839 # random map handling
2840 {
2841 my $guard = cf::lock_acquire "exit_prepare:$exit";
2842
2843 prepare_random_map $exit
2844 if $exit->slaying eq "/!";
2845 }
2846
2847 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2848 my $x = $exit->stats->hp;
2849 my $y = $exit->stats->sp;
2850
2630 $self->goto ($slaying, $hp, $sp); 2851 $self->goto ($map, $x, $y);
2631 2852
2853 # if exit is damned, update players death & WoR home-position
2854 $self->contr->savebed ($map, $x, $y)
2855 if $exit->flag (cf::FLAG_DAMNED);
2856
2632 1; 2857 1
2633 }) { 2858 }) {
2634 $self->message ("Something went wrong deep within the crossfire server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2635 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2636 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2637 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2638 2863
2639 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2640 $self->leave_link; 2865 $self->leave_link;
2641 } 2866 }
2642 })->prio (1); 2867 })->prio (1);
2643} 2868}
2644 2869
2656sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2657 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2658 2883
2659 utf8::encode $text; 2884 utf8::encode $text;
2660 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2885 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2886}
2887
2888=item $client->send_big_packet ($pkt)
2889
2890Like C<send_packet>, but tries to compress large packets, and fragments
2891them as required.
2892
2893=cut
2894
2895our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2896
2897sub cf::client::send_big_packet {
2898 my ($self, $pkt) = @_;
2899
2900 # try lzf for large packets
2901 $pkt = "lzf " . Compress::LZF::compress $pkt
2902 if 1024 <= length $pkt and $self->{can_lzf};
2903
2904 # split very large packets
2905 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2906 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2907 $pkt = "frag";
2908 }
2909
2910 $self->send_packet ($pkt);
2661} 2911}
2662 2912
2663=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2664 2914
2665Send a drawinfo or msg packet to the client, formatting the msg for the 2915Send a drawinfo or msg packet to the client, formatting the msg for the
2667the message, with C<log> being the default. If C<$color> is negative, suppress 2917the message, with C<log> being the default. If C<$color> is negative, suppress
2668the message unless the client supports the msg packet. 2918the message unless the client supports the msg packet.
2669 2919
2670=cut 2920=cut
2671 2921
2922# non-persistent channels (usually the info channel)
2672our %CHANNEL = ( 2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2673 "c/identify" => { 2930 "c/identify" => {
2674 id => "infobox", 2931 id => "infobox",
2675 title => "Identify", 2932 title => "Identify",
2676 reply => undef, 2933 reply => undef,
2677 tooltip => "Items recently identified", 2934 tooltip => "Items recently identified",
2680 id => "infobox", 2937 id => "infobox",
2681 title => "Examine", 2938 title => "Examine",
2682 reply => undef, 2939 reply => undef,
2683 tooltip => "Signs and other items you examined", 2940 tooltip => "Signs and other items you examined",
2684 }, 2941 },
2942 "c/shopinfo" => {
2943 id => "infobox",
2944 title => "Shop Info",
2945 reply => undef,
2946 tooltip => "What your bargaining skill tells you about the shop",
2947 },
2948 "c/book" => {
2949 id => "infobox",
2950 title => "Book",
2951 reply => undef,
2952 tooltip => "The contents of a note or book",
2953 },
2685 "c/lookat" => { 2954 "c/lookat" => {
2686 id => "infobox", 2955 id => "infobox",
2687 title => "Look", 2956 title => "Look",
2688 reply => undef, 2957 reply => undef,
2689 tooltip => "What you saw there", 2958 tooltip => "What you saw there",
2690 }, 2959 },
2960 "c/who" => {
2961 id => "infobox",
2962 title => "Players",
2963 reply => undef,
2964 tooltip => "Shows players who are currently online",
2965 },
2966 "c/body" => {
2967 id => "infobox",
2968 title => "Body Parts",
2969 reply => undef,
2970 tooltip => "Shows which body parts you posess and are available",
2971 },
2972 "c/statistics" => {
2973 id => "infobox",
2974 title => "Statistics",
2975 reply => undef,
2976 tooltip => "Shows your primary statistics",
2977 },
2978 "c/skills" => {
2979 id => "infobox",
2980 title => "Skills",
2981 reply => undef,
2982 tooltip => "Shows your experience per skill and item power",
2983 },
2984 "c/shopitems" => {
2985 id => "infobox",
2986 title => "Shop Items",
2987 reply => undef,
2988 tooltip => "Shows the items currently for sale in this shop",
2989 },
2990 "c/resistances" => {
2991 id => "infobox",
2992 title => "Resistances",
2993 reply => undef,
2994 tooltip => "Shows your resistances",
2995 },
2996 "c/pets" => {
2997 id => "infobox",
2998 title => "Pets",
2999 reply => undef,
3000 tooltip => "Shows information abotu your pets/a specific pet",
3001 },
3002 "c/perceiveself" => {
3003 id => "infobox",
3004 title => "Perceive Self",
3005 reply => undef,
3006 tooltip => "You gained detailed knowledge about yourself",
3007 },
3008 "c/uptime" => {
3009 id => "infobox",
3010 title => "Uptime",
3011 reply => undef,
3012 tooltip => "How long the server has been running since last restart",
3013 },
3014 "c/mapinfo" => {
3015 id => "infobox",
3016 title => "Map Info",
3017 reply => undef,
3018 tooltip => "Information related to the maps",
3019 },
3020 "c/party" => {
3021 id => "party",
3022 title => "Party",
3023 reply => "gsay ",
3024 tooltip => "Messages and chat related to your party",
3025 },
3026 "c/death" => {
3027 id => "death",
3028 title => "Death",
3029 reply => undef,
3030 tooltip => "Reason for and more info about your most recent death",
3031 },
3032 "c/say" => $SAY_CHANNEL,
3033 "c/chat" => $CHAT_CHANNEL,
2691); 3034);
2692 3035
2693sub cf::client::send_msg { 3036sub cf::client::send_msg {
2694 my ($self, $channel, $msg, $color, @extra) = @_; 3037 my ($self, $channel, $msg, $color, @extra) = @_;
2695 3038
2696 $msg = $self->pl->expand_cfpod ($msg); 3039 $msg = $self->pl->expand_cfpod ($msg)
3040 unless $color & cf::NDI_VERBATIM;
2697 3041
2698 $color &= cf::NDI_CLIENT_MASK; # just in case... 3042 $color &= cf::NDI_CLIENT_MASK; # just in case...
2699 3043
2700 # check predefined channels, for the benefit of C 3044 # check predefined channels, for the benefit of C
2701 if ($CHANNEL{$channel}) { 3045 if ($CHANNEL{$channel}) {
2702 $channel = $CHANNEL{$channel}; 3046 $channel = $CHANNEL{$channel};
2703 3047
2704 $self->ext_msg (channel_info => $channel) 3048 $self->ext_msg (channel_info => $channel);
2705 if $self->can_msg;
2706
2707 $channel = $channel->{id}; 3049 $channel = $channel->{id};
2708 3050
2709 } elsif (ref $channel) { 3051 } elsif (ref $channel) {
2710 # send meta info to client, if not yet sent 3052 # send meta info to client, if not yet sent
2711 unless (exists $self->{channel}{$channel->{id}}) { 3053 unless (exists $self->{channel}{$channel->{id}}) {
2712 $self->{channel}{$channel->{id}} = $channel; 3054 $self->{channel}{$channel->{id}} = $channel;
2713 $self->ext_msg (channel_info => $channel) 3055 $self->ext_msg (channel_info => $channel);
2714 if $self->can_msg;
2715 } 3056 }
2716 3057
2717 $channel = $channel->{id}; 3058 $channel = $channel->{id};
2718 } 3059 }
2719 3060
2720 return unless @extra || length $msg; 3061 return unless @extra || length $msg;
2721 3062
2722 if ($self->can_msg) {
2723 # default colour, mask it out 3063 # default colour, mask it out
2724 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3064 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2725 if $color & cf::NDI_DEF; 3065 if $color & cf::NDI_DEF;
2726 3066
2727 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3067 my $pkt = "msg "
3068 . $self->{json_coder}->encode (
2728 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2729 } else { 3070 );
2730 if ($color >= 0) {
2731 # replace some tags by gcfclient-compatible ones
2732 for ($msg) {
2733 1 while
2734 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2735 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2736 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2737 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2738 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2739 }
2740 3071
2741 $color &= cf::NDI_COLOR_MASK; 3072 $self->send_big_packet ($pkt);
2742
2743 utf8::encode $msg;
2744
2745 if (0 && $msg =~ /\[/) {
2746 # COMMAND/INFO
2747 $self->send_packet ("drawextinfo $color 10 8 $msg")
2748 } else {
2749 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2750 $self->send_packet ("drawinfo $color $msg")
2751 }
2752 }
2753 }
2754} 3073}
2755 3074
2756=item $client->ext_msg ($type, @msg) 3075=item $client->ext_msg ($type, @msg)
2757 3076
2758Sends an ext event to the client. 3077Sends an ext event to the client.
2761 3080
2762sub cf::client::ext_msg($$@) { 3081sub cf::client::ext_msg($$@) {
2763 my ($self, $type, @msg) = @_; 3082 my ($self, $type, @msg) = @_;
2764 3083
2765 if ($self->extcmd == 2) { 3084 if ($self->extcmd == 2) {
2766 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2767 } elsif ($self->extcmd == 1) { # TODO: remove 3086 } elsif ($self->extcmd == 1) { # TODO: remove
2768 push @msg, msgtype => "event_$type"; 3087 push @msg, msgtype => "event_$type";
2769 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2770 } 3089 }
2771} 3090}
2772 3091
2773=item $client->ext_reply ($msgid, @msg) 3092=item $client->ext_reply ($msgid, @msg)
2774 3093
2778 3097
2779sub cf::client::ext_reply($$@) { 3098sub cf::client::ext_reply($$@) {
2780 my ($self, $id, @msg) = @_; 3099 my ($self, $id, @msg) = @_;
2781 3100
2782 if ($self->extcmd == 2) { 3101 if ($self->extcmd == 2) {
2783 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2784 } elsif ($self->extcmd == 1) { 3103 } elsif ($self->extcmd == 1) {
2785 #TODO: version 1, remove 3104 #TODO: version 1, remove
2786 unshift @msg, msgtype => "reply", msgid => $id; 3105 unshift @msg, msgtype => "reply", msgid => $id;
2787 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2788 } 3107 }
2789} 3108}
2790 3109
2791=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2792 3111
2863 3182
2864 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
2865 if $reply; 3184 if $reply;
2866 3185
2867 } else { 3186 } else {
2868 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2869 } 3188 }
2870 3189
2871 cf::override; 3190 cf::override;
2872 }, 3191 },
2873); 3192);
2893 3212
2894 $coro 3213 $coro
2895} 3214}
2896 3215
2897cf::client->attach ( 3216cf::client->attach (
2898 on_destroy => sub { 3217 on_client_destroy => sub {
2899 my ($ns) = @_; 3218 my ($ns) = @_;
2900 3219
2901 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2902 }, 3221 },
2903); 3222);
2919our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
2920 3239
2921$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
2922 3241
2923$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
2924 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
2925 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
2926 sort time 3245 sort time
2927)); 3246));
2928 3247
2929# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
2932 3251
2933The following functions and methods are available within a safe environment: 3252The following functions and methods are available within a safe environment:
2934 3253
2935 cf::object 3254 cf::object
2936 contr pay_amount pay_player map x y force_find force_add destroy 3255 contr pay_amount pay_player map x y force_find force_add destroy
2937 insert remove name archname title slaying race decrease_ob_nr 3256 insert remove name archname title slaying race decrease split
3257 value
2938 3258
2939 cf::object::player 3259 cf::object::player
2940 player 3260 player
2941 3261
2942 cf::player 3262 cf::player
2947 3267
2948=cut 3268=cut
2949 3269
2950for ( 3270for (
2951 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3271 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2952 insert remove inv name archname title slaying race 3272 insert remove inv nrof name archname title slaying race
2953 decrease_ob_nr destroy)], 3273 decrease split destroy change_exp value msg lore send_msg)],
2954 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
2955 ["cf::player" => qw(peaceful)], 3275 ["cf::player" => qw(peaceful send_msg)],
2956 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
2957) { 3277) {
2958 no strict 'refs'; 3278 no strict 'refs';
2959 my ($pkg, @funs) = @$_; 3279 my ($pkg, @funs) = @$_;
2960 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3280 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2978 3298
2979 my $qcode = $code; 3299 my $qcode = $code;
2980 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3300 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2981 $qcode =~ s/\n/\\n/g; 3301 $qcode =~ s/\n/\\n/g;
2982 3302
3303 %vars = (_dummy => 0) unless %vars;
3304
3305 my @res;
2983 local $_; 3306 local $_;
2984 local @safe::cf::_safe_eval_args = values %vars;
2985 3307
2986 my $eval = 3308 my $eval =
2987 "do {\n" 3309 "do {\n"
2988 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3310 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2989 . "#line 0 \"{$qcode}\"\n" 3311 . "#line 0 \"{$qcode}\"\n"
2990 . $code 3312 . $code
2991 . "\n}" 3313 . "\n}"
2992 ; 3314 ;
2993 3315
3316 if ($CFG{safe_eval}) {
2994 sub_generation_inc; 3317 sub_generation_inc;
3318 local @safe::cf::_safe_eval_args = values %vars;
2995 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3319 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2996 sub_generation_inc; 3320 sub_generation_inc;
3321 } else {
3322 local @cf::_safe_eval_args = values %vars;
3323 @res = wantarray ? eval eval : scalar eval $eval;
3324 }
2997 3325
2998 if ($@) { 3326 if ($@) {
2999 warn "$@"; 3327 warn "$@",
3000 warn "while executing safe code '$code'\n"; 3328 "while executing safe code '$code'\n",
3001 warn "with arguments " . (join " ", %vars) . "\n"; 3329 "with arguments " . (join " ", %vars) . "\n";
3002 } 3330 }
3003 3331
3004 wantarray ? @res : $res[0] 3332 wantarray ? @res : $res[0]
3005} 3333}
3006 3334
3020=cut 3348=cut
3021 3349
3022sub register_script_function { 3350sub register_script_function {
3023 my ($fun, $cb) = @_; 3351 my ($fun, $cb) = @_;
3024 3352
3025 no strict 'refs'; 3353 $fun = "safe::$fun" if $CFG{safe_eval};
3026 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3354 *$fun = $safe_hole->wrap ($cb);
3027} 3355}
3028 3356
3029=back 3357=back
3030 3358
3031=cut 3359=cut
3040 # for this (global event?) 3368 # for this (global event?)
3041 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3042 3370
3043 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3371 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3044 3372
3045 warn "loading facedata from $path\n"; 3373 trace "loading facedata from $path\n";
3046 3374
3047 my $facedata; 3375 my $facedata;
3048 0 < aio_load $path, $facedata 3376 0 < aio_load $path, $facedata
3049 or die "$path: $!"; 3377 or die "$path: $!";
3050 3378
3052 3380
3053 $facedata->{version} == 2 3381 $facedata->{version} == 2
3054 or cf::cleanup "$path: version mismatch, cannot proceed."; 3382 or cf::cleanup "$path: version mismatch, cannot proceed.";
3055 3383
3056 # patch in the exptable 3384 # patch in the exptable
3385 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3057 $facedata->{resource}{"res/exp_table"} = { 3386 $facedata->{resource}{"res/exp_table"} = {
3058 type => FT_RSRC, 3387 type => FT_RSRC,
3059 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3388 data => $exp_table,
3389 hash => (Digest::MD5::md5 $exp_table),
3060 }; 3390 };
3061 cf::cede_to_tick; 3391 cf::cede_to_tick;
3062 3392
3063 { 3393 {
3064 my $faces = $facedata->{faceinfo}; 3394 my $faces = $facedata->{faceinfo};
3065 3395
3066 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
3067 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3397 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3398
3068 cf::face::set_visibility $idx, $info->{visibility}; 3399 cf::face::set_visibility $idx, $info->{visibility};
3069 cf::face::set_magicmap $idx, $info->{magicmap}; 3400 cf::face::set_magicmap $idx, $info->{magicmap};
3070 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3071 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3072 3403
3073 cf::cede_to_tick; 3404 cf::cede_to_tick;
3074 } 3405 }
3075 3406
3076 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
3077 next unless $info->{smooth}; 3408 next unless $info->{smooth};
3409
3078 my $idx = cf::face::find $face 3410 my $idx = cf::face::find $face
3079 or next; 3411 or next;
3412
3080 if (my $smooth = cf::face::find $info->{smooth}) { 3413 if (my $smooth = cf::face::find $info->{smooth}) {
3081 cf::face::set_smooth $idx, $smooth; 3414 cf::face::set_smooth $idx, $smooth;
3082 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3415 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3083 } else { 3416 } else {
3084 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3417 error "smooth face '$info->{smooth}' not found for face '$face'";
3085 } 3418 }
3086 3419
3087 cf::cede_to_tick; 3420 cf::cede_to_tick;
3088 } 3421 }
3089 } 3422 }
3098 3431
3099 cf::anim::invalidate_all; # d'oh 3432 cf::anim::invalidate_all; # d'oh
3100 } 3433 }
3101 3434
3102 { 3435 {
3103 # TODO: for gcfclient pleasure, we should give resources
3104 # that gcfclient doesn't grok a >10000 face index.
3105 my $res = $facedata->{resource}; 3436 my $res = $facedata->{resource};
3106 3437
3107 my $soundconf = delete $res->{"res/sound.conf"};
3108
3109 while (my ($name, $info) = each %$res) { 3438 while (my ($name, $info) = each %$res) {
3439 if (defined $info->{type}) {
3110 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3440 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3111 my $data;
3112 3441
3113 if ($info->{type} & 1) { 3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3114 # prepend meta info 3443 cf::face::set_type $idx, $info->{type};
3115
3116 my $meta = $enc->encode ({
3117 name => $name,
3118 %{ $info->{meta} || {} },
3119 });
3120
3121 $data = pack "(w/a*)*", $meta, $info->{data};
3122 } else { 3444 } else {
3123 $data = $info->{data}; 3445 $RESOURCE{$name} = $info; # unused
3124 } 3446 }
3125 3447
3126 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3127 cf::face::set_type $idx, $info->{type};
3128
3129 cf::cede_to_tick; 3448 cf::cede_to_tick;
3130 } 3449 }
3131
3132 if ($soundconf) {
3133 $soundconf = $enc->decode (delete $soundconf->{data});
3134
3135 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3136 my $sound = $soundconf->{compat}[$_]
3137 or next;
3138
3139 my $face = cf::face::find "sound/$sound->[1]";
3140 cf::sound::set $sound->[0] => $face;
3141 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3142 }
3143
3144 while (my ($k, $v) = each %{$soundconf->{event}}) {
3145 my $face = cf::face::find "sound/$v";
3146 cf::sound::set $k => $face;
3147 }
3148 }
3149 } 3450 }
3451
3452 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3150 3453
3151 1 3454 1
3152} 3455}
3153 3456
3154register_exticmd fx_want => sub { 3457register_exticmd fx_want => sub {
3156 3459
3157 while (my ($k, $v) = each %$want) { 3460 while (my ($k, $v) = each %$want) {
3158 $ns->fx_want ($k, $v); 3461 $ns->fx_want ($k, $v);
3159 } 3462 }
3160}; 3463};
3464
3465sub load_resource_file($) {
3466 my $guard = lock_acquire "load_resource_file";
3467
3468 my $status = load_resource_file_ $_[0];
3469 get_slot 0.1, 100;
3470 cf::arch::commit_load;
3471
3472 $status
3473}
3161 3474
3162sub reload_regions { 3475sub reload_regions {
3163 # HACK to clear player env face cache, we need some signal framework 3476 # HACK to clear player env face cache, we need some signal framework
3164 # for this (global event?) 3477 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = (); 3478 %ext::player_env::MUSIC_FACE_CACHE = ();
3179} 3492}
3180 3493
3181sub reload_archetypes { 3494sub reload_archetypes {
3182 load_resource_file "$DATADIR/archetypes" 3495 load_resource_file "$DATADIR/archetypes"
3183 or die "unable to load archetypes\n"; 3496 or die "unable to load archetypes\n";
3184 #d# NEED to laod twice to resolve forward references
3185 # this really needs to be done in an extra post-pass
3186 # (which needs to be synchronous, so solve it differently)
3187 load_resource_file "$DATADIR/archetypes"
3188 or die "unable to load archetypes\n";
3189} 3497}
3190 3498
3191sub reload_treasures { 3499sub reload_treasures {
3192 load_resource_file "$DATADIR/treasures" 3500 load_resource_file "$DATADIR/treasures"
3193 or die "unable to load treasurelists\n"; 3501 or die "unable to load treasurelists\n";
3194} 3502}
3195 3503
3504sub reload_sound {
3505 trace "loading sound config from $DATADIR/sound\n";
3506
3507 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3508 or die "$DATADIR/sound $!";
3509
3510 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3511
3512 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3513 my $sound = $soundconf->{compat}[$_]
3514 or next;
3515
3516 my $face = cf::face::find "sound/$sound->[1]";
3517 cf::sound::set $sound->[0] => $face;
3518 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3519 }
3520
3521 while (my ($k, $v) = each %{$soundconf->{event}}) {
3522 my $face = cf::face::find "sound/$v";
3523 cf::sound::set $k => $face;
3524 }
3525}
3526
3196sub reload_resources { 3527sub reload_resources {
3197 warn "reloading resource files...\n"; 3528 trace "reloading resource files...\n";
3198 3529
3530 reload_facedata;
3531 reload_sound;
3532 reload_archetypes;
3199 reload_regions; 3533 reload_regions;
3200 reload_facedata;
3201 #reload_archetypes;#d#
3202 reload_archetypes;
3203 reload_treasures; 3534 reload_treasures;
3204 3535
3205 warn "finished reloading resource files\n"; 3536 trace "finished reloading resource files\n";
3206}
3207
3208sub init {
3209 reload_resources;
3210} 3537}
3211 3538
3212sub reload_config { 3539sub reload_config {
3540 trace "reloading config file...\n";
3541
3213 open my $fh, "<:utf8", "$CONFDIR/config" 3542 open my $fh, "<:utf8", "$CONFDIR/config"
3214 or return; 3543 or return;
3215 3544
3216 local $/; 3545 local $/;
3217 *CFG = YAML::Syck::Load <$fh>; 3546 *CFG = YAML::XS::Load scalar <$fh>;
3218 3547
3219 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3548 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3220 3549
3221 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3550 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3222 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3551 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3223 3552
3224 if (exists $CFG{mlockall}) { 3553 if (exists $CFG{mlockall}) {
3226 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3555 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3227 and die "WARNING: m(un)lockall failed: $!\n"; 3556 and die "WARNING: m(un)lockall failed: $!\n";
3228 }; 3557 };
3229 warn $@ if $@; 3558 warn $@ if $@;
3230 } 3559 }
3560
3561 trace "finished reloading resource files\n";
3562}
3563
3564sub pidfile() {
3565 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3566 or die "$PIDFILE: $!";
3567 flock $fh, &Fcntl::LOCK_EX
3568 or die "$PIDFILE: flock: $!";
3569 $fh
3570}
3571
3572# make sure only one server instance is running at any one time
3573sub atomic {
3574 my $fh = pidfile;
3575
3576 my $pid = <$fh>;
3577 kill 9, $pid if $pid > 0;
3578
3579 seek $fh, 0, 0;
3580 print $fh $$;
3581}
3582
3583sub main_loop {
3584 trace "EV::loop starting\n";
3585 if (1) {
3586 EV::loop;
3587 }
3588 trace "EV::loop returned\n";
3589 goto &main_loop unless $REALLY_UNLOOP;
3231} 3590}
3232 3591
3233sub main { 3592sub main {
3593 cf::init_globals; # initialise logging
3594
3595 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3596 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3597 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3598 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3599
3600 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3601
3234 # we must not ever block the main coroutine 3602 # we must not ever block the main coroutine
3235 local $Coro::idle = sub { 3603 local $Coro::idle = sub {
3236 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3604 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3237 (async { 3605 (async {
3238 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3606 $Coro::current->{desc} = "IDLE BUG HANDLER";
3239 Event::one_event; 3607 EV::loop EV::LOOP_ONESHOT;
3240 })->prio (Coro::PRIO_MAX); 3608 })->prio (Coro::PRIO_MAX);
3241 }; 3609 };
3242 3610
3611 evthread_start IO::AIO::poll_fileno;
3612
3613 cf::sync_job {
3614 cf::init_experience;
3615 cf::init_anim;
3616 cf::init_attackmess;
3617 cf::init_dynamic;
3618
3619 cf::load_settings;
3620 cf::load_materials;
3621
3622 reload_resources;
3243 reload_config; 3623 reload_config;
3244 db_init; 3624 db_init;
3625
3626 cf::init_uuid;
3627 cf::init_signals;
3628 cf::init_skills;
3629
3630 cf::init_beforeplay;
3631
3632 atomic;
3633
3245 load_extensions; 3634 load_extensions;
3246 3635
3247 $TICK_WATCHER->start; 3636 utime time, time, $RUNTIMEFILE;
3248 Event::loop; 3637
3638 # no (long-running) fork's whatsoever before this point(!)
3639 use POSIX ();
3640 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3641
3642 (pop @POST_INIT)->(0) while @POST_INIT;
3643 };
3644
3645 cf::object::thawer::errors_are_fatal 0;
3646 info "parse errors in files are no longer fatal from this point on.\n";
3647
3648 main_loop;
3249} 3649}
3250 3650
3251############################################################################# 3651#############################################################################
3252# initialisation and cleanup 3652# initialisation and cleanup
3253 3653
3254# install some emergency cleanup handlers 3654# install some emergency cleanup handlers
3255BEGIN { 3655BEGIN {
3656 our %SIGWATCHER = ();
3256 for my $signal (qw(INT HUP TERM)) { 3657 for my $signal (qw(INT HUP TERM)) {
3257 Event->signal ( 3658 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3258 reentrant => 0,
3259 data => WF_AUTOCANCEL,
3260 signal => $signal,
3261 prio => 0,
3262 cb => sub {
3263 cf::cleanup "SIG$signal"; 3659 cf::cleanup "SIG$signal";
3264 },
3265 ); 3660 };
3266 } 3661 }
3267} 3662}
3268 3663
3269sub write_runtime { 3664sub write_runtime_sync {
3270 my $runtime = "$LOCALDIR/runtime"; 3665 my $t0 = AE::time;
3271 3666
3272 # first touch the runtime file to show we are still running: 3667 # first touch the runtime file to show we are still running:
3273 # the fsync below can take a very very long time. 3668 # the fsync below can take a very very long time.
3274 3669
3275 IO::AIO::aio_utime $runtime, undef, undef; 3670 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3276 3671
3277 my $guard = cf::lock_acquire "write_runtime"; 3672 my $guard = cf::lock_acquire "write_runtime";
3278 3673
3279 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3674 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3280 or return; 3675 or return;
3281 3676
3282 my $value = $cf::RUNTIME + 90 + 10; 3677 my $value = $cf::RUNTIME + 90 + 10;
3283 # 10 is the runtime save interval, for a monotonic clock 3678 # 10 is the runtime save interval, for a monotonic clock
3284 # 60 allows for the watchdog to kill the server. 3679 # 60 allows for the watchdog to kill the server.
3294 aio_utime $fh, undef, undef; 3689 aio_utime $fh, undef, undef;
3295 3690
3296 close $fh 3691 close $fh
3297 or return; 3692 or return;
3298 3693
3299 aio_rename "$runtime~", $runtime 3694 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3300 and return; 3695 and return;
3301 3696
3302 warn "runtime file written.\n"; 3697 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3303 3698
3304 1 3699 1
3700}
3701
3702our $uuid_lock;
3703our $uuid_skip;
3704
3705sub write_uuid_sync($) {
3706 $uuid_skip ||= $_[0];
3707
3708 return if $uuid_lock;
3709 local $uuid_lock = 1;
3710
3711 my $uuid = "$LOCALDIR/uuid";
3712
3713 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3714 or return;
3715
3716 my $value = uuid_seq uuid_cur;
3717
3718 unless ($value) {
3719 info "cowardly refusing to write zero uuid value!\n";
3720 return;
3721 }
3722
3723 my $value = uuid_str $value + $uuid_skip;
3724 $uuid_skip = 0;
3725
3726 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3727 and return;
3728
3729 # always fsync - this file is important
3730 aio_fsync $fh
3731 and return;
3732
3733 close $fh
3734 or return;
3735
3736 aio_rename "$uuid~", $uuid
3737 and return;
3738
3739 trace "uuid file written ($value).\n";
3740
3741 1
3742
3743}
3744
3745sub write_uuid($$) {
3746 my ($skip, $sync) = @_;
3747
3748 $sync ? write_uuid_sync $skip
3749 : async { write_uuid_sync $skip };
3305} 3750}
3306 3751
3307sub emergency_save() { 3752sub emergency_save() {
3308 my $freeze_guard = cf::freeze_mainloop; 3753 my $freeze_guard = cf::freeze_mainloop;
3309 3754
3310 warn "enter emergency perl save\n"; 3755 info "emergency_perl_save: enter\n";
3756
3757 # this is a trade-off: we want to be very quick here, so
3758 # save all maps without fsync, and later call a global sync
3759 # (which in turn might be very very slow)
3760 local $USE_FSYNC = 0;
3311 3761
3312 cf::sync_job { 3762 cf::sync_job {
3763 cf::write_runtime_sync; # external watchdog should not bark
3764
3313 # use a peculiar iteration method to avoid tripping on perl 3765 # use a peculiar iteration method to avoid tripping on perl
3314 # refcount bugs in for. also avoids problems with players 3766 # refcount bugs in for. also avoids problems with players
3315 # and maps saved/destroyed asynchronously. 3767 # and maps saved/destroyed asynchronously.
3316 warn "begin emergency player save\n"; 3768 info "emergency_perl_save: begin player save\n";
3317 for my $login (keys %cf::PLAYER) { 3769 for my $login (keys %cf::PLAYER) {
3318 my $pl = $cf::PLAYER{$login} or next; 3770 my $pl = $cf::PLAYER{$login} or next;
3319 $pl->valid or next; 3771 $pl->valid or next;
3320 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3772 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3321 $pl->save; 3773 $pl->save;
3322 } 3774 }
3323 warn "end emergency player save\n"; 3775 info "emergency_perl_save: end player save\n";
3324 3776
3325 warn "begin emergency map save\n"; 3777 cf::write_runtime_sync; # external watchdog should not bark
3778
3779 info "emergency_perl_save: begin map save\n";
3326 for my $path (keys %cf::MAP) { 3780 for my $path (keys %cf::MAP) {
3327 my $map = $cf::MAP{$path} or next; 3781 my $map = $cf::MAP{$path} or next;
3328 $map->valid or next; 3782 $map->valid or next;
3329 $map->save; 3783 $map->save;
3330 } 3784 }
3331 warn "end emergency map save\n"; 3785 info "emergency_perl_save: end map save\n";
3332 3786
3333 warn "begin emergency database checkpoint\n"; 3787 cf::write_runtime_sync; # external watchdog should not bark
3788
3789 info "emergency_perl_save: begin database checkpoint\n";
3334 BDB::db_env_txn_checkpoint $DB_ENV; 3790 BDB::db_env_txn_checkpoint $DB_ENV;
3335 warn "end emergency database checkpoint\n"; 3791 info "emergency_perl_save: end database checkpoint\n";
3792
3793 info "emergency_perl_save: begin write uuid\n";
3794 write_uuid_sync 1;
3795 info "emergency_perl_save: end write uuid\n";
3796
3797 cf::write_runtime_sync; # external watchdog should not bark
3798
3799 trace "emergency_perl_save: syncing database to disk";
3800 BDB::db_env_txn_checkpoint $DB_ENV;
3801
3802 info "emergency_perl_save: starting sync()\n";
3803 IO::AIO::aio_sync sub {
3804 info "emergency_perl_save: finished sync()\n";
3805 };
3806
3807 cf::write_runtime_sync; # external watchdog should not bark
3808
3809 trace "emergency_perl_save: flushing outstanding aio requests";
3810 while (IO::AIO::nreqs || BDB::nreqs) {
3811 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3812 }
3813
3814 cf::write_runtime_sync; # external watchdog should not bark
3336 }; 3815 };
3337 3816
3338 warn "leave emergency perl save\n"; 3817 info "emergency_perl_save: leave\n";
3339} 3818}
3340 3819
3341sub post_cleanup { 3820sub post_cleanup {
3342 my ($make_core) = @_; 3821 my ($make_core) = @_;
3343 3822
3823 IO::AIO::flush;
3824
3825 IO::AIO::flush;
3826
3344 warn Carp::longmess "post_cleanup backtrace" 3827 error Carp::longmess "post_cleanup backtrace"
3345 if $make_core; 3828 if $make_core;
3829
3830 my $fh = pidfile;
3831 unlink $PIDFILE if <$fh> == $$;
3832}
3833
3834# a safer delete_package, copied from Symbol
3835sub clear_package($) {
3836 my $pkg = shift;
3837
3838 # expand to full symbol table name if needed
3839 unless ($pkg =~ /^main::.*::$/) {
3840 $pkg = "main$pkg" if $pkg =~ /^::/;
3841 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3842 $pkg .= '::' unless $pkg =~ /::$/;
3843 }
3844
3845 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3846 my $stem_symtab = *{$stem}{HASH};
3847
3848 defined $stem_symtab and exists $stem_symtab->{$leaf}
3849 or return;
3850
3851 # clear all symbols
3852 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3853 for my $name (keys %$leaf_symtab) {
3854 _gv_clear *{"$pkg$name"};
3855# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3856 }
3346} 3857}
3347 3858
3348sub do_reload_perl() { 3859sub do_reload_perl() {
3349 # can/must only be called in main 3860 # can/must only be called in main
3350 if ($Coro::current != $Coro::main) { 3861 if (in_main) {
3351 warn "can only reload from main coroutine"; 3862 error "can only reload from main coroutine";
3352 return; 3863 return;
3353 } 3864 }
3354 3865
3866 return if $RELOAD++;
3867
3868 my $t1 = AE::time;
3869
3870 while ($RELOAD) {
3355 warn "reloading..."; 3871 info "reloading...";
3356 3872
3357 warn "entering sync_job"; 3873 trace "entering sync_job";
3358 3874
3359 cf::sync_job { 3875 cf::sync_job {
3360 cf::write_runtime; # external watchdog should not bark
3361 cf::emergency_save; 3876 cf::emergency_save;
3362 cf::write_runtime; # external watchdog should not bark
3363 3877
3364 warn "syncing database to disk";
3365 BDB::db_env_txn_checkpoint $DB_ENV;
3366
3367 # if anything goes wrong in here, we should simply crash as we already saved
3368
3369 warn "cancelling all WF_AUTOCANCEL watchers";
3370 for (Event::all_watchers) {
3371 $_->cancel if $_->data & WF_AUTOCANCEL;
3372 }
3373
3374 warn "flushing outstanding aio requests";
3375 for (;;) {
3376 BDB::flush;
3377 IO::AIO::flush;
3378 Coro::cede_notself;
3379 last unless IO::AIO::nreqs || BDB::nreqs;
3380 warn "iterate...";
3381 }
3382
3383 ++$RELOAD;
3384
3385 warn "cancelling all extension coros"; 3878 trace "cancelling all extension coros";
3386 $_->cancel for values %EXT_CORO; 3879 $_->cancel for values %EXT_CORO;
3387 %EXT_CORO = (); 3880 %EXT_CORO = ();
3388 3881
3389 warn "removing commands"; 3882 trace "removing commands";
3390 %COMMAND = (); 3883 %COMMAND = ();
3391 3884
3392 warn "removing ext/exti commands"; 3885 trace "removing ext/exti commands";
3393 %EXTCMD = (); 3886 %EXTCMD = ();
3394 %EXTICMD = (); 3887 %EXTICMD = ();
3395 3888
3396 warn "unloading/nuking all extensions"; 3889 trace "unloading/nuking all extensions";
3397 for my $pkg (@EXTS) { 3890 for my $pkg (@EXTS) {
3398 warn "... unloading $pkg"; 3891 trace "... unloading $pkg";
3399 3892
3400 if (my $cb = $pkg->can ("unload")) { 3893 if (my $cb = $pkg->can ("unload")) {
3401 eval { 3894 eval {
3402 $cb->($pkg); 3895 $cb->($pkg);
3403 1 3896 1
3404 } or warn "$pkg unloaded, but with errors: $@"; 3897 } or error "$pkg unloaded, but with errors: $@";
3898 }
3899
3900 trace "... clearing $pkg";
3901 clear_package $pkg;
3405 } 3902 }
3406 3903
3407 warn "... nuking $pkg";
3408 Symbol::delete_package $pkg;
3409 }
3410
3411 warn "unloading all perl modules loaded from $LIBDIR"; 3904 trace "unloading all perl modules loaded from $LIBDIR";
3412 while (my ($k, $v) = each %INC) { 3905 while (my ($k, $v) = each %INC) {
3413 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3906 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3414 3907
3415 warn "... unloading $k"; 3908 trace "... unloading $k";
3416 delete $INC{$k}; 3909 delete $INC{$k};
3417 3910
3418 $k =~ s/\.pm$//; 3911 $k =~ s/\.pm$//;
3419 $k =~ s/\//::/g; 3912 $k =~ s/\//::/g;
3420 3913
3421 if (my $cb = $k->can ("unload_module")) { 3914 if (my $cb = $k->can ("unload_module")) {
3422 $cb->(); 3915 $cb->();
3916 }
3917
3918 clear_package $k;
3423 } 3919 }
3424 3920
3425 Symbol::delete_package $k;
3426 }
3427
3428 warn "getting rid of safe::, as good as possible"; 3921 trace "getting rid of safe::, as good as possible";
3429 Symbol::delete_package "safe::$_" 3922 clear_package "safe::$_"
3430 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3923 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3431 3924
3432 warn "unloading cf.pm \"a bit\""; 3925 trace "unloading cf.pm \"a bit\"";
3433 delete $INC{"cf.pm"}; 3926 delete $INC{"cf.pm"};
3434 delete $INC{"cf/pod.pm"}; 3927 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3435 3928
3436 # don't, removes xs symbols, too, 3929 # don't, removes xs symbols, too,
3437 # and global variables created in xs 3930 # and global variables created in xs
3438 #Symbol::delete_package __PACKAGE__; 3931 #clear_package __PACKAGE__;
3439 3932
3440 warn "unload completed, starting to reload now"; 3933 info "unload completed, starting to reload now";
3441 3934
3442 warn "reloading cf.pm"; 3935 trace "reloading cf.pm";
3443 require cf; 3936 require cf;
3444 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3937 cf::_connect_to_perl_1;
3445 3938
3446 warn "loading config and database again"; 3939 trace "loading config and database again";
3447 cf::reload_config; 3940 cf::reload_config;
3448 3941
3449 warn "loading extensions"; 3942 trace "loading extensions";
3450 cf::load_extensions; 3943 cf::load_extensions;
3451 3944
3945 if ($REATTACH_ON_RELOAD) {
3452 warn "reattaching attachments to objects/players"; 3946 trace "reattaching attachments to objects/players";
3453 _global_reattach; # objects, sockets 3947 _global_reattach; # objects, sockets
3454 warn "reattaching attachments to maps"; 3948 trace "reattaching attachments to maps";
3455 reattach $_ for values %MAP; 3949 reattach $_ for values %MAP;
3456 warn "reattaching attachments to players"; 3950 trace "reattaching attachments to players";
3457 reattach $_ for values %PLAYER; 3951 reattach $_ for values %PLAYER;
3952 }
3458 3953
3954 trace "running post_init jobs";
3955 (pop @POST_INIT)->(1) while @POST_INIT;
3956
3459 warn "leaving sync_job"; 3957 trace "leaving sync_job";
3460 3958
3461 1 3959 1
3462 } or do { 3960 } or do {
3463 warn $@; 3961 error $@;
3464 warn "error while reloading, exiting."; 3962 cf::cleanup "error while reloading, exiting.";
3465 exit 1; 3963 };
3964
3965 info "reloaded";
3966 --$RELOAD;
3466 }; 3967 }
3467 3968
3468 warn "reloaded"; 3969 $t1 = AE::time - $t1;
3970 info "reload completed in ${t1}s\n";
3469}; 3971};
3470 3972
3471our $RELOAD_WATCHER; # used only during reload 3973our $RELOAD_WATCHER; # used only during reload
3472 3974
3473sub reload_perl() { 3975sub reload_perl() {
3474 # doing reload synchronously and two reloads happen back-to-back, 3976 # doing reload synchronously and two reloads happen back-to-back,
3475 # coro crashes during coro_state_free->destroy here. 3977 # coro crashes during coro_state_free->destroy here.
3476 3978
3477 $RELOAD_WATCHER ||= Event->timer ( 3979 $RELOAD_WATCHER ||= cf::async {
3478 reentrant => 0, 3980 Coro::AIO::aio_wait cache_extensions;
3479 after => 0, 3981
3480 data => WF_AUTOCANCEL, 3982 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3481 cb => sub {
3482 do_reload_perl; 3983 do_reload_perl;
3483 undef $RELOAD_WATCHER; 3984 undef $RELOAD_WATCHER;
3484 }, 3985 };
3485 ); 3986 };
3486} 3987}
3487 3988
3488register_command "reload" => sub { 3989register_command "reload" => sub {
3489 my ($who, $arg) = @_; 3990 my ($who, $arg) = @_;
3490 3991
3503 4004
3504our @WAIT_FOR_TICK; 4005our @WAIT_FOR_TICK;
3505our @WAIT_FOR_TICK_BEGIN; 4006our @WAIT_FOR_TICK_BEGIN;
3506 4007
3507sub wait_for_tick { 4008sub wait_for_tick {
3508 return unless $TICK_WATCHER->is_active;
3509 return if $Coro::current == $Coro::main; 4009 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3510 4010
3511 my $signal = new Coro::Signal; 4011 my $signal = new Coro::Signal;
3512 push @WAIT_FOR_TICK, $signal; 4012 push @WAIT_FOR_TICK, $signal;
3513 $signal->wait; 4013 $signal->wait;
3514} 4014}
3515 4015
3516sub wait_for_tick_begin { 4016sub wait_for_tick_begin {
3517 return unless $TICK_WATCHER->is_active;
3518 return if $Coro::current == $Coro::main; 4017 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3519 4018
3520 my $signal = new Coro::Signal; 4019 my $signal = new Coro::Signal;
3521 push @WAIT_FOR_TICK_BEGIN, $signal; 4020 push @WAIT_FOR_TICK_BEGIN, $signal;
3522 $signal->wait; 4021 $signal->wait;
3523} 4022}
3524 4023
3525$TICK_WATCHER = Event->timer ( 4024sub tick {
3526 reentrant => 0,
3527 parked => 1,
3528 prio => 0,
3529 at => $NEXT_TICK || $TICK,
3530 data => WF_AUTOCANCEL,
3531 cb => sub {
3532 if ($Coro::current != $Coro::main) { 4025 if ($Coro::current != $Coro::main) {
3533 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4026 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3534 unless ++$bug_warning > 10; 4027 unless ++$bug_warning > 10;
3535 return; 4028 return;
3536 } 4029 }
3537 4030
3538 $NOW = $tick_start = Event::time;
3539
3540 cf::server_tick; # one server iteration 4031 cf::server_tick; # one server iteration
3541 4032
3542 $RUNTIME += $TICK; 4033 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3543 $NEXT_TICK += $TICK;
3544 4034
3545 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4035 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3546 $NEXT_RUNTIME_WRITE = $NOW + 10; 4036 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3547 Coro::async_pool { 4037 Coro::async_pool {
3548 $Coro::current->{desc} = "runtime saver"; 4038 $Coro::current->{desc} = "runtime saver";
3549 write_runtime 4039 write_runtime_sync
3550 or warn "ERROR: unable to write runtime file: $!"; 4040 or error "ERROR: unable to write runtime file: $!";
3551 };
3552 } 4041 };
4042 }
3553 4043
3554 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4044 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3555 $sig->send; 4045 $sig->send;
3556 } 4046 }
3557 while (my $sig = shift @WAIT_FOR_TICK) { 4047 while (my $sig = shift @WAIT_FOR_TICK) {
3558 $sig->send; 4048 $sig->send;
3559 } 4049 }
3560 4050
3561 $NOW = Event::time; 4051 $LOAD = ($NOW - $TICK_START) / $TICK;
3562
3563 # if we are delayed by four ticks or more, skip them all
3564 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3565
3566 $TICK_WATCHER->at ($NEXT_TICK);
3567 $TICK_WATCHER->start;
3568
3569 $LOAD = ($NOW - $tick_start) / $TICK;
3570 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4052 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3571 4053
3572 _post_tick; 4054 if (0) {
4055 if ($NEXT_TICK) {
4056 my $jitter = $TICK_START - $NEXT_TICK;
4057 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4058 debug "jitter $JITTER\n";#d#
4059 }
3573 }, 4060 }
3574); 4061}
3575 4062
3576{ 4063{
4064 # configure BDB
4065
3577 BDB::min_parallel 8; 4066 BDB::min_parallel 16;
3578 BDB::max_poll_time $TICK * 0.1; 4067 BDB::max_poll_reqs $TICK * 0.1;
3579 $BDB_POLL_WATCHER = Event->io ( 4068 $AnyEvent::BDB::WATCHER->priority (1);
3580 reentrant => 0,
3581 fd => BDB::poll_fileno,
3582 poll => 'r',
3583 prio => 0,
3584 data => WF_AUTOCANCEL,
3585 cb => \&BDB::poll_cb,
3586 );
3587
3588 BDB::set_sync_prepare {
3589 my $status;
3590 my $current = $Coro::current;
3591 (
3592 sub {
3593 $status = $!;
3594 $current->ready; undef $current;
3595 },
3596 sub {
3597 Coro::schedule while defined $current;
3598 $! = $status;
3599 },
3600 )
3601 };
3602 4069
3603 unless ($DB_ENV) { 4070 unless ($DB_ENV) {
3604 $DB_ENV = BDB::db_env_create; 4071 $DB_ENV = BDB::db_env_create;
3605 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4072 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3606 | BDB::LOG_AUTOREMOVE, 1); 4073 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4074 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3607 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4075 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3608 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4076 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3609 4077
3610 cf::sync_job { 4078 cf::sync_job {
3611 eval { 4079 eval {
3621 4089
3622 cf::cleanup "db_env_open(db): $@" if $@; 4090 cf::cleanup "db_env_open(db): $@" if $@;
3623 }; 4091 };
3624 } 4092 }
3625 4093
3626 $BDB_DEADLOCK_WATCHER = Event->timer ( 4094 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3627 after => 3,
3628 interval => 1,
3629 hard => 1,
3630 prio => 0,
3631 data => WF_AUTOCANCEL,
3632 cb => sub {
3633 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4095 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3634 },
3635 ); 4096 };
3636 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4097 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3637 after => 11,
3638 interval => 60,
3639 hard => 1,
3640 prio => 0,
3641 data => WF_AUTOCANCEL,
3642 cb => sub {
3643 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4098 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3644 },
3645 ); 4099 };
3646 $BDB_TRICKLE_WATCHER = Event->timer ( 4100 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3647 after => 5,
3648 interval => 10,
3649 hard => 1,
3650 prio => 0,
3651 data => WF_AUTOCANCEL,
3652 cb => sub {
3653 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4101 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3654 },
3655 ); 4102 };
3656} 4103}
3657 4104
3658{ 4105{
4106 # configure IO::AIO
4107
3659 IO::AIO::min_parallel 8; 4108 IO::AIO::min_parallel 8;
3660
3661 undef $Coro::AIO::WATCHER;
3662 IO::AIO::max_poll_time $TICK * 0.1; 4109 IO::AIO::max_poll_time $TICK * 0.1;
3663 $AIO_POLL_WATCHER = Event->io ( 4110 undef $AnyEvent::AIO::WATCHER;
3664 reentrant => 0,
3665 data => WF_AUTOCANCEL,
3666 fd => IO::AIO::poll_fileno,
3667 poll => 'r',
3668 prio => 0,
3669 cb => \&IO::AIO::poll_cb,
3670 );
3671} 4111}
3672 4112
3673my $_log_backtrace; 4113my $_log_backtrace;
3674 4114
3675sub _log_backtrace { 4115sub _log_backtrace {
3678 $msg =~ s/\n//; 4118 $msg =~ s/\n//;
3679 4119
3680 # limit the # of concurrent backtraces 4120 # limit the # of concurrent backtraces
3681 if ($_log_backtrace < 2) { 4121 if ($_log_backtrace < 2) {
3682 ++$_log_backtrace; 4122 ++$_log_backtrace;
4123 my $perl_bt = Carp::longmess $msg;
3683 async { 4124 async {
3684 $Coro::current->{desc} = "abt $msg"; 4125 $Coro::current->{desc} = "abt $msg";
3685 4126
3686 my @bt = fork_call { 4127 my @bt = fork_call {
3687 @addr = map { sprintf "%x", $_ } @addr; 4128 @addr = map { sprintf "%x", $_ } @addr;
3698 } 4139 }
3699 4140
3700 @funcs 4141 @funcs
3701 }; 4142 };
3702 4143
3703 LOG llevInfo, "[ABT] $msg\n"; 4144 LOG llevInfo, "[ABT] $perl_bt\n";
4145 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3704 LOG llevInfo, "[ABT] $_\n" for @bt; 4146 LOG llevInfo, "[ABT] $_\n" for @bt;
3705 --$_log_backtrace; 4147 --$_log_backtrace;
3706 }; 4148 };
3707 } else { 4149 } else {
3708 LOG llevInfo, "[ABT] $msg\n"; 4150 LOG llevInfo, "[ABT] $msg\n";
3709 LOG llevInfo, "[ABT] [suppressed]\n"; 4151 LOG llevInfo, "[ABT] [suppressed]\n";
3710 } 4152 }
3711} 4153}
3712 4154
3713# load additional modules 4155# load additional modules
3714use cf::pod; 4156require "cf/$_.pm" for @EXTRA_MODULES;
4157cf::_connect_to_perl_2;
3715 4158
3716END { cf::emergency_save } 4159END { cf::emergency_save }
3717 4160
37181 41611
3719 4162

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines