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

Diff Legend

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