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

Diff Legend

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