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.379 by root, Thu Oct 4 23:59:07 2007 UTC vs.
Revision 1.511 by root, Wed Apr 7 18:35:56 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
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 121our $DB_ENV;
89 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
90our %CFG; 125our %CFG;
91 126
92our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 128our $RUNTIME;
129our $NOW;
94 130
95our (%PLAYER, %PLAYER_LOADING); # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 132our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
98 134
99# 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 ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 137
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
104our $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 :)
105 147
106binmode STDOUT; 148binmode STDOUT;
107binmode STDERR; 149binmode STDERR;
108 150
109# read virtual server time, if available 151# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
114} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
115 159
116mkdir $_ 160mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 162
119our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
120 164
121sub 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::"} };
122 177
123############################################################################# 178#############################################################################
124 179
125=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
126 181
162 217
163The raw value load value from the last tick. 218The raw value load value from the last tick.
164 219
165=item %cf::CFG 220=item %cf::CFG
166 221
167Configuration for the server, loaded from C</etc/crossfire/config>, or 222Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 223from wherever your confdir points to.
169 224
170=item cf::wait_for_tick, cf::wait_for_tick_begin 225=item cf::wait_for_tick, cf::wait_for_tick_begin
171 226
172These 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
173returns 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
174per 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.
175 230
176=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
177 232
178This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 235that call.
181 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
182=back 243=back
183 244
184=cut 245=cut
185 246
186BEGIN { 247$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 248 my $msg = join "", @_;
189 249
190 $msg .= "\n" 250 $msg .= "\n"
191 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
192 252
193 $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;
194 254
195 LOG llevError, $msg; 255 LOG llevError, $msg;
196 }; 256};
197} 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};
198 271
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 282for my $pkg (qw(
210 cf::global cf::attachable 283 cf::global cf::attachable
211 cf::object cf::object::player 284 cf::object cf::object::player
212 cf::client cf::player 285 cf::client cf::player
213 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
214 cf::map cf::party cf::region 288 cf::party cf::region
215)) { 289)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 291}
219 292
220$Event::DIED = sub { 293$EV::DIED = sub {
221 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
222}; 295};
223 296
224############################################################################# 297#############################################################################
225 298
226=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
248 $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;
249 $d 322 $d
250 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
251} 324}
252 325
253=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
254 327
255Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
256 329
257=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
258 331
259Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
260 333
261=cut 334=cut
262 335
263our $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
264 337
265sub to_json ($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
266sub 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}
267 354
268=item cf::lock_wait $string 355=item cf::lock_wait $string
269 356
270Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
271 358
272=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
273 360
274Wait 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
275a 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,
276for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
277returned. 364returned.
278 365
279Locks 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
280deadlocked coro. 367deadlocked coro.
286 373
287Return 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.
288 375
289=cut 376=cut
290 377
291our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 379
294sub lock_wait($) { 380sub lock_wait($) {
295 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 382}
308 383
309sub lock_acquire($) { 384sub lock_acquire($) {
310 my ($key) = @_; 385 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 386}
324 387
325sub lock_active($) { 388sub lock_active($) {
326 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 390}
330 391
331sub freeze_mainloop { 392sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
333 394
334 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 396}
336 }; 397
337 $TICK_WATCHER->stop; 398=item cf::periodic $interval, $cb
338 $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
339} 411}
340 412
341=item cf::get_slot $time[, $priority[, $name]] 413=item cf::get_slot $time[, $priority[, $name]]
342 414
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 415Allocate $time seconds of blocking CPU time at priority C<$priority>:
351 423
352=cut 424=cut
353 425
354our @SLOT_QUEUE; 426our @SLOT_QUEUE;
355our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
356 429
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
360 433
361 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
362 436
363 while () { 437 while () {
364 next_job: 438 next_job:
439
365 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
366 if ($avail > 0.01) { 441
367 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
369 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send; 446 $job->[2]->send;
371 Coro::cede; 447 Coro::cede;
372 goto next_job; 448 goto next_job;
373 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
374 } 451 }
375 } 452 }
376 453
377 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
378 # 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
379 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 457 $signal->wait;
381 } else { 458 } else {
459 $busy = 0;
382 Coro::schedule; 460 Coro::schedule;
383 } 461 }
384 } 462 }
385}; 463};
386 464
387sub get_slot($;$$) { 465sub get_slot($;$$) {
466 return if tick_inhibit || $Coro::current == $Coro::main;
467
388 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
389 469
390 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
391 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
392 473
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
406 487
407BEGIN { *async = \&Coro::async_pool } 488BEGIN { *async = \&Coro::async_pool }
408 489
409=item cf::sync_job { BLOCK } 490=item cf::sync_job { BLOCK }
410 491
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 492The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 493is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 494partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 495acceptable.
415 496
416If 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
417the given BLOCK in another coroutine while waiting for the result. The 498the given BLOCK in another coroutine while waiting for the result. The
422 503
423sub sync_job(&) { 504sub sync_job(&) {
424 my ($job) = @_; 505 my ($job) = @_;
425 506
426 if ($Coro::current == $Coro::main) { 507 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 508 my $time = EV::time;
428 509
429 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
431 512
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d# 513 LOG llevError, Carp::longmess "sync job";#d#
433 514
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 515 my $freeze_guard = freeze_mainloop;
437 516
438 my $busy = 1; 517 my $busy = 1;
439 my @res; 518 my @res;
440 519
444 warn $@ if $@; 523 warn $@ if $@;
445 undef $busy; 524 undef $busy;
446 })->prio (Coro::PRIO_MAX); 525 })->prio (Coro::PRIO_MAX);
447 526
448 while ($busy) { 527 while ($busy) {
449 Coro::cede or Event::one_event; 528 if (Coro::nready) {
529 Coro::cede_notself;
530 } else {
531 EV::loop EV::LOOP_ONESHOT;
450 } 532 }
533 }
451 534
452 $time = Event::time - $time; 535 my $time = EV::time - $time;
453 536
454 LOG llevError | logBacktrace, Carp::longmess "long sync job"
455 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456
457 $tick_start += $time; # do not account sync jobs to server load 537 $TICK_START += $time; # do not account sync jobs to server load
458 538
459 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
460 } else { 540 } else {
461 # we are in another coroutine, how wonderful, everything just works 541 # we are in another coroutine, how wonderful, everything just works
462 542
487=item fork_call { }, $args 567=item fork_call { }, $args
488 568
489Executes the given code block with the given arguments in a seperate 569Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 570process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 571Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 572never block itself or use any form of event handling.
493 573
494=cut 574=cut
495 575
496sub fork_call(&@) { 576sub fork_call(&@) {
497 my ($cb, @args) = @_; 577 my ($cb, @args) = @_;
504 reset_signals; 584 reset_signals;
505 &$cb 585 &$cb
506 }, @args; 586 }, @args;
507 587
508 wantarray ? @res : $res[-1] 588 wantarray ? @res : $res[-1]
589}
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
509} 616}
510 617
511=item $value = cf::db_get $family => $key 618=item $value = cf::db_get $family => $key
512 619
513Returns a single value from the environment database. 620Returns a single value from the environment database.
652 759
653############################################################################# 760#############################################################################
654 761
655=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
656 763
657Many 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
658attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
660 767
661In 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>
662C<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
663Crossfire TRT). 770Deliantra).
664 771
665=over 4 772=over 4
666 773
667=item $attachable->attach ($attachment, key => $value...) 774=item $attachable->attach ($attachment, key => $value...)
668 775
712=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
713 820
714Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
715given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
716 823
717Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
718that 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.
719 826
720These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
721 828
722=over 4 829=over 4
950 } 1057 }
951 1058
952 0 1059 0
953} 1060}
954 1061
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1062=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1063
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1064=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1065
959Generate an object-specific event with the given arguments. 1066Generate an object-specific event with the given arguments.
960 1067
966 1073
967=cut 1074=cut
968 1075
969############################################################################# 1076#############################################################################
970# object support 1077# object support
971#
972 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#
973sub _can_merge { 1112sub _can_merge {
974 my ($ob1, $ob2) = @_; 1113 my ($ob1, $ob2) = @_;
975 1114
976 local $Storable::canonical = 1; 1115 ++$SLOW_MERGES;#d#
977 my $fob1 = Storable::freeze $ob1;
978 my $fob2 = Storable::freeze $ob2;
979 1116
980 $fob1 eq $fob2 1117 # we do the slow way here
1118 return _object_equal $ob1, $ob2
981} 1119}
982 1120
983sub reattach { 1121sub reattach {
984 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
985 my ($obj) = @_; 1123 my ($obj) = @_;
986 1124
1125 # no longer needed after getting rid of delete_package?
987 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
988 1127
989 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
990 1129
991 @$registry = (); 1130 @$registry = ();
992 1131
1007cf::attachable->attach ( 1146cf::attachable->attach (
1008 prio => -1000000, 1147 prio => -1000000,
1009 on_instantiate => sub { 1148 on_instantiate => sub {
1010 my ($obj, $data) = @_; 1149 my ($obj, $data) = @_;
1011 1150
1012 $data = from_json $data; 1151 $data = decode_json $data;
1013 1152
1014 for (@$data) { 1153 for (@$data) {
1015 my ($name, $args) = @$_; 1154 my ($name, $args) = @$_;
1016 1155
1017 $obj->attach ($name, %{$args || {} }); 1156 $obj->attach ($name, %{$args || {} });
1038 utf8::decode (my $decname = $filename); 1177 utf8::decode (my $decname = $filename);
1039 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
1040 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1041 1180
1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1043 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1045 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 }
1046 close $fh; 1188 aio_close $fh;
1047 1189
1048 if (@$objs) { 1190 if (@$objs) {
1049 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) {
1050 chmod SAVE_MODE, $fh; 1192 aio_chmod $fh, SAVE_MODE;
1051 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1052 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1053 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 }
1054 close $fh; 1199 aio_close $fh;
1055 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1056 } 1201 }
1057 } else { 1202 } else {
1058 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1059 } 1204 }
1060 1205
1061 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1062 } else { 1210 } else {
1063 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1064 } 1212 }
1065 } else { 1213 } else {
1066 aio_unlink $filename; 1214 aio_unlink $filename;
1067 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1068 } 1216 }
1087 1235
1088 unless (aio_stat "$filename.pst") { 1236 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1237 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1238 or return;
1091 1239
1092 $av = eval { (Storable::thaw $av)->{objs} }; 1240 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs};
1093 } 1242 }
1094 1243
1095 utf8::decode (my $decname = $filename); 1244 utf8::decode (my $decname = $filename);
1096 warn sprintf "loading %s (%d,%d)\n", 1245 warn sprintf "loading %s (%d,%d)\n",
1097 $decname, length $data, scalar @{$av || []}; 1246 $decname, length $data, scalar @{$av || []};
1158 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1159 1308
1160 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1161} 1310}
1162 1311
1312use File::Glob ();
1313
1163cf::player->attach ( 1314cf::player->attach (
1164 on_command => sub { 1315 on_unknown_command => sub {
1165 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1166 1317
1167 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1168 or return; 1319 or return;
1169 1320
1199 1350
1200 cf::override; 1351 cf::override;
1201 }, 1352 },
1202); 1353);
1203 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
1204sub load_extensions { 1368sub load_extensions {
1205 cf::sync_job { 1369 cf::sync_job {
1206 my %todo; 1370 my %todo;
1207 1371
1208 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
1227 1391
1228 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1229 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1230 1394
1231 $ext{source} = 1395 $ext{source} =
1232 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1233 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1234 . $source 1398 . $source
1235 . "\n};\n1"; 1399 . "\n};\n1";
1236 1400
1237 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1238 } 1402 }
1239 1403
1404 my $pass = 0;
1240 my %done; 1405 my %done;
1241 while (%todo) { 1406 while (%todo) {
1242 my $progress; 1407 my $progress;
1243 1408
1409 ++$pass;
1410
1411 ext:
1244 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1245 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1246 goto skip 1414 next ext
1247 unless exists $done{$_}; 1415 unless exists $done{$_};
1248 } 1416 }
1249 1417
1250 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1251 1419
1252 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1253 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1254 : "$v->{base}: extension inactive.\n";
1255 1424
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1256 if (exists $v->{meta}{mandatory}) { 1426 if exists $v->{meta}{mandatory};
1257 warn $msg; 1427 } else {
1258 warn "mandatory extension failed to load, exiting.\n"; 1428 $done{$k} = delete $todo{$k};
1259 exit 1; 1429 push @EXTS, $v->{pkg};
1260 } 1430 $progress = 1;
1261 1431
1262 warn $msg; 1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1263 } 1434 }
1264
1265 $done{$k} = delete $todo{$k};
1266 push @EXTS, $v->{pkg};
1267 $progress = 1;
1268 } 1435 }
1269 1436
1270 skip: 1437 unless ($progress) {
1271 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1272 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1273 } 1445 }
1274 }; 1446 };
1275} 1447}
1276 1448
1277############################################################################# 1449#############################################################################
1278 1450
1279=back 1451=back
1280 1452
1281=head2 CORE EXTENSIONS 1453=head2 CORE EXTENSIONS
1282 1454
1283Functions and methods that extend core crossfire objects. 1455Functions and methods that extend core deliantra objects.
1284 1456
1285=cut 1457=cut
1286 1458
1287package cf::player; 1459package cf::player;
1288 1460
1331 1503
1332sub exists($) { 1504sub exists($) {
1333 my ($login) = @_; 1505 my ($login) = @_;
1334 1506
1335 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1336 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1337} 1509}
1338 1510
1339sub find($) { 1511sub find($) {
1340 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1341 my $login = $_[0]; 1513 my $login = $_[0];
1353 my $f = new_from_file cf::object::thawer path $login 1525 my $f = new_from_file cf::object::thawer path $login
1354 or return; 1526 or return;
1355 1527
1356 my $pl = cf::player::load_pl $f 1528 my $pl = cf::player::load_pl $f
1357 or return; 1529 or return;
1530
1358 local $cf::PLAYER_LOADING{$login} = $pl; 1531 local $cf::PLAYER_LOADING{$login} = $pl;
1359 $f->resolve_delayed_derefs; 1532 $f->resolve_delayed_derefs;
1360 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1361 } 1534 }
1362 } 1535 }
1363} 1536}
1364 1537
1538cf::player->attach (
1539 on_load => sub {
1540 my ($pl, $path) = @_;
1541
1542 # restore slots saved in save, below
1543 my $slots = delete $pl->{_slots};
1544
1545 $pl->ob->current_weapon ($slots->[0]);
1546 $pl->combat_ob ($slots->[1]);
1547 $pl->ranged_ob ($slots->[2]);
1548 },
1549);
1550
1365sub save($) { 1551sub save($) {
1366 my ($pl) = @_; 1552 my ($pl) = @_;
1367 1553
1368 return if $pl->{deny_save}; 1554 return if $pl->{deny_save};
1369 1555
1372 1558
1373 return if $pl->{deny_save}; 1559 return if $pl->{deny_save};
1374 1560
1375 aio_mkdir playerdir $pl, 0770; 1561 aio_mkdir playerdir $pl, 0770;
1376 $pl->{last_save} = $cf::RUNTIME; 1562 $pl->{last_save} = $cf::RUNTIME;
1563
1564 cf::get_slot 0.01;
1565
1566 # save slots, to be restored later
1567 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1377 1568
1378 $pl->save_pl ($path); 1569 $pl->save_pl ($path);
1379 cf::cede_to_tick; 1570 cf::cede_to_tick;
1380} 1571}
1381 1572
1413 my ($pl) = @_; 1604 my ($pl) = @_;
1414 1605
1415 my $name = $pl->ob->name; 1606 my $name = $pl->ob->name;
1416 1607
1417 $pl->{deny_save} = 1; 1608 $pl->{deny_save} = 1;
1418 $pl->password ("*"); # this should lock out the player until we nuked the dir 1609 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1419 1610
1420 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1611 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1421 $pl->deactivate; 1612 $pl->deactivate;
1613 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1614 $pl->ob->check_score;
1422 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1615 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1423 $pl->ns->destroy if $pl->ns; 1616 $pl->ns->destroy if $pl->ns;
1424 1617
1425 my $path = playerdir $pl; 1618 my $path = playerdir $pl;
1426 my $temp = "$path~$cf::RUNTIME~deleting~"; 1619 my $temp = "$path~$cf::RUNTIME~deleting~";
1465 1658
1466 for my $login (@$dirs) { 1659 for my $login (@$dirs) {
1467 my $path = path $login; 1660 my $path = path $login;
1468 1661
1469 # a .pst is a dead give-away for a valid player 1662 # a .pst is a dead give-away for a valid player
1470 unless (-e "$path.pst") { 1663 # if no pst file found, open and chekc for blocked users
1664 if (aio_stat "$path.pst") {
1471 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1665 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1472 aio_read $fh, 0, 512, my $buf, 0 or next; 1666 aio_read $fh, 0, 512, my $buf, 0 or next;
1473 $buf !~ /^password -------------$/m or next; # official not-valid tag 1667 $buf !~ /^password -------------$/m or next; # official not-valid tag
1474 } 1668 }
1475 1669
1506 } 1700 }
1507 1701
1508 \@paths 1702 \@paths
1509} 1703}
1510 1704
1511=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1705=item $protocol_xml = $player->expand_cfpod ($cfpod)
1512 1706
1513Expand crossfire pod fragments into protocol xml. 1707Expand deliantra pod fragments into protocol xml.
1514
1515=cut
1516
1517sub expand_cfpod {
1518 ((my $self), (local $_)) = @_;
1519
1520 # escape & and <
1521 s/&/&amp;/g;
1522 s/(?<![BIUGHT])</&lt;/g;
1523
1524 # this is buggy, it needs to properly take care of nested <'s
1525
1526 1 while
1527 # replace B<>, I<>, U<> etc.
1528 s/B<([^\>]*)>/<b>$1<\/b>/
1529 || s/I<([^\>]*)>/<i>$1<\/i>/
1530 || s/U<([^\>]*)>/<u>$1<\/u>/
1531 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1532 # replace G<male|female> tags
1533 || s{G<([^>|]*)\|([^>]*)>}{
1534 $self->gender ? $2 : $1
1535 }ge
1536 # replace H<hint text>
1537 || s{H<([^\>]*)>}
1538 {
1539 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1540 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1541 "")
1542 [$self->{hintmode}]
1543 }ge;
1544
1545 # create single paragraphs (very hackish)
1546 s/(?<=\S)\n(?=\w)/ /g;
1547
1548 # compress some whitespace
1549 s/\s+\n/\n/g; # ws line-ends
1550 s/\n\n+/\n/g; # double lines
1551 s/^\n+//; # beginning lines
1552 s/\n+$//; # ending lines
1553
1554 $_
1555}
1556
1557sub hintmode {
1558 $_[0]{hintmode} = $_[1] if @_ > 1;
1559 $_[0]{hintmode}
1560}
1561 1708
1562=item $player->ext_reply ($msgid, @msg) 1709=item $player->ext_reply ($msgid, @msg)
1563 1710
1564Sends an ext reply to the player. 1711Sends an ext reply to the player.
1565 1712
1632our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1633our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1634 1781
1635sub generate_random_map { 1782sub generate_random_map {
1636 my ($self, $rmp) = @_; 1783 my ($self, $rmp) = @_;
1784
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786
1637 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1638 $self->_create_random_map ( 1788 $self->_create_random_map (
1639 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1640 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1641 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1642 $rmp->{exit_on_final_map}, 1792 $rmp->{exit_on_final_map},
1643 $rmp->{xsize}, $rmp->{ysize}, 1793 $rmp->{xsize}, $rmp->{ysize},
1644 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1645 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1763 1913
1764# the temporary/swap location 1914# the temporary/swap location
1765sub save_path { 1915sub save_path {
1766 my ($self) = @_; 1916 my ($self) = @_;
1767 1917
1768 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1769 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1770} 1920}
1771 1921
1772# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1773sub uniq_path { 1923sub uniq_path {
1774 my ($self) = @_; 1924 my ($self) = @_;
1775 1925
1776 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1777 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1778}
1779
1780# and all this just because we cannot iterate over
1781# all maps in C++...
1782sub change_all_map_light {
1783 my ($change) = @_;
1784
1785 $_->change_map_light ($change)
1786 for grep $_->outdoor, values %cf::MAP;
1787} 1928}
1788 1929
1789sub decay_objects { 1930sub decay_objects {
1790 my ($self) = @_; 1931 my ($self) = @_;
1791 1932
1875sub find { 2016sub find {
1876 my ($path, $origin) = @_; 2017 my ($path, $origin) = @_;
1877 2018
1878 $path = normalise $path, $origin && $origin->path; 2019 $path = normalise $path, $origin && $origin->path;
1879 2020
1880 cf::lock_wait "map_data:$path";#d#remove 2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1881 cf::lock_wait "map_find:$path"; 2022 my $guard2 = cf::lock_acquire "map_find:$path";
1882 2023
1883 $cf::MAP{$path} || do { 2024 $cf::MAP{$path} || do {
1884 my $guard1 = cf::lock_acquire "map_find:$path";
1885 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1886
1887 my $map = new_from_path cf::map $path 2025 my $map = new_from_path cf::map $path
1888 or return; 2026 or return;
1889 2027
1890 $map->{last_save} = $cf::RUNTIME; 2028 $map->{last_save} = $cf::RUNTIME;
1891 2029
1893 or return; 2031 or return;
1894 2032
1895 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2033 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1896 # doing this can freeze the server in a sync job, obviously 2034 # doing this can freeze the server in a sync job, obviously
1897 #$cf::WAIT_FOR_TICK->wait; 2035 #$cf::WAIT_FOR_TICK->wait;
2036 undef $guard2;
1898 undef $guard1; 2037 undef $guard1;
1899 undef $guard2;
1900 $map->reset; 2038 $map->reset;
1901 return find $path; 2039 return find $path;
1902 } 2040 }
1903 2041
1904 $cf::MAP{$path} = $map 2042 $cf::MAP{$path} = $map
1905 } 2043 }
1906} 2044}
1907 2045
1908sub pre_load { } 2046sub pre_load { }
1909sub post_load { } 2047#sub post_load { } # XS
1910 2048
1911sub load { 2049sub load {
1912 my ($self) = @_; 2050 my ($self) = @_;
1913 2051
1914 local $self->{deny_reset} = 1; # loading can take a long time 2052 local $self->{deny_reset} = 1; # loading can take a long time
1931 my $f = new_from_file cf::object::thawer $self->{load_path}; 2069 my $f = new_from_file cf::object::thawer $self->{load_path};
1932 $f->skip_block; 2070 $f->skip_block;
1933 $self->_load_objects ($f) 2071 $self->_load_objects ($f)
1934 or return; 2072 or return;
1935 2073
1936 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2074 $self->post_load_original
1937 if delete $self->{load_original}; 2075 if delete $self->{load_original};
1938 2076
1939 if (my $uniq = $self->uniq_path) { 2077 if (my $uniq = $self->uniq_path) {
1940 utf8::encode $uniq; 2078 utf8::encode $uniq;
1941 unless (aio_stat $uniq) { 2079 unless (aio_stat $uniq) {
1959 unless ($self->{deny_activate}) { 2097 unless ($self->{deny_activate}) {
1960 $self->decay_objects; 2098 $self->decay_objects;
1961 $self->fix_auto_apply; 2099 $self->fix_auto_apply;
1962 $self->update_buttons; 2100 $self->update_buttons;
1963 cf::cede_to_tick; 2101 cf::cede_to_tick;
1964 $self->set_darkness_map;
1965 cf::cede_to_tick;
1966 $self->activate; 2102 $self->activate;
1967 } 2103 }
1968 2104
1969 $self->{last_save} = $cf::RUNTIME; 2105 $self->{last_save} = $cf::RUNTIME;
1970 $self->last_access ($cf::RUNTIME); 2106 $self->last_access ($cf::RUNTIME);
1971 2107
1972 $self->in_memory (cf::MAP_IN_MEMORY); 2108 $self->in_memory (cf::MAP_ACTIVE);
1973 } 2109 }
1974 2110
1975 $self->post_load; 2111 $self->post_load;
1976} 2112}
1977 2113
2114# customize the map for a given player, i.e.
2115# return the _real_ map. used by e.g. per-player
2116# maps to change the path to ~playername/mappath
1978sub customise_for { 2117sub customise_for {
1979 my ($self, $ob) = @_; 2118 my ($self, $ob) = @_;
1980 2119
1981 return find "~" . $ob->name . "/" . $self->{path} 2120 return find "~" . $ob->name . "/" . $self->{path}
1982 if $self->per_player; 2121 if $self->per_player;
2035 my ($path, $origin, $load) = @_; 2174 my ($path, $origin, $load) = @_;
2036 2175
2037 $path = normalise $path, $origin && $origin->{path}; 2176 $path = normalise $path, $origin && $origin->{path};
2038 2177
2039 if (my $map = $cf::MAP{$path}) { 2178 if (my $map = $cf::MAP{$path}) {
2040 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2179 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2041 } 2180 }
2042 2181
2043 $MAP_PREFETCH{$path} |= $load; 2182 $MAP_PREFETCH{$path} |= $load;
2044 2183
2045 $MAP_PREFETCHER ||= cf::async { 2184 $MAP_PREFETCHER ||= cf::async {
2082 cf::async { 2221 cf::async {
2083 $Coro::current->{desc} = "map player save"; 2222 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2223 $_->contr->save for $self->players;
2085 }; 2224 };
2086 2225
2226 cf::get_slot 0.02;
2227
2087 if ($uniq) { 2228 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2229 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2089 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2230 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2090 } else { 2231 } else {
2091 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2099 $self->save; 2240 $self->save;
2100 2241
2101 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2102 2243
2103 return if $self->players; 2244 return if $self->players;
2104 return if $self->in_memory != cf::MAP_IN_MEMORY; 2245 return if $self->in_memory != cf::MAP_ACTIVE;
2105 return if $self->{deny_save}; 2246 return if $self->{deny_save};
2106 2247
2107 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2108 2249
2109 $self->deactivate; 2250 $self->deactivate;
2134 2275
2135 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2136 2277
2137 return if $self->players; 2278 return if $self->players;
2138 2279
2139 warn "resetting map ", $self->path; 2280 warn "resetting map ", $self->path, "\n";
2140 2281
2141 $self->in_memory (cf::MAP_SWAPPED); 2282 $self->in_memory (cf::MAP_SWAPPED);
2142 2283
2143 # need to save uniques path 2284 # need to save uniques path
2144 unless ($self->{deny_save}) { 2285 unless ($self->{deny_save}) {
2227 2368
2228sub unique_maps() { 2369sub unique_maps() {
2229 [ 2370 [
2230 map { 2371 map {
2231 utf8::decode $_; 2372 utf8::decode $_;
2232 /\.map$/ 2373 s/\.map$//; # TODO future compatibility hack
2374 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2375 ? ()
2233 ? normalise $_ 2376 : normalise $_
2234 : ()
2235 } @{ aio_readdir $UNIQUEDIR or [] } 2377 } @{ aio_readdir $UNIQUEDIR or [] }
2236 ] 2378 ]
2237} 2379}
2238 2380
2239package cf; 2381=item cf::map::static_maps
2382
2383Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2384file in the shared directory excluding F</styles> and F</editor>). May
2385block.
2386
2387=cut
2388
2389sub static_maps() {
2390 my @dirs = "";
2391 my @maps;
2392
2393 while (@dirs) {
2394 my $dir = shift @dirs;
2395
2396 next if $dir eq "/styles" || $dir eq "/editor";
2397
2398 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2399 or return;
2400
2401 for (@$files) {
2402 s/\.map$// or next;
2403 utf8::decode $_;
2404 push @maps, "$dir/$_";
2405 }
2406
2407 push @dirs, map "$dir/$_", @$dirs;
2408 }
2409
2410 \@maps
2411}
2240 2412
2241=back 2413=back
2242 2414
2243=head3 cf::object 2415=head3 cf::object
2244 2416
2248 2420
2249=over 4 2421=over 4
2250 2422
2251=item $ob->inv_recursive 2423=item $ob->inv_recursive
2252 2424
2253Returns the inventory of the object _and_ their inventories, recursively. 2425Returns the inventory of the object I<and> their inventories, recursively,
2426but I<not> the object itself.
2254 2427
2255=cut 2428=cut
2256 2429
2257sub inv_recursive_; 2430sub inv_recursive_;
2258sub inv_recursive_ { 2431sub inv_recursive_ {
2263 inv_recursive_ inv $_[0] 2436 inv_recursive_ inv $_[0]
2264} 2437}
2265 2438
2266=item $ref = $ob->ref 2439=item $ref = $ob->ref
2267 2440
2268creates and returns a persistent reference to an objetc that can be stored as a string. 2441Creates and returns a persistent reference to an object that can be stored as a string.
2269 2442
2270=item $ob = cf::object::deref ($refstring) 2443=item $ob = cf::object::deref ($refstring)
2271 2444
2272returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2445returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2273even if the object actually exists. May block. 2446even if the object actually exists. May block.
2305can be C<undef>. Does the right thing when the player is currently in a 2478can be C<undef>. Does the right thing when the player is currently in a
2306dialogue with the given NPC character. 2479dialogue with the given NPC character.
2307 2480
2308=cut 2481=cut
2309 2482
2483our $SAY_CHANNEL = {
2484 id => "say",
2485 title => "Map",
2486 reply => "say ",
2487 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2488};
2489
2490our $CHAT_CHANNEL = {
2491 id => "chat",
2492 title => "Chat",
2493 reply => "chat ",
2494 tooltip => "Player chat and shouts, global to the server.",
2495};
2496
2310# rough implementation of a future "reply" method that works 2497# rough implementation of a future "reply" method that works
2311# with dialog boxes. 2498# with dialog boxes.
2312#TODO: the first argument must go, split into a $npc->reply_to ( method 2499#TODO: the first argument must go, split into a $npc->reply_to ( method
2313sub cf::object::player::reply($$$;$) { 2500sub cf::object::player::reply($$$;$) {
2314 my ($self, $npc, $msg, $flags) = @_; 2501 my ($self, $npc, $msg, $flags) = @_;
2325 my $dialog = $pl->{npc_dialog}; 2512 my $dialog = $pl->{npc_dialog};
2326 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2513 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2327 2514
2328 } else { 2515 } else {
2329 $msg = $npc->name . " says: $msg" if $npc; 2516 $msg = $npc->name . " says: $msg" if $npc;
2330 $self->message ($msg, $flags); 2517 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2331 } 2518 }
2332 } 2519 }
2333} 2520}
2334 2521
2335=item $object->send_msg ($channel, $msg, $color, [extra...]) 2522=item $object->send_msg ($channel, $msg, $color, [extra...])
2360 2547
2361=item $player_object->enter_link 2548=item $player_object->enter_link
2362 2549
2363Freezes the player and moves him/her to a special map (C<{link}>). 2550Freezes the player and moves him/her to a special map (C<{link}>).
2364 2551
2365The player should be reasonably safe there for short amounts of time. You 2552The player should be reasonably safe there for short amounts of time (e.g.
2366I<MUST> call C<leave_link> as soon as possible, though. 2553for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2554though, as the palyer cannot control the character while it is on the link
2555map.
2367 2556
2368Will never block. 2557Will never block.
2369 2558
2370=item $player_object->leave_link ($map, $x, $y) 2559=item $player_object->leave_link ($map, $x, $y)
2371 2560
2423 ($x, $y) = (-1, -1) 2612 ($x, $y) = (-1, -1)
2424 unless (defined $x) && (defined $y); 2613 unless (defined $x) && (defined $y);
2425 2614
2426 # use -1 or undef as default coordinates, not 0, 0 2615 # use -1 or undef as default coordinates, not 0, 0
2427 ($x, $y) = ($map->enter_x, $map->enter_y) 2616 ($x, $y) = ($map->enter_x, $map->enter_y)
2428 if $x <=0 && $y <= 0; 2617 if $x <= 0 && $y <= 0;
2429 2618
2430 $map->load; 2619 $map->load;
2431 $map->load_neighbours; 2620 $map->load_neighbours;
2432 2621
2433 return unless $self->contr->active; 2622 return unless $self->contr->active;
2434 $self->activate_recursive;
2435 2623
2436 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2437 $self->enter_map ($map, $x, $y); 2625 $self->enter_map ($map, $x, $y);
2626
2627 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive;
2438} 2629}
2439 2630
2440=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2441 2632
2442Moves the player to the given map-path and coordinates by first freezing 2633Moves the player to the given map-path and coordinates by first freezing
2443her, loading and preparing them map, calling the provided $check callback 2634her, loading and preparing them map, calling the provided $check callback
2444that has to return the map if sucecssful, and then unfreezes the player on 2635that has to return the map if sucecssful, and then unfreezes the player on
2445the new (success) or old (failed) map position. In either case, $done will 2636the new (success) or old (failed) map position. In either case, $done will
2446be called at the end of this process. 2637be called at the end of this process.
2638
2639Note that $check will be called with a potentially non-loaded map, so if
2640it needs a loaded map it has to call C<< ->load >>.
2447 2641
2448=cut 2642=cut
2449 2643
2450our $GOTOGEN; 2644our $GOTOGEN;
2451 2645
2530} 2724}
2531 2725
2532sub prepare_random_map { 2726sub prepare_random_map {
2533 my ($exit) = @_; 2727 my ($exit) = @_;
2534 2728
2535 my $guard = cf::lock_acquire "exit_prepare:$exit";
2536
2537 # all this does is basically replace the /! path by 2729 # all this does is basically replace the /! path by
2538 # a new random map path (?random/...) with a seed 2730 # a new random map path (?random/...) with a seed
2539 # that depends on the exit object 2731 # that depends on the exit object
2540 2732
2541 my $rmp = parse_random_map_params $exit->msg; 2733 my $rmp = parse_random_map_params $exit->msg;
2543 if ($exit->map) { 2735 if ($exit->map) {
2544 $rmp->{region} = $exit->region->name; 2736 $rmp->{region} = $exit->region->name;
2545 $rmp->{origin_map} = $exit->map->path; 2737 $rmp->{origin_map} = $exit->map->path;
2546 $rmp->{origin_x} = $exit->x; 2738 $rmp->{origin_x} = $exit->x;
2547 $rmp->{origin_y} = $exit->y; 2739 $rmp->{origin_y} = $exit->y;
2740
2741 $exit->map->touch;
2548 } 2742 }
2549 2743
2550 $rmp->{random_seed} ||= $exit->random_seed; 2744 $rmp->{random_seed} ||= $exit->random_seed;
2551 2745
2552 my $data = cf::to_json $rmp; 2746 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2553 my $md5 = Digest::MD5::md5_hex $data; 2747 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta"; 2748 my $meta = "$RANDOMDIR/$md5.meta";
2555 2749
2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2750 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557 aio_write $fh, 0, (length $data), $data, 0; 2751 aio_write $fh, 0, (length $data), $data, 0;
2558 undef $fh; 2752 undef $fh;
2559 aio_rename "$meta~", $meta; 2753 aio_rename "$meta~", $meta;
2560 2754
2755 my $slaying = "?random/$md5";
2756
2757 if ($exit->valid) {
2561 $exit->slaying ("?random/$md5"); 2758 $exit->slaying ("?random/$md5");
2562 $exit->msg (undef); 2759 $exit->msg (undef);
2760 }
2563 } 2761 }
2564} 2762}
2565 2763
2566sub cf::object::player::enter_exit { 2764sub cf::object::player::enter_exit {
2567 my ($self, $exit) = @_; 2765 my ($self, $exit) = @_;
2568 2766
2569 return unless $self->type == cf::PLAYER; 2767 return unless $self->type == cf::PLAYER;
2570 2768
2571 if ($exit->slaying eq "/!") {
2572 #TODO: this should de-fi-ni-te-ly not be a sync-job
2573 # the problem is that $exit might not survive long enough
2574 # so it needs to be done right now, right here
2575 cf::sync_job { prepare_random_map $exit };
2576 }
2577
2578 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2579 my $hp = $exit->stats->hp;
2580 my $sp = $exit->stats->sp;
2581
2582 $self->enter_link; 2769 $self->enter_link;
2583 2770
2584 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED);
2587
2588 (async { 2771 (async {
2589 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2772 $Coro::current->{desc} = "enter_exit";
2590 2773
2591 $self->deactivate_recursive; # just to be sure
2592 unless (eval { 2774 unless (eval {
2775 $self->deactivate_recursive; # just to be sure
2776
2777 # random map handling
2778 {
2779 my $guard = cf::lock_acquire "exit_prepare:$exit";
2780
2781 prepare_random_map $exit
2782 if $exit->slaying eq "/!";
2783 }
2784
2785 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2786 my $x = $exit->stats->hp;
2787 my $y = $exit->stats->sp;
2788
2593 $self->goto ($slaying, $hp, $sp); 2789 $self->goto ($map, $x, $y);
2594 2790
2791 # if exit is damned, update players death & WoR home-position
2792 $self->contr->savebed ($map, $x, $y)
2793 if $exit->flag (cf::FLAG_DAMNED);
2794
2595 1; 2795 1
2596 }) { 2796 }) {
2597 $self->message ("Something went wrong deep within the crossfire server. " 2797 $self->message ("Something went wrong deep within the deliantra server. "
2598 . "I'll try to bring you back to the map you were before. " 2798 . "I'll try to bring you back to the map you were before. "
2599 . "Please report this to the dungeon master!", 2799 . "Please report this to the dungeon master!",
2600 cf::NDI_UNIQUE | cf::NDI_RED); 2800 cf::NDI_UNIQUE | cf::NDI_RED);
2601 2801
2602 warn "ERROR in enter_exit: $@"; 2802 warn "ERROR in enter_exit: $@";
2619sub cf::client::send_drawinfo { 2819sub cf::client::send_drawinfo {
2620 my ($self, $text, $flags) = @_; 2820 my ($self, $text, $flags) = @_;
2621 2821
2622 utf8::encode $text; 2822 utf8::encode $text;
2623 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2823 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2824}
2825
2826=item $client->send_big_packet ($pkt)
2827
2828Like C<send_packet>, but tries to compress large packets, and fragments
2829them as required.
2830
2831=cut
2832
2833our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2834
2835sub cf::client::send_big_packet {
2836 my ($self, $pkt) = @_;
2837
2838 # try lzf for large packets
2839 $pkt = "lzf " . Compress::LZF::compress $pkt
2840 if 1024 <= length $pkt and $self->{can_lzf};
2841
2842 # split very large packets
2843 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2844 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2845 $pkt = "frag";
2846 }
2847
2848 $self->send_packet ($pkt);
2624} 2849}
2625 2850
2626=item $client->send_msg ($channel, $msg, $color, [extra...]) 2851=item $client->send_msg ($channel, $msg, $color, [extra...])
2627 2852
2628Send a drawinfo or msg packet to the client, formatting the msg for the 2853Send a drawinfo or msg packet to the client, formatting the msg for the
2630the message, with C<log> being the default. If C<$color> is negative, suppress 2855the message, with C<log> being the default. If C<$color> is negative, suppress
2631the message unless the client supports the msg packet. 2856the message unless the client supports the msg packet.
2632 2857
2633=cut 2858=cut
2634 2859
2860# non-persistent channels (usually the info channel)
2635our %CHANNEL = ( 2861our %CHANNEL = (
2862 "c/motd" => {
2863 id => "infobox",
2864 title => "MOTD",
2865 reply => undef,
2866 tooltip => "The message of the day",
2867 },
2636 "c/identify" => { 2868 "c/identify" => {
2637 id => "infobox", 2869 id => "infobox",
2638 title => "Identify", 2870 title => "Identify",
2639 reply => undef, 2871 reply => undef,
2640 tooltip => "Items recently identified", 2872 tooltip => "Items recently identified",
2643 id => "infobox", 2875 id => "infobox",
2644 title => "Examine", 2876 title => "Examine",
2645 reply => undef, 2877 reply => undef,
2646 tooltip => "Signs and other items you examined", 2878 tooltip => "Signs and other items you examined",
2647 }, 2879 },
2880 "c/shopinfo" => {
2881 id => "infobox",
2882 title => "Shop Info",
2883 reply => undef,
2884 tooltip => "What your bargaining skill tells you about the shop",
2885 },
2886 "c/book" => {
2887 id => "infobox",
2888 title => "Book",
2889 reply => undef,
2890 tooltip => "The contents of a note or book",
2891 },
2648 "c/lookat" => { 2892 "c/lookat" => {
2649 id => "infobox", 2893 id => "infobox",
2650 title => "Look", 2894 title => "Look",
2651 reply => undef, 2895 reply => undef,
2652 tooltip => "What you saw there", 2896 tooltip => "What you saw there",
2653 }, 2897 },
2898 "c/who" => {
2899 id => "infobox",
2900 title => "Players",
2901 reply => undef,
2902 tooltip => "Shows players who are currently online",
2903 },
2904 "c/body" => {
2905 id => "infobox",
2906 title => "Body Parts",
2907 reply => undef,
2908 tooltip => "Shows which body parts you posess and are available",
2909 },
2910 "c/statistics" => {
2911 id => "infobox",
2912 title => "Statistics",
2913 reply => undef,
2914 tooltip => "Shows your primary statistics",
2915 },
2916 "c/skills" => {
2917 id => "infobox",
2918 title => "Skills",
2919 reply => undef,
2920 tooltip => "Shows your experience per skill and item power",
2921 },
2922 "c/shopitems" => {
2923 id => "infobox",
2924 title => "Shop Items",
2925 reply => undef,
2926 tooltip => "Shows the items currently for sale in this shop",
2927 },
2928 "c/resistances" => {
2929 id => "infobox",
2930 title => "Resistances",
2931 reply => undef,
2932 tooltip => "Shows your resistances",
2933 },
2934 "c/pets" => {
2935 id => "infobox",
2936 title => "Pets",
2937 reply => undef,
2938 tooltip => "Shows information abotu your pets/a specific pet",
2939 },
2940 "c/perceiveself" => {
2941 id => "infobox",
2942 title => "Perceive Self",
2943 reply => undef,
2944 tooltip => "You gained detailed knowledge about yourself",
2945 },
2946 "c/uptime" => {
2947 id => "infobox",
2948 title => "Uptime",
2949 reply => undef,
2950 tooltip => "How long the server has been running since last restart",
2951 },
2952 "c/mapinfo" => {
2953 id => "infobox",
2954 title => "Map Info",
2955 reply => undef,
2956 tooltip => "Information related to the maps",
2957 },
2958 "c/party" => {
2959 id => "party",
2960 title => "Party",
2961 reply => "gsay ",
2962 tooltip => "Messages and chat related to your party",
2963 },
2964 "c/death" => {
2965 id => "death",
2966 title => "Death",
2967 reply => undef,
2968 tooltip => "Reason for and more info about your most recent death",
2969 },
2970 "c/say" => $SAY_CHANNEL,
2971 "c/chat" => $CHAT_CHANNEL,
2654); 2972);
2655 2973
2656sub cf::client::send_msg { 2974sub cf::client::send_msg {
2657 my ($self, $channel, $msg, $color, @extra) = @_; 2975 my ($self, $channel, $msg, $color, @extra) = @_;
2658 2976
2659 $msg = $self->pl->expand_cfpod ($msg); 2977 $msg = $self->pl->expand_cfpod ($msg)
2978 unless $color & cf::NDI_VERBATIM;
2660 2979
2661 $color &= cf::NDI_CLIENT_MASK; # just in case... 2980 $color &= cf::NDI_CLIENT_MASK; # just in case...
2662 2981
2663 # check predefined channels, for the benefit of C 2982 # check predefined channels, for the benefit of C
2664 if ($CHANNEL{$channel}) { 2983 if ($CHANNEL{$channel}) {
2665 $channel = $CHANNEL{$channel}; 2984 $channel = $CHANNEL{$channel};
2666 2985
2667 $self->ext_msg (channel_info => $channel) 2986 $self->ext_msg (channel_info => $channel);
2668 if $self->can_msg;
2669
2670 $channel = $channel->{id}; 2987 $channel = $channel->{id};
2671 2988
2672 } elsif (ref $channel) { 2989 } elsif (ref $channel) {
2673 # send meta info to client, if not yet sent 2990 # send meta info to client, if not yet sent
2674 unless (exists $self->{channel}{$channel->{id}}) { 2991 unless (exists $self->{channel}{$channel->{id}}) {
2675 $self->{channel}{$channel->{id}} = $channel; 2992 $self->{channel}{$channel->{id}} = $channel;
2676 $self->ext_msg (channel_info => $channel) 2993 $self->ext_msg (channel_info => $channel);
2677 if $self->can_msg;
2678 } 2994 }
2679 2995
2680 $channel = $channel->{id}; 2996 $channel = $channel->{id};
2681 } 2997 }
2682 2998
2683 return unless @extra || length $msg; 2999 return unless @extra || length $msg;
2684 3000
2685 if ($self->can_msg) {
2686 # default colour, mask it out 3001 # default colour, mask it out
2687 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3002 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2688 if $color & cf::NDI_DEF; 3003 if $color & cf::NDI_DEF;
2689 3004
2690 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3005 my $pkt = "msg "
3006 . $self->{json_coder}->encode (
2691 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3007 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2692 } else { 3008 );
2693 if ($color >= 0) {
2694 # replace some tags by gcfclient-compatible ones
2695 for ($msg) {
2696 1 while
2697 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2698 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2699 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2700 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2701 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2702 }
2703 3009
2704 $color &= cf::NDI_COLOR_MASK; 3010 $self->send_big_packet ($pkt);
2705
2706 utf8::encode $msg;
2707
2708 if (0 && $msg =~ /\[/) {
2709 # COMMAND/INFO
2710 $self->send_packet ("drawextinfo $color 10 8 $msg")
2711 } else {
2712 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2713 $self->send_packet ("drawinfo $color $msg")
2714 }
2715 }
2716 }
2717} 3011}
2718 3012
2719=item $client->ext_msg ($type, @msg) 3013=item $client->ext_msg ($type, @msg)
2720 3014
2721Sends an ext event to the client. 3015Sends an ext event to the client.
2724 3018
2725sub cf::client::ext_msg($$@) { 3019sub cf::client::ext_msg($$@) {
2726 my ($self, $type, @msg) = @_; 3020 my ($self, $type, @msg) = @_;
2727 3021
2728 if ($self->extcmd == 2) { 3022 if ($self->extcmd == 2) {
2729 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3023 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2730 } elsif ($self->extcmd == 1) { # TODO: remove 3024 } elsif ($self->extcmd == 1) { # TODO: remove
2731 push @msg, msgtype => "event_$type"; 3025 push @msg, msgtype => "event_$type";
2732 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2733 } 3027 }
2734} 3028}
2735 3029
2736=item $client->ext_reply ($msgid, @msg) 3030=item $client->ext_reply ($msgid, @msg)
2737 3031
2741 3035
2742sub cf::client::ext_reply($$@) { 3036sub cf::client::ext_reply($$@) {
2743 my ($self, $id, @msg) = @_; 3037 my ($self, $id, @msg) = @_;
2744 3038
2745 if ($self->extcmd == 2) { 3039 if ($self->extcmd == 2) {
2746 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2747 } elsif ($self->extcmd == 1) { 3041 } elsif ($self->extcmd == 1) {
2748 #TODO: version 1, remove 3042 #TODO: version 1, remove
2749 unshift @msg, msgtype => "reply", msgid => $id; 3043 unshift @msg, msgtype => "reply", msgid => $id;
2750 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3044 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2751 } 3045 }
2752} 3046}
2753 3047
2754=item $success = $client->query ($flags, "text", \&cb) 3048=item $success = $client->query ($flags, "text", \&cb)
2755 3049
2856 3150
2857 $coro 3151 $coro
2858} 3152}
2859 3153
2860cf::client->attach ( 3154cf::client->attach (
2861 on_destroy => sub { 3155 on_client_destroy => sub {
2862 my ($ns) = @_; 3156 my ($ns) = @_;
2863 3157
2864 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3158 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2865 }, 3159 },
2866); 3160);
2882our $safe_hole = new Safe::Hole; 3176our $safe_hole = new Safe::Hole;
2883 3177
2884$SIG{FPE} = 'IGNORE'; 3178$SIG{FPE} = 'IGNORE';
2885 3179
2886$safe->permit_only (Opcode::opset qw( 3180$safe->permit_only (Opcode::opset qw(
2887 :base_core :base_mem :base_orig :base_math 3181 :base_core :base_mem :base_orig :base_math :base_loop
2888 grepstart grepwhile mapstart mapwhile 3182 grepstart grepwhile mapstart mapwhile
2889 sort time 3183 sort time
2890)); 3184));
2891 3185
2892# here we export the classes and methods available to script code 3186# here we export the classes and methods available to script code
2894=pod 3188=pod
2895 3189
2896The following functions and methods are available within a safe environment: 3190The following functions and methods are available within a safe environment:
2897 3191
2898 cf::object 3192 cf::object
2899 contr pay_amount pay_player map x y force_find force_add 3193 contr pay_amount pay_player map x y force_find force_add destroy
2900 insert remove name archname title slaying race decrease_ob_nr 3194 insert remove name archname title slaying race decrease split
3195 value
2901 3196
2902 cf::object::player 3197 cf::object::player
2903 player 3198 player
2904 3199
2905 cf::player 3200 cf::player
2910 3205
2911=cut 3206=cut
2912 3207
2913for ( 3208for (
2914 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3209 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2915 insert remove inv name archname title slaying race 3210 insert remove inv nrof name archname title slaying race
2916 decrease_ob_nr)], 3211 decrease split destroy change_exp value msg lore send_msg)],
2917 ["cf::object::player" => qw(player)], 3212 ["cf::object::player" => qw(player)],
2918 ["cf::player" => qw(peaceful)], 3213 ["cf::player" => qw(peaceful send_msg)],
2919 ["cf::map" => qw(trigger)], 3214 ["cf::map" => qw(trigger)],
2920) { 3215) {
2921 no strict 'refs'; 3216 no strict 'refs';
2922 my ($pkg, @funs) = @$_; 3217 my ($pkg, @funs) = @$_;
2923 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2941 3236
2942 my $qcode = $code; 3237 my $qcode = $code;
2943 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3238 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2944 $qcode =~ s/\n/\\n/g; 3239 $qcode =~ s/\n/\\n/g;
2945 3240
3241 %vars = (_dummy => 0) unless %vars;
3242
3243 my @res;
2946 local $_; 3244 local $_;
2947 local @safe::cf::_safe_eval_args = values %vars;
2948 3245
2949 my $eval = 3246 my $eval =
2950 "do {\n" 3247 "do {\n"
2951 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3248 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2952 . "#line 0 \"{$qcode}\"\n" 3249 . "#line 0 \"{$qcode}\"\n"
2953 . $code 3250 . $code
2954 . "\n}" 3251 . "\n}"
2955 ; 3252 ;
2956 3253
3254 if ($CFG{safe_eval}) {
2957 sub_generation_inc; 3255 sub_generation_inc;
3256 local @safe::cf::_safe_eval_args = values %vars;
2958 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3257 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2959 sub_generation_inc; 3258 sub_generation_inc;
3259 } else {
3260 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval;
3262 }
2960 3263
2961 if ($@) { 3264 if ($@) {
2962 warn "$@"; 3265 warn "$@";
2963 warn "while executing safe code '$code'\n"; 3266 warn "while executing safe code '$code'\n";
2964 warn "with arguments " . (join " ", %vars) . "\n"; 3267 warn "with arguments " . (join " ", %vars) . "\n";
2983=cut 3286=cut
2984 3287
2985sub register_script_function { 3288sub register_script_function {
2986 my ($fun, $cb) = @_; 3289 my ($fun, $cb) = @_;
2987 3290
2988 no strict 'refs'; 3291 $fun = "safe::$fun" if $CFG{safe_eval};
2989 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3292 *$fun = $safe_hole->wrap ($cb);
2990} 3293}
2991 3294
2992=back 3295=back
2993 3296
2994=cut 3297=cut
3015 3318
3016 $facedata->{version} == 2 3319 $facedata->{version} == 2
3017 or cf::cleanup "$path: version mismatch, cannot proceed."; 3320 or cf::cleanup "$path: version mismatch, cannot proceed.";
3018 3321
3019 # patch in the exptable 3322 # patch in the exptable
3323 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3020 $facedata->{resource}{"res/exp_table"} = { 3324 $facedata->{resource}{"res/exp_table"} = {
3021 type => FT_RSRC, 3325 type => FT_RSRC,
3022 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3326 data => $exp_table,
3327 hash => (Digest::MD5::md5 $exp_table),
3023 }; 3328 };
3024 cf::cede_to_tick; 3329 cf::cede_to_tick;
3025 3330
3026 { 3331 {
3027 my $faces = $facedata->{faceinfo}; 3332 my $faces = $facedata->{faceinfo};
3028 3333
3029 while (my ($face, $info) = each %$faces) { 3334 while (my ($face, $info) = each %$faces) {
3030 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3335 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3336
3031 cf::face::set_visibility $idx, $info->{visibility}; 3337 cf::face::set_visibility $idx, $info->{visibility};
3032 cf::face::set_magicmap $idx, $info->{magicmap}; 3338 cf::face::set_magicmap $idx, $info->{magicmap};
3033 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3034 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3035 3341
3036 cf::cede_to_tick; 3342 cf::cede_to_tick;
3037 } 3343 }
3038 3344
3039 while (my ($face, $info) = each %$faces) { 3345 while (my ($face, $info) = each %$faces) {
3040 next unless $info->{smooth}; 3346 next unless $info->{smooth};
3347
3041 my $idx = cf::face::find $face 3348 my $idx = cf::face::find $face
3042 or next; 3349 or next;
3350
3043 if (my $smooth = cf::face::find $info->{smooth}) { 3351 if (my $smooth = cf::face::find $info->{smooth}) {
3044 cf::face::set_smooth $idx, $smooth; 3352 cf::face::set_smooth $idx, $smooth;
3045 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3353 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3046 } else { 3354 } else {
3047 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3355 warn "smooth face '$info->{smooth}' not found for face '$face'";
3061 3369
3062 cf::anim::invalidate_all; # d'oh 3370 cf::anim::invalidate_all; # d'oh
3063 } 3371 }
3064 3372
3065 { 3373 {
3066 # TODO: for gcfclient pleasure, we should give resources
3067 # that gcfclient doesn't grok a >10000 face index.
3068 my $res = $facedata->{resource}; 3374 my $res = $facedata->{resource};
3069 3375
3070 my $soundconf = delete $res->{"res/sound.conf"};
3071
3072 while (my ($name, $info) = each %$res) { 3376 while (my ($name, $info) = each %$res) {
3377 if (defined $info->{type}) {
3073 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3378 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3074 my $data;
3075 3379
3076 if ($info->{type} & 1) { 3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3077 # prepend meta info 3381 cf::face::set_type $idx, $info->{type};
3078
3079 my $meta = $enc->encode ({
3080 name => $name,
3081 %{ $info->{meta} || {} },
3082 });
3083
3084 $data = pack "(w/a*)*", $meta, $info->{data};
3085 } else { 3382 } else {
3086 $data = $info->{data}; 3383 $RESOURCE{$name} = $info;
3087 } 3384 }
3088 3385
3089 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3090 cf::face::set_type $idx, $info->{type};
3091
3092 cf::cede_to_tick; 3386 cf::cede_to_tick;
3093 } 3387 }
3094
3095 if ($soundconf) {
3096 $soundconf = $enc->decode (delete $soundconf->{data});
3097
3098 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3099 my $sound = $soundconf->{compat}[$_]
3100 or next;
3101
3102 my $face = cf::face::find "sound/$sound->[1]";
3103 cf::sound::set $sound->[0] => $face;
3104 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3105 }
3106
3107 while (my ($k, $v) = each %{$soundconf->{event}}) {
3108 my $face = cf::face::find "sound/$v";
3109 cf::sound::set $k => $face;
3110 }
3111 }
3112 } 3388 }
3389
3390 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3113 3391
3114 1 3392 1
3115} 3393}
3394
3395cf::global->attach (on_resource_update => sub {
3396 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3397 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3398
3399 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3400 my $sound = $soundconf->{compat}[$_]
3401 or next;
3402
3403 my $face = cf::face::find "sound/$sound->[1]";
3404 cf::sound::set $sound->[0] => $face;
3405 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3406 }
3407
3408 while (my ($k, $v) = each %{$soundconf->{event}}) {
3409 my $face = cf::face::find "sound/$v";
3410 cf::sound::set $k => $face;
3411 }
3412 }
3413});
3116 3414
3117register_exticmd fx_want => sub { 3415register_exticmd fx_want => sub {
3118 my ($ns, $want) = @_; 3416 my ($ns, $want) = @_;
3119 3417
3120 while (my ($k, $v) = each %$want) { 3418 while (my ($k, $v) = each %$want) {
3121 $ns->fx_want ($k, $v); 3419 $ns->fx_want ($k, $v);
3122 } 3420 }
3123}; 3421};
3422
3423sub load_resource_file($) {
3424 my $guard = lock_acquire "load_resource_file";
3425
3426 my $status = load_resource_file_ $_[0];
3427 get_slot 0.1, 100;
3428 cf::arch::commit_load;
3429
3430 $status
3431}
3124 3432
3125sub reload_regions { 3433sub reload_regions {
3126 # HACK to clear player env face cache, we need some signal framework 3434 # HACK to clear player env face cache, we need some signal framework
3127 # for this (global event?) 3435 # for this (global event?)
3128 %ext::player_env::MUSIC_FACE_CACHE = (); 3436 %ext::player_env::MUSIC_FACE_CACHE = ();
3142} 3450}
3143 3451
3144sub reload_archetypes { 3452sub reload_archetypes {
3145 load_resource_file "$DATADIR/archetypes" 3453 load_resource_file "$DATADIR/archetypes"
3146 or die "unable to load archetypes\n"; 3454 or die "unable to load archetypes\n";
3147 #d# NEED to laod twice to resolve forward references
3148 # this really needs to be done in an extra post-pass
3149 # (which needs to be synchronous, so solve it differently)
3150 load_resource_file "$DATADIR/archetypes"
3151 or die "unable to load archetypes\n";
3152} 3455}
3153 3456
3154sub reload_treasures { 3457sub reload_treasures {
3155 load_resource_file "$DATADIR/treasures" 3458 load_resource_file "$DATADIR/treasures"
3156 or die "unable to load treasurelists\n"; 3459 or die "unable to load treasurelists\n";
3157} 3460}
3158 3461
3159sub reload_resources { 3462sub reload_resources {
3160 warn "reloading resource files...\n"; 3463 warn "reloading resource files...\n";
3161 3464
3465 reload_facedata;
3466 reload_archetypes;
3162 reload_regions; 3467 reload_regions;
3163 reload_facedata;
3164 #reload_archetypes;#d#
3165 reload_archetypes;
3166 reload_treasures; 3468 reload_treasures;
3167 3469
3168 warn "finished reloading resource files\n"; 3470 warn "finished reloading resource files\n";
3169} 3471}
3170 3472
3171sub init {
3172 reload_resources;
3173}
3174
3175sub reload_config { 3473sub reload_config {
3474 warn "reloading config file...\n";
3475
3176 open my $fh, "<:utf8", "$CONFDIR/config" 3476 open my $fh, "<:utf8", "$CONFDIR/config"
3177 or return; 3477 or return;
3178 3478
3179 local $/; 3479 local $/;
3180 *CFG = YAML::Syck::Load <$fh>; 3480 *CFG = YAML::XS::Load scalar <$fh>;
3181 3481
3182 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3183 3483
3184 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3185 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3485 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3189 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3190 and die "WARNING: m(un)lockall failed: $!\n"; 3490 and die "WARNING: m(un)lockall failed: $!\n";
3191 }; 3491 };
3192 warn $@ if $@; 3492 warn $@ if $@;
3193 } 3493 }
3494
3495 warn "finished reloading resource files\n";
3496}
3497
3498sub pidfile() {
3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3500 or die "$PIDFILE: $!";
3501 flock $fh, &Fcntl::LOCK_EX
3502 or die "$PIDFILE: flock: $!";
3503 $fh
3504}
3505
3506# make sure only one server instance is running at any one time
3507sub atomic {
3508 my $fh = pidfile;
3509
3510 my $pid = <$fh>;
3511 kill 9, $pid if $pid > 0;
3512
3513 seek $fh, 0, 0;
3514 print $fh $$;
3515}
3516
3517sub main_loop {
3518 warn "EV::loop starting\n";
3519 if (1) {
3520 EV::loop;
3521 }
3522 warn "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP;
3194} 3524}
3195 3525
3196sub main { 3526sub main {
3527 cf::init_globals; # initialise logging
3528
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533
3534 cf::init_experience;
3535 cf::init_anim;
3536 cf::init_attackmess;
3537 cf::init_dynamic;
3538
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540
3197 # we must not ever block the main coroutine 3541 # we must not ever block the main coroutine
3198 local $Coro::idle = sub { 3542 local $Coro::idle = sub {
3199 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3543 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3200 (async { 3544 (async {
3201 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3545 $Coro::current->{desc} = "IDLE BUG HANDLER";
3202 Event::one_event; 3546 EV::loop EV::LOOP_ONESHOT;
3203 })->prio (Coro::PRIO_MAX); 3547 })->prio (Coro::PRIO_MAX);
3204 }; 3548 };
3205 3549
3550 evthread_start IO::AIO::poll_fileno;
3551
3552 cf::sync_job {
3553 cf::load_settings;
3554 cf::load_materials;
3555
3556 reload_resources;
3206 reload_config; 3557 reload_config;
3207 db_init; 3558 db_init;
3559
3560 cf::init_uuid;
3561 cf::init_signals;
3562 cf::init_skills;
3563
3564 cf::init_beforeplay;
3565
3566 atomic;
3567
3208 load_extensions; 3568 load_extensions;
3209 3569
3210 $TICK_WATCHER->start; 3570 utime time, time, $RUNTIMEFILE;
3211 Event::loop; 3571
3572 # no (long-running) fork's whatsoever before this point(!)
3573 use POSIX ();
3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575
3576 (pop @POST_INIT)->(0) while @POST_INIT;
3577 };
3578
3579 main_loop;
3212} 3580}
3213 3581
3214############################################################################# 3582#############################################################################
3215# initialisation and cleanup 3583# initialisation and cleanup
3216 3584
3217# install some emergency cleanup handlers 3585# install some emergency cleanup handlers
3218BEGIN { 3586BEGIN {
3587 our %SIGWATCHER = ();
3219 for my $signal (qw(INT HUP TERM)) { 3588 for my $signal (qw(INT HUP TERM)) {
3220 Event->signal ( 3589 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3221 reentrant => 0,
3222 data => WF_AUTOCANCEL,
3223 signal => $signal,
3224 prio => 0,
3225 cb => sub {
3226 cf::cleanup "SIG$signal"; 3590 cf::cleanup "SIG$signal";
3227 },
3228 ); 3591 };
3229 } 3592 }
3230} 3593}
3231 3594
3232sub write_runtime { 3595sub write_runtime_sync {
3233 my $runtime = "$LOCALDIR/runtime"; 3596 my $t0 = EV::time;
3234 3597
3235 # first touch the runtime file to show we are still running: 3598 # first touch the runtime file to show we are still running:
3236 # the fsync below can take a very very long time. 3599 # the fsync below can take a very very long time.
3237 3600
3238 IO::AIO::aio_utime $runtime, undef, undef; 3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3239 3602
3240 my $guard = cf::lock_acquire "write_runtime"; 3603 my $guard = cf::lock_acquire "write_runtime";
3241 3604
3242 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3605 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3243 or return; 3606 or return;
3244 3607
3245 my $value = $cf::RUNTIME + 90 + 10; 3608 my $value = $cf::RUNTIME + 90 + 10;
3246 # 10 is the runtime save interval, for a monotonic clock 3609 # 10 is the runtime save interval, for a monotonic clock
3247 # 60 allows for the watchdog to kill the server. 3610 # 60 allows for the watchdog to kill the server.
3257 aio_utime $fh, undef, undef; 3620 aio_utime $fh, undef, undef;
3258 3621
3259 close $fh 3622 close $fh
3260 or return; 3623 or return;
3261 3624
3262 aio_rename "$runtime~", $runtime 3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3263 and return; 3626 and return;
3264 3627
3265 warn "runtime file written.\n"; 3628 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3266 3629
3267 1 3630 1
3631}
3632
3633our $uuid_lock;
3634our $uuid_skip;
3635
3636sub write_uuid_sync($) {
3637 $uuid_skip ||= $_[0];
3638
3639 return if $uuid_lock;
3640 local $uuid_lock = 1;
3641
3642 my $uuid = "$LOCALDIR/uuid";
3643
3644 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3645 or return;
3646
3647 my $value = uuid_seq uuid_cur;
3648
3649 unless ($value) {
3650 warn "cowardly refusing to write zero uuid value!\n";
3651 return;
3652 }
3653
3654 my $value = uuid_str $value + $uuid_skip;
3655 $uuid_skip = 0;
3656
3657 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3658 and return;
3659
3660 # always fsync - this file is important
3661 aio_fsync $fh
3662 and return;
3663
3664 close $fh
3665 or return;
3666
3667 aio_rename "$uuid~", $uuid
3668 and return;
3669
3670 warn "uuid file written ($value).\n";
3671
3672 1
3673
3674}
3675
3676sub write_uuid($$) {
3677 my ($skip, $sync) = @_;
3678
3679 $sync ? write_uuid_sync $skip
3680 : async { write_uuid_sync $skip };
3268} 3681}
3269 3682
3270sub emergency_save() { 3683sub emergency_save() {
3271 my $freeze_guard = cf::freeze_mainloop; 3684 my $freeze_guard = cf::freeze_mainloop;
3272 3685
3273 warn "enter emergency perl save\n"; 3686 warn "emergency_perl_save: enter\n";
3274 3687
3275 cf::sync_job { 3688 cf::sync_job {
3689 # this is a trade-off: we want to be very quick here, so
3690 # save all maps without fsync, and later call a global sync
3691 # (which in turn might be very very slow)
3692 local $USE_FSYNC = 0;
3693
3276 # use a peculiar iteration method to avoid tripping on perl 3694 # use a peculiar iteration method to avoid tripping on perl
3277 # refcount bugs in for. also avoids problems with players 3695 # refcount bugs in for. also avoids problems with players
3278 # and maps saved/destroyed asynchronously. 3696 # and maps saved/destroyed asynchronously.
3279 warn "begin emergency player save\n"; 3697 warn "emergency_perl_save: begin player save\n";
3280 for my $login (keys %cf::PLAYER) { 3698 for my $login (keys %cf::PLAYER) {
3281 my $pl = $cf::PLAYER{$login} or next; 3699 my $pl = $cf::PLAYER{$login} or next;
3282 $pl->valid or next; 3700 $pl->valid or next;
3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3283 $pl->save; 3702 $pl->save;
3284 } 3703 }
3285 warn "end emergency player save\n"; 3704 warn "emergency_perl_save: end player save\n";
3286 3705
3287 warn "begin emergency map save\n"; 3706 warn "emergency_perl_save: begin map save\n";
3288 for my $path (keys %cf::MAP) { 3707 for my $path (keys %cf::MAP) {
3289 my $map = $cf::MAP{$path} or next; 3708 my $map = $cf::MAP{$path} or next;
3290 $map->valid or next; 3709 $map->valid or next;
3291 $map->save; 3710 $map->save;
3292 } 3711 }
3293 warn "end emergency map save\n"; 3712 warn "emergency_perl_save: end map save\n";
3294 3713
3295 warn "begin emergency database checkpoint\n"; 3714 warn "emergency_perl_save: begin database checkpoint\n";
3296 BDB::db_env_txn_checkpoint $DB_ENV; 3715 BDB::db_env_txn_checkpoint $DB_ENV;
3297 warn "end emergency database checkpoint\n"; 3716 warn "emergency_perl_save: end database checkpoint\n";
3717
3718 warn "emergency_perl_save: begin write uuid\n";
3719 write_uuid_sync 1;
3720 warn "emergency_perl_save: end write uuid\n";
3298 }; 3721 };
3299 3722
3723 warn "emergency_perl_save: starting sync()\n";
3724 IO::AIO::aio_sync sub {
3725 warn "emergency_perl_save: finished sync()\n";
3726 };
3727
3300 warn "leave emergency perl save\n"; 3728 warn "emergency_perl_save: leave\n";
3301} 3729}
3302 3730
3303sub post_cleanup { 3731sub post_cleanup {
3304 my ($make_core) = @_; 3732 my ($make_core) = @_;
3305 3733
3306 warn Carp::longmess "post_cleanup backtrace" 3734 warn Carp::longmess "post_cleanup backtrace"
3307 if $make_core; 3735 if $make_core;
3736
3737 my $fh = pidfile;
3738 unlink $PIDFILE if <$fh> == $$;
3739}
3740
3741# a safer delete_package, copied from Symbol
3742sub clear_package($) {
3743 my $pkg = shift;
3744
3745 # expand to full symbol table name if needed
3746 unless ($pkg =~ /^main::.*::$/) {
3747 $pkg = "main$pkg" if $pkg =~ /^::/;
3748 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3749 $pkg .= '::' unless $pkg =~ /::$/;
3750 }
3751
3752 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3753 my $stem_symtab = *{$stem}{HASH};
3754
3755 defined $stem_symtab and exists $stem_symtab->{$leaf}
3756 or return;
3757
3758 # clear all symbols
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 }
3764 warn "cleared package $pkg\n";#d#
3308} 3765}
3309 3766
3310sub do_reload_perl() { 3767sub do_reload_perl() {
3311 # can/must only be called in main 3768 # can/must only be called in main
3312 if ($Coro::current != $Coro::main) { 3769 if ($Coro::current != $Coro::main) {
3313 warn "can only reload from main coroutine"; 3770 warn "can only reload from main coroutine";
3314 return; 3771 return;
3315 } 3772 }
3316 3773
3774 return if $RELOAD++;
3775
3776 my $t1 = EV::time;
3777
3778 while ($RELOAD) {
3317 warn "reloading..."; 3779 warn "reloading...";
3318 3780
3319 warn "entering sync_job"; 3781 warn "entering sync_job";
3320 3782
3321 cf::sync_job { 3783 cf::sync_job {
3322 cf::write_runtime; # external watchdog should not bark 3784 cf::write_runtime_sync; # external watchdog should not bark
3323 cf::emergency_save; 3785 cf::emergency_save;
3324 cf::write_runtime; # external watchdog should not bark 3786 cf::write_runtime_sync; # external watchdog should not bark
3325 3787
3326 warn "syncing database to disk"; 3788 warn "syncing database to disk";
3327 BDB::db_env_txn_checkpoint $DB_ENV; 3789 BDB::db_env_txn_checkpoint $DB_ENV;
3328 3790
3329 # if anything goes wrong in here, we should simply crash as we already saved 3791 # if anything goes wrong in here, we should simply crash as we already saved
3330 3792
3331 warn "cancelling all WF_AUTOCANCEL watchers";
3332 for (Event::all_watchers) {
3333 $_->cancel if $_->data & WF_AUTOCANCEL;
3334 }
3335
3336 warn "flushing outstanding aio requests"; 3793 warn "flushing outstanding aio requests";
3337 for (;;) {
3338 BDB::flush;
3339 IO::AIO::flush;
3340 Coro::cede;
3341 last unless IO::AIO::nreqs || BDB::nreqs; 3794 while (IO::AIO::nreqs || BDB::nreqs) {
3342 warn "iterate..."; 3795 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3343 }
3344
3345 ++$RELOAD;
3346
3347 warn "cancelling all extension coros";
3348 $_->cancel for values %EXT_CORO;
3349 %EXT_CORO = ();
3350
3351 warn "removing commands";
3352 %COMMAND = ();
3353
3354 warn "removing ext/exti commands";
3355 %EXTCMD = ();
3356 %EXTICMD = ();
3357
3358 warn "unloading/nuking all extensions";
3359 for my $pkg (@EXTS) {
3360 warn "... unloading $pkg";
3361
3362 if (my $cb = $pkg->can ("unload")) {
3363 eval {
3364 $cb->($pkg);
3365 1
3366 } or warn "$pkg unloaded, but with errors: $@";
3367 } 3796 }
3368 3797
3369 warn "... nuking $pkg"; 3798 warn "cancelling all extension coros";
3370 Symbol::delete_package $pkg; 3799 $_->cancel for values %EXT_CORO;
3371 } 3800 %EXT_CORO = ();
3372 3801
3373 warn "unloading all perl modules loaded from $LIBDIR"; 3802 warn "removing commands";
3374 while (my ($k, $v) = each %INC) { 3803 %COMMAND = ();
3375 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3376 3804
3805 warn "removing ext/exti commands";
3806 %EXTCMD = ();
3807 %EXTICMD = ();
3808
3809 warn "unloading/nuking all extensions";
3810 for my $pkg (@EXTS) {
3377 warn "... unloading $k"; 3811 warn "... unloading $pkg";
3378 delete $INC{$k};
3379 3812
3380 $k =~ s/\.pm$//;
3381 $k =~ s/\//::/g;
3382
3383 if (my $cb = $k->can ("unload_module")) { 3813 if (my $cb = $pkg->can ("unload")) {
3814 eval {
3384 $cb->(); 3815 $cb->($pkg);
3816 1
3817 } or warn "$pkg unloaded, but with errors: $@";
3818 }
3819
3820 warn "... clearing $pkg";
3821 clear_package $pkg;
3385 } 3822 }
3386 3823
3387 Symbol::delete_package $k; 3824 warn "unloading all perl modules loaded from $LIBDIR";
3825 while (my ($k, $v) = each %INC) {
3826 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3827
3828 warn "... unloading $k";
3829 delete $INC{$k};
3830
3831 $k =~ s/\.pm$//;
3832 $k =~ s/\//::/g;
3833
3834 if (my $cb = $k->can ("unload_module")) {
3835 $cb->();
3836 }
3837
3838 clear_package $k;
3388 } 3839 }
3389 3840
3390 warn "getting rid of safe::, as good as possible"; 3841 warn "getting rid of safe::, as good as possible";
3391 Symbol::delete_package "safe::$_" 3842 clear_package "safe::$_"
3392 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3843 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3393 3844
3394 warn "unloading cf.pm \"a bit\""; 3845 warn "unloading cf.pm \"a bit\"";
3395 delete $INC{"cf.pm"}; 3846 delete $INC{"cf.pm"};
3396 delete $INC{"cf/pod.pm"}; 3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3397 3848
3398 # don't, removes xs symbols, too, 3849 # don't, removes xs symbols, too,
3399 # and global variables created in xs 3850 # and global variables created in xs
3400 #Symbol::delete_package __PACKAGE__; 3851 #clear_package __PACKAGE__;
3401 3852
3402 warn "unload completed, starting to reload now"; 3853 warn "unload completed, starting to reload now";
3403 3854
3404 warn "reloading cf.pm"; 3855 warn "reloading cf.pm";
3405 require cf; 3856 require cf;
3406 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3857 cf::_connect_to_perl_1;
3407 3858
3408 warn "loading config and database again"; 3859 warn "loading config and database again";
3409 cf::reload_config; 3860 cf::reload_config;
3410 3861
3411 warn "loading extensions"; 3862 warn "loading extensions";
3412 cf::load_extensions; 3863 cf::load_extensions;
3413 3864
3865 if ($REATTACH_ON_RELOAD) {
3414 warn "reattaching attachments to objects/players"; 3866 warn "reattaching attachments to objects/players";
3415 _global_reattach; # objects, sockets 3867 _global_reattach; # objects, sockets
3416 warn "reattaching attachments to maps"; 3868 warn "reattaching attachments to maps";
3417 reattach $_ for values %MAP; 3869 reattach $_ for values %MAP;
3418 warn "reattaching attachments to players"; 3870 warn "reattaching attachments to players";
3419 reattach $_ for values %PLAYER; 3871 reattach $_ for values %PLAYER;
3872 }
3420 3873
3874 warn "running post_init jobs";
3875 (pop @POST_INIT)->(1) while @POST_INIT;
3876
3421 warn "leaving sync_job"; 3877 warn "leaving sync_job";
3422 3878
3423 1 3879 1
3424 } or do { 3880 } or do {
3425 warn $@; 3881 warn $@;
3426 warn "error while reloading, exiting."; 3882 cf::cleanup "error while reloading, exiting.";
3427 exit 1;
3428 }; 3883 };
3429 3884
3430 warn "reloaded"; 3885 warn "reloaded";
3886 --$RELOAD;
3887 }
3888
3889 $t1 = EV::time - $t1;
3890 warn "reload completed in ${t1}s\n";
3431}; 3891};
3432 3892
3433our $RELOAD_WATCHER; # used only during reload 3893our $RELOAD_WATCHER; # used only during reload
3434 3894
3435sub reload_perl() { 3895sub reload_perl() {
3436 # doing reload synchronously and two reloads happen back-to-back, 3896 # doing reload synchronously and two reloads happen back-to-back,
3437 # coro crashes during coro_state_free->destroy here. 3897 # coro crashes during coro_state_free->destroy here.
3438 3898
3439 $RELOAD_WATCHER ||= Event->timer ( 3899 $RELOAD_WATCHER ||= cf::async {
3440 reentrant => 0, 3900 Coro::AIO::aio_wait cache_extensions;
3441 after => 0, 3901
3442 data => WF_AUTOCANCEL, 3902 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3443 cb => sub {
3444 do_reload_perl; 3903 do_reload_perl;
3445 undef $RELOAD_WATCHER; 3904 undef $RELOAD_WATCHER;
3446 }, 3905 };
3447 ); 3906 };
3448} 3907}
3449 3908
3450register_command "reload" => sub { 3909register_command "reload" => sub {
3451 my ($who, $arg) = @_; 3910 my ($who, $arg) = @_;
3452 3911
3465 3924
3466our @WAIT_FOR_TICK; 3925our @WAIT_FOR_TICK;
3467our @WAIT_FOR_TICK_BEGIN; 3926our @WAIT_FOR_TICK_BEGIN;
3468 3927
3469sub wait_for_tick { 3928sub wait_for_tick {
3470 return unless $TICK_WATCHER->is_active;
3471 return if $Coro::current == $Coro::main; 3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3472 3930
3473 my $signal = new Coro::Signal; 3931 my $signal = new Coro::Signal;
3474 push @WAIT_FOR_TICK, $signal; 3932 push @WAIT_FOR_TICK, $signal;
3475 $signal->wait; 3933 $signal->wait;
3476} 3934}
3477 3935
3478sub wait_for_tick_begin { 3936sub wait_for_tick_begin {
3479 return unless $TICK_WATCHER->is_active;
3480 return if $Coro::current == $Coro::main; 3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3481 3938
3482 my $signal = new Coro::Signal; 3939 my $signal = new Coro::Signal;
3483 push @WAIT_FOR_TICK_BEGIN, $signal; 3940 push @WAIT_FOR_TICK_BEGIN, $signal;
3484 $signal->wait; 3941 $signal->wait;
3485} 3942}
3486 3943
3487$TICK_WATCHER = Event->timer ( 3944sub tick {
3488 reentrant => 0,
3489 parked => 1,
3490 prio => 0,
3491 at => $NEXT_TICK || $TICK,
3492 data => WF_AUTOCANCEL,
3493 cb => sub {
3494 if ($Coro::current != $Coro::main) { 3945 if ($Coro::current != $Coro::main) {
3495 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3946 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3496 unless ++$bug_warning > 10; 3947 unless ++$bug_warning > 10;
3497 return; 3948 return;
3498 } 3949 }
3499 3950
3500 $NOW = $tick_start = Event::time;
3501
3502 cf::server_tick; # one server iteration 3951 cf::server_tick; # one server iteration
3503 3952
3504 $RUNTIME += $TICK; 3953 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3505 $NEXT_TICK += $TICK;
3506 3954
3507 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3955 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3508 $NEXT_RUNTIME_WRITE = $NOW + 10; 3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3509 Coro::async_pool { 3957 Coro::async_pool {
3510 $Coro::current->{desc} = "runtime saver"; 3958 $Coro::current->{desc} = "runtime saver";
3511 write_runtime 3959 write_runtime_sync
3512 or warn "ERROR: unable to write runtime file: $!"; 3960 or warn "ERROR: unable to write runtime file: $!";
3513 };
3514 } 3961 };
3962 }
3515 3963
3516 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3964 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3517 $sig->send; 3965 $sig->send;
3518 } 3966 }
3519 while (my $sig = shift @WAIT_FOR_TICK) { 3967 while (my $sig = shift @WAIT_FOR_TICK) {
3520 $sig->send; 3968 $sig->send;
3521 } 3969 }
3522 3970
3523 $NOW = Event::time; 3971 $LOAD = ($NOW - $TICK_START) / $TICK;
3524
3525 # if we are delayed by four ticks or more, skip them all
3526 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3527
3528 $TICK_WATCHER->at ($NEXT_TICK);
3529 $TICK_WATCHER->start;
3530
3531 $LOAD = ($NOW - $tick_start) / $TICK;
3532 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3972 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3533 3973
3534 _post_tick; 3974 if (0) {
3975 if ($NEXT_TICK) {
3976 my $jitter = $TICK_START - $NEXT_TICK;
3977 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3978 warn "jitter $JITTER\n";#d#
3979 }
3535 }, 3980 }
3536); 3981}
3537 3982
3538{ 3983{
3984 # configure BDB
3985
3539 BDB::min_parallel 8; 3986 BDB::min_parallel 16;
3540 BDB::max_poll_time $TICK * 0.1; 3987 BDB::max_poll_reqs $TICK * 0.1;
3541 $BDB_POLL_WATCHER = Event->io ( 3988 $AnyEvent::BDB::WATCHER->priority (1);
3542 reentrant => 0,
3543 fd => BDB::poll_fileno,
3544 poll => 'r',
3545 prio => 0,
3546 data => WF_AUTOCANCEL,
3547 cb => \&BDB::poll_cb,
3548 );
3549
3550 BDB::set_sync_prepare {
3551 my $status;
3552 my $current = $Coro::current;
3553 (
3554 sub {
3555 $status = $!;
3556 $current->ready; undef $current;
3557 },
3558 sub {
3559 Coro::schedule while defined $current;
3560 $! = $status;
3561 },
3562 )
3563 };
3564 3989
3565 unless ($DB_ENV) { 3990 unless ($DB_ENV) {
3566 $DB_ENV = BDB::db_env_create; 3991 $DB_ENV = BDB::db_env_create;
3567 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3992 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3568 | BDB::LOG_AUTOREMOVE, 1); 3993 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3994 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3569 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3995 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3570 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3996 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3571 3997
3572 cf::sync_job { 3998 cf::sync_job {
3573 eval { 3999 eval {
3583 4009
3584 cf::cleanup "db_env_open(db): $@" if $@; 4010 cf::cleanup "db_env_open(db): $@" if $@;
3585 }; 4011 };
3586 } 4012 }
3587 4013
3588 $BDB_DEADLOCK_WATCHER = Event->timer ( 4014 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3589 after => 3,
3590 interval => 1,
3591 hard => 1,
3592 prio => 0,
3593 data => WF_AUTOCANCEL,
3594 cb => sub {
3595 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4015 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3596 },
3597 ); 4016 };
3598 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4017 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3599 after => 11,
3600 interval => 60,
3601 hard => 1,
3602 prio => 0,
3603 data => WF_AUTOCANCEL,
3604 cb => sub {
3605 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4018 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3606 },
3607 ); 4019 };
3608 $BDB_TRICKLE_WATCHER = Event->timer ( 4020 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3609 after => 5,
3610 interval => 10,
3611 hard => 1,
3612 prio => 0,
3613 data => WF_AUTOCANCEL,
3614 cb => sub {
3615 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4021 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3616 },
3617 ); 4022 };
3618} 4023}
3619 4024
3620{ 4025{
4026 # configure IO::AIO
4027
3621 IO::AIO::min_parallel 8; 4028 IO::AIO::min_parallel 8;
3622
3623 undef $Coro::AIO::WATCHER;
3624 IO::AIO::max_poll_time $TICK * 0.1; 4029 IO::AIO::max_poll_time $TICK * 0.1;
3625 $AIO_POLL_WATCHER = Event->io ( 4030 undef $AnyEvent::AIO::WATCHER;
3626 reentrant => 0,
3627 data => WF_AUTOCANCEL,
3628 fd => IO::AIO::poll_fileno,
3629 poll => 'r',
3630 prio => 0,
3631 cb => \&IO::AIO::poll_cb,
3632 );
3633} 4031}
3634 4032
3635my $_log_backtrace; 4033my $_log_backtrace;
3636 4034
3637sub _log_backtrace { 4035sub _log_backtrace {
3640 $msg =~ s/\n//; 4038 $msg =~ s/\n//;
3641 4039
3642 # limit the # of concurrent backtraces 4040 # limit the # of concurrent backtraces
3643 if ($_log_backtrace < 2) { 4041 if ($_log_backtrace < 2) {
3644 ++$_log_backtrace; 4042 ++$_log_backtrace;
4043 my $perl_bt = Carp::longmess $msg;
3645 async { 4044 async {
3646 $Coro::current->{desc} = "abt $msg"; 4045 $Coro::current->{desc} = "abt $msg";
3647 4046
3648 my @bt = fork_call { 4047 my @bt = fork_call {
3649 @addr = map { sprintf "%x", $_ } @addr; 4048 @addr = map { sprintf "%x", $_ } @addr;
3660 } 4059 }
3661 4060
3662 @funcs 4061 @funcs
3663 }; 4062 };
3664 4063
3665 LOG llevInfo, "[ABT] $msg\n"; 4064 LOG llevInfo, "[ABT] $perl_bt\n";
4065 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3666 LOG llevInfo, "[ABT] $_\n" for @bt; 4066 LOG llevInfo, "[ABT] $_\n" for @bt;
3667 --$_log_backtrace; 4067 --$_log_backtrace;
3668 }; 4068 };
3669 } else { 4069 } else {
3670 LOG llevInfo, "[ABT] $msg\n"; 4070 LOG llevInfo, "[ABT] $msg\n";
3671 LOG llevInfo, "[ABT] [suppressed]\n"; 4071 LOG llevInfo, "[ABT] [suppressed]\n";
3672 } 4072 }
3673} 4073}
3674 4074
3675# load additional modules 4075# load additional modules
3676use cf::pod; 4076require "cf/$_.pm" for @EXTRA_MODULES;
4077cf::_connect_to_perl_2;
3677 4078
3678END { cf::emergency_save } 4079END { cf::emergency_save }
3679 4080
36801 40811
3681 4082

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines