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.542 by root, Wed May 5 09:05:03 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";
1291 1456
1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1292 if (exists $v->{meta}{mandatory}) { 1458 if exists $v->{meta}{mandatory};
1293 warn $msg; 1459
1294 warn "mandatory extension failed to load, exiting.\n"; 1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1295 exit 1; 1461 delete $todo{$k};
1296 } 1462 } else {
1297 1463 $done{$k} = delete $todo{$k};
1298 warn $msg; 1464 push @EXTS, $v->{pkg};
1465 $progress = 1;
1466
1467 info "$v->{base}: extension inactive.\n"
1468 unless $active;
1299 } 1469 }
1300
1301 $done{$k} = delete $todo{$k};
1302 push @EXTS, $v->{pkg};
1303 $progress = 1;
1304 } 1470 }
1305 1471
1306 skip: 1472 unless ($progress) {
1307 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1473 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1308 unless $progress; 1474
1475 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory};
1478 }
1479 }
1309 } 1480 }
1310 }; 1481 };
1311} 1482}
1312 1483
1313############################################################################# 1484#############################################################################
1314 1485
1315=back 1486=back
1316 1487
1317=head2 CORE EXTENSIONS 1488=head2 CORE EXTENSIONS
1318 1489
1319Functions and methods that extend core crossfire objects. 1490Functions and methods that extend core deliantra objects.
1320 1491
1321=cut 1492=cut
1322 1493
1323package cf::player; 1494package cf::player;
1324 1495
1367 1538
1368sub exists($) { 1539sub exists($) {
1369 my ($login) = @_; 1540 my ($login) = @_;
1370 1541
1371 $cf::PLAYER{$login} 1542 $cf::PLAYER{$login}
1372 or cf::sync_job { !aio_stat path $login } 1543 or !aio_stat path $login
1373} 1544}
1374 1545
1375sub find($) { 1546sub find($) {
1376 return $cf::PLAYER{$_[0]} || do { 1547 return $cf::PLAYER{$_[0]} || do {
1377 my $login = $_[0]; 1548 my $login = $_[0];
1389 my $f = new_from_file cf::object::thawer path $login 1560 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1561 or return;
1391 1562
1392 my $pl = cf::player::load_pl $f 1563 my $pl = cf::player::load_pl $f
1393 or return; 1564 or return;
1565
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1566 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1567 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1568 $cf::PLAYER{$login} = $pl
1397 } 1569 }
1398 } 1570 }
1399} 1571}
1400 1572
1573cf::player->attach (
1574 on_load => sub {
1575 my ($pl, $path) = @_;
1576
1577 # restore slots saved in save, below
1578 my $slots = delete $pl->{_slots};
1579
1580 $pl->ob->current_weapon ($slots->[0]);
1581 $pl->combat_ob ($slots->[1]);
1582 $pl->ranged_ob ($slots->[2]);
1583 },
1584);
1585
1401sub save($) { 1586sub save($) {
1402 my ($pl) = @_; 1587 my ($pl) = @_;
1403 1588
1404 return if $pl->{deny_save}; 1589 return if $pl->{deny_save};
1405 1590
1408 1593
1409 return if $pl->{deny_save}; 1594 return if $pl->{deny_save};
1410 1595
1411 aio_mkdir playerdir $pl, 0770; 1596 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1597 $pl->{last_save} = $cf::RUNTIME;
1598
1599 cf::get_slot 0.01;
1600
1601 # save slots, to be restored later
1602 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1413 1603
1414 $pl->save_pl ($path); 1604 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1605 cf::cede_to_tick;
1416} 1606}
1417 1607
1449 my ($pl) = @_; 1639 my ($pl) = @_;
1450 1640
1451 my $name = $pl->ob->name; 1641 my $name = $pl->ob->name;
1452 1642
1453 $pl->{deny_save} = 1; 1643 $pl->{deny_save} = 1;
1454 $pl->password ("*"); # this should lock out the player until we nuked the dir 1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1455 1645
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1647 $pl->deactivate;
1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1460 1651
1461 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 1692
1502 for my $login (@$dirs) { 1693 for my $login (@$dirs) {
1503 my $path = path $login; 1694 my $path = path $login;
1504 1695
1505 # a .pst is a dead give-away for a valid player 1696 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1697 # if no pst file found, open and chekc for blocked users
1698 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1699 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1700 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1701 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1702 }
1511 1703
1515 1707
1516 \@logins 1708 \@logins
1517} 1709}
1518 1710
1519=item $player->maps 1711=item $player->maps
1712
1713=item cf::player::maps $login
1520 1714
1521Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1522player. May block. 1716player. May block.
1523 1717
1524=cut 1718=cut
1542 } 1736 }
1543 1737
1544 \@paths 1738 \@paths
1545} 1739}
1546 1740
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1741=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548 1742
1549Expand crossfire pod fragments into protocol xml. 1743Expand 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 1744
1598=item $player->ext_reply ($msgid, @msg) 1745=item $player->ext_reply ($msgid, @msg)
1599 1746
1600Sends an ext reply to the player. 1747Sends an ext reply to the player.
1601 1748
1633 1780
1634=cut 1781=cut
1635 1782
1636sub find_by_path($) { 1783sub find_by_path($) {
1637 my ($path) = @_; 1784 my ($path) = @_;
1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1638 1787
1639 my ($match, $specificity); 1788 my ($match, $specificity);
1640 1789
1641 for my $region (list) { 1790 for my $region (list) {
1642 if ($region->{match} && $path =~ $region->{match}) { 1791 if ($region->{match} && $path =~ $region->{match}) {
1668our $MAX_RESET = 3600; 1817our $MAX_RESET = 3600;
1669our $DEFAULT_RESET = 3000; 1818our $DEFAULT_RESET = 3000;
1670 1819
1671sub generate_random_map { 1820sub generate_random_map {
1672 my ($self, $rmp) = @_; 1821 my ($self, $rmp) = @_;
1822
1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1824
1673 # mit "rum" bekleckern, nicht 1825 # mit "rum" bekleckern, nicht
1674 $self->_create_random_map ( 1826 $self->_create_random_map (
1675 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1676 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1677 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1678 $rmp->{exit_on_final_map}, 1830 $rmp->{exit_on_final_map},
1679 $rmp->{xsize}, $rmp->{ysize}, 1831 $rmp->{xsize}, $rmp->{ysize},
1680 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1681 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1696 1848
1697sub register { 1849sub register {
1698 my (undef, $regex, $prio) = @_; 1850 my (undef, $regex, $prio) = @_;
1699 my $pkg = caller; 1851 my $pkg = caller;
1700 1852
1701 no strict;
1702 push @{"$pkg\::ISA"}, __PACKAGE__; 1853 push @{"$pkg\::ISA"}, __PACKAGE__;
1703 1854
1704 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1855 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1705} 1856}
1706 1857
1707# also paths starting with '/' 1858# also paths starting with '/'
1708$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1859$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1709 1860
1710sub thawer_merge { 1861sub thawer_merge {
1711 my ($self, $merge) = @_; 1862 my ($self, $merge) = @_;
1712 1863
1713 # we have to keep some variables in memory intact 1864 # we have to keep some variables in memory intact
1799 1950
1800# the temporary/swap location 1951# the temporary/swap location
1801sub save_path { 1952sub save_path {
1802 my ($self) = @_; 1953 my ($self) = @_;
1803 1954
1804 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1955 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1805 "$TMPDIR/$path.map" 1956 "$TMPDIR/$path.map"
1806} 1957}
1807 1958
1808# the unique path, undef == no special unique path 1959# the unique path, undef == no special unique path
1809sub uniq_path { 1960sub uniq_path {
1810 my ($self) = @_; 1961 my ($self) = @_;
1811 1962
1812 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1963 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1813 "$UNIQUEDIR/$path" 1964 "$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} 1965}
1824 1966
1825sub decay_objects { 1967sub decay_objects {
1826 my ($self) = @_; 1968 my ($self) = @_;
1827 1969
1911sub find { 2053sub find {
1912 my ($path, $origin) = @_; 2054 my ($path, $origin) = @_;
1913 2055
1914 $path = normalise $path, $origin && $origin->path; 2056 $path = normalise $path, $origin && $origin->path;
1915 2057
1916 cf::lock_wait "map_data:$path";#d#remove 2058 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1917 cf::lock_wait "map_find:$path"; 2059 my $guard2 = cf::lock_acquire "map_find:$path";
1918 2060
1919 $cf::MAP{$path} || do { 2061 $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 2062 my $map = new_from_path cf::map $path
1924 or return; 2063 or return;
1925 2064
1926 $map->{last_save} = $cf::RUNTIME; 2065 $map->{last_save} = $cf::RUNTIME;
1927 2066
1929 or return; 2068 or return;
1930 2069
1931 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2070 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1932 # doing this can freeze the server in a sync job, obviously 2071 # doing this can freeze the server in a sync job, obviously
1933 #$cf::WAIT_FOR_TICK->wait; 2072 #$cf::WAIT_FOR_TICK->wait;
2073 undef $guard2;
1934 undef $guard1; 2074 undef $guard1;
1935 undef $guard2;
1936 $map->reset; 2075 $map->reset;
1937 return find $path; 2076 return find $path;
1938 } 2077 }
1939 2078
1940 $cf::MAP{$path} = $map 2079 $cf::MAP{$path} = $map
1941 } 2080 }
1942} 2081}
1943 2082
1944sub pre_load { } 2083sub pre_load { }
1945sub post_load { } 2084#sub post_load { } # XS
1946 2085
1947sub load { 2086sub load {
1948 my ($self) = @_; 2087 my ($self) = @_;
1949 2088
1950 local $self->{deny_reset} = 1; # loading can take a long time 2089 local $self->{deny_reset} = 1; # loading can take a long time
1967 my $f = new_from_file cf::object::thawer $self->{load_path}; 2106 my $f = new_from_file cf::object::thawer $self->{load_path};
1968 $f->skip_block; 2107 $f->skip_block;
1969 $self->_load_objects ($f) 2108 $self->_load_objects ($f)
1970 or return; 2109 or return;
1971 2110
1972 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2111 $self->post_load_original
1973 if delete $self->{load_original}; 2112 if delete $self->{load_original};
1974 2113
1975 if (my $uniq = $self->uniq_path) { 2114 if (my $uniq = $self->uniq_path) {
1976 utf8::encode $uniq; 2115 utf8::encode $uniq;
1977 unless (aio_stat $uniq) { 2116 unless (aio_stat $uniq) {
1995 unless ($self->{deny_activate}) { 2134 unless ($self->{deny_activate}) {
1996 $self->decay_objects; 2135 $self->decay_objects;
1997 $self->fix_auto_apply; 2136 $self->fix_auto_apply;
1998 $self->update_buttons; 2137 $self->update_buttons;
1999 cf::cede_to_tick; 2138 cf::cede_to_tick;
2000 $self->set_darkness_map;
2001 cf::cede_to_tick;
2002 $self->activate; 2139 $self->activate;
2003 } 2140 }
2004 2141
2005 $self->{last_save} = $cf::RUNTIME; 2142 $self->{last_save} = $cf::RUNTIME;
2006 $self->last_access ($cf::RUNTIME); 2143 $self->last_access ($cf::RUNTIME);
2007 2144
2008 $self->in_memory (cf::MAP_IN_MEMORY); 2145 $self->in_memory (cf::MAP_ACTIVE);
2009 } 2146 }
2010 2147
2011 $self->post_load; 2148 $self->post_load;
2012} 2149}
2013 2150
2151# customize the map for a given player, i.e.
2152# return the _real_ map. used by e.g. per-player
2153# maps to change the path to ~playername/mappath
2014sub customise_for { 2154sub customise_for {
2015 my ($self, $ob) = @_; 2155 my ($self, $ob) = @_;
2016 2156
2017 return find "~" . $ob->name . "/" . $self->{path} 2157 return find "~" . $ob->name . "/" . $self->{path}
2018 if $self->per_player; 2158 if $self->per_player;
2034 or next; 2174 or next;
2035 $neigh = find $neigh, $map 2175 $neigh = find $neigh, $map
2036 or next; 2176 or next;
2037 $neigh->load; 2177 $neigh->load;
2038 2178
2179 # now find the diagonal neighbours
2039 push @neigh, 2180 push @neigh,
2040 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2181 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2041 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2182 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2042 } 2183 }
2043 2184
2050} 2191}
2051 2192
2052sub find_sync { 2193sub find_sync {
2053 my ($path, $origin) = @_; 2194 my ($path, $origin) = @_;
2054 2195
2055 cf::sync_job { find $path, $origin } 2196 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2197 if $Coro::current == $Coro::main;
2198
2199 find $path, $origin
2056} 2200}
2057 2201
2058sub do_load_sync { 2202sub do_load_sync {
2059 my ($map) = @_; 2203 my ($map) = @_;
2060 2204
2061 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2205 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2062 if $Coro::current == $Coro::main; 2206 if $Coro::current == $Coro::main;
2063 2207
2064 cf::sync_job { $map->load }; 2208 $map->load;
2065} 2209}
2066 2210
2067our %MAP_PREFETCH; 2211our %MAP_PREFETCH;
2068our $MAP_PREFETCHER = undef; 2212our $MAP_PREFETCHER = undef;
2069 2213
2071 my ($path, $origin, $load) = @_; 2215 my ($path, $origin, $load) = @_;
2072 2216
2073 $path = normalise $path, $origin && $origin->{path}; 2217 $path = normalise $path, $origin && $origin->{path};
2074 2218
2075 if (my $map = $cf::MAP{$path}) { 2219 if (my $map = $cf::MAP{$path}) {
2076 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2220 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2077 } 2221 }
2078 2222
2079 $MAP_PREFETCH{$path} |= $load; 2223 $MAP_PREFETCH{$path} |= $load;
2080 2224
2081 $MAP_PREFETCHER ||= cf::async { 2225 $MAP_PREFETCHER ||= cf::async {
2095 $MAP_PREFETCHER->prio (6); 2239 $MAP_PREFETCHER->prio (6);
2096 2240
2097 () 2241 ()
2098} 2242}
2099 2243
2244# common code, used by both ->save and ->swapout
2100sub save { 2245sub _save {
2101 my ($self) = @_; 2246 my ($self) = @_;
2102
2103 my $lock = cf::lock_acquire "map_data:$self->{path}";
2104 2247
2105 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2106 2249
2107 return unless $self->dirty; 2250 return unless $self->dirty;
2108 2251
2117 2260
2118 cf::async { 2261 cf::async {
2119 $Coro::current->{desc} = "map player save"; 2262 $Coro::current->{desc} = "map player save";
2120 $_->contr->save for $self->players; 2263 $_->contr->save for $self->players;
2121 }; 2264 };
2265
2266 cf::get_slot 0.02;
2122 2267
2123 if ($uniq) { 2268 if ($uniq) {
2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2269 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2125 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2270 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2126 } else { 2271 } else {
2127 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2272 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2128 } 2273 }
2129} 2274}
2130 2275
2276sub save {
2277 my ($self) = @_;
2278
2279 my $lock = cf::lock_acquire "map_data:$self->{path}";
2280
2281 $self->_save;
2282}
2283
2131sub swap_out { 2284sub swap_out {
2132 my ($self) = @_; 2285 my ($self) = @_;
2133 2286
2134 # save first because save cedes
2135 $self->save;
2136
2137 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2287 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138 2288
2289 return if $self->in_memory != cf::MAP_ACTIVE;
2290 return if $self->{deny_save};
2139 return if $self->players; 2291 return if $self->players;
2140 return if $self->in_memory != cf::MAP_IN_MEMORY;
2141 return if $self->{deny_save};
2142 2292
2293 # first deactivate the map and "unlink" it from the core
2294 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP;
2143 $self->in_memory (cf::MAP_SWAPPED); 2296 $self->in_memory (cf::MAP_SWAPPED);
2297
2298 # then atomically save
2299 $self->_save;
2300
2301 # then free the map
2302 $self->clear;
2303}
2304
2305sub reset_at {
2306 my ($self) = @_;
2307
2308 # TODO: safety, remove and allow resettable per-player maps
2309 return 1e99 if $self->{deny_reset};
2310
2311 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2312 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2313
2314 $time + $to
2315}
2316
2317sub should_reset {
2318 my ($self) = @_;
2319
2320 $self->reset_at <= $cf::RUNTIME
2321}
2322
2323sub reset {
2324 my ($self) = @_;
2325
2326 my $lock = cf::lock_acquire "map_data:$self->{path}";
2327
2328 return if $self->players;
2329
2330 cf::trace "resetting map ", $self->path, "\n";
2331
2332 $self->in_memory (cf::MAP_SWAPPED);
2333
2334 # need to save uniques path
2335 unless ($self->{deny_save}) {
2336 my $uniq = $self->uniq_path; utf8::encode $uniq;
2337
2338 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2339 if $uniq;
2340 }
2341
2342 delete $cf::MAP{$self->path};
2144 2343
2145 $self->deactivate; 2344 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP; 2345 $_->clear_links_to ($self) for values %cf::MAP;
2147 $self->clear; 2346 $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 2347
2193 $self->unlink_save; 2348 $self->unlink_save;
2194 $self->destroy; 2349 $self->destroy;
2195} 2350}
2196 2351
2204 2359
2205 delete $cf::MAP{$self->path}; 2360 delete $cf::MAP{$self->path};
2206 2361
2207 $self->unlink_save; 2362 $self->unlink_save;
2208 2363
2209 bless $self, "cf::map"; 2364 bless $self, "cf::map::wrap";
2210 delete $self->{deny_reset}; 2365 delete $self->{deny_reset};
2211 $self->{deny_save} = 1; 2366 $self->{deny_save} = 1;
2212 $self->reset_timeout (1); 2367 $self->reset_timeout (1);
2213 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2368 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2214 2369
2263 2418
2264sub unique_maps() { 2419sub unique_maps() {
2265 [ 2420 [
2266 map { 2421 map {
2267 utf8::decode $_; 2422 utf8::decode $_;
2268 /\.map$/ 2423 s/\.map$//; # TODO future compatibility hack
2424 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2425 ? ()
2269 ? normalise $_ 2426 : normalise $_
2270 : ()
2271 } @{ aio_readdir $UNIQUEDIR or [] } 2427 } @{ aio_readdir $UNIQUEDIR or [] }
2272 ] 2428 ]
2273} 2429}
2274 2430
2275package cf; 2431=item cf::map::static_maps
2432
2433Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2434file in the shared directory excluding F</styles> and F</editor>). May
2435block.
2436
2437=cut
2438
2439sub static_maps() {
2440 my @dirs = "";
2441 my @maps;
2442
2443 while (@dirs) {
2444 my $dir = shift @dirs;
2445
2446 next if $dir eq "/styles" || $dir eq "/editor";
2447
2448 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2449 or return;
2450
2451 for (@$files) {
2452 s/\.map$// or next;
2453 utf8::decode $_;
2454 push @maps, "$dir/$_";
2455 }
2456
2457 push @dirs, map "$dir/$_", @$dirs;
2458 }
2459
2460 \@maps
2461}
2276 2462
2277=back 2463=back
2278 2464
2279=head3 cf::object 2465=head3 cf::object
2280 2466
2284 2470
2285=over 4 2471=over 4
2286 2472
2287=item $ob->inv_recursive 2473=item $ob->inv_recursive
2288 2474
2289Returns the inventory of the object _and_ their inventories, recursively. 2475Returns the inventory of the object I<and> their inventories, recursively,
2476but I<not> the object itself.
2290 2477
2291=cut 2478=cut
2292 2479
2293sub inv_recursive_; 2480sub inv_recursive_;
2294sub inv_recursive_ { 2481sub inv_recursive_ {
2299 inv_recursive_ inv $_[0] 2486 inv_recursive_ inv $_[0]
2300} 2487}
2301 2488
2302=item $ref = $ob->ref 2489=item $ref = $ob->ref
2303 2490
2304creates and returns a persistent reference to an objetc that can be stored as a string. 2491Creates and returns a persistent reference to an object that can be stored as a string.
2305 2492
2306=item $ob = cf::object::deref ($refstring) 2493=item $ob = cf::object::deref ($refstring)
2307 2494
2308returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2495returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2309even if the object actually exists. May block. 2496even if the object actually exists. May block.
2341can be C<undef>. Does the right thing when the player is currently in a 2528can be C<undef>. Does the right thing when the player is currently in a
2342dialogue with the given NPC character. 2529dialogue with the given NPC character.
2343 2530
2344=cut 2531=cut
2345 2532
2533our $SAY_CHANNEL = {
2534 id => "say",
2535 title => "Map",
2536 reply => "say ",
2537 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2538};
2539
2540our $CHAT_CHANNEL = {
2541 id => "chat",
2542 title => "Chat",
2543 reply => "chat ",
2544 tooltip => "Player chat and shouts, global to the server.",
2545};
2546
2346# rough implementation of a future "reply" method that works 2547# rough implementation of a future "reply" method that works
2347# with dialog boxes. 2548# with dialog boxes.
2348#TODO: the first argument must go, split into a $npc->reply_to ( method 2549#TODO: the first argument must go, split into a $npc->reply_to ( method
2349sub cf::object::player::reply($$$;$) { 2550sub cf::object::player::reply($$$;$) {
2350 my ($self, $npc, $msg, $flags) = @_; 2551 my ($self, $npc, $msg, $flags) = @_;
2361 my $dialog = $pl->{npc_dialog}; 2562 my $dialog = $pl->{npc_dialog};
2362 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2563 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2363 2564
2364 } else { 2565 } else {
2365 $msg = $npc->name . " says: $msg" if $npc; 2566 $msg = $npc->name . " says: $msg" if $npc;
2366 $self->message ($msg, $flags); 2567 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2367 } 2568 }
2368 } 2569 }
2369} 2570}
2370 2571
2371=item $object->send_msg ($channel, $msg, $color, [extra...]) 2572=item $object->send_msg ($channel, $msg, $color, [extra...])
2396 2597
2397=item $player_object->enter_link 2598=item $player_object->enter_link
2398 2599
2399Freezes the player and moves him/her to a special map (C<{link}>). 2600Freezes the player and moves him/her to a special map (C<{link}>).
2400 2601
2401The player should be reasonably safe there for short amounts of time. You 2602The player should be reasonably safe there for short amounts of time (e.g.
2402I<MUST> call C<leave_link> as soon as possible, though. 2603for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2604though, as the player cannot control the character while it is on the link
2605map.
2403 2606
2404Will never block. 2607Will never block.
2405 2608
2406=item $player_object->leave_link ($map, $x, $y) 2609=item $player_object->leave_link ($map, $x, $y)
2407 2610
2427sub cf::object::player::enter_link { 2630sub cf::object::player::enter_link {
2428 my ($self) = @_; 2631 my ($self) = @_;
2429 2632
2430 $self->deactivate_recursive; 2633 $self->deactivate_recursive;
2431 2634
2635 ++$self->{_link_recursion};
2636
2432 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2637 return if UNIVERSAL::isa $self->map, "ext::map_link";
2433 2638
2434 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2639 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2435 if $self->map && $self->map->{path} ne "{link}"; 2640 if $self->map && $self->map->{path} ne "{link}";
2436 2641
2437 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2642 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2438} 2643}
2439 2644
2440sub cf::object::player::leave_link { 2645sub cf::object::player::leave_link {
2441 my ($self, $map, $x, $y) = @_; 2646 my ($self, $map, $x, $y) = @_;
2442 2647
2459 ($x, $y) = (-1, -1) 2664 ($x, $y) = (-1, -1)
2460 unless (defined $x) && (defined $y); 2665 unless (defined $x) && (defined $y);
2461 2666
2462 # use -1 or undef as default coordinates, not 0, 0 2667 # use -1 or undef as default coordinates, not 0, 0
2463 ($x, $y) = ($map->enter_x, $map->enter_y) 2668 ($x, $y) = ($map->enter_x, $map->enter_y)
2464 if $x <=0 && $y <= 0; 2669 if $x <= 0 && $y <= 0;
2465 2670
2466 $map->load; 2671 $map->load;
2467 $map->load_neighbours; 2672 $map->load_neighbours;
2468 2673
2469 return unless $self->contr->active; 2674 return unless $self->contr->active;
2470 $self->activate_recursive;
2471 2675
2472 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2676 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2473 $self->enter_map ($map, $x, $y); 2677 if ($self->enter_map ($map, $x, $y)) {
2474} 2678 # entering was successful
2679 delete $self->{_link_recursion};
2680 # only activate afterwards, to support waiting in hooks
2681 $self->activate_recursive;
2682 }
2475 2683
2684}
2685
2476=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2686=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2477 2687
2478Moves the player to the given map-path and coordinates by first freezing 2688Moves the player to the given map-path and coordinates by first freezing
2479her, loading and preparing them map, calling the provided $check callback 2689her, loading and preparing them map, calling the provided $check callback
2480that has to return the map if sucecssful, and then unfreezes the player on 2690that 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 2691the new (success) or old (failed) map position. In either case, $done will
2482be called at the end of this process. 2692be called at the end of this process.
2483 2693
2694Note that $check will be called with a potentially non-loaded map, so if
2695it needs a loaded map it has to call C<< ->load >>.
2696
2484=cut 2697=cut
2485 2698
2486our $GOTOGEN; 2699our $GOTOGEN;
2487 2700
2488sub cf::object::player::goto { 2701sub cf::object::player::goto {
2489 my ($self, $path, $x, $y, $check, $done) = @_; 2702 my ($self, $path, $x, $y, $check, $done) = @_;
2703
2704 if ($self->{_link_recursion} >= $MAX_LINKS) {
2705 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2706 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2707 ($path, $x, $y) = @$EMERGENCY_POSITION;
2708 }
2490 2709
2491 # do generation counting so two concurrent goto's will be executed in-order 2710 # do generation counting so two concurrent goto's will be executed in-order
2492 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2711 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2493 2712
2494 $self->enter_link; 2713 $self->enter_link;
2518 my $map = eval { 2737 my $map = eval {
2519 my $map = defined $path ? cf::map::find $path : undef; 2738 my $map = defined $path ? cf::map::find $path : undef;
2520 2739
2521 if ($map) { 2740 if ($map) {
2522 $map = $map->customise_for ($self); 2741 $map = $map->customise_for ($self);
2523 $map = $check->($map) if $check && $map; 2742 $map = $check->($map, $x, $y, $self) if $check && $map;
2524 } else { 2743 } else {
2525 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2744 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2526 } 2745 }
2527 2746
2528 $map 2747 $map
2536 if ($gen == $self->{_goto_generation}) { 2755 if ($gen == $self->{_goto_generation}) {
2537 delete $self->{_goto_generation}; 2756 delete $self->{_goto_generation};
2538 $self->leave_link ($map, $x, $y); 2757 $self->leave_link ($map, $x, $y);
2539 } 2758 }
2540 2759
2541 $done->() if $done; 2760 $done->($self) if $done;
2542 })->prio (1); 2761 })->prio (1);
2543} 2762}
2544 2763
2545=item $player_object->enter_exit ($exit_object) 2764=item $player_object->enter_exit ($exit_object)
2546 2765
2566} 2785}
2567 2786
2568sub prepare_random_map { 2787sub prepare_random_map {
2569 my ($exit) = @_; 2788 my ($exit) = @_;
2570 2789
2571 my $guard = cf::lock_acquire "exit_prepare:$exit";
2572
2573 # all this does is basically replace the /! path by 2790 # all this does is basically replace the /! path by
2574 # a new random map path (?random/...) with a seed 2791 # a new random map path (?random/...) with a seed
2575 # that depends on the exit object 2792 # that depends on the exit object
2576 2793
2577 my $rmp = parse_random_map_params $exit->msg; 2794 my $rmp = parse_random_map_params $exit->msg;
2579 if ($exit->map) { 2796 if ($exit->map) {
2580 $rmp->{region} = $exit->region->name; 2797 $rmp->{region} = $exit->region->name;
2581 $rmp->{origin_map} = $exit->map->path; 2798 $rmp->{origin_map} = $exit->map->path;
2582 $rmp->{origin_x} = $exit->x; 2799 $rmp->{origin_x} = $exit->x;
2583 $rmp->{origin_y} = $exit->y; 2800 $rmp->{origin_y} = $exit->y;
2801
2802 $exit->map->touch;
2584 } 2803 }
2585 2804
2586 $rmp->{random_seed} ||= $exit->random_seed; 2805 $rmp->{random_seed} ||= $exit->random_seed;
2587 2806
2588 my $data = cf::to_json $rmp; 2807 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2589 my $md5 = Digest::MD5::md5_hex $data; 2808 my $md5 = Digest::MD5::md5_hex $data;
2590 my $meta = "$RANDOMDIR/$md5.meta"; 2809 my $meta = "$RANDOMDIR/$md5.meta";
2591 2810
2592 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2811 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2593 aio_write $fh, 0, (length $data), $data, 0; 2812 aio_write $fh, 0, (length $data), $data, 0;
2594 undef $fh; 2813 undef $fh;
2595 aio_rename "$meta~", $meta; 2814 aio_rename "$meta~", $meta;
2596 2815
2816 my $slaying = "?random/$md5";
2817
2818 if ($exit->valid) {
2597 $exit->slaying ("?random/$md5"); 2819 $exit->slaying ("?random/$md5");
2598 $exit->msg (undef); 2820 $exit->msg (undef);
2821 }
2599 } 2822 }
2600} 2823}
2601 2824
2602sub cf::object::player::enter_exit { 2825sub cf::object::player::enter_exit {
2603 my ($self, $exit) = @_; 2826 my ($self, $exit) = @_;
2604 2827
2605 return unless $self->type == cf::PLAYER; 2828 return unless $self->type == cf::PLAYER;
2606 2829
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; 2830 $self->enter_link;
2619 2831
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 { 2832 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2833 $Coro::current->{desc} = "enter_exit";
2626 2834
2627 $self->deactivate_recursive; # just to be sure
2628 unless (eval { 2835 unless (eval {
2836 $self->deactivate_recursive; # just to be sure
2837
2838 # random map handling
2839 {
2840 my $guard = cf::lock_acquire "exit_prepare:$exit";
2841
2842 prepare_random_map $exit
2843 if $exit->slaying eq "/!";
2844 }
2845
2846 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2847 my $x = $exit->stats->hp;
2848 my $y = $exit->stats->sp;
2849
2629 $self->goto ($slaying, $hp, $sp); 2850 $self->goto ($map, $x, $y);
2630 2851
2852 # if exit is damned, update players death & WoR home-position
2853 $self->contr->savebed ($map, $x, $y)
2854 if $exit->flag (cf::FLAG_DAMNED);
2855
2631 1; 2856 1
2632 }) { 2857 }) {
2633 $self->message ("Something went wrong deep within the crossfire server. " 2858 $self->message ("Something went wrong deep within the deliantra server. "
2634 . "I'll try to bring you back to the map you were before. " 2859 . "I'll try to bring you back to the map you were before. "
2635 . "Please report this to the dungeon master!", 2860 . "Please report this to the dungeon master!",
2636 cf::NDI_UNIQUE | cf::NDI_RED); 2861 cf::NDI_UNIQUE | cf::NDI_RED);
2637 2862
2638 warn "ERROR in enter_exit: $@"; 2863 error "ERROR in enter_exit: $@";
2639 $self->leave_link; 2864 $self->leave_link;
2640 } 2865 }
2641 })->prio (1); 2866 })->prio (1);
2642} 2867}
2643 2868
2655sub cf::client::send_drawinfo { 2880sub cf::client::send_drawinfo {
2656 my ($self, $text, $flags) = @_; 2881 my ($self, $text, $flags) = @_;
2657 2882
2658 utf8::encode $text; 2883 utf8::encode $text;
2659 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2884 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2885}
2886
2887=item $client->send_big_packet ($pkt)
2888
2889Like C<send_packet>, but tries to compress large packets, and fragments
2890them as required.
2891
2892=cut
2893
2894our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2895
2896sub cf::client::send_big_packet {
2897 my ($self, $pkt) = @_;
2898
2899 # try lzf for large packets
2900 $pkt = "lzf " . Compress::LZF::compress $pkt
2901 if 1024 <= length $pkt and $self->{can_lzf};
2902
2903 # split very large packets
2904 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2905 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2906 $pkt = "frag";
2907 }
2908
2909 $self->send_packet ($pkt);
2660} 2910}
2661 2911
2662=item $client->send_msg ($channel, $msg, $color, [extra...]) 2912=item $client->send_msg ($channel, $msg, $color, [extra...])
2663 2913
2664Send a drawinfo or msg packet to the client, formatting the msg for the 2914Send 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 2916the message, with C<log> being the default. If C<$color> is negative, suppress
2667the message unless the client supports the msg packet. 2917the message unless the client supports the msg packet.
2668 2918
2669=cut 2919=cut
2670 2920
2921# non-persistent channels (usually the info channel)
2671our %CHANNEL = ( 2922our %CHANNEL = (
2923 "c/motd" => {
2924 id => "infobox",
2925 title => "MOTD",
2926 reply => undef,
2927 tooltip => "The message of the day",
2928 },
2672 "c/identify" => { 2929 "c/identify" => {
2673 id => "infobox", 2930 id => "infobox",
2674 title => "Identify", 2931 title => "Identify",
2675 reply => undef, 2932 reply => undef,
2676 tooltip => "Items recently identified", 2933 tooltip => "Items recently identified",
2678 "c/examine" => { 2935 "c/examine" => {
2679 id => "infobox", 2936 id => "infobox",
2680 title => "Examine", 2937 title => "Examine",
2681 reply => undef, 2938 reply => undef,
2682 tooltip => "Signs and other items you examined", 2939 tooltip => "Signs and other items you examined",
2940 },
2941 "c/shopinfo" => {
2942 id => "infobox",
2943 title => "Shop Info",
2944 reply => undef,
2945 tooltip => "What your bargaining skill tells you about the shop",
2683 }, 2946 },
2684 "c/book" => { 2947 "c/book" => {
2685 id => "infobox", 2948 id => "infobox",
2686 title => "Book", 2949 title => "Book",
2687 reply => undef, 2950 reply => undef,
2691 id => "infobox", 2954 id => "infobox",
2692 title => "Look", 2955 title => "Look",
2693 reply => undef, 2956 reply => undef,
2694 tooltip => "What you saw there", 2957 tooltip => "What you saw there",
2695 }, 2958 },
2959 "c/who" => {
2960 id => "infobox",
2961 title => "Players",
2962 reply => undef,
2963 tooltip => "Shows players who are currently online",
2964 },
2965 "c/body" => {
2966 id => "infobox",
2967 title => "Body Parts",
2968 reply => undef,
2969 tooltip => "Shows which body parts you posess and are available",
2970 },
2971 "c/statistics" => {
2972 id => "infobox",
2973 title => "Statistics",
2974 reply => undef,
2975 tooltip => "Shows your primary statistics",
2976 },
2977 "c/skills" => {
2978 id => "infobox",
2979 title => "Skills",
2980 reply => undef,
2981 tooltip => "Shows your experience per skill and item power",
2982 },
2983 "c/shopitems" => {
2984 id => "infobox",
2985 title => "Shop Items",
2986 reply => undef,
2987 tooltip => "Shows the items currently for sale in this shop",
2988 },
2989 "c/resistances" => {
2990 id => "infobox",
2991 title => "Resistances",
2992 reply => undef,
2993 tooltip => "Shows your resistances",
2994 },
2995 "c/pets" => {
2996 id => "infobox",
2997 title => "Pets",
2998 reply => undef,
2999 tooltip => "Shows information abotu your pets/a specific pet",
3000 },
3001 "c/perceiveself" => {
3002 id => "infobox",
3003 title => "Perceive Self",
3004 reply => undef,
3005 tooltip => "You gained detailed knowledge about yourself",
3006 },
3007 "c/uptime" => {
3008 id => "infobox",
3009 title => "Uptime",
3010 reply => undef,
3011 tooltip => "How long the server has been running since last restart",
3012 },
3013 "c/mapinfo" => {
3014 id => "infobox",
3015 title => "Map Info",
3016 reply => undef,
3017 tooltip => "Information related to the maps",
3018 },
3019 "c/party" => {
3020 id => "party",
3021 title => "Party",
3022 reply => "gsay ",
3023 tooltip => "Messages and chat related to your party",
3024 },
3025 "c/death" => {
3026 id => "death",
3027 title => "Death",
3028 reply => undef,
3029 tooltip => "Reason for and more info about your most recent death",
3030 },
3031 "c/say" => $SAY_CHANNEL,
3032 "c/chat" => $CHAT_CHANNEL,
2696); 3033);
2697 3034
2698sub cf::client::send_msg { 3035sub cf::client::send_msg {
2699 my ($self, $channel, $msg, $color, @extra) = @_; 3036 my ($self, $channel, $msg, $color, @extra) = @_;
2700 3037
2701 $msg = $self->pl->expand_cfpod ($msg); 3038 $msg = $self->pl->expand_cfpod ($msg)
3039 unless $color & cf::NDI_VERBATIM;
2702 3040
2703 $color &= cf::NDI_CLIENT_MASK; # just in case... 3041 $color &= cf::NDI_CLIENT_MASK; # just in case...
2704 3042
2705 # check predefined channels, for the benefit of C 3043 # check predefined channels, for the benefit of C
2706 if ($CHANNEL{$channel}) { 3044 if ($CHANNEL{$channel}) {
2707 $channel = $CHANNEL{$channel}; 3045 $channel = $CHANNEL{$channel};
2708 3046
2709 $self->ext_msg (channel_info => $channel) 3047 $self->ext_msg (channel_info => $channel);
2710 if $self->can_msg;
2711
2712 $channel = $channel->{id}; 3048 $channel = $channel->{id};
2713 3049
2714 } elsif (ref $channel) { 3050 } elsif (ref $channel) {
2715 # send meta info to client, if not yet sent 3051 # send meta info to client, if not yet sent
2716 unless (exists $self->{channel}{$channel->{id}}) { 3052 unless (exists $self->{channel}{$channel->{id}}) {
2717 $self->{channel}{$channel->{id}} = $channel; 3053 $self->{channel}{$channel->{id}} = $channel;
2718 $self->ext_msg (channel_info => $channel) 3054 $self->ext_msg (channel_info => $channel);
2719 if $self->can_msg;
2720 } 3055 }
2721 3056
2722 $channel = $channel->{id}; 3057 $channel = $channel->{id};
2723 } 3058 }
2724 3059
2725 return unless @extra || length $msg; 3060 return unless @extra || length $msg;
2726 3061
2727 if ($self->can_msg) {
2728 # default colour, mask it out 3062 # default colour, mask it out
2729 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3063 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2730 if $color & cf::NDI_DEF; 3064 if $color & cf::NDI_DEF;
2731 3065
2732 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3066 my $pkt = "msg "
3067 . $self->{json_coder}->encode (
2733 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3068 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2734 } else { 3069 );
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 3070
2746 $color &= cf::NDI_COLOR_MASK; 3071 $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} 3072}
2760 3073
2761=item $client->ext_msg ($type, @msg) 3074=item $client->ext_msg ($type, @msg)
2762 3075
2763Sends an ext event to the client. 3076Sends an ext event to the client.
2766 3079
2767sub cf::client::ext_msg($$@) { 3080sub cf::client::ext_msg($$@) {
2768 my ($self, $type, @msg) = @_; 3081 my ($self, $type, @msg) = @_;
2769 3082
2770 if ($self->extcmd == 2) { 3083 if ($self->extcmd == 2) {
2771 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3084 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2772 } elsif ($self->extcmd == 1) { # TODO: remove 3085 } elsif ($self->extcmd == 1) { # TODO: remove
2773 push @msg, msgtype => "event_$type"; 3086 push @msg, msgtype => "event_$type";
2774 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3087 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2775 } 3088 }
2776} 3089}
2777 3090
2778=item $client->ext_reply ($msgid, @msg) 3091=item $client->ext_reply ($msgid, @msg)
2779 3092
2783 3096
2784sub cf::client::ext_reply($$@) { 3097sub cf::client::ext_reply($$@) {
2785 my ($self, $id, @msg) = @_; 3098 my ($self, $id, @msg) = @_;
2786 3099
2787 if ($self->extcmd == 2) { 3100 if ($self->extcmd == 2) {
2788 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2789 } elsif ($self->extcmd == 1) { 3102 } elsif ($self->extcmd == 1) {
2790 #TODO: version 1, remove 3103 #TODO: version 1, remove
2791 unshift @msg, msgtype => "reply", msgid => $id; 3104 unshift @msg, msgtype => "reply", msgid => $id;
2792 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3105 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2793 } 3106 }
2794} 3107}
2795 3108
2796=item $success = $client->query ($flags, "text", \&cb) 3109=item $success = $client->query ($flags, "text", \&cb)
2797 3110
2868 3181
2869 $ns->ext_reply ($reply, @reply) 3182 $ns->ext_reply ($reply, @reply)
2870 if $reply; 3183 if $reply;
2871 3184
2872 } else { 3185 } else {
2873 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3186 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2874 } 3187 }
2875 3188
2876 cf::override; 3189 cf::override;
2877 }, 3190 },
2878); 3191);
2898 3211
2899 $coro 3212 $coro
2900} 3213}
2901 3214
2902cf::client->attach ( 3215cf::client->attach (
2903 on_destroy => sub { 3216 on_client_destroy => sub {
2904 my ($ns) = @_; 3217 my ($ns) = @_;
2905 3218
2906 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3219 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2907 }, 3220 },
2908); 3221);
2924our $safe_hole = new Safe::Hole; 3237our $safe_hole = new Safe::Hole;
2925 3238
2926$SIG{FPE} = 'IGNORE'; 3239$SIG{FPE} = 'IGNORE';
2927 3240
2928$safe->permit_only (Opcode::opset qw( 3241$safe->permit_only (Opcode::opset qw(
2929 :base_core :base_mem :base_orig :base_math 3242 :base_core :base_mem :base_orig :base_math :base_loop
2930 grepstart grepwhile mapstart mapwhile 3243 grepstart grepwhile mapstart mapwhile
2931 sort time 3244 sort time
2932)); 3245));
2933 3246
2934# here we export the classes and methods available to script code 3247# here we export the classes and methods available to script code
2937 3250
2938The following functions and methods are available within a safe environment: 3251The following functions and methods are available within a safe environment:
2939 3252
2940 cf::object 3253 cf::object
2941 contr pay_amount pay_player map x y force_find force_add destroy 3254 contr pay_amount pay_player map x y force_find force_add destroy
2942 insert remove name archname title slaying race decrease_ob_nr 3255 insert remove name archname title slaying race decrease split
3256 value
2943 3257
2944 cf::object::player 3258 cf::object::player
2945 player 3259 player
2946 3260
2947 cf::player 3261 cf::player
2952 3266
2953=cut 3267=cut
2954 3268
2955for ( 3269for (
2956 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3270 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2957 insert remove inv name archname title slaying race 3271 insert remove inv nrof name archname title slaying race
2958 decrease_ob_nr destroy)], 3272 decrease split destroy change_exp value msg lore send_msg)],
2959 ["cf::object::player" => qw(player)], 3273 ["cf::object::player" => qw(player)],
2960 ["cf::player" => qw(peaceful)], 3274 ["cf::player" => qw(peaceful send_msg)],
2961 ["cf::map" => qw(trigger)], 3275 ["cf::map" => qw(trigger)],
2962) { 3276) {
2963 no strict 'refs';
2964 my ($pkg, @funs) = @$_; 3277 my ($pkg, @funs) = @$_;
2965 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3278 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2966 for @funs; 3279 for @funs;
2967} 3280}
2968 3281
2983 3296
2984 my $qcode = $code; 3297 my $qcode = $code;
2985 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3298 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2986 $qcode =~ s/\n/\\n/g; 3299 $qcode =~ s/\n/\\n/g;
2987 3300
3301 %vars = (_dummy => 0) unless %vars;
3302
3303 my @res;
2988 local $_; 3304 local $_;
2989 local @safe::cf::_safe_eval_args = values %vars;
2990 3305
2991 my $eval = 3306 my $eval =
2992 "do {\n" 3307 "do {\n"
2993 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3308 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2994 . "#line 0 \"{$qcode}\"\n" 3309 . "#line 0 \"{$qcode}\"\n"
2995 . $code 3310 . $code
2996 . "\n}" 3311 . "\n}"
2997 ; 3312 ;
2998 3313
3314 if ($CFG{safe_eval}) {
2999 sub_generation_inc; 3315 sub_generation_inc;
3316 local @safe::cf::_safe_eval_args = values %vars;
3000 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3317 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3001 sub_generation_inc; 3318 sub_generation_inc;
3319 } else {
3320 local @cf::_safe_eval_args = values %vars;
3321 @res = wantarray ? eval eval : scalar eval $eval;
3322 }
3002 3323
3003 if ($@) { 3324 if ($@) {
3004 warn "$@"; 3325 warn "$@",
3005 warn "while executing safe code '$code'\n"; 3326 "while executing safe code '$code'\n",
3006 warn "with arguments " . (join " ", %vars) . "\n"; 3327 "with arguments " . (join " ", %vars) . "\n";
3007 } 3328 }
3008 3329
3009 wantarray ? @res : $res[0] 3330 wantarray ? @res : $res[0]
3010} 3331}
3011 3332
3025=cut 3346=cut
3026 3347
3027sub register_script_function { 3348sub register_script_function {
3028 my ($fun, $cb) = @_; 3349 my ($fun, $cb) = @_;
3029 3350
3030 no strict 'refs'; 3351 $fun = "safe::$fun" if $CFG{safe_eval};
3031 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3352 *$fun = $safe_hole->wrap ($cb);
3032} 3353}
3033 3354
3034=back 3355=back
3035 3356
3036=cut 3357=cut
3037 3358
3038############################################################################# 3359#############################################################################
3039# the server's init and main functions 3360# the server's init and main functions
3361
3362# async inc loader. yay.
3363sub inc_loader {
3364 my $mod = $_[1];
3365
3366 if (in_main && !tick_inhibit) {
3367 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3368 } else {
3369 debug "loading perl module $mod\n";
3370 }
3371
3372 # 1. find real file
3373 for my $dir (@ORIG_INC) {
3374 ref $dir and next;
3375 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3376 or next;
3377
3378 $data = "#line 1 $dir/$mod\n$data";
3379
3380 open my $fh, "<", \$data or die;
3381
3382 return $fh;
3383 }
3384
3385 ()
3386}
3387
3388sub init_inc {
3389 # save original @INC
3390 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3391
3392 # make sure we can do scalar-opens
3393 open my $dummy, "<", \my $dummy2;
3394
3395 # execute some stuff so perl load's some of the core modules
3396 /Ü/ =~ /ü/i;
3397 eval { &Storable::nstore_fd };
3398
3399 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3400
3401 debug "module loading will be asynchronous from this point on.";
3402}
3040 3403
3041sub load_facedata($) { 3404sub load_facedata($) {
3042 my ($path) = @_; 3405 my ($path) = @_;
3043 3406
3044 # HACK to clear player env face cache, we need some signal framework 3407 # HACK to clear player env face cache, we need some signal framework
3045 # for this (global event?) 3408 # for this (global event?)
3046 %ext::player_env::MUSIC_FACE_CACHE = (); 3409 %ext::player_env::MUSIC_FACE_CACHE = ();
3047 3410
3048 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3411 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3049 3412
3050 warn "loading facedata from $path\n"; 3413 trace "loading facedata from $path\n";
3051 3414
3052 my $facedata; 3415 my $facedata;
3053 0 < aio_load $path, $facedata 3416 0 < aio_load $path, $facedata
3054 or die "$path: $!"; 3417 or die "$path: $!";
3055 3418
3057 3420
3058 $facedata->{version} == 2 3421 $facedata->{version} == 2
3059 or cf::cleanup "$path: version mismatch, cannot proceed."; 3422 or cf::cleanup "$path: version mismatch, cannot proceed.";
3060 3423
3061 # patch in the exptable 3424 # patch in the exptable
3425 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3062 $facedata->{resource}{"res/exp_table"} = { 3426 $facedata->{resource}{"res/exp_table"} = {
3063 type => FT_RSRC, 3427 type => FT_RSRC,
3064 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3428 data => $exp_table,
3429 hash => (Digest::MD5::md5 $exp_table),
3065 }; 3430 };
3066 cf::cede_to_tick; 3431 cf::cede_to_tick;
3067 3432
3068 { 3433 {
3069 my $faces = $facedata->{faceinfo}; 3434 my $faces = $facedata->{faceinfo};
3070 3435
3071 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
3072 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3437 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3438
3073 cf::face::set_visibility $idx, $info->{visibility}; 3439 cf::face::set_visibility $idx, $info->{visibility};
3074 cf::face::set_magicmap $idx, $info->{magicmap}; 3440 cf::face::set_magicmap $idx, $info->{magicmap};
3075 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3441 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3076 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3442 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3077 3443
3078 cf::cede_to_tick; 3444 cf::cede_to_tick;
3079 } 3445 }
3080 3446
3081 while (my ($face, $info) = each %$faces) { 3447 while (my ($face, $info) = each %$faces) {
3082 next unless $info->{smooth}; 3448 next unless $info->{smooth};
3449
3083 my $idx = cf::face::find $face 3450 my $idx = cf::face::find $face
3084 or next; 3451 or next;
3452
3085 if (my $smooth = cf::face::find $info->{smooth}) { 3453 if (my $smooth = cf::face::find $info->{smooth}) {
3086 cf::face::set_smooth $idx, $smooth; 3454 cf::face::set_smooth $idx, $smooth;
3087 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3455 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3088 } else { 3456 } else {
3089 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3457 error "smooth face '$info->{smooth}' not found for face '$face'";
3090 } 3458 }
3091 3459
3092 cf::cede_to_tick; 3460 cf::cede_to_tick;
3093 } 3461 }
3094 } 3462 }
3103 3471
3104 cf::anim::invalidate_all; # d'oh 3472 cf::anim::invalidate_all; # d'oh
3105 } 3473 }
3106 3474
3107 { 3475 {
3108 # TODO: for gcfclient pleasure, we should give resources
3109 # that gcfclient doesn't grok a >10000 face index.
3110 my $res = $facedata->{resource}; 3476 my $res = $facedata->{resource};
3111 3477
3112 my $soundconf = delete $res->{"res/sound.conf"};
3113
3114 while (my ($name, $info) = each %$res) { 3478 while (my ($name, $info) = each %$res) {
3479 if (defined $info->{type}) {
3115 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3480 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3116 my $data;
3117 3481
3118 if ($info->{type} & 1) { 3482 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3119 # prepend meta info 3483 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 { 3484 } else {
3128 $data = $info->{data}; 3485 $RESOURCE{$name} = $info; # unused
3129 } 3486 }
3130 3487
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; 3488 cf::cede_to_tick;
3135 } 3489 }
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 } 3490 }
3491
3492 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3155 3493
3156 1 3494 1
3157} 3495}
3158 3496
3159register_exticmd fx_want => sub { 3497register_exticmd fx_want => sub {
3161 3499
3162 while (my ($k, $v) = each %$want) { 3500 while (my ($k, $v) = each %$want) {
3163 $ns->fx_want ($k, $v); 3501 $ns->fx_want ($k, $v);
3164 } 3502 }
3165}; 3503};
3504
3505sub load_resource_file($) {
3506 my $guard = lock_acquire "load_resource_file";
3507
3508 my $status = load_resource_file_ $_[0];
3509 get_slot 0.1, 100;
3510 cf::arch::commit_load;
3511
3512 $status
3513}
3166 3514
3167sub reload_regions { 3515sub reload_regions {
3168 # HACK to clear player env face cache, we need some signal framework 3516 # HACK to clear player env face cache, we need some signal framework
3169 # for this (global event?) 3517 # for this (global event?)
3170 %ext::player_env::MUSIC_FACE_CACHE = (); 3518 %ext::player_env::MUSIC_FACE_CACHE = ();
3184} 3532}
3185 3533
3186sub reload_archetypes { 3534sub reload_archetypes {
3187 load_resource_file "$DATADIR/archetypes" 3535 load_resource_file "$DATADIR/archetypes"
3188 or die "unable to load archetypes\n"; 3536 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} 3537}
3195 3538
3196sub reload_treasures { 3539sub reload_treasures {
3197 load_resource_file "$DATADIR/treasures" 3540 load_resource_file "$DATADIR/treasures"
3198 or die "unable to load treasurelists\n"; 3541 or die "unable to load treasurelists\n";
3199} 3542}
3200 3543
3544sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n";
3546
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3551
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_]
3554 or next;
3555
3556 my $face = cf::face::find "sound/$sound->[1]";
3557 cf::sound::set $sound->[0] => $face;
3558 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3559 }
3560
3561 while (my ($k, $v) = each %{$soundconf->{event}}) {
3562 my $face = cf::face::find "sound/$v";
3563 cf::sound::set $k => $face;
3564 }
3565}
3566
3201sub reload_resources { 3567sub reload_resources {
3202 warn "reloading resource files...\n"; 3568 trace "reloading resource files...\n";
3203 3569
3570 reload_facedata;
3571 reload_sound;
3572 reload_archetypes;
3204 reload_regions; 3573 reload_regions;
3205 reload_facedata;
3206 #reload_archetypes;#d#
3207 reload_archetypes;
3208 reload_treasures; 3574 reload_treasures;
3209 3575
3210 warn "finished reloading resource files\n"; 3576 trace "finished reloading resource files\n";
3211}
3212
3213sub init {
3214 reload_resources;
3215} 3577}
3216 3578
3217sub reload_config { 3579sub reload_config {
3580 trace "reloading config file...\n";
3581
3218 open my $fh, "<:utf8", "$CONFDIR/config" 3582 open my $fh, "<:utf8", "$CONFDIR/config"
3219 or return; 3583 or return;
3220 3584
3221 local $/; 3585 local $/;
3222 *CFG = YAML::Syck::Load <$fh>; 3586 *CFG = YAML::XS::Load scalar <$fh>;
3223 3587
3224 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3588 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3225 3589
3226 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3590 $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}; 3591 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3228 3592
3229 if (exists $CFG{mlockall}) { 3593 if (exists $CFG{mlockall}) {
3231 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3595 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3232 and die "WARNING: m(un)lockall failed: $!\n"; 3596 and die "WARNING: m(un)lockall failed: $!\n";
3233 }; 3597 };
3234 warn $@ if $@; 3598 warn $@ if $@;
3235 } 3599 }
3600
3601 trace "finished reloading resource files\n";
3602}
3603
3604sub pidfile() {
3605 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3606 or die "$PIDFILE: $!";
3607 flock $fh, &Fcntl::LOCK_EX
3608 or die "$PIDFILE: flock: $!";
3609 $fh
3610}
3611
3612# make sure only one server instance is running at any one time
3613sub atomic {
3614 my $fh = pidfile;
3615
3616 my $pid = <$fh>;
3617 kill 9, $pid if $pid > 0;
3618
3619 seek $fh, 0, 0;
3620 print $fh $$;
3621}
3622
3623sub main_loop {
3624 trace "EV::loop starting\n";
3625 if (1) {
3626 EV::loop;
3627 }
3628 trace "EV::loop returned\n";
3629 goto &main_loop unless $REALLY_UNLOOP;
3236} 3630}
3237 3631
3238sub main { 3632sub main {
3633 cf::init_globals; # initialise logging
3634
3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3636 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3638 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3639
3640 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3641
3239 # we must not ever block the main coroutine 3642 # we must not ever block the main coroutine
3240 local $Coro::idle = sub { 3643 local $Coro::idle = sub {
3241 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3644 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3242 (async { 3645 (async {
3243 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3646 $Coro::current->{desc} = "IDLE BUG HANDLER";
3244 Event::one_event; 3647 EV::loop EV::LOOP_ONESHOT;
3245 })->prio (Coro::PRIO_MAX); 3648 })->prio (Coro::PRIO_MAX);
3246 }; 3649 };
3247 3650
3651 evthread_start IO::AIO::poll_fileno;
3652
3653 cf::sync_job {
3654 init_inc;
3655
3656 cf::init_experience;
3657 cf::init_anim;
3658 cf::init_attackmess;
3659 cf::init_dynamic;
3660
3661 cf::load_settings;
3662 cf::load_materials;
3663
3664 reload_resources;
3248 reload_config; 3665 reload_config;
3249 db_init; 3666 db_init;
3667
3668 cf::init_uuid;
3669 cf::init_signals;
3670 cf::init_skills;
3671
3672 cf::init_beforeplay;
3673
3674 atomic;
3675
3250 load_extensions; 3676 load_extensions;
3251 3677
3252 $TICK_WATCHER->start; 3678 utime time, time, $RUNTIMEFILE;
3253 Event::loop; 3679
3680 # no (long-running) fork's whatsoever before this point(!)
3681 use POSIX ();
3682 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3683
3684 (pop @POST_INIT)->(0) while @POST_INIT;
3685 };
3686
3687 cf::object::thawer::errors_are_fatal 0;
3688 info "parse errors in files are no longer fatal from this point on.\n";
3689
3690 my $free_main; $free_main = EV::idle sub {
3691 undef $free_main;
3692 undef &main; # free gobs of memory :)
3693 };
3694
3695 goto &main_loop;
3254} 3696}
3255 3697
3256############################################################################# 3698#############################################################################
3257# initialisation and cleanup 3699# initialisation and cleanup
3258 3700
3259# install some emergency cleanup handlers 3701# install some emergency cleanup handlers
3260BEGIN { 3702BEGIN {
3703 our %SIGWATCHER = ();
3261 for my $signal (qw(INT HUP TERM)) { 3704 for my $signal (qw(INT HUP TERM)) {
3262 Event->signal ( 3705 $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"; 3706 cf::cleanup "SIG$signal";
3269 },
3270 ); 3707 };
3271 } 3708 }
3272} 3709}
3273 3710
3274sub write_runtime { 3711sub write_runtime_sync {
3275 my $runtime = "$LOCALDIR/runtime"; 3712 my $t0 = AE::time;
3276 3713
3277 # first touch the runtime file to show we are still running: 3714 # first touch the runtime file to show we are still running:
3278 # the fsync below can take a very very long time. 3715 # the fsync below can take a very very long time.
3279 3716
3280 IO::AIO::aio_utime $runtime, undef, undef; 3717 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3281 3718
3282 my $guard = cf::lock_acquire "write_runtime"; 3719 my $guard = cf::lock_acquire "write_runtime";
3283 3720
3284 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3721 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3285 or return; 3722 or return;
3286 3723
3287 my $value = $cf::RUNTIME + 90 + 10; 3724 my $value = $cf::RUNTIME + 90 + 10;
3288 # 10 is the runtime save interval, for a monotonic clock 3725 # 10 is the runtime save interval, for a monotonic clock
3289 # 60 allows for the watchdog to kill the server. 3726 # 60 allows for the watchdog to kill the server.
3299 aio_utime $fh, undef, undef; 3736 aio_utime $fh, undef, undef;
3300 3737
3301 close $fh 3738 close $fh
3302 or return; 3739 or return;
3303 3740
3304 aio_rename "$runtime~", $runtime 3741 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3305 and return; 3742 and return;
3306 3743
3307 warn "runtime file written.\n"; 3744 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3308 3745
3309 1 3746 1
3747}
3748
3749our $uuid_lock;
3750our $uuid_skip;
3751
3752sub write_uuid_sync($) {
3753 $uuid_skip ||= $_[0];
3754
3755 return if $uuid_lock;
3756 local $uuid_lock = 1;
3757
3758 my $uuid = "$LOCALDIR/uuid";
3759
3760 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3761 or return;
3762
3763 my $value = uuid_seq uuid_cur;
3764
3765 unless ($value) {
3766 info "cowardly refusing to write zero uuid value!\n";
3767 return;
3768 }
3769
3770 my $value = uuid_str $value + $uuid_skip;
3771 $uuid_skip = 0;
3772
3773 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3774 and return;
3775
3776 # always fsync - this file is important
3777 aio_fsync $fh
3778 and return;
3779
3780 close $fh
3781 or return;
3782
3783 aio_rename "$uuid~", $uuid
3784 and return;
3785
3786 trace "uuid file written ($value).\n";
3787
3788 1
3789
3790}
3791
3792sub write_uuid($$) {
3793 my ($skip, $sync) = @_;
3794
3795 $sync ? write_uuid_sync $skip
3796 : async { write_uuid_sync $skip };
3310} 3797}
3311 3798
3312sub emergency_save() { 3799sub emergency_save() {
3313 my $freeze_guard = cf::freeze_mainloop; 3800 my $freeze_guard = cf::freeze_mainloop;
3314 3801
3315 warn "enter emergency perl save\n"; 3802 info "emergency_perl_save: enter\n";
3803
3804 # this is a trade-off: we want to be very quick here, so
3805 # save all maps without fsync, and later call a global sync
3806 # (which in turn might be very very slow)
3807 local $USE_FSYNC = 0;
3316 3808
3317 cf::sync_job { 3809 cf::sync_job {
3810 cf::write_runtime_sync; # external watchdog should not bark
3811
3318 # use a peculiar iteration method to avoid tripping on perl 3812 # use a peculiar iteration method to avoid tripping on perl
3319 # refcount bugs in for. also avoids problems with players 3813 # refcount bugs in for. also avoids problems with players
3320 # and maps saved/destroyed asynchronously. 3814 # and maps saved/destroyed asynchronously.
3321 warn "begin emergency player save\n"; 3815 info "emergency_perl_save: begin player save\n";
3322 for my $login (keys %cf::PLAYER) { 3816 for my $login (keys %cf::PLAYER) {
3323 my $pl = $cf::PLAYER{$login} or next; 3817 my $pl = $cf::PLAYER{$login} or next;
3324 $pl->valid or next; 3818 $pl->valid or next;
3325 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3819 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3326 $pl->save; 3820 $pl->save;
3327 } 3821 }
3328 warn "end emergency player save\n"; 3822 info "emergency_perl_save: end player save\n";
3329 3823
3330 warn "begin emergency map save\n"; 3824 cf::write_runtime_sync; # external watchdog should not bark
3825
3826 info "emergency_perl_save: begin map save\n";
3331 for my $path (keys %cf::MAP) { 3827 for my $path (keys %cf::MAP) {
3332 my $map = $cf::MAP{$path} or next; 3828 my $map = $cf::MAP{$path} or next;
3333 $map->valid or next; 3829 $map->valid or next;
3334 $map->save; 3830 $map->save;
3335 } 3831 }
3336 warn "end emergency map save\n"; 3832 info "emergency_perl_save: end map save\n";
3337 3833
3338 warn "begin emergency database checkpoint\n"; 3834 cf::write_runtime_sync; # external watchdog should not bark
3835
3836 info "emergency_perl_save: begin database checkpoint\n";
3339 BDB::db_env_txn_checkpoint $DB_ENV; 3837 BDB::db_env_txn_checkpoint $DB_ENV;
3340 warn "end emergency database checkpoint\n"; 3838 info "emergency_perl_save: end database checkpoint\n";
3839
3840 info "emergency_perl_save: begin write uuid\n";
3841 write_uuid_sync 1;
3842 info "emergency_perl_save: end write uuid\n";
3843
3844 cf::write_runtime_sync; # external watchdog should not bark
3845
3846 trace "emergency_perl_save: syncing database to disk";
3847 BDB::db_env_txn_checkpoint $DB_ENV;
3848
3849 info "emergency_perl_save: starting sync\n";
3850 IO::AIO::aio_sync sub {
3851 info "emergency_perl_save: finished sync\n";
3852 };
3853
3854 cf::write_runtime_sync; # external watchdog should not bark
3855
3856 trace "emergency_perl_save: flushing outstanding aio requests";
3857 while (IO::AIO::nreqs || BDB::nreqs) {
3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3859 }
3860
3861 cf::write_runtime_sync; # external watchdog should not bark
3341 }; 3862 };
3342 3863
3343 warn "leave emergency perl save\n"; 3864 info "emergency_perl_save: leave\n";
3344} 3865}
3345 3866
3346sub post_cleanup { 3867sub post_cleanup {
3347 my ($make_core) = @_; 3868 my ($make_core) = @_;
3348 3869
3870 IO::AIO::flush;
3871
3349 warn Carp::longmess "post_cleanup backtrace" 3872 error Carp::longmess "post_cleanup backtrace"
3350 if $make_core; 3873 if $make_core;
3874
3875 my $fh = pidfile;
3876 unlink $PIDFILE if <$fh> == $$;
3877}
3878
3879# a safer delete_package, copied from Symbol
3880sub clear_package($) {
3881 my $pkg = shift;
3882
3883 # expand to full symbol table name if needed
3884 unless ($pkg =~ /^main::.*::$/) {
3885 $pkg = "main$pkg" if $pkg =~ /^::/;
3886 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3887 $pkg .= '::' unless $pkg =~ /::$/;
3888 }
3889
3890 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3891 my $stem_symtab = *{$stem}{HASH};
3892
3893 defined $stem_symtab and exists $stem_symtab->{$leaf}
3894 or return;
3895
3896 # clear all symbols
3897 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3898 for my $name (keys %$leaf_symtab) {
3899 _gv_clear *{"$pkg$name"};
3900# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3901 }
3351} 3902}
3352 3903
3353sub do_reload_perl() { 3904sub do_reload_perl() {
3354 # can/must only be called in main 3905 # can/must only be called in main
3355 if ($Coro::current != $Coro::main) { 3906 if (in_main) {
3356 warn "can only reload from main coroutine"; 3907 error "can only reload from main coroutine";
3357 return; 3908 return;
3358 } 3909 }
3359 3910
3911 return if $RELOAD++;
3912
3913 my $t1 = AE::time;
3914
3915 while ($RELOAD) {
3360 warn "reloading..."; 3916 info "reloading...";
3361 3917
3362 warn "entering sync_job"; 3918 trace "entering sync_job";
3363 3919
3364 cf::sync_job { 3920 cf::sync_job {
3365 cf::write_runtime; # external watchdog should not bark
3366 cf::emergency_save; 3921 cf::emergency_save;
3367 cf::write_runtime; # external watchdog should not bark
3368 3922
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"; 3923 trace "cancelling all extension coros";
3391 $_->cancel for values %EXT_CORO; 3924 $_->cancel for values %EXT_CORO;
3392 %EXT_CORO = (); 3925 %EXT_CORO = ();
3393 3926
3394 warn "removing commands"; 3927 trace "removing commands";
3395 %COMMAND = (); 3928 %COMMAND = ();
3396 3929
3397 warn "removing ext/exti commands"; 3930 trace "removing ext/exti commands";
3398 %EXTCMD = (); 3931 %EXTCMD = ();
3399 %EXTICMD = (); 3932 %EXTICMD = ();
3400 3933
3401 warn "unloading/nuking all extensions"; 3934 trace "unloading/nuking all extensions";
3402 for my $pkg (@EXTS) { 3935 for my $pkg (@EXTS) {
3403 warn "... unloading $pkg"; 3936 trace "... unloading $pkg";
3404 3937
3405 if (my $cb = $pkg->can ("unload")) { 3938 if (my $cb = $pkg->can ("unload")) {
3406 eval { 3939 eval {
3407 $cb->($pkg); 3940 $cb->($pkg);
3408 1 3941 1
3409 } or warn "$pkg unloaded, but with errors: $@"; 3942 } or error "$pkg unloaded, but with errors: $@";
3943 }
3944
3945 trace "... clearing $pkg";
3946 clear_package $pkg;
3410 } 3947 }
3411 3948
3412 warn "... nuking $pkg";
3413 Symbol::delete_package $pkg;
3414 }
3415
3416 warn "unloading all perl modules loaded from $LIBDIR"; 3949 trace "unloading all perl modules loaded from $LIBDIR";
3417 while (my ($k, $v) = each %INC) { 3950 while (my ($k, $v) = each %INC) {
3418 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3951 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3419 3952
3420 warn "... unloading $k"; 3953 trace "... unloading $k";
3421 delete $INC{$k}; 3954 delete $INC{$k};
3422 3955
3423 $k =~ s/\.pm$//; 3956 $k =~ s/\.pm$//;
3424 $k =~ s/\//::/g; 3957 $k =~ s/\//::/g;
3425 3958
3426 if (my $cb = $k->can ("unload_module")) { 3959 if (my $cb = $k->can ("unload_module")) {
3427 $cb->(); 3960 $cb->();
3961 }
3962
3963 clear_package $k;
3428 } 3964 }
3429 3965
3430 Symbol::delete_package $k;
3431 }
3432
3433 warn "getting rid of safe::, as good as possible"; 3966 trace "getting rid of safe::, as good as possible";
3434 Symbol::delete_package "safe::$_" 3967 clear_package "safe::$_"
3435 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3968 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3436 3969
3437 warn "unloading cf.pm \"a bit\""; 3970 trace "unloading cf.pm \"a bit\"";
3438 delete $INC{"cf.pm"}; 3971 delete $INC{"cf.pm"};
3439 delete $INC{"cf/pod.pm"}; 3972 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3440 3973
3441 # don't, removes xs symbols, too, 3974 # don't, removes xs symbols, too,
3442 # and global variables created in xs 3975 # and global variables created in xs
3443 #Symbol::delete_package __PACKAGE__; 3976 #clear_package __PACKAGE__;
3444 3977
3445 warn "unload completed, starting to reload now"; 3978 info "unload completed, starting to reload now";
3446 3979
3447 warn "reloading cf.pm"; 3980 trace "reloading cf.pm";
3448 require cf; 3981 require cf;
3449 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3982 cf::_connect_to_perl_1;
3450 3983
3451 warn "loading config and database again"; 3984 trace "loading config and database again";
3452 cf::reload_config; 3985 cf::reload_config;
3453 3986
3454 warn "loading extensions"; 3987 trace "loading extensions";
3455 cf::load_extensions; 3988 cf::load_extensions;
3456 3989
3990 if ($REATTACH_ON_RELOAD) {
3457 warn "reattaching attachments to objects/players"; 3991 trace "reattaching attachments to objects/players";
3458 _global_reattach; # objects, sockets 3992 _global_reattach; # objects, sockets
3459 warn "reattaching attachments to maps"; 3993 trace "reattaching attachments to maps";
3460 reattach $_ for values %MAP; 3994 reattach $_ for values %MAP;
3461 warn "reattaching attachments to players"; 3995 trace "reattaching attachments to players";
3462 reattach $_ for values %PLAYER; 3996 reattach $_ for values %PLAYER;
3997 }
3463 3998
3999 trace "running post_init jobs";
4000 (pop @POST_INIT)->(1) while @POST_INIT;
4001
3464 warn "leaving sync_job"; 4002 trace "leaving sync_job";
3465 4003
3466 1 4004 1
3467 } or do { 4005 } or do {
3468 warn $@; 4006 error $@;
3469 warn "error while reloading, exiting."; 4007 cf::cleanup "error while reloading, exiting.";
3470 exit 1; 4008 };
4009
4010 info "reloaded";
4011 --$RELOAD;
3471 }; 4012 }
3472 4013
3473 warn "reloaded"; 4014 $t1 = AE::time - $t1;
4015 info "reload completed in ${t1}s\n";
3474}; 4016};
3475 4017
3476our $RELOAD_WATCHER; # used only during reload 4018our $RELOAD_WATCHER; # used only during reload
3477 4019
3478sub reload_perl() { 4020sub reload_perl() {
3479 # doing reload synchronously and two reloads happen back-to-back, 4021 # doing reload synchronously and two reloads happen back-to-back,
3480 # coro crashes during coro_state_free->destroy here. 4022 # coro crashes during coro_state_free->destroy here.
3481 4023
3482 $RELOAD_WATCHER ||= Event->timer ( 4024 $RELOAD_WATCHER ||= cf::async {
3483 reentrant => 0, 4025 Coro::AIO::aio_wait cache_extensions;
3484 after => 0, 4026
3485 data => WF_AUTOCANCEL, 4027 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3486 cb => sub {
3487 do_reload_perl; 4028 do_reload_perl;
3488 undef $RELOAD_WATCHER; 4029 undef $RELOAD_WATCHER;
3489 }, 4030 };
3490 ); 4031 };
3491} 4032}
3492 4033
3493register_command "reload" => sub { 4034register_command "reload" => sub {
3494 my ($who, $arg) = @_; 4035 my ($who, $arg) = @_;
3495 4036
3500 reload_perl; 4041 reload_perl;
3501 }; 4042 };
3502 } 4043 }
3503}; 4044};
3504 4045
3505unshift @INC, $LIBDIR; 4046#############################################################################
3506 4047
3507my $bug_warning = 0; 4048my $bug_warning = 0;
3508 4049
3509our @WAIT_FOR_TICK; 4050our @WAIT_FOR_TICK;
3510our @WAIT_FOR_TICK_BEGIN; 4051our @WAIT_FOR_TICK_BEGIN;
3511 4052
3512sub wait_for_tick { 4053sub wait_for_tick {
3513 return unless $TICK_WATCHER->is_active;
3514 return if $Coro::current == $Coro::main; 4054 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3515 4055
3516 my $signal = new Coro::Signal; 4056 my $signal = new Coro::Signal;
3517 push @WAIT_FOR_TICK, $signal; 4057 push @WAIT_FOR_TICK, $signal;
3518 $signal->wait; 4058 $signal->wait;
3519} 4059}
3520 4060
3521sub wait_for_tick_begin { 4061sub wait_for_tick_begin {
3522 return unless $TICK_WATCHER->is_active;
3523 return if $Coro::current == $Coro::main; 4062 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3524 4063
3525 my $signal = new Coro::Signal; 4064 my $signal = new Coro::Signal;
3526 push @WAIT_FOR_TICK_BEGIN, $signal; 4065 push @WAIT_FOR_TICK_BEGIN, $signal;
3527 $signal->wait; 4066 $signal->wait;
3528} 4067}
3529 4068
3530$TICK_WATCHER = Event->timer ( 4069sub 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) { 4070 if ($Coro::current != $Coro::main) {
3538 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4071 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3539 unless ++$bug_warning > 10; 4072 unless ++$bug_warning > 10;
3540 return; 4073 return;
3541 } 4074 }
3542 4075
3543 $NOW = $tick_start = Event::time;
3544
3545 cf::server_tick; # one server iteration 4076 cf::server_tick; # one server iteration
3546 4077
3547 $RUNTIME += $TICK; 4078 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3548 $NEXT_TICK += $TICK;
3549 4079
3550 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4080 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3551 $NEXT_RUNTIME_WRITE = $NOW + 10; 4081 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3552 Coro::async_pool { 4082 Coro::async_pool {
3553 $Coro::current->{desc} = "runtime saver"; 4083 $Coro::current->{desc} = "runtime saver";
3554 write_runtime 4084 write_runtime_sync
3555 or warn "ERROR: unable to write runtime file: $!"; 4085 or error "ERROR: unable to write runtime file: $!";
3556 };
3557 } 4086 };
4087 }
3558 4088
3559 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4089 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3560 $sig->send; 4090 $sig->send;
3561 } 4091 }
3562 while (my $sig = shift @WAIT_FOR_TICK) { 4092 while (my $sig = shift @WAIT_FOR_TICK) {
3563 $sig->send; 4093 $sig->send;
3564 } 4094 }
3565 4095
3566 $NOW = Event::time; 4096 $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; 4097 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3576 4098
3577 _post_tick; 4099 if (0) {
4100 if ($NEXT_TICK) {
4101 my $jitter = $TICK_START - $NEXT_TICK;
4102 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4103 debug "jitter $JITTER\n";#d#
4104 }
3578 }, 4105 }
3579); 4106}
3580 4107
3581{ 4108{
4109 # configure BDB
4110
3582 BDB::min_parallel 8; 4111 BDB::min_parallel 16;
3583 BDB::max_poll_time $TICK * 0.1; 4112 BDB::max_poll_reqs $TICK * 0.1;
3584 $BDB_POLL_WATCHER = Event->io ( 4113 $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 4114
3608 unless ($DB_ENV) { 4115 unless ($DB_ENV) {
3609 $DB_ENV = BDB::db_env_create; 4116 $DB_ENV = BDB::db_env_create;
3610 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4117 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3611 | BDB::LOG_AUTOREMOVE, 1); 4118 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4119 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3612 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4120 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3613 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4121 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3614 4122
3615 cf::sync_job { 4123 cf::sync_job {
3616 eval { 4124 eval {
3626 4134
3627 cf::cleanup "db_env_open(db): $@" if $@; 4135 cf::cleanup "db_env_open(db): $@" if $@;
3628 }; 4136 };
3629 } 4137 }
3630 4138
3631 $BDB_DEADLOCK_WATCHER = Event->timer ( 4139 $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 { }; 4140 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3639 },
3640 ); 4141 };
3641 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4142 $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 { }; 4143 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3649 },
3650 ); 4144 };
3651 $BDB_TRICKLE_WATCHER = Event->timer ( 4145 $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 { }; 4146 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3659 },
3660 ); 4147 };
3661} 4148}
3662 4149
3663{ 4150{
4151 # configure IO::AIO
4152
3664 IO::AIO::min_parallel 8; 4153 IO::AIO::min_parallel 8;
3665
3666 undef $Coro::AIO::WATCHER;
3667 IO::AIO::max_poll_time $TICK * 0.1; 4154 IO::AIO::max_poll_time $TICK * 0.1;
3668 $AIO_POLL_WATCHER = Event->io ( 4155 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} 4156}
3677 4157
3678my $_log_backtrace; 4158my $_log_backtrace;
3679 4159
3680sub _log_backtrace { 4160sub _log_backtrace {
3683 $msg =~ s/\n//; 4163 $msg =~ s/\n//;
3684 4164
3685 # limit the # of concurrent backtraces 4165 # limit the # of concurrent backtraces
3686 if ($_log_backtrace < 2) { 4166 if ($_log_backtrace < 2) {
3687 ++$_log_backtrace; 4167 ++$_log_backtrace;
4168 my $perl_bt = Carp::longmess $msg;
3688 async { 4169 async {
3689 $Coro::current->{desc} = "abt $msg"; 4170 $Coro::current->{desc} = "abt $msg";
3690 4171
3691 my @bt = fork_call { 4172 my @bt = fork_call {
3692 @addr = map { sprintf "%x", $_ } @addr; 4173 @addr = map { sprintf "%x", $_ } @addr;
3703 } 4184 }
3704 4185
3705 @funcs 4186 @funcs
3706 }; 4187 };
3707 4188
3708 LOG llevInfo, "[ABT] $msg\n"; 4189 LOG llevInfo, "[ABT] $perl_bt\n";
4190 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3709 LOG llevInfo, "[ABT] $_\n" for @bt; 4191 LOG llevInfo, "[ABT] $_\n" for @bt;
3710 --$_log_backtrace; 4192 --$_log_backtrace;
3711 }; 4193 };
3712 } else { 4194 } else {
3713 LOG llevInfo, "[ABT] $msg\n"; 4195 LOG llevInfo, "[ABT] $msg\n";
3714 LOG llevInfo, "[ABT] [suppressed]\n"; 4196 LOG llevInfo, "[ABT] [suppressed]\n";
3715 } 4197 }
3716} 4198}
3717 4199
3718# load additional modules 4200# load additional modules
3719use cf::pod; 4201require "cf/$_.pm" for @EXTRA_MODULES;
4202cf::_connect_to_perl_2;
3720 4203
3721END { cf::emergency_save } 4204END { cf::emergency_save }
3722 4205
37231 42061
3724 4207

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines