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.377 by root, Thu Oct 4 11:36:38 2007 UTC vs.
Revision 1.509 by root, Mon Apr 5 03:22:25 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines