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.551 by root, Sun May 16 13:48:07 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines