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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines