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.504 by root, Sat Jan 30 23:50:16 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
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 3.64 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
18use Coro::Event; 44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
24use Coro::Util (); 53use Coro::Util ();
25 54
26use JSON::XS (); 55use JSON::XS 2.01 ();
27use BDB (); 56use BDB ();
28use Data::Dumper; 57use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 58use Fcntl;
31use YAML::Syck (); 59use YAML::XS ();
32use IO::AIO 2.32 (); 60use IO::AIO ();
33use Time::HiRes; 61use Time::HiRes;
34use Compress::LZF; 62use Compress::LZF;
35use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
36 66
37# configure various modules to our taste 67# configure various modules to our taste
38# 68#
39$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 77
43$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
44 79$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 80
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
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;
75 112
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $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 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 115our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
83 117
118our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 120our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 121our $DB_ENV;
122
123our @EXTRA_MODULES = qw(pod match mapscript);
86 124
87our %CFG; 125our %CFG;
88 126
89our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 128our $RUNTIME;
129our $NOW;
91 130
92our (%PLAYER, %PLAYER_LOADING); # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 132our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
95 134
96# used to convert map paths into valid unix filenames by replacing / by ∕ 135# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 137
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
102 147
103binmode STDOUT; 148binmode STDOUT;
104binmode STDERR; 149binmode STDERR;
105 150
106# read virtual server time, if available 151# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
111} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
112 159
113mkdir $_ 160mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 162
116our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
117 164
118sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
119 177
120############################################################################# 178#############################################################################
121 179
122=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
123 181
159 217
160The raw value load value from the last tick. 218The raw value load value from the last tick.
161 219
162=item %cf::CFG 220=item %cf::CFG
163 221
164Configuration for the server, loaded from C</etc/crossfire/config>, or 222Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 223from wherever your confdir points to.
166 224
167=item cf::wait_for_tick, cf::wait_for_tick_begin 225=item cf::wait_for_tick, cf::wait_for_tick_begin
168 226
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 227These 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 228returns 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. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172 230
173=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
174 232
175This array contains the results of the last C<invoke ()> call. When 233This 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 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call. 235that call.
178 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
179=back 243=back
180 244
181=cut 245=cut
182 246
183BEGIN { 247$Coro::State::WARNHOOK = sub {
184 *CORE::GLOBAL::warn = sub {
185 my $msg = join "", @_; 248 my $msg = join "", @_;
186 249
187 $msg .= "\n" 250 $msg .= "\n"
188 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
189 252
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 254
192 utf8::encode $msg;
193 LOG llevError, $msg; 255 LOG llevError, $msg;
194 }; 256};
195} 257
258$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
262
263 if ($Coro::current == $Coro::main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d#
266 }#d#
267
268 # kill coroutine otherwise
269 Coro::terminate
270};
196 271
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 282for my $pkg (qw(
208 cf::global cf::attachable 283 cf::global cf::attachable
209 cf::object cf::object::player 284 cf::object cf::object::player
210 cf::client cf::player 285 cf::client cf::player
211 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
212 cf::map cf::party cf::region 288 cf::party cf::region
213)) { 289)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 291}
217 292
218$Event::DIED = sub { 293$EV::DIED = sub {
219 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
220}; 295};
221 296
222############################################################################# 297#############################################################################
223 298
224=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 322 $d
248 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
249} 324}
250 325
251=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
252 327
253Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
254 329
255=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
256 331
257Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
258 333
259=cut 334=cut
260 335
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 337
263sub to_json ($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
265 354
266=item cf::lock_wait $string 355=item cf::lock_wait $string
267 356
268Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
269 358
270=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
271 360
272Wait until the given lock is available and then acquires it and returns 361Wait 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, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
275returned. 364returned.
276 365
277Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro. 367deadlocked coro.
284 373
285Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
286 375
287=cut 376=cut
288 377
289our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
290our %LOCKER;#d#
291 379
292sub lock_wait($) { 380sub lock_wait($) {
293 my ($key) = @_; 381 $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} 382}
306 383
307sub lock_acquire($) { 384sub lock_acquire($) {
308 my ($key) = @_; 385 $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} 386}
322 387
323sub lock_active($) { 388sub lock_active($) {
324 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
325
326 ! ! $LOCK{$key}
327} 390}
328 391
329sub freeze_mainloop { 392sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
331 394
332 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
333 $TICK_WATCHER->start; 396}
334 }; 397
335 $TICK_WATCHER->stop; 398=item cf::periodic $interval, $cb
336 $guard 399
400Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer.
402
403=cut
404
405sub periodic($$) {
406 my ($interval, $cb) = @_;
407
408 my $start = rand List::Util::min 180, $interval;
409
410 EV::periodic $start, $interval, 0, $cb
337} 411}
338 412
339=item cf::get_slot $time[, $priority[, $name]] 413=item cf::get_slot $time[, $priority[, $name]]
340 414
341Allocate $time seconds of blocking CPU time at priority C<$priority>: 415Allocate $time seconds of blocking CPU time at priority C<$priority>:
349 423
350=cut 424=cut
351 425
352our @SLOT_QUEUE; 426our @SLOT_QUEUE;
353our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
354 429
355$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager");
433
357 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
358 436
359 while () { 437 while () {
360 next_job: 438 next_job:
439
361 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
362 if ($avail > 0.01) { 441
363 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
364 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
365 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
366 $job->[2]->send; 446 $job->[2]->send;
367 Coro::cede; 447 Coro::cede;
368 goto next_job; 448 goto next_job;
369 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
370 } 451 }
371 } 452 }
372 453
373 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait; 457 $signal->wait;
377 } else { 458 } else {
459 $busy = 0;
378 Coro::schedule; 460 Coro::schedule;
379 } 461 }
380 } 462 }
381}; 463};
382 464
383sub get_slot($;$$) { 465sub get_slot($;$$) {
466 return if tick_inhibit || $Coro::current == $Coro::main;
467
384 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
385 469
386 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
387 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
388 473
389 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
390 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
391 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
402 487
403BEGIN { *async = \&Coro::async_pool } 488BEGIN { *async = \&Coro::async_pool }
404 489
405=item cf::sync_job { BLOCK } 490=item cf::sync_job { BLOCK }
406 491
407The design of Crossfire TRT requires that the main coroutine ($Coro::main) 492The design of Deliantra requires that the main coroutine ($Coro::main)
408is always able to handle events or runnable, as Crossfire TRT is only 493is 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 494partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable. 495acceptable.
411 496
412If it must be done, put the blocking parts into C<sync_job>. This will run 497If 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 498the given BLOCK in another coroutine while waiting for the result. The
418 503
419sub sync_job(&) { 504sub sync_job(&) {
420 my ($job) = @_; 505 my ($job) = @_;
421 506
422 if ($Coro::current == $Coro::main) { 507 if ($Coro::current == $Coro::main) {
423 my $time = Event::time; 508 my $time = EV::time;
424 509
425 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
426 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
427 512
428 # TODO: use suspend/resume instead 513 LOG llevError, Carp::longmess "sync job";#d#
429 # (but this is cancel-safe) 514
430 my $freeze_guard = freeze_mainloop; 515 my $freeze_guard = freeze_mainloop;
431 516
432 my $busy = 1; 517 my $busy = 1;
433 my @res; 518 my @res;
434 519
435 (async { 520 (async {
521 $Coro::current->desc ("sync job coro");
436 @res = eval { $job->() }; 522 @res = eval { $job->() };
437 warn $@ if $@; 523 warn $@ if $@;
438 undef $busy; 524 undef $busy;
439 })->prio (Coro::PRIO_MAX); 525 })->prio (Coro::PRIO_MAX);
440 526
441 while ($busy) { 527 while ($busy) {
442 Coro::cede or Event::one_event; 528 if (Coro::nready) {
529 Coro::cede_notself;
530 } else {
531 EV::loop EV::LOOP_ONESHOT;
443 } 532 }
533 }
444 534
445 $time = Event::time - $time; 535 my $time = EV::time - $time;
446 536
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 537 $TICK_START += $time; # do not account sync jobs to server load
451 538
452 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
453 } else { 540 } else {
454 # we are in another coroutine, how wonderful, everything just works 541 # we are in another coroutine, how wonderful, everything just works
455 542
480=item fork_call { }, $args 567=item fork_call { }, $args
481 568
482Executes the given code block with the given arguments in a seperate 569Executes the given code block with the given arguments in a seperate
483process, returning the results. Everything must be serialisable with 570process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may 571Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling. 572never block itself or use any form of event handling.
486 573
487=cut 574=cut
488 575
489sub fork_call(&@) { 576sub fork_call(&@) {
490 my ($cb, @args) = @_; 577 my ($cb, @args) = @_;
499 }, @args; 586 }, @args;
500 587
501 wantarray ? @res : $res[-1] 588 wantarray ? @res : $res[-1]
502} 589}
503 590
591=item $coin = coin_from_name $name
592
593=cut
594
595our %coin_alias = (
596 "silver" => "silvercoin",
597 "silvercoin" => "silvercoin",
598 "silvercoins" => "silvercoin",
599 "gold" => "goldcoin",
600 "goldcoin" => "goldcoin",
601 "goldcoins" => "goldcoin",
602 "platinum" => "platinacoin",
603 "platinumcoin" => "platinacoin",
604 "platinumcoins" => "platinacoin",
605 "platina" => "platinacoin",
606 "platinacoin" => "platinacoin",
607 "platinacoins" => "platinacoin",
608 "royalty" => "royalty",
609 "royalties" => "royalty",
610);
611
612sub coin_from_name($) {
613 $coin_alias{$_[0]}
614 ? cf::arch::find $coin_alias{$_[0]}
615 : undef
616}
617
504=item $value = cf::db_get $family => $key 618=item $value = cf::db_get $family => $key
505 619
506Returns a single value from the environment database. 620Returns a single value from the environment database.
507 621
508=item cf::db_put $family => $key => $value 622=item cf::db_put $family => $key => $value
509 623
510Stores the given C<$value> in the family. It can currently store binary 624Stores 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). 625data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512 626
627=item $db = cf::db_table "name"
628
629Create and/or open a new database table. The string must not be "db" and must be unique
630within each server.
631
513=cut 632=cut
633
634sub db_table($) {
635 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV;
637
638 eval {
639 $db->set_flags (BDB::CHKSUM);
640
641 utf8::encode $name;
642 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
643 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
644 cf::cleanup "db_open(db): $!" if $!;
645 };
646 cf::cleanup "db_open(db): $@" if $@;
647
648 $db
649}
514 650
515our $DB; 651our $DB;
516 652
517sub db_init { 653sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job { 654 cf::sync_job {
522 eval { 655 $DB ||= db_table "db";
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 } 656 };
532} 657}
533 658
534sub db_get($$) { 659sub db_get($$) {
535 my $key = "$_[0]/$_[1]"; 660 my $key = "$_[0]/$_[1]";
536 661
634 759
635############################################################################# 760#############################################################################
636 761
637=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
638 763
639Many objects in crossfire are so-called attachable objects. That means you can 764Many objects in deliantra are so-called attachable objects. That means you can
640attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
641to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
642 767
643In the following description, CLASS can be any of C<global>, C<object> 768In 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 769C<player>, C<client> or C<map> (i.e. the attachable objects in
645Crossfire TRT). 770Deliantra).
646 771
647=over 4 772=over 4
648 773
649=item $attachable->attach ($attachment, key => $value...) 774=item $attachable->attach ($attachment, key => $value...)
650 775
694=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
695 820
696Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
697given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
698 823
699Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
700that are attached at load/instantiate time, thus the need for a name. 825that are attached at load/instantiate time, thus the need for a name.
701 826
702These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
703 828
704=over 4 829=over 4
932 } 1057 }
933 1058
934 0 1059 0
935} 1060}
936 1061
937=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1062=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
938 1063
939=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1064=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
940 1065
941Generate an object-specific event with the given arguments. 1066Generate an object-specific event with the given arguments.
942 1067
948 1073
949=cut 1074=cut
950 1075
951############################################################################# 1076#############################################################################
952# object support 1077# object support
953#
954 1078
1079sub _object_equal($$);
1080sub _object_equal($$) {
1081 my ($a, $b) = @_;
1082
1083 return 0 unless (ref $a) eq (ref $b);
1084
1085 if ("HASH" eq ref $a) {
1086 my @ka = keys %$a;
1087 my @kb = keys %$b;
1088
1089 return 0 if @ka != @kb;
1090
1091 for (0 .. $#ka) {
1092 return 0 unless $ka[$_] eq $kb[$_];
1093 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1094 }
1095
1096 } elsif ("ARRAY" eq ref $a) {
1097
1098 return 0 if @$a != @$b;
1099
1100 for (0 .. $#$a) {
1101 return 0 unless _object_equal $a->[$_], $b->[$_];
1102 }
1103
1104 } elsif ($a ne $b) {
1105 return 0;
1106 }
1107
1108 1
1109}
1110
1111our $SLOW_MERGES;#d#
955sub _can_merge { 1112sub _can_merge {
956 my ($ob1, $ob2) = @_; 1113 my ($ob1, $ob2) = @_;
957 1114
958 local $Storable::canonical = 1; 1115 ++$SLOW_MERGES;#d#
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961 1116
962 $fob1 eq $fob2 1117 # we do the slow way here
1118 return _object_equal $ob1, $ob2
963} 1119}
964 1120
965sub reattach { 1121sub reattach {
966 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
967 my ($obj) = @_; 1123 my ($obj) = @_;
968 1124
1125 # no longer needed after getting rid of delete_package?
969 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1126 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
970 1127
971 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
972 1129
973 @$registry = (); 1130 @$registry = ();
974 1131
989cf::attachable->attach ( 1146cf::attachable->attach (
990 prio => -1000000, 1147 prio => -1000000,
991 on_instantiate => sub { 1148 on_instantiate => sub {
992 my ($obj, $data) = @_; 1149 my ($obj, $data) = @_;
993 1150
994 $data = from_json $data; 1151 $data = decode_json $data;
995 1152
996 for (@$data) { 1153 for (@$data) {
997 my ($name, $args) = @$_; 1154 my ($name, $args) = @$_;
998 1155
999 $obj->attach ($name, %{$args || {} }); 1156 $obj->attach ($name, %{$args || {} });
1013); 1170);
1014 1171
1015sub object_freezer_save { 1172sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1173 my ($filename, $rdata, $objs) = @_;
1017 1174
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1175 sync_job {
1021 if (length $$rdata) { 1176 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1024 1180
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 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;
1186 aio_fsync $fh;
1187 }
1029 close $fh; 1188 aio_close $fh;
1030 1189
1031 if (@$objs) { 1190 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1191 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1192 aio_chmod $fh, SAVE_MODE;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1195 if ($cf::USE_FSYNC) {
1196 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;
1197 aio_fsync $fh;
1198 }
1037 close $fh; 1199 aio_close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1201 }
1040 } else { 1202 } else {
1041 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1042 } 1204 }
1043 1205
1044 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1045 } else { 1210 } else {
1046 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1047 } 1212 }
1048 } else { 1213 } else {
1049 aio_unlink $filename; 1214 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1051 } 1216 }
1052 }; 1217 };
1053
1054 undef $guard;
1055} 1218}
1056 1219
1057sub object_freezer_as_string { 1220sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1221 my ($rdata, $objs) = @_;
1059 1222
1064 1227
1065sub object_thawer_load { 1228sub object_thawer_load {
1066 my ($filename) = @_; 1229 my ($filename) = @_;
1067 1230
1068 my ($data, $av); 1231 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1232
1072 (aio_load $filename, $data) >= 0 1233 (aio_load $filename, $data) >= 0
1073 or return; 1234 or return;
1074 1235
1075 unless (aio_stat "$filename.pst") { 1236 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1237 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1238 or return;
1078 1239
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1240 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs};
1081 } 1242 }
1082 1243
1244 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1245 warn sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1246 $decname, length $data, scalar @{$av || []};
1085 1247
1086 ($data, $av) 1248 ($data, $av)
1087} 1249}
1088 1250
1089=head2 COMMAND CALLBACKS 1251=head2 COMMAND CALLBACKS
1145 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1146 1308
1147 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1148} 1310}
1149 1311
1312use File::Glob ();
1313
1150cf::player->attach ( 1314cf::player->attach (
1151 on_command => sub { 1315 on_command => sub {
1152 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1153 1317
1154 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1186 1350
1187 cf::override; 1351 cf::override;
1188 }, 1352 },
1189); 1353);
1190 1354
1355# "readahead" all extensions
1356sub cache_extensions {
1357 my $grp = IO::AIO::aio_group;
1358
1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1360 for (grep /\.ext$/, @{$_[0]}) {
1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1362 }
1363 };
1364
1365 $grp
1366}
1367
1191sub load_extensions { 1368sub load_extensions {
1192 cf::sync_job { 1369 cf::sync_job {
1193 my %todo; 1370 my %todo;
1194 1371
1195 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
1214 1391
1215 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1216 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1217 1394
1218 $ext{source} = 1395 $ext{source} =
1219 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1220 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1221 . $source 1398 . $source
1222 . "\n};\n1"; 1399 . "\n};\n1";
1223 1400
1224 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1240 my $msg = $@ ? "$v->{path}: $@\n" 1417 my $msg = $@ ? "$v->{path}: $@\n"
1241 : "$v->{base}: extension inactive.\n"; 1418 : "$v->{base}: extension inactive.\n";
1242 1419
1243 if (exists $v->{meta}{mandatory}) { 1420 if (exists $v->{meta}{mandatory}) {
1244 warn $msg; 1421 warn $msg;
1245 warn "mandatory extension failed to load, exiting.\n"; 1422 cf::cleanup "mandatory extension failed to load, exiting.";
1246 exit 1;
1247 } 1423 }
1248 1424
1249 warn $msg; 1425 warn $msg;
1250 } 1426 }
1251 1427
1265 1441
1266=back 1442=back
1267 1443
1268=head2 CORE EXTENSIONS 1444=head2 CORE EXTENSIONS
1269 1445
1270Functions and methods that extend core crossfire objects. 1446Functions and methods that extend core deliantra objects.
1271 1447
1272=cut 1448=cut
1273 1449
1274package cf::player; 1450package cf::player;
1275 1451
1318 1494
1319sub exists($) { 1495sub exists($) {
1320 my ($login) = @_; 1496 my ($login) = @_;
1321 1497
1322 $cf::PLAYER{$login} 1498 $cf::PLAYER{$login}
1323 or cf::sync_job { !aio_stat path $login } 1499 or !aio_stat path $login
1324} 1500}
1325 1501
1326sub find($) { 1502sub find($) {
1327 return $cf::PLAYER{$_[0]} || do { 1503 return $cf::PLAYER{$_[0]} || do {
1328 my $login = $_[0]; 1504 my $login = $_[0];
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1514 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1515
1340 my $f = new_from_file cf::object::thawer path $login 1516 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1517 or return;
1342 1518
1343 $f->next;
1344 my $pl = cf::player::load_pl $f 1519 my $pl = cf::player::load_pl $f
1345 or return; 1520 or return;
1521
1346 local $cf::PLAYER_LOADING{$login} = $pl; 1522 local $cf::PLAYER_LOADING{$login} = $pl;
1347 $f->resolve_delayed_derefs; 1523 $f->resolve_delayed_derefs;
1348 $cf::PLAYER{$login} = $pl 1524 $cf::PLAYER{$login} = $pl
1349 } 1525 }
1350 } 1526 }
1360 1536
1361 return if $pl->{deny_save}; 1537 return if $pl->{deny_save};
1362 1538
1363 aio_mkdir playerdir $pl, 0770; 1539 aio_mkdir playerdir $pl, 0770;
1364 $pl->{last_save} = $cf::RUNTIME; 1540 $pl->{last_save} = $cf::RUNTIME;
1541
1542 cf::get_slot 0.01;
1365 1543
1366 $pl->save_pl ($path); 1544 $pl->save_pl ($path);
1367 cf::cede_to_tick; 1545 cf::cede_to_tick;
1368} 1546}
1369 1547
1401 my ($pl) = @_; 1579 my ($pl) = @_;
1402 1580
1403 my $name = $pl->ob->name; 1581 my $name = $pl->ob->name;
1404 1582
1405 $pl->{deny_save} = 1; 1583 $pl->{deny_save} = 1;
1406 $pl->password ("*"); # this should lock out the player until we nuked the dir 1584 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1407 1585
1408 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1586 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1409 $pl->deactivate; 1587 $pl->deactivate;
1588 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1589 $pl->ob->check_score;
1410 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1590 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1411 $pl->ns->destroy if $pl->ns; 1591 $pl->ns->destroy if $pl->ns;
1412 1592
1413 my $path = playerdir $pl; 1593 my $path = playerdir $pl;
1414 my $temp = "$path~$cf::RUNTIME~deleting~"; 1594 my $temp = "$path~$cf::RUNTIME~deleting~";
1453 1633
1454 for my $login (@$dirs) { 1634 for my $login (@$dirs) {
1455 my $path = path $login; 1635 my $path = path $login;
1456 1636
1457 # a .pst is a dead give-away for a valid player 1637 # a .pst is a dead give-away for a valid player
1458 unless (-e "$path.pst") { 1638 # if no pst file found, open and chekc for blocked users
1639 if (aio_stat "$path.pst") {
1459 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1640 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1460 aio_read $fh, 0, 512, my $buf, 0 or next; 1641 aio_read $fh, 0, 512, my $buf, 0 or next;
1461 $buf !~ /^password -------------$/m or next; # official not-valid tag 1642 $buf !~ /^password -------------$/m or next; # official not-valid tag
1462 } 1643 }
1463 1644
1494 } 1675 }
1495 1676
1496 \@paths 1677 \@paths
1497} 1678}
1498 1679
1499=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1680=item $protocol_xml = $player->expand_cfpod ($cfpod)
1500 1681
1501Expand crossfire pod fragments into protocol xml. 1682Expand 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 1683
1550=item $player->ext_reply ($msgid, @msg) 1684=item $player->ext_reply ($msgid, @msg)
1551 1685
1552Sends an ext reply to the player. 1686Sends an ext reply to the player.
1553 1687
1620our $MAX_RESET = 3600; 1754our $MAX_RESET = 3600;
1621our $DEFAULT_RESET = 3000; 1755our $DEFAULT_RESET = 3000;
1622 1756
1623sub generate_random_map { 1757sub generate_random_map {
1624 my ($self, $rmp) = @_; 1758 my ($self, $rmp) = @_;
1759
1760 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1761
1625 # mit "rum" bekleckern, nicht 1762 # mit "rum" bekleckern, nicht
1626 $self->_create_random_map ( 1763 $self->_create_random_map (
1627 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1764 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1628 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1765 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1629 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1766 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1751 1888
1752# the temporary/swap location 1889# the temporary/swap location
1753sub save_path { 1890sub save_path {
1754 my ($self) = @_; 1891 my ($self) = @_;
1755 1892
1756 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1893 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1757 "$TMPDIR/$path.map" 1894 "$TMPDIR/$path.map"
1758} 1895}
1759 1896
1760# the unique path, undef == no special unique path 1897# the unique path, undef == no special unique path
1761sub uniq_path { 1898sub uniq_path {
1762 my ($self) = @_; 1899 my ($self) = @_;
1763 1900
1764 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1901 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1765 "$UNIQUEDIR/$path" 1902 "$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} 1903}
1776 1904
1777sub decay_objects { 1905sub decay_objects {
1778 my ($self) = @_; 1906 my ($self) = @_;
1779 1907
1863sub find { 1991sub find {
1864 my ($path, $origin) = @_; 1992 my ($path, $origin) = @_;
1865 1993
1866 $path = normalise $path, $origin && $origin->path; 1994 $path = normalise $path, $origin && $origin->path;
1867 1995
1868 cf::lock_wait "map_data:$path";#d#remove 1996 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1869 cf::lock_wait "map_find:$path"; 1997 my $guard2 = cf::lock_acquire "map_find:$path";
1870 1998
1871 $cf::MAP{$path} || do { 1999 $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 2000 my $map = new_from_path cf::map $path
1876 or return; 2001 or return;
1877 2002
1878 $map->{last_save} = $cf::RUNTIME; 2003 $map->{last_save} = $cf::RUNTIME;
1879 2004
1881 or return; 2006 or return;
1882 2007
1883 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2008 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1884 # doing this can freeze the server in a sync job, obviously 2009 # doing this can freeze the server in a sync job, obviously
1885 #$cf::WAIT_FOR_TICK->wait; 2010 #$cf::WAIT_FOR_TICK->wait;
2011 undef $guard2;
1886 undef $guard1; 2012 undef $guard1;
1887 undef $guard2;
1888 $map->reset; 2013 $map->reset;
1889 return find $path; 2014 return find $path;
1890 } 2015 }
1891 2016
1892 $cf::MAP{$path} = $map 2017 $cf::MAP{$path} = $map
1893 } 2018 }
1894} 2019}
1895 2020
1896sub pre_load { } 2021sub pre_load { }
1897sub post_load { } 2022#sub post_load { } # XS
1898 2023
1899sub load { 2024sub load {
1900 my ($self) = @_; 2025 my ($self) = @_;
1901 2026
1902 local $self->{deny_reset} = 1; # loading can take a long time 2027 local $self->{deny_reset} = 1; # loading can take a long time
1919 my $f = new_from_file cf::object::thawer $self->{load_path}; 2044 my $f = new_from_file cf::object::thawer $self->{load_path};
1920 $f->skip_block; 2045 $f->skip_block;
1921 $self->_load_objects ($f) 2046 $self->_load_objects ($f)
1922 or return; 2047 or return;
1923 2048
1924 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2049 $self->post_load_original
1925 if delete $self->{load_original}; 2050 if delete $self->{load_original};
1926 2051
1927 if (my $uniq = $self->uniq_path) { 2052 if (my $uniq = $self->uniq_path) {
1928 utf8::encode $uniq; 2053 utf8::encode $uniq;
1929 unless (aio_stat $uniq) { 2054 unless (aio_stat $uniq) {
1947 unless ($self->{deny_activate}) { 2072 unless ($self->{deny_activate}) {
1948 $self->decay_objects; 2073 $self->decay_objects;
1949 $self->fix_auto_apply; 2074 $self->fix_auto_apply;
1950 $self->update_buttons; 2075 $self->update_buttons;
1951 cf::cede_to_tick; 2076 cf::cede_to_tick;
1952 $self->set_darkness_map;
1953 cf::cede_to_tick;
1954 $self->activate; 2077 $self->activate;
1955 } 2078 }
1956 2079
1957 $self->{last_save} = $cf::RUNTIME; 2080 $self->{last_save} = $cf::RUNTIME;
1958 $self->last_access ($cf::RUNTIME); 2081 $self->last_access ($cf::RUNTIME);
1959 2082
1960 $self->in_memory (cf::MAP_IN_MEMORY); 2083 $self->in_memory (cf::MAP_ACTIVE);
1961 } 2084 }
1962 2085
1963 $self->post_load; 2086 $self->post_load;
1964} 2087}
1965 2088
2023 my ($path, $origin, $load) = @_; 2146 my ($path, $origin, $load) = @_;
2024 2147
2025 $path = normalise $path, $origin && $origin->{path}; 2148 $path = normalise $path, $origin && $origin->{path};
2026 2149
2027 if (my $map = $cf::MAP{$path}) { 2150 if (my $map = $cf::MAP{$path}) {
2028 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2151 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2029 } 2152 }
2030 2153
2031 $MAP_PREFETCH{$path} |= $load; 2154 $MAP_PREFETCH{$path} |= $load;
2032 2155
2033 $MAP_PREFETCHER ||= cf::async { 2156 $MAP_PREFETCHER ||= cf::async {
2157 $Coro::current->{desc} = "map prefetcher";
2158
2034 while (%MAP_PREFETCH) { 2159 while (%MAP_PREFETCH) {
2035 while (my ($k, $v) = each %MAP_PREFETCH) { 2160 while (my ($k, $v) = each %MAP_PREFETCH) {
2036 if (my $map = find $k) { 2161 if (my $map = find $k) {
2037 $map->load if $v; 2162 $map->load if $v;
2038 } 2163 }
2064 return if $self->{deny_save}; 2189 return if $self->{deny_save};
2065 2190
2066 local $self->{last_access} = $self->last_access;#d# 2191 local $self->{last_access} = $self->last_access;#d#
2067 2192
2068 cf::async { 2193 cf::async {
2194 $Coro::current->{desc} = "map player save";
2069 $_->contr->save for $self->players; 2195 $_->contr->save for $self->players;
2070 }; 2196 };
2197
2198 cf::get_slot 0.02;
2071 2199
2072 if ($uniq) { 2200 if ($uniq) {
2073 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2201 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2074 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2202 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2075 } else { 2203 } else {
2084 $self->save; 2212 $self->save;
2085 2213
2086 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2214 my $lock = cf::lock_acquire "map_data:$self->{path}";
2087 2215
2088 return if $self->players; 2216 return if $self->players;
2089 return if $self->in_memory != cf::MAP_IN_MEMORY; 2217 return if $self->in_memory != cf::MAP_ACTIVE;
2090 return if $self->{deny_save}; 2218 return if $self->{deny_save};
2091 2219
2092 $self->in_memory (cf::MAP_SWAPPED); 2220 $self->in_memory (cf::MAP_SWAPPED);
2093 2221
2094 $self->deactivate; 2222 $self->deactivate;
2119 2247
2120 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2248 my $lock = cf::lock_acquire "map_data:$self->{path}";
2121 2249
2122 return if $self->players; 2250 return if $self->players;
2123 2251
2124 warn "resetting map ", $self->path; 2252 warn "resetting map ", $self->path, "\n";
2125 2253
2126 $self->in_memory (cf::MAP_SWAPPED); 2254 $self->in_memory (cf::MAP_SWAPPED);
2127 2255
2128 # need to save uniques path 2256 # need to save uniques path
2129 unless ($self->{deny_save}) { 2257 unless ($self->{deny_save}) {
2212 2340
2213sub unique_maps() { 2341sub unique_maps() {
2214 [ 2342 [
2215 map { 2343 map {
2216 utf8::decode $_; 2344 utf8::decode $_;
2217 /\.map$/ 2345 s/\.map$//; # TODO future compatibility hack
2346 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2347 ? ()
2218 ? normalise $_ 2348 : normalise $_
2219 : ()
2220 } @{ aio_readdir $UNIQUEDIR or [] } 2349 } @{ aio_readdir $UNIQUEDIR or [] }
2221 ] 2350 ]
2222} 2351}
2223 2352
2224package cf; 2353=item cf::map::static_maps
2354
2355Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2356file in the shared directory excluding F</styles> and F</editor>). May
2357block.
2358
2359=cut
2360
2361sub static_maps() {
2362 my @dirs = "";
2363 my @maps;
2364
2365 while (@dirs) {
2366 my $dir = shift @dirs;
2367
2368 next if $dir eq "/styles" || $dir eq "/editor";
2369
2370 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2371 or return;
2372
2373 for (@$files) {
2374 s/\.map$// or next;
2375 utf8::decode $_;
2376 push @maps, "$dir/$_";
2377 }
2378
2379 push @dirs, map "$dir/$_", @$dirs;
2380 }
2381
2382 \@maps
2383}
2225 2384
2226=back 2385=back
2227 2386
2228=head3 cf::object 2387=head3 cf::object
2229 2388
2233 2392
2234=over 4 2393=over 4
2235 2394
2236=item $ob->inv_recursive 2395=item $ob->inv_recursive
2237 2396
2238Returns the inventory of the object _and_ their inventories, recursively. 2397Returns the inventory of the object I<and> their inventories, recursively,
2398but I<not> the object itself.
2239 2399
2240=cut 2400=cut
2241 2401
2242sub inv_recursive_; 2402sub inv_recursive_;
2243sub inv_recursive_ { 2403sub inv_recursive_ {
2248 inv_recursive_ inv $_[0] 2408 inv_recursive_ inv $_[0]
2249} 2409}
2250 2410
2251=item $ref = $ob->ref 2411=item $ref = $ob->ref
2252 2412
2253creates and returns a persistent reference to an objetc that can be stored as a string. 2413Creates and returns a persistent reference to an object that can be stored as a string.
2254 2414
2255=item $ob = cf::object::deref ($refstring) 2415=item $ob = cf::object::deref ($refstring)
2256 2416
2257returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2417returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2258even if the object actually exists. May block. 2418even if the object actually exists. May block.
2260=cut 2420=cut
2261 2421
2262sub deref { 2422sub deref {
2263 my ($ref) = @_; 2423 my ($ref) = @_;
2264 2424
2265 # temporary compatibility#TODO#remove
2266 $ref =~ s{^<}{player/<};
2267
2268 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2425 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2269 my ($uuid, $name) = ($1, $2); 2426 my ($uuid, $name) = ($1, $2);
2270 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2427 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2271 or return; 2428 or return;
2272 $pl->ob->uuid eq $uuid 2429 $pl->ob->uuid eq $uuid
2273 or return; 2430 or return;
2293can be C<undef>. Does the right thing when the player is currently in a 2450can be C<undef>. Does the right thing when the player is currently in a
2294dialogue with the given NPC character. 2451dialogue with the given NPC character.
2295 2452
2296=cut 2453=cut
2297 2454
2455our $SAY_CHANNEL = {
2456 id => "say",
2457 title => "Map",
2458 reply => "say ",
2459 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2460};
2461
2462our $CHAT_CHANNEL = {
2463 id => "chat",
2464 title => "Chat",
2465 reply => "chat ",
2466 tooltip => "Player chat and shouts, global to the server.",
2467};
2468
2298# rough implementation of a future "reply" method that works 2469# rough implementation of a future "reply" method that works
2299# with dialog boxes. 2470# with dialog boxes.
2300#TODO: the first argument must go, split into a $npc->reply_to ( method 2471#TODO: the first argument must go, split into a $npc->reply_to ( method
2301sub cf::object::player::reply($$$;$) { 2472sub cf::object::player::reply($$$;$) {
2302 my ($self, $npc, $msg, $flags) = @_; 2473 my ($self, $npc, $msg, $flags) = @_;
2313 my $dialog = $pl->{npc_dialog}; 2484 my $dialog = $pl->{npc_dialog};
2314 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2485 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2315 2486
2316 } else { 2487 } else {
2317 $msg = $npc->name . " says: $msg" if $npc; 2488 $msg = $npc->name . " says: $msg" if $npc;
2318 $self->message ($msg, $flags); 2489 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2319 } 2490 }
2320 } 2491 }
2321} 2492}
2322 2493
2323=item $object->send_msg ($channel, $msg, $color, [extra...]) 2494=item $object->send_msg ($channel, $msg, $color, [extra...])
2348 2519
2349=item $player_object->enter_link 2520=item $player_object->enter_link
2350 2521
2351Freezes the player and moves him/her to a special map (C<{link}>). 2522Freezes the player and moves him/her to a special map (C<{link}>).
2352 2523
2353The player should be reasonably safe there for short amounts of time. You 2524The player should be reasonably safe there for short amounts of time (e.g.
2354I<MUST> call C<leave_link> as soon as possible, though. 2525for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2526though, as the palyer cannot control the character while it is on the link
2527map.
2355 2528
2356Will never block. 2529Will never block.
2357 2530
2358=item $player_object->leave_link ($map, $x, $y) 2531=item $player_object->leave_link ($map, $x, $y)
2359 2532
2411 ($x, $y) = (-1, -1) 2584 ($x, $y) = (-1, -1)
2412 unless (defined $x) && (defined $y); 2585 unless (defined $x) && (defined $y);
2413 2586
2414 # use -1 or undef as default coordinates, not 0, 0 2587 # use -1 or undef as default coordinates, not 0, 0
2415 ($x, $y) = ($map->enter_x, $map->enter_y) 2588 ($x, $y) = ($map->enter_x, $map->enter_y)
2416 if $x <=0 && $y <= 0; 2589 if $x <= 0 && $y <= 0;
2417 2590
2418 $map->load; 2591 $map->load;
2419 $map->load_neighbours; 2592 $map->load_neighbours;
2420 2593
2421 return unless $self->contr->active; 2594 return unless $self->contr->active;
2422 $self->activate_recursive;
2423 2595
2424 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2596 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2425 $self->enter_map ($map, $x, $y); 2597 $self->enter_map ($map, $x, $y);
2598
2599 # only activate afterwards, to support waiting in hooks
2600 $self->activate_recursive;
2426} 2601}
2427 2602
2428=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2603=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2429 2604
2430Moves the player to the given map-path and coordinates by first freezing 2605Moves the player to the given map-path and coordinates by first freezing
2431her, loading and preparing them map, calling the provided $check callback 2606her, loading and preparing them map, calling the provided $check callback
2432that has to return the map if sucecssful, and then unfreezes the player on 2607that 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 2608the new (success) or old (failed) map position. In either case, $done will
2434be called at the end of this process. 2609be called at the end of this process.
2435 2610
2611Note that $check will be called with a potentially non-loaded map, so if
2612it needs a loaded map it has to call C<< ->load >>.
2613
2436=cut 2614=cut
2437 2615
2438our $GOTOGEN; 2616our $GOTOGEN;
2439 2617
2440sub cf::object::player::goto { 2618sub cf::object::player::goto {
2444 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2622 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2445 2623
2446 $self->enter_link; 2624 $self->enter_link;
2447 2625
2448 (async { 2626 (async {
2627 $Coro::current->{desc} = "player::goto $path $x $y";
2628
2629 # *tag paths override both path and x|y
2630 if ($path =~ /^\*(.*)$/) {
2631 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2632 my $ob = $obs[rand @obs];
2633
2634 # see if we actually can go there
2635 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2636 $ob = $obs[rand @obs];
2637 } else {
2638 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2639 }
2640 # else put us there anyways for now #d#
2641
2642 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2643 } else {
2644 ($path, $x, $y) = (undef, undef, undef);
2645 }
2646 }
2647
2449 my $map = eval { 2648 my $map = eval {
2450 my $map = cf::map::find $path; 2649 my $map = defined $path ? cf::map::find $path : undef;
2451 2650
2452 if ($map) { 2651 if ($map) {
2453 $map = $map->customise_for ($self); 2652 $map = $map->customise_for ($self);
2454 $map = $check->($map) if $check && $map; 2653 $map = $check->($map) if $check && $map;
2455 } else { 2654 } else {
2456 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2655 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2457 } 2656 }
2458 2657
2459 $map 2658 $map
2460 }; 2659 };
2461 2660
2497} 2696}
2498 2697
2499sub prepare_random_map { 2698sub prepare_random_map {
2500 my ($exit) = @_; 2699 my ($exit) = @_;
2501 2700
2502 my $guard = cf::lock_acquire "exit_prepare:$exit";
2503
2504 # all this does is basically replace the /! path by 2701 # all this does is basically replace the /! path by
2505 # a new random map path (?random/...) with a seed 2702 # a new random map path (?random/...) with a seed
2506 # that depends on the exit object 2703 # that depends on the exit object
2507 2704
2508 my $rmp = parse_random_map_params $exit->msg; 2705 my $rmp = parse_random_map_params $exit->msg;
2510 if ($exit->map) { 2707 if ($exit->map) {
2511 $rmp->{region} = $exit->region->name; 2708 $rmp->{region} = $exit->region->name;
2512 $rmp->{origin_map} = $exit->map->path; 2709 $rmp->{origin_map} = $exit->map->path;
2513 $rmp->{origin_x} = $exit->x; 2710 $rmp->{origin_x} = $exit->x;
2514 $rmp->{origin_y} = $exit->y; 2711 $rmp->{origin_y} = $exit->y;
2712
2713 $exit->map->touch;
2515 } 2714 }
2516 2715
2517 $rmp->{random_seed} ||= $exit->random_seed; 2716 $rmp->{random_seed} ||= $exit->random_seed;
2518 2717
2519 my $data = cf::to_json $rmp; 2718 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2520 my $md5 = Digest::MD5::md5_hex $data; 2719 my $md5 = Digest::MD5::md5_hex $data;
2521 my $meta = "$RANDOMDIR/$md5.meta"; 2720 my $meta = "$RANDOMDIR/$md5.meta";
2522 2721
2523 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2722 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2524 aio_write $fh, 0, (length $data), $data, 0; 2723 aio_write $fh, 0, (length $data), $data, 0;
2525 undef $fh; 2724 undef $fh;
2526 aio_rename "$meta~", $meta; 2725 aio_rename "$meta~", $meta;
2527 2726
2727 my $slaying = "?random/$md5";
2728
2729 if ($exit->valid) {
2528 $exit->slaying ("?random/$md5"); 2730 $exit->slaying ("?random/$md5");
2529 $exit->msg (undef); 2731 $exit->msg (undef);
2732 }
2530 } 2733 }
2531} 2734}
2532 2735
2533sub cf::object::player::enter_exit { 2736sub cf::object::player::enter_exit {
2534 my ($self, $exit) = @_; 2737 my ($self, $exit) = @_;
2535 2738
2536 return unless $self->type == cf::PLAYER; 2739 return unless $self->type == cf::PLAYER;
2537 2740
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; 2741 $self->enter_link;
2550 2742
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 { 2743 (async {
2556 $self->deactivate_recursive; # just to be sure 2744 $Coro::current->{desc} = "enter_exit";
2745
2557 unless (eval { 2746 unless (eval {
2747 $self->deactivate_recursive; # just to be sure
2748
2749 # random map handling
2750 {
2751 my $guard = cf::lock_acquire "exit_prepare:$exit";
2752
2753 prepare_random_map $exit
2754 if $exit->slaying eq "/!";
2755 }
2756
2757 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2758 my $x = $exit->stats->hp;
2759 my $y = $exit->stats->sp;
2760
2558 $self->goto ($slaying, $hp, $sp); 2761 $self->goto ($map, $x, $y);
2559 2762
2763 # if exit is damned, update players death & WoR home-position
2764 $self->contr->savebed ($map, $x, $y)
2765 if $exit->flag (cf::FLAG_DAMNED);
2766
2560 1; 2767 1
2561 }) { 2768 }) {
2562 $self->message ("Something went wrong deep within the crossfire server. " 2769 $self->message ("Something went wrong deep within the deliantra server. "
2563 . "I'll try to bring you back to the map you were before. " 2770 . "I'll try to bring you back to the map you were before. "
2564 . "Please report this to the dungeon master!", 2771 . "Please report this to the dungeon master!",
2565 cf::NDI_UNIQUE | cf::NDI_RED); 2772 cf::NDI_UNIQUE | cf::NDI_RED);
2566 2773
2567 warn "ERROR in enter_exit: $@"; 2774 warn "ERROR in enter_exit: $@";
2584sub cf::client::send_drawinfo { 2791sub cf::client::send_drawinfo {
2585 my ($self, $text, $flags) = @_; 2792 my ($self, $text, $flags) = @_;
2586 2793
2587 utf8::encode $text; 2794 utf8::encode $text;
2588 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2795 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2796}
2797
2798=item $client->send_big_packet ($pkt)
2799
2800Like C<send_packet>, but tries to compress large packets, and fragments
2801them as required.
2802
2803=cut
2804
2805our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2806
2807sub cf::client::send_big_packet {
2808 my ($self, $pkt) = @_;
2809
2810 # try lzf for large packets
2811 $pkt = "lzf " . Compress::LZF::compress $pkt
2812 if 1024 <= length $pkt and $self->{can_lzf};
2813
2814 # split very large packets
2815 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2816 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2817 $pkt = "frag";
2818 }
2819
2820 $self->send_packet ($pkt);
2589} 2821}
2590 2822
2591=item $client->send_msg ($channel, $msg, $color, [extra...]) 2823=item $client->send_msg ($channel, $msg, $color, [extra...])
2592 2824
2593Send a drawinfo or msg packet to the client, formatting the msg for the 2825Send 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 2827the message, with C<log> being the default. If C<$color> is negative, suppress
2596the message unless the client supports the msg packet. 2828the message unless the client supports the msg packet.
2597 2829
2598=cut 2830=cut
2599 2831
2832# non-persistent channels (usually the info channel)
2600our %CHANNEL = ( 2833our %CHANNEL = (
2834 "c/motd" => {
2835 id => "infobox",
2836 title => "MOTD",
2837 reply => undef,
2838 tooltip => "The message of the day",
2839 },
2601 "c/identify" => { 2840 "c/identify" => {
2602 id => "identify", 2841 id => "infobox",
2603 title => "Identify", 2842 title => "Identify",
2604 reply => undef, 2843 reply => undef,
2605 tooltip => "Items recently identified", 2844 tooltip => "Items recently identified",
2606 }, 2845 },
2607 "c/examine" => { 2846 "c/examine" => {
2608 id => "examine", 2847 id => "infobox",
2609 title => "Examine", 2848 title => "Examine",
2610 reply => undef, 2849 reply => undef,
2611 tooltip => "Signs and other items you examined", 2850 tooltip => "Signs and other items you examined",
2612 }, 2851 },
2852 "c/shopinfo" => {
2853 id => "infobox",
2854 title => "Shop Info",
2855 reply => undef,
2856 tooltip => "What your bargaining skill tells you about the shop",
2857 },
2858 "c/book" => {
2859 id => "infobox",
2860 title => "Book",
2861 reply => undef,
2862 tooltip => "The contents of a note or book",
2863 },
2864 "c/lookat" => {
2865 id => "infobox",
2866 title => "Look",
2867 reply => undef,
2868 tooltip => "What you saw there",
2869 },
2870 "c/who" => {
2871 id => "infobox",
2872 title => "Players",
2873 reply => undef,
2874 tooltip => "Shows players who are currently online",
2875 },
2876 "c/body" => {
2877 id => "infobox",
2878 title => "Body Parts",
2879 reply => undef,
2880 tooltip => "Shows which body parts you posess and are available",
2881 },
2882 "c/statistics" => {
2883 id => "infobox",
2884 title => "Statistics",
2885 reply => undef,
2886 tooltip => "Shows your primary statistics",
2887 },
2888 "c/skills" => {
2889 id => "infobox",
2890 title => "Skills",
2891 reply => undef,
2892 tooltip => "Shows your experience per skill and item power",
2893 },
2894 "c/shopitems" => {
2895 id => "infobox",
2896 title => "Shop Items",
2897 reply => undef,
2898 tooltip => "Shows the items currently for sale in this shop",
2899 },
2900 "c/resistances" => {
2901 id => "infobox",
2902 title => "Resistances",
2903 reply => undef,
2904 tooltip => "Shows your resistances",
2905 },
2906 "c/pets" => {
2907 id => "infobox",
2908 title => "Pets",
2909 reply => undef,
2910 tooltip => "Shows information abotu your pets/a specific pet",
2911 },
2912 "c/perceiveself" => {
2913 id => "infobox",
2914 title => "Perceive Self",
2915 reply => undef,
2916 tooltip => "You gained detailed knowledge about yourself",
2917 },
2918 "c/uptime" => {
2919 id => "infobox",
2920 title => "Uptime",
2921 reply => undef,
2922 tooltip => "How long the server has been running since last restart",
2923 },
2924 "c/mapinfo" => {
2925 id => "infobox",
2926 title => "Map Info",
2927 reply => undef,
2928 tooltip => "Information related to the maps",
2929 },
2930 "c/party" => {
2931 id => "party",
2932 title => "Party",
2933 reply => "gsay ",
2934 tooltip => "Messages and chat related to your party",
2935 },
2936 "c/death" => {
2937 id => "death",
2938 title => "Death",
2939 reply => undef,
2940 tooltip => "Reason for and more info about your most recent death",
2941 },
2942 "c/say" => $SAY_CHANNEL,
2943 "c/chat" => $CHAT_CHANNEL,
2613); 2944);
2614 2945
2615sub cf::client::send_msg { 2946sub cf::client::send_msg {
2616 my ($self, $channel, $msg, $color, @extra) = @_; 2947 my ($self, $channel, $msg, $color, @extra) = @_;
2617 2948
2618 $msg = $self->pl->expand_cfpod ($msg); 2949 $msg = $self->pl->expand_cfpod ($msg)
2950 unless $color & cf::NDI_VERBATIM;
2619 2951
2620 $color &= cf::NDI_CLIENT_MASK; # just in case... 2952 $color &= cf::NDI_CLIENT_MASK; # just in case...
2621 2953
2622 # check predefined channels, for the benefit of C 2954 # check predefined channels, for the benefit of C
2623 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2955 if ($CHANNEL{$channel}) {
2956 $channel = $CHANNEL{$channel};
2624 2957
2958 $self->ext_msg (channel_info => $channel);
2959 $channel = $channel->{id};
2960
2625 if (ref $channel) { 2961 } elsif (ref $channel) {
2626 # send meta info to client, if not yet sent 2962 # send meta info to client, if not yet sent
2627 unless (exists $self->{channel}{$channel->{id}}) { 2963 unless (exists $self->{channel}{$channel->{id}}) {
2628 $self->{channel}{$channel->{id}} = $channel; 2964 $self->{channel}{$channel->{id}} = $channel;
2629 $self->ext_msg (channel_info => $channel) 2965 $self->ext_msg (channel_info => $channel);
2630 if $self->can_msg;
2631 } 2966 }
2632 2967
2633 $channel = $channel->{id}; 2968 $channel = $channel->{id};
2634 } 2969 }
2635 2970
2636 return unless @extra || length $msg; 2971 return unless @extra || length $msg;
2637 2972
2638 if ($self->can_msg) {
2639 # default colour, mask it out 2973 # default colour, mask it out
2640 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2974 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2641 if $color & cf::NDI_DEF; 2975 if $color & cf::NDI_DEF;
2642 2976
2643 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2977 my $pkt = "msg "
2978 . $self->{json_coder}->encode (
2644 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2979 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2645 } else { 2980 );
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 2981
2657 $color &= cf::NDI_COLOR_MASK; 2982 $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} 2983}
2671 2984
2672=item $client->ext_msg ($type, @msg) 2985=item $client->ext_msg ($type, @msg)
2673 2986
2674Sends an ext event to the client. 2987Sends an ext event to the client.
2677 2990
2678sub cf::client::ext_msg($$@) { 2991sub cf::client::ext_msg($$@) {
2679 my ($self, $type, @msg) = @_; 2992 my ($self, $type, @msg) = @_;
2680 2993
2681 if ($self->extcmd == 2) { 2994 if ($self->extcmd == 2) {
2682 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2995 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2683 } elsif ($self->extcmd == 1) { # TODO: remove 2996 } elsif ($self->extcmd == 1) { # TODO: remove
2684 push @msg, msgtype => "event_$type"; 2997 push @msg, msgtype => "event_$type";
2685 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2998 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2686 } 2999 }
2687} 3000}
2688 3001
2689=item $client->ext_reply ($msgid, @msg) 3002=item $client->ext_reply ($msgid, @msg)
2690 3003
2694 3007
2695sub cf::client::ext_reply($$@) { 3008sub cf::client::ext_reply($$@) {
2696 my ($self, $id, @msg) = @_; 3009 my ($self, $id, @msg) = @_;
2697 3010
2698 if ($self->extcmd == 2) { 3011 if ($self->extcmd == 2) {
2699 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3012 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2700 } elsif ($self->extcmd == 1) { 3013 } elsif ($self->extcmd == 1) {
2701 #TODO: version 1, remove 3014 #TODO: version 1, remove
2702 unshift @msg, msgtype => "reply", msgid => $id; 3015 unshift @msg, msgtype => "reply", msgid => $id;
2703 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3016 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2704 } 3017 }
2705} 3018}
2706 3019
2707=item $success = $client->query ($flags, "text", \&cb) 3020=item $success = $client->query ($flags, "text", \&cb)
2708 3021
2835our $safe_hole = new Safe::Hole; 3148our $safe_hole = new Safe::Hole;
2836 3149
2837$SIG{FPE} = 'IGNORE'; 3150$SIG{FPE} = 'IGNORE';
2838 3151
2839$safe->permit_only (Opcode::opset qw( 3152$safe->permit_only (Opcode::opset qw(
2840 :base_core :base_mem :base_orig :base_math 3153 :base_core :base_mem :base_orig :base_math :base_loop
2841 grepstart grepwhile mapstart mapwhile 3154 grepstart grepwhile mapstart mapwhile
2842 sort time 3155 sort time
2843)); 3156));
2844 3157
2845# here we export the classes and methods available to script code 3158# here we export the classes and methods available to script code
2847=pod 3160=pod
2848 3161
2849The following functions and methods are available within a safe environment: 3162The following functions and methods are available within a safe environment:
2850 3163
2851 cf::object 3164 cf::object
2852 contr pay_amount pay_player map x y force_find force_add 3165 contr pay_amount pay_player map x y force_find force_add destroy
2853 insert remove name archname title slaying race decrease_ob_nr 3166 insert remove name archname title slaying race decrease split
3167 value
2854 3168
2855 cf::object::player 3169 cf::object::player
2856 player 3170 player
2857 3171
2858 cf::player 3172 cf::player
2863 3177
2864=cut 3178=cut
2865 3179
2866for ( 3180for (
2867 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3181 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2868 insert remove inv name archname title slaying race 3182 insert remove inv nrof name archname title slaying race
2869 decrease_ob_nr)], 3183 decrease split destroy change_exp value msg lore send_msg)],
2870 ["cf::object::player" => qw(player)], 3184 ["cf::object::player" => qw(player)],
2871 ["cf::player" => qw(peaceful)], 3185 ["cf::player" => qw(peaceful send_msg)],
2872 ["cf::map" => qw(trigger)], 3186 ["cf::map" => qw(trigger)],
2873) { 3187) {
2874 no strict 'refs'; 3188 no strict 'refs';
2875 my ($pkg, @funs) = @$_; 3189 my ($pkg, @funs) = @$_;
2876 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3190 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2894 3208
2895 my $qcode = $code; 3209 my $qcode = $code;
2896 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3210 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2897 $qcode =~ s/\n/\\n/g; 3211 $qcode =~ s/\n/\\n/g;
2898 3212
3213 %vars = (_dummy => 0) unless %vars;
3214
3215 my @res;
2899 local $_; 3216 local $_;
2900 local @safe::cf::_safe_eval_args = values %vars;
2901 3217
2902 my $eval = 3218 my $eval =
2903 "do {\n" 3219 "do {\n"
2904 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3220 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2905 . "#line 0 \"{$qcode}\"\n" 3221 . "#line 0 \"{$qcode}\"\n"
2906 . $code 3222 . $code
2907 . "\n}" 3223 . "\n}"
2908 ; 3224 ;
2909 3225
3226 if ($CFG{safe_eval}) {
2910 sub_generation_inc; 3227 sub_generation_inc;
3228 local @safe::cf::_safe_eval_args = values %vars;
2911 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3229 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2912 sub_generation_inc; 3230 sub_generation_inc;
3231 } else {
3232 local @cf::_safe_eval_args = values %vars;
3233 @res = wantarray ? eval eval : scalar eval $eval;
3234 }
2913 3235
2914 if ($@) { 3236 if ($@) {
2915 warn "$@"; 3237 warn "$@";
2916 warn "while executing safe code '$code'\n"; 3238 warn "while executing safe code '$code'\n";
2917 warn "with arguments " . (join " ", %vars) . "\n"; 3239 warn "with arguments " . (join " ", %vars) . "\n";
2936=cut 3258=cut
2937 3259
2938sub register_script_function { 3260sub register_script_function {
2939 my ($fun, $cb) = @_; 3261 my ($fun, $cb) = @_;
2940 3262
2941 no strict 'refs'; 3263 $fun = "safe::$fun" if $CFG{safe_eval};
2942 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3264 *$fun = $safe_hole->wrap ($cb);
2943} 3265}
2944 3266
2945=back 3267=back
2946 3268
2947=cut 3269=cut
2968 3290
2969 $facedata->{version} == 2 3291 $facedata->{version} == 2
2970 or cf::cleanup "$path: version mismatch, cannot proceed."; 3292 or cf::cleanup "$path: version mismatch, cannot proceed.";
2971 3293
2972 # patch in the exptable 3294 # patch in the exptable
3295 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2973 $facedata->{resource}{"res/exp_table"} = { 3296 $facedata->{resource}{"res/exp_table"} = {
2974 type => FT_RSRC, 3297 type => FT_RSRC,
2975 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3298 data => $exp_table,
3299 hash => (Digest::MD5::md5 $exp_table),
2976 }; 3300 };
2977 cf::cede_to_tick; 3301 cf::cede_to_tick;
2978 3302
2979 { 3303 {
2980 my $faces = $facedata->{faceinfo}; 3304 my $faces = $facedata->{faceinfo};
2981 3305
2982 while (my ($face, $info) = each %$faces) { 3306 while (my ($face, $info) = each %$faces) {
2983 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3307 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3308
2984 cf::face::set_visibility $idx, $info->{visibility}; 3309 cf::face::set_visibility $idx, $info->{visibility};
2985 cf::face::set_magicmap $idx, $info->{magicmap}; 3310 cf::face::set_magicmap $idx, $info->{magicmap};
2986 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3311 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2987 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3312 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2988 3313
2989 cf::cede_to_tick; 3314 cf::cede_to_tick;
2990 } 3315 }
2991 3316
2992 while (my ($face, $info) = each %$faces) { 3317 while (my ($face, $info) = each %$faces) {
2993 next unless $info->{smooth}; 3318 next unless $info->{smooth};
3319
2994 my $idx = cf::face::find $face 3320 my $idx = cf::face::find $face
2995 or next; 3321 or next;
3322
2996 if (my $smooth = cf::face::find $info->{smooth}) { 3323 if (my $smooth = cf::face::find $info->{smooth}) {
2997 cf::face::set_smooth $idx, $smooth; 3324 cf::face::set_smooth $idx, $smooth;
2998 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3325 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2999 } else { 3326 } else {
3000 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3327 warn "smooth face '$info->{smooth}' not found for face '$face'";
3014 3341
3015 cf::anim::invalidate_all; # d'oh 3342 cf::anim::invalidate_all; # d'oh
3016 } 3343 }
3017 3344
3018 { 3345 {
3019 # TODO: for gcfclient pleasure, we should give resources
3020 # that gcfclient doesn't grok a >10000 face index.
3021 my $res = $facedata->{resource}; 3346 my $res = $facedata->{resource};
3022 3347
3023 my $soundconf = delete $res->{"res/sound.conf"};
3024
3025 while (my ($name, $info) = each %$res) { 3348 while (my ($name, $info) = each %$res) {
3349 if (defined $info->{type}) {
3026 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3350 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3027 my $data;
3028 3351
3029 if ($info->{type} & 1) { 3352 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3030 # prepend meta info 3353 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 { 3354 } else {
3039 $data = $info->{data}; 3355 $RESOURCE{$name} = $info;
3040 } 3356 }
3041 3357
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; 3358 cf::cede_to_tick;
3046 } 3359 }
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 } 3360 }
3361
3362 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3066 3363
3067 1 3364 1
3068} 3365}
3366
3367cf::global->attach (on_resource_update => sub {
3368 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3369 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3370
3371 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3372 my $sound = $soundconf->{compat}[$_]
3373 or next;
3374
3375 my $face = cf::face::find "sound/$sound->[1]";
3376 cf::sound::set $sound->[0] => $face;
3377 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3378 }
3379
3380 while (my ($k, $v) = each %{$soundconf->{event}}) {
3381 my $face = cf::face::find "sound/$v";
3382 cf::sound::set $k => $face;
3383 }
3384 }
3385});
3069 3386
3070register_exticmd fx_want => sub { 3387register_exticmd fx_want => sub {
3071 my ($ns, $want) = @_; 3388 my ($ns, $want) = @_;
3072 3389
3073 while (my ($k, $v) = each %$want) { 3390 while (my ($k, $v) = each %$want) {
3074 $ns->fx_want ($k, $v); 3391 $ns->fx_want ($k, $v);
3075 } 3392 }
3076}; 3393};
3394
3395sub load_resource_file($) {
3396 my $guard = lock_acquire "load_resource_file";
3397
3398 my $status = load_resource_file_ $_[0];
3399 get_slot 0.1, 100;
3400 cf::arch::commit_load;
3401
3402 $status
3403}
3077 3404
3078sub reload_regions { 3405sub reload_regions {
3079 # HACK to clear player env face cache, we need some signal framework 3406 # HACK to clear player env face cache, we need some signal framework
3080 # for this (global event?) 3407 # for this (global event?)
3081 %ext::player_env::MUSIC_FACE_CACHE = (); 3408 %ext::player_env::MUSIC_FACE_CACHE = ();
3095} 3422}
3096 3423
3097sub reload_archetypes { 3424sub reload_archetypes {
3098 load_resource_file "$DATADIR/archetypes" 3425 load_resource_file "$DATADIR/archetypes"
3099 or die "unable to load archetypes\n"; 3426 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} 3427}
3106 3428
3107sub reload_treasures { 3429sub reload_treasures {
3108 load_resource_file "$DATADIR/treasures" 3430 load_resource_file "$DATADIR/treasures"
3109 or die "unable to load treasurelists\n"; 3431 or die "unable to load treasurelists\n";
3110} 3432}
3111 3433
3112sub reload_resources { 3434sub reload_resources {
3113 warn "reloading resource files...\n"; 3435 warn "reloading resource files...\n";
3114 3436
3437 reload_facedata;
3438 reload_archetypes;
3115 reload_regions; 3439 reload_regions;
3116 reload_facedata;
3117 #reload_archetypes;#d#
3118 reload_archetypes;
3119 reload_treasures; 3440 reload_treasures;
3120 3441
3121 warn "finished reloading resource files\n"; 3442 warn "finished reloading resource files\n";
3122} 3443}
3123 3444
3124sub init {
3125 reload_resources;
3126}
3127
3128sub reload_config { 3445sub reload_config {
3446 warn "reloading config file...\n";
3447
3129 open my $fh, "<:utf8", "$CONFDIR/config" 3448 open my $fh, "<:utf8", "$CONFDIR/config"
3130 or return; 3449 or return;
3131 3450
3132 local $/; 3451 local $/;
3133 *CFG = YAML::Syck::Load <$fh>; 3452 *CFG = YAML::XS::Load scalar <$fh>;
3134 3453
3135 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3454 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3136 3455
3137 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3456 $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}; 3457 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3142 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3461 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3143 and die "WARNING: m(un)lockall failed: $!\n"; 3462 and die "WARNING: m(un)lockall failed: $!\n";
3144 }; 3463 };
3145 warn $@ if $@; 3464 warn $@ if $@;
3146 } 3465 }
3466
3467 warn "finished reloading resource files\n";
3468}
3469
3470sub pidfile() {
3471 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3472 or die "$PIDFILE: $!";
3473 flock $fh, &Fcntl::LOCK_EX
3474 or die "$PIDFILE: flock: $!";
3475 $fh
3476}
3477
3478# make sure only one server instance is running at any one time
3479sub atomic {
3480 my $fh = pidfile;
3481
3482 my $pid = <$fh>;
3483 kill 9, $pid if $pid > 0;
3484
3485 seek $fh, 0, 0;
3486 print $fh $$;
3487}
3488
3489sub main_loop {
3490 warn "EV::loop starting\n";
3491 if (1) {
3492 EV::loop;
3493 }
3494 warn "EV::loop returned\n";
3495 goto &main_loop unless $REALLY_UNLOOP;
3147} 3496}
3148 3497
3149sub main { 3498sub main {
3499 cf::init_globals; # initialise logging
3500
3501 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3502 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3503 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3504 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3505
3506 cf::init_experience;
3507 cf::init_anim;
3508 cf::init_attackmess;
3509 cf::init_dynamic;
3510
3511 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3512
3150 # we must not ever block the main coroutine 3513 # we must not ever block the main coroutine
3151 local $Coro::idle = sub { 3514 local $Coro::idle = sub {
3152 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3515 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3153 (async { 3516 (async {
3154 Event::one_event; 3517 $Coro::current->{desc} = "IDLE BUG HANDLER";
3518 EV::loop EV::LOOP_ONESHOT;
3155 })->prio (Coro::PRIO_MAX); 3519 })->prio (Coro::PRIO_MAX);
3156 }; 3520 };
3157 3521
3522 evthread_start IO::AIO::poll_fileno;
3523
3524 cf::sync_job {
3525 cf::load_settings;
3526 cf::load_materials;
3527
3528 reload_resources;
3158 reload_config; 3529 reload_config;
3159 db_init; 3530 db_init;
3531
3532 cf::init_uuid;
3533 cf::init_signals;
3534 cf::init_commands;
3535 cf::init_skills;
3536
3537 cf::init_beforeplay;
3538
3539 atomic;
3540
3160 load_extensions; 3541 load_extensions;
3161 3542
3162 $TICK_WATCHER->start; 3543 utime time, time, $RUNTIMEFILE;
3163 Event::loop; 3544
3545 # no (long-running) fork's whatsoever before this point(!)
3546 use POSIX ();
3547 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3548
3549 (pop @POST_INIT)->(0) while @POST_INIT;
3550 };
3551
3552 main_loop;
3164} 3553}
3165 3554
3166############################################################################# 3555#############################################################################
3167# initialisation and cleanup 3556# initialisation and cleanup
3168 3557
3169# install some emergency cleanup handlers 3558# install some emergency cleanup handlers
3170BEGIN { 3559BEGIN {
3560 our %SIGWATCHER = ();
3171 for my $signal (qw(INT HUP TERM)) { 3561 for my $signal (qw(INT HUP TERM)) {
3172 Event->signal ( 3562 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3173 reentrant => 0,
3174 data => WF_AUTOCANCEL,
3175 signal => $signal,
3176 prio => 0,
3177 cb => sub {
3178 cf::cleanup "SIG$signal"; 3563 cf::cleanup "SIG$signal";
3179 },
3180 ); 3564 };
3181 } 3565 }
3182} 3566}
3183 3567
3184sub write_runtime { 3568sub write_runtime_sync {
3185 my $runtime = "$LOCALDIR/runtime";
3186
3187 # first touch the runtime file to show we are still running: 3569 # first touch the runtime file to show we are still running:
3188 # the fsync below can take a very very long time. 3570 # the fsync below can take a very very long time.
3189 3571
3190 IO::AIO::aio_utime $runtime, undef, undef; 3572 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3191 3573
3192 my $guard = cf::lock_acquire "write_runtime"; 3574 my $guard = cf::lock_acquire "write_runtime";
3193 3575
3194 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3576 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3195 or return; 3577 or return;
3196 3578
3197 my $value = $cf::RUNTIME + 90 + 10; 3579 my $value = $cf::RUNTIME + 90 + 10;
3198 # 10 is the runtime save interval, for a monotonic clock 3580 # 10 is the runtime save interval, for a monotonic clock
3199 # 60 allows for the watchdog to kill the server. 3581 # 60 allows for the watchdog to kill the server.
3209 aio_utime $fh, undef, undef; 3591 aio_utime $fh, undef, undef;
3210 3592
3211 close $fh 3593 close $fh
3212 or return; 3594 or return;
3213 3595
3214 aio_rename "$runtime~", $runtime 3596 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3215 and return; 3597 and return;
3216 3598
3217 warn "runtime file written.\n"; 3599 warn "runtime file written.\n";
3218 3600
3219 1 3601 1
3602}
3603
3604our $uuid_lock;
3605our $uuid_skip;
3606
3607sub write_uuid_sync($) {
3608 $uuid_skip ||= $_[0];
3609
3610 return if $uuid_lock;
3611 local $uuid_lock = 1;
3612
3613 my $uuid = "$LOCALDIR/uuid";
3614
3615 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3616 or return;
3617
3618 my $value = uuid_seq uuid_cur;
3619
3620 unless ($value) {
3621 warn "cowardly refusing to write zero uuid value!\n";
3622 return;
3623 }
3624
3625 my $value = uuid_str $value + $uuid_skip;
3626 $uuid_skip = 0;
3627
3628 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3629 and return;
3630
3631 # always fsync - this file is important
3632 aio_fsync $fh
3633 and return;
3634
3635 close $fh
3636 or return;
3637
3638 aio_rename "$uuid~", $uuid
3639 and return;
3640
3641 warn "uuid file written ($value).\n";
3642
3643 1
3644
3645}
3646
3647sub write_uuid($$) {
3648 my ($skip, $sync) = @_;
3649
3650 $sync ? write_uuid_sync $skip
3651 : async { write_uuid_sync $skip };
3220} 3652}
3221 3653
3222sub emergency_save() { 3654sub emergency_save() {
3223 my $freeze_guard = cf::freeze_mainloop; 3655 my $freeze_guard = cf::freeze_mainloop;
3224 3656
3225 warn "enter emergency perl save\n"; 3657 warn "emergency_perl_save: enter\n";
3226 3658
3227 cf::sync_job { 3659 cf::sync_job {
3660 # this is a trade-off: we want to be very quick here, so
3661 # save all maps without fsync, and later call a global sync
3662 # (which in turn might be very very slow)
3663 local $USE_FSYNC = 0;
3664
3228 # use a peculiar iteration method to avoid tripping on perl 3665 # use a peculiar iteration method to avoid tripping on perl
3229 # refcount bugs in for. also avoids problems with players 3666 # refcount bugs in for. also avoids problems with players
3230 # and maps saved/destroyed asynchronously. 3667 # and maps saved/destroyed asynchronously.
3231 warn "begin emergency player save\n"; 3668 warn "emergency_perl_save: begin player save\n";
3232 for my $login (keys %cf::PLAYER) { 3669 for my $login (keys %cf::PLAYER) {
3233 my $pl = $cf::PLAYER{$login} or next; 3670 my $pl = $cf::PLAYER{$login} or next;
3234 $pl->valid or next; 3671 $pl->valid or next;
3672 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3235 $pl->save; 3673 $pl->save;
3236 } 3674 }
3237 warn "end emergency player save\n"; 3675 warn "emergency_perl_save: end player save\n";
3238 3676
3239 warn "begin emergency map save\n"; 3677 warn "emergency_perl_save: begin map save\n";
3240 for my $path (keys %cf::MAP) { 3678 for my $path (keys %cf::MAP) {
3241 my $map = $cf::MAP{$path} or next; 3679 my $map = $cf::MAP{$path} or next;
3242 $map->valid or next; 3680 $map->valid or next;
3243 $map->save; 3681 $map->save;
3244 } 3682 }
3245 warn "end emergency map save\n"; 3683 warn "emergency_perl_save: end map save\n";
3246 3684
3247 warn "begin emergency database checkpoint\n"; 3685 warn "emergency_perl_save: begin database checkpoint\n";
3248 BDB::db_env_txn_checkpoint $DB_ENV; 3686 BDB::db_env_txn_checkpoint $DB_ENV;
3249 warn "end emergency database checkpoint\n"; 3687 warn "emergency_perl_save: end database checkpoint\n";
3688
3689 warn "emergency_perl_save: begin write uuid\n";
3690 write_uuid_sync 1;
3691 warn "emergency_perl_save: end write uuid\n";
3250 }; 3692 };
3251 3693
3694 warn "emergency_perl_save: starting sync()\n";
3695 IO::AIO::aio_sync sub {
3696 warn "emergency_perl_save: finished sync()\n";
3697 };
3698
3252 warn "leave emergency perl save\n"; 3699 warn "emergency_perl_save: leave\n";
3253} 3700}
3254 3701
3255sub post_cleanup { 3702sub post_cleanup {
3256 my ($make_core) = @_; 3703 my ($make_core) = @_;
3257 3704
3258 warn Carp::longmess "post_cleanup backtrace" 3705 warn Carp::longmess "post_cleanup backtrace"
3259 if $make_core; 3706 if $make_core;
3707
3708 my $fh = pidfile;
3709 unlink $PIDFILE if <$fh> == $$;
3710}
3711
3712# a safer delete_package, copied from Symbol
3713sub clear_package($) {
3714 my $pkg = shift;
3715
3716 # expand to full symbol table name if needed
3717 unless ($pkg =~ /^main::.*::$/) {
3718 $pkg = "main$pkg" if $pkg =~ /^::/;
3719 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3720 $pkg .= '::' unless $pkg =~ /::$/;
3721 }
3722
3723 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3724 my $stem_symtab = *{$stem}{HASH};
3725
3726 defined $stem_symtab and exists $stem_symtab->{$leaf}
3727 or return;
3728
3729 # clear all symbols
3730 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3731 for my $name (keys %$leaf_symtab) {
3732 _gv_clear *{"$pkg$name"};
3733# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3734 }
3735 warn "cleared package $pkg\n";#d#
3260} 3736}
3261 3737
3262sub do_reload_perl() { 3738sub do_reload_perl() {
3263 # can/must only be called in main 3739 # can/must only be called in main
3264 if ($Coro::current != $Coro::main) { 3740 if ($Coro::current != $Coro::main) {
3265 warn "can only reload from main coroutine"; 3741 warn "can only reload from main coroutine";
3266 return; 3742 return;
3267 } 3743 }
3268 3744
3745 return if $RELOAD++;
3746
3747 my $t1 = EV::time;
3748
3749 while ($RELOAD) {
3269 warn "reloading..."; 3750 warn "reloading...";
3270 3751
3271 warn "entering sync_job"; 3752 warn "entering sync_job";
3272 3753
3273 cf::sync_job { 3754 cf::sync_job {
3274 cf::write_runtime; # external watchdog should not bark 3755 cf::write_runtime_sync; # external watchdog should not bark
3275 cf::emergency_save; 3756 cf::emergency_save;
3276 cf::write_runtime; # external watchdog should not bark 3757 cf::write_runtime_sync; # external watchdog should not bark
3277 3758
3278 warn "syncing database to disk"; 3759 warn "syncing database to disk";
3279 BDB::db_env_txn_checkpoint $DB_ENV; 3760 BDB::db_env_txn_checkpoint $DB_ENV;
3280 3761
3281 # if anything goes wrong in here, we should simply crash as we already saved 3762 # if anything goes wrong in here, we should simply crash as we already saved
3282 3763
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"; 3764 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; 3765 while (IO::AIO::nreqs || BDB::nreqs) {
3294 warn "iterate..."; 3766 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3295 }
3296
3297 ++$RELOAD;
3298
3299 warn "cancelling all extension coros";
3300 $_->cancel for values %EXT_CORO;
3301 %EXT_CORO = ();
3302
3303 warn "removing commands";
3304 %COMMAND = ();
3305
3306 warn "removing ext/exti commands";
3307 %EXTCMD = ();
3308 %EXTICMD = ();
3309
3310 warn "unloading/nuking all extensions";
3311 for my $pkg (@EXTS) {
3312 warn "... unloading $pkg";
3313
3314 if (my $cb = $pkg->can ("unload")) {
3315 eval {
3316 $cb->($pkg);
3317 1
3318 } or warn "$pkg unloaded, but with errors: $@";
3319 } 3767 }
3320 3768
3321 warn "... nuking $pkg"; 3769 warn "cancelling all extension coros";
3322 Symbol::delete_package $pkg; 3770 $_->cancel for values %EXT_CORO;
3323 } 3771 %EXT_CORO = ();
3324 3772
3325 warn "unloading all perl modules loaded from $LIBDIR"; 3773 warn "removing commands";
3326 while (my ($k, $v) = each %INC) { 3774 %COMMAND = ();
3327 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3328 3775
3776 warn "removing ext/exti commands";
3777 %EXTCMD = ();
3778 %EXTICMD = ();
3779
3780 warn "unloading/nuking all extensions";
3781 for my $pkg (@EXTS) {
3329 warn "... unloading $k"; 3782 warn "... unloading $pkg";
3330 delete $INC{$k};
3331 3783
3332 $k =~ s/\.pm$//;
3333 $k =~ s/\//::/g;
3334
3335 if (my $cb = $k->can ("unload_module")) { 3784 if (my $cb = $pkg->can ("unload")) {
3785 eval {
3336 $cb->(); 3786 $cb->($pkg);
3787 1
3788 } or warn "$pkg unloaded, but with errors: $@";
3789 }
3790
3791 warn "... clearing $pkg";
3792 clear_package $pkg;
3337 } 3793 }
3338 3794
3339 Symbol::delete_package $k; 3795 warn "unloading all perl modules loaded from $LIBDIR";
3796 while (my ($k, $v) = each %INC) {
3797 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3798
3799 warn "... unloading $k";
3800 delete $INC{$k};
3801
3802 $k =~ s/\.pm$//;
3803 $k =~ s/\//::/g;
3804
3805 if (my $cb = $k->can ("unload_module")) {
3806 $cb->();
3807 }
3808
3809 clear_package $k;
3340 } 3810 }
3341 3811
3342 warn "getting rid of safe::, as good as possible"; 3812 warn "getting rid of safe::, as good as possible";
3343 Symbol::delete_package "safe::$_" 3813 clear_package "safe::$_"
3344 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3814 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3345 3815
3346 warn "unloading cf.pm \"a bit\""; 3816 warn "unloading cf.pm \"a bit\"";
3347 delete $INC{"cf.pm"}; 3817 delete $INC{"cf.pm"};
3348 delete $INC{"cf/pod.pm"}; 3818 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3349 3819
3350 # don't, removes xs symbols, too, 3820 # don't, removes xs symbols, too,
3351 # and global variables created in xs 3821 # and global variables created in xs
3352 #Symbol::delete_package __PACKAGE__; 3822 #clear_package __PACKAGE__;
3353 3823
3354 warn "unload completed, starting to reload now"; 3824 warn "unload completed, starting to reload now";
3355 3825
3356 warn "reloading cf.pm"; 3826 warn "reloading cf.pm";
3357 require cf; 3827 require cf;
3358 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3828 cf::_connect_to_perl_1;
3359 3829
3360 warn "loading config and database again"; 3830 warn "loading config and database again";
3361 cf::reload_config; 3831 cf::reload_config;
3362 3832
3363 warn "loading extensions"; 3833 warn "loading extensions";
3364 cf::load_extensions; 3834 cf::load_extensions;
3365 3835
3836 if ($REATTACH_ON_RELOAD) {
3366 warn "reattaching attachments to objects/players"; 3837 warn "reattaching attachments to objects/players";
3367 _global_reattach; # objects, sockets 3838 _global_reattach; # objects, sockets
3368 warn "reattaching attachments to maps"; 3839 warn "reattaching attachments to maps";
3369 reattach $_ for values %MAP; 3840 reattach $_ for values %MAP;
3370 warn "reattaching attachments to players"; 3841 warn "reattaching attachments to players";
3371 reattach $_ for values %PLAYER; 3842 reattach $_ for values %PLAYER;
3843 }
3372 3844
3845 warn "running post_init jobs";
3846 (pop @POST_INIT)->(1) while @POST_INIT;
3847
3373 warn "leaving sync_job"; 3848 warn "leaving sync_job";
3374 3849
3375 1 3850 1
3376 } or do { 3851 } or do {
3377 warn $@; 3852 warn $@;
3378 warn "error while reloading, exiting."; 3853 cf::cleanup "error while reloading, exiting.";
3379 exit 1;
3380 }; 3854 };
3381 3855
3382 warn "reloaded"; 3856 warn "reloaded";
3857 --$RELOAD;
3858 }
3859
3860 $t1 = EV::time - $t1;
3861 warn "reload completed in ${t1}s\n";
3383}; 3862};
3384 3863
3385our $RELOAD_WATCHER; # used only during reload 3864our $RELOAD_WATCHER; # used only during reload
3386 3865
3387sub reload_perl() { 3866sub reload_perl() {
3388 # doing reload synchronously and two reloads happen back-to-back, 3867 # doing reload synchronously and two reloads happen back-to-back,
3389 # coro crashes during coro_state_free->destroy here. 3868 # coro crashes during coro_state_free->destroy here.
3390 3869
3391 $RELOAD_WATCHER ||= Event->timer ( 3870 $RELOAD_WATCHER ||= cf::async {
3392 reentrant => 0, 3871 Coro::AIO::aio_wait cache_extensions;
3393 after => 0, 3872
3394 data => WF_AUTOCANCEL, 3873 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3395 cb => sub {
3396 do_reload_perl; 3874 do_reload_perl;
3397 undef $RELOAD_WATCHER; 3875 undef $RELOAD_WATCHER;
3398 }, 3876 };
3399 ); 3877 };
3400} 3878}
3401 3879
3402register_command "reload" => sub { 3880register_command "reload" => sub {
3403 my ($who, $arg) = @_; 3881 my ($who, $arg) = @_;
3404 3882
3405 if ($who->flag (FLAG_WIZ)) { 3883 if ($who->flag (FLAG_WIZ)) {
3406 $who->message ("reloading server."); 3884 $who->message ("reloading server.");
3885 async {
3886 $Coro::current->{desc} = "perl_reload";
3407 async { reload_perl }; 3887 reload_perl;
3888 };
3408 } 3889 }
3409}; 3890};
3410 3891
3411unshift @INC, $LIBDIR; 3892unshift @INC, $LIBDIR;
3412 3893
3414 3895
3415our @WAIT_FOR_TICK; 3896our @WAIT_FOR_TICK;
3416our @WAIT_FOR_TICK_BEGIN; 3897our @WAIT_FOR_TICK_BEGIN;
3417 3898
3418sub wait_for_tick { 3899sub wait_for_tick {
3419 return unless $TICK_WATCHER->is_active;
3420 return if $Coro::current == $Coro::main; 3900 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3421 3901
3422 my $signal = new Coro::Signal; 3902 my $signal = new Coro::Signal;
3423 push @WAIT_FOR_TICK, $signal; 3903 push @WAIT_FOR_TICK, $signal;
3424 $signal->wait; 3904 $signal->wait;
3425} 3905}
3426 3906
3427sub wait_for_tick_begin { 3907sub wait_for_tick_begin {
3428 return unless $TICK_WATCHER->is_active;
3429 return if $Coro::current == $Coro::main; 3908 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3430 3909
3431 my $signal = new Coro::Signal; 3910 my $signal = new Coro::Signal;
3432 push @WAIT_FOR_TICK_BEGIN, $signal; 3911 push @WAIT_FOR_TICK_BEGIN, $signal;
3433 $signal->wait; 3912 $signal->wait;
3434} 3913}
3435 3914
3436 my $min = 1e6;#d# 3915sub 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) { 3916 if ($Coro::current != $Coro::main) {
3446 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3917 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3447 unless ++$bug_warning > 10; 3918 unless ++$bug_warning > 10;
3448 return; 3919 return;
3449 } 3920 }
3450 3921
3451 $NOW = $tick_start = Event::time;
3452
3453 cf::server_tick; # one server iteration 3922 cf::server_tick; # one server iteration
3454 3923
3455 0 && sync_job {#d# 3924 #for(1..3e6){} EV::now_update; $NOW=EV::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 3925
3461 $map->width (50); 3926 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3462 $map->height (50); 3927 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3463 $map->alloc; 3928 Coro::async_pool {
3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work 3929 $Coro::current->{desc} = "runtime saver";
3465 my $t = Event::time - $t; 3930 write_runtime_sync
3466 3931 or warn "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 }; 3932 };
3933 }
3477 3934
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) { 3935 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3493 $sig->send; 3936 $sig->send;
3494 } 3937 }
3495 while (my $sig = shift @WAIT_FOR_TICK) { 3938 while (my $sig = shift @WAIT_FOR_TICK) {
3496 $sig->send; 3939 $sig->send;
3497 } 3940 }
3498 3941
3499 $NOW = Event::time; 3942 $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; 3943 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3509 3944
3510 _post_tick; 3945 if (0) {
3511 3946 if ($NEXT_TICK) {
3512 3947 my $jitter = $TICK_START - $NEXT_TICK;
3948 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3949 warn "jitter $JITTER\n";#d#
3950 }
3513 }, 3951 }
3514); 3952}
3515 3953
3516{ 3954{
3517 BDB::max_poll_time $TICK * 0.1; 3955 # configure BDB
3518 $BDB_POLL_WATCHER = Event->io ( 3956
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; 3957 BDB::min_parallel 16;
3527 3958 BDB::max_poll_reqs $TICK * 0.1;
3528 BDB::set_sync_prepare { 3959 $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 3960
3543 unless ($DB_ENV) { 3961 unless ($DB_ENV) {
3544 $DB_ENV = BDB::db_env_create; 3962 $DB_ENV = BDB::db_env_create;
3963 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3964 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3965 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3966 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3967 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3545 3968
3546 cf::sync_job { 3969 cf::sync_job {
3547 eval { 3970 eval {
3548 BDB::db_env_open 3971 BDB::db_env_open
3549 $DB_ENV, 3972 $DB_ENV,
3551 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3974 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3975 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3553 0666; 3976 0666;
3554 3977
3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3978 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 }; 3979 };
3560 3980
3561 cf::cleanup "db_env_open(db): $@" if $@; 3981 cf::cleanup "db_env_open(db): $@" if $@;
3562 }; 3982 };
3563 } 3983 }
3984
3985 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3986 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3987 };
3988 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3989 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3990 };
3991 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3992 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3993 };
3564} 3994}
3565 3995
3566{ 3996{
3997 # configure IO::AIO
3998
3567 IO::AIO::min_parallel 8; 3999 IO::AIO::min_parallel 8;
3568
3569 undef $Coro::AIO::WATCHER;
3570 IO::AIO::max_poll_time $TICK * 0.1; 4000 IO::AIO::max_poll_time $TICK * 0.1;
3571 $AIO_POLL_WATCHER = Event->io ( 4001 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} 4002}
3580 4003
3581my $_log_backtrace; 4004my $_log_backtrace;
3582 4005
3583sub _log_backtrace { 4006sub _log_backtrace {
3586 $msg =~ s/\n//; 4009 $msg =~ s/\n//;
3587 4010
3588 # limit the # of concurrent backtraces 4011 # limit the # of concurrent backtraces
3589 if ($_log_backtrace < 2) { 4012 if ($_log_backtrace < 2) {
3590 ++$_log_backtrace; 4013 ++$_log_backtrace;
4014 my $perl_bt = Carp::longmess $msg;
3591 async { 4015 async {
4016 $Coro::current->{desc} = "abt $msg";
4017
3592 my @bt = fork_call { 4018 my @bt = fork_call {
3593 @addr = map { sprintf "%x", $_ } @addr; 4019 @addr = map { sprintf "%x", $_ } @addr;
3594 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4020 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3595 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4021 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3596 or die "addr2line: $!"; 4022 or die "addr2line: $!";
3604 } 4030 }
3605 4031
3606 @funcs 4032 @funcs
3607 }; 4033 };
3608 4034
3609 LOG llevInfo, "[ABT] $msg\n"; 4035 LOG llevInfo, "[ABT] $perl_bt\n";
4036 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3610 LOG llevInfo, "[ABT] $_\n" for @bt; 4037 LOG llevInfo, "[ABT] $_\n" for @bt;
3611 --$_log_backtrace; 4038 --$_log_backtrace;
3612 }; 4039 };
3613 } else { 4040 } else {
3614 LOG llevInfo, "[ABT] $msg\n"; 4041 LOG llevInfo, "[ABT] $msg\n";
3615 LOG llevInfo, "[ABT] [suppressed]\n"; 4042 LOG llevInfo, "[ABT] [suppressed]\n";
3616 } 4043 }
3617} 4044}
3618 4045
3619# load additional modules 4046# load additional modules
3620use cf::pod; 4047require "cf/$_.pm" for @EXTRA_MODULES;
4048cf::_connect_to_perl_2;
3621 4049
3622END { cf::emergency_save } 4050END { cf::emergency_save }
3623 4051
36241 40521
3625 4053

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines