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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines