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.315 by root, Mon Jul 23 17:53:55 2007 UTC vs.
Revision 1.512 by root, Sun Apr 11 04:52:07 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines