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.385 by root, Fri Oct 12 19:13:26 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 Event; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 4.1 (); 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.51 (); 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, 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 return 1;#d# 1115 ++$SLOW_MERGES;#d#
977 1116
978 #todo#d# kill yourself and do some recursive checking manually without storable 1117 # we do the slow way here
979 sync_job { 1118 return _object_equal $ob1, $ob2
980 my $guard = Coro::Storable::guard;
981 local $Storable::canonical = 1;
982 my $fob1 = Storable::freeze $ob1;
983 my $fob2 = Storable::freeze $ob2;
984 $fob1 eq $fob2
985 }
986} 1119}
987 1120
988sub reattach { 1121sub reattach {
989 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
990 my ($obj) = @_; 1123 my ($obj) = @_;
991 1124
1125 # no longer needed after getting rid of delete_package?
992 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
993 1127
994 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
995 1129
996 @$registry = (); 1130 @$registry = ();
997 1131
1012cf::attachable->attach ( 1146cf::attachable->attach (
1013 prio => -1000000, 1147 prio => -1000000,
1014 on_instantiate => sub { 1148 on_instantiate => sub {
1015 my ($obj, $data) = @_; 1149 my ($obj, $data) = @_;
1016 1150
1017 $data = from_json $data; 1151 $data = decode_json $data;
1018 1152
1019 for (@$data) { 1153 for (@$data) {
1020 my ($name, $args) = @$_; 1154 my ($name, $args) = @$_;
1021 1155
1022 $obj->attach ($name, %{$args || {} }); 1156 $obj->attach ($name, %{$args || {} });
1043 utf8::decode (my $decname = $filename); 1177 utf8::decode (my $decname = $filename);
1044 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
1045 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1046 1180
1047 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1048 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1049 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1050 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 }
1051 close $fh; 1188 aio_close $fh;
1052 1189
1053 if (@$objs) { 1190 if (@$objs) {
1054 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) {
1055 chmod SAVE_MODE, $fh; 1192 aio_chmod $fh, SAVE_MODE;
1056 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1057 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1058 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 }
1059 close $fh; 1199 aio_close $fh;
1060 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1061 } 1201 }
1062 } else { 1202 } else {
1063 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1064 } 1204 }
1065 1205
1066 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1067 } else { 1210 } else {
1068 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1069 } 1212 }
1070 } else { 1213 } else {
1071 aio_unlink $filename; 1214 aio_unlink $filename;
1072 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1073 } 1216 }
1092 1235
1093 unless (aio_stat "$filename.pst") { 1236 unless (aio_stat "$filename.pst") {
1094 (aio_load "$filename.pst", $av) >= 0 1237 (aio_load "$filename.pst", $av) >= 0
1095 or return; 1238 or return;
1096 1239
1097 my $st = eval { Coro::Storable::thaw $av } 1240 my $st = eval { Coro::Storable::thaw $av };
1098 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1099 $av = $st->{objs}; 1241 $av = $st->{objs};
1100 } 1242 }
1101 1243
1102 utf8::decode (my $decname = $filename); 1244 utf8::decode (my $decname = $filename);
1103 warn sprintf "loading %s (%d,%d)\n", 1245 warn sprintf "loading %s (%d,%d)\n",
1165 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1166 1308
1167 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1168} 1310}
1169 1311
1312use File::Glob ();
1313
1170cf::player->attach ( 1314cf::player->attach (
1171 on_command => sub { 1315 on_unknown_command => sub {
1172 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1173 1317
1174 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1175 or return; 1319 or return;
1176 1320
1206 1350
1207 cf::override; 1351 cf::override;
1208 }, 1352 },
1209); 1353);
1210 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
1211sub load_extensions { 1368sub load_extensions {
1212 cf::sync_job { 1369 cf::sync_job {
1213 my %todo; 1370 my %todo;
1214 1371
1215 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
1234 1391
1235 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1236 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1237 1394
1238 $ext{source} = 1395 $ext{source} =
1239 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1240 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1241 . $source 1398 . $source
1242 . "\n};\n1"; 1399 . "\n};\n1";
1243 1400
1244 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1245 } 1402 }
1246 1403
1404 my $pass = 0;
1247 my %done; 1405 my %done;
1248 while (%todo) { 1406 while (%todo) {
1249 my $progress; 1407 my $progress;
1250 1408
1409 ++$pass;
1410
1411 ext:
1251 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1252 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1253 goto skip 1414 next ext
1254 unless exists $done{$_}; 1415 unless exists $done{$_};
1255 } 1416 }
1256 1417
1257 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1258 1419
1259 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1260 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1261 : "$v->{base}: extension inactive.\n";
1262 1424
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1263 if (exists $v->{meta}{mandatory}) { 1426 if exists $v->{meta}{mandatory};
1264 warn $msg; 1427 } else {
1265 warn "mandatory extension failed to load, exiting.\n"; 1428 $done{$k} = delete $todo{$k};
1266 exit 1; 1429 push @EXTS, $v->{pkg};
1267 } 1430 $progress = 1;
1268 1431
1269 warn $msg; 1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1270 } 1434 }
1271
1272 $done{$k} = delete $todo{$k};
1273 push @EXTS, $v->{pkg};
1274 $progress = 1;
1275 } 1435 }
1276 1436
1277 skip: 1437 unless ($progress) {
1278 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1279 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 }
1280 } 1445 }
1281 }; 1446 };
1282} 1447}
1283 1448
1284############################################################################# 1449#############################################################################
1285 1450
1286=back 1451=back
1287 1452
1288=head2 CORE EXTENSIONS 1453=head2 CORE EXTENSIONS
1289 1454
1290Functions and methods that extend core crossfire objects. 1455Functions and methods that extend core deliantra objects.
1291 1456
1292=cut 1457=cut
1293 1458
1294package cf::player; 1459package cf::player;
1295 1460
1338 1503
1339sub exists($) { 1504sub exists($) {
1340 my ($login) = @_; 1505 my ($login) = @_;
1341 1506
1342 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1343 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1344} 1509}
1345 1510
1346sub find($) { 1511sub find($) {
1347 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1348 my $login = $_[0]; 1513 my $login = $_[0];
1360 my $f = new_from_file cf::object::thawer path $login 1525 my $f = new_from_file cf::object::thawer path $login
1361 or return; 1526 or return;
1362 1527
1363 my $pl = cf::player::load_pl $f 1528 my $pl = cf::player::load_pl $f
1364 or return; 1529 or return;
1530
1365 local $cf::PLAYER_LOADING{$login} = $pl; 1531 local $cf::PLAYER_LOADING{$login} = $pl;
1366 $f->resolve_delayed_derefs; 1532 $f->resolve_delayed_derefs;
1367 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1368 } 1534 }
1369 } 1535 }
1370} 1536}
1371 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
1372sub save($) { 1551sub save($) {
1373 my ($pl) = @_; 1552 my ($pl) = @_;
1374 1553
1375 return if $pl->{deny_save}; 1554 return if $pl->{deny_save};
1376 1555
1379 1558
1380 return if $pl->{deny_save}; 1559 return if $pl->{deny_save};
1381 1560
1382 aio_mkdir playerdir $pl, 0770; 1561 aio_mkdir playerdir $pl, 0770;
1383 $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];
1384 1568
1385 $pl->save_pl ($path); 1569 $pl->save_pl ($path);
1386 cf::cede_to_tick; 1570 cf::cede_to_tick;
1387} 1571}
1388 1572
1420 my ($pl) = @_; 1604 my ($pl) = @_;
1421 1605
1422 my $name = $pl->ob->name; 1606 my $name = $pl->ob->name;
1423 1607
1424 $pl->{deny_save} = 1; 1608 $pl->{deny_save} = 1;
1425 $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
1426 1610
1427 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1611 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1428 $pl->deactivate; 1612 $pl->deactivate;
1613 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1614 $pl->ob->check_score;
1429 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1615 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1430 $pl->ns->destroy if $pl->ns; 1616 $pl->ns->destroy if $pl->ns;
1431 1617
1432 my $path = playerdir $pl; 1618 my $path = playerdir $pl;
1433 my $temp = "$path~$cf::RUNTIME~deleting~"; 1619 my $temp = "$path~$cf::RUNTIME~deleting~";
1472 1658
1473 for my $login (@$dirs) { 1659 for my $login (@$dirs) {
1474 my $path = path $login; 1660 my $path = path $login;
1475 1661
1476 # a .pst is a dead give-away for a valid player 1662 # a .pst is a dead give-away for a valid player
1477 unless (-e "$path.pst") { 1663 # if no pst file found, open and chekc for blocked users
1664 if (aio_stat "$path.pst") {
1478 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1665 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1479 aio_read $fh, 0, 512, my $buf, 0 or next; 1666 aio_read $fh, 0, 512, my $buf, 0 or next;
1480 $buf !~ /^password -------------$/m or next; # official not-valid tag 1667 $buf !~ /^password -------------$/m or next; # official not-valid tag
1481 } 1668 }
1482 1669
1513 } 1700 }
1514 1701
1515 \@paths 1702 \@paths
1516} 1703}
1517 1704
1518=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1705=item $protocol_xml = $player->expand_cfpod ($cfpod)
1519 1706
1520Expand crossfire pod fragments into protocol xml. 1707Expand deliantra pod fragments into protocol xml.
1521
1522=cut
1523
1524sub expand_cfpod {
1525 ((my $self), (local $_)) = @_;
1526
1527 # escape & and <
1528 s/&/&amp;/g;
1529 s/(?<![BIUGHT])</&lt;/g;
1530
1531 # this is buggy, it needs to properly take care of nested <'s
1532
1533 1 while
1534 # replace B<>, I<>, U<> etc.
1535 s/B<([^\>]*)>/<b>$1<\/b>/
1536 || s/I<([^\>]*)>/<i>$1<\/i>/
1537 || s/U<([^\>]*)>/<u>$1<\/u>/
1538 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1539 # replace G<male|female> tags
1540 || s{G<([^>|]*)\|([^>]*)>}{
1541 $self->gender ? $2 : $1
1542 }ge
1543 # replace H<hint text>
1544 || s{H<([^\>]*)>}
1545 {
1546 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1547 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1548 "")
1549 [$self->{hintmode}]
1550 }ge;
1551
1552 # create single paragraphs (very hackish)
1553 s/(?<=\S)\n(?=\w)/ /g;
1554
1555 # compress some whitespace
1556 s/\s+\n/\n/g; # ws line-ends
1557 s/\n\n+/\n/g; # double lines
1558 s/^\n+//; # beginning lines
1559 s/\n+$//; # ending lines
1560
1561 $_
1562}
1563
1564sub hintmode {
1565 $_[0]{hintmode} = $_[1] if @_ > 1;
1566 $_[0]{hintmode}
1567}
1568 1708
1569=item $player->ext_reply ($msgid, @msg) 1709=item $player->ext_reply ($msgid, @msg)
1570 1710
1571Sends an ext reply to the player. 1711Sends an ext reply to the player.
1572 1712
1639our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1640our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1641 1781
1642sub generate_random_map { 1782sub generate_random_map {
1643 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
1644 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1645 $self->_create_random_map ( 1788 $self->_create_random_map (
1646 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1647 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1648 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1649 $rmp->{exit_on_final_map}, 1792 $rmp->{exit_on_final_map},
1650 $rmp->{xsize}, $rmp->{ysize}, 1793 $rmp->{xsize}, $rmp->{ysize},
1651 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1652 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1770 1913
1771# the temporary/swap location 1914# the temporary/swap location
1772sub save_path { 1915sub save_path {
1773 my ($self) = @_; 1916 my ($self) = @_;
1774 1917
1775 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1776 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1777} 1920}
1778 1921
1779# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1780sub uniq_path { 1923sub uniq_path {
1781 my ($self) = @_; 1924 my ($self) = @_;
1782 1925
1783 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1784 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1785}
1786
1787# and all this just because we cannot iterate over
1788# all maps in C++...
1789sub change_all_map_light {
1790 my ($change) = @_;
1791
1792 $_->change_map_light ($change)
1793 for grep $_->outdoor, values %cf::MAP;
1794} 1928}
1795 1929
1796sub decay_objects { 1930sub decay_objects {
1797 my ($self) = @_; 1931 my ($self) = @_;
1798 1932
1882sub find { 2016sub find {
1883 my ($path, $origin) = @_; 2017 my ($path, $origin) = @_;
1884 2018
1885 $path = normalise $path, $origin && $origin->path; 2019 $path = normalise $path, $origin && $origin->path;
1886 2020
1887 cf::lock_wait "map_data:$path";#d#remove 2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1888 cf::lock_wait "map_find:$path"; 2022 my $guard2 = cf::lock_acquire "map_find:$path";
1889 2023
1890 $cf::MAP{$path} || do { 2024 $cf::MAP{$path} || do {
1891 my $guard1 = cf::lock_acquire "map_find:$path";
1892 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1893
1894 my $map = new_from_path cf::map $path 2025 my $map = new_from_path cf::map $path
1895 or return; 2026 or return;
1896 2027
1897 $map->{last_save} = $cf::RUNTIME; 2028 $map->{last_save} = $cf::RUNTIME;
1898 2029
1900 or return; 2031 or return;
1901 2032
1902 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2033 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1903 # doing this can freeze the server in a sync job, obviously 2034 # doing this can freeze the server in a sync job, obviously
1904 #$cf::WAIT_FOR_TICK->wait; 2035 #$cf::WAIT_FOR_TICK->wait;
2036 undef $guard2;
1905 undef $guard1; 2037 undef $guard1;
1906 undef $guard2;
1907 $map->reset; 2038 $map->reset;
1908 return find $path; 2039 return find $path;
1909 } 2040 }
1910 2041
1911 $cf::MAP{$path} = $map 2042 $cf::MAP{$path} = $map
1912 } 2043 }
1913} 2044}
1914 2045
1915sub pre_load { } 2046sub pre_load { }
1916sub post_load { } 2047#sub post_load { } # XS
1917 2048
1918sub load { 2049sub load {
1919 my ($self) = @_; 2050 my ($self) = @_;
1920 2051
1921 local $self->{deny_reset} = 1; # loading can take a long time 2052 local $self->{deny_reset} = 1; # loading can take a long time
1938 my $f = new_from_file cf::object::thawer $self->{load_path}; 2069 my $f = new_from_file cf::object::thawer $self->{load_path};
1939 $f->skip_block; 2070 $f->skip_block;
1940 $self->_load_objects ($f) 2071 $self->_load_objects ($f)
1941 or return; 2072 or return;
1942 2073
1943 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2074 $self->post_load_original
1944 if delete $self->{load_original}; 2075 if delete $self->{load_original};
1945 2076
1946 if (my $uniq = $self->uniq_path) { 2077 if (my $uniq = $self->uniq_path) {
1947 utf8::encode $uniq; 2078 utf8::encode $uniq;
1948 unless (aio_stat $uniq) { 2079 unless (aio_stat $uniq) {
1966 unless ($self->{deny_activate}) { 2097 unless ($self->{deny_activate}) {
1967 $self->decay_objects; 2098 $self->decay_objects;
1968 $self->fix_auto_apply; 2099 $self->fix_auto_apply;
1969 $self->update_buttons; 2100 $self->update_buttons;
1970 cf::cede_to_tick; 2101 cf::cede_to_tick;
1971 $self->set_darkness_map;
1972 cf::cede_to_tick;
1973 $self->activate; 2102 $self->activate;
1974 } 2103 }
1975 2104
1976 $self->{last_save} = $cf::RUNTIME; 2105 $self->{last_save} = $cf::RUNTIME;
1977 $self->last_access ($cf::RUNTIME); 2106 $self->last_access ($cf::RUNTIME);
1978 2107
1979 $self->in_memory (cf::MAP_IN_MEMORY); 2108 $self->in_memory (cf::MAP_ACTIVE);
1980 } 2109 }
1981 2110
1982 $self->post_load; 2111 $self->post_load;
1983} 2112}
1984 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
1985sub customise_for { 2117sub customise_for {
1986 my ($self, $ob) = @_; 2118 my ($self, $ob) = @_;
1987 2119
1988 return find "~" . $ob->name . "/" . $self->{path} 2120 return find "~" . $ob->name . "/" . $self->{path}
1989 if $self->per_player; 2121 if $self->per_player;
2042 my ($path, $origin, $load) = @_; 2174 my ($path, $origin, $load) = @_;
2043 2175
2044 $path = normalise $path, $origin && $origin->{path}; 2176 $path = normalise $path, $origin && $origin->{path};
2045 2177
2046 if (my $map = $cf::MAP{$path}) { 2178 if (my $map = $cf::MAP{$path}) {
2047 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2179 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2048 } 2180 }
2049 2181
2050 $MAP_PREFETCH{$path} |= $load; 2182 $MAP_PREFETCH{$path} |= $load;
2051 2183
2052 $MAP_PREFETCHER ||= cf::async { 2184 $MAP_PREFETCHER ||= cf::async {
2089 cf::async { 2221 cf::async {
2090 $Coro::current->{desc} = "map player save"; 2222 $Coro::current->{desc} = "map player save";
2091 $_->contr->save for $self->players; 2223 $_->contr->save for $self->players;
2092 }; 2224 };
2093 2225
2226 cf::get_slot 0.02;
2227
2094 if ($uniq) { 2228 if ($uniq) {
2095 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2229 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2096 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2230 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2097 } else { 2231 } else {
2098 $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);
2106 $self->save; 2240 $self->save;
2107 2241
2108 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2109 2243
2110 return if $self->players; 2244 return if $self->players;
2111 return if $self->in_memory != cf::MAP_IN_MEMORY; 2245 return if $self->in_memory != cf::MAP_ACTIVE;
2112 return if $self->{deny_save}; 2246 return if $self->{deny_save};
2113 2247
2114 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2115 2249
2116 $self->deactivate; 2250 $self->deactivate;
2141 2275
2142 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2277
2144 return if $self->players; 2278 return if $self->players;
2145 2279
2146 warn "resetting map ", $self->path; 2280 warn "resetting map ", $self->path, "\n";
2147 2281
2148 $self->in_memory (cf::MAP_SWAPPED); 2282 $self->in_memory (cf::MAP_SWAPPED);
2149 2283
2150 # need to save uniques path 2284 # need to save uniques path
2151 unless ($self->{deny_save}) { 2285 unless ($self->{deny_save}) {
2234 2368
2235sub unique_maps() { 2369sub unique_maps() {
2236 [ 2370 [
2237 map { 2371 map {
2238 utf8::decode $_; 2372 utf8::decode $_;
2239 /\.map$/ 2373 s/\.map$//; # TODO future compatibility hack
2374 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2375 ? ()
2240 ? normalise $_ 2376 : normalise $_
2241 : ()
2242 } @{ aio_readdir $UNIQUEDIR or [] } 2377 } @{ aio_readdir $UNIQUEDIR or [] }
2243 ] 2378 ]
2244} 2379}
2245 2380
2246package 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}
2247 2412
2248=back 2413=back
2249 2414
2250=head3 cf::object 2415=head3 cf::object
2251 2416
2255 2420
2256=over 4 2421=over 4
2257 2422
2258=item $ob->inv_recursive 2423=item $ob->inv_recursive
2259 2424
2260Returns 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.
2261 2427
2262=cut 2428=cut
2263 2429
2264sub inv_recursive_; 2430sub inv_recursive_;
2265sub inv_recursive_ { 2431sub inv_recursive_ {
2270 inv_recursive_ inv $_[0] 2436 inv_recursive_ inv $_[0]
2271} 2437}
2272 2438
2273=item $ref = $ob->ref 2439=item $ref = $ob->ref
2274 2440
2275creates 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.
2276 2442
2277=item $ob = cf::object::deref ($refstring) 2443=item $ob = cf::object::deref ($refstring)
2278 2444
2279returns 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,
2280even if the object actually exists. May block. 2446even if the object actually exists. May block.
2312can 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
2313dialogue with the given NPC character. 2479dialogue with the given NPC character.
2314 2480
2315=cut 2481=cut
2316 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
2317# rough implementation of a future "reply" method that works 2497# rough implementation of a future "reply" method that works
2318# with dialog boxes. 2498# with dialog boxes.
2319#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
2320sub cf::object::player::reply($$$;$) { 2500sub cf::object::player::reply($$$;$) {
2321 my ($self, $npc, $msg, $flags) = @_; 2501 my ($self, $npc, $msg, $flags) = @_;
2332 my $dialog = $pl->{npc_dialog}; 2512 my $dialog = $pl->{npc_dialog};
2333 $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));
2334 2514
2335 } else { 2515 } else {
2336 $msg = $npc->name . " says: $msg" if $npc; 2516 $msg = $npc->name . " says: $msg" if $npc;
2337 $self->message ($msg, $flags); 2517 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2338 } 2518 }
2339 } 2519 }
2340} 2520}
2341 2521
2342=item $object->send_msg ($channel, $msg, $color, [extra...]) 2522=item $object->send_msg ($channel, $msg, $color, [extra...])
2367 2547
2368=item $player_object->enter_link 2548=item $player_object->enter_link
2369 2549
2370Freezes 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}>).
2371 2551
2372The 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.
2373I<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.
2374 2556
2375Will never block. 2557Will never block.
2376 2558
2377=item $player_object->leave_link ($map, $x, $y) 2559=item $player_object->leave_link ($map, $x, $y)
2378 2560
2430 ($x, $y) = (-1, -1) 2612 ($x, $y) = (-1, -1)
2431 unless (defined $x) && (defined $y); 2613 unless (defined $x) && (defined $y);
2432 2614
2433 # use -1 or undef as default coordinates, not 0, 0 2615 # use -1 or undef as default coordinates, not 0, 0
2434 ($x, $y) = ($map->enter_x, $map->enter_y) 2616 ($x, $y) = ($map->enter_x, $map->enter_y)
2435 if $x <=0 && $y <= 0; 2617 if $x <= 0 && $y <= 0;
2436 2618
2437 $map->load; 2619 $map->load;
2438 $map->load_neighbours; 2620 $map->load_neighbours;
2439 2621
2440 return unless $self->contr->active; 2622 return unless $self->contr->active;
2441 $self->activate_recursive;
2442 2623
2443 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2444 $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;
2445} 2629}
2446 2630
2447=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2448 2632
2449Moves 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
2450her, loading and preparing them map, calling the provided $check callback 2634her, loading and preparing them map, calling the provided $check callback
2451that 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
2452the 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
2453be 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 >>.
2454 2641
2455=cut 2642=cut
2456 2643
2457our $GOTOGEN; 2644our $GOTOGEN;
2458 2645
2537} 2724}
2538 2725
2539sub prepare_random_map { 2726sub prepare_random_map {
2540 my ($exit) = @_; 2727 my ($exit) = @_;
2541 2728
2542 my $guard = cf::lock_acquire "exit_prepare:$exit";
2543
2544 # all this does is basically replace the /! path by 2729 # all this does is basically replace the /! path by
2545 # a new random map path (?random/...) with a seed 2730 # a new random map path (?random/...) with a seed
2546 # that depends on the exit object 2731 # that depends on the exit object
2547 2732
2548 my $rmp = parse_random_map_params $exit->msg; 2733 my $rmp = parse_random_map_params $exit->msg;
2550 if ($exit->map) { 2735 if ($exit->map) {
2551 $rmp->{region} = $exit->region->name; 2736 $rmp->{region} = $exit->region->name;
2552 $rmp->{origin_map} = $exit->map->path; 2737 $rmp->{origin_map} = $exit->map->path;
2553 $rmp->{origin_x} = $exit->x; 2738 $rmp->{origin_x} = $exit->x;
2554 $rmp->{origin_y} = $exit->y; 2739 $rmp->{origin_y} = $exit->y;
2740
2741 $exit->map->touch;
2555 } 2742 }
2556 2743
2557 $rmp->{random_seed} ||= $exit->random_seed; 2744 $rmp->{random_seed} ||= $exit->random_seed;
2558 2745
2559 my $data = cf::to_json $rmp; 2746 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2560 my $md5 = Digest::MD5::md5_hex $data; 2747 my $md5 = Digest::MD5::md5_hex $data;
2561 my $meta = "$RANDOMDIR/$md5.meta"; 2748 my $meta = "$RANDOMDIR/$md5.meta";
2562 2749
2563 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2750 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2564 aio_write $fh, 0, (length $data), $data, 0; 2751 aio_write $fh, 0, (length $data), $data, 0;
2565 undef $fh; 2752 undef $fh;
2566 aio_rename "$meta~", $meta; 2753 aio_rename "$meta~", $meta;
2567 2754
2755 my $slaying = "?random/$md5";
2756
2757 if ($exit->valid) {
2568 $exit->slaying ("?random/$md5"); 2758 $exit->slaying ("?random/$md5");
2569 $exit->msg (undef); 2759 $exit->msg (undef);
2760 }
2570 } 2761 }
2571} 2762}
2572 2763
2573sub cf::object::player::enter_exit { 2764sub cf::object::player::enter_exit {
2574 my ($self, $exit) = @_; 2765 my ($self, $exit) = @_;
2575 2766
2576 return unless $self->type == cf::PLAYER; 2767 return unless $self->type == cf::PLAYER;
2577 2768
2578 if ($exit->slaying eq "/!") {
2579 #TODO: this should de-fi-ni-te-ly not be a sync-job
2580 # the problem is that $exit might not survive long enough
2581 # so it needs to be done right now, right here
2582 cf::sync_job { prepare_random_map $exit };
2583 }
2584
2585 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2586 my $hp = $exit->stats->hp;
2587 my $sp = $exit->stats->sp;
2588
2589 $self->enter_link; 2769 $self->enter_link;
2590 2770
2591 # if exit is damned, update players death & WoR home-position
2592 $self->contr->savebed ($slaying, $hp, $sp)
2593 if $exit->flag (FLAG_DAMNED);
2594
2595 (async { 2771 (async {
2596 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2772 $Coro::current->{desc} = "enter_exit";
2597 2773
2598 $self->deactivate_recursive; # just to be sure
2599 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
2600 $self->goto ($slaying, $hp, $sp); 2789 $self->goto ($map, $x, $y);
2601 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
2602 1; 2795 1
2603 }) { 2796 }) {
2604 $self->message ("Something went wrong deep within the crossfire server. " 2797 $self->message ("Something went wrong deep within the deliantra server. "
2605 . "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. "
2606 . "Please report this to the dungeon master!", 2799 . "Please report this to the dungeon master!",
2607 cf::NDI_UNIQUE | cf::NDI_RED); 2800 cf::NDI_UNIQUE | cf::NDI_RED);
2608 2801
2609 warn "ERROR in enter_exit: $@"; 2802 warn "ERROR in enter_exit: $@";
2626sub cf::client::send_drawinfo { 2819sub cf::client::send_drawinfo {
2627 my ($self, $text, $flags) = @_; 2820 my ($self, $text, $flags) = @_;
2628 2821
2629 utf8::encode $text; 2822 utf8::encode $text;
2630 $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);
2631} 2849}
2632 2850
2633=item $client->send_msg ($channel, $msg, $color, [extra...]) 2851=item $client->send_msg ($channel, $msg, $color, [extra...])
2634 2852
2635Send 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
2637the 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
2638the message unless the client supports the msg packet. 2856the message unless the client supports the msg packet.
2639 2857
2640=cut 2858=cut
2641 2859
2860# non-persistent channels (usually the info channel)
2642our %CHANNEL = ( 2861our %CHANNEL = (
2862 "c/motd" => {
2863 id => "infobox",
2864 title => "MOTD",
2865 reply => undef,
2866 tooltip => "The message of the day",
2867 },
2643 "c/identify" => { 2868 "c/identify" => {
2644 id => "infobox", 2869 id => "infobox",
2645 title => "Identify", 2870 title => "Identify",
2646 reply => undef, 2871 reply => undef,
2647 tooltip => "Items recently identified", 2872 tooltip => "Items recently identified",
2650 id => "infobox", 2875 id => "infobox",
2651 title => "Examine", 2876 title => "Examine",
2652 reply => undef, 2877 reply => undef,
2653 tooltip => "Signs and other items you examined", 2878 tooltip => "Signs and other items you examined",
2654 }, 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 },
2655 "c/lookat" => { 2892 "c/lookat" => {
2656 id => "infobox", 2893 id => "infobox",
2657 title => "Look", 2894 title => "Look",
2658 reply => undef, 2895 reply => undef,
2659 tooltip => "What you saw there", 2896 tooltip => "What you saw there",
2660 }, 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,
2661); 2972);
2662 2973
2663sub cf::client::send_msg { 2974sub cf::client::send_msg {
2664 my ($self, $channel, $msg, $color, @extra) = @_; 2975 my ($self, $channel, $msg, $color, @extra) = @_;
2665 2976
2666 $msg = $self->pl->expand_cfpod ($msg); 2977 $msg = $self->pl->expand_cfpod ($msg)
2978 unless $color & cf::NDI_VERBATIM;
2667 2979
2668 $color &= cf::NDI_CLIENT_MASK; # just in case... 2980 $color &= cf::NDI_CLIENT_MASK; # just in case...
2669 2981
2670 # check predefined channels, for the benefit of C 2982 # check predefined channels, for the benefit of C
2671 if ($CHANNEL{$channel}) { 2983 if ($CHANNEL{$channel}) {
2672 $channel = $CHANNEL{$channel}; 2984 $channel = $CHANNEL{$channel};
2673 2985
2674 $self->ext_msg (channel_info => $channel) 2986 $self->ext_msg (channel_info => $channel);
2675 if $self->can_msg;
2676
2677 $channel = $channel->{id}; 2987 $channel = $channel->{id};
2678 2988
2679 } elsif (ref $channel) { 2989 } elsif (ref $channel) {
2680 # send meta info to client, if not yet sent 2990 # send meta info to client, if not yet sent
2681 unless (exists $self->{channel}{$channel->{id}}) { 2991 unless (exists $self->{channel}{$channel->{id}}) {
2682 $self->{channel}{$channel->{id}} = $channel; 2992 $self->{channel}{$channel->{id}} = $channel;
2683 $self->ext_msg (channel_info => $channel) 2993 $self->ext_msg (channel_info => $channel);
2684 if $self->can_msg;
2685 } 2994 }
2686 2995
2687 $channel = $channel->{id}; 2996 $channel = $channel->{id};
2688 } 2997 }
2689 2998
2690 return unless @extra || length $msg; 2999 return unless @extra || length $msg;
2691 3000
2692 if ($self->can_msg) {
2693 # default colour, mask it out 3001 # default colour, mask it out
2694 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3002 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2695 if $color & cf::NDI_DEF; 3003 if $color & cf::NDI_DEF;
2696 3004
2697 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3005 my $pkt = "msg "
3006 . $self->{json_coder}->encode (
2698 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3007 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2699 } else { 3008 );
2700 if ($color >= 0) {
2701 # replace some tags by gcfclient-compatible ones
2702 for ($msg) {
2703 1 while
2704 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2705 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2706 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2707 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2708 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2709 }
2710 3009
2711 $color &= cf::NDI_COLOR_MASK; 3010 $self->send_big_packet ($pkt);
2712
2713 utf8::encode $msg;
2714
2715 if (0 && $msg =~ /\[/) {
2716 # COMMAND/INFO
2717 $self->send_packet ("drawextinfo $color 10 8 $msg")
2718 } else {
2719 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2720 $self->send_packet ("drawinfo $color $msg")
2721 }
2722 }
2723 }
2724} 3011}
2725 3012
2726=item $client->ext_msg ($type, @msg) 3013=item $client->ext_msg ($type, @msg)
2727 3014
2728Sends an ext event to the client. 3015Sends an ext event to the client.
2731 3018
2732sub cf::client::ext_msg($$@) { 3019sub cf::client::ext_msg($$@) {
2733 my ($self, $type, @msg) = @_; 3020 my ($self, $type, @msg) = @_;
2734 3021
2735 if ($self->extcmd == 2) { 3022 if ($self->extcmd == 2) {
2736 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3023 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2737 } elsif ($self->extcmd == 1) { # TODO: remove 3024 } elsif ($self->extcmd == 1) { # TODO: remove
2738 push @msg, msgtype => "event_$type"; 3025 push @msg, msgtype => "event_$type";
2739 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2740 } 3027 }
2741} 3028}
2742 3029
2743=item $client->ext_reply ($msgid, @msg) 3030=item $client->ext_reply ($msgid, @msg)
2744 3031
2748 3035
2749sub cf::client::ext_reply($$@) { 3036sub cf::client::ext_reply($$@) {
2750 my ($self, $id, @msg) = @_; 3037 my ($self, $id, @msg) = @_;
2751 3038
2752 if ($self->extcmd == 2) { 3039 if ($self->extcmd == 2) {
2753 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2754 } elsif ($self->extcmd == 1) { 3041 } elsif ($self->extcmd == 1) {
2755 #TODO: version 1, remove 3042 #TODO: version 1, remove
2756 unshift @msg, msgtype => "reply", msgid => $id; 3043 unshift @msg, msgtype => "reply", msgid => $id;
2757 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3044 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2758 } 3045 }
2759} 3046}
2760 3047
2761=item $success = $client->query ($flags, "text", \&cb) 3048=item $success = $client->query ($flags, "text", \&cb)
2762 3049
2863 3150
2864 $coro 3151 $coro
2865} 3152}
2866 3153
2867cf::client->attach ( 3154cf::client->attach (
2868 on_destroy => sub { 3155 on_client_destroy => sub {
2869 my ($ns) = @_; 3156 my ($ns) = @_;
2870 3157
2871 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3158 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2872 }, 3159 },
2873); 3160);
2889our $safe_hole = new Safe::Hole; 3176our $safe_hole = new Safe::Hole;
2890 3177
2891$SIG{FPE} = 'IGNORE'; 3178$SIG{FPE} = 'IGNORE';
2892 3179
2893$safe->permit_only (Opcode::opset qw( 3180$safe->permit_only (Opcode::opset qw(
2894 :base_core :base_mem :base_orig :base_math 3181 :base_core :base_mem :base_orig :base_math :base_loop
2895 grepstart grepwhile mapstart mapwhile 3182 grepstart grepwhile mapstart mapwhile
2896 sort time 3183 sort time
2897)); 3184));
2898 3185
2899# here we export the classes and methods available to script code 3186# here we export the classes and methods available to script code
2902 3189
2903The following functions and methods are available within a safe environment: 3190The following functions and methods are available within a safe environment:
2904 3191
2905 cf::object 3192 cf::object
2906 contr pay_amount pay_player map x y force_find force_add destroy 3193 contr pay_amount pay_player map x y force_find force_add destroy
2907 insert remove name archname title slaying race decrease_ob_nr 3194 insert remove name archname title slaying race decrease split
3195 value
2908 3196
2909 cf::object::player 3197 cf::object::player
2910 player 3198 player
2911 3199
2912 cf::player 3200 cf::player
2917 3205
2918=cut 3206=cut
2919 3207
2920for ( 3208for (
2921 ["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
2922 insert remove inv name archname title slaying race 3210 insert remove inv nrof name archname title slaying race
2923 decrease_ob_nr destroy)], 3211 decrease split destroy change_exp value msg lore send_msg)],
2924 ["cf::object::player" => qw(player)], 3212 ["cf::object::player" => qw(player)],
2925 ["cf::player" => qw(peaceful)], 3213 ["cf::player" => qw(peaceful send_msg)],
2926 ["cf::map" => qw(trigger)], 3214 ["cf::map" => qw(trigger)],
2927) { 3215) {
2928 no strict 'refs'; 3216 no strict 'refs';
2929 my ($pkg, @funs) = @$_; 3217 my ($pkg, @funs) = @$_;
2930 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2948 3236
2949 my $qcode = $code; 3237 my $qcode = $code;
2950 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3238 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2951 $qcode =~ s/\n/\\n/g; 3239 $qcode =~ s/\n/\\n/g;
2952 3240
3241 %vars = (_dummy => 0) unless %vars;
3242
3243 my @res;
2953 local $_; 3244 local $_;
2954 local @safe::cf::_safe_eval_args = values %vars;
2955 3245
2956 my $eval = 3246 my $eval =
2957 "do {\n" 3247 "do {\n"
2958 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3248 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2959 . "#line 0 \"{$qcode}\"\n" 3249 . "#line 0 \"{$qcode}\"\n"
2960 . $code 3250 . $code
2961 . "\n}" 3251 . "\n}"
2962 ; 3252 ;
2963 3253
3254 if ($CFG{safe_eval}) {
2964 sub_generation_inc; 3255 sub_generation_inc;
3256 local @safe::cf::_safe_eval_args = values %vars;
2965 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3257 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2966 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 }
2967 3263
2968 if ($@) { 3264 if ($@) {
2969 warn "$@"; 3265 warn "$@";
2970 warn "while executing safe code '$code'\n"; 3266 warn "while executing safe code '$code'\n";
2971 warn "with arguments " . (join " ", %vars) . "\n"; 3267 warn "with arguments " . (join " ", %vars) . "\n";
2990=cut 3286=cut
2991 3287
2992sub register_script_function { 3288sub register_script_function {
2993 my ($fun, $cb) = @_; 3289 my ($fun, $cb) = @_;
2994 3290
2995 no strict 'refs'; 3291 $fun = "safe::$fun" if $CFG{safe_eval};
2996 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3292 *$fun = $safe_hole->wrap ($cb);
2997} 3293}
2998 3294
2999=back 3295=back
3000 3296
3001=cut 3297=cut
3022 3318
3023 $facedata->{version} == 2 3319 $facedata->{version} == 2
3024 or cf::cleanup "$path: version mismatch, cannot proceed."; 3320 or cf::cleanup "$path: version mismatch, cannot proceed.";
3025 3321
3026 # 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]);
3027 $facedata->{resource}{"res/exp_table"} = { 3324 $facedata->{resource}{"res/exp_table"} = {
3028 type => FT_RSRC, 3325 type => FT_RSRC,
3029 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),
3030 }; 3328 };
3031 cf::cede_to_tick; 3329 cf::cede_to_tick;
3032 3330
3033 { 3331 {
3034 my $faces = $facedata->{faceinfo}; 3332 my $faces = $facedata->{faceinfo};
3035 3333
3036 while (my ($face, $info) = each %$faces) { 3334 while (my ($face, $info) = each %$faces) {
3037 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3335 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3336
3038 cf::face::set_visibility $idx, $info->{visibility}; 3337 cf::face::set_visibility $idx, $info->{visibility};
3039 cf::face::set_magicmap $idx, $info->{magicmap}; 3338 cf::face::set_magicmap $idx, $info->{magicmap};
3040 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3041 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3042 3341
3043 cf::cede_to_tick; 3342 cf::cede_to_tick;
3044 } 3343 }
3045 3344
3046 while (my ($face, $info) = each %$faces) { 3345 while (my ($face, $info) = each %$faces) {
3047 next unless $info->{smooth}; 3346 next unless $info->{smooth};
3347
3048 my $idx = cf::face::find $face 3348 my $idx = cf::face::find $face
3049 or next; 3349 or next;
3350
3050 if (my $smooth = cf::face::find $info->{smooth}) { 3351 if (my $smooth = cf::face::find $info->{smooth}) {
3051 cf::face::set_smooth $idx, $smooth; 3352 cf::face::set_smooth $idx, $smooth;
3052 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3353 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3053 } else { 3354 } else {
3054 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3355 warn "smooth face '$info->{smooth}' not found for face '$face'";
3068 3369
3069 cf::anim::invalidate_all; # d'oh 3370 cf::anim::invalidate_all; # d'oh
3070 } 3371 }
3071 3372
3072 { 3373 {
3073 # TODO: for gcfclient pleasure, we should give resources
3074 # that gcfclient doesn't grok a >10000 face index.
3075 my $res = $facedata->{resource}; 3374 my $res = $facedata->{resource};
3076 3375
3077 my $soundconf = delete $res->{"res/sound.conf"};
3078
3079 while (my ($name, $info) = each %$res) { 3376 while (my ($name, $info) = each %$res) {
3377 if (defined $info->{type}) {
3080 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3378 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3081 my $data;
3082 3379
3083 if ($info->{type} & 1) { 3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3084 # prepend meta info 3381 cf::face::set_type $idx, $info->{type};
3085
3086 my $meta = $enc->encode ({
3087 name => $name,
3088 %{ $info->{meta} || {} },
3089 });
3090
3091 $data = pack "(w/a*)*", $meta, $info->{data};
3092 } else { 3382 } else {
3093 $data = $info->{data}; 3383 $RESOURCE{$name} = $info;
3094 } 3384 }
3095 3385
3096 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3097 cf::face::set_type $idx, $info->{type};
3098
3099 cf::cede_to_tick; 3386 cf::cede_to_tick;
3100 } 3387 }
3101
3102 if ($soundconf) {
3103 $soundconf = $enc->decode (delete $soundconf->{data});
3104
3105 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3106 my $sound = $soundconf->{compat}[$_]
3107 or next;
3108
3109 my $face = cf::face::find "sound/$sound->[1]";
3110 cf::sound::set $sound->[0] => $face;
3111 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3112 }
3113
3114 while (my ($k, $v) = each %{$soundconf->{event}}) {
3115 my $face = cf::face::find "sound/$v";
3116 cf::sound::set $k => $face;
3117 }
3118 }
3119 } 3388 }
3389
3390 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3120 3391
3121 1 3392 1
3122} 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});
3123 3414
3124register_exticmd fx_want => sub { 3415register_exticmd fx_want => sub {
3125 my ($ns, $want) = @_; 3416 my ($ns, $want) = @_;
3126 3417
3127 while (my ($k, $v) = each %$want) { 3418 while (my ($k, $v) = each %$want) {
3128 $ns->fx_want ($k, $v); 3419 $ns->fx_want ($k, $v);
3129 } 3420 }
3130}; 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}
3131 3432
3132sub reload_regions { 3433sub reload_regions {
3133 # 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
3134 # for this (global event?) 3435 # for this (global event?)
3135 %ext::player_env::MUSIC_FACE_CACHE = (); 3436 %ext::player_env::MUSIC_FACE_CACHE = ();
3149} 3450}
3150 3451
3151sub reload_archetypes { 3452sub reload_archetypes {
3152 load_resource_file "$DATADIR/archetypes" 3453 load_resource_file "$DATADIR/archetypes"
3153 or die "unable to load archetypes\n"; 3454 or die "unable to load archetypes\n";
3154 #d# NEED to laod twice to resolve forward references
3155 # this really needs to be done in an extra post-pass
3156 # (which needs to be synchronous, so solve it differently)
3157 load_resource_file "$DATADIR/archetypes"
3158 or die "unable to load archetypes\n";
3159} 3455}
3160 3456
3161sub reload_treasures { 3457sub reload_treasures {
3162 load_resource_file "$DATADIR/treasures" 3458 load_resource_file "$DATADIR/treasures"
3163 or die "unable to load treasurelists\n"; 3459 or die "unable to load treasurelists\n";
3164} 3460}
3165 3461
3166sub reload_resources { 3462sub reload_resources {
3167 warn "reloading resource files...\n"; 3463 warn "reloading resource files...\n";
3168 3464
3465 reload_facedata;
3466 reload_archetypes;
3169 reload_regions; 3467 reload_regions;
3170 reload_facedata;
3171 #reload_archetypes;#d#
3172 reload_archetypes;
3173 reload_treasures; 3468 reload_treasures;
3174 3469
3175 warn "finished reloading resource files\n"; 3470 warn "finished reloading resource files\n";
3176} 3471}
3177 3472
3178sub init {
3179 reload_resources;
3180}
3181
3182sub reload_config { 3473sub reload_config {
3474 warn "reloading config file...\n";
3475
3183 open my $fh, "<:utf8", "$CONFDIR/config" 3476 open my $fh, "<:utf8", "$CONFDIR/config"
3184 or return; 3477 or return;
3185 3478
3186 local $/; 3479 local $/;
3187 *CFG = YAML::Syck::Load <$fh>; 3480 *CFG = YAML::XS::Load scalar <$fh>;
3188 3481
3189 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3190 3483
3191 $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};
3192 $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};
3196 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3197 and die "WARNING: m(un)lockall failed: $!\n"; 3490 and die "WARNING: m(un)lockall failed: $!\n";
3198 }; 3491 };
3199 warn $@ if $@; 3492 warn $@ if $@;
3200 } 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;
3201} 3524}
3202 3525
3203sub 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
3204 # we must not ever block the main coroutine 3541 # we must not ever block the main coroutine
3205 local $Coro::idle = sub { 3542 local $Coro::idle = sub {
3206 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#
3207 (async { 3544 (async {
3208 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3545 $Coro::current->{desc} = "IDLE BUG HANDLER";
3209 Event::one_event; 3546 EV::loop EV::LOOP_ONESHOT;
3210 })->prio (Coro::PRIO_MAX); 3547 })->prio (Coro::PRIO_MAX);
3211 }; 3548 };
3212 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;
3213 reload_config; 3557 reload_config;
3214 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
3215 load_extensions; 3568 load_extensions;
3216 3569
3217 $TICK_WATCHER->start; 3570 utime time, time, $RUNTIMEFILE;
3218 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;
3219} 3580}
3220 3581
3221############################################################################# 3582#############################################################################
3222# initialisation and cleanup 3583# initialisation and cleanup
3223 3584
3224# install some emergency cleanup handlers 3585# install some emergency cleanup handlers
3225BEGIN { 3586BEGIN {
3587 our %SIGWATCHER = ();
3226 for my $signal (qw(INT HUP TERM)) { 3588 for my $signal (qw(INT HUP TERM)) {
3227 Event->signal ( 3589 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3228 reentrant => 0,
3229 data => WF_AUTOCANCEL,
3230 signal => $signal,
3231 prio => 0,
3232 cb => sub {
3233 cf::cleanup "SIG$signal"; 3590 cf::cleanup "SIG$signal";
3234 },
3235 ); 3591 };
3236 } 3592 }
3237} 3593}
3238 3594
3239sub write_runtime { 3595sub write_runtime_sync {
3240 my $runtime = "$LOCALDIR/runtime"; 3596 my $t0 = EV::time;
3241 3597
3242 # first touch the runtime file to show we are still running: 3598 # first touch the runtime file to show we are still running:
3243 # the fsync below can take a very very long time. 3599 # the fsync below can take a very very long time.
3244 3600
3245 IO::AIO::aio_utime $runtime, undef, undef; 3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3246 3602
3247 my $guard = cf::lock_acquire "write_runtime"; 3603 my $guard = cf::lock_acquire "write_runtime";
3248 3604
3249 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3605 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3250 or return; 3606 or return;
3251 3607
3252 my $value = $cf::RUNTIME + 90 + 10; 3608 my $value = $cf::RUNTIME + 90 + 10;
3253 # 10 is the runtime save interval, for a monotonic clock 3609 # 10 is the runtime save interval, for a monotonic clock
3254 # 60 allows for the watchdog to kill the server. 3610 # 60 allows for the watchdog to kill the server.
3264 aio_utime $fh, undef, undef; 3620 aio_utime $fh, undef, undef;
3265 3621
3266 close $fh 3622 close $fh
3267 or return; 3623 or return;
3268 3624
3269 aio_rename "$runtime~", $runtime 3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3270 and return; 3626 and return;
3271 3627
3272 warn "runtime file written.\n"; 3628 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3273 3629
3274 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 };
3275} 3681}
3276 3682
3277sub emergency_save() { 3683sub emergency_save() {
3278 my $freeze_guard = cf::freeze_mainloop; 3684 my $freeze_guard = cf::freeze_mainloop;
3279 3685
3280 warn "enter emergency perl save\n"; 3686 warn "emergency_perl_save: enter\n";
3281 3687
3282 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
3283 # use a peculiar iteration method to avoid tripping on perl 3694 # use a peculiar iteration method to avoid tripping on perl
3284 # refcount bugs in for. also avoids problems with players 3695 # refcount bugs in for. also avoids problems with players
3285 # and maps saved/destroyed asynchronously. 3696 # and maps saved/destroyed asynchronously.
3286 warn "begin emergency player save\n"; 3697 warn "emergency_perl_save: begin player save\n";
3287 for my $login (keys %cf::PLAYER) { 3698 for my $login (keys %cf::PLAYER) {
3288 my $pl = $cf::PLAYER{$login} or next; 3699 my $pl = $cf::PLAYER{$login} or next;
3289 $pl->valid or next; 3700 $pl->valid or next;
3290 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3291 $pl->save; 3702 $pl->save;
3292 } 3703 }
3293 warn "end emergency player save\n"; 3704 warn "emergency_perl_save: end player save\n";
3294 3705
3295 warn "begin emergency map save\n"; 3706 warn "emergency_perl_save: begin map save\n";
3296 for my $path (keys %cf::MAP) { 3707 for my $path (keys %cf::MAP) {
3297 my $map = $cf::MAP{$path} or next; 3708 my $map = $cf::MAP{$path} or next;
3298 $map->valid or next; 3709 $map->valid or next;
3299 $map->save; 3710 $map->save;
3300 } 3711 }
3301 warn "end emergency map save\n"; 3712 warn "emergency_perl_save: end map save\n";
3302 3713
3303 warn "begin emergency database checkpoint\n"; 3714 warn "emergency_perl_save: begin database checkpoint\n";
3304 BDB::db_env_txn_checkpoint $DB_ENV; 3715 BDB::db_env_txn_checkpoint $DB_ENV;
3305 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";
3306 }; 3721 };
3307 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
3308 warn "leave emergency perl save\n"; 3728 warn "emergency_perl_save: leave\n";
3309} 3729}
3310 3730
3311sub post_cleanup { 3731sub post_cleanup {
3312 my ($make_core) = @_; 3732 my ($make_core) = @_;
3313 3733
3314 warn Carp::longmess "post_cleanup backtrace" 3734 warn Carp::longmess "post_cleanup backtrace"
3315 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#
3316} 3765}
3317 3766
3318sub do_reload_perl() { 3767sub do_reload_perl() {
3319 # can/must only be called in main 3768 # can/must only be called in main
3320 if ($Coro::current != $Coro::main) { 3769 if ($Coro::current != $Coro::main) {
3321 warn "can only reload from main coroutine"; 3770 warn "can only reload from main coroutine";
3322 return; 3771 return;
3323 } 3772 }
3324 3773
3774 return if $RELOAD++;
3775
3776 my $t1 = EV::time;
3777
3778 while ($RELOAD) {
3325 warn "reloading..."; 3779 warn "reloading...";
3326 3780
3327 warn "entering sync_job"; 3781 warn "entering sync_job";
3328 3782
3329 cf::sync_job { 3783 cf::sync_job {
3330 cf::write_runtime; # external watchdog should not bark 3784 cf::write_runtime_sync; # external watchdog should not bark
3331 cf::emergency_save; 3785 cf::emergency_save;
3332 cf::write_runtime; # external watchdog should not bark 3786 cf::write_runtime_sync; # external watchdog should not bark
3333 3787
3334 warn "syncing database to disk"; 3788 warn "syncing database to disk";
3335 BDB::db_env_txn_checkpoint $DB_ENV; 3789 BDB::db_env_txn_checkpoint $DB_ENV;
3336 3790
3337 # 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
3338 3792
3339 warn "cancelling all WF_AUTOCANCEL watchers";
3340 for (Event::all_watchers) {
3341 $_->cancel if $_->data & WF_AUTOCANCEL;
3342 }
3343
3344 warn "flushing outstanding aio requests"; 3793 warn "flushing outstanding aio requests";
3345 for (;;) {
3346 BDB::flush;
3347 IO::AIO::flush;
3348 Coro::cede;
3349 last unless IO::AIO::nreqs || BDB::nreqs; 3794 while (IO::AIO::nreqs || BDB::nreqs) {
3350 warn "iterate..."; 3795 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3351 }
3352
3353 ++$RELOAD;
3354
3355 warn "cancelling all extension coros";
3356 $_->cancel for values %EXT_CORO;
3357 %EXT_CORO = ();
3358
3359 warn "removing commands";
3360 %COMMAND = ();
3361
3362 warn "removing ext/exti commands";
3363 %EXTCMD = ();
3364 %EXTICMD = ();
3365
3366 warn "unloading/nuking all extensions";
3367 for my $pkg (@EXTS) {
3368 warn "... unloading $pkg";
3369
3370 if (my $cb = $pkg->can ("unload")) {
3371 eval {
3372 $cb->($pkg);
3373 1
3374 } or warn "$pkg unloaded, but with errors: $@";
3375 } 3796 }
3376 3797
3377 warn "... nuking $pkg"; 3798 warn "cancelling all extension coros";
3378 Symbol::delete_package $pkg; 3799 $_->cancel for values %EXT_CORO;
3379 } 3800 %EXT_CORO = ();
3380 3801
3381 warn "unloading all perl modules loaded from $LIBDIR"; 3802 warn "removing commands";
3382 while (my ($k, $v) = each %INC) { 3803 %COMMAND = ();
3383 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3384 3804
3805 warn "removing ext/exti commands";
3806 %EXTCMD = ();
3807 %EXTICMD = ();
3808
3809 warn "unloading/nuking all extensions";
3810 for my $pkg (@EXTS) {
3385 warn "... unloading $k"; 3811 warn "... unloading $pkg";
3386 delete $INC{$k};
3387 3812
3388 $k =~ s/\.pm$//;
3389 $k =~ s/\//::/g;
3390
3391 if (my $cb = $k->can ("unload_module")) { 3813 if (my $cb = $pkg->can ("unload")) {
3814 eval {
3392 $cb->(); 3815 $cb->($pkg);
3816 1
3817 } or warn "$pkg unloaded, but with errors: $@";
3818 }
3819
3820 warn "... clearing $pkg";
3821 clear_package $pkg;
3393 } 3822 }
3394 3823
3395 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;
3396 } 3839 }
3397 3840
3398 warn "getting rid of safe::, as good as possible"; 3841 warn "getting rid of safe::, as good as possible";
3399 Symbol::delete_package "safe::$_" 3842 clear_package "safe::$_"
3400 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);
3401 3844
3402 warn "unloading cf.pm \"a bit\""; 3845 warn "unloading cf.pm \"a bit\"";
3403 delete $INC{"cf.pm"}; 3846 delete $INC{"cf.pm"};
3404 delete $INC{"cf/pod.pm"}; 3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3405 3848
3406 # don't, removes xs symbols, too, 3849 # don't, removes xs symbols, too,
3407 # and global variables created in xs 3850 # and global variables created in xs
3408 #Symbol::delete_package __PACKAGE__; 3851 #clear_package __PACKAGE__;
3409 3852
3410 warn "unload completed, starting to reload now"; 3853 warn "unload completed, starting to reload now";
3411 3854
3412 warn "reloading cf.pm"; 3855 warn "reloading cf.pm";
3413 require cf; 3856 require cf;
3414 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3857 cf::_connect_to_perl_1;
3415 3858
3416 warn "loading config and database again"; 3859 warn "loading config and database again";
3417 cf::reload_config; 3860 cf::reload_config;
3418 3861
3419 warn "loading extensions"; 3862 warn "loading extensions";
3420 cf::load_extensions; 3863 cf::load_extensions;
3421 3864
3865 if ($REATTACH_ON_RELOAD) {
3422 warn "reattaching attachments to objects/players"; 3866 warn "reattaching attachments to objects/players";
3423 _global_reattach; # objects, sockets 3867 _global_reattach; # objects, sockets
3424 warn "reattaching attachments to maps"; 3868 warn "reattaching attachments to maps";
3425 reattach $_ for values %MAP; 3869 reattach $_ for values %MAP;
3426 warn "reattaching attachments to players"; 3870 warn "reattaching attachments to players";
3427 reattach $_ for values %PLAYER; 3871 reattach $_ for values %PLAYER;
3872 }
3428 3873
3874 warn "running post_init jobs";
3875 (pop @POST_INIT)->(1) while @POST_INIT;
3876
3429 warn "leaving sync_job"; 3877 warn "leaving sync_job";
3430 3878
3431 1 3879 1
3432 } or do { 3880 } or do {
3433 warn $@; 3881 warn $@;
3434 warn "error while reloading, exiting."; 3882 cf::cleanup "error while reloading, exiting.";
3435 exit 1;
3436 }; 3883 };
3437 3884
3438 warn "reloaded"; 3885 warn "reloaded";
3886 --$RELOAD;
3887 }
3888
3889 $t1 = EV::time - $t1;
3890 warn "reload completed in ${t1}s\n";
3439}; 3891};
3440 3892
3441our $RELOAD_WATCHER; # used only during reload 3893our $RELOAD_WATCHER; # used only during reload
3442 3894
3443sub reload_perl() { 3895sub reload_perl() {
3444 # doing reload synchronously and two reloads happen back-to-back, 3896 # doing reload synchronously and two reloads happen back-to-back,
3445 # coro crashes during coro_state_free->destroy here. 3897 # coro crashes during coro_state_free->destroy here.
3446 3898
3447 $RELOAD_WATCHER ||= Event->timer ( 3899 $RELOAD_WATCHER ||= cf::async {
3448 reentrant => 0, 3900 Coro::AIO::aio_wait cache_extensions;
3449 after => 0, 3901
3450 data => WF_AUTOCANCEL, 3902 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3451 cb => sub {
3452 do_reload_perl; 3903 do_reload_perl;
3453 undef $RELOAD_WATCHER; 3904 undef $RELOAD_WATCHER;
3454 }, 3905 };
3455 ); 3906 };
3456} 3907}
3457 3908
3458register_command "reload" => sub { 3909register_command "reload" => sub {
3459 my ($who, $arg) = @_; 3910 my ($who, $arg) = @_;
3460 3911
3473 3924
3474our @WAIT_FOR_TICK; 3925our @WAIT_FOR_TICK;
3475our @WAIT_FOR_TICK_BEGIN; 3926our @WAIT_FOR_TICK_BEGIN;
3476 3927
3477sub wait_for_tick { 3928sub wait_for_tick {
3478 return unless $TICK_WATCHER->is_active;
3479 return if $Coro::current == $Coro::main; 3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3480 3930
3481 my $signal = new Coro::Signal; 3931 my $signal = new Coro::Signal;
3482 push @WAIT_FOR_TICK, $signal; 3932 push @WAIT_FOR_TICK, $signal;
3483 $signal->wait; 3933 $signal->wait;
3484} 3934}
3485 3935
3486sub wait_for_tick_begin { 3936sub wait_for_tick_begin {
3487 return unless $TICK_WATCHER->is_active;
3488 return if $Coro::current == $Coro::main; 3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3489 3938
3490 my $signal = new Coro::Signal; 3939 my $signal = new Coro::Signal;
3491 push @WAIT_FOR_TICK_BEGIN, $signal; 3940 push @WAIT_FOR_TICK_BEGIN, $signal;
3492 $signal->wait; 3941 $signal->wait;
3493} 3942}
3494 3943
3495$TICK_WATCHER = Event->timer ( 3944sub tick {
3496 reentrant => 0,
3497 parked => 1,
3498 prio => 0,
3499 at => $NEXT_TICK || $TICK,
3500 data => WF_AUTOCANCEL,
3501 cb => sub {
3502 if ($Coro::current != $Coro::main) { 3945 if ($Coro::current != $Coro::main) {
3503 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"
3504 unless ++$bug_warning > 10; 3947 unless ++$bug_warning > 10;
3505 return; 3948 return;
3506 } 3949 }
3507 3950
3508 $NOW = $tick_start = Event::time;
3509
3510 cf::server_tick; # one server iteration 3951 cf::server_tick; # one server iteration
3511 3952
3512 $RUNTIME += $TICK; 3953 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3513 $NEXT_TICK += $TICK;
3514 3954
3515 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3955 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3516 $NEXT_RUNTIME_WRITE = $NOW + 10; 3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3517 Coro::async_pool { 3957 Coro::async_pool {
3518 $Coro::current->{desc} = "runtime saver"; 3958 $Coro::current->{desc} = "runtime saver";
3519 write_runtime 3959 write_runtime_sync
3520 or warn "ERROR: unable to write runtime file: $!"; 3960 or warn "ERROR: unable to write runtime file: $!";
3521 };
3522 } 3961 };
3962 }
3523 3963
3524 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3964 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3525 $sig->send; 3965 $sig->send;
3526 } 3966 }
3527 while (my $sig = shift @WAIT_FOR_TICK) { 3967 while (my $sig = shift @WAIT_FOR_TICK) {
3528 $sig->send; 3968 $sig->send;
3529 } 3969 }
3530 3970
3531 $NOW = Event::time; 3971 $LOAD = ($NOW - $TICK_START) / $TICK;
3532
3533 # if we are delayed by four ticks or more, skip them all
3534 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3535
3536 $TICK_WATCHER->at ($NEXT_TICK);
3537 $TICK_WATCHER->start;
3538
3539 $LOAD = ($NOW - $tick_start) / $TICK;
3540 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3972 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3541 3973
3542 _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 }
3543 }, 3980 }
3544); 3981}
3545 3982
3546{ 3983{
3984 # configure BDB
3985
3547 BDB::min_parallel 8; 3986 BDB::min_parallel 16;
3548 BDB::max_poll_time $TICK * 0.1; 3987 BDB::max_poll_reqs $TICK * 0.1;
3549 $BDB_POLL_WATCHER = Event->io ( 3988 $AnyEvent::BDB::WATCHER->priority (1);
3550 reentrant => 0,
3551 fd => BDB::poll_fileno,
3552 poll => 'r',
3553 prio => 0,
3554 data => WF_AUTOCANCEL,
3555 cb => \&BDB::poll_cb,
3556 );
3557
3558 BDB::set_sync_prepare {
3559 my $status;
3560 my $current = $Coro::current;
3561 (
3562 sub {
3563 $status = $!;
3564 $current->ready; undef $current;
3565 },
3566 sub {
3567 Coro::schedule while defined $current;
3568 $! = $status;
3569 },
3570 )
3571 };
3572 3989
3573 unless ($DB_ENV) { 3990 unless ($DB_ENV) {
3574 $DB_ENV = BDB::db_env_create; 3991 $DB_ENV = BDB::db_env_create;
3575 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3992 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3576 | 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;
3577 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3995 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3578 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3996 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3579 3997
3580 cf::sync_job { 3998 cf::sync_job {
3581 eval { 3999 eval {
3591 4009
3592 cf::cleanup "db_env_open(db): $@" if $@; 4010 cf::cleanup "db_env_open(db): $@" if $@;
3593 }; 4011 };
3594 } 4012 }
3595 4013
3596 $BDB_DEADLOCK_WATCHER = Event->timer ( 4014 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3597 after => 3,
3598 interval => 1,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 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 { };
3604 },
3605 ); 4016 };
3606 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4017 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3607 after => 11,
3608 interval => 60,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4018 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3614 },
3615 ); 4019 };
3616 $BDB_TRICKLE_WATCHER = Event->timer ( 4020 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3617 after => 5,
3618 interval => 10,
3619 hard => 1,
3620 prio => 0,
3621 data => WF_AUTOCANCEL,
3622 cb => sub {
3623 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4021 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3624 },
3625 ); 4022 };
3626} 4023}
3627 4024
3628{ 4025{
4026 # configure IO::AIO
4027
3629 IO::AIO::min_parallel 8; 4028 IO::AIO::min_parallel 8;
3630
3631 undef $Coro::AIO::WATCHER;
3632 IO::AIO::max_poll_time $TICK * 0.1; 4029 IO::AIO::max_poll_time $TICK * 0.1;
3633 $AIO_POLL_WATCHER = Event->io ( 4030 undef $AnyEvent::AIO::WATCHER;
3634 reentrant => 0,
3635 data => WF_AUTOCANCEL,
3636 fd => IO::AIO::poll_fileno,
3637 poll => 'r',
3638 prio => 0,
3639 cb => \&IO::AIO::poll_cb,
3640 );
3641} 4031}
3642 4032
3643my $_log_backtrace; 4033my $_log_backtrace;
3644 4034
3645sub _log_backtrace { 4035sub _log_backtrace {
3648 $msg =~ s/\n//; 4038 $msg =~ s/\n//;
3649 4039
3650 # limit the # of concurrent backtraces 4040 # limit the # of concurrent backtraces
3651 if ($_log_backtrace < 2) { 4041 if ($_log_backtrace < 2) {
3652 ++$_log_backtrace; 4042 ++$_log_backtrace;
4043 my $perl_bt = Carp::longmess $msg;
3653 async { 4044 async {
3654 $Coro::current->{desc} = "abt $msg"; 4045 $Coro::current->{desc} = "abt $msg";
3655 4046
3656 my @bt = fork_call { 4047 my @bt = fork_call {
3657 @addr = map { sprintf "%x", $_ } @addr; 4048 @addr = map { sprintf "%x", $_ } @addr;
3668 } 4059 }
3669 4060
3670 @funcs 4061 @funcs
3671 }; 4062 };
3672 4063
3673 LOG llevInfo, "[ABT] $msg\n"; 4064 LOG llevInfo, "[ABT] $perl_bt\n";
4065 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3674 LOG llevInfo, "[ABT] $_\n" for @bt; 4066 LOG llevInfo, "[ABT] $_\n" for @bt;
3675 --$_log_backtrace; 4067 --$_log_backtrace;
3676 }; 4068 };
3677 } else { 4069 } else {
3678 LOG llevInfo, "[ABT] $msg\n"; 4070 LOG llevInfo, "[ABT] $msg\n";
3679 LOG llevInfo, "[ABT] [suppressed]\n"; 4071 LOG llevInfo, "[ABT] [suppressed]\n";
3680 } 4072 }
3681} 4073}
3682 4074
3683# load additional modules 4075# load additional modules
3684use cf::pod; 4076require "cf/$_.pm" for @EXTRA_MODULES;
4077cf::_connect_to_perl_2;
3685 4078
3686END { cf::emergency_save } 4079END { cf::emergency_save }
3687 4080
36881 40811
3689 4082

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines