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.361 by root, Sun Sep 9 12:52:48 2007 UTC vs.
Revision 1.543 by root, Wed May 5 23:23:29 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
124our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 126our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 127our $DB_ENV;
128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
86 130
87our %CFG; 131our %CFG;
88 132
89our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 134our $RUNTIME;
135our $NOW;
91 136
92our (%PLAYER, %PLAYER_LOADING); # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 138our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 139our $LINK_MAP; # the special {link} map, which is always available
95 140
96# 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 ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 143
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
101our $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 :)
102 153
103binmode STDOUT; 154binmode STDOUT;
104binmode STDERR; 155binmode STDERR;
105 156
106# read virtual server time, if available 157# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
111} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
112 165
113mkdir $_ 166mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 168
116our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
117 170
118sub 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::"} };
119 187
120############################################################################# 188#############################################################################
121 189
122=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
123 191
159 227
160The raw value load value from the last tick. 228The raw value load value from the last tick.
161 229
162=item %cf::CFG 230=item %cf::CFG
163 231
164Configuration for the server, loaded from C</etc/crossfire/config>, or 232Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 233from wherever your confdir points to.
166 234
167=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
168 236
169These 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
170returns 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
171per 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.
172 240
173=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
174 242
175This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
176C<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
177that call. 245that call.
178 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
179=back 253=back
180 254
181=cut 255=cut
182 256
183BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
184 *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 {
185 my $msg = join "", @_; 264 my $msg = join "", @_;
186 265
187 $msg .= "\n" 266 $msg .= "\n"
188 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
189 268
190 $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;
191 270
192 utf8::encode $msg;
193 LOG llevError, $msg; 271 LOG llevWarn, $msg;
194 }; 272};
195} 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};
196 287
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 298for my $pkg (qw(
208 cf::global cf::attachable 299 cf::global cf::attachable
209 cf::object cf::object::player 300 cf::object cf::object::player
210 cf::client cf::player 301 cf::client cf::player
211 cf::arch cf::living 302 cf::arch cf::living
303 cf::map cf::mapspace
212 cf::map cf::party cf::region 304 cf::party cf::region
213)) { 305)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 307}
217 308
218$Event::DIED = sub { 309$EV::DIED = sub {
219 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
220}; 311};
221 312
222############################################################################# 313#############################################################################
223 314
224=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
246 $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;
247 $d 338 $d
248 } || "[unable to dump $_[0]: '$@']"; 339 } || "[unable to dump $_[0]: '$@']";
249} 340}
250 341
251=item $ref = cf::from_json $json 342=item $ref = cf::decode_json $json
252 343
253Converts a JSON string into the corresponding perl data structure. 344Converts a JSON string into the corresponding perl data structure.
254 345
255=item $json = cf::to_json $ref 346=item $json = cf::encode_json $ref
256 347
257Converts a perl data structure into its JSON representation. 348Converts a perl data structure into its JSON representation.
258 349
259=cut 350=cut
260 351
261our $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
262 353
263sub to_json ($) { $json_coder->encode ($_[0]) } 354sub encode_json($) { $json_coder->encode ($_[0]) }
264sub 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}
265 370
266=item cf::lock_wait $string 371=item cf::lock_wait $string
267 372
268Wait until the given lock is available. See cf::lock_acquire. 373Wait until the given lock is available. See cf::lock_acquire.
269 374
270=item my $lock = cf::lock_acquire $string 375=item my $lock = cf::lock_acquire $string
271 376
272Wait 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
273a 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,
274for example when the coroutine gets canceled), the lock is automatically 379for example when the coroutine gets canceled), the lock is automatically
275returned. 380returned.
276 381
277Locks 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
278deadlocked coro. 383deadlocked coro.
284 389
285Return 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.
286 391
287=cut 392=cut
288 393
289our %LOCK; 394our $LOCKS = new Coro::SemaphoreSet;
290our %LOCKER;#d#
291 395
292sub lock_wait($) { 396sub lock_wait($) {
293 my ($key) = @_; 397 $LOCKS->wait ($_[0]);
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
299
300 # wait for lock, if any
301 while ($LOCK{$key}) {
302 push @{ $LOCK{$key} }, $Coro::current;
303 Coro::schedule;
304 }
305} 398}
306 399
307sub lock_acquire($) { 400sub lock_acquire($) {
308 my ($key) = @_; 401 $LOCKS->guard ($_[0])
309
310 # wait, to be sure we are not locked
311 lock_wait $key;
312
313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
315
316 Coro::guard {
317 delete $LOCKER{$key};#d#
318 # wake up all waiters, to be on the safe side
319 $_->ready for @{ delete $LOCK{$key} };
320 }
321} 402}
322 403
323sub lock_active($) { 404sub lock_active($) {
324 my ($key) = @_; 405 $LOCKS->count ($_[0]) < 1
325
326 ! ! $LOCK{$key}
327} 406}
328 407
329sub freeze_mainloop { 408sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 409 tick_inhibit_inc;
331 410
332 my $guard = Coro::guard { 411 &Guard::guard (\&tick_inhibit_dec);
333 $TICK_WATCHER->start; 412}
334 }; 413
335 $TICK_WATCHER->stop; 414=item cf::periodic $interval, $cb
336 $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
337} 427}
338 428
339=item cf::get_slot $time[, $priority[, $name]] 429=item cf::get_slot $time[, $priority[, $name]]
340 430
341Allocate $time seconds of blocking CPU time at priority C<$priority>: 431Allocate $time seconds of blocking CPU time at priority C<$priority>:
349 439
350=cut 440=cut
351 441
352our @SLOT_QUEUE; 442our @SLOT_QUEUE;
353our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
354 445
355$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
448 $Coro::current->desc ("timeslot manager");
449
357 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
358 452
359 while () { 453 while () {
360 next_job: 454 next_job:
455
361 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
362 if ($avail > 0.01) { 457
363 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
364 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
365 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
366 $job->[2]->send; 462 $job->[2]->send;
367 Coro::cede; 463 Coro::cede;
368 goto next_job; 464 goto next_job;
369 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
370 } 467 }
371 } 468 }
372 469
373 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
374 # 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
375 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait; 473 $signal->wait;
377 } else { 474 } else {
475 $busy = 0;
378 Coro::schedule; 476 Coro::schedule;
379 } 477 }
380 } 478 }
381}; 479};
382 480
383sub get_slot($;$$) { 481sub get_slot($;$$) {
482 return if tick_inhibit || $Coro::current == $Coro::main;
483
384 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
385 485
386 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
387 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
388 489
389 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
390 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
391 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
402 503
403BEGIN { *async = \&Coro::async_pool } 504BEGIN { *async = \&Coro::async_pool }
404 505
405=item cf::sync_job { BLOCK } 506=item cf::sync_job { BLOCK }
406 507
407The design of Crossfire TRT requires that the main coroutine ($Coro::main) 508The design of Deliantra requires that the main coroutine ($Coro::main)
408is always able to handle events or runnable, as Crossfire TRT is only 509is always able to handle events or runnable, as Deliantra is only
409partly 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
410acceptable. 511acceptable.
411 512
412If 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
413the given BLOCK in another coroutine while waiting for the result. The 514the given BLOCK in another coroutine while waiting for the result. The
417=cut 518=cut
418 519
419sub sync_job(&) { 520sub sync_job(&) {
420 my ($job) = @_; 521 my ($job) = @_;
421 522
422 if ($Coro::current == $Coro::main) { 523 if (in_main) {
423 my $time = Event::time; 524 my $time = AE::time;
424 525
425 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
426 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
427 528
428 # TODO: use suspend/resume instead 529 #LOG llevError, Carp::longmess "sync job";#d#
429 # (but this is cancel-safe) 530
430 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
431 532
432 my $busy = 1; 533 my $busy = 1;
433 my @res; 534 my @res;
434 535
435 (async { 536 (async {
537 $Coro::current->desc ("sync job coro");
436 @res = eval { $job->() }; 538 @res = eval { $job->() };
437 warn $@ if $@; 539 error $@ if $@;
438 undef $busy; 540 undef $busy;
439 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
440 542
441 while ($busy) { 543 while ($busy) {
442 Coro::cede or Event::one_event; 544 if (Coro::nready) {
545 Coro::cede_notself;
546 } else {
547 EV::loop EV::LOOP_ONESHOT;
443 } 548 }
549 }
444 550
445 $time = Event::time - $time; 551 my $time = AE::time - $time;
446 552
447 LOG llevError | logBacktrace, Carp::longmess "long sync job"
448 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
449
450 $tick_start += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
451 554
452 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
453 } else { 556 } else {
454 # we are in another coroutine, how wonderful, everything just works 557 # we are in another coroutine, how wonderful, everything just works
455 558
480=item fork_call { }, $args 583=item fork_call { }, $args
481 584
482Executes the given code block with the given arguments in a seperate 585Executes the given code block with the given arguments in a seperate
483process, returning the results. Everything must be serialisable with 586process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may 587Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling. 588never block itself or use any form of event handling.
486 589
487=cut 590=cut
488 591
489sub fork_call(&@) { 592sub fork_call(&@) {
490 my ($cb, @args) = @_; 593 my ($cb, @args) = @_;
499 }, @args; 602 }, @args;
500 603
501 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
502} 605}
503 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
504=item $value = cf::db_get $family => $key 645=item $value = cf::db_get $family => $key
505 646
506Returns a single value from the environment database. 647Returns a single value from the environment database.
507 648
508=item cf::db_put $family => $key => $value 649=item cf::db_put $family => $key => $value
509 650
510Stores the given C<$value> in the family. It can currently store binary 651Stores the given C<$value> in the family. It can currently store binary
511data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 652data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512 653
654=item $db = cf::db_table "name"
655
656Create and/or open a new database table. The string must not be "db" and must be unique
657within each server.
658
513=cut 659=cut
660
661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
665 my ($name) = @_;
666 my $db = BDB::db_create $DB_ENV;
667
668 eval {
669 $db->set_flags (BDB::CHKSUM);
670
671 utf8::encode $name;
672 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
673 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
674 cf::cleanup "db_open(db): $!" if $!;
675 };
676 cf::cleanup "db_open(db): $@" if $@;
677
678 $db
679}
514 680
515our $DB; 681our $DB;
516 682
517sub db_init { 683sub db_init {
518 unless ($DB) { 684 $DB ||= db_table "db";
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job {
522 eval {
523 $DB->set_flags (BDB::CHKSUM);
524
525 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
526 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
527 cf::cleanup "db_open(db): $!" if $!;
528 };
529 cf::cleanup "db_open(db): $@" if $@;
530 };
531 }
532} 685}
533 686
534sub db_get($$) { 687sub db_get($$) {
535 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
536 689
537 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
538 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
539 694
540 $! ? () 695 $! ? ()
541 : $data 696 : $data
542 }
543} 697}
544 698
545sub db_put($$$) { 699sub db_put($$$) {
546 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
547 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
603 757
604 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
605 my $data = $process->(\@data); 759 my $data = $process->(\@data);
606 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
607 761
608 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
609 763
610 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
611 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
612 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
613 767
623 777
624=cut 778=cut
625 779
626sub datalog($@) { 780sub datalog($@) {
627 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
628 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
629} 783}
630 784
631=back 785=back
632 786
633=cut 787=cut
634 788
635############################################################################# 789#############################################################################
636 790
637=head2 ATTACHABLE OBJECTS 791=head2 ATTACHABLE OBJECTS
638 792
639Many 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
640attach callbacks/event handlers (a collection of which is called an "attachment") 794attach callbacks/event handlers (a collection of which is called an "attachment")
641to it. All such attachable objects support the following methods. 795to it. All such attachable objects support the following methods.
642 796
643In 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>
644C<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
645Crossfire TRT). 799Deliantra).
646 800
647=over 4 801=over 4
648 802
649=item $attachable->attach ($attachment, key => $value...) 803=item $attachable->attach ($attachment, key => $value...)
650 804
694=item cf::CLASS::attachment $name, ... 848=item cf::CLASS::attachment $name, ...
695 849
696Register an attachment by C<$name> through which attachable objects of the 850Register an attachment by C<$name> through which attachable objects of the
697given CLASS can refer to this attachment. 851given CLASS can refer to this attachment.
698 852
699Some classes such as crossfire maps and objects can specify attachments 853Some classes such as deliantra maps and objects can specify attachments
700that 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.
701 855
702These calls expect any number of the following handler/hook descriptions: 856These calls expect any number of the following handler/hook descriptions:
703 857
704=over 4 858=over 4
828 982
829 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
830 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
831 985
832 } elsif (ref $type) { 986 } elsif (ref $type) {
833 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
834 988
835 } else { 989 } else {
836 shift @arg; 990 shift @arg;
837 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
838 } 992 }
839 } 993 }
840} 994}
841 995
842sub _object_attach { 996sub _object_attach {
852 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
853 } 1007 }
854 1008
855 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
856 } else { 1010 } else {
857 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
858 } 1012 }
859 1013
860 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
861} 1015}
862 1016
921 1075
922 for (@$callbacks) { 1076 for (@$callbacks) {
923 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
924 1078
925 if ($@) { 1079 if ($@) {
926 warn "$@";
927 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
928 override; 1081 override;
929 } 1082 }
930 1083
931 return 1 if $override; 1084 return 1 if $override;
932 } 1085 }
933 1086
934 0 1087 0
935} 1088}
936 1089
937=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1090=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
938 1091
939=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1092=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
940 1093
941Generate an object-specific event with the given arguments. 1094Generate an object-specific event with the given arguments.
942 1095
948 1101
949=cut 1102=cut
950 1103
951############################################################################# 1104#############################################################################
952# object support 1105# object support
953#
954 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#
955sub _can_merge { 1140sub _can_merge {
956 my ($ob1, $ob2) = @_; 1141 my ($ob1, $ob2) = @_;
957 1142
958 local $Storable::canonical = 1; 1143 ++$SLOW_MERGES;#d#
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961 1144
962 $fob1 eq $fob2 1145 # we do the slow way here
1146 return _object_equal $ob1, $ob2
963} 1147}
964 1148
965sub reattach { 1149sub reattach {
966 # basically do the same as instantiate, without calling instantiate 1150 # basically do the same as instantiate, without calling instantiate
967 my ($obj) = @_; 1151 my ($obj) = @_;
968 1152
1153 # no longer needed after getting rid of delete_package?
969 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
970 1155
971 my $registry = $obj->registry; 1156 my $registry = $obj->registry;
972 1157
973 @$registry = (); 1158 @$registry = ();
974 1159
979 for (@$attach) { 1164 for (@$attach) {
980 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
981 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
982 } 1167 }
983 } else { 1168 } else {
984 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
985 } 1170 }
986 } 1171 }
987} 1172}
988 1173
989cf::attachable->attach ( 1174cf::attachable->attach (
990 prio => -1000000, 1175 prio => -1000000,
991 on_instantiate => sub { 1176 on_instantiate => sub {
992 my ($obj, $data) = @_; 1177 my ($obj, $data) = @_;
993 1178
994 $data = from_json $data; 1179 $data = decode_json $data;
995 1180
996 for (@$data) { 1181 for (@$data) {
997 my ($name, $args) = @$_; 1182 my ($name, $args) = @$_;
998 1183
999 $obj->attach ($name, %{$args || {} }); 1184 $obj->attach ($name, %{$args || {} });
1013); 1198);
1014 1199
1015sub object_freezer_save { 1200sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1017 1202
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1203 sync_job {
1021 if (length $$rdata) { 1204 if (length $$rdata) {
1205 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1024 1209
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1211 aio_chmod $fh, SAVE_MODE;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 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 }
1029 close $fh; 1217 aio_close $fh;
1030 1218
1031 if (@$objs) { 1219 if (@$objs) {
1032 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) {
1033 chmod SAVE_MODE, $fh; 1221 aio_chmod $fh, SAVE_MODE;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1222 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1223 aio_write $fh, 0, (length $data), $data, 0;
1036 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 }
1037 close $fh; 1228 aio_close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1229 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1230 }
1040 } else { 1231 } else {
1041 aio_unlink "$filename.pst"; 1232 aio_unlink "$filename.pst";
1042 } 1233 }
1043 1234
1044 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1236
1237 $filename =~ s%/[^/]+$%%;
1238 aio_pathsync $filename if $cf::USE_FSYNC;
1045 } else { 1239 } else {
1046 warn "FATAL: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1047 } 1241 }
1048 } else { 1242 } else {
1049 aio_unlink $filename; 1243 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1051 } 1245 }
1052 }; 1246 };
1053
1054 undef $guard;
1055} 1247}
1056 1248
1057sub object_freezer_as_string { 1249sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1250 my ($rdata, $objs) = @_;
1059 1251
1064 1256
1065sub object_thawer_load { 1257sub object_thawer_load {
1066 my ($filename) = @_; 1258 my ($filename) = @_;
1067 1259
1068 my ($data, $av); 1260 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1261
1072 (aio_load $filename, $data) >= 0 1262 (aio_load $filename, $data) >= 0
1073 or return; 1263 or return;
1074 1264
1075 unless (aio_stat "$filename.pst") { 1265 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1266 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1267 or return;
1078 1268
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1269 my $st = eval { Coro::Storable::thaw $av };
1270 $av = $st->{objs};
1081 } 1271 }
1082 1272
1273 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1085 1277
1086 ($data, $av) 1278 ($data, $av)
1087} 1279}
1088 1280
1089=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1145 my ($name, $cb) = @_; 1337 my ($name, $cb) = @_;
1146 1338
1147 $EXTICMD{$name} = $cb; 1339 $EXTICMD{$name} = $cb;
1148} 1340}
1149 1341
1342use File::Glob ();
1343
1150cf::player->attach ( 1344cf::player->attach (
1151 on_command => sub { 1345 on_unknown_command => sub {
1152 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1153 1347
1154 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1155 or return; 1349 or return;
1156 1350
1179 1373
1180 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1181 if $reply; 1375 if $reply;
1182 1376
1183 } else { 1377 } else {
1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1185 } 1379 }
1186 1380
1187 cf::override; 1381 cf::override;
1188 }, 1382 },
1189); 1383);
1190 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
1191sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1192 cf::sync_job { 1401 cf::sync_job {
1193 my %todo; 1402 my %todo;
1194 1403
1195 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1196 next unless -r $path; 1405 next unless -r $path;
1214 1423
1215 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1216 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1217 1426
1218 $ext{source} = 1427 $ext{source} =
1219 "package $pkg; use strict; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1220 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1221 . $source 1430 . $source
1222 . "\n};\n1"; 1431 . "\n};\n1";
1223 1432
1224 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1225 } 1434 }
1226 1435
1436 my $pass = 0;
1227 my %done; 1437 my %done;
1228 while (%todo) { 1438 while (%todo) {
1229 my $progress; 1439 my $progress;
1230 1440
1441 ++$pass;
1442
1443 ext:
1231 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1232 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1233 goto skip 1446 next ext
1234 unless exists $done{$_}; 1447 unless exists $done{$_};
1235 } 1448 }
1236 1449
1237 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1238 1451
1239 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1240 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1241 : "$v->{base}: extension inactive.\n";
1242 1456
1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1243 if (exists $v->{meta}{mandatory}) { 1458 if exists $v->{meta}{mandatory};
1244 warn $msg; 1459
1245 warn "mandatory extension failed to load, exiting.\n"; 1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1246 exit 1; 1461 delete $todo{$k};
1247 } 1462 } else {
1248 1463 $done{$k} = delete $todo{$k};
1249 warn $msg; 1464 push @EXTS, $v->{pkg};
1465 $progress = 1;
1466
1467 info "$v->{base}: extension inactive.\n"
1468 unless $active;
1250 } 1469 }
1251
1252 $done{$k} = delete $todo{$k};
1253 push @EXTS, $v->{pkg};
1254 $progress = 1;
1255 } 1470 }
1256 1471
1257 skip: 1472 unless ($progress) {
1258 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1473 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1259 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 }
1260 } 1480 }
1261 }; 1481 };
1262} 1482}
1263 1483
1264############################################################################# 1484#############################################################################
1265 1485
1266=back 1486=back
1267 1487
1268=head2 CORE EXTENSIONS 1488=head2 CORE EXTENSIONS
1269 1489
1270Functions and methods that extend core crossfire objects. 1490Functions and methods that extend core deliantra objects.
1271 1491
1272=cut 1492=cut
1273 1493
1274package cf::player; 1494package cf::player;
1275 1495
1318 1538
1319sub exists($) { 1539sub exists($) {
1320 my ($login) = @_; 1540 my ($login) = @_;
1321 1541
1322 $cf::PLAYER{$login} 1542 $cf::PLAYER{$login}
1323 or cf::sync_job { !aio_stat path $login } 1543 or !aio_stat path $login
1324} 1544}
1325 1545
1326sub find($) { 1546sub find($) {
1327 return $cf::PLAYER{$_[0]} || do { 1547 return $cf::PLAYER{$_[0]} || do {
1328 my $login = $_[0]; 1548 my $login = $_[0];
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1558 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1559
1340 my $f = new_from_file cf::object::thawer path $login 1560 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1561 or return;
1342 1562
1343 $f->next;
1344 my $pl = cf::player::load_pl $f 1563 my $pl = cf::player::load_pl $f
1345 or return; 1564 or return;
1565
1346 local $cf::PLAYER_LOADING{$login} = $pl; 1566 local $cf::PLAYER_LOADING{$login} = $pl;
1347 $f->resolve_delayed_derefs; 1567 $f->resolve_delayed_derefs;
1348 $cf::PLAYER{$login} = $pl 1568 $cf::PLAYER{$login} = $pl
1349 } 1569 }
1350 } 1570 }
1351} 1571}
1352 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
1353sub save($) { 1586sub save($) {
1354 my ($pl) = @_; 1587 my ($pl) = @_;
1355 1588
1356 return if $pl->{deny_save}; 1589 return if $pl->{deny_save};
1357 1590
1360 1593
1361 return if $pl->{deny_save}; 1594 return if $pl->{deny_save};
1362 1595
1363 aio_mkdir playerdir $pl, 0770; 1596 aio_mkdir playerdir $pl, 0770;
1364 $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];
1365 1603
1366 $pl->save_pl ($path); 1604 $pl->save_pl ($path);
1367 cf::cede_to_tick; 1605 cf::cede_to_tick;
1368} 1606}
1369 1607
1401 my ($pl) = @_; 1639 my ($pl) = @_;
1402 1640
1403 my $name = $pl->ob->name; 1641 my $name = $pl->ob->name;
1404 1642
1405 $pl->{deny_save} = 1; 1643 $pl->{deny_save} = 1;
1406 $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
1407 1645
1408 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1409 $pl->deactivate; 1647 $pl->deactivate;
1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1410 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1411 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1412 1651
1413 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1414 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
1453 1692
1454 for my $login (@$dirs) { 1693 for my $login (@$dirs) {
1455 my $path = path $login; 1694 my $path = path $login;
1456 1695
1457 # a .pst is a dead give-away for a valid player 1696 # a .pst is a dead give-away for a valid player
1458 unless (-e "$path.pst") { 1697 # if no pst file found, open and chekc for blocked users
1698 if (aio_stat "$path.pst") {
1459 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1699 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1460 aio_read $fh, 0, 512, my $buf, 0 or next; 1700 aio_read $fh, 0, 512, my $buf, 0 or next;
1461 $buf !~ /^password -------------$/m or next; # official not-valid tag 1701 $buf !~ /^password -------------$/m or next; # official not-valid tag
1462 } 1702 }
1463 1703
1467 1707
1468 \@logins 1708 \@logins
1469} 1709}
1470 1710
1471=item $player->maps 1711=item $player->maps
1712
1713=item cf::player::maps $login
1472 1714
1473Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1474player. May block. 1716player. May block.
1475 1717
1476=cut 1718=cut
1494 } 1736 }
1495 1737
1496 \@paths 1738 \@paths
1497} 1739}
1498 1740
1499=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1741=item $protocol_xml = $player->expand_cfpod ($cfpod)
1500 1742
1501Expand crossfire pod fragments into protocol xml. 1743Expand deliantra pod fragments into protocol xml.
1502
1503=cut
1504
1505sub expand_cfpod {
1506 ((my $self), (local $_)) = @_;
1507
1508 # escape & and <
1509 s/&/&amp;/g;
1510 s/(?<![BIUGHT])</&lt;/g;
1511
1512 # this is buggy, it needs to properly take care of nested <'s
1513
1514 1 while
1515 # replace B<>, I<>, U<> etc.
1516 s/B<([^\>]*)>/<b>$1<\/b>/
1517 || s/I<([^\>]*)>/<i>$1<\/i>/
1518 || s/U<([^\>]*)>/<u>$1<\/u>/
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1520 # replace G<male|female> tags
1521 || s{G<([^>|]*)\|([^>]*)>}{
1522 $self->gender ? $2 : $1
1523 }ge
1524 # replace H<hint text>
1525 || s{H<([^\>]*)>}
1526 {
1527 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1528 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1529 "")
1530 [$self->{hintmode}]
1531 }ge;
1532
1533 # create single paragraphs (very hackish)
1534 s/(?<=\S)\n(?=\w)/ /g;
1535
1536 # compress some whitespace
1537 s/\s+\n/\n/g; # ws line-ends
1538 s/\n\n+/\n/g; # double lines
1539 s/^\n+//; # beginning lines
1540 s/\n+$//; # ending lines
1541
1542 $_
1543}
1544
1545sub hintmode {
1546 $_[0]{hintmode} = $_[1] if @_ > 1;
1547 $_[0]{hintmode}
1548}
1549 1744
1550=item $player->ext_reply ($msgid, @msg) 1745=item $player->ext_reply ($msgid, @msg)
1551 1746
1552Sends an ext reply to the player. 1747Sends an ext reply to the player.
1553 1748
1585 1780
1586=cut 1781=cut
1587 1782
1588sub find_by_path($) { 1783sub find_by_path($) {
1589 my ($path) = @_; 1784 my ($path) = @_;
1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1590 1787
1591 my ($match, $specificity); 1788 my ($match, $specificity);
1592 1789
1593 for my $region (list) { 1790 for my $region (list) {
1594 if ($region->{match} && $path =~ $region->{match}) { 1791 if ($region->{match} && $path =~ $region->{match}) {
1620our $MAX_RESET = 3600; 1817our $MAX_RESET = 3600;
1621our $DEFAULT_RESET = 3000; 1818our $DEFAULT_RESET = 3000;
1622 1819
1623sub generate_random_map { 1820sub generate_random_map {
1624 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
1625 # mit "rum" bekleckern, nicht 1825 # mit "rum" bekleckern, nicht
1626 $self->_create_random_map ( 1826 $self->_create_random_map (
1627 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1628 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1629 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1630 $rmp->{exit_on_final_map}, 1830 $rmp->{exit_on_final_map},
1631 $rmp->{xsize}, $rmp->{ysize}, 1831 $rmp->{xsize}, $rmp->{ysize},
1632 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1633 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1648 1848
1649sub register { 1849sub register {
1650 my (undef, $regex, $prio) = @_; 1850 my (undef, $regex, $prio) = @_;
1651 my $pkg = caller; 1851 my $pkg = caller;
1652 1852
1653 no strict;
1654 push @{"$pkg\::ISA"}, __PACKAGE__; 1853 push @{"$pkg\::ISA"}, __PACKAGE__;
1655 1854
1656 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1855 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1657} 1856}
1658 1857
1659# also paths starting with '/' 1858# also paths starting with '/'
1660$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1859$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1661 1860
1662sub thawer_merge { 1861sub thawer_merge {
1663 my ($self, $merge) = @_; 1862 my ($self, $merge) = @_;
1664 1863
1665 # we have to keep some variables in memory intact 1864 # we have to keep some variables in memory intact
1670} 1869}
1671 1870
1672sub normalise { 1871sub normalise {
1673 my ($path, $base) = @_; 1872 my ($path, $base) = @_;
1674 1873
1675 $path = "$path"; # make sure its a string 1874 $path = "$path"; # make sure it's a string
1676 1875
1677 $path =~ s/\.map$//; 1876 $path =~ s/\.map$//;
1678 1877
1679 # map plan: 1878 # map plan:
1680 # 1879 #
1719 $self->init; # pass $1 etc. 1918 $self->init; # pass $1 etc.
1720 return $self; 1919 return $self;
1721 } 1920 }
1722 } 1921 }
1723 1922
1724 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1923 Carp::cluck "unable to resolve path '$path' (base '$base')";
1725 () 1924 ()
1726} 1925}
1727 1926
1728sub init { 1927sub init {
1729 my ($self) = @_; 1928 my ($self) = @_;
1751 1950
1752# the temporary/swap location 1951# the temporary/swap location
1753sub save_path { 1952sub save_path {
1754 my ($self) = @_; 1953 my ($self) = @_;
1755 1954
1756 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1955 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1757 "$TMPDIR/$path.map" 1956 "$TMPDIR/$path.map"
1758} 1957}
1759 1958
1760# the unique path, undef == no special unique path 1959# the unique path, undef == no special unique path
1761sub uniq_path { 1960sub uniq_path {
1762 my ($self) = @_; 1961 my ($self) = @_;
1763 1962
1764 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1963 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1765 "$UNIQUEDIR/$path" 1964 "$UNIQUEDIR/$path"
1766}
1767
1768# and all this just because we cannot iterate over
1769# all maps in C++...
1770sub change_all_map_light {
1771 my ($change) = @_;
1772
1773 $_->change_map_light ($change)
1774 for grep $_->outdoor, values %cf::MAP;
1775} 1965}
1776 1966
1777sub decay_objects { 1967sub decay_objects {
1778 my ($self) = @_; 1968 my ($self) = @_;
1779 1969
1861 2051
1862sub find; 2052sub find;
1863sub find { 2053sub find {
1864 my ($path, $origin) = @_; 2054 my ($path, $origin) = @_;
1865 2055
2056 cf::cede_to_tick;
2057
1866 $path = normalise $path, $origin && $origin->path; 2058 $path = normalise $path, $origin && $origin->path;
1867 2059
1868 cf::lock_wait "map_data:$path";#d#remove 2060 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1869 cf::lock_wait "map_find:$path"; 2061 my $guard2 = cf::lock_acquire "map_find:$path";
1870 2062
1871 $cf::MAP{$path} || do { 2063 $cf::MAP{$path} || do {
1872 my $guard1 = cf::lock_acquire "map_find:$path";
1873 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1874
1875 my $map = new_from_path cf::map $path 2064 my $map = new_from_path cf::map $path
1876 or return; 2065 or return;
1877 2066
1878 $map->{last_save} = $cf::RUNTIME; 2067 $map->{last_save} = $cf::RUNTIME;
1879 2068
1881 or return; 2070 or return;
1882 2071
1883 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2072 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1884 # doing this can freeze the server in a sync job, obviously 2073 # doing this can freeze the server in a sync job, obviously
1885 #$cf::WAIT_FOR_TICK->wait; 2074 #$cf::WAIT_FOR_TICK->wait;
2075 undef $guard2;
1886 undef $guard1; 2076 undef $guard1;
1887 undef $guard2;
1888 $map->reset; 2077 $map->reset;
1889 return find $path; 2078 return find $path;
1890 } 2079 }
1891 2080
1892 $cf::MAP{$path} = $map 2081 $cf::MAP{$path} = $map
1893 } 2082 }
1894} 2083}
1895 2084
1896sub pre_load { } 2085sub pre_load { }
1897sub post_load { } 2086#sub post_load { } # XS
1898 2087
1899sub load { 2088sub load {
1900 my ($self) = @_; 2089 my ($self) = @_;
1901 2090
1902 local $self->{deny_reset} = 1; # loading can take a long time 2091 local $self->{deny_reset} = 1; # loading can take a long time
1919 my $f = new_from_file cf::object::thawer $self->{load_path}; 2108 my $f = new_from_file cf::object::thawer $self->{load_path};
1920 $f->skip_block; 2109 $f->skip_block;
1921 $self->_load_objects ($f) 2110 $self->_load_objects ($f)
1922 or return; 2111 or return;
1923 2112
1924 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2113 $self->post_load_original
1925 if delete $self->{load_original}; 2114 if delete $self->{load_original};
1926 2115
1927 if (my $uniq = $self->uniq_path) { 2116 if (my $uniq = $self->uniq_path) {
1928 utf8::encode $uniq; 2117 utf8::encode $uniq;
1929 unless (aio_stat $uniq) { 2118 unless (aio_stat $uniq) {
1947 unless ($self->{deny_activate}) { 2136 unless ($self->{deny_activate}) {
1948 $self->decay_objects; 2137 $self->decay_objects;
1949 $self->fix_auto_apply; 2138 $self->fix_auto_apply;
1950 $self->update_buttons; 2139 $self->update_buttons;
1951 cf::cede_to_tick; 2140 cf::cede_to_tick;
1952 $self->set_darkness_map;
1953 cf::cede_to_tick;
1954 $self->activate; 2141 $self->activate;
1955 } 2142 }
1956 2143
1957 $self->{last_save} = $cf::RUNTIME; 2144 $self->{last_save} = $cf::RUNTIME;
1958 $self->last_access ($cf::RUNTIME); 2145 $self->last_access ($cf::RUNTIME);
1959 2146
1960 $self->in_memory (cf::MAP_IN_MEMORY); 2147 $self->in_memory (cf::MAP_ACTIVE);
1961 } 2148 }
1962 2149
1963 $self->post_load; 2150 $self->post_load;
1964} 2151}
1965 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
1966sub customise_for { 2156sub customise_for {
1967 my ($self, $ob) = @_; 2157 my ($self, $ob) = @_;
1968 2158
1969 return find "~" . $ob->name . "/" . $self->{path} 2159 return find "~" . $ob->name . "/" . $self->{path}
1970 if $self->per_player; 2160 if $self->per_player;
1986 or next; 2176 or next;
1987 $neigh = find $neigh, $map 2177 $neigh = find $neigh, $map
1988 or next; 2178 or next;
1989 $neigh->load; 2179 $neigh->load;
1990 2180
2181 # now find the diagonal neighbours
1991 push @neigh, 2182 push @neigh,
1992 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2183 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1993 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2184 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1994 } 2185 }
1995 2186
2002} 2193}
2003 2194
2004sub find_sync { 2195sub find_sync {
2005 my ($path, $origin) = @_; 2196 my ($path, $origin) = @_;
2006 2197
2007 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
2008} 2202}
2009 2203
2010sub do_load_sync { 2204sub do_load_sync {
2011 my ($map) = @_; 2205 my ($map) = @_;
2012 2206
2013 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2207 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2014 if $Coro::current == $Coro::main; 2208 if $Coro::current == $Coro::main;
2015 2209
2016 cf::sync_job { $map->load }; 2210 $map->load;
2017} 2211}
2018 2212
2019our %MAP_PREFETCH; 2213our %MAP_PREFETCH;
2020our $MAP_PREFETCHER = undef; 2214our $MAP_PREFETCHER = undef;
2021 2215
2023 my ($path, $origin, $load) = @_; 2217 my ($path, $origin, $load) = @_;
2024 2218
2025 $path = normalise $path, $origin && $origin->{path}; 2219 $path = normalise $path, $origin && $origin->{path};
2026 2220
2027 if (my $map = $cf::MAP{$path}) { 2221 if (my $map = $cf::MAP{$path}) {
2028 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2222 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2029 } 2223 }
2030 2224
2031 $MAP_PREFETCH{$path} |= $load; 2225 $MAP_PREFETCH{$path} |= $load;
2032 2226
2033 $MAP_PREFETCHER ||= cf::async { 2227 $MAP_PREFETCHER ||= cf::async {
2228 $Coro::current->{desc} = "map prefetcher";
2229
2034 while (%MAP_PREFETCH) { 2230 while (%MAP_PREFETCH) {
2035 while (my ($k, $v) = each %MAP_PREFETCH) { 2231 while (my ($k, $v) = each %MAP_PREFETCH) {
2036 if (my $map = find $k) { 2232 if (my $map = find $k) {
2037 $map->load if $v; 2233 $map->load if $v;
2038 } 2234 }
2045 $MAP_PREFETCHER->prio (6); 2241 $MAP_PREFETCHER->prio (6);
2046 2242
2047 () 2243 ()
2048} 2244}
2049 2245
2246# common code, used by both ->save and ->swapout
2050sub save { 2247sub _save {
2051 my ($self) = @_; 2248 my ($self) = @_;
2052
2053 my $lock = cf::lock_acquire "map_data:$self->{path}";
2054 2249
2055 $self->{last_save} = $cf::RUNTIME; 2250 $self->{last_save} = $cf::RUNTIME;
2056 2251
2057 return unless $self->dirty; 2252 return unless $self->dirty;
2058 2253
2064 return if $self->{deny_save}; 2259 return if $self->{deny_save};
2065 2260
2066 local $self->{last_access} = $self->last_access;#d# 2261 local $self->{last_access} = $self->last_access;#d#
2067 2262
2068 cf::async { 2263 cf::async {
2264 $Coro::current->{desc} = "map player save";
2069 $_->contr->save for $self->players; 2265 $_->contr->save for $self->players;
2070 }; 2266 };
2267
2268 cf::get_slot 0.02;
2071 2269
2072 if ($uniq) { 2270 if ($uniq) {
2073 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2271 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2074 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2272 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2075 } else { 2273 } else {
2076 $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);
2077 } 2275 }
2078} 2276}
2079 2277
2278sub save {
2279 my ($self) = @_;
2280
2281 my $lock = cf::lock_acquire "map_data:$self->{path}";
2282
2283 $self->_save;
2284}
2285
2080sub swap_out { 2286sub swap_out {
2081 my ($self) = @_; 2287 my ($self) = @_;
2082 2288
2083 # save first because save cedes
2084 $self->save;
2085
2086 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2289 my $lock = cf::lock_acquire "map_data:$self->{path}";
2087 2290
2291 return if $self->in_memory != cf::MAP_ACTIVE;
2292 return if $self->{deny_save};
2088 return if $self->players; 2293 return if $self->players;
2089 return if $self->in_memory != cf::MAP_IN_MEMORY;
2090 return if $self->{deny_save};
2091 2294
2295 # first deactivate the map and "unlink" it from the core
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
2092 $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};
2093 2345
2094 $self->deactivate; 2346 $self->deactivate;
2095 $_->clear_links_to ($self) for values %cf::MAP; 2347 $_->clear_links_to ($self) for values %cf::MAP;
2096 $self->clear; 2348 $self->clear;
2097}
2098
2099sub reset_at {
2100 my ($self) = @_;
2101
2102 # TODO: safety, remove and allow resettable per-player maps
2103 return 1e99 if $self->{deny_reset};
2104
2105 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2106 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2107
2108 $time + $to
2109}
2110
2111sub should_reset {
2112 my ($self) = @_;
2113
2114 $self->reset_at <= $cf::RUNTIME
2115}
2116
2117sub reset {
2118 my ($self) = @_;
2119
2120 my $lock = cf::lock_acquire "map_data:$self->{path}";
2121
2122 return if $self->players;
2123
2124 warn "resetting map ", $self->path;
2125
2126 $self->in_memory (cf::MAP_SWAPPED);
2127
2128 # need to save uniques path
2129 unless ($self->{deny_save}) {
2130 my $uniq = $self->uniq_path; utf8::encode $uniq;
2131
2132 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2133 if $uniq;
2134 }
2135
2136 delete $cf::MAP{$self->path};
2137
2138 $self->deactivate;
2139 $_->clear_links_to ($self) for values %cf::MAP;
2140 $self->clear;
2141 2349
2142 $self->unlink_save; 2350 $self->unlink_save;
2143 $self->destroy; 2351 $self->destroy;
2144} 2352}
2145 2353
2153 2361
2154 delete $cf::MAP{$self->path}; 2362 delete $cf::MAP{$self->path};
2155 2363
2156 $self->unlink_save; 2364 $self->unlink_save;
2157 2365
2158 bless $self, "cf::map"; 2366 bless $self, "cf::map::wrap";
2159 delete $self->{deny_reset}; 2367 delete $self->{deny_reset};
2160 $self->{deny_save} = 1; 2368 $self->{deny_save} = 1;
2161 $self->reset_timeout (1); 2369 $self->reset_timeout (1);
2162 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2370 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2163 2371
2212 2420
2213sub unique_maps() { 2421sub unique_maps() {
2214 [ 2422 [
2215 map { 2423 map {
2216 utf8::decode $_; 2424 utf8::decode $_;
2217 /\.map$/ 2425 s/\.map$//; # TODO future compatibility hack
2426 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2427 ? ()
2218 ? normalise $_ 2428 : normalise $_
2219 : ()
2220 } @{ aio_readdir $UNIQUEDIR or [] } 2429 } @{ aio_readdir $UNIQUEDIR or [] }
2221 ] 2430 ]
2222} 2431}
2223 2432
2224package 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}
2225 2464
2226=back 2465=back
2227 2466
2228=head3 cf::object 2467=head3 cf::object
2229 2468
2233 2472
2234=over 4 2473=over 4
2235 2474
2236=item $ob->inv_recursive 2475=item $ob->inv_recursive
2237 2476
2238Returns 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.
2239 2479
2240=cut 2480=cut
2241 2481
2242sub inv_recursive_; 2482sub inv_recursive_;
2243sub inv_recursive_ { 2483sub inv_recursive_ {
2248 inv_recursive_ inv $_[0] 2488 inv_recursive_ inv $_[0]
2249} 2489}
2250 2490
2251=item $ref = $ob->ref 2491=item $ref = $ob->ref
2252 2492
2253creates 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.
2254 2494
2255=item $ob = cf::object::deref ($refstring) 2495=item $ob = cf::object::deref ($refstring)
2256 2496
2257returns 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,
2258even if the object actually exists. May block. 2498even if the object actually exists. May block.
2260=cut 2500=cut
2261 2501
2262sub deref { 2502sub deref {
2263 my ($ref) = @_; 2503 my ($ref) = @_;
2264 2504
2265 # temporary compatibility#TODO#remove
2266 $ref =~ s{^<}{player/<};
2267
2268 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2505 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2269 my ($uuid, $name) = ($1, $2); 2506 my ($uuid, $name) = ($1, $2);
2270 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2507 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2271 or return; 2508 or return;
2272 $pl->ob->uuid eq $uuid 2509 $pl->ob->uuid eq $uuid
2273 or return; 2510 or return;
2293can 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
2294dialogue with the given NPC character. 2531dialogue with the given NPC character.
2295 2532
2296=cut 2533=cut
2297 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
2298# rough implementation of a future "reply" method that works 2549# rough implementation of a future "reply" method that works
2299# with dialog boxes. 2550# with dialog boxes.
2300#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
2301sub cf::object::player::reply($$$;$) { 2552sub cf::object::player::reply($$$;$) {
2302 my ($self, $npc, $msg, $flags) = @_; 2553 my ($self, $npc, $msg, $flags) = @_;
2313 my $dialog = $pl->{npc_dialog}; 2564 my $dialog = $pl->{npc_dialog};
2314 $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));
2315 2566
2316 } else { 2567 } else {
2317 $msg = $npc->name . " says: $msg" if $npc; 2568 $msg = $npc->name . " says: $msg" if $npc;
2318 $self->message ($msg, $flags); 2569 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2319 } 2570 }
2320 } 2571 }
2321} 2572}
2322 2573
2323=item $object->send_msg ($channel, $msg, $color, [extra...]) 2574=item $object->send_msg ($channel, $msg, $color, [extra...])
2348 2599
2349=item $player_object->enter_link 2600=item $player_object->enter_link
2350 2601
2351Freezes 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}>).
2352 2603
2353The 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.
2354I<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.
2355 2608
2356Will never block. 2609Will never block.
2357 2610
2358=item $player_object->leave_link ($map, $x, $y) 2611=item $player_object->leave_link ($map, $x, $y)
2359 2612
2379sub cf::object::player::enter_link { 2632sub cf::object::player::enter_link {
2380 my ($self) = @_; 2633 my ($self) = @_;
2381 2634
2382 $self->deactivate_recursive; 2635 $self->deactivate_recursive;
2383 2636
2637 ++$self->{_link_recursion};
2638
2384 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2639 return if UNIVERSAL::isa $self->map, "ext::map_link";
2385 2640
2386 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2641 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2387 if $self->map && $self->map->{path} ne "{link}"; 2642 if $self->map && $self->map->{path} ne "{link}";
2388 2643
2389 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2644 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2390} 2645}
2391 2646
2392sub cf::object::player::leave_link { 2647sub cf::object::player::leave_link {
2393 my ($self, $map, $x, $y) = @_; 2648 my ($self, $map, $x, $y) = @_;
2394 2649
2411 ($x, $y) = (-1, -1) 2666 ($x, $y) = (-1, -1)
2412 unless (defined $x) && (defined $y); 2667 unless (defined $x) && (defined $y);
2413 2668
2414 # use -1 or undef as default coordinates, not 0, 0 2669 # use -1 or undef as default coordinates, not 0, 0
2415 ($x, $y) = ($map->enter_x, $map->enter_y) 2670 ($x, $y) = ($map->enter_x, $map->enter_y)
2416 if $x <=0 && $y <= 0; 2671 if $x <= 0 && $y <= 0;
2417 2672
2418 $map->load; 2673 $map->load;
2419 $map->load_neighbours; 2674 $map->load_neighbours;
2420 2675
2421 return unless $self->contr->active; 2676 return unless $self->contr->active;
2422 $self->activate_recursive;
2423 2677
2424 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2678 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2425 $self->enter_map ($map, $x, $y); 2679 if ($self->enter_map ($map, $x, $y)) {
2426} 2680 # entering was successful
2681 delete $self->{_link_recursion};
2682 # only activate afterwards, to support waiting in hooks
2683 $self->activate_recursive;
2684 }
2427 2685
2686}
2687
2428=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)]])
2429 2689
2430Moves 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
2431her, loading and preparing them map, calling the provided $check callback 2691her, loading and preparing them map, calling the provided $check callback
2432that 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
2433the 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
2434be called at the end of this process. 2694be called at the end of this process.
2435 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
2436=cut 2699=cut
2437 2700
2438our $GOTOGEN; 2701our $GOTOGEN;
2439 2702
2440sub cf::object::player::goto { 2703sub cf::object::player::goto {
2441 my ($self, $path, $x, $y, $check, $done) = @_; 2704 my ($self, $path, $x, $y, $check, $done) = @_;
2442 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 }
2711
2443 # 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
2444 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2713 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2445 2714
2446 $self->enter_link; 2715 $self->enter_link;
2447 2716
2448 (async { 2717 (async {
2718 $Coro::current->{desc} = "player::goto $path $x $y";
2719
2720 # *tag paths override both path and x|y
2721 if ($path =~ /^\*(.*)$/) {
2722 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2723 my $ob = $obs[rand @obs];
2724
2725 # see if we actually can go there
2726 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2727 $ob = $obs[rand @obs];
2728 } else {
2729 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2730 }
2731 # else put us there anyways for now #d#
2732
2733 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2734 } else {
2735 ($path, $x, $y) = (undef, undef, undef);
2736 }
2737 }
2738
2449 my $map = eval { 2739 my $map = eval {
2450 my $map = cf::map::find $path; 2740 my $map = defined $path ? cf::map::find $path : undef;
2451 2741
2452 if ($map) { 2742 if ($map) {
2453 $map = $map->customise_for ($self); 2743 $map = $map->customise_for ($self);
2454 $map = $check->($map) if $check && $map; 2744 $map = $check->($map, $x, $y, $self) if $check && $map;
2455 } else { 2745 } else {
2456 $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);
2457 } 2747 }
2458 2748
2459 $map 2749 $map
2460 }; 2750 };
2461 2751
2467 if ($gen == $self->{_goto_generation}) { 2757 if ($gen == $self->{_goto_generation}) {
2468 delete $self->{_goto_generation}; 2758 delete $self->{_goto_generation};
2469 $self->leave_link ($map, $x, $y); 2759 $self->leave_link ($map, $x, $y);
2470 } 2760 }
2471 2761
2472 $done->() if $done; 2762 $done->($self) if $done;
2473 })->prio (1); 2763 })->prio (1);
2474} 2764}
2475 2765
2476=item $player_object->enter_exit ($exit_object) 2766=item $player_object->enter_exit ($exit_object)
2477 2767
2497} 2787}
2498 2788
2499sub prepare_random_map { 2789sub prepare_random_map {
2500 my ($exit) = @_; 2790 my ($exit) = @_;
2501 2791
2502 my $guard = cf::lock_acquire "exit_prepare:$exit";
2503
2504 # all this does is basically replace the /! path by 2792 # all this does is basically replace the /! path by
2505 # a new random map path (?random/...) with a seed 2793 # a new random map path (?random/...) with a seed
2506 # that depends on the exit object 2794 # that depends on the exit object
2507 2795
2508 my $rmp = parse_random_map_params $exit->msg; 2796 my $rmp = parse_random_map_params $exit->msg;
2510 if ($exit->map) { 2798 if ($exit->map) {
2511 $rmp->{region} = $exit->region->name; 2799 $rmp->{region} = $exit->region->name;
2512 $rmp->{origin_map} = $exit->map->path; 2800 $rmp->{origin_map} = $exit->map->path;
2513 $rmp->{origin_x} = $exit->x; 2801 $rmp->{origin_x} = $exit->x;
2514 $rmp->{origin_y} = $exit->y; 2802 $rmp->{origin_y} = $exit->y;
2803
2804 $exit->map->touch;
2515 } 2805 }
2516 2806
2517 $rmp->{random_seed} ||= $exit->random_seed; 2807 $rmp->{random_seed} ||= $exit->random_seed;
2518 2808
2519 my $data = cf::to_json $rmp; 2809 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2520 my $md5 = Digest::MD5::md5_hex $data; 2810 my $md5 = Digest::MD5::md5_hex $data;
2521 my $meta = "$RANDOMDIR/$md5.meta"; 2811 my $meta = "$RANDOMDIR/$md5.meta";
2522 2812
2523 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2813 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2524 aio_write $fh, 0, (length $data), $data, 0; 2814 aio_write $fh, 0, (length $data), $data, 0;
2525 undef $fh; 2815 undef $fh;
2526 aio_rename "$meta~", $meta; 2816 aio_rename "$meta~", $meta;
2527 2817
2818 my $slaying = "?random/$md5";
2819
2820 if ($exit->valid) {
2528 $exit->slaying ("?random/$md5"); 2821 $exit->slaying ("?random/$md5");
2529 $exit->msg (undef); 2822 $exit->msg (undef);
2823 }
2530 } 2824 }
2531} 2825}
2532 2826
2533sub cf::object::player::enter_exit { 2827sub cf::object::player::enter_exit {
2534 my ($self, $exit) = @_; 2828 my ($self, $exit) = @_;
2535 2829
2536 return unless $self->type == cf::PLAYER; 2830 return unless $self->type == cf::PLAYER;
2537 2831
2538 if ($exit->slaying eq "/!") {
2539 #TODO: this should de-fi-ni-te-ly not be a sync-job
2540 # the problem is that $exit might not survive long enough
2541 # so it needs to be done right now, right here
2542 cf::sync_job { prepare_random_map $exit };
2543 }
2544
2545 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2546 my $hp = $exit->stats->hp;
2547 my $sp = $exit->stats->sp;
2548
2549 $self->enter_link; 2832 $self->enter_link;
2550 2833
2551 # if exit is damned, update players death & WoR home-position
2552 $self->contr->savebed ($slaying, $hp, $sp)
2553 if $exit->flag (FLAG_DAMNED);
2554
2555 (async { 2834 (async {
2556 $self->deactivate_recursive; # just to be sure 2835 $Coro::current->{desc} = "enter_exit";
2836
2557 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
2558 $self->goto ($slaying, $hp, $sp); 2852 $self->goto ($map, $x, $y);
2559 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
2560 1; 2858 1
2561 }) { 2859 }) {
2562 $self->message ("Something went wrong deep within the crossfire server. " 2860 $self->message ("Something went wrong deep within the deliantra server. "
2563 . "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. "
2564 . "Please report this to the dungeon master!", 2862 . "Please report this to the dungeon master!",
2565 cf::NDI_UNIQUE | cf::NDI_RED); 2863 cf::NDI_UNIQUE | cf::NDI_RED);
2566 2864
2567 warn "ERROR in enter_exit: $@"; 2865 error "ERROR in enter_exit: $@";
2568 $self->leave_link; 2866 $self->leave_link;
2569 } 2867 }
2570 })->prio (1); 2868 })->prio (1);
2571} 2869}
2572 2870
2584sub cf::client::send_drawinfo { 2882sub cf::client::send_drawinfo {
2585 my ($self, $text, $flags) = @_; 2883 my ($self, $text, $flags) = @_;
2586 2884
2587 utf8::encode $text; 2885 utf8::encode $text;
2588 $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);
2589} 2912}
2590 2913
2591=item $client->send_msg ($channel, $msg, $color, [extra...]) 2914=item $client->send_msg ($channel, $msg, $color, [extra...])
2592 2915
2593Send 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
2595the 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
2596the message unless the client supports the msg packet. 2919the message unless the client supports the msg packet.
2597 2920
2598=cut 2921=cut
2599 2922
2923# non-persistent channels (usually the info channel)
2600our %CHANNEL = ( 2924our %CHANNEL = (
2925 "c/motd" => {
2926 id => "infobox",
2927 title => "MOTD",
2928 reply => undef,
2929 tooltip => "The message of the day",
2930 },
2601 "c/identify" => { 2931 "c/identify" => {
2602 id => "identify", 2932 id => "infobox",
2603 title => "Identify", 2933 title => "Identify",
2604 reply => undef, 2934 reply => undef,
2605 tooltip => "Items recently identified", 2935 tooltip => "Items recently identified",
2606 }, 2936 },
2607 "c/examine" => { 2937 "c/examine" => {
2608 id => "examine", 2938 id => "infobox",
2609 title => "Examine", 2939 title => "Examine",
2610 reply => undef, 2940 reply => undef,
2611 tooltip => "Signs and other items you examined", 2941 tooltip => "Signs and other items you examined",
2612 }, 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 },
2955 "c/lookat" => {
2956 id => "infobox",
2957 title => "Look",
2958 reply => undef,
2959 tooltip => "What you saw there",
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,
2613); 3035);
2614 3036
2615sub cf::client::send_msg { 3037sub cf::client::send_msg {
2616 my ($self, $channel, $msg, $color, @extra) = @_; 3038 my ($self, $channel, $msg, $color, @extra) = @_;
2617 3039
2618 $msg = $self->pl->expand_cfpod ($msg); 3040 $msg = $self->pl->expand_cfpod ($msg)
3041 unless $color & cf::NDI_VERBATIM;
2619 3042
2620 $color &= cf::NDI_CLIENT_MASK; # just in case... 3043 $color &= cf::NDI_CLIENT_MASK; # just in case...
2621 3044
2622 # check predefined channels, for the benefit of C 3045 # check predefined channels, for the benefit of C
2623 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3046 if ($CHANNEL{$channel}) {
3047 $channel = $CHANNEL{$channel};
2624 3048
3049 $self->ext_msg (channel_info => $channel);
3050 $channel = $channel->{id};
3051
2625 if (ref $channel) { 3052 } elsif (ref $channel) {
2626 # send meta info to client, if not yet sent 3053 # send meta info to client, if not yet sent
2627 unless (exists $self->{channel}{$channel->{id}}) { 3054 unless (exists $self->{channel}{$channel->{id}}) {
2628 $self->{channel}{$channel->{id}} = $channel; 3055 $self->{channel}{$channel->{id}} = $channel;
2629 $self->ext_msg (channel_info => $channel) 3056 $self->ext_msg (channel_info => $channel);
2630 if $self->can_msg;
2631 } 3057 }
2632 3058
2633 $channel = $channel->{id}; 3059 $channel = $channel->{id};
2634 } 3060 }
2635 3061
2636 return unless @extra || length $msg; 3062 return unless @extra || length $msg;
2637 3063
2638 if ($self->can_msg) {
2639 # default colour, mask it out 3064 # default colour, mask it out
2640 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3065 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2641 if $color & cf::NDI_DEF; 3066 if $color & cf::NDI_DEF;
2642 3067
2643 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3068 my $pkt = "msg "
3069 . $self->{json_coder}->encode (
2644 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3070 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2645 } else { 3071 );
2646 if ($color >= 0) {
2647 # replace some tags by gcfclient-compatible ones
2648 for ($msg) {
2649 1 while
2650 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2651 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2652 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2653 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2654 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2655 }
2656 3072
2657 $color &= cf::NDI_COLOR_MASK; 3073 $self->send_big_packet ($pkt);
2658
2659 utf8::encode $msg;
2660
2661 if (0 && $msg =~ /\[/) {
2662 # COMMAND/INFO
2663 $self->send_packet ("drawextinfo $color 10 8 $msg")
2664 } else {
2665 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2666 $self->send_packet ("drawinfo $color $msg")
2667 }
2668 }
2669 }
2670} 3074}
2671 3075
2672=item $client->ext_msg ($type, @msg) 3076=item $client->ext_msg ($type, @msg)
2673 3077
2674Sends an ext event to the client. 3078Sends an ext event to the client.
2677 3081
2678sub cf::client::ext_msg($$@) { 3082sub cf::client::ext_msg($$@) {
2679 my ($self, $type, @msg) = @_; 3083 my ($self, $type, @msg) = @_;
2680 3084
2681 if ($self->extcmd == 2) { 3085 if ($self->extcmd == 2) {
2682 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3086 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2683 } elsif ($self->extcmd == 1) { # TODO: remove 3087 } elsif ($self->extcmd == 1) { # TODO: remove
2684 push @msg, msgtype => "event_$type"; 3088 push @msg, msgtype => "event_$type";
2685 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3089 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2686 } 3090 }
2687} 3091}
2688 3092
2689=item $client->ext_reply ($msgid, @msg) 3093=item $client->ext_reply ($msgid, @msg)
2690 3094
2694 3098
2695sub cf::client::ext_reply($$@) { 3099sub cf::client::ext_reply($$@) {
2696 my ($self, $id, @msg) = @_; 3100 my ($self, $id, @msg) = @_;
2697 3101
2698 if ($self->extcmd == 2) { 3102 if ($self->extcmd == 2) {
2699 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3103 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2700 } elsif ($self->extcmd == 1) { 3104 } elsif ($self->extcmd == 1) {
2701 #TODO: version 1, remove 3105 #TODO: version 1, remove
2702 unshift @msg, msgtype => "reply", msgid => $id; 3106 unshift @msg, msgtype => "reply", msgid => $id;
2703 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3107 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2704 } 3108 }
2705} 3109}
2706 3110
2707=item $success = $client->query ($flags, "text", \&cb) 3111=item $success = $client->query ($flags, "text", \&cb)
2708 3112
2779 3183
2780 $ns->ext_reply ($reply, @reply) 3184 $ns->ext_reply ($reply, @reply)
2781 if $reply; 3185 if $reply;
2782 3186
2783 } else { 3187 } else {
2784 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";
2785 } 3189 }
2786 3190
2787 cf::override; 3191 cf::override;
2788 }, 3192 },
2789); 3193);
2809 3213
2810 $coro 3214 $coro
2811} 3215}
2812 3216
2813cf::client->attach ( 3217cf::client->attach (
2814 on_destroy => sub { 3218 on_client_destroy => sub {
2815 my ($ns) = @_; 3219 my ($ns) = @_;
2816 3220
2817 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3221 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2818 }, 3222 },
2819); 3223);
2835our $safe_hole = new Safe::Hole; 3239our $safe_hole = new Safe::Hole;
2836 3240
2837$SIG{FPE} = 'IGNORE'; 3241$SIG{FPE} = 'IGNORE';
2838 3242
2839$safe->permit_only (Opcode::opset qw( 3243$safe->permit_only (Opcode::opset qw(
2840 :base_core :base_mem :base_orig :base_math 3244 :base_core :base_mem :base_orig :base_math :base_loop
2841 grepstart grepwhile mapstart mapwhile 3245 grepstart grepwhile mapstart mapwhile
2842 sort time 3246 sort time
2843)); 3247));
2844 3248
2845# here we export the classes and methods available to script code 3249# here we export the classes and methods available to script code
2847=pod 3251=pod
2848 3252
2849The following functions and methods are available within a safe environment: 3253The following functions and methods are available within a safe environment:
2850 3254
2851 cf::object 3255 cf::object
2852 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
2853 insert remove name archname title slaying race decrease_ob_nr 3257 insert remove name archname title slaying race decrease split
3258 value
2854 3259
2855 cf::object::player 3260 cf::object::player
2856 player 3261 player
2857 3262
2858 cf::player 3263 cf::player
2863 3268
2864=cut 3269=cut
2865 3270
2866for ( 3271for (
2867 ["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
2868 insert remove inv name archname title slaying race 3273 insert remove inv nrof name archname title slaying race
2869 decrease_ob_nr)], 3274 decrease split destroy change_exp value msg lore send_msg)],
2870 ["cf::object::player" => qw(player)], 3275 ["cf::object::player" => qw(player)],
2871 ["cf::player" => qw(peaceful)], 3276 ["cf::player" => qw(peaceful send_msg)],
2872 ["cf::map" => qw(trigger)], 3277 ["cf::map" => qw(trigger)],
2873) { 3278) {
2874 no strict 'refs';
2875 my ($pkg, @funs) = @$_; 3279 my ($pkg, @funs) = @$_;
2876 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3280 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2877 for @funs; 3281 for @funs;
2878} 3282}
2879 3283
2894 3298
2895 my $qcode = $code; 3299 my $qcode = $code;
2896 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3300 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2897 $qcode =~ s/\n/\\n/g; 3301 $qcode =~ s/\n/\\n/g;
2898 3302
3303 %vars = (_dummy => 0) unless %vars;
3304
3305 my @res;
2899 local $_; 3306 local $_;
2900 local @safe::cf::_safe_eval_args = values %vars;
2901 3307
2902 my $eval = 3308 my $eval =
2903 "do {\n" 3309 "do {\n"
2904 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3310 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2905 . "#line 0 \"{$qcode}\"\n" 3311 . "#line 0 \"{$qcode}\"\n"
2906 . $code 3312 . $code
2907 . "\n}" 3313 . "\n}"
2908 ; 3314 ;
2909 3315
3316 if ($CFG{safe_eval}) {
2910 sub_generation_inc; 3317 sub_generation_inc;
3318 local @safe::cf::_safe_eval_args = values %vars;
2911 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3319 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2912 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 }
2913 3325
2914 if ($@) { 3326 if ($@) {
2915 warn "$@"; 3327 warn "$@",
2916 warn "while executing safe code '$code'\n"; 3328 "while executing safe code '$code'\n",
2917 warn "with arguments " . (join " ", %vars) . "\n"; 3329 "with arguments " . (join " ", %vars) . "\n";
2918 } 3330 }
2919 3331
2920 wantarray ? @res : $res[0] 3332 wantarray ? @res : $res[0]
2921} 3333}
2922 3334
2936=cut 3348=cut
2937 3349
2938sub register_script_function { 3350sub register_script_function {
2939 my ($fun, $cb) = @_; 3351 my ($fun, $cb) = @_;
2940 3352
2941 no strict 'refs'; 3353 $fun = "safe::$fun" if $CFG{safe_eval};
2942 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3354 *$fun = $safe_hole->wrap ($cb);
2943} 3355}
2944 3356
2945=back 3357=back
2946 3358
2947=cut 3359=cut
2956 # for this (global event?) 3368 # for this (global event?)
2957 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
2958 3370
2959 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3371 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2960 3372
2961 warn "loading facedata from $path\n"; 3373 trace "loading facedata from $path\n";
2962 3374
2963 my $facedata; 3375 my $facedata;
2964 0 < aio_load $path, $facedata 3376 0 < aio_load $path, $facedata
2965 or die "$path: $!"; 3377 or die "$path: $!";
2966 3378
2968 3380
2969 $facedata->{version} == 2 3381 $facedata->{version} == 2
2970 or cf::cleanup "$path: version mismatch, cannot proceed."; 3382 or cf::cleanup "$path: version mismatch, cannot proceed.";
2971 3383
2972 # 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]);
2973 $facedata->{resource}{"res/exp_table"} = { 3386 $facedata->{resource}{"res/exp_table"} = {
2974 type => FT_RSRC, 3387 type => FT_RSRC,
2975 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),
2976 }; 3390 };
2977 cf::cede_to_tick; 3391 cf::cede_to_tick;
2978 3392
2979 { 3393 {
2980 my $faces = $facedata->{faceinfo}; 3394 my $faces = $facedata->{faceinfo};
2981 3395
2982 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
2983 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3397 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3398
2984 cf::face::set_visibility $idx, $info->{visibility}; 3399 cf::face::set_visibility $idx, $info->{visibility};
2985 cf::face::set_magicmap $idx, $info->{magicmap}; 3400 cf::face::set_magicmap $idx, $info->{magicmap};
2986 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2987 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2988 3403
2989 cf::cede_to_tick; 3404 cf::cede_to_tick;
2990 } 3405 }
2991 3406
2992 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
2993 next unless $info->{smooth}; 3408 next unless $info->{smooth};
3409
2994 my $idx = cf::face::find $face 3410 my $idx = cf::face::find $face
2995 or next; 3411 or next;
3412
2996 if (my $smooth = cf::face::find $info->{smooth}) { 3413 if (my $smooth = cf::face::find $info->{smooth}) {
2997 cf::face::set_smooth $idx, $smooth; 3414 cf::face::set_smooth $idx, $smooth;
2998 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3415 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2999 } else { 3416 } else {
3000 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3417 error "smooth face '$info->{smooth}' not found for face '$face'";
3001 } 3418 }
3002 3419
3003 cf::cede_to_tick; 3420 cf::cede_to_tick;
3004 } 3421 }
3005 } 3422 }
3014 3431
3015 cf::anim::invalidate_all; # d'oh 3432 cf::anim::invalidate_all; # d'oh
3016 } 3433 }
3017 3434
3018 { 3435 {
3019 # TODO: for gcfclient pleasure, we should give resources
3020 # that gcfclient doesn't grok a >10000 face index.
3021 my $res = $facedata->{resource}; 3436 my $res = $facedata->{resource};
3022 3437
3023 my $soundconf = delete $res->{"res/sound.conf"};
3024
3025 while (my ($name, $info) = each %$res) { 3438 while (my ($name, $info) = each %$res) {
3439 if (defined $info->{type}) {
3026 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3440 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3027 my $data;
3028 3441
3029 if ($info->{type} & 1) { 3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3030 # prepend meta info 3443 cf::face::set_type $idx, $info->{type};
3031
3032 my $meta = $enc->encode ({
3033 name => $name,
3034 %{ $info->{meta} || {} },
3035 });
3036
3037 $data = pack "(w/a*)*", $meta, $info->{data};
3038 } else { 3444 } else {
3039 $data = $info->{data}; 3445 $RESOURCE{$name} = $info; # unused
3040 } 3446 }
3041 3447
3042 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3043 cf::face::set_type $idx, $info->{type};
3044
3045 cf::cede_to_tick; 3448 cf::cede_to_tick;
3046 } 3449 }
3047
3048 if ($soundconf) {
3049 $soundconf = $enc->decode (delete $soundconf->{data});
3050
3051 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3052 my $sound = $soundconf->{compat}[$_]
3053 or next;
3054
3055 my $face = cf::face::find "sound/$sound->[1]";
3056 cf::sound::set $sound->[0] => $face;
3057 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3058 }
3059
3060 while (my ($k, $v) = each %{$soundconf->{event}}) {
3061 my $face = cf::face::find "sound/$v";
3062 cf::sound::set $k => $face;
3063 }
3064 }
3065 } 3450 }
3451
3452 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3066 3453
3067 1 3454 1
3068} 3455}
3069 3456
3070register_exticmd fx_want => sub { 3457register_exticmd fx_want => sub {
3072 3459
3073 while (my ($k, $v) = each %$want) { 3460 while (my ($k, $v) = each %$want) {
3074 $ns->fx_want ($k, $v); 3461 $ns->fx_want ($k, $v);
3075 } 3462 }
3076}; 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}
3077 3474
3078sub reload_regions { 3475sub reload_regions {
3079 # 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
3080 # for this (global event?) 3477 # for this (global event?)
3081 %ext::player_env::MUSIC_FACE_CACHE = (); 3478 %ext::player_env::MUSIC_FACE_CACHE = ();
3095} 3492}
3096 3493
3097sub reload_archetypes { 3494sub reload_archetypes {
3098 load_resource_file "$DATADIR/archetypes" 3495 load_resource_file "$DATADIR/archetypes"
3099 or die "unable to load archetypes\n"; 3496 or die "unable to load archetypes\n";
3100 #d# NEED to laod twice to resolve forward references
3101 # this really needs to be done in an extra post-pass
3102 # (which needs to be synchronous, so solve it differently)
3103 load_resource_file "$DATADIR/archetypes"
3104 or die "unable to load archetypes\n";
3105} 3497}
3106 3498
3107sub reload_treasures { 3499sub reload_treasures {
3108 load_resource_file "$DATADIR/treasures" 3500 load_resource_file "$DATADIR/treasures"
3109 or die "unable to load treasurelists\n"; 3501 or die "unable to load treasurelists\n";
3110} 3502}
3111 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
3112sub reload_resources { 3527sub reload_resources {
3113 warn "reloading resource files...\n"; 3528 trace "reloading resource files...\n";
3114 3529
3530 reload_facedata;
3531 reload_sound;
3532 reload_archetypes;
3115 reload_regions; 3533 reload_regions;
3116 reload_facedata;
3117 #reload_archetypes;#d#
3118 reload_archetypes;
3119 reload_treasures; 3534 reload_treasures;
3120 3535
3121 warn "finished reloading resource files\n"; 3536 trace "finished reloading resource files\n";
3122}
3123
3124sub init {
3125 reload_resources;
3126} 3537}
3127 3538
3128sub reload_config { 3539sub reload_config {
3540 trace "reloading config file...\n";
3541
3129 open my $fh, "<:utf8", "$CONFDIR/config" 3542 open my $fh, "<:utf8", "$CONFDIR/config"
3130 or return; 3543 or return;
3131 3544
3132 local $/; 3545 local $/;
3133 *CFG = YAML::Syck::Load <$fh>; 3546 *CFG = YAML::XS::Load scalar <$fh>;
3134 3547
3135 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3548 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3136 3549
3137 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3550 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3138 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3551 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3139 3552
3140 if (exists $CFG{mlockall}) { 3553 if (exists $CFG{mlockall}) {
3142 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3555 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3143 and die "WARNING: m(un)lockall failed: $!\n"; 3556 and die "WARNING: m(un)lockall failed: $!\n";
3144 }; 3557 };
3145 warn $@ if $@; 3558 warn $@ if $@;
3146 } 3559 }
3560
3561 trace "finished reloading resource files\n";
3562}
3563
3564sub pidfile() {
3565 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3566 or die "$PIDFILE: $!";
3567 flock $fh, &Fcntl::LOCK_EX
3568 or die "$PIDFILE: flock: $!";
3569 $fh
3570}
3571
3572# make sure only one server instance is running at any one time
3573sub atomic {
3574 my $fh = pidfile;
3575
3576 my $pid = <$fh>;
3577 kill 9, $pid if $pid > 0;
3578
3579 seek $fh, 0, 0;
3580 print $fh $$;
3581}
3582
3583sub main_loop {
3584 trace "EV::loop starting\n";
3585 if (1) {
3586 EV::loop;
3587 }
3588 trace "EV::loop returned\n";
3589 goto &main_loop unless $REALLY_UNLOOP;
3147} 3590}
3148 3591
3149sub main { 3592sub main {
3593 cf::init_globals; # initialise logging
3594
3595 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3596 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3597 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3598 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3599
3600 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3601
3150 # we must not ever block the main coroutine 3602 # we must not ever block the main coroutine
3151 local $Coro::idle = sub { 3603 local $Coro::idle = sub {
3152 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3604 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3153 (async { 3605 (async {
3154 Event::one_event; 3606 $Coro::current->{desc} = "IDLE BUG HANDLER";
3607 EV::loop EV::LOOP_ONESHOT;
3155 })->prio (Coro::PRIO_MAX); 3608 })->prio (Coro::PRIO_MAX);
3156 }; 3609 };
3157 3610
3611 evthread_start IO::AIO::poll_fileno;
3612
3613 cf::sync_job {
3614 cf::incloader::init ();
3615
3616 cf::init_experience;
3617 cf::init_anim;
3618 cf::init_attackmess;
3619 cf::init_dynamic;
3620
3621 cf::load_settings;
3622 cf::load_materials;
3623
3624 reload_resources;
3158 reload_config; 3625 reload_config;
3159 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
3160 load_extensions; 3636 load_extensions;
3161 3637
3162 $TICK_WATCHER->start; 3638 utime time, time, $RUNTIMEFILE;
3163 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;
3164} 3656}
3165 3657
3166############################################################################# 3658#############################################################################
3167# initialisation and cleanup 3659# initialisation and cleanup
3168 3660
3169# install some emergency cleanup handlers 3661# install some emergency cleanup handlers
3170BEGIN { 3662BEGIN {
3663 our %SIGWATCHER = ();
3171 for my $signal (qw(INT HUP TERM)) { 3664 for my $signal (qw(INT HUP TERM)) {
3172 Event->signal ( 3665 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3173 reentrant => 0,
3174 data => WF_AUTOCANCEL,
3175 signal => $signal,
3176 prio => 0,
3177 cb => sub {
3178 cf::cleanup "SIG$signal"; 3666 cf::cleanup "SIG$signal";
3179 },
3180 ); 3667 };
3181 } 3668 }
3182} 3669}
3183 3670
3184sub write_runtime { 3671sub write_runtime_sync {
3185 my $runtime = "$LOCALDIR/runtime"; 3672 my $t0 = AE::time;
3186 3673
3187 # first touch the runtime file to show we are still running: 3674 # first touch the runtime file to show we are still running:
3188 # the fsync below can take a very very long time. 3675 # the fsync below can take a very very long time.
3189 3676
3190 IO::AIO::aio_utime $runtime, undef, undef; 3677 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3191 3678
3192 my $guard = cf::lock_acquire "write_runtime"; 3679 my $guard = cf::lock_acquire "write_runtime";
3193 3680
3194 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3681 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3195 or return; 3682 or return;
3196 3683
3197 my $value = $cf::RUNTIME + 90 + 10; 3684 my $value = $cf::RUNTIME + 90 + 10;
3198 # 10 is the runtime save interval, for a monotonic clock 3685 # 10 is the runtime save interval, for a monotonic clock
3199 # 60 allows for the watchdog to kill the server. 3686 # 60 allows for the watchdog to kill the server.
3209 aio_utime $fh, undef, undef; 3696 aio_utime $fh, undef, undef;
3210 3697
3211 close $fh 3698 close $fh
3212 or return; 3699 or return;
3213 3700
3214 aio_rename "$runtime~", $runtime 3701 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3215 and return; 3702 and return;
3216 3703
3217 warn "runtime file written.\n"; 3704 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3218 3705
3219 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 };
3220} 3757}
3221 3758
3222sub emergency_save() { 3759sub emergency_save() {
3223 my $freeze_guard = cf::freeze_mainloop; 3760 my $freeze_guard = cf::freeze_mainloop;
3224 3761
3225 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;
3226 3768
3227 cf::sync_job { 3769 cf::sync_job {
3770 cf::write_runtime_sync; # external watchdog should not bark
3771
3228 # use a peculiar iteration method to avoid tripping on perl 3772 # use a peculiar iteration method to avoid tripping on perl
3229 # refcount bugs in for. also avoids problems with players 3773 # refcount bugs in for. also avoids problems with players
3230 # and maps saved/destroyed asynchronously. 3774 # and maps saved/destroyed asynchronously.
3231 warn "begin emergency player save\n"; 3775 info "emergency_perl_save: begin player save\n";
3232 for my $login (keys %cf::PLAYER) { 3776 for my $login (keys %cf::PLAYER) {
3233 my $pl = $cf::PLAYER{$login} or next; 3777 my $pl = $cf::PLAYER{$login} or next;
3234 $pl->valid or next; 3778 $pl->valid or next;
3779 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3235 $pl->save; 3780 $pl->save;
3236 } 3781 }
3237 warn "end emergency player save\n"; 3782 info "emergency_perl_save: end player save\n";
3238 3783
3239 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";
3240 for my $path (keys %cf::MAP) { 3787 for my $path (keys %cf::MAP) {
3241 my $map = $cf::MAP{$path} or next; 3788 my $map = $cf::MAP{$path} or next;
3242 $map->valid or next; 3789 $map->valid or next;
3243 $map->save; 3790 $map->save;
3244 } 3791 }
3245 warn "end emergency map save\n"; 3792 info "emergency_perl_save: end map save\n";
3246 3793
3247 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";
3248 BDB::db_env_txn_checkpoint $DB_ENV; 3797 BDB::db_env_txn_checkpoint $DB_ENV;
3249 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
3250 }; 3822 };
3251 3823
3252 warn "leave emergency perl save\n"; 3824 info "emergency_perl_save: leave\n";
3253} 3825}
3254 3826
3255sub post_cleanup { 3827sub post_cleanup {
3256 my ($make_core) = @_; 3828 my ($make_core) = @_;
3257 3829
3830 IO::AIO::flush;
3831
3258 warn Carp::longmess "post_cleanup backtrace" 3832 error Carp::longmess "post_cleanup backtrace"
3259 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 }
3260} 3862}
3261 3863
3262sub do_reload_perl() { 3864sub do_reload_perl() {
3263 # can/must only be called in main 3865 # can/must only be called in main
3264 if ($Coro::current != $Coro::main) { 3866 unless (in_main) {
3265 warn "can only reload from main coroutine"; 3867 error "can only reload from main coroutine";
3266 return; 3868 return;
3267 } 3869 }
3268 3870
3871 return if $RELOAD++;
3872
3873 my $t1 = AE::time;
3874
3875 while ($RELOAD) {
3876 cf::get_slot 0.1, -1, "reload_perl";
3269 warn "reloading..."; 3877 info "reloading...";
3270 3878
3271 warn "entering sync_job"; 3879 trace "entering sync_job";
3272 3880
3273 cf::sync_job { 3881 cf::sync_job {
3274 cf::write_runtime; # external watchdog should not bark
3275 cf::emergency_save; 3882 #cf::emergency_save;
3276 cf::write_runtime; # external watchdog should not bark
3277 3883
3278 warn "syncing database to disk";
3279 BDB::db_env_txn_checkpoint $DB_ENV;
3280
3281 # if anything goes wrong in here, we should simply crash as we already saved
3282
3283 warn "cancelling all WF_AUTOCANCEL watchers";
3284 for (Event::all_watchers) {
3285 $_->cancel if $_->data & WF_AUTOCANCEL;
3286 }
3287
3288 warn "flushing outstanding aio requests";
3289 for (;;) {
3290 BDB::flush;
3291 IO::AIO::flush;
3292 Coro::cede;
3293 last unless IO::AIO::nreqs || BDB::nreqs;
3294 warn "iterate...";
3295 }
3296
3297 ++$RELOAD;
3298
3299 warn "cancelling all extension coros"; 3884 trace "cancelling all extension coros";
3300 $_->cancel for values %EXT_CORO; 3885 $_->cancel for values %EXT_CORO;
3301 %EXT_CORO = (); 3886 %EXT_CORO = ();
3302 3887
3303 warn "removing commands"; 3888 trace "removing commands";
3304 %COMMAND = (); 3889 %COMMAND = ();
3305 3890
3306 warn "removing ext/exti commands"; 3891 trace "removing ext/exti commands";
3307 %EXTCMD = (); 3892 %EXTCMD = ();
3308 %EXTICMD = (); 3893 %EXTICMD = ();
3309 3894
3310 warn "unloading/nuking all extensions"; 3895 trace "unloading/nuking all extensions";
3311 for my $pkg (@EXTS) { 3896 for my $pkg (@EXTS) {
3312 warn "... unloading $pkg"; 3897 trace "... unloading $pkg";
3313 3898
3314 if (my $cb = $pkg->can ("unload")) { 3899 if (my $cb = $pkg->can ("unload")) {
3315 eval { 3900 eval {
3316 $cb->($pkg); 3901 $cb->($pkg);
3317 1 3902 1
3318 } 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;
3319 } 3908 }
3320 3909
3321 warn "... nuking $pkg";
3322 Symbol::delete_package $pkg;
3323 }
3324
3325 warn "unloading all perl modules loaded from $LIBDIR"; 3910 trace "unloading all perl modules loaded from $LIBDIR";
3326 while (my ($k, $v) = each %INC) { 3911 while (my ($k, $v) = each %INC) {
3327 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3912 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3328 3913
3329 warn "... unloading $k"; 3914 trace "... unloading $k";
3330 delete $INC{$k}; 3915 delete $INC{$k};
3331 3916
3332 $k =~ s/\.pm$//; 3917 $k =~ s/\.pm$//;
3333 $k =~ s/\//::/g; 3918 $k =~ s/\//::/g;
3334 3919
3335 if (my $cb = $k->can ("unload_module")) { 3920 if (my $cb = $k->can ("unload_module")) {
3336 $cb->(); 3921 $cb->();
3922 }
3923
3924 clear_package $k;
3337 } 3925 }
3338 3926
3339 Symbol::delete_package $k;
3340 }
3341
3342 warn "getting rid of safe::, as good as possible"; 3927 trace "getting rid of safe::, as good as possible";
3343 Symbol::delete_package "safe::$_" 3928 clear_package "safe::$_"
3344 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);
3345 3930
3346 warn "unloading cf.pm \"a bit\""; 3931 trace "unloading cf.pm \"a bit\"";
3347 delete $INC{"cf.pm"}; 3932 delete $INC{"cf.pm"};
3348 delete $INC{"cf/pod.pm"}; 3933 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3349 3934
3350 # don't, removes xs symbols, too, 3935 # don't, removes xs symbols, too,
3351 # and global variables created in xs 3936 # and global variables created in xs
3352 #Symbol::delete_package __PACKAGE__; 3937 #clear_package __PACKAGE__;
3353 3938
3354 warn "unload completed, starting to reload now"; 3939 info "unload completed, starting to reload now";
3355 3940
3356 warn "reloading cf.pm"; 3941 trace "reloading cf.pm";
3357 require cf; 3942 require cf;
3358 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3943 cf::_connect_to_perl_1;
3359 3944
3360 warn "loading config and database again"; 3945 trace "loading config and database again";
3361 cf::reload_config; 3946 cf::reload_config;
3362 3947
3363 warn "loading extensions"; 3948 trace "loading extensions";
3364 cf::load_extensions; 3949 cf::load_extensions;
3365 3950
3951 if ($REATTACH_ON_RELOAD) {
3366 warn "reattaching attachments to objects/players"; 3952 trace "reattaching attachments to objects/players";
3367 _global_reattach; # objects, sockets 3953 _global_reattach; # objects, sockets
3368 warn "reattaching attachments to maps"; 3954 trace "reattaching attachments to maps";
3369 reattach $_ for values %MAP; 3955 reattach $_ for values %MAP;
3370 warn "reattaching attachments to players"; 3956 trace "reattaching attachments to players";
3371 reattach $_ for values %PLAYER; 3957 reattach $_ for values %PLAYER;
3958 }
3372 3959
3960 trace "running post_init jobs";
3961 (pop @POST_INIT)->(1) while @POST_INIT;
3962
3373 warn "leaving sync_job"; 3963 trace "leaving sync_job";
3374 3964
3375 1 3965 1
3376 } or do { 3966 } or do {
3377 warn $@; 3967 error $@;
3378 warn "error while reloading, exiting."; 3968 cf::cleanup "error while reloading, exiting.";
3379 exit 1; 3969 };
3970
3971 info "reloaded";
3972 --$RELOAD;
3380 }; 3973 }
3381 3974
3382 warn "reloaded"; 3975 $t1 = AE::time - $t1;
3976 info "reload completed in ${t1}s\n";
3383}; 3977};
3384 3978
3385our $RELOAD_WATCHER; # used only during reload 3979our $RELOAD_WATCHER; # used only during reload
3386 3980
3387sub reload_perl() { 3981sub reload_perl() {
3388 # doing reload synchronously and two reloads happen back-to-back, 3982 # doing reload synchronously and two reloads happen back-to-back,
3389 # coro crashes during coro_state_free->destroy here. 3983 # coro crashes during coro_state_free->destroy here.
3390 3984
3391 $RELOAD_WATCHER ||= Event->timer ( 3985 $RELOAD_WATCHER ||= cf::async {
3392 reentrant => 0, 3986 Coro::AIO::aio_wait cache_extensions;
3393 after => 0, 3987
3394 data => WF_AUTOCANCEL, 3988 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3395 cb => sub {
3396 do_reload_perl; 3989 do_reload_perl;
3397 undef $RELOAD_WATCHER; 3990 undef $RELOAD_WATCHER;
3398 }, 3991 };
3399 ); 3992 };
3400} 3993}
3401 3994
3402register_command "reload" => sub { 3995register_command "reload" => sub {
3403 my ($who, $arg) = @_; 3996 my ($who, $arg) = @_;
3404 3997
3405 if ($who->flag (FLAG_WIZ)) { 3998 if ($who->flag (FLAG_WIZ)) {
3406 $who->message ("reloading server."); 3999 $who->message ("reloading server.");
4000 async {
4001 $Coro::current->{desc} = "perl_reload";
3407 async { reload_perl }; 4002 reload_perl;
4003 };
3408 } 4004 }
3409}; 4005};
3410 4006
3411unshift @INC, $LIBDIR; 4007#############################################################################
3412 4008
3413my $bug_warning = 0; 4009my $bug_warning = 0;
3414 4010
3415our @WAIT_FOR_TICK; 4011our @WAIT_FOR_TICK;
3416our @WAIT_FOR_TICK_BEGIN; 4012our @WAIT_FOR_TICK_BEGIN;
3417 4013
3418sub wait_for_tick { 4014sub wait_for_tick {
3419 return unless $TICK_WATCHER->is_active;
3420 return if $Coro::current == $Coro::main; 4015 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3421 4016
3422 my $signal = new Coro::Signal; 4017 my $signal = new Coro::Signal;
3423 push @WAIT_FOR_TICK, $signal; 4018 push @WAIT_FOR_TICK, $signal;
3424 $signal->wait; 4019 $signal->wait;
3425} 4020}
3426 4021
3427sub wait_for_tick_begin { 4022sub wait_for_tick_begin {
3428 return unless $TICK_WATCHER->is_active;
3429 return if $Coro::current == $Coro::main; 4023 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3430 4024
3431 my $signal = new Coro::Signal; 4025 my $signal = new Coro::Signal;
3432 push @WAIT_FOR_TICK_BEGIN, $signal; 4026 push @WAIT_FOR_TICK_BEGIN, $signal;
3433 $signal->wait; 4027 $signal->wait;
3434} 4028}
3435 4029
3436 my $min = 1e6;#d# 4030sub tick {
3437 my $avg = 10;
3438$TICK_WATCHER = Event->timer (
3439 reentrant => 0,
3440 parked => 1,
3441 prio => 0,
3442 at => $NEXT_TICK || $TICK,
3443 data => WF_AUTOCANCEL,
3444 cb => sub {
3445 if ($Coro::current != $Coro::main) { 4031 if ($Coro::current != $Coro::main) {
3446 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"
3447 unless ++$bug_warning > 10; 4033 unless ++$bug_warning > 10;
3448 return; 4034 return;
3449 } 4035 }
3450 4036
3451 $NOW = $tick_start = Event::time;
3452
3453 cf::server_tick; # one server iteration 4037 cf::server_tick; # one server iteration
3454 4038
3455 0 && sync_job {#d# 4039 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3456 for(1..10) {
3457 my $t = Event::time;
3458 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3459 or die;
3460 4040
3461 $map->width (50); 4041 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3462 $map->height (50); 4042 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3463 $map->alloc; 4043 Coro::async_pool {
3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work 4044 $Coro::current->{desc} = "runtime saver";
3465 my $t = Event::time - $t; 4045 write_runtime_sync
3466 4046 or error "ERROR: unable to write runtime file: $!";
3467 #next unless $t < 0.0013;#d#
3468 if ($t < $min) {
3469 $min = $t;
3470 }
3471 $avg = $avg * 0.99 + $t * 0.01;
3472 }
3473 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3474 exit 0;
3475 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3476 }; 4047 };
4048 }
3477 4049
3478 $RUNTIME += $TICK;
3479 $NEXT_TICK += $TICK;
3480
3481 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3482 $NEXT_RUNTIME_WRITE = $NOW + 10;
3483 Coro::async_pool {
3484 write_runtime
3485 or warn "ERROR: unable to write runtime file: $!";
3486 };
3487 }
3488
3489# my $AFTER = Event::time;
3490# warn $AFTER - $NOW;#d#
3491
3492 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4050 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3493 $sig->send; 4051 $sig->send;
3494 } 4052 }
3495 while (my $sig = shift @WAIT_FOR_TICK) { 4053 while (my $sig = shift @WAIT_FOR_TICK) {
3496 $sig->send; 4054 $sig->send;
3497 } 4055 }
3498 4056
3499 $NOW = Event::time; 4057 $LOAD = ($NOW - $TICK_START) / $TICK;
3500
3501 # if we are delayed by four ticks or more, skip them all
3502 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3503
3504 $TICK_WATCHER->at ($NEXT_TICK);
3505 $TICK_WATCHER->start;
3506
3507 $LOAD = ($NOW - $tick_start) / $TICK;
3508 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4058 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3509 4059
3510 _post_tick; 4060 if (0) {
3511 4061 if ($NEXT_TICK) {
3512 4062 my $jitter = $TICK_START - $NEXT_TICK;
4063 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4064 debug "jitter $JITTER\n";#d#
4065 }
3513 }, 4066 }
3514); 4067}
3515 4068
3516{ 4069{
3517 BDB::max_poll_time $TICK * 0.1; 4070 # configure BDB
3518 $BDB_POLL_WATCHER = Event->io ( 4071
3519 reentrant => 0,
3520 fd => BDB::poll_fileno,
3521 poll => 'r',
3522 prio => 0,
3523 data => WF_AUTOCANCEL,
3524 cb => \&BDB::poll_cb,
3525 );
3526 BDB::min_parallel 8; 4072 BDB::min_parallel 16;
3527 4073 BDB::max_poll_reqs $TICK * 0.1;
3528 BDB::set_sync_prepare { 4074 $AnyEvent::BDB::WATCHER->priority (1);
3529 my $status;
3530 my $current = $Coro::current;
3531 (
3532 sub {
3533 $status = $!;
3534 $current->ready; undef $current;
3535 },
3536 sub {
3537 Coro::schedule while defined $current;
3538 $! = $status;
3539 },
3540 )
3541 };
3542 4075
3543 unless ($DB_ENV) { 4076 unless ($DB_ENV) {
3544 $DB_ENV = BDB::db_env_create; 4077 $DB_ENV = BDB::db_env_create;
4078 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
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;
4081 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4082 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3545 4083
3546 cf::sync_job { 4084 cf::sync_job {
3547 eval { 4085 eval {
3548 BDB::db_env_open 4086 BDB::db_env_open
3549 $DB_ENV, 4087 $DB_ENV,
3551 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4089 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4090 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3553 0666; 4091 0666;
3554 4092
3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4093 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3556
3557 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3558 $DB_ENV->set_lk_detect;
3559 }; 4094 };
3560 4095
3561 cf::cleanup "db_env_open(db): $@" if $@; 4096 cf::cleanup "db_env_open(db): $@" if $@;
3562 }; 4097 };
3563 } 4098 }
4099
4100 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4101 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4102 };
4103 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4104 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4105 };
4106 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4107 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4108 };
3564} 4109}
3565 4110
3566{ 4111{
4112 # configure IO::AIO
4113
3567 IO::AIO::min_parallel 8; 4114 IO::AIO::min_parallel 8;
3568
3569 undef $Coro::AIO::WATCHER;
3570 IO::AIO::max_poll_time $TICK * 0.1; 4115 IO::AIO::max_poll_time $TICK * 0.1;
3571 $AIO_POLL_WATCHER = Event->io ( 4116 undef $AnyEvent::AIO::WATCHER;
3572 reentrant => 0,
3573 data => WF_AUTOCANCEL,
3574 fd => IO::AIO::poll_fileno,
3575 poll => 'r',
3576 prio => 6,
3577 cb => \&IO::AIO::poll_cb,
3578 );
3579} 4117}
3580 4118
3581my $_log_backtrace; 4119my $_log_backtrace;
3582 4120
3583sub _log_backtrace { 4121sub _log_backtrace {
3586 $msg =~ s/\n//; 4124 $msg =~ s/\n//;
3587 4125
3588 # limit the # of concurrent backtraces 4126 # limit the # of concurrent backtraces
3589 if ($_log_backtrace < 2) { 4127 if ($_log_backtrace < 2) {
3590 ++$_log_backtrace; 4128 ++$_log_backtrace;
4129 my $perl_bt = Carp::longmess $msg;
3591 async { 4130 async {
4131 $Coro::current->{desc} = "abt $msg";
4132
3592 my @bt = fork_call { 4133 my @bt = fork_call {
3593 @addr = map { sprintf "%x", $_ } @addr; 4134 @addr = map { sprintf "%x", $_ } @addr;
3594 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4135 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3595 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4136 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3596 or die "addr2line: $!"; 4137 or die "addr2line: $!";
3604 } 4145 }
3605 4146
3606 @funcs 4147 @funcs
3607 }; 4148 };
3608 4149
3609 LOG llevInfo, "[ABT] $msg\n"; 4150 LOG llevInfo, "[ABT] $perl_bt\n";
4151 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3610 LOG llevInfo, "[ABT] $_\n" for @bt; 4152 LOG llevInfo, "[ABT] $_\n" for @bt;
3611 --$_log_backtrace; 4153 --$_log_backtrace;
3612 }; 4154 };
3613 } else { 4155 } else {
3614 LOG llevInfo, "[ABT] $msg\n"; 4156 LOG llevInfo, "[ABT] $msg\n";
3615 LOG llevInfo, "[ABT] [suppressed]\n"; 4157 LOG llevInfo, "[ABT] [suppressed]\n";
3616 } 4158 }
3617} 4159}
3618 4160
3619# load additional modules 4161# load additional modules
3620use cf::pod; 4162require "cf/$_.pm" for @EXTRA_MODULES;
4163cf::_connect_to_perl_2;
3621 4164
3622END { cf::emergency_save } 4165END { cf::emergency_save }
3623 4166
36241 41671
3625 4168

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines