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.375 by root, Sun Sep 30 20:22:21 2007 UTC vs.
Revision 1.548 by root, Mon May 10 21:40:22 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 Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.64 (); 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.32 (); 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 incloader);
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 thread
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
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
176=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
177 247
178This array contains the results of the last C<invoke ()> call. When 248This 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 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 250that call.
181 251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
182=back 258=back
183 259
184=cut 260=cut
185 261
186BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
187 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
188 my $msg = join "", @_; 269 my $msg = join "", @_;
189 270
190 $msg .= "\n" 271 $msg .= "\n"
191 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
192 273
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 275
195 LOG llevError, $msg; 276 LOG llevWarn, $msg;
196 }; 277};
197} 278
279$Coro::State::DIEHOOK = sub {
280 return unless $^S eq 0; # "eq", not "=="
281
282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
285 error "DIEHOOK called in main context, Coro bug?\n";#d#
286 return;#d#
287 }#d#
288
289 # kill coroutine otherwise
290 Coro::terminate
291};
198 292
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 303for my $pkg (qw(
210 cf::global cf::attachable 304 cf::global cf::attachable
211 cf::object cf::object::player 305 cf::object cf::object::player
212 cf::client cf::player 306 cf::client cf::player
213 cf::arch cf::living 307 cf::arch cf::living
308 cf::map cf::mapspace
214 cf::map cf::party cf::region 309 cf::party cf::region
215)) { 310)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 312}
219 313
220$Event::DIED = sub { 314$EV::DIED = sub {
221 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
222}; 316};
223 317
224############################################################################# 318#############################################################################
225 319
226=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 342 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 343 $d
250 } || "[unable to dump $_[0]: '$@']"; 344 } || "[unable to dump $_[0]: '$@']";
251} 345}
252 346
253=item $ref = cf::from_json $json 347=item $ref = cf::decode_json $json
254 348
255Converts a JSON string into the corresponding perl data structure. 349Converts a JSON string into the corresponding perl data structure.
256 350
257=item $json = cf::to_json $ref 351=item $json = cf::encode_json $ref
258 352
259Converts a perl data structure into its JSON representation. 353Converts a perl data structure into its JSON representation.
260 354
261=cut 355=cut
262 356
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 358
265sub to_json ($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
374=item cf::post_init { BLOCK }
375
376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
377but I<before> the server starts ticking again.
378
379The codeblock will have a single boolean argument to indicate whether this
380is a reload or not.
381
382=cut
383
384sub post_init(&) {
385 push @POST_INIT, shift;
386}
267 387
268=item cf::lock_wait $string 388=item cf::lock_wait $string
269 389
270Wait until the given lock is available. See cf::lock_acquire. 390Wait until the given lock is available. See cf::lock_acquire.
271 391
272=item my $lock = cf::lock_acquire $string 392=item my $lock = cf::lock_acquire $string
273 393
274Wait until the given lock is available and then acquires it and returns 394Wait 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, 395a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 396for example when the coroutine gets canceled), the lock is automatically
277returned. 397returned.
278 398
279Locks are *not* recursive, locking from the same coro twice results in a 399Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 400deadlocked coro.
286 406
287Return true if the lock is currently active, i.e. somebody has locked it. 407Return true if the lock is currently active, i.e. somebody has locked it.
288 408
289=cut 409=cut
290 410
291our %LOCK; 411our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 412
294sub lock_wait($) { 413sub lock_wait($) {
295 my ($key) = @_; 414 $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} 415}
308 416
309sub lock_acquire($) { 417sub lock_acquire($) {
310 my ($key) = @_; 418 $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} 419}
324 420
325sub lock_active($) { 421sub lock_active($) {
326 my ($key) = @_; 422 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 423}
330 424
331sub freeze_mainloop { 425sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 426 tick_inhibit_inc;
333 427
334 my $guard = Coro::guard { 428 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 429}
336 }; 430
337 $TICK_WATCHER->stop; 431=item cf::periodic $interval, $cb
338 $guard 432
433Like EV::periodic, but randomly selects a starting point so that the actions
434get spread over time.
435
436=cut
437
438sub periodic($$) {
439 my ($interval, $cb) = @_;
440
441 my $start = rand List::Util::min 180, $interval;
442
443 EV::periodic $start, $interval, 0, $cb
339} 444}
340 445
341=item cf::get_slot $time[, $priority[, $name]] 446=item cf::get_slot $time[, $priority[, $name]]
342 447
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 448Allocate $time seconds of blocking CPU time at priority C<$priority>:
351 456
352=cut 457=cut
353 458
354our @SLOT_QUEUE; 459our @SLOT_QUEUE;
355our $SLOT_QUEUE; 460our $SLOT_QUEUE;
461our $SLOT_DECAY = 0.9;
356 462
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 463$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 464$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager"); 465 $Coro::current->desc ("timeslot manager");
360 466
361 my $signal = new Coro::Signal; 467 my $signal = new Coro::Signal;
468 my $busy;
362 469
363 while () { 470 while () {
364 next_job: 471 next_job:
472
365 my $avail = cf::till_tick; 473 my $avail = cf::till_tick;
366 if ($avail > 0.01) { 474
367 for (0 .. $#SLOT_QUEUE) { 475 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) { 476 if ($SLOT_QUEUE[$_][0] <= $avail) {
477 $busy = 0;
369 my $job = splice @SLOT_QUEUE, $_, 1, (); 478 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send; 479 $job->[2]->send;
371 Coro::cede; 480 Coro::cede;
372 goto next_job; 481 goto next_job;
373 } 482 } else {
483 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
374 } 484 }
375 } 485 }
376 486
377 if (@SLOT_QUEUE) { 487 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive 488 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 489 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 490 $signal->wait;
381 } else { 491 } else {
492 $busy = 0;
382 Coro::schedule; 493 Coro::schedule;
383 } 494 }
384 } 495 }
385}; 496};
386 497
387sub get_slot($;$$) { 498sub get_slot($;$$) {
499 return if tick_inhibit || $Coro::current == $Coro::main;
500
388 my ($time, $pri, $name) = @_; 501 my ($time, $pri, $name) = @_;
389 502
390 $time = $TICK * .6 if $time > $TICK * .6; 503 $time = clamp $time, 0.01, $TICK * .6;
504
391 my $sig = new Coro::Signal; 505 my $sig = new Coro::Signal;
392 506
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 507 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 508 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready; 509 $SLOT_QUEUE->ready;
406 520
407BEGIN { *async = \&Coro::async_pool } 521BEGIN { *async = \&Coro::async_pool }
408 522
409=item cf::sync_job { BLOCK } 523=item cf::sync_job { BLOCK }
410 524
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 525The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 526is 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 527partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 528acceptable.
415 529
416If it must be done, put the blocking parts into C<sync_job>. This will run 530If 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 531the given BLOCK in another coroutine while waiting for the result. The
421=cut 535=cut
422 536
423sub sync_job(&) { 537sub sync_job(&) {
424 my ($job) = @_; 538 my ($job) = @_;
425 539
426 if ($Coro::current == $Coro::main) { 540 if (in_main) {
427 my $time = Event::time; 541 my $time = AE::time;
428 542
429 # this is the main coro, too bad, we have to block 543 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 544 # till the operation succeeds, freezing the server :/
431 545
432 # TODO: use suspend/resume instead 546 #LOG llevError, Carp::longmess "sync job";#d#
433 # (but this is cancel-safe) 547
434 my $freeze_guard = freeze_mainloop; 548 my $freeze_guard = freeze_mainloop;
435 549
436 my $busy = 1; 550 my $busy = 1;
437 my @res; 551 my @res;
438 552
439 (async { 553 (async {
440 $Coro::current->desc ("sync job coro"); 554 $Coro::current->desc ("sync job coro");
441 @res = eval { $job->() }; 555 @res = eval { $job->() };
442 warn $@ if $@; 556 error $@ if $@;
443 undef $busy; 557 undef $busy;
444 })->prio (Coro::PRIO_MAX); 558 })->prio (Coro::PRIO_MAX);
445 559
446 while ($busy) { 560 while ($busy) {
447 Coro::cede or Event::one_event; 561 if (Coro::nready) {
562 Coro::cede_notself;
563 } else {
564 EV::loop EV::LOOP_ONESHOT;
448 } 565 }
566 }
449 567
450 $time = Event::time - $time; 568 my $time = AE::time - $time;
451 569
452 LOG llevError | logBacktrace, Carp::longmess "long sync job"
453 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
454
455 $tick_start += $time; # do not account sync jobs to server load 570 $TICK_START += $time; # do not account sync jobs to server load
456 571
457 wantarray ? @res : $res[0] 572 wantarray ? @res : $res[0]
458 } else { 573 } else {
459 # we are in another coroutine, how wonderful, everything just works 574 # we are in another coroutine, how wonderful, everything just works
460 575
480 $EXT_CORO{$coro+0} = $coro; 595 $EXT_CORO{$coro+0} = $coro;
481 596
482 $coro 597 $coro
483} 598}
484 599
485=item fork_call { }, $args 600=item fork_call { }, @args
486 601
487Executes the given code block with the given arguments in a seperate 602Executes the given code block with the given arguments in a seperate
488process, returning the results. Everything must be serialisable with 603process, returning the results. Everything must be serialisable with
489Coro::Storable. May, of course, block. Note that the executed sub may 604Coro::Storable. May, of course, block. Note that the executed sub may
490never block itself or use any form of Event handling. 605never block itself or use any form of event handling.
491 606
492=cut 607=cut
608
609sub post_fork {
610 reset_signals;
611}
493 612
494sub fork_call(&@) { 613sub fork_call(&@) {
495 my ($cb, @args) = @_; 614 my ($cb, @args) = @_;
496 615
497 # we seemingly have to make a local copy of the whole thing, 616 # we seemingly have to make a local copy of the whole thing,
498 # otherwise perl prematurely frees the stuff :/ 617 # otherwise perl prematurely frees the stuff :/
499 # TODO: investigate and fix (likely this will be rather laborious) 618 # TODO: investigate and fix (likely this will be rather laborious)
500 619
501 my @res = Coro::Util::fork_eval { 620 my @res = Coro::Util::fork_eval {
502 reset_signals; 621 cf::post_fork;
503 &$cb 622 &$cb
504 }, @args; 623 } @args;
505 624
506 wantarray ? @res : $res[-1] 625 wantarray ? @res : $res[-1]
626}
627
628sub objinfo {
629 (
630 "counter value" => cf::object::object_count,
631 "objects created" => cf::object::create_count,
632 "objects destroyed" => cf::object::destroy_count,
633 "freelist size" => cf::object::free_count,
634 "allocated objects" => cf::object::objects_size,
635 "active objects" => cf::object::actives_size,
636 )
637}
638
639=item $coin = coin_from_name $name
640
641=cut
642
643our %coin_alias = (
644 "silver" => "silvercoin",
645 "silvercoin" => "silvercoin",
646 "silvercoins" => "silvercoin",
647 "gold" => "goldcoin",
648 "goldcoin" => "goldcoin",
649 "goldcoins" => "goldcoin",
650 "platinum" => "platinacoin",
651 "platinumcoin" => "platinacoin",
652 "platinumcoins" => "platinacoin",
653 "platina" => "platinacoin",
654 "platinacoin" => "platinacoin",
655 "platinacoins" => "platinacoin",
656 "royalty" => "royalty",
657 "royalties" => "royalty",
658);
659
660sub coin_from_name($) {
661 $coin_alias{$_[0]}
662 ? cf::arch::find $coin_alias{$_[0]}
663 : undef
507} 664}
508 665
509=item $value = cf::db_get $family => $key 666=item $value = cf::db_get $family => $key
510 667
511Returns a single value from the environment database. 668Returns a single value from the environment database.
521within each server. 678within each server.
522 679
523=cut 680=cut
524 681
525sub db_table($) { 682sub db_table($) {
683 cf::error "db_get called from main context"
684 if $Coro::current == $Coro::main;
685
526 my ($name) = @_; 686 my ($name) = @_;
527 my $db = BDB::db_create $DB_ENV; 687 my $db = BDB::db_create $DB_ENV;
528 688
529 eval { 689 eval {
530 $db->set_flags (BDB::CHKSUM); 690 $db->set_flags (BDB::CHKSUM);
540} 700}
541 701
542our $DB; 702our $DB;
543 703
544sub db_init { 704sub db_init {
545 cf::sync_job {
546 $DB ||= db_table "db"; 705 $DB ||= db_table "db";
547 };
548} 706}
549 707
550sub db_get($$) { 708sub db_get($$) {
551 my $key = "$_[0]/$_[1]"; 709 my $key = "$_[0]/$_[1]";
552 710
553 cf::sync_job { 711 cf::error "db_get called from main context"
712 if $Coro::current == $Coro::main;
713
554 BDB::db_get $DB, undef, $key, my $data; 714 BDB::db_get $DB, undef, $key, my $data;
555 715
556 $! ? () 716 $! ? ()
557 : $data 717 : $data
558 }
559} 718}
560 719
561sub db_put($$$) { 720sub db_put($$$) {
562 BDB::dbreq_pri 4; 721 BDB::dbreq_pri 4;
563 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 722 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
619 778
620 my $t1 = Time::HiRes::time; 779 my $t1 = Time::HiRes::time;
621 my $data = $process->(\@data); 780 my $data = $process->(\@data);
622 my $t2 = Time::HiRes::time; 781 my $t2 = Time::HiRes::time;
623 782
624 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 783 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
625 784
626 db_put cache => "$id/data", $data; 785 db_put cache => "$id/data", $data;
627 db_put cache => "$id/md5" , $md5; 786 db_put cache => "$id/md5" , $md5;
628 db_put cache => "$id/meta", $meta; 787 db_put cache => "$id/meta", $meta;
629 788
639 798
640=cut 799=cut
641 800
642sub datalog($@) { 801sub datalog($@) {
643 my ($type, %kv) = @_; 802 my ($type, %kv) = @_;
644 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 803 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
645} 804}
646 805
647=back 806=back
648 807
649=cut 808=cut
650 809
651############################################################################# 810#############################################################################
652 811
653=head2 ATTACHABLE OBJECTS 812=head2 ATTACHABLE OBJECTS
654 813
655Many objects in crossfire are so-called attachable objects. That means you can 814Many objects in deliantra are so-called attachable objects. That means you can
656attach callbacks/event handlers (a collection of which is called an "attachment") 815attach callbacks/event handlers (a collection of which is called an "attachment")
657to it. All such attachable objects support the following methods. 816to it. All such attachable objects support the following methods.
658 817
659In the following description, CLASS can be any of C<global>, C<object> 818In the following description, CLASS can be any of C<global>, C<object>
660C<player>, C<client> or C<map> (i.e. the attachable objects in 819C<player>, C<client> or C<map> (i.e. the attachable objects in
661Crossfire TRT). 820Deliantra).
662 821
663=over 4 822=over 4
664 823
665=item $attachable->attach ($attachment, key => $value...) 824=item $attachable->attach ($attachment, key => $value...)
666 825
710=item cf::CLASS::attachment $name, ... 869=item cf::CLASS::attachment $name, ...
711 870
712Register an attachment by C<$name> through which attachable objects of the 871Register an attachment by C<$name> through which attachable objects of the
713given CLASS can refer to this attachment. 872given CLASS can refer to this attachment.
714 873
715Some classes such as crossfire maps and objects can specify attachments 874Some classes such as deliantra maps and objects can specify attachments
716that are attached at load/instantiate time, thus the need for a name. 875that are attached at load/instantiate time, thus the need for a name.
717 876
718These calls expect any number of the following handler/hook descriptions: 877These calls expect any number of the following handler/hook descriptions:
719 878
720=over 4 879=over 4
844 1003
845 } elsif (exists $cb_id{$type}) { 1004 } elsif (exists $cb_id{$type}) {
846 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1005 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
847 1006
848 } elsif (ref $type) { 1007 } elsif (ref $type) {
849 warn "attaching objects not supported, ignoring.\n"; 1008 error "attaching objects not supported, ignoring.\n";
850 1009
851 } else { 1010 } else {
852 shift @arg; 1011 shift @arg;
853 warn "attach argument '$type' not supported, ignoring.\n"; 1012 error "attach argument '$type' not supported, ignoring.\n";
854 } 1013 }
855 } 1014 }
856} 1015}
857 1016
858sub _object_attach { 1017sub _object_attach {
868 _attach $registry, $klass, @attach; 1027 _attach $registry, $klass, @attach;
869 } 1028 }
870 1029
871 $obj->{$name} = \%arg; 1030 $obj->{$name} = \%arg;
872 } else { 1031 } else {
873 warn "object uses attachment '$name' which is not available, postponing.\n"; 1032 info "object uses attachment '$name' which is not available, postponing.\n";
874 } 1033 }
875 1034
876 $obj->{_attachment}{$name} = undef; 1035 $obj->{_attachment}{$name} = undef;
877} 1036}
878 1037
937 1096
938 for (@$callbacks) { 1097 for (@$callbacks) {
939 eval { &{$_->[1]} }; 1098 eval { &{$_->[1]} };
940 1099
941 if ($@) { 1100 if ($@) {
942 warn "$@";
943 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1101 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
944 override; 1102 override;
945 } 1103 }
946 1104
947 return 1 if $override; 1105 return 1 if $override;
948 } 1106 }
949 1107
950 0 1108 0
951} 1109}
952 1110
953=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1111=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
954 1112
955=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1113=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
956 1114
957Generate an object-specific event with the given arguments. 1115Generate an object-specific event with the given arguments.
958 1116
964 1122
965=cut 1123=cut
966 1124
967############################################################################# 1125#############################################################################
968# object support 1126# object support
969#
970 1127
1128sub _object_equal($$);
1129sub _object_equal($$) {
1130 my ($a, $b) = @_;
1131
1132 return 0 unless (ref $a) eq (ref $b);
1133
1134 if ("HASH" eq ref $a) {
1135 my @ka = keys %$a;
1136 my @kb = keys %$b;
1137
1138 return 0 if @ka != @kb;
1139
1140 for (0 .. $#ka) {
1141 return 0 unless $ka[$_] eq $kb[$_];
1142 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1143 }
1144
1145 } elsif ("ARRAY" eq ref $a) {
1146
1147 return 0 if @$a != @$b;
1148
1149 for (0 .. $#$a) {
1150 return 0 unless _object_equal $a->[$_], $b->[$_];
1151 }
1152
1153 } elsif ($a ne $b) {
1154 return 0;
1155 }
1156
1157 1
1158}
1159
1160our $SLOW_MERGES;#d#
971sub _can_merge { 1161sub _can_merge {
972 my ($ob1, $ob2) = @_; 1162 my ($ob1, $ob2) = @_;
973 1163
974 local $Storable::canonical = 1; 1164 ++$SLOW_MERGES;#d#
975 my $fob1 = Storable::freeze $ob1;
976 my $fob2 = Storable::freeze $ob2;
977 1165
978 $fob1 eq $fob2 1166 # we do the slow way here
1167 return _object_equal $ob1, $ob2
979} 1168}
980 1169
981sub reattach { 1170sub reattach {
982 # basically do the same as instantiate, without calling instantiate 1171 # basically do the same as instantiate, without calling instantiate
983 my ($obj) = @_; 1172 my ($obj) = @_;
984 1173
1174 # no longer needed after getting rid of delete_package?
985 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1175 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
986 1176
987 my $registry = $obj->registry; 1177 my $registry = $obj->registry;
988 1178
989 @$registry = (); 1179 @$registry = ();
990 1180
995 for (@$attach) { 1185 for (@$attach) {
996 my ($klass, @attach) = @$_; 1186 my ($klass, @attach) = @$_;
997 _attach $registry, $klass, @attach; 1187 _attach $registry, $klass, @attach;
998 } 1188 }
999 } else { 1189 } else {
1000 warn "object uses attachment '$name' that is not available, postponing.\n"; 1190 info "object uses attachment '$name' that is not available, postponing.\n";
1001 } 1191 }
1002 } 1192 }
1003} 1193}
1004 1194
1005cf::attachable->attach ( 1195cf::attachable->attach (
1006 prio => -1000000, 1196 prio => -1000000,
1007 on_instantiate => sub { 1197 on_instantiate => sub {
1008 my ($obj, $data) = @_; 1198 my ($obj, $data) = @_;
1009 1199
1010 $data = from_json $data; 1200 $data = decode_json $data;
1011 1201
1012 for (@$data) { 1202 for (@$data) {
1013 my ($name, $args) = @$_; 1203 my ($name, $args) = @$_;
1014 1204
1015 $obj->attach ($name, %{$args || {} }); 1205 $obj->attach ($name, %{$args || {} });
1032 my ($filename, $rdata, $objs) = @_; 1222 my ($filename, $rdata, $objs) = @_;
1033 1223
1034 sync_job { 1224 sync_job {
1035 if (length $$rdata) { 1225 if (length $$rdata) {
1036 utf8::decode (my $decname = $filename); 1226 utf8::decode (my $decname = $filename);
1037 warn sprintf "saving %s (%d,%d)\n", 1227 trace sprintf "saving %s (%d,%d)\n",
1038 $decname, length $$rdata, scalar @$objs; 1228 $decname, length $$rdata, scalar @$objs
1229 if $VERBOSE_IO;
1039 1230
1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1231 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1041 chmod SAVE_MODE, $fh; 1232 aio_chmod $fh, SAVE_MODE;
1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1233 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1043 aio_fsync $fh if $cf::USE_FSYNC; 1234 if ($cf::USE_FSYNC) {
1235 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;
1236 aio_fsync $fh;
1237 }
1044 close $fh; 1238 aio_close $fh;
1045 1239
1046 if (@$objs) { 1240 if (@$objs) {
1047 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1241 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1048 chmod SAVE_MODE, $fh; 1242 aio_chmod $fh, SAVE_MODE;
1049 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1243 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1050 aio_write $fh, 0, (length $data), $data, 0; 1244 aio_write $fh, 0, (length $data), $data, 0;
1051 aio_fsync $fh if $cf::USE_FSYNC; 1245 if ($cf::USE_FSYNC) {
1246 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;
1247 aio_fsync $fh;
1248 }
1052 close $fh; 1249 aio_close $fh;
1053 aio_rename "$filename.pst~", "$filename.pst"; 1250 aio_rename "$filename.pst~", "$filename.pst";
1054 } 1251 }
1055 } else { 1252 } else {
1056 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1057 } 1254 }
1058 1255
1059 aio_rename "$filename~", $filename; 1256 aio_rename "$filename~", $filename;
1257
1258 $filename =~ s%/[^/]+$%%;
1259 aio_pathsync $filename if $cf::USE_FSYNC;
1060 } else { 1260 } else {
1061 warn "FATAL: $filename~: $!\n"; 1261 error "unable to save objects: $filename~: $!\n";
1062 } 1262 }
1063 } else { 1263 } else {
1064 aio_unlink $filename; 1264 aio_unlink $filename;
1065 aio_unlink "$filename.pst"; 1265 aio_unlink "$filename.pst";
1066 } 1266 }
1085 1285
1086 unless (aio_stat "$filename.pst") { 1286 unless (aio_stat "$filename.pst") {
1087 (aio_load "$filename.pst", $av) >= 0 1287 (aio_load "$filename.pst", $av) >= 0
1088 or return; 1288 or return;
1089 1289
1090 $av = eval { (Storable::thaw $av)->{objs} }; 1290 my $st = eval { Coro::Storable::thaw $av };
1291 $av = $st->{objs};
1091 } 1292 }
1092 1293
1093 utf8::decode (my $decname = $filename); 1294 utf8::decode (my $decname = $filename);
1094 warn sprintf "loading %s (%d,%d)\n", 1295 trace sprintf "loading %s (%d,%d)\n",
1095 $decname, length $data, scalar @{$av || []}; 1296 $decname, length $data, scalar @{$av || []}
1297 if $VERBOSE_IO;
1096 1298
1097 ($data, $av) 1299 ($data, $av)
1098} 1300}
1099 1301
1100=head2 COMMAND CALLBACKS 1302=head2 COMMAND CALLBACKS
1156 my ($name, $cb) = @_; 1358 my ($name, $cb) = @_;
1157 1359
1158 $EXTICMD{$name} = $cb; 1360 $EXTICMD{$name} = $cb;
1159} 1361}
1160 1362
1363use File::Glob ();
1364
1161cf::player->attach ( 1365cf::player->attach (
1162 on_command => sub { 1366 on_unknown_command => sub {
1163 my ($pl, $name, $params) = @_; 1367 my ($pl, $name, $params) = @_;
1164 1368
1165 my $cb = $COMMAND{$name} 1369 my $cb = $COMMAND{$name}
1166 or return; 1370 or return;
1167 1371
1190 1394
1191 $pl->ext_reply ($reply, @reply) 1395 $pl->ext_reply ($reply, @reply)
1192 if $reply; 1396 if $reply;
1193 1397
1194 } else { 1398 } else {
1195 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1399 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1196 } 1400 }
1197 1401
1198 cf::override; 1402 cf::override;
1199 }, 1403 },
1200); 1404);
1201 1405
1406# "readahead" all extensions
1407sub cache_extensions {
1408 my $grp = IO::AIO::aio_group;
1409
1410 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1411 for (grep /\.ext$/, @{$_[0]}) {
1412 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1413 }
1414 };
1415
1416 $grp
1417}
1418
1202sub load_extensions { 1419sub load_extensions {
1420 info "loading extensions...";
1421
1203 cf::sync_job { 1422 cf::sync_job {
1204 my %todo; 1423 my %todo;
1205 1424
1206 for my $path (<$LIBDIR/*.ext>) { 1425 for my $path (<$LIBDIR/*.ext>) {
1207 next unless -r $path; 1426 next unless -r $path;
1225 1444
1226 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1445 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1227 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1446 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1228 1447
1229 $ext{source} = 1448 $ext{source} =
1230 "package $pkg; use strict; use utf8;\n" 1449 "package $pkg; use common::sense;\n"
1231 . "#line 1 \"$path\"\n{\n" 1450 . "#line 1 \"$path\"\n{\n"
1232 . $source 1451 . $source
1233 . "\n};\n1"; 1452 . "\n};\n1";
1234 1453
1235 $todo{$base} = \%ext; 1454 $todo{$base} = \%ext;
1236 } 1455 }
1237 1456
1457 my $pass = 0;
1238 my %done; 1458 my %done;
1239 while (%todo) { 1459 while (%todo) {
1240 my $progress; 1460 my $progress;
1241 1461
1462 ++$pass;
1463
1464 ext:
1242 while (my ($k, $v) = each %todo) { 1465 while (my ($k, $v) = each %todo) {
1243 for (split /,\s*/, $v->{meta}{depends}) { 1466 for (split /,\s*/, $v->{meta}{depends}) {
1244 goto skip 1467 next ext
1245 unless exists $done{$_}; 1468 unless exists $done{$_};
1246 } 1469 }
1247 1470
1248 warn "... loading '$k' into '$v->{pkg}'\n"; 1471 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1249 1472
1250 unless (eval $v->{source}) { 1473 my $active = eval $v->{source};
1474
1475 if (length $@) {
1251 my $msg = $@ ? "$v->{path}: $@\n" 1476 error "$v->{path}: $@\n";
1252 : "$v->{base}: extension inactive.\n";
1253 1477
1478 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1254 if (exists $v->{meta}{mandatory}) { 1479 if exists $v->{meta}{mandatory};
1255 warn $msg; 1480
1256 warn "mandatory extension failed to load, exiting.\n"; 1481 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1257 exit 1; 1482 delete $todo{$k};
1258 } 1483 } else {
1259 1484 $done{$k} = delete $todo{$k};
1260 warn $msg; 1485 push @EXTS, $v->{pkg};
1486 $progress = 1;
1487
1488 info "$v->{base}: extension inactive.\n"
1489 unless $active;
1261 } 1490 }
1262
1263 $done{$k} = delete $todo{$k};
1264 push @EXTS, $v->{pkg};
1265 $progress = 1;
1266 } 1491 }
1267 1492
1268 skip: 1493 unless ($progress) {
1269 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1494 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1270 unless $progress; 1495
1496 while (my ($k, $v) = each %todo) {
1497 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1498 if exists $v->{meta}{mandatory};
1499 }
1500 }
1271 } 1501 }
1272 }; 1502 };
1273} 1503}
1274 1504
1275############################################################################# 1505#############################################################################
1276 1506
1277=back 1507=back
1278 1508
1279=head2 CORE EXTENSIONS 1509=head2 CORE EXTENSIONS
1280 1510
1281Functions and methods that extend core crossfire objects. 1511Functions and methods that extend core deliantra objects.
1282 1512
1283=cut 1513=cut
1284 1514
1285package cf::player; 1515package cf::player;
1286 1516
1329 1559
1330sub exists($) { 1560sub exists($) {
1331 my ($login) = @_; 1561 my ($login) = @_;
1332 1562
1333 $cf::PLAYER{$login} 1563 $cf::PLAYER{$login}
1334 or cf::sync_job { !aio_stat path $login } 1564 or !aio_stat path $login
1335} 1565}
1336 1566
1337sub find($) { 1567sub find($) {
1338 return $cf::PLAYER{$_[0]} || do { 1568 return $cf::PLAYER{$_[0]} || do {
1339 my $login = $_[0]; 1569 my $login = $_[0];
1351 my $f = new_from_file cf::object::thawer path $login 1581 my $f = new_from_file cf::object::thawer path $login
1352 or return; 1582 or return;
1353 1583
1354 my $pl = cf::player::load_pl $f 1584 my $pl = cf::player::load_pl $f
1355 or return; 1585 or return;
1586
1356 local $cf::PLAYER_LOADING{$login} = $pl; 1587 local $cf::PLAYER_LOADING{$login} = $pl;
1357 $f->resolve_delayed_derefs; 1588 $f->resolve_delayed_derefs;
1358 $cf::PLAYER{$login} = $pl 1589 $cf::PLAYER{$login} = $pl
1359 } 1590 }
1360 } 1591 }
1361} 1592}
1362 1593
1594cf::player->attach (
1595 on_load => sub {
1596 my ($pl, $path) = @_;
1597
1598 # restore slots saved in save, below
1599 my $slots = delete $pl->{_slots};
1600
1601 $pl->ob->current_weapon ($slots->[0]);
1602 $pl->combat_ob ($slots->[1]);
1603 $pl->ranged_ob ($slots->[2]);
1604 },
1605);
1606
1363sub save($) { 1607sub save($) {
1364 my ($pl) = @_; 1608 my ($pl) = @_;
1365 1609
1366 return if $pl->{deny_save}; 1610 return if $pl->{deny_save};
1367 1611
1370 1614
1371 return if $pl->{deny_save}; 1615 return if $pl->{deny_save};
1372 1616
1373 aio_mkdir playerdir $pl, 0770; 1617 aio_mkdir playerdir $pl, 0770;
1374 $pl->{last_save} = $cf::RUNTIME; 1618 $pl->{last_save} = $cf::RUNTIME;
1619
1620 cf::get_slot 0.01;
1621
1622 # save slots, to be restored later
1623 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1375 1624
1376 $pl->save_pl ($path); 1625 $pl->save_pl ($path);
1377 cf::cede_to_tick; 1626 cf::cede_to_tick;
1378} 1627}
1379 1628
1411 my ($pl) = @_; 1660 my ($pl) = @_;
1412 1661
1413 my $name = $pl->ob->name; 1662 my $name = $pl->ob->name;
1414 1663
1415 $pl->{deny_save} = 1; 1664 $pl->{deny_save} = 1;
1416 $pl->password ("*"); # this should lock out the player until we nuked the dir 1665 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1417 1666
1418 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1419 $pl->deactivate; 1668 $pl->deactivate;
1669
1670 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1671 ext::highscore::check ($pl->ob);
1672
1420 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1673 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1421 $pl->ns->destroy if $pl->ns; 1674 $pl->ns->destroy if $pl->ns;
1422 1675
1423 my $path = playerdir $pl; 1676 my $path = playerdir $pl;
1424 my $temp = "$path~$cf::RUNTIME~deleting~"; 1677 my $temp = "$path~$cf::RUNTIME~deleting~";
1463 1716
1464 for my $login (@$dirs) { 1717 for my $login (@$dirs) {
1465 my $path = path $login; 1718 my $path = path $login;
1466 1719
1467 # a .pst is a dead give-away for a valid player 1720 # a .pst is a dead give-away for a valid player
1468 unless (-e "$path.pst") { 1721 # if no pst file found, open and chekc for blocked users
1722 if (aio_stat "$path.pst") {
1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1723 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1470 aio_read $fh, 0, 512, my $buf, 0 or next; 1724 aio_read $fh, 0, 512, my $buf, 0 or next;
1471 $buf !~ /^password -------------$/m or next; # official not-valid tag 1725 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 } 1726 }
1473 1727
1477 1731
1478 \@logins 1732 \@logins
1479} 1733}
1480 1734
1481=item $player->maps 1735=item $player->maps
1736
1737=item cf::player::maps $login
1482 1738
1483Returns an arrayref of map paths that are private for this 1739Returns an arrayref of map paths that are private for this
1484player. May block. 1740player. May block.
1485 1741
1486=cut 1742=cut
1504 } 1760 }
1505 1761
1506 \@paths 1762 \@paths
1507} 1763}
1508 1764
1509=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1765=item $protocol_xml = $player->expand_cfpod ($cfpod)
1510 1766
1511Expand crossfire pod fragments into protocol xml. 1767Expand deliantra pod fragments into protocol xml.
1512
1513=cut
1514
1515sub expand_cfpod {
1516 ((my $self), (local $_)) = @_;
1517
1518 # escape & and <
1519 s/&/&amp;/g;
1520 s/(?<![BIUGHT])</&lt;/g;
1521
1522 # this is buggy, it needs to properly take care of nested <'s
1523
1524 1 while
1525 # replace B<>, I<>, U<> etc.
1526 s/B<([^\>]*)>/<b>$1<\/b>/
1527 || s/I<([^\>]*)>/<i>$1<\/i>/
1528 || s/U<([^\>]*)>/<u>$1<\/u>/
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1530 # replace G<male|female> tags
1531 || s{G<([^>|]*)\|([^>]*)>}{
1532 $self->gender ? $2 : $1
1533 }ge
1534 # replace H<hint text>
1535 || s{H<([^\>]*)>}
1536 {
1537 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1538 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1539 "")
1540 [$self->{hintmode}]
1541 }ge;
1542
1543 # create single paragraphs (very hackish)
1544 s/(?<=\S)\n(?=\w)/ /g;
1545
1546 # compress some whitespace
1547 s/\s+\n/\n/g; # ws line-ends
1548 s/\n\n+/\n/g; # double lines
1549 s/^\n+//; # beginning lines
1550 s/\n+$//; # ending lines
1551
1552 $_
1553}
1554
1555sub hintmode {
1556 $_[0]{hintmode} = $_[1] if @_ > 1;
1557 $_[0]{hintmode}
1558}
1559 1768
1560=item $player->ext_reply ($msgid, @msg) 1769=item $player->ext_reply ($msgid, @msg)
1561 1770
1562Sends an ext reply to the player. 1771Sends an ext reply to the player.
1563 1772
1595 1804
1596=cut 1805=cut
1597 1806
1598sub find_by_path($) { 1807sub find_by_path($) {
1599 my ($path) = @_; 1808 my ($path) = @_;
1809
1810 $path =~ s/^~[^\/]*//; # skip ~login
1600 1811
1601 my ($match, $specificity); 1812 my ($match, $specificity);
1602 1813
1603 for my $region (list) { 1814 for my $region (list) {
1604 if ($region->{match} && $path =~ $region->{match}) { 1815 if ($region->{match} && $path =~ $region->{match}) {
1630our $MAX_RESET = 3600; 1841our $MAX_RESET = 3600;
1631our $DEFAULT_RESET = 3000; 1842our $DEFAULT_RESET = 3000;
1632 1843
1633sub generate_random_map { 1844sub generate_random_map {
1634 my ($self, $rmp) = @_; 1845 my ($self, $rmp) = @_;
1846
1847 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1848
1635 # mit "rum" bekleckern, nicht 1849 # mit "rum" bekleckern, nicht
1636 $self->_create_random_map ( 1850 $self->_create_random_map (
1637 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1851 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1638 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1852 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1639 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1853 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1640 $rmp->{exit_on_final_map}, 1854 $rmp->{exit_on_final_map},
1641 $rmp->{xsize}, $rmp->{ysize}, 1855 $rmp->{xsize}, $rmp->{ysize},
1642 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1856 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1643 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1857 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1658 1872
1659sub register { 1873sub register {
1660 my (undef, $regex, $prio) = @_; 1874 my (undef, $regex, $prio) = @_;
1661 my $pkg = caller; 1875 my $pkg = caller;
1662 1876
1663 no strict;
1664 push @{"$pkg\::ISA"}, __PACKAGE__; 1877 push @{"$pkg\::ISA"}, __PACKAGE__;
1665 1878
1666 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1879 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1667} 1880}
1668 1881
1669# also paths starting with '/' 1882# also paths starting with '/'
1670$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1883$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1671 1884
1672sub thawer_merge { 1885sub thawer_merge {
1673 my ($self, $merge) = @_; 1886 my ($self, $merge) = @_;
1674 1887
1675 # we have to keep some variables in memory intact 1888 # we have to keep some variables in memory intact
1680} 1893}
1681 1894
1682sub normalise { 1895sub normalise {
1683 my ($path, $base) = @_; 1896 my ($path, $base) = @_;
1684 1897
1685 $path = "$path"; # make sure its a string 1898 $path = "$path"; # make sure it's a string
1686 1899
1687 $path =~ s/\.map$//; 1900 $path =~ s/\.map$//;
1688 1901
1689 # map plan: 1902 # map plan:
1690 # 1903 #
1729 $self->init; # pass $1 etc. 1942 $self->init; # pass $1 etc.
1730 return $self; 1943 return $self;
1731 } 1944 }
1732 } 1945 }
1733 1946
1734 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1947 Carp::cluck "unable to resolve path '$path' (base '$base')";
1735 () 1948 ()
1736} 1949}
1737 1950
1738sub init { 1951sub init {
1739 my ($self) = @_; 1952 my ($self) = @_;
1761 1974
1762# the temporary/swap location 1975# the temporary/swap location
1763sub save_path { 1976sub save_path {
1764 my ($self) = @_; 1977 my ($self) = @_;
1765 1978
1766 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1979 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1767 "$TMPDIR/$path.map" 1980 "$TMPDIR/$path.map"
1768} 1981}
1769 1982
1770# the unique path, undef == no special unique path 1983# the unique path, undef == no special unique path
1771sub uniq_path { 1984sub uniq_path {
1772 my ($self) = @_; 1985 my ($self) = @_;
1773 1986
1774 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1987 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1775 "$UNIQUEDIR/$path" 1988 "$UNIQUEDIR/$path"
1776}
1777
1778# and all this just because we cannot iterate over
1779# all maps in C++...
1780sub change_all_map_light {
1781 my ($change) = @_;
1782
1783 $_->change_map_light ($change)
1784 for grep $_->outdoor, values %cf::MAP;
1785} 1989}
1786 1990
1787sub decay_objects { 1991sub decay_objects {
1788 my ($self) = @_; 1992 my ($self) = @_;
1789 1993
1871 2075
1872sub find; 2076sub find;
1873sub find { 2077sub find {
1874 my ($path, $origin) = @_; 2078 my ($path, $origin) = @_;
1875 2079
2080 cf::cede_to_tick;
2081
1876 $path = normalise $path, $origin && $origin->path; 2082 $path = normalise $path, $origin && $origin->path;
1877 2083
1878 cf::lock_wait "map_data:$path";#d#remove 2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1879 cf::lock_wait "map_find:$path"; 2085 my $guard2 = cf::lock_acquire "map_find:$path";
1880 2086
1881 $cf::MAP{$path} || do { 2087 $cf::MAP{$path} || do {
1882 my $guard1 = cf::lock_acquire "map_find:$path";
1883 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1884
1885 my $map = new_from_path cf::map $path 2088 my $map = new_from_path cf::map $path
1886 or return; 2089 or return;
1887 2090
1888 $map->{last_save} = $cf::RUNTIME; 2091 $map->{last_save} = $cf::RUNTIME;
1889 2092
1891 or return; 2094 or return;
1892 2095
1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2096 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1894 # doing this can freeze the server in a sync job, obviously 2097 # doing this can freeze the server in a sync job, obviously
1895 #$cf::WAIT_FOR_TICK->wait; 2098 #$cf::WAIT_FOR_TICK->wait;
2099 undef $guard2;
1896 undef $guard1; 2100 undef $guard1;
1897 undef $guard2;
1898 $map->reset; 2101 $map->reset;
1899 return find $path; 2102 return find $path;
1900 } 2103 }
1901 2104
1902 $cf::MAP{$path} = $map 2105 $cf::MAP{$path} = $map
1903 } 2106 }
1904} 2107}
1905 2108
1906sub pre_load { } 2109sub pre_load { }
1907sub post_load { } 2110#sub post_load { } # XS
1908 2111
1909sub load { 2112sub load {
1910 my ($self) = @_; 2113 my ($self) = @_;
1911 2114
1912 local $self->{deny_reset} = 1; # loading can take a long time 2115 local $self->{deny_reset} = 1; # loading can take a long time
1929 my $f = new_from_file cf::object::thawer $self->{load_path}; 2132 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block; 2133 $f->skip_block;
1931 $self->_load_objects ($f) 2134 $self->_load_objects ($f)
1932 or return; 2135 or return;
1933 2136
1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2137 $self->post_load_original
1935 if delete $self->{load_original}; 2138 if delete $self->{load_original};
1936 2139
1937 if (my $uniq = $self->uniq_path) { 2140 if (my $uniq = $self->uniq_path) {
1938 utf8::encode $uniq; 2141 utf8::encode $uniq;
1939 unless (aio_stat $uniq) { 2142 unless (aio_stat $uniq) {
1957 unless ($self->{deny_activate}) { 2160 unless ($self->{deny_activate}) {
1958 $self->decay_objects; 2161 $self->decay_objects;
1959 $self->fix_auto_apply; 2162 $self->fix_auto_apply;
1960 $self->update_buttons; 2163 $self->update_buttons;
1961 cf::cede_to_tick; 2164 cf::cede_to_tick;
1962 $self->set_darkness_map;
1963 cf::cede_to_tick;
1964 $self->activate; 2165 $self->activate;
1965 } 2166 }
1966 2167
1967 $self->{last_save} = $cf::RUNTIME; 2168 $self->{last_save} = $cf::RUNTIME;
1968 $self->last_access ($cf::RUNTIME); 2169 $self->last_access ($cf::RUNTIME);
1969 2170
1970 $self->in_memory (cf::MAP_IN_MEMORY); 2171 $self->in_memory (cf::MAP_ACTIVE);
1971 } 2172 }
1972 2173
1973 $self->post_load; 2174 $self->post_load;
1974} 2175}
1975 2176
2177# customize the map for a given player, i.e.
2178# return the _real_ map. used by e.g. per-player
2179# maps to change the path to ~playername/mappath
1976sub customise_for { 2180sub customise_for {
1977 my ($self, $ob) = @_; 2181 my ($self, $ob) = @_;
1978 2182
1979 return find "~" . $ob->name . "/" . $self->{path} 2183 return find "~" . $ob->name . "/" . $self->{path}
1980 if $self->per_player; 2184 if $self->per_player;
1996 or next; 2200 or next;
1997 $neigh = find $neigh, $map 2201 $neigh = find $neigh, $map
1998 or next; 2202 or next;
1999 $neigh->load; 2203 $neigh->load;
2000 2204
2205 # now find the diagonal neighbours
2001 push @neigh, 2206 push @neigh,
2002 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2207 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2003 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2208 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2004 } 2209 }
2005 2210
2012} 2217}
2013 2218
2014sub find_sync { 2219sub find_sync {
2015 my ($path, $origin) = @_; 2220 my ($path, $origin) = @_;
2016 2221
2017 cf::sync_job { find $path, $origin } 2222 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2223 if $Coro::current == $Coro::main;
2224
2225 find $path, $origin
2018} 2226}
2019 2227
2020sub do_load_sync { 2228sub do_load_sync {
2021 my ($map) = @_; 2229 my ($map) = @_;
2022 2230
2023 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2024 if $Coro::current == $Coro::main; 2232 if $Coro::current == $Coro::main;
2025 2233
2026 cf::sync_job { $map->load }; 2234 $map->load;
2027} 2235}
2028 2236
2029our %MAP_PREFETCH; 2237our %MAP_PREFETCH;
2030our $MAP_PREFETCHER = undef; 2238our $MAP_PREFETCHER = undef;
2031 2239
2033 my ($path, $origin, $load) = @_; 2241 my ($path, $origin, $load) = @_;
2034 2242
2035 $path = normalise $path, $origin && $origin->{path}; 2243 $path = normalise $path, $origin && $origin->{path};
2036 2244
2037 if (my $map = $cf::MAP{$path}) { 2245 if (my $map = $cf::MAP{$path}) {
2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2246 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2039 } 2247 }
2040 2248
2041 $MAP_PREFETCH{$path} |= $load; 2249 $MAP_PREFETCH{$path} |= $load;
2042 2250
2043 $MAP_PREFETCHER ||= cf::async { 2251 $MAP_PREFETCHER ||= cf::async {
2057 $MAP_PREFETCHER->prio (6); 2265 $MAP_PREFETCHER->prio (6);
2058 2266
2059 () 2267 ()
2060} 2268}
2061 2269
2270# common code, used by both ->save and ->swapout
2062sub save { 2271sub _save {
2063 my ($self) = @_; 2272 my ($self) = @_;
2064
2065 my $lock = cf::lock_acquire "map_data:$self->{path}";
2066 2273
2067 $self->{last_save} = $cf::RUNTIME; 2274 $self->{last_save} = $cf::RUNTIME;
2068 2275
2069 return unless $self->dirty; 2276 return unless $self->dirty;
2070 2277
2079 2286
2080 cf::async { 2287 cf::async {
2081 $Coro::current->{desc} = "map player save"; 2288 $Coro::current->{desc} = "map player save";
2082 $_->contr->save for $self->players; 2289 $_->contr->save for $self->players;
2083 }; 2290 };
2291
2292 cf::get_slot 0.02;
2084 2293
2085 if ($uniq) { 2294 if ($uniq) {
2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2295 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2087 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2296 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2088 } else { 2297 } else {
2089 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2298 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2090 } 2299 }
2091} 2300}
2092 2301
2302sub save {
2303 my ($self) = @_;
2304
2305 my $lock = cf::lock_acquire "map_data:$self->{path}";
2306
2307 $self->_save;
2308}
2309
2093sub swap_out { 2310sub swap_out {
2094 my ($self) = @_; 2311 my ($self) = @_;
2095 2312
2096 # save first because save cedes
2097 $self->save;
2098
2099 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2100 2314
2315 return if $self->in_memory != cf::MAP_ACTIVE;
2316 return if $self->{deny_save};
2101 return if $self->players; 2317 return if $self->players;
2102 return if $self->in_memory != cf::MAP_IN_MEMORY;
2103 return if $self->{deny_save};
2104 2318
2319 # first deactivate the map and "unlink" it from the core
2320 $self->deactivate;
2321 $_->clear_links_to ($self) for values %cf::MAP;
2105 $self->in_memory (cf::MAP_SWAPPED); 2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # then atomically save
2325 $self->_save;
2326
2327 # then free the map
2328 $self->clear;
2329}
2330
2331sub reset_at {
2332 my ($self) = @_;
2333
2334 # TODO: safety, remove and allow resettable per-player maps
2335 return 1e99 if $self->{deny_reset};
2336
2337 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2338 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2339
2340 $time + $to
2341}
2342
2343sub should_reset {
2344 my ($self) = @_;
2345
2346 $self->reset_at <= $cf::RUNTIME
2347}
2348
2349sub reset {
2350 my ($self) = @_;
2351
2352 my $lock = cf::lock_acquire "map_data:$self->{path}";
2353
2354 return if $self->players;
2355
2356 cf::trace "resetting map ", $self->path, "\n";
2357
2358 $self->in_memory (cf::MAP_SWAPPED);
2359
2360 # need to save uniques path
2361 unless ($self->{deny_save}) {
2362 my $uniq = $self->uniq_path; utf8::encode $uniq;
2363
2364 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2365 if $uniq;
2366 }
2367
2368 delete $cf::MAP{$self->path};
2106 2369
2107 $self->deactivate; 2370 $self->deactivate;
2108 $_->clear_links_to ($self) for values %cf::MAP; 2371 $_->clear_links_to ($self) for values %cf::MAP;
2109 $self->clear; 2372 $self->clear;
2110}
2111
2112sub reset_at {
2113 my ($self) = @_;
2114
2115 # TODO: safety, remove and allow resettable per-player maps
2116 return 1e99 if $self->{deny_reset};
2117
2118 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2119 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2120
2121 $time + $to
2122}
2123
2124sub should_reset {
2125 my ($self) = @_;
2126
2127 $self->reset_at <= $cf::RUNTIME
2128}
2129
2130sub reset {
2131 my ($self) = @_;
2132
2133 my $lock = cf::lock_acquire "map_data:$self->{path}";
2134
2135 return if $self->players;
2136
2137 warn "resetting map ", $self->path;
2138
2139 $self->in_memory (cf::MAP_SWAPPED);
2140
2141 # need to save uniques path
2142 unless ($self->{deny_save}) {
2143 my $uniq = $self->uniq_path; utf8::encode $uniq;
2144
2145 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2146 if $uniq;
2147 }
2148
2149 delete $cf::MAP{$self->path};
2150
2151 $self->deactivate;
2152 $_->clear_links_to ($self) for values %cf::MAP;
2153 $self->clear;
2154 2373
2155 $self->unlink_save; 2374 $self->unlink_save;
2156 $self->destroy; 2375 $self->destroy;
2157} 2376}
2158 2377
2166 2385
2167 delete $cf::MAP{$self->path}; 2386 delete $cf::MAP{$self->path};
2168 2387
2169 $self->unlink_save; 2388 $self->unlink_save;
2170 2389
2171 bless $self, "cf::map"; 2390 bless $self, "cf::map::wrap";
2172 delete $self->{deny_reset}; 2391 delete $self->{deny_reset};
2173 $self->{deny_save} = 1; 2392 $self->{deny_save} = 1;
2174 $self->reset_timeout (1); 2393 $self->reset_timeout (1);
2175 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2394 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2176 2395
2225 2444
2226sub unique_maps() { 2445sub unique_maps() {
2227 [ 2446 [
2228 map { 2447 map {
2229 utf8::decode $_; 2448 utf8::decode $_;
2230 /\.map$/ 2449 s/\.map$//; # TODO future compatibility hack
2450 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2451 ? ()
2231 ? normalise $_ 2452 : normalise $_
2232 : ()
2233 } @{ aio_readdir $UNIQUEDIR or [] } 2453 } @{ aio_readdir $UNIQUEDIR or [] }
2234 ] 2454 ]
2235} 2455}
2236 2456
2237package cf; 2457=item cf::map::static_maps
2458
2459Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2460file in the shared directory excluding F</styles> and F</editor>). May
2461block.
2462
2463=cut
2464
2465sub static_maps() {
2466 my @dirs = "";
2467 my @maps;
2468
2469 while (@dirs) {
2470 my $dir = shift @dirs;
2471
2472 next if $dir eq "/styles" || $dir eq "/editor";
2473
2474 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2475 or return;
2476
2477 for (@$files) {
2478 s/\.map$// or next;
2479 utf8::decode $_;
2480 push @maps, "$dir/$_";
2481 }
2482
2483 push @dirs, map "$dir/$_", @$dirs;
2484 }
2485
2486 \@maps
2487}
2238 2488
2239=back 2489=back
2240 2490
2241=head3 cf::object 2491=head3 cf::object
2242 2492
2246 2496
2247=over 4 2497=over 4
2248 2498
2249=item $ob->inv_recursive 2499=item $ob->inv_recursive
2250 2500
2251Returns the inventory of the object _and_ their inventories, recursively. 2501Returns the inventory of the object I<and> their inventories, recursively,
2502but I<not> the object itself.
2252 2503
2253=cut 2504=cut
2254 2505
2255sub inv_recursive_; 2506sub inv_recursive_;
2256sub inv_recursive_ { 2507sub inv_recursive_ {
2261 inv_recursive_ inv $_[0] 2512 inv_recursive_ inv $_[0]
2262} 2513}
2263 2514
2264=item $ref = $ob->ref 2515=item $ref = $ob->ref
2265 2516
2266creates and returns a persistent reference to an objetc that can be stored as a string. 2517Creates and returns a persistent reference to an object that can be stored as a string.
2267 2518
2268=item $ob = cf::object::deref ($refstring) 2519=item $ob = cf::object::deref ($refstring)
2269 2520
2270returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2521returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2271even if the object actually exists. May block. 2522even if the object actually exists. May block.
2273=cut 2524=cut
2274 2525
2275sub deref { 2526sub deref {
2276 my ($ref) = @_; 2527 my ($ref) = @_;
2277 2528
2278 # temporary compatibility#TODO#remove
2279 $ref =~ s{^<}{player/<};
2280
2281 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2529 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2282 my ($uuid, $name) = ($1, $2); 2530 my ($uuid, $name) = ($1, $2);
2283 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2531 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2284 or return; 2532 or return;
2285 $pl->ob->uuid eq $uuid 2533 $pl->ob->uuid eq $uuid
2286 or return; 2534 or return;
2306can be C<undef>. Does the right thing when the player is currently in a 2554can be C<undef>. Does the right thing when the player is currently in a
2307dialogue with the given NPC character. 2555dialogue with the given NPC character.
2308 2556
2309=cut 2557=cut
2310 2558
2559our $SAY_CHANNEL = {
2560 id => "say",
2561 title => "Map",
2562 reply => "say ",
2563 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2564};
2565
2566our $CHAT_CHANNEL = {
2567 id => "chat",
2568 title => "Chat",
2569 reply => "chat ",
2570 tooltip => "Player chat and shouts, global to the server.",
2571};
2572
2311# rough implementation of a future "reply" method that works 2573# rough implementation of a future "reply" method that works
2312# with dialog boxes. 2574# with dialog boxes.
2313#TODO: the first argument must go, split into a $npc->reply_to ( method 2575#TODO: the first argument must go, split into a $npc->reply_to ( method
2314sub cf::object::player::reply($$$;$) { 2576sub cf::object::player::reply($$$;$) {
2315 my ($self, $npc, $msg, $flags) = @_; 2577 my ($self, $npc, $msg, $flags) = @_;
2326 my $dialog = $pl->{npc_dialog}; 2588 my $dialog = $pl->{npc_dialog};
2327 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2589 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2328 2590
2329 } else { 2591 } else {
2330 $msg = $npc->name . " says: $msg" if $npc; 2592 $msg = $npc->name . " says: $msg" if $npc;
2331 $self->message ($msg, $flags); 2593 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2332 } 2594 }
2333 } 2595 }
2334} 2596}
2335 2597
2336=item $object->send_msg ($channel, $msg, $color, [extra...]) 2598=item $object->send_msg ($channel, $msg, $color, [extra...])
2361 2623
2362=item $player_object->enter_link 2624=item $player_object->enter_link
2363 2625
2364Freezes the player and moves him/her to a special map (C<{link}>). 2626Freezes the player and moves him/her to a special map (C<{link}>).
2365 2627
2366The player should be reasonably safe there for short amounts of time. You 2628The player should be reasonably safe there for short amounts of time (e.g.
2367I<MUST> call C<leave_link> as soon as possible, though. 2629for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2630though, as the player cannot control the character while it is on the link
2631map.
2368 2632
2369Will never block. 2633Will never block.
2370 2634
2371=item $player_object->leave_link ($map, $x, $y) 2635=item $player_object->leave_link ($map, $x, $y)
2372 2636
2392sub cf::object::player::enter_link { 2656sub cf::object::player::enter_link {
2393 my ($self) = @_; 2657 my ($self) = @_;
2394 2658
2395 $self->deactivate_recursive; 2659 $self->deactivate_recursive;
2396 2660
2661 ++$self->{_link_recursion};
2662
2397 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2663 return if UNIVERSAL::isa $self->map, "ext::map_link";
2398 2664
2399 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2665 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2400 if $self->map && $self->map->{path} ne "{link}"; 2666 if $self->map && $self->map->{path} ne "{link}";
2401 2667
2402 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2668 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2403} 2669}
2404 2670
2405sub cf::object::player::leave_link { 2671sub cf::object::player::leave_link {
2406 my ($self, $map, $x, $y) = @_; 2672 my ($self, $map, $x, $y) = @_;
2407 2673
2424 ($x, $y) = (-1, -1) 2690 ($x, $y) = (-1, -1)
2425 unless (defined $x) && (defined $y); 2691 unless (defined $x) && (defined $y);
2426 2692
2427 # use -1 or undef as default coordinates, not 0, 0 2693 # use -1 or undef as default coordinates, not 0, 0
2428 ($x, $y) = ($map->enter_x, $map->enter_y) 2694 ($x, $y) = ($map->enter_x, $map->enter_y)
2429 if $x <=0 && $y <= 0; 2695 if $x <= 0 && $y <= 0;
2430 2696
2431 $map->load; 2697 $map->load;
2432 $map->load_neighbours; 2698 $map->load_neighbours;
2433 2699
2434 return unless $self->contr->active; 2700 return unless $self->contr->active;
2435 $self->activate_recursive;
2436 2701
2437 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2702 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2438 $self->enter_map ($map, $x, $y); 2703 if ($self->enter_map ($map, $x, $y)) {
2439} 2704 # entering was successful
2705 delete $self->{_link_recursion};
2706 # only activate afterwards, to support waiting in hooks
2707 $self->activate_recursive;
2708 }
2440 2709
2710}
2711
2441=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2712=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2442 2713
2443Moves the player to the given map-path and coordinates by first freezing 2714Moves the player to the given map-path and coordinates by first freezing
2444her, loading and preparing them map, calling the provided $check callback 2715her, loading and preparing them map, calling the provided $check callback
2445that has to return the map if sucecssful, and then unfreezes the player on 2716that has to return the map if sucecssful, and then unfreezes the player on
2446the new (success) or old (failed) map position. In either case, $done will 2717the new (success) or old (failed) map position. In either case, $done will
2447be called at the end of this process. 2718be called at the end of this process.
2448 2719
2720Note that $check will be called with a potentially non-loaded map, so if
2721it needs a loaded map it has to call C<< ->load >>.
2722
2449=cut 2723=cut
2450 2724
2451our $GOTOGEN; 2725our $GOTOGEN;
2452 2726
2453sub cf::object::player::goto { 2727sub cf::object::player::goto {
2454 my ($self, $path, $x, $y, $check, $done) = @_; 2728 my ($self, $path, $x, $y, $check, $done) = @_;
2729
2730 if ($self->{_link_recursion} >= $MAX_LINKS) {
2731 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2732 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2733 ($path, $x, $y) = @$EMERGENCY_POSITION;
2734 }
2455 2735
2456 # do generation counting so two concurrent goto's will be executed in-order 2736 # do generation counting so two concurrent goto's will be executed in-order
2457 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2737 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2458 2738
2459 $self->enter_link; 2739 $self->enter_link;
2483 my $map = eval { 2763 my $map = eval {
2484 my $map = defined $path ? cf::map::find $path : undef; 2764 my $map = defined $path ? cf::map::find $path : undef;
2485 2765
2486 if ($map) { 2766 if ($map) {
2487 $map = $map->customise_for ($self); 2767 $map = $map->customise_for ($self);
2488 $map = $check->($map) if $check && $map; 2768 $map = $check->($map, $x, $y, $self) if $check && $map;
2489 } else { 2769 } else {
2490 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2770 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2491 } 2771 }
2492 2772
2493 $map 2773 $map
2501 if ($gen == $self->{_goto_generation}) { 2781 if ($gen == $self->{_goto_generation}) {
2502 delete $self->{_goto_generation}; 2782 delete $self->{_goto_generation};
2503 $self->leave_link ($map, $x, $y); 2783 $self->leave_link ($map, $x, $y);
2504 } 2784 }
2505 2785
2506 $done->() if $done; 2786 $done->($self) if $done;
2507 })->prio (1); 2787 })->prio (1);
2508} 2788}
2509 2789
2510=item $player_object->enter_exit ($exit_object) 2790=item $player_object->enter_exit ($exit_object)
2511 2791
2531} 2811}
2532 2812
2533sub prepare_random_map { 2813sub prepare_random_map {
2534 my ($exit) = @_; 2814 my ($exit) = @_;
2535 2815
2536 my $guard = cf::lock_acquire "exit_prepare:$exit";
2537
2538 # all this does is basically replace the /! path by 2816 # all this does is basically replace the /! path by
2539 # a new random map path (?random/...) with a seed 2817 # a new random map path (?random/...) with a seed
2540 # that depends on the exit object 2818 # that depends on the exit object
2541 2819
2542 my $rmp = parse_random_map_params $exit->msg; 2820 my $rmp = parse_random_map_params $exit->msg;
2544 if ($exit->map) { 2822 if ($exit->map) {
2545 $rmp->{region} = $exit->region->name; 2823 $rmp->{region} = $exit->region->name;
2546 $rmp->{origin_map} = $exit->map->path; 2824 $rmp->{origin_map} = $exit->map->path;
2547 $rmp->{origin_x} = $exit->x; 2825 $rmp->{origin_x} = $exit->x;
2548 $rmp->{origin_y} = $exit->y; 2826 $rmp->{origin_y} = $exit->y;
2827
2828 $exit->map->touch;
2549 } 2829 }
2550 2830
2551 $rmp->{random_seed} ||= $exit->random_seed; 2831 $rmp->{random_seed} ||= $exit->random_seed;
2552 2832
2553 my $data = cf::to_json $rmp; 2833 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2554 my $md5 = Digest::MD5::md5_hex $data; 2834 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2835 my $meta = "$RANDOMDIR/$md5.meta";
2556 2836
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2837 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2838 aio_write $fh, 0, (length $data), $data, 0;
2559 undef $fh; 2839 undef $fh;
2560 aio_rename "$meta~", $meta; 2840 aio_rename "$meta~", $meta;
2561 2841
2842 my $slaying = "?random/$md5";
2843
2844 if ($exit->valid) {
2562 $exit->slaying ("?random/$md5"); 2845 $exit->slaying ("?random/$md5");
2563 $exit->msg (undef); 2846 $exit->msg (undef);
2847 }
2564 } 2848 }
2565} 2849}
2566 2850
2567sub cf::object::player::enter_exit { 2851sub cf::object::player::enter_exit {
2568 my ($self, $exit) = @_; 2852 my ($self, $exit) = @_;
2569 2853
2570 return unless $self->type == cf::PLAYER; 2854 return unless $self->type == cf::PLAYER;
2571 2855
2572 if ($exit->slaying eq "/!") {
2573 #TODO: this should de-fi-ni-te-ly not be a sync-job
2574 # the problem is that $exit might not survive long enough
2575 # so it needs to be done right now, right here
2576 cf::sync_job { prepare_random_map $exit };
2577 }
2578
2579 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2580 my $hp = $exit->stats->hp;
2581 my $sp = $exit->stats->sp;
2582
2583 $self->enter_link; 2856 $self->enter_link;
2584 2857
2585 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED);
2588
2589 (async { 2858 (async {
2590 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2859 $Coro::current->{desc} = "enter_exit";
2591 2860
2592 $self->deactivate_recursive; # just to be sure
2593 unless (eval { 2861 unless (eval {
2862 $self->deactivate_recursive; # just to be sure
2863
2864 # random map handling
2865 {
2866 my $guard = cf::lock_acquire "exit_prepare:$exit";
2867
2868 prepare_random_map $exit
2869 if $exit->slaying eq "/!";
2870 }
2871
2872 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2873 my $x = $exit->stats->hp;
2874 my $y = $exit->stats->sp;
2875
2594 $self->goto ($slaying, $hp, $sp); 2876 $self->goto ($map, $x, $y);
2595 2877
2878 # if exit is damned, update players death & WoR home-position
2879 $self->contr->savebed ($map, $x, $y)
2880 if $exit->flag (cf::FLAG_DAMNED);
2881
2596 1; 2882 1
2597 }) { 2883 }) {
2598 $self->message ("Something went wrong deep within the crossfire server. " 2884 $self->message ("Something went wrong deep within the deliantra server. "
2599 . "I'll try to bring you back to the map you were before. " 2885 . "I'll try to bring you back to the map you were before. "
2600 . "Please report this to the dungeon master!", 2886 . "Please report this to the dungeon master!",
2601 cf::NDI_UNIQUE | cf::NDI_RED); 2887 cf::NDI_UNIQUE | cf::NDI_RED);
2602 2888
2603 warn "ERROR in enter_exit: $@"; 2889 error "ERROR in enter_exit: $@";
2604 $self->leave_link; 2890 $self->leave_link;
2605 } 2891 }
2606 })->prio (1); 2892 })->prio (1);
2607} 2893}
2608 2894
2620sub cf::client::send_drawinfo { 2906sub cf::client::send_drawinfo {
2621 my ($self, $text, $flags) = @_; 2907 my ($self, $text, $flags) = @_;
2622 2908
2623 utf8::encode $text; 2909 utf8::encode $text;
2624 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2910 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2911}
2912
2913=item $client->send_big_packet ($pkt)
2914
2915Like C<send_packet>, but tries to compress large packets, and fragments
2916them as required.
2917
2918=cut
2919
2920our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2921
2922sub cf::client::send_big_packet {
2923 my ($self, $pkt) = @_;
2924
2925 # try lzf for large packets
2926 $pkt = "lzf " . Compress::LZF::compress $pkt
2927 if 1024 <= length $pkt and $self->{can_lzf};
2928
2929 # split very large packets
2930 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2931 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2932 $pkt = "frag";
2933 }
2934
2935 $self->send_packet ($pkt);
2625} 2936}
2626 2937
2627=item $client->send_msg ($channel, $msg, $color, [extra...]) 2938=item $client->send_msg ($channel, $msg, $color, [extra...])
2628 2939
2629Send a drawinfo or msg packet to the client, formatting the msg for the 2940Send a drawinfo or msg packet to the client, formatting the msg for the
2631the message, with C<log> being the default. If C<$color> is negative, suppress 2942the message, with C<log> being the default. If C<$color> is negative, suppress
2632the message unless the client supports the msg packet. 2943the message unless the client supports the msg packet.
2633 2944
2634=cut 2945=cut
2635 2946
2947# non-persistent channels (usually the info channel)
2636our %CHANNEL = ( 2948our %CHANNEL = (
2949 "c/motd" => {
2950 id => "infobox",
2951 title => "MOTD",
2952 reply => undef,
2953 tooltip => "The message of the day",
2954 },
2637 "c/identify" => { 2955 "c/identify" => {
2638 id => "infobox", 2956 id => "infobox",
2639 title => "Identify", 2957 title => "Identify",
2640 reply => undef, 2958 reply => undef,
2641 tooltip => "Items recently identified", 2959 tooltip => "Items recently identified",
2644 id => "infobox", 2962 id => "infobox",
2645 title => "Examine", 2963 title => "Examine",
2646 reply => undef, 2964 reply => undef,
2647 tooltip => "Signs and other items you examined", 2965 tooltip => "Signs and other items you examined",
2648 }, 2966 },
2967 "c/shopinfo" => {
2968 id => "infobox",
2969 title => "Shop Info",
2970 reply => undef,
2971 tooltip => "What your bargaining skill tells you about the shop",
2972 },
2973 "c/book" => {
2974 id => "infobox",
2975 title => "Book",
2976 reply => undef,
2977 tooltip => "The contents of a note or book",
2978 },
2649 "c/lookat" => { 2979 "c/lookat" => {
2650 id => "infobox", 2980 id => "infobox",
2651 title => "Look", 2981 title => "Look",
2652 reply => undef, 2982 reply => undef,
2653 tooltip => "What you saw there", 2983 tooltip => "What you saw there",
2654 }, 2984 },
2985 "c/who" => {
2986 id => "infobox",
2987 title => "Players",
2988 reply => undef,
2989 tooltip => "Shows players who are currently online",
2990 },
2991 "c/body" => {
2992 id => "infobox",
2993 title => "Body Parts",
2994 reply => undef,
2995 tooltip => "Shows which body parts you posess and are available",
2996 },
2997 "c/statistics" => {
2998 id => "infobox",
2999 title => "Statistics",
3000 reply => undef,
3001 tooltip => "Shows your primary statistics",
3002 },
3003 "c/skills" => {
3004 id => "infobox",
3005 title => "Skills",
3006 reply => undef,
3007 tooltip => "Shows your experience per skill and item power",
3008 },
3009 "c/shopitems" => {
3010 id => "infobox",
3011 title => "Shop Items",
3012 reply => undef,
3013 tooltip => "Shows the items currently for sale in this shop",
3014 },
3015 "c/resistances" => {
3016 id => "infobox",
3017 title => "Resistances",
3018 reply => undef,
3019 tooltip => "Shows your resistances",
3020 },
3021 "c/pets" => {
3022 id => "infobox",
3023 title => "Pets",
3024 reply => undef,
3025 tooltip => "Shows information abotu your pets/a specific pet",
3026 },
3027 "c/perceiveself" => {
3028 id => "infobox",
3029 title => "Perceive Self",
3030 reply => undef,
3031 tooltip => "You gained detailed knowledge about yourself",
3032 },
3033 "c/uptime" => {
3034 id => "infobox",
3035 title => "Uptime",
3036 reply => undef,
3037 tooltip => "How long the server has been running since last restart",
3038 },
3039 "c/mapinfo" => {
3040 id => "infobox",
3041 title => "Map Info",
3042 reply => undef,
3043 tooltip => "Information related to the maps",
3044 },
3045 "c/party" => {
3046 id => "party",
3047 title => "Party",
3048 reply => "gsay ",
3049 tooltip => "Messages and chat related to your party",
3050 },
3051 "c/death" => {
3052 id => "death",
3053 title => "Death",
3054 reply => undef,
3055 tooltip => "Reason for and more info about your most recent death",
3056 },
3057 "c/say" => $SAY_CHANNEL,
3058 "c/chat" => $CHAT_CHANNEL,
2655); 3059);
2656 3060
2657sub cf::client::send_msg { 3061sub cf::client::send_msg {
2658 my ($self, $channel, $msg, $color, @extra) = @_; 3062 my ($self, $channel, $msg, $color, @extra) = @_;
2659 3063
2660 $msg = $self->pl->expand_cfpod ($msg); 3064 $msg = $self->pl->expand_cfpod ($msg)
3065 unless $color & cf::NDI_VERBATIM;
2661 3066
2662 $color &= cf::NDI_CLIENT_MASK; # just in case... 3067 $color &= cf::NDI_CLIENT_MASK; # just in case...
2663 3068
2664 # check predefined channels, for the benefit of C 3069 # check predefined channels, for the benefit of C
2665 if ($CHANNEL{$channel}) { 3070 if ($CHANNEL{$channel}) {
2666 $channel = $CHANNEL{$channel}; 3071 $channel = $CHANNEL{$channel};
2667 3072
2668 $self->ext_msg (channel_info => $channel) 3073 $self->ext_msg (channel_info => $channel);
2669 if $self->can_msg;
2670
2671 $channel = $channel->{id}; 3074 $channel = $channel->{id};
2672 3075
2673 } elsif (ref $channel) { 3076 } elsif (ref $channel) {
2674 # send meta info to client, if not yet sent 3077 # send meta info to client, if not yet sent
2675 unless (exists $self->{channel}{$channel->{id}}) { 3078 unless (exists $self->{channel}{$channel->{id}}) {
2676 $self->{channel}{$channel->{id}} = $channel; 3079 $self->{channel}{$channel->{id}} = $channel;
2677 $self->ext_msg (channel_info => $channel) 3080 $self->ext_msg (channel_info => $channel);
2678 if $self->can_msg;
2679 } 3081 }
2680 3082
2681 $channel = $channel->{id}; 3083 $channel = $channel->{id};
2682 } 3084 }
2683 3085
2684 return unless @extra || length $msg; 3086 return unless @extra || length $msg;
2685 3087
2686 if ($self->can_msg) {
2687 # default colour, mask it out 3088 # default colour, mask it out
2688 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3089 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2689 if $color & cf::NDI_DEF; 3090 if $color & cf::NDI_DEF;
2690 3091
2691 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3092 my $pkt = "msg "
3093 . $self->{json_coder}->encode (
2692 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3094 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2693 } else { 3095 );
2694 if ($color >= 0) {
2695 # replace some tags by gcfclient-compatible ones
2696 for ($msg) {
2697 1 while
2698 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2699 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2700 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2701 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2702 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2703 }
2704 3096
2705 $color &= cf::NDI_COLOR_MASK; 3097 $self->send_big_packet ($pkt);
2706
2707 utf8::encode $msg;
2708
2709 if (0 && $msg =~ /\[/) {
2710 # COMMAND/INFO
2711 $self->send_packet ("drawextinfo $color 10 8 $msg")
2712 } else {
2713 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2714 $self->send_packet ("drawinfo $color $msg")
2715 }
2716 }
2717 }
2718} 3098}
2719 3099
2720=item $client->ext_msg ($type, @msg) 3100=item $client->ext_msg ($type, @msg)
2721 3101
2722Sends an ext event to the client. 3102Sends an ext event to the client.
2725 3105
2726sub cf::client::ext_msg($$@) { 3106sub cf::client::ext_msg($$@) {
2727 my ($self, $type, @msg) = @_; 3107 my ($self, $type, @msg) = @_;
2728 3108
2729 if ($self->extcmd == 2) { 3109 if ($self->extcmd == 2) {
2730 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3110 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2731 } elsif ($self->extcmd == 1) { # TODO: remove 3111 } elsif ($self->extcmd == 1) { # TODO: remove
2732 push @msg, msgtype => "event_$type"; 3112 push @msg, msgtype => "event_$type";
2733 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3113 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2734 } 3114 }
2735} 3115}
2736 3116
2737=item $client->ext_reply ($msgid, @msg) 3117=item $client->ext_reply ($msgid, @msg)
2738 3118
2742 3122
2743sub cf::client::ext_reply($$@) { 3123sub cf::client::ext_reply($$@) {
2744 my ($self, $id, @msg) = @_; 3124 my ($self, $id, @msg) = @_;
2745 3125
2746 if ($self->extcmd == 2) { 3126 if ($self->extcmd == 2) {
2747 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2748 } elsif ($self->extcmd == 1) { 3128 } elsif ($self->extcmd == 1) {
2749 #TODO: version 1, remove 3129 #TODO: version 1, remove
2750 unshift @msg, msgtype => "reply", msgid => $id; 3130 unshift @msg, msgtype => "reply", msgid => $id;
2751 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3131 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2752 } 3132 }
2753} 3133}
2754 3134
2755=item $success = $client->query ($flags, "text", \&cb) 3135=item $success = $client->query ($flags, "text", \&cb)
2756 3136
2827 3207
2828 $ns->ext_reply ($reply, @reply) 3208 $ns->ext_reply ($reply, @reply)
2829 if $reply; 3209 if $reply;
2830 3210
2831 } else { 3211 } else {
2832 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3212 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2833 } 3213 }
2834 3214
2835 cf::override; 3215 cf::override;
2836 }, 3216 },
2837); 3217);
2857 3237
2858 $coro 3238 $coro
2859} 3239}
2860 3240
2861cf::client->attach ( 3241cf::client->attach (
2862 on_destroy => sub { 3242 on_client_destroy => sub {
2863 my ($ns) = @_; 3243 my ($ns) = @_;
2864 3244
2865 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3245 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2866 }, 3246 },
2867); 3247);
2883our $safe_hole = new Safe::Hole; 3263our $safe_hole = new Safe::Hole;
2884 3264
2885$SIG{FPE} = 'IGNORE'; 3265$SIG{FPE} = 'IGNORE';
2886 3266
2887$safe->permit_only (Opcode::opset qw( 3267$safe->permit_only (Opcode::opset qw(
2888 :base_core :base_mem :base_orig :base_math 3268 :base_core :base_mem :base_orig :base_math :base_loop
2889 grepstart grepwhile mapstart mapwhile 3269 grepstart grepwhile mapstart mapwhile
2890 sort time 3270 sort time
2891)); 3271));
2892 3272
2893# here we export the classes and methods available to script code 3273# here we export the classes and methods available to script code
2895=pod 3275=pod
2896 3276
2897The following functions and methods are available within a safe environment: 3277The following functions and methods are available within a safe environment:
2898 3278
2899 cf::object 3279 cf::object
2900 contr pay_amount pay_player map x y force_find force_add 3280 contr pay_amount pay_player map x y force_find force_add destroy
2901 insert remove name archname title slaying race decrease_ob_nr 3281 insert remove name archname title slaying race decrease split
3282 value
2902 3283
2903 cf::object::player 3284 cf::object::player
2904 player 3285 player
2905 3286
2906 cf::player 3287 cf::player
2911 3292
2912=cut 3293=cut
2913 3294
2914for ( 3295for (
2915 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3296 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2916 insert remove inv name archname title slaying race 3297 insert remove inv nrof name archname title slaying race
2917 decrease_ob_nr)], 3298 decrease split destroy change_exp value msg lore send_msg)],
2918 ["cf::object::player" => qw(player)], 3299 ["cf::object::player" => qw(player)],
2919 ["cf::player" => qw(peaceful)], 3300 ["cf::player" => qw(peaceful send_msg)],
2920 ["cf::map" => qw(trigger)], 3301 ["cf::map" => qw(trigger)],
2921) { 3302) {
2922 no strict 'refs';
2923 my ($pkg, @funs) = @$_; 3303 my ($pkg, @funs) = @$_;
2924 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3304 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2925 for @funs; 3305 for @funs;
2926} 3306}
2927 3307
2942 3322
2943 my $qcode = $code; 3323 my $qcode = $code;
2944 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3324 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2945 $qcode =~ s/\n/\\n/g; 3325 $qcode =~ s/\n/\\n/g;
2946 3326
3327 %vars = (_dummy => 0) unless %vars;
3328
3329 my @res;
2947 local $_; 3330 local $_;
2948 local @safe::cf::_safe_eval_args = values %vars;
2949 3331
2950 my $eval = 3332 my $eval =
2951 "do {\n" 3333 "do {\n"
2952 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3334 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2953 . "#line 0 \"{$qcode}\"\n" 3335 . "#line 0 \"{$qcode}\"\n"
2954 . $code 3336 . $code
2955 . "\n}" 3337 . "\n}"
2956 ; 3338 ;
2957 3339
3340 if ($CFG{safe_eval}) {
2958 sub_generation_inc; 3341 sub_generation_inc;
3342 local @safe::cf::_safe_eval_args = values %vars;
2959 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3343 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2960 sub_generation_inc; 3344 sub_generation_inc;
3345 } else {
3346 local @cf::_safe_eval_args = values %vars;
3347 @res = wantarray ? eval eval : scalar eval $eval;
3348 }
2961 3349
2962 if ($@) { 3350 if ($@) {
2963 warn "$@"; 3351 warn "$@",
2964 warn "while executing safe code '$code'\n"; 3352 "while executing safe code '$code'\n",
2965 warn "with arguments " . (join " ", %vars) . "\n"; 3353 "with arguments " . (join " ", %vars) . "\n";
2966 } 3354 }
2967 3355
2968 wantarray ? @res : $res[0] 3356 wantarray ? @res : $res[0]
2969} 3357}
2970 3358
2984=cut 3372=cut
2985 3373
2986sub register_script_function { 3374sub register_script_function {
2987 my ($fun, $cb) = @_; 3375 my ($fun, $cb) = @_;
2988 3376
2989 no strict 'refs'; 3377 $fun = "safe::$fun" if $CFG{safe_eval};
2990 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3378 *$fun = $safe_hole->wrap ($cb);
2991} 3379}
2992 3380
2993=back 3381=back
2994 3382
2995=cut 3383=cut
3004 # for this (global event?) 3392 # for this (global event?)
3005 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3006 3394
3007 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3395 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3008 3396
3009 warn "loading facedata from $path\n"; 3397 trace "loading facedata from $path\n";
3010 3398
3011 my $facedata;
3012 0 < aio_load $path, $facedata 3399 0 < aio_load $path, my $facedata
3013 or die "$path: $!"; 3400 or die "$path: $!";
3014 3401
3015 $facedata = Coro::Storable::thaw $facedata; 3402 $facedata = Coro::Storable::thaw $facedata;
3016 3403
3017 $facedata->{version} == 2 3404 $facedata->{version} == 2
3018 or cf::cleanup "$path: version mismatch, cannot proceed."; 3405 or cf::cleanup "$path: version mismatch, cannot proceed.";
3019 3406
3020 # patch in the exptable 3407 # patch in the exptable
3408 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3021 $facedata->{resource}{"res/exp_table"} = { 3409 $facedata->{resource}{"res/exp_table"} = {
3022 type => FT_RSRC, 3410 type => FT_RSRC,
3023 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3411 data => $exp_table,
3412 hash => (Digest::MD5::md5 $exp_table),
3024 }; 3413 };
3025 cf::cede_to_tick; 3414 cf::cede_to_tick;
3026 3415
3027 { 3416 {
3028 my $faces = $facedata->{faceinfo}; 3417 my $faces = $facedata->{faceinfo};
3029 3418
3030 while (my ($face, $info) = each %$faces) { 3419 while (my ($face, $info) = each %$faces) {
3031 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3420 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3421
3032 cf::face::set_visibility $idx, $info->{visibility}; 3422 cf::face::set_visibility $idx, $info->{visibility};
3033 cf::face::set_magicmap $idx, $info->{magicmap}; 3423 cf::face::set_magicmap $idx, $info->{magicmap};
3034 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3424 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3035 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3425 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3036 3426
3037 cf::cede_to_tick; 3427 cf::cede_to_tick;
3038 } 3428 }
3039 3429
3040 while (my ($face, $info) = each %$faces) { 3430 while (my ($face, $info) = each %$faces) {
3041 next unless $info->{smooth}; 3431 next unless $info->{smooth};
3432
3042 my $idx = cf::face::find $face 3433 my $idx = cf::face::find $face
3043 or next; 3434 or next;
3435
3044 if (my $smooth = cf::face::find $info->{smooth}) { 3436 if (my $smooth = cf::face::find $info->{smooth}) {
3045 cf::face::set_smooth $idx, $smooth; 3437 cf::face::set_smooth $idx, $smooth;
3046 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3438 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3047 } else { 3439 } else {
3048 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3440 error "smooth face '$info->{smooth}' not found for face '$face'";
3049 } 3441 }
3050 3442
3051 cf::cede_to_tick; 3443 cf::cede_to_tick;
3052 } 3444 }
3053 } 3445 }
3062 3454
3063 cf::anim::invalidate_all; # d'oh 3455 cf::anim::invalidate_all; # d'oh
3064 } 3456 }
3065 3457
3066 { 3458 {
3067 # TODO: for gcfclient pleasure, we should give resources
3068 # that gcfclient doesn't grok a >10000 face index.
3069 my $res = $facedata->{resource}; 3459 my $res = $facedata->{resource};
3070 3460
3071 my $soundconf = delete $res->{"res/sound.conf"};
3072
3073 while (my ($name, $info) = each %$res) { 3461 while (my ($name, $info) = each %$res) {
3462 if (defined $info->{type}) {
3074 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3463 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3075 my $data;
3076 3464
3077 if ($info->{type} & 1) { 3465 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3078 # prepend meta info 3466 cf::face::set_type $idx, $info->{type};
3079
3080 my $meta = $enc->encode ({
3081 name => $name,
3082 %{ $info->{meta} || {} },
3083 });
3084
3085 $data = pack "(w/a*)*", $meta, $info->{data};
3086 } else { 3467 } else {
3087 $data = $info->{data}; 3468 $RESOURCE{$name} = $info; # unused
3088 } 3469 }
3089 3470
3090 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3091 cf::face::set_type $idx, $info->{type};
3092
3093 cf::cede_to_tick; 3471 cf::cede_to_tick;
3094 } 3472 }
3095
3096 if ($soundconf) {
3097 $soundconf = $enc->decode (delete $soundconf->{data});
3098
3099 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3100 my $sound = $soundconf->{compat}[$_]
3101 or next;
3102
3103 my $face = cf::face::find "sound/$sound->[1]";
3104 cf::sound::set $sound->[0] => $face;
3105 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3106 }
3107
3108 while (my ($k, $v) = each %{$soundconf->{event}}) {
3109 my $face = cf::face::find "sound/$v";
3110 cf::sound::set $k => $face;
3111 }
3112 }
3113 } 3473 }
3474
3475 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3114 3476
3115 1 3477 1
3116} 3478}
3117 3479
3118register_exticmd fx_want => sub { 3480register_exticmd fx_want => sub {
3120 3482
3121 while (my ($k, $v) = each %$want) { 3483 while (my ($k, $v) = each %$want) {
3122 $ns->fx_want ($k, $v); 3484 $ns->fx_want ($k, $v);
3123 } 3485 }
3124}; 3486};
3487
3488sub load_resource_file($) {
3489 my $guard = lock_acquire "load_resource_file";
3490
3491 my $status = load_resource_file_ $_[0];
3492 get_slot 0.1, 100;
3493 cf::arch::commit_load;
3494
3495 $status
3496}
3125 3497
3126sub reload_regions { 3498sub reload_regions {
3127 # HACK to clear player env face cache, we need some signal framework 3499 # HACK to clear player env face cache, we need some signal framework
3128 # for this (global event?) 3500 # for this (global event?)
3129 %ext::player_env::MUSIC_FACE_CACHE = (); 3501 %ext::player_env::MUSIC_FACE_CACHE = ();
3143} 3515}
3144 3516
3145sub reload_archetypes { 3517sub reload_archetypes {
3146 load_resource_file "$DATADIR/archetypes" 3518 load_resource_file "$DATADIR/archetypes"
3147 or die "unable to load archetypes\n"; 3519 or die "unable to load archetypes\n";
3148 #d# NEED to laod twice to resolve forward references
3149 # this really needs to be done in an extra post-pass
3150 # (which needs to be synchronous, so solve it differently)
3151 load_resource_file "$DATADIR/archetypes"
3152 or die "unable to load archetypes\n";
3153} 3520}
3154 3521
3155sub reload_treasures { 3522sub reload_treasures {
3156 load_resource_file "$DATADIR/treasures" 3523 load_resource_file "$DATADIR/treasures"
3157 or die "unable to load treasurelists\n"; 3524 or die "unable to load treasurelists\n";
3158} 3525}
3159 3526
3527sub reload_sound {
3528 trace "loading sound config from $DATADIR/sound\n";
3529
3530 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3531 or die "$DATADIR/sound $!";
3532
3533 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3534
3535 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3536 my $sound = $soundconf->{compat}[$_]
3537 or next;
3538
3539 my $face = cf::face::find "sound/$sound->[1]";
3540 cf::sound::set $sound->[0] => $face;
3541 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3542 }
3543
3544 while (my ($k, $v) = each %{$soundconf->{event}}) {
3545 my $face = cf::face::find "sound/$v";
3546 cf::sound::set $k => $face;
3547 }
3548}
3549
3160sub reload_resources { 3550sub reload_resources {
3161 warn "reloading resource files...\n"; 3551 trace "reloading resource files...\n";
3162 3552
3553 reload_exp_table;
3554 reload_materials;
3555 reload_facedata;
3556 reload_sound;
3557 reload_archetypes;
3163 reload_regions; 3558 reload_regions;
3164 reload_facedata;
3165 #reload_archetypes;#d#
3166 reload_archetypes;
3167 reload_treasures; 3559 reload_treasures;
3168 3560
3169 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3170}
3171
3172sub init {
3173 reload_resources;
3174} 3562}
3175 3563
3176sub reload_config { 3564sub reload_config {
3177 open my $fh, "<:utf8", "$CONFDIR/config" 3565 trace "reloading config file...\n";
3178 or return;
3179 3566
3180 local $/; 3567 0 < aio_load "$CONFDIR/config", my $config
3181 *CFG = YAML::Syck::Load <$fh>; 3568 or die "$CONFDIR/config: $!";
3182 3569
3570 utf8::decode $config;
3571 *CFG = yaml_load $config;
3572
3183 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3184 3574
3185 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3575 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3186 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3576 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3187 3577
3188 if (exists $CFG{mlockall}) { 3578 if (exists $CFG{mlockall}) {
3192 }; 3582 };
3193 warn $@ if $@; 3583 warn $@ if $@;
3194 } 3584 }
3195} 3585}
3196 3586
3587sub pidfile() {
3588 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3589 or die "$PIDFILE: $!";
3590 flock $fh, &Fcntl::LOCK_EX
3591 or die "$PIDFILE: flock: $!";
3592 $fh
3593}
3594
3595# make sure only one server instance is running at any one time
3596sub atomic {
3597 my $fh = pidfile;
3598
3599 my $pid = <$fh>;
3600 kill 9, $pid if $pid > 0;
3601
3602 seek $fh, 0, 0;
3603 print $fh $$;
3604}
3605
3606sub main_loop {
3607 trace "EV::loop starting\n";
3608 if (1) {
3609 EV::loop;
3610 }
3611 trace "EV::loop returned\n";
3612 goto &main_loop unless $REALLY_UNLOOP;
3613}
3614
3197sub main { 3615sub main {
3616 cf::init_globals; # initialise logging
3617
3618 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3619 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3620 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3621 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3622
3623 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3624
3198 # we must not ever block the main coroutine 3625 # we must not ever block the main coroutine
3199 local $Coro::idle = sub { 3626 local $Coro::idle = sub {
3200 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3627 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3201 (async { 3628 (async {
3202 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3629 $Coro::current->{desc} = "IDLE BUG HANDLER";
3203 Event::one_event; 3630 EV::loop EV::LOOP_ONESHOT;
3204 })->prio (Coro::PRIO_MAX); 3631 })->prio (Coro::PRIO_MAX);
3205 }; 3632 };
3206 3633
3634 evthread_start IO::AIO::poll_fileno;
3635
3636 cf::sync_job {
3637 cf::incloader::init ();
3638
3639 cf::init_anim;
3640 cf::init_attackmess;
3641 cf::init_dynamic;
3642
3643 cf::load_settings;
3644
3645 reload_resources;
3207 reload_config; 3646 reload_config;
3208 db_init; 3647 db_init;
3648
3649 cf::init_uuid;
3650 cf::init_signals;
3651 cf::init_skills;
3652
3653 cf::init_beforeplay;
3654
3655 atomic;
3656
3209 load_extensions; 3657 load_extensions;
3210 3658
3211 $TICK_WATCHER->start; 3659 utime time, time, $RUNTIMEFILE;
3212 Event::loop; 3660
3661 # no (long-running) fork's whatsoever before this point(!)
3662 use POSIX ();
3663 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3664
3665 (pop @POST_INIT)->(0) while @POST_INIT;
3666 };
3667
3668 cf::object::thawer::errors_are_fatal 0;
3669 info "parse errors in files are no longer fatal from this point on.\n";
3670
3671 my $free_main; $free_main = EV::idle sub {
3672 undef $free_main;
3673 undef &main; # free gobs of memory :)
3674 };
3675
3676 goto &main_loop;
3213} 3677}
3214 3678
3215############################################################################# 3679#############################################################################
3216# initialisation and cleanup 3680# initialisation and cleanup
3217 3681
3218# install some emergency cleanup handlers 3682# install some emergency cleanup handlers
3219BEGIN { 3683BEGIN {
3684 our %SIGWATCHER = ();
3220 for my $signal (qw(INT HUP TERM)) { 3685 for my $signal (qw(INT HUP TERM)) {
3221 Event->signal ( 3686 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3222 reentrant => 0,
3223 data => WF_AUTOCANCEL,
3224 signal => $signal,
3225 prio => 0,
3226 cb => sub {
3227 cf::cleanup "SIG$signal"; 3687 cf::cleanup "SIG$signal";
3228 },
3229 ); 3688 };
3230 } 3689 }
3231} 3690}
3232 3691
3233sub write_runtime { 3692sub write_runtime_sync {
3234 my $runtime = "$LOCALDIR/runtime"; 3693 my $t0 = AE::time;
3235 3694
3236 # first touch the runtime file to show we are still running: 3695 # first touch the runtime file to show we are still running:
3237 # the fsync below can take a very very long time. 3696 # the fsync below can take a very very long time.
3238 3697
3239 IO::AIO::aio_utime $runtime, undef, undef; 3698 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3240 3699
3241 my $guard = cf::lock_acquire "write_runtime"; 3700 my $guard = cf::lock_acquire "write_runtime";
3242 3701
3243 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3702 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3244 or return; 3703 or return;
3245 3704
3246 my $value = $cf::RUNTIME + 90 + 10; 3705 my $value = $cf::RUNTIME + 90 + 10;
3247 # 10 is the runtime save interval, for a monotonic clock 3706 # 10 is the runtime save interval, for a monotonic clock
3248 # 60 allows for the watchdog to kill the server. 3707 # 60 allows for the watchdog to kill the server.
3258 aio_utime $fh, undef, undef; 3717 aio_utime $fh, undef, undef;
3259 3718
3260 close $fh 3719 close $fh
3261 or return; 3720 or return;
3262 3721
3263 aio_rename "$runtime~", $runtime 3722 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3264 and return; 3723 and return;
3265 3724
3266 warn "runtime file written.\n"; 3725 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3267 3726
3268 1 3727 1
3728}
3729
3730our $uuid_lock;
3731our $uuid_skip;
3732
3733sub write_uuid_sync($) {
3734 $uuid_skip ||= $_[0];
3735
3736 return if $uuid_lock;
3737 local $uuid_lock = 1;
3738
3739 my $uuid = "$LOCALDIR/uuid";
3740
3741 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3742 or return;
3743
3744 my $value = uuid_seq uuid_cur;
3745
3746 unless ($value) {
3747 info "cowardly refusing to write zero uuid value!\n";
3748 return;
3749 }
3750
3751 my $value = uuid_str $value + $uuid_skip;
3752 $uuid_skip = 0;
3753
3754 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3755 and return;
3756
3757 # always fsync - this file is important
3758 aio_fsync $fh
3759 and return;
3760
3761 close $fh
3762 or return;
3763
3764 aio_rename "$uuid~", $uuid
3765 and return;
3766
3767 trace "uuid file written ($value).\n";
3768
3769 1
3770
3771}
3772
3773sub write_uuid($$) {
3774 my ($skip, $sync) = @_;
3775
3776 $sync ? write_uuid_sync $skip
3777 : async { write_uuid_sync $skip };
3269} 3778}
3270 3779
3271sub emergency_save() { 3780sub emergency_save() {
3272 my $freeze_guard = cf::freeze_mainloop; 3781 my $freeze_guard = cf::freeze_mainloop;
3273 3782
3274 warn "enter emergency perl save\n"; 3783 info "emergency_perl_save: enter\n";
3784
3785 # this is a trade-off: we want to be very quick here, so
3786 # save all maps without fsync, and later call a global sync
3787 # (which in turn might be very very slow)
3788 local $USE_FSYNC = 0;
3275 3789
3276 cf::sync_job { 3790 cf::sync_job {
3791 cf::write_runtime_sync; # external watchdog should not bark
3792
3277 # use a peculiar iteration method to avoid tripping on perl 3793 # use a peculiar iteration method to avoid tripping on perl
3278 # refcount bugs in for. also avoids problems with players 3794 # refcount bugs in for. also avoids problems with players
3279 # and maps saved/destroyed asynchronously. 3795 # and maps saved/destroyed asynchronously.
3280 warn "begin emergency player save\n"; 3796 info "emergency_perl_save: begin player save\n";
3281 for my $login (keys %cf::PLAYER) { 3797 for my $login (keys %cf::PLAYER) {
3282 my $pl = $cf::PLAYER{$login} or next; 3798 my $pl = $cf::PLAYER{$login} or next;
3283 $pl->valid or next; 3799 $pl->valid or next;
3800 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3284 $pl->save; 3801 $pl->save;
3285 } 3802 }
3286 warn "end emergency player save\n"; 3803 info "emergency_perl_save: end player save\n";
3287 3804
3288 warn "begin emergency map save\n"; 3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3807 info "emergency_perl_save: begin map save\n";
3289 for my $path (keys %cf::MAP) { 3808 for my $path (keys %cf::MAP) {
3290 my $map = $cf::MAP{$path} or next; 3809 my $map = $cf::MAP{$path} or next;
3291 $map->valid or next; 3810 $map->valid or next;
3292 $map->save; 3811 $map->save;
3293 } 3812 }
3294 warn "end emergency map save\n"; 3813 info "emergency_perl_save: end map save\n";
3295 3814
3296 warn "begin emergency database checkpoint\n"; 3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 info "emergency_perl_save: begin database checkpoint\n";
3297 BDB::db_env_txn_checkpoint $DB_ENV; 3818 BDB::db_env_txn_checkpoint $DB_ENV;
3298 warn "end emergency database checkpoint\n"; 3819 info "emergency_perl_save: end database checkpoint\n";
3820
3821 info "emergency_perl_save: begin write uuid\n";
3822 write_uuid_sync 1;
3823 info "emergency_perl_save: end write uuid\n";
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: syncing database to disk";
3828 BDB::db_env_txn_checkpoint $DB_ENV;
3829
3830 info "emergency_perl_save: starting sync\n";
3831 IO::AIO::aio_sync sub {
3832 info "emergency_perl_save: finished sync\n";
3833 };
3834
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3837 trace "emergency_perl_save: flushing outstanding aio requests";
3838 while (IO::AIO::nreqs || BDB::nreqs) {
3839 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3840 }
3841
3842 cf::write_runtime_sync; # external watchdog should not bark
3299 }; 3843 };
3300 3844
3301 warn "leave emergency perl save\n"; 3845 info "emergency_perl_save: leave\n";
3302} 3846}
3303 3847
3304sub post_cleanup { 3848sub post_cleanup {
3305 my ($make_core) = @_; 3849 my ($make_core) = @_;
3306 3850
3851 IO::AIO::flush;
3852
3307 warn Carp::longmess "post_cleanup backtrace" 3853 error Carp::longmess "post_cleanup backtrace"
3308 if $make_core; 3854 if $make_core;
3855
3856 my $fh = pidfile;
3857 unlink $PIDFILE if <$fh> == $$;
3858}
3859
3860# a safer delete_package, copied from Symbol
3861sub clear_package($) {
3862 my $pkg = shift;
3863
3864 # expand to full symbol table name if needed
3865 unless ($pkg =~ /^main::.*::$/) {
3866 $pkg = "main$pkg" if $pkg =~ /^::/;
3867 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3868 $pkg .= '::' unless $pkg =~ /::$/;
3869 }
3870
3871 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3872 my $stem_symtab = *{$stem}{HASH};
3873
3874 defined $stem_symtab and exists $stem_symtab->{$leaf}
3875 or return;
3876
3877 # clear all symbols
3878 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3879 for my $name (keys %$leaf_symtab) {
3880 _gv_clear *{"$pkg$name"};
3881# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3882 }
3309} 3883}
3310 3884
3311sub do_reload_perl() { 3885sub do_reload_perl() {
3312 # can/must only be called in main 3886 # can/must only be called in main
3313 if ($Coro::current != $Coro::main) { 3887 unless (in_main) {
3314 warn "can only reload from main coroutine"; 3888 error "can only reload from main coroutine";
3315 return; 3889 return;
3316 } 3890 }
3317 3891
3892 return if $RELOAD++;
3893
3894 my $t1 = AE::time;
3895
3896 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl";
3318 warn "reloading..."; 3898 info "reloading...";
3319 3899
3320 warn "entering sync_job"; 3900 trace "entering sync_job";
3321 3901
3322 cf::sync_job { 3902 cf::sync_job {
3323 cf::write_runtime; # external watchdog should not bark
3324 cf::emergency_save; 3903 #cf::emergency_save;
3325 cf::write_runtime; # external watchdog should not bark
3326 3904
3327 warn "syncing database to disk";
3328 BDB::db_env_txn_checkpoint $DB_ENV;
3329
3330 # if anything goes wrong in here, we should simply crash as we already saved
3331
3332 warn "cancelling all WF_AUTOCANCEL watchers";
3333 for (Event::all_watchers) {
3334 $_->cancel if $_->data & WF_AUTOCANCEL;
3335 }
3336
3337 warn "flushing outstanding aio requests";
3338 for (;;) {
3339 BDB::flush;
3340 IO::AIO::flush;
3341 Coro::cede;
3342 last unless IO::AIO::nreqs || BDB::nreqs;
3343 warn "iterate...";
3344 }
3345
3346 ++$RELOAD;
3347
3348 warn "cancelling all extension coros"; 3905 trace "cancelling all extension coros";
3349 $_->cancel for values %EXT_CORO; 3906 $_->cancel for values %EXT_CORO;
3350 %EXT_CORO = (); 3907 %EXT_CORO = ();
3351 3908
3352 warn "removing commands"; 3909 trace "removing commands";
3353 %COMMAND = (); 3910 %COMMAND = ();
3354 3911
3355 warn "removing ext/exti commands"; 3912 trace "removing ext/exti commands";
3356 %EXTCMD = (); 3913 %EXTCMD = ();
3357 %EXTICMD = (); 3914 %EXTICMD = ();
3358 3915
3359 warn "unloading/nuking all extensions"; 3916 trace "unloading/nuking all extensions";
3360 for my $pkg (@EXTS) { 3917 for my $pkg (@EXTS) {
3361 warn "... unloading $pkg"; 3918 trace "... unloading $pkg";
3362 3919
3363 if (my $cb = $pkg->can ("unload")) { 3920 if (my $cb = $pkg->can ("unload")) {
3364 eval { 3921 eval {
3365 $cb->($pkg); 3922 $cb->($pkg);
3366 1 3923 1
3367 } or warn "$pkg unloaded, but with errors: $@"; 3924 } or error "$pkg unloaded, but with errors: $@";
3925 }
3926
3927 trace "... clearing $pkg";
3928 clear_package $pkg;
3368 } 3929 }
3369 3930
3370 warn "... nuking $pkg";
3371 Symbol::delete_package $pkg;
3372 }
3373
3374 warn "unloading all perl modules loaded from $LIBDIR"; 3931 trace "unloading all perl modules loaded from $LIBDIR";
3375 while (my ($k, $v) = each %INC) { 3932 while (my ($k, $v) = each %INC) {
3376 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3377 3934
3378 warn "... unloading $k"; 3935 trace "... unloading $k";
3379 delete $INC{$k}; 3936 delete $INC{$k};
3380 3937
3381 $k =~ s/\.pm$//; 3938 $k =~ s/\.pm$//;
3382 $k =~ s/\//::/g; 3939 $k =~ s/\//::/g;
3383 3940
3384 if (my $cb = $k->can ("unload_module")) { 3941 if (my $cb = $k->can ("unload_module")) {
3385 $cb->(); 3942 $cb->();
3943 }
3944
3945 clear_package $k;
3386 } 3946 }
3387 3947
3388 Symbol::delete_package $k;
3389 }
3390
3391 warn "getting rid of safe::, as good as possible"; 3948 trace "getting rid of safe::, as good as possible";
3392 Symbol::delete_package "safe::$_" 3949 clear_package "safe::$_"
3393 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3950 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3394 3951
3395 warn "unloading cf.pm \"a bit\""; 3952 trace "unloading cf.pm \"a bit\"";
3396 delete $INC{"cf.pm"}; 3953 delete $INC{"cf.pm"};
3397 delete $INC{"cf/pod.pm"}; 3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3398 3955
3399 # don't, removes xs symbols, too, 3956 # don't, removes xs symbols, too,
3400 # and global variables created in xs 3957 # and global variables created in xs
3401 #Symbol::delete_package __PACKAGE__; 3958 #clear_package __PACKAGE__;
3402 3959
3403 warn "unload completed, starting to reload now"; 3960 info "unload completed, starting to reload now";
3404 3961
3405 warn "reloading cf.pm"; 3962 trace "reloading cf.pm";
3406 require cf; 3963 require cf;
3407 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3964 cf::_connect_to_perl_1;
3408 3965
3409 warn "loading config and database again"; 3966 trace "loading config and database again";
3410 cf::reload_config; 3967 cf::reload_config;
3411 3968
3412 warn "loading extensions"; 3969 trace "loading extensions";
3413 cf::load_extensions; 3970 cf::load_extensions;
3414 3971
3972 if ($REATTACH_ON_RELOAD) {
3415 warn "reattaching attachments to objects/players"; 3973 trace "reattaching attachments to objects/players";
3416 _global_reattach; # objects, sockets 3974 _global_reattach; # objects, sockets
3417 warn "reattaching attachments to maps"; 3975 trace "reattaching attachments to maps";
3418 reattach $_ for values %MAP; 3976 reattach $_ for values %MAP;
3419 warn "reattaching attachments to players"; 3977 trace "reattaching attachments to players";
3420 reattach $_ for values %PLAYER; 3978 reattach $_ for values %PLAYER;
3979 }
3421 3980
3981 trace "running post_init jobs";
3982 (pop @POST_INIT)->(1) while @POST_INIT;
3983
3422 warn "leaving sync_job"; 3984 trace "leaving sync_job";
3423 3985
3424 1 3986 1
3425 } or do { 3987 } or do {
3426 warn $@; 3988 error $@;
3427 warn "error while reloading, exiting."; 3989 cf::cleanup "error while reloading, exiting.";
3428 exit 1; 3990 };
3991
3992 info "reloaded";
3993 --$RELOAD;
3429 }; 3994 }
3430 3995
3431 warn "reloaded"; 3996 $t1 = AE::time - $t1;
3997 info "reload completed in ${t1}s\n";
3432}; 3998};
3433 3999
3434our $RELOAD_WATCHER; # used only during reload 4000our $RELOAD_WATCHER; # used only during reload
3435 4001
3436sub reload_perl() { 4002sub reload_perl() {
3437 # doing reload synchronously and two reloads happen back-to-back, 4003 # doing reload synchronously and two reloads happen back-to-back,
3438 # coro crashes during coro_state_free->destroy here. 4004 # coro crashes during coro_state_free->destroy here.
3439 4005
3440 $RELOAD_WATCHER ||= Event->timer ( 4006 $RELOAD_WATCHER ||= cf::async {
3441 reentrant => 0, 4007 Coro::AIO::aio_wait cache_extensions;
3442 after => 0, 4008
3443 data => WF_AUTOCANCEL, 4009 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3444 cb => sub {
3445 do_reload_perl; 4010 do_reload_perl;
3446 undef $RELOAD_WATCHER; 4011 undef $RELOAD_WATCHER;
3447 }, 4012 };
3448 ); 4013 };
3449} 4014}
3450 4015
3451register_command "reload" => sub { 4016register_command "reload" => sub {
3452 my ($who, $arg) = @_; 4017 my ($who, $arg) = @_;
3453 4018
3458 reload_perl; 4023 reload_perl;
3459 }; 4024 };
3460 } 4025 }
3461}; 4026};
3462 4027
3463unshift @INC, $LIBDIR; 4028#############################################################################
3464 4029
3465my $bug_warning = 0; 4030my $bug_warning = 0;
3466 4031
3467our @WAIT_FOR_TICK; 4032our @WAIT_FOR_TICK;
3468our @WAIT_FOR_TICK_BEGIN; 4033our @WAIT_FOR_TICK_BEGIN;
3469 4034
3470sub wait_for_tick { 4035sub wait_for_tick() {
3471 return unless $TICK_WATCHER->is_active;
3472 return if $Coro::current == $Coro::main; 4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3473 4037
3474 my $signal = new Coro::Signal; 4038 my $signal = new Coro::Signal;
3475 push @WAIT_FOR_TICK, $signal; 4039 push @WAIT_FOR_TICK, $signal;
3476 $signal->wait; 4040 $signal->wait;
3477} 4041}
3478 4042
3479sub wait_for_tick_begin { 4043sub wait_for_tick_begin() {
3480 return unless $TICK_WATCHER->is_active;
3481 return if $Coro::current == $Coro::main; 4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3482 4045
3483 my $signal = new Coro::Signal; 4046 my $signal = new Coro::Signal;
3484 push @WAIT_FOR_TICK_BEGIN, $signal; 4047 push @WAIT_FOR_TICK_BEGIN, $signal;
3485 $signal->wait; 4048 $signal->wait;
3486} 4049}
3487 4050
3488$TICK_WATCHER = Event->timer ( 4051sub tick {
3489 reentrant => 0,
3490 parked => 1,
3491 prio => 0,
3492 at => $NEXT_TICK || $TICK,
3493 data => WF_AUTOCANCEL,
3494 cb => sub {
3495 if ($Coro::current != $Coro::main) { 4052 if ($Coro::current != $Coro::main) {
3496 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4053 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3497 unless ++$bug_warning > 10; 4054 unless ++$bug_warning > 10;
3498 return; 4055 return;
3499 } 4056 }
3500 4057
3501 $NOW = $tick_start = Event::time;
3502
3503 cf::server_tick; # one server iteration 4058 cf::server_tick; # one server iteration
3504 4059
3505 $RUNTIME += $TICK; 4060 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3506 $NEXT_TICK += $TICK;
3507 4061
3508 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4062 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3509 $NEXT_RUNTIME_WRITE = $NOW + 10; 4063 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3510 Coro::async_pool { 4064 Coro::async_pool {
3511 $Coro::current->{desc} = "runtime saver"; 4065 $Coro::current->{desc} = "runtime saver";
3512 write_runtime 4066 write_runtime_sync
3513 or warn "ERROR: unable to write runtime file: $!"; 4067 or error "ERROR: unable to write runtime file: $!";
3514 };
3515 } 4068 };
4069 }
3516 4070
3517 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3518 $sig->send; 4072 $sig->send;
3519 } 4073 }
3520 while (my $sig = shift @WAIT_FOR_TICK) { 4074 while (my $sig = shift @WAIT_FOR_TICK) {
3521 $sig->send; 4075 $sig->send;
3522 } 4076 }
3523 4077
3524 $NOW = Event::time; 4078 $LOAD = ($NOW - $TICK_START) / $TICK;
3525
3526 # if we are delayed by four ticks or more, skip them all
3527 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3528
3529 $TICK_WATCHER->at ($NEXT_TICK);
3530 $TICK_WATCHER->start;
3531
3532 $LOAD = ($NOW - $tick_start) / $TICK;
3533 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4079 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3534 4080
3535 _post_tick; 4081 if (0) {
4082 if ($NEXT_TICK) {
4083 my $jitter = $TICK_START - $NEXT_TICK;
4084 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4085 debug "jitter $JITTER\n";#d#
4086 }
3536 }, 4087 }
3537); 4088}
3538 4089
3539{ 4090{
4091 # configure BDB
4092
3540 BDB::min_parallel 8; 4093 BDB::min_parallel 16;
3541 BDB::max_poll_time $TICK * 0.1; 4094 BDB::max_poll_reqs $TICK * 0.1;
3542 $BDB_POLL_WATCHER = Event->io ( 4095 $AnyEvent::BDB::WATCHER->priority (1);
3543 reentrant => 0,
3544 fd => BDB::poll_fileno,
3545 poll => 'r',
3546 prio => 0,
3547 data => WF_AUTOCANCEL,
3548 cb => \&BDB::poll_cb,
3549 );
3550
3551 BDB::set_sync_prepare {
3552 my $status;
3553 my $current = $Coro::current;
3554 (
3555 sub {
3556 $status = $!;
3557 $current->ready; undef $current;
3558 },
3559 sub {
3560 Coro::schedule while defined $current;
3561 $! = $status;
3562 },
3563 )
3564 };
3565 4096
3566 unless ($DB_ENV) { 4097 unless ($DB_ENV) {
3567 $DB_ENV = BDB::db_env_create; 4098 $DB_ENV = BDB::db_env_create;
3568 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4099 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3569 | BDB::LOG_AUTOREMOVE, 1); 4100 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4101 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3570 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4102 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3571 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4103 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3572 4104
3573 cf::sync_job { 4105 cf::sync_job {
3574 eval { 4106 eval {
3584 4116
3585 cf::cleanup "db_env_open(db): $@" if $@; 4117 cf::cleanup "db_env_open(db): $@" if $@;
3586 }; 4118 };
3587 } 4119 }
3588 4120
3589 $BDB_DEADLOCK_WATCHER = Event->timer ( 4121 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3590 after => 3,
3591 interval => 1,
3592 hard => 1,
3593 prio => 0,
3594 data => WF_AUTOCANCEL,
3595 cb => sub {
3596 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4122 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3597 },
3598 ); 4123 };
3599 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4124 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3600 after => 11,
3601 interval => 60,
3602 hard => 1,
3603 prio => 0,
3604 data => WF_AUTOCANCEL,
3605 cb => sub {
3606 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4125 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3607 },
3608 ); 4126 };
3609 $BDB_TRICKLE_WATCHER = Event->timer ( 4127 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3610 after => 5,
3611 interval => 10,
3612 hard => 1,
3613 prio => 0,
3614 data => WF_AUTOCANCEL,
3615 cb => sub {
3616 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4128 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3617 },
3618 ); 4129 };
3619} 4130}
3620 4131
3621{ 4132{
4133 # configure IO::AIO
4134
3622 IO::AIO::min_parallel 8; 4135 IO::AIO::min_parallel 8;
3623
3624 undef $Coro::AIO::WATCHER;
3625 IO::AIO::max_poll_time $TICK * 0.1; 4136 IO::AIO::max_poll_time $TICK * 0.1;
3626 $AIO_POLL_WATCHER = Event->io ( 4137 undef $AnyEvent::AIO::WATCHER;
3627 reentrant => 0,
3628 data => WF_AUTOCANCEL,
3629 fd => IO::AIO::poll_fileno,
3630 poll => 'r',
3631 prio => 6,
3632 cb => \&IO::AIO::poll_cb,
3633 );
3634} 4138}
3635 4139
3636my $_log_backtrace; 4140my $_log_backtrace;
3637 4141
3638sub _log_backtrace { 4142sub _log_backtrace {
3641 $msg =~ s/\n//; 4145 $msg =~ s/\n//;
3642 4146
3643 # limit the # of concurrent backtraces 4147 # limit the # of concurrent backtraces
3644 if ($_log_backtrace < 2) { 4148 if ($_log_backtrace < 2) {
3645 ++$_log_backtrace; 4149 ++$_log_backtrace;
4150 my $perl_bt = Carp::longmess $msg;
3646 async { 4151 async {
3647 $Coro::current->{desc} = "abt $msg"; 4152 $Coro::current->{desc} = "abt $msg";
3648 4153
3649 my @bt = fork_call { 4154 my @bt = fork_call {
3650 @addr = map { sprintf "%x", $_ } @addr; 4155 @addr = map { sprintf "%x", $_ } @addr;
3661 } 4166 }
3662 4167
3663 @funcs 4168 @funcs
3664 }; 4169 };
3665 4170
3666 LOG llevInfo, "[ABT] $msg\n"; 4171 LOG llevInfo, "[ABT] $perl_bt\n";
4172 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3667 LOG llevInfo, "[ABT] $_\n" for @bt; 4173 LOG llevInfo, "[ABT] $_\n" for @bt;
3668 --$_log_backtrace; 4174 --$_log_backtrace;
3669 }; 4175 };
3670 } else { 4176 } else {
3671 LOG llevInfo, "[ABT] $msg\n"; 4177 LOG llevInfo, "[ABT] $msg\n";
3672 LOG llevInfo, "[ABT] [suppressed]\n"; 4178 LOG llevInfo, "[ABT] [suppressed]\n";
3673 } 4179 }
3674} 4180}
3675 4181
3676# load additional modules 4182# load additional modules
3677use cf::pod; 4183require "cf/$_.pm" for @EXTRA_MODULES;
4184cf::_connect_to_perl_2;
3678 4185
3679END { cf::emergency_save } 4186END { cf::emergency_save }
3680 4187
36811 41881
3682 4189

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines