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.291 by root, Tue Jul 3 00:54:44 2007 UTC vs.
Revision 1.512 by root, Sun Apr 11 04:52:07 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines