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.348 by root, Thu Aug 30 08:34:40 2007 UTC vs.
Revision 1.511 by root, Wed Apr 7 18:35:56 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 3.64 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
18use Coro::Event; 44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
24use Coro::Util (); 53use Coro::Util ();
25 54
26use JSON::XS (); 55use JSON::XS 2.01 ();
27use BDB (); 56use BDB ();
28use Data::Dumper; 57use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 58use Fcntl;
31use YAML::Syck (); 59use YAML::XS ();
32use IO::AIO 2.32 (); 60use IO::AIO ();
33use Time::HiRes; 61use Time::HiRes;
34use Compress::LZF; 62use Compress::LZF;
35use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
36 66
37# configure various modules to our taste 67# configure various modules to our taste
38# 68#
39$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 77
43$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
44 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 80
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
65our $DATADIR = datadir; 98our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
75 112
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 115our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
83 117
118our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 120our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 121our $DB_ENV;
122
123our @EXTRA_MODULES = qw(pod match mapscript);
86 124
87our %CFG; 125our %CFG;
88 126
89our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 128our $RUNTIME;
129our $NOW;
91 130
92our %PLAYER; # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 132our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
95 134
96# used to convert map paths into valid unix filenames by replacing / by ∕ 135# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 137
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
102 147
103binmode STDOUT; 148binmode STDOUT;
104binmode STDERR; 149binmode STDERR;
105 150
106# read virtual server time, if available 151# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
111} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
112 159
113mkdir $_ 160mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 162
116our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
117 164
118sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
119 177
120############################################################################# 178#############################################################################
121 179
122=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
123 181
159 217
160The raw value load value from the last tick. 218The raw value load value from the last tick.
161 219
162=item %cf::CFG 220=item %cf::CFG
163 221
164Configuration for the server, loaded from C</etc/crossfire/config>, or 222Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 223from wherever your confdir points to.
166 224
167=item cf::wait_for_tick, cf::wait_for_tick_begin 225=item cf::wait_for_tick, cf::wait_for_tick_begin
168 226
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
170returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
171per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172 230
173=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
174 232
175This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call. 235that call.
178 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
179=back 243=back
180 244
181=cut 245=cut
182 246
183BEGIN { 247$Coro::State::WARNHOOK = sub {
184 *CORE::GLOBAL::warn = sub {
185 my $msg = join "", @_; 248 my $msg = join "", @_;
186 249
187 $msg .= "\n" 250 $msg .= "\n"
188 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
189 252
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 254
192 utf8::encode $msg;
193 LOG llevError, $msg; 255 LOG llevError, $msg;
194 }; 256};
195} 257
258$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
262
263 if ($Coro::current == $Coro::main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d#
266 }#d#
267
268 # kill coroutine otherwise
269 Coro::terminate
270};
196 271
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 282for my $pkg (qw(
208 cf::global cf::attachable 283 cf::global cf::attachable
209 cf::object cf::object::player 284 cf::object cf::object::player
210 cf::client cf::player 285 cf::client cf::player
211 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
212 cf::map cf::party cf::region 288 cf::party cf::region
213)) { 289)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 291}
217 292
218$Event::DIED = sub { 293$EV::DIED = sub {
219 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
220}; 295};
221 296
222############################################################################# 297#############################################################################
223 298
224=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 322 $d
248 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
249} 324}
250 325
251=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
252 327
253Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
254 329
255=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
256 331
257Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
258 333
259=cut 334=cut
260 335
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 337
263sub to_json ($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
265 354
266=item cf::lock_wait $string 355=item cf::lock_wait $string
267 356
268Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
269 358
270=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
271 360
272Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
275returned. 364returned.
276 365
277Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro. 367deadlocked coro.
284 373
285Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
286 375
287=cut 376=cut
288 377
289our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
290 379
291sub lock_wait($) { 380sub lock_wait($) {
292 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
293
294 # wait for lock, if any
295 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule;
298 }
299} 382}
300 383
301sub lock_acquire($) { 384sub lock_acquire($) {
302 my ($key) = @_; 385 $LOCKS->guard ($_[0])
303
304 # wait, to be sure we are not locked
305 lock_wait $key;
306
307 $LOCK{$key} = [];
308
309 Coro::guard {
310 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} };
312 }
313} 386}
314 387
315sub lock_active($) { 388sub lock_active($) {
316 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
317
318 ! ! $LOCK{$key}
319} 390}
320 391
321sub freeze_mainloop { 392sub freeze_mainloop {
322 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
323 394
324 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
325 $TICK_WATCHER->start; 396}
326 }; 397
327 $TICK_WATCHER->stop; 398=item cf::periodic $interval, $cb
328 $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
329} 411}
330 412
331=item cf::get_slot $time[, $priority[, $name]] 413=item cf::get_slot $time[, $priority[, $name]]
332 414
333Allocate $time seconds of blocking CPU time at priority C<$priority>: 415Allocate $time seconds of blocking CPU time at priority C<$priority>:
341 423
342=cut 424=cut
343 425
344our @SLOT_QUEUE; 426our @SLOT_QUEUE;
345our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
346 429
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager");
433
349 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
350 436
351 while () { 437 while () {
352 next_job: 438 next_job:
439
353 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
354 if ($avail > 0.01) { 441
355 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
357 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send; 446 $job->[2]->send;
359 Coro::cede; 447 Coro::cede;
360 goto next_job; 448 goto next_job;
361 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
362 } 451 }
363 } 452 }
364 453
365 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
366 # 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
367 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 457 $signal->wait;
369 } else { 458 } else {
459 $busy = 0;
370 Coro::schedule; 460 Coro::schedule;
371 } 461 }
372 } 462 }
373}; 463};
374 464
375sub get_slot($;$$) { 465sub get_slot($;$$) {
466 return if tick_inhibit || $Coro::current == $Coro::main;
467
376 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
377 469
378 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
379 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
380 473
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
394 487
395BEGIN { *async = \&Coro::async_pool } 488BEGIN { *async = \&Coro::async_pool }
396 489
397=item cf::sync_job { BLOCK } 490=item cf::sync_job { BLOCK }
398 491
399The design of Crossfire TRT requires that the main coroutine ($Coro::main) 492The design of Deliantra requires that the main coroutine ($Coro::main)
400is always able to handle events or runnable, as Crossfire TRT is only 493is always able to handle events or runnable, as Deliantra is only
401partly 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
402acceptable. 495acceptable.
403 496
404If 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
405the given BLOCK in another coroutine while waiting for the result. The 498the given BLOCK in another coroutine while waiting for the result. The
410 503
411sub sync_job(&) { 504sub sync_job(&) {
412 my ($job) = @_; 505 my ($job) = @_;
413 506
414 if ($Coro::current == $Coro::main) { 507 if ($Coro::current == $Coro::main) {
415 my $time = Event::time; 508 my $time = EV::time;
416 509
417 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
419 512
420 # TODO: use suspend/resume instead 513 LOG llevError, Carp::longmess "sync job";#d#
421 # (but this is cancel-safe) 514
422 my $freeze_guard = freeze_mainloop; 515 my $freeze_guard = freeze_mainloop;
423 516
424 my $busy = 1; 517 my $busy = 1;
425 my @res; 518 my @res;
426 519
427 (async { 520 (async {
521 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 522 @res = eval { $job->() };
429 warn $@ if $@; 523 warn $@ if $@;
430 undef $busy; 524 undef $busy;
431 })->prio (Coro::PRIO_MAX); 525 })->prio (Coro::PRIO_MAX);
432 526
433 while ($busy) { 527 while ($busy) {
434 Coro::cede or Event::one_event; 528 if (Coro::nready) {
529 Coro::cede_notself;
530 } else {
531 EV::loop EV::LOOP_ONESHOT;
435 } 532 }
533 }
436 534
437 $time = Event::time - $time; 535 my $time = EV::time - $time;
438 536
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load 537 $TICK_START += $time; # do not account sync jobs to server load
443 538
444 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
445 } else { 540 } else {
446 # we are in another coroutine, how wonderful, everything just works 541 # we are in another coroutine, how wonderful, everything just works
447 542
472=item fork_call { }, $args 567=item fork_call { }, $args
473 568
474Executes the given code block with the given arguments in a seperate 569Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with 570process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may 571Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling. 572never block itself or use any form of event handling.
478 573
479=cut 574=cut
480 575
481sub fork_call(&@) { 576sub fork_call(&@) {
482 my ($cb, @args) = @_; 577 my ($cb, @args) = @_;
483 578
484 # we seemingly have to make a local copy of the whole thing, 579 # we seemingly have to make a local copy of the whole thing,
485 # otherwise perl prematurely frees the stuff :/ 580 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious) 581 # TODO: investigate and fix (likely this will be rather laborious)
487 582
488 my @res = Coro::Util::fork_eval { 583 my @res = Coro::Util::fork_eval {
489 reset_signals; 584 reset_signals;
490 &$cb 585 &$cb
491 }, @args; 586 }, @args;
492 587
493 wantarray ? @res : $res[-1] 588 wantarray ? @res : $res[-1]
494} 589}
495 590
591=item $coin = coin_from_name $name
592
593=cut
594
595our %coin_alias = (
596 "silver" => "silvercoin",
597 "silvercoin" => "silvercoin",
598 "silvercoins" => "silvercoin",
599 "gold" => "goldcoin",
600 "goldcoin" => "goldcoin",
601 "goldcoins" => "goldcoin",
602 "platinum" => "platinacoin",
603 "platinumcoin" => "platinacoin",
604 "platinumcoins" => "platinacoin",
605 "platina" => "platinacoin",
606 "platinacoin" => "platinacoin",
607 "platinacoins" => "platinacoin",
608 "royalty" => "royalty",
609 "royalties" => "royalty",
610);
611
612sub coin_from_name($) {
613 $coin_alias{$_[0]}
614 ? cf::arch::find $coin_alias{$_[0]}
615 : undef
616}
617
496=item $value = cf::db_get $family => $key 618=item $value = cf::db_get $family => $key
497 619
498Returns a single value from the environment database. 620Returns a single value from the environment database.
499 621
500=item cf::db_put $family => $key => $value 622=item cf::db_put $family => $key => $value
501 623
502Stores the given C<$value> in the family. It can currently store binary 624Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 625data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 626
627=item $db = cf::db_table "name"
628
629Create and/or open a new database table. The string must not be "db" and must be unique
630within each server.
631
505=cut 632=cut
633
634sub db_table($) {
635 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV;
637
638 eval {
639 $db->set_flags (BDB::CHKSUM);
640
641 utf8::encode $name;
642 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
643 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
644 cf::cleanup "db_open(db): $!" if $!;
645 };
646 cf::cleanup "db_open(db): $@" if $@;
647
648 $db
649}
506 650
507our $DB; 651our $DB;
508 652
509sub db_init { 653sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 654 cf::sync_job {
514 eval { 655 $DB ||= db_table "db";
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
523 } 656 };
524} 657}
525 658
526sub db_get($$) { 659sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 660 my $key = "$_[0]/$_[1]";
528 661
626 759
627############################################################################# 760#############################################################################
628 761
629=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
630 763
631Many 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
632attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
634 767
635In 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>
636C<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
637Crossfire TRT). 770Deliantra).
638 771
639=over 4 772=over 4
640 773
641=item $attachable->attach ($attachment, key => $value...) 774=item $attachable->attach ($attachment, key => $value...)
642 775
686=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
687 820
688Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
689given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
690 823
691Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
692that 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.
693 826
694These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
695 828
696=over 4 829=over 4
924 } 1057 }
925 1058
926 0 1059 0
927} 1060}
928 1061
929=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1062=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930 1063
931=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1064=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932 1065
933Generate an object-specific event with the given arguments. 1066Generate an object-specific event with the given arguments.
934 1067
940 1073
941=cut 1074=cut
942 1075
943############################################################################# 1076#############################################################################
944# object support 1077# object support
945#
946 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#
947sub _can_merge { 1112sub _can_merge {
948 my ($ob1, $ob2) = @_; 1113 my ($ob1, $ob2) = @_;
949 1114
950 local $Storable::canonical = 1; 1115 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1116
954 $fob1 eq $fob2 1117 # we do the slow way here
1118 return _object_equal $ob1, $ob2
955} 1119}
956 1120
957sub reattach { 1121sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1123 my ($obj) = @_;
960 1124
1125 # no longer needed after getting rid of delete_package?
961 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
962 1127
963 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
964 1129
965 @$registry = (); 1130 @$registry = ();
966 1131
981cf::attachable->attach ( 1146cf::attachable->attach (
982 prio => -1000000, 1147 prio => -1000000,
983 on_instantiate => sub { 1148 on_instantiate => sub {
984 my ($obj, $data) = @_; 1149 my ($obj, $data) = @_;
985 1150
986 $data = from_json $data; 1151 $data = decode_json $data;
987 1152
988 for (@$data) { 1153 for (@$data) {
989 my ($name, $args) = @$_; 1154 my ($name, $args) = @$_;
990 1155
991 $obj->attach ($name, %{$args || {} }); 1156 $obj->attach ($name, %{$args || {} });
1007sub object_freezer_save { 1172sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1173 my ($filename, $rdata, $objs) = @_;
1009 1174
1010 sync_job { 1175 sync_job {
1011 if (length $$rdata) { 1176 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1014 1180
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 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 }
1019 close $fh; 1188 aio_close $fh;
1020 1189
1021 if (@$objs) { 1190 if (@$objs) {
1022 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) {
1023 chmod SAVE_MODE, $fh; 1192 aio_chmod $fh, SAVE_MODE;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1026 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 }
1027 close $fh; 1199 aio_close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1201 }
1030 } else { 1202 } else {
1031 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1032 } 1204 }
1033 1205
1034 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1035 } else { 1210 } else {
1036 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1037 } 1212 }
1038 } else { 1213 } else {
1039 aio_unlink $filename; 1214 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1041 } 1216 }
1042 } 1217 };
1043} 1218}
1044 1219
1045sub object_freezer_as_string { 1220sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1221 my ($rdata, $objs) = @_;
1047 1222
1059 or return; 1234 or return;
1060 1235
1061 unless (aio_stat "$filename.pst") { 1236 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1237 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1238 or return;
1239
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1240 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs};
1065 } 1242 }
1066 1243
1244 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1245 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1246 $decname, length $data, scalar @{$av || []};
1247
1069 return ($data, $av); 1248 ($data, $av)
1070} 1249}
1071 1250
1072=head2 COMMAND CALLBACKS 1251=head2 COMMAND CALLBACKS
1073 1252
1074=over 4 1253=over 4
1128 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1129 1308
1130 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1131} 1310}
1132 1311
1312use File::Glob ();
1313
1133cf::player->attach ( 1314cf::player->attach (
1134 on_command => sub { 1315 on_unknown_command => sub {
1135 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1136 1317
1137 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1138 or return; 1319 or return;
1139 1320
1169 1350
1170 cf::override; 1351 cf::override;
1171 }, 1352 },
1172); 1353);
1173 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
1174sub load_extensions { 1368sub load_extensions {
1175 cf::sync_job { 1369 cf::sync_job {
1176 my %todo; 1370 my %todo;
1177 1371
1178 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
1197 1391
1198 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1199 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1200 1394
1201 $ext{source} = 1395 $ext{source} =
1202 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1203 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1204 . $source 1398 . $source
1205 . "\n};\n1"; 1399 . "\n};\n1";
1206 1400
1207 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1208 } 1402 }
1209 1403
1404 my $pass = 0;
1210 my %done; 1405 my %done;
1211 while (%todo) { 1406 while (%todo) {
1212 my $progress; 1407 my $progress;
1213 1408
1409 ++$pass;
1410
1411 ext:
1214 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1215 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1216 goto skip 1414 next ext
1217 unless exists $done{$_}; 1415 unless exists $done{$_};
1218 } 1416 }
1219 1417
1220 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1221 1419
1222 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1223 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1224 : "$v->{base}: extension inactive.\n";
1225 1424
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1226 if (exists $v->{meta}{mandatory}) { 1426 if exists $v->{meta}{mandatory};
1227 warn $msg; 1427 } else {
1228 warn "mandatory extension failed to load, exiting.\n"; 1428 $done{$k} = delete $todo{$k};
1229 exit 1; 1429 push @EXTS, $v->{pkg};
1230 } 1430 $progress = 1;
1231 1431
1232 warn $msg; 1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1233 } 1434 }
1234
1235 $done{$k} = delete $todo{$k};
1236 push @EXTS, $v->{pkg};
1237 $progress = 1;
1238 } 1435 }
1239 1436
1240 skip: 1437 unless ($progress) {
1241 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1242 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 }
1243 } 1445 }
1244 }; 1446 };
1245} 1447}
1246 1448
1247############################################################################# 1449#############################################################################
1248 1450
1249=back 1451=back
1250 1452
1251=head2 CORE EXTENSIONS 1453=head2 CORE EXTENSIONS
1252 1454
1253Functions and methods that extend core crossfire objects. 1455Functions and methods that extend core deliantra objects.
1254 1456
1255=cut 1457=cut
1256 1458
1257package cf::player; 1459package cf::player;
1258 1460
1259use Coro::AIO; 1461use Coro::AIO;
1260 1462
1261=head3 cf::player 1463=head3 cf::player
1262 1464
1263=over 4 1465=over 4
1466
1467=item cf::player::num_playing
1468
1469Returns the official number of playing players, as per the Crossfire metaserver rules.
1470
1471=cut
1472
1473sub num_playing {
1474 scalar grep
1475 $_->ob->map
1476 && !$_->hidden
1477 && !$_->ob->flag (cf::FLAG_WIZ),
1478 cf::player::list
1479}
1264 1480
1265=item cf::player::find $login 1481=item cf::player::find $login
1266 1482
1267Returns the given player object, loading it if necessary (might block). 1483Returns the given player object, loading it if necessary (might block).
1268 1484
1287 1503
1288sub exists($) { 1504sub exists($) {
1289 my ($login) = @_; 1505 my ($login) = @_;
1290 1506
1291 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1292 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1293} 1509}
1294 1510
1295sub find($) { 1511sub find($) {
1296 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1297 my $login = $_[0]; 1513 my $login = $_[0];
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1520 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1521 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1522 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1523 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1524
1309 my $pl = load_pl path $login 1525 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1526 or return;
1527
1528 my $pl = cf::player::load_pl $f
1529 or return;
1530
1531 local $cf::PLAYER_LOADING{$login} = $pl;
1532 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1312 } 1534 }
1313 } 1535 }
1314} 1536}
1537
1538cf::player->attach (
1539 on_load => sub {
1540 my ($pl, $path) = @_;
1541
1542 # restore slots saved in save, below
1543 my $slots = delete $pl->{_slots};
1544
1545 $pl->ob->current_weapon ($slots->[0]);
1546 $pl->combat_ob ($slots->[1]);
1547 $pl->ranged_ob ($slots->[2]);
1548 },
1549);
1315 1550
1316sub save($) { 1551sub save($) {
1317 my ($pl) = @_; 1552 my ($pl) = @_;
1318 1553
1319 return if $pl->{deny_save}; 1554 return if $pl->{deny_save};
1323 1558
1324 return if $pl->{deny_save}; 1559 return if $pl->{deny_save};
1325 1560
1326 aio_mkdir playerdir $pl, 0770; 1561 aio_mkdir playerdir $pl, 0770;
1327 $pl->{last_save} = $cf::RUNTIME; 1562 $pl->{last_save} = $cf::RUNTIME;
1563
1564 cf::get_slot 0.01;
1565
1566 # save slots, to be restored later
1567 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1328 1568
1329 $pl->save_pl ($path); 1569 $pl->save_pl ($path);
1330 cf::cede_to_tick; 1570 cf::cede_to_tick;
1331} 1571}
1332 1572
1364 my ($pl) = @_; 1604 my ($pl) = @_;
1365 1605
1366 my $name = $pl->ob->name; 1606 my $name = $pl->ob->name;
1367 1607
1368 $pl->{deny_save} = 1; 1608 $pl->{deny_save} = 1;
1369 $pl->password ("*"); # this should lock out the player until we nuked the dir 1609 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1370 1610
1371 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1611 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1372 $pl->deactivate; 1612 $pl->deactivate;
1613 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1614 $pl->ob->check_score;
1373 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1615 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1374 $pl->ns->destroy if $pl->ns; 1616 $pl->ns->destroy if $pl->ns;
1375 1617
1376 my $path = playerdir $pl; 1618 my $path = playerdir $pl;
1377 my $temp = "$path~$cf::RUNTIME~deleting~"; 1619 my $temp = "$path~$cf::RUNTIME~deleting~";
1413 or return []; 1655 or return [];
1414 1656
1415 my @logins; 1657 my @logins;
1416 1658
1417 for my $login (@$dirs) { 1659 for my $login (@$dirs) {
1660 my $path = path $login;
1661
1662 # a .pst is a dead give-away for a valid player
1663 # if no pst file found, open and chekc for blocked users
1664 if (aio_stat "$path.pst") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1665 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1666 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1667 $buf !~ /^password -------------$/m or next; # official not-valid tag
1668 }
1421 1669
1422 utf8::decode $login; 1670 utf8::decode $login;
1423 push @logins, $login; 1671 push @logins, $login;
1424 } 1672 }
1425 1673
1452 } 1700 }
1453 1701
1454 \@paths 1702 \@paths
1455} 1703}
1456 1704
1457=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1705=item $protocol_xml = $player->expand_cfpod ($cfpod)
1458 1706
1459Expand crossfire pod fragments into protocol xml. 1707Expand deliantra pod fragments into protocol xml.
1460
1461=cut
1462
1463sub expand_cfpod {
1464 ((my $self), (local $_)) = @_;
1465
1466 # escape & and <
1467 s/&/&amp;/g;
1468 s/(?<![BIUGH])</&lt;/g;
1469
1470 # this is buggy, it needs to properly take care of nested <'s
1471
1472 1 while
1473 # replace B<>, I<>, U<> etc.
1474 s/B<([^\>]*)>/<b>$1<\/b>/
1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 # replace G<male|female> tags
1478 || s{G<([^>|]*)\|([^>]*)>}{
1479 $self->gender ? $2 : $1
1480 }ge
1481 # replace H<hint text>
1482 || s{H<([^\>]*)>}
1483 {
1484 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1485 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1486 "")
1487 [$self->{hintmode}]
1488 }ge;
1489
1490 # create single paragraphs (very hackish)
1491 s/(?<=\S)\n(?=\w)/ /g;
1492
1493 # compress some whitespace
1494 s/\s+\n/\n/g; # ws line-ends
1495 s/\n\n+/\n/g; # double lines
1496 s/^\n+//; # beginning lines
1497 s/\n+$//; # ending lines
1498
1499 $_
1500}
1501
1502sub hintmode {
1503 $_[0]{hintmode} = $_[1] if @_ > 1;
1504 $_[0]{hintmode}
1505}
1506 1708
1507=item $player->ext_reply ($msgid, @msg) 1709=item $player->ext_reply ($msgid, @msg)
1508 1710
1509Sends an ext reply to the player. 1711Sends an ext reply to the player.
1510 1712
1577our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1578our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1579 1781
1580sub generate_random_map { 1782sub generate_random_map {
1581 my ($self, $rmp) = @_; 1783 my ($self, $rmp) = @_;
1784
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786
1582 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1583 $self->_create_random_map ( 1788 $self->_create_random_map (
1584 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1585 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1586 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1587 $rmp->{exit_on_final_map}, 1792 $rmp->{exit_on_final_map},
1588 $rmp->{xsize}, $rmp->{ysize}, 1793 $rmp->{xsize}, $rmp->{ysize},
1589 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1590 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1708 1913
1709# the temporary/swap location 1914# the temporary/swap location
1710sub save_path { 1915sub save_path {
1711 my ($self) = @_; 1916 my ($self) = @_;
1712 1917
1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1714 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1715} 1920}
1716 1921
1717# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1718sub uniq_path { 1923sub uniq_path {
1719 my ($self) = @_; 1924 my ($self) = @_;
1720 1925
1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1722 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1723}
1724
1725# and all this just because we cannot iterate over
1726# all maps in C++...
1727sub change_all_map_light {
1728 my ($change) = @_;
1729
1730 $_->change_map_light ($change)
1731 for grep $_->outdoor, values %cf::MAP;
1732} 1928}
1733 1929
1734sub decay_objects { 1930sub decay_objects {
1735 my ($self) = @_; 1931 my ($self) = @_;
1736 1932
1749 1945
1750sub load_header_from($) { 1946sub load_header_from($) {
1751 my ($self, $path) = @_; 1947 my ($self, $path) = @_;
1752 1948
1753 utf8::encode $path; 1949 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1950 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1951 or return;
1952
1953 $self->_load_header ($f)
1954 or return;
1955
1956 local $MAP_LOADING{$self->{path}} = $self;
1957 $f->resolve_delayed_derefs;
1759 1958
1760 $self->{load_path} = $path; 1959 $self->{load_path} = $path;
1761 1960
1762 1 1961 1
1763} 1962}
1817sub find { 2016sub find {
1818 my ($path, $origin) = @_; 2017 my ($path, $origin) = @_;
1819 2018
1820 $path = normalise $path, $origin && $origin->path; 2019 $path = normalise $path, $origin && $origin->path;
1821 2020
2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 2022 my $guard2 = cf::lock_acquire "map_find:$path";
1823 2023
1824 $cf::MAP{$path} || do { 2024 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path";
1826 my $map = new_from_path cf::map $path 2025 my $map = new_from_path cf::map $path
1827 or return; 2026 or return;
1828 2027
1829 $map->{last_save} = $cf::RUNTIME; 2028 $map->{last_save} = $cf::RUNTIME;
1830 2029
1832 or return; 2031 or return;
1833 2032
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2033 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 2034 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 2035 #$cf::WAIT_FOR_TICK->wait;
2036 undef $guard2;
2037 undef $guard1;
1837 $map->reset; 2038 $map->reset;
1838 undef $guard;
1839 return find $path; 2039 return find $path;
1840 } 2040 }
1841 2041
1842 $cf::MAP{$path} = $map 2042 $cf::MAP{$path} = $map
1843 } 2043 }
1844} 2044}
1845 2045
1846sub pre_load { } 2046sub pre_load { }
1847sub post_load { } 2047#sub post_load { } # XS
1848 2048
1849sub load { 2049sub load {
1850 my ($self) = @_; 2050 my ($self) = @_;
1851 2051
1852 local $self->{deny_reset} = 1; # loading can take a long time 2052 local $self->{deny_reset} = 1; # loading can take a long time
1853 2053
1854 my $path = $self->{path}; 2054 my $path = $self->{path};
1855 2055
1856 { 2056 {
1857 my $guard1 = cf::lock_acquire "map_data:$path"; 2057 my $guard = cf::lock_acquire "map_data:$path";
1858 my $guard2 = cf::lock_acquire "map_load:$path";
1859 2058
2059 return unless $self->valid;
1860 return if $self->in_memory != cf::MAP_SWAPPED; 2060 return unless $self->in_memory == cf::MAP_SWAPPED;
1861 2061
1862 $self->in_memory (cf::MAP_LOADING); 2062 $self->in_memory (cf::MAP_LOADING);
1863 2063
1864 $self->alloc; 2064 $self->alloc;
1865 2065
1866 $self->pre_load; 2066 $self->pre_load;
1867 cf::cede_to_tick; 2067 cf::cede_to_tick;
1868 2068
2069 my $f = new_from_file cf::object::thawer $self->{load_path};
2070 $f->skip_block;
1869 $self->_load_objects ($self->{load_path}, 1) 2071 $self->_load_objects ($f)
1870 or return; 2072 or return;
1871 2073
1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2074 $self->post_load_original
1873 if delete $self->{load_original}; 2075 if delete $self->{load_original};
1874 2076
1875 if (my $uniq = $self->uniq_path) { 2077 if (my $uniq = $self->uniq_path) {
1876 utf8::encode $uniq; 2078 utf8::encode $uniq;
1877 if (aio_open $uniq, O_RDONLY, 0) { 2079 unless (aio_stat $uniq) {
2080 if (my $f = new_from_file cf::object::thawer $uniq) {
1878 $self->clear_unique_items; 2081 $self->clear_unique_items;
1879 $self->_load_objects ($uniq, 0); 2082 $self->_load_objects ($f);
2083 $f->resolve_delayed_derefs;
2084 }
1880 } 2085 }
1881 } 2086 }
2087
2088 $f->resolve_delayed_derefs;
1882 2089
1883 cf::cede_to_tick; 2090 cf::cede_to_tick;
1884 # now do the right thing for maps 2091 # now do the right thing for maps
1885 $self->link_multipart_objects; 2092 $self->link_multipart_objects;
1886 $self->difficulty ($self->estimate_difficulty) 2093 $self->difficulty ($self->estimate_difficulty)
1890 unless ($self->{deny_activate}) { 2097 unless ($self->{deny_activate}) {
1891 $self->decay_objects; 2098 $self->decay_objects;
1892 $self->fix_auto_apply; 2099 $self->fix_auto_apply;
1893 $self->update_buttons; 2100 $self->update_buttons;
1894 cf::cede_to_tick; 2101 cf::cede_to_tick;
1895 $self->set_darkness_map;
1896 cf::cede_to_tick;
1897 $self->activate; 2102 $self->activate;
1898 } 2103 }
1899 2104
1900 $self->{last_save} = $cf::RUNTIME; 2105 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME); 2106 $self->last_access ($cf::RUNTIME);
1902 2107
1903 $self->in_memory (cf::MAP_IN_MEMORY); 2108 $self->in_memory (cf::MAP_ACTIVE);
1904 } 2109 }
1905 2110
1906 $self->post_load; 2111 $self->post_load;
1907} 2112}
1908 2113
2114# customize the map for a given player, i.e.
2115# return the _real_ map. used by e.g. per-player
2116# maps to change the path to ~playername/mappath
1909sub customise_for { 2117sub customise_for {
1910 my ($self, $ob) = @_; 2118 my ($self, $ob) = @_;
1911 2119
1912 return find "~" . $ob->name . "/" . $self->{path} 2120 return find "~" . $ob->name . "/" . $self->{path}
1913 if $self->per_player; 2121 if $self->per_player;
1966 my ($path, $origin, $load) = @_; 2174 my ($path, $origin, $load) = @_;
1967 2175
1968 $path = normalise $path, $origin && $origin->{path}; 2176 $path = normalise $path, $origin && $origin->{path};
1969 2177
1970 if (my $map = $cf::MAP{$path}) { 2178 if (my $map = $cf::MAP{$path}) {
1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2179 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1972 } 2180 }
1973 2181
1974 $MAP_PREFETCH{$path} |= $load; 2182 $MAP_PREFETCH{$path} |= $load;
1975 2183
1976 $MAP_PREFETCHER ||= cf::async { 2184 $MAP_PREFETCHER ||= cf::async {
2185 $Coro::current->{desc} = "map prefetcher";
2186
1977 while (%MAP_PREFETCH) { 2187 while (%MAP_PREFETCH) {
1978 while (my ($k, $v) = each %MAP_PREFETCH) { 2188 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $k) { 2189 if (my $map = find $k) {
1980 $map->load if $v; 2190 $map->load if $v;
1981 } 2191 }
2007 return if $self->{deny_save}; 2217 return if $self->{deny_save};
2008 2218
2009 local $self->{last_access} = $self->last_access;#d# 2219 local $self->{last_access} = $self->last_access;#d#
2010 2220
2011 cf::async { 2221 cf::async {
2222 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2223 $_->contr->save for $self->players;
2013 }; 2224 };
2225
2226 cf::get_slot 0.02;
2014 2227
2015 if ($uniq) { 2228 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2229 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2017 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2230 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2018 } else { 2231 } else {
2027 $self->save; 2240 $self->save;
2028 2241
2029 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2243
2031 return if $self->players; 2244 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2245 return if $self->in_memory != cf::MAP_ACTIVE;
2033 return if $self->{deny_save}; 2246 return if $self->{deny_save};
2034 2247
2248 $self->in_memory (cf::MAP_SWAPPED);
2249
2250 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2252 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2253}
2038 2254
2039sub reset_at { 2255sub reset_at {
2040 my ($self) = @_; 2256 my ($self) = @_;
2041 2257
2059 2275
2060 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2061 2277
2062 return if $self->players; 2278 return if $self->players;
2063 2279
2064 warn "resetting map ", $self->path; 2280 warn "resetting map ", $self->path, "\n";
2065 2281
2066 $self->in_memory (cf::MAP_SWAPPED); 2282 $self->in_memory (cf::MAP_SWAPPED);
2067 2283
2068 # need to save uniques path 2284 # need to save uniques path
2069 unless ($self->{deny_save}) { 2285 unless ($self->{deny_save}) {
2073 if $uniq; 2289 if $uniq;
2074 } 2290 }
2075 2291
2076 delete $cf::MAP{$self->path}; 2292 delete $cf::MAP{$self->path};
2077 2293
2294 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2296 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2297
2082 $self->unlink_save; 2298 $self->unlink_save;
2083 $self->destroy; 2299 $self->destroy;
2084} 2300}
2085 2301
2086my $nuke_counter = "aaaa"; 2302my $nuke_counter = "aaaa";
2087 2303
2088sub nuke { 2304sub nuke {
2089 my ($self) = @_; 2305 my ($self) = @_;
2090 2306
2307 {
2308 my $lock = cf::lock_acquire "map_data:$self->{path}";
2309
2091 delete $cf::MAP{$self->path}; 2310 delete $cf::MAP{$self->path};
2092 2311
2093 $self->unlink_save; 2312 $self->unlink_save;
2094 2313
2095 bless $self, "cf::map"; 2314 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2315 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2316 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2317 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2318 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2319
2101 $cf::MAP{$self->path} = $self; 2320 $cf::MAP{$self->path} = $self;
2321 }
2102 2322
2103 $self->reset; # polite request, might not happen 2323 $self->reset; # polite request, might not happen
2104} 2324}
2105 2325
2106=item $maps = cf::map::tmp_maps 2326=item $maps = cf::map::tmp_maps
2148 2368
2149sub unique_maps() { 2369sub unique_maps() {
2150 [ 2370 [
2151 map { 2371 map {
2152 utf8::decode $_; 2372 utf8::decode $_;
2153 /\.map$/ 2373 s/\.map$//; # TODO future compatibility hack
2374 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2375 ? ()
2154 ? normalise $_ 2376 : normalise $_
2155 : ()
2156 } @{ aio_readdir $UNIQUEDIR or [] } 2377 } @{ aio_readdir $UNIQUEDIR or [] }
2157 ] 2378 ]
2158} 2379}
2159 2380
2160package cf; 2381=item cf::map::static_maps
2382
2383Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2384file in the shared directory excluding F</styles> and F</editor>). May
2385block.
2386
2387=cut
2388
2389sub static_maps() {
2390 my @dirs = "";
2391 my @maps;
2392
2393 while (@dirs) {
2394 my $dir = shift @dirs;
2395
2396 next if $dir eq "/styles" || $dir eq "/editor";
2397
2398 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2399 or return;
2400
2401 for (@$files) {
2402 s/\.map$// or next;
2403 utf8::decode $_;
2404 push @maps, "$dir/$_";
2405 }
2406
2407 push @dirs, map "$dir/$_", @$dirs;
2408 }
2409
2410 \@maps
2411}
2161 2412
2162=back 2413=back
2163 2414
2164=head3 cf::object 2415=head3 cf::object
2165 2416
2169 2420
2170=over 4 2421=over 4
2171 2422
2172=item $ob->inv_recursive 2423=item $ob->inv_recursive
2173 2424
2174Returns the inventory of the object _and_ their inventories, recursively. 2425Returns the inventory of the object I<and> their inventories, recursively,
2426but I<not> the object itself.
2175 2427
2176=cut 2428=cut
2177 2429
2178sub inv_recursive_; 2430sub inv_recursive_;
2179sub inv_recursive_ { 2431sub inv_recursive_ {
2182 2434
2183sub inv_recursive { 2435sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2436 inv_recursive_ inv $_[0]
2185} 2437}
2186 2438
2439=item $ref = $ob->ref
2440
2441Creates and returns a persistent reference to an object that can be stored as a string.
2442
2443=item $ob = cf::object::deref ($refstring)
2444
2445returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2446even if the object actually exists. May block.
2447
2448=cut
2449
2450sub deref {
2451 my ($ref) = @_;
2452
2453 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2454 my ($uuid, $name) = ($1, $2);
2455 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2456 or return;
2457 $pl->ob->uuid eq $uuid
2458 or return;
2459
2460 $pl->ob
2461 } else {
2462 warn "$ref: cannot resolve object reference\n";
2463 undef
2464 }
2465}
2466
2187package cf; 2467package cf;
2188 2468
2189=back 2469=back
2190 2470
2191=head3 cf::object::player 2471=head3 cf::object::player
2197Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2477Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2198can be C<undef>. Does the right thing when the player is currently in a 2478can be C<undef>. Does the right thing when the player is currently in a
2199dialogue with the given NPC character. 2479dialogue with the given NPC character.
2200 2480
2201=cut 2481=cut
2482
2483our $SAY_CHANNEL = {
2484 id => "say",
2485 title => "Map",
2486 reply => "say ",
2487 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2488};
2489
2490our $CHAT_CHANNEL = {
2491 id => "chat",
2492 title => "Chat",
2493 reply => "chat ",
2494 tooltip => "Player chat and shouts, global to the server.",
2495};
2202 2496
2203# rough implementation of a future "reply" method that works 2497# rough implementation of a future "reply" method that works
2204# with dialog boxes. 2498# with dialog boxes.
2205#TODO: the first argument must go, split into a $npc->reply_to ( method 2499#TODO: the first argument must go, split into a $npc->reply_to ( method
2206sub cf::object::player::reply($$$;$) { 2500sub cf::object::player::reply($$$;$) {
2218 my $dialog = $pl->{npc_dialog}; 2512 my $dialog = $pl->{npc_dialog};
2219 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2513 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220 2514
2221 } else { 2515 } else {
2222 $msg = $npc->name . " says: $msg" if $npc; 2516 $msg = $npc->name . " says: $msg" if $npc;
2223 $self->message ($msg, $flags); 2517 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2224 } 2518 }
2225 } 2519 }
2226} 2520}
2227 2521
2228=item $object->send_msg ($channel, $msg, $color, [extra...]) 2522=item $object->send_msg ($channel, $msg, $color, [extra...])
2253 2547
2254=item $player_object->enter_link 2548=item $player_object->enter_link
2255 2549
2256Freezes the player and moves him/her to a special map (C<{link}>). 2550Freezes the player and moves him/her to a special map (C<{link}>).
2257 2551
2258The player should be reasonably safe there for short amounts of time. You 2552The player should be reasonably safe there for short amounts of time (e.g.
2259I<MUST> call C<leave_link> as soon as possible, though. 2553for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2554though, as the palyer cannot control the character while it is on the link
2555map.
2260 2556
2261Will never block. 2557Will never block.
2262 2558
2263=item $player_object->leave_link ($map, $x, $y) 2559=item $player_object->leave_link ($map, $x, $y)
2264 2560
2316 ($x, $y) = (-1, -1) 2612 ($x, $y) = (-1, -1)
2317 unless (defined $x) && (defined $y); 2613 unless (defined $x) && (defined $y);
2318 2614
2319 # use -1 or undef as default coordinates, not 0, 0 2615 # use -1 or undef as default coordinates, not 0, 0
2320 ($x, $y) = ($map->enter_x, $map->enter_y) 2616 ($x, $y) = ($map->enter_x, $map->enter_y)
2321 if $x <=0 && $y <= 0; 2617 if $x <= 0 && $y <= 0;
2322 2618
2323 $map->load; 2619 $map->load;
2324 $map->load_neighbours; 2620 $map->load_neighbours;
2325 2621
2326 return unless $self->contr->active; 2622 return unless $self->contr->active;
2327 $self->activate_recursive;
2328 2623
2329 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2330 $self->enter_map ($map, $x, $y); 2625 $self->enter_map ($map, $x, $y);
2626
2627 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive;
2331} 2629}
2332 2630
2333=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2334 2632
2335Moves the player to the given map-path and coordinates by first freezing 2633Moves the player to the given map-path and coordinates by first freezing
2336her, loading and preparing them map, calling the provided $check callback 2634her, loading and preparing them map, calling the provided $check callback
2337that has to return the map if sucecssful, and then unfreezes the player on 2635that has to return the map if sucecssful, and then unfreezes the player on
2338the new (success) or old (failed) map position. In either case, $done will 2636the new (success) or old (failed) map position. In either case, $done will
2339be called at the end of this process. 2637be called at the end of this process.
2340 2638
2639Note that $check will be called with a potentially non-loaded map, so if
2640it needs a loaded map it has to call C<< ->load >>.
2641
2341=cut 2642=cut
2342 2643
2343our $GOTOGEN; 2644our $GOTOGEN;
2344 2645
2345sub cf::object::player::goto { 2646sub cf::object::player::goto {
2349 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2650 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2350 2651
2351 $self->enter_link; 2652 $self->enter_link;
2352 2653
2353 (async { 2654 (async {
2655 $Coro::current->{desc} = "player::goto $path $x $y";
2656
2657 # *tag paths override both path and x|y
2658 if ($path =~ /^\*(.*)$/) {
2659 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2660 my $ob = $obs[rand @obs];
2661
2662 # see if we actually can go there
2663 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2664 $ob = $obs[rand @obs];
2665 } else {
2666 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2667 }
2668 # else put us there anyways for now #d#
2669
2670 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2671 } else {
2672 ($path, $x, $y) = (undef, undef, undef);
2673 }
2674 }
2675
2354 my $map = eval { 2676 my $map = eval {
2355 my $map = cf::map::find $path; 2677 my $map = defined $path ? cf::map::find $path : undef;
2356 2678
2357 if ($map) { 2679 if ($map) {
2358 $map = $map->customise_for ($self); 2680 $map = $map->customise_for ($self);
2359 $map = $check->($map) if $check && $map; 2681 $map = $check->($map) if $check && $map;
2360 } else { 2682 } else {
2361 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2683 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2362 } 2684 }
2363 2685
2364 $map 2686 $map
2365 }; 2687 };
2366 2688
2402} 2724}
2403 2725
2404sub prepare_random_map { 2726sub prepare_random_map {
2405 my ($exit) = @_; 2727 my ($exit) = @_;
2406 2728
2407 my $guard = cf::lock_acquire "exit_prepare:$exit";
2408
2409 # all this does is basically replace the /! path by 2729 # all this does is basically replace the /! path by
2410 # a new random map path (?random/...) with a seed 2730 # a new random map path (?random/...) with a seed
2411 # that depends on the exit object 2731 # that depends on the exit object
2412 2732
2413 my $rmp = parse_random_map_params $exit->msg; 2733 my $rmp = parse_random_map_params $exit->msg;
2415 if ($exit->map) { 2735 if ($exit->map) {
2416 $rmp->{region} = $exit->region->name; 2736 $rmp->{region} = $exit->region->name;
2417 $rmp->{origin_map} = $exit->map->path; 2737 $rmp->{origin_map} = $exit->map->path;
2418 $rmp->{origin_x} = $exit->x; 2738 $rmp->{origin_x} = $exit->x;
2419 $rmp->{origin_y} = $exit->y; 2739 $rmp->{origin_y} = $exit->y;
2740
2741 $exit->map->touch;
2420 } 2742 }
2421 2743
2422 $rmp->{random_seed} ||= $exit->random_seed; 2744 $rmp->{random_seed} ||= $exit->random_seed;
2423 2745
2424 my $data = cf::to_json $rmp; 2746 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2425 my $md5 = Digest::MD5::md5_hex $data; 2747 my $md5 = Digest::MD5::md5_hex $data;
2426 my $meta = "$RANDOMDIR/$md5.meta"; 2748 my $meta = "$RANDOMDIR/$md5.meta";
2427 2749
2428 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2750 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2429 aio_write $fh, 0, (length $data), $data, 0; 2751 aio_write $fh, 0, (length $data), $data, 0;
2430 undef $fh; 2752 undef $fh;
2431 aio_rename "$meta~", $meta; 2753 aio_rename "$meta~", $meta;
2432 2754
2755 my $slaying = "?random/$md5";
2756
2757 if ($exit->valid) {
2433 $exit->slaying ("?random/$md5"); 2758 $exit->slaying ("?random/$md5");
2434 $exit->msg (undef); 2759 $exit->msg (undef);
2760 }
2435 } 2761 }
2436} 2762}
2437 2763
2438sub cf::object::player::enter_exit { 2764sub cf::object::player::enter_exit {
2439 my ($self, $exit) = @_; 2765 my ($self, $exit) = @_;
2440 2766
2441 return unless $self->type == cf::PLAYER; 2767 return unless $self->type == cf::PLAYER;
2442 2768
2443 if ($exit->slaying eq "/!") {
2444 #TODO: this should de-fi-ni-te-ly not be a sync-job
2445 # the problem is that $exit might not survive long enough
2446 # so it needs to be done right now, right here
2447 cf::sync_job { prepare_random_map $exit };
2448 }
2449
2450 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2451 my $hp = $exit->stats->hp;
2452 my $sp = $exit->stats->sp;
2453
2454 $self->enter_link; 2769 $self->enter_link;
2455 2770
2456 # if exit is damned, update players death & WoR home-position
2457 $self->contr->savebed ($slaying, $hp, $sp)
2458 if $exit->flag (FLAG_DAMNED);
2459
2460 (async { 2771 (async {
2461 $self->deactivate_recursive; # just to be sure 2772 $Coro::current->{desc} = "enter_exit";
2773
2462 unless (eval { 2774 unless (eval {
2775 $self->deactivate_recursive; # just to be sure
2776
2777 # random map handling
2778 {
2779 my $guard = cf::lock_acquire "exit_prepare:$exit";
2780
2781 prepare_random_map $exit
2782 if $exit->slaying eq "/!";
2783 }
2784
2785 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2786 my $x = $exit->stats->hp;
2787 my $y = $exit->stats->sp;
2788
2463 $self->goto ($slaying, $hp, $sp); 2789 $self->goto ($map, $x, $y);
2464 2790
2791 # if exit is damned, update players death & WoR home-position
2792 $self->contr->savebed ($map, $x, $y)
2793 if $exit->flag (cf::FLAG_DAMNED);
2794
2465 1; 2795 1
2466 }) { 2796 }) {
2467 $self->message ("Something went wrong deep within the crossfire server. " 2797 $self->message ("Something went wrong deep within the deliantra server. "
2468 . "I'll try to bring you back to the map you were before. " 2798 . "I'll try to bring you back to the map you were before. "
2469 . "Please report this to the dungeon master!", 2799 . "Please report this to the dungeon master!",
2470 cf::NDI_UNIQUE | cf::NDI_RED); 2800 cf::NDI_UNIQUE | cf::NDI_RED);
2471 2801
2472 warn "ERROR in enter_exit: $@"; 2802 warn "ERROR in enter_exit: $@";
2489sub cf::client::send_drawinfo { 2819sub cf::client::send_drawinfo {
2490 my ($self, $text, $flags) = @_; 2820 my ($self, $text, $flags) = @_;
2491 2821
2492 utf8::encode $text; 2822 utf8::encode $text;
2493 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2823 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2824}
2825
2826=item $client->send_big_packet ($pkt)
2827
2828Like C<send_packet>, but tries to compress large packets, and fragments
2829them as required.
2830
2831=cut
2832
2833our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2834
2835sub cf::client::send_big_packet {
2836 my ($self, $pkt) = @_;
2837
2838 # try lzf for large packets
2839 $pkt = "lzf " . Compress::LZF::compress $pkt
2840 if 1024 <= length $pkt and $self->{can_lzf};
2841
2842 # split very large packets
2843 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2844 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2845 $pkt = "frag";
2846 }
2847
2848 $self->send_packet ($pkt);
2494} 2849}
2495 2850
2496=item $client->send_msg ($channel, $msg, $color, [extra...]) 2851=item $client->send_msg ($channel, $msg, $color, [extra...])
2497 2852
2498Send a drawinfo or msg packet to the client, formatting the msg for the 2853Send a drawinfo or msg packet to the client, formatting the msg for the
2500the message, with C<log> being the default. If C<$color> is negative, suppress 2855the message, with C<log> being the default. If C<$color> is negative, suppress
2501the message unless the client supports the msg packet. 2856the message unless the client supports the msg packet.
2502 2857
2503=cut 2858=cut
2504 2859
2860# non-persistent channels (usually the info channel)
2861our %CHANNEL = (
2862 "c/motd" => {
2863 id => "infobox",
2864 title => "MOTD",
2865 reply => undef,
2866 tooltip => "The message of the day",
2867 },
2868 "c/identify" => {
2869 id => "infobox",
2870 title => "Identify",
2871 reply => undef,
2872 tooltip => "Items recently identified",
2873 },
2874 "c/examine" => {
2875 id => "infobox",
2876 title => "Examine",
2877 reply => undef,
2878 tooltip => "Signs and other items you examined",
2879 },
2880 "c/shopinfo" => {
2881 id => "infobox",
2882 title => "Shop Info",
2883 reply => undef,
2884 tooltip => "What your bargaining skill tells you about the shop",
2885 },
2886 "c/book" => {
2887 id => "infobox",
2888 title => "Book",
2889 reply => undef,
2890 tooltip => "The contents of a note or book",
2891 },
2892 "c/lookat" => {
2893 id => "infobox",
2894 title => "Look",
2895 reply => undef,
2896 tooltip => "What you saw there",
2897 },
2898 "c/who" => {
2899 id => "infobox",
2900 title => "Players",
2901 reply => undef,
2902 tooltip => "Shows players who are currently online",
2903 },
2904 "c/body" => {
2905 id => "infobox",
2906 title => "Body Parts",
2907 reply => undef,
2908 tooltip => "Shows which body parts you posess and are available",
2909 },
2910 "c/statistics" => {
2911 id => "infobox",
2912 title => "Statistics",
2913 reply => undef,
2914 tooltip => "Shows your primary statistics",
2915 },
2916 "c/skills" => {
2917 id => "infobox",
2918 title => "Skills",
2919 reply => undef,
2920 tooltip => "Shows your experience per skill and item power",
2921 },
2922 "c/shopitems" => {
2923 id => "infobox",
2924 title => "Shop Items",
2925 reply => undef,
2926 tooltip => "Shows the items currently for sale in this shop",
2927 },
2928 "c/resistances" => {
2929 id => "infobox",
2930 title => "Resistances",
2931 reply => undef,
2932 tooltip => "Shows your resistances",
2933 },
2934 "c/pets" => {
2935 id => "infobox",
2936 title => "Pets",
2937 reply => undef,
2938 tooltip => "Shows information abotu your pets/a specific pet",
2939 },
2940 "c/perceiveself" => {
2941 id => "infobox",
2942 title => "Perceive Self",
2943 reply => undef,
2944 tooltip => "You gained detailed knowledge about yourself",
2945 },
2946 "c/uptime" => {
2947 id => "infobox",
2948 title => "Uptime",
2949 reply => undef,
2950 tooltip => "How long the server has been running since last restart",
2951 },
2952 "c/mapinfo" => {
2953 id => "infobox",
2954 title => "Map Info",
2955 reply => undef,
2956 tooltip => "Information related to the maps",
2957 },
2958 "c/party" => {
2959 id => "party",
2960 title => "Party",
2961 reply => "gsay ",
2962 tooltip => "Messages and chat related to your party",
2963 },
2964 "c/death" => {
2965 id => "death",
2966 title => "Death",
2967 reply => undef,
2968 tooltip => "Reason for and more info about your most recent death",
2969 },
2970 "c/say" => $SAY_CHANNEL,
2971 "c/chat" => $CHAT_CHANNEL,
2972);
2973
2505sub cf::client::send_msg { 2974sub cf::client::send_msg {
2506 my ($self, $channel, $msg, $color, @extra) = @_; 2975 my ($self, $channel, $msg, $color, @extra) = @_;
2507 2976
2508 $msg = $self->pl->expand_cfpod ($msg); 2977 $msg = $self->pl->expand_cfpod ($msg)
2978 unless $color & cf::NDI_VERBATIM;
2509 2979
2510 $color &= cf::NDI_CLIENT_MASK; # just in case... 2980 $color &= cf::NDI_CLIENT_MASK; # just in case...
2511 2981
2982 # check predefined channels, for the benefit of C
2983 if ($CHANNEL{$channel}) {
2984 $channel = $CHANNEL{$channel};
2985
2986 $self->ext_msg (channel_info => $channel);
2987 $channel = $channel->{id};
2988
2512 if (ref $channel) { 2989 } elsif (ref $channel) {
2513 # send meta info to client, if not yet sent 2990 # send meta info to client, if not yet sent
2514 unless (exists $self->{channel}{$channel->{id}}) { 2991 unless (exists $self->{channel}{$channel->{id}}) {
2515 $self->{channel}{$channel->{id}} = $channel; 2992 $self->{channel}{$channel->{id}} = $channel;
2516 $self->ext_msg (channel_info => $channel); 2993 $self->ext_msg (channel_info => $channel);
2517 } 2994 }
2519 $channel = $channel->{id}; 2996 $channel = $channel->{id};
2520 } 2997 }
2521 2998
2522 return unless @extra || length $msg; 2999 return unless @extra || length $msg;
2523 3000
2524 if ($self->can_msg) {
2525 # default colour, mask it out 3001 # default colour, mask it out
2526 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3002 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2527 if $color & cf::NDI_DEF; 3003 if $color & cf::NDI_DEF;
2528 3004
2529 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3005 my $pkt = "msg "
3006 . $self->{json_coder}->encode (
2530 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3007 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2531 } else { 3008 );
2532 if ($color >= 0) {
2533 # replace some tags by gcfclient-compatible ones
2534 for ($msg) {
2535 1 while
2536 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2537 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2538 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2539 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2540 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2541 }
2542 3009
2543 $color &= cf::NDI_COLOR_MASK; 3010 $self->send_big_packet ($pkt);
2544
2545 utf8::encode $msg;
2546
2547 if (0 && $msg =~ /\[/) {
2548 # COMMAND/INFO
2549 $self->send_packet ("drawextinfo $color 10 8 $msg")
2550 } else {
2551 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2552 $self->send_packet ("drawinfo $color $msg")
2553 }
2554 }
2555 }
2556} 3011}
2557 3012
2558=item $client->ext_msg ($type, @msg) 3013=item $client->ext_msg ($type, @msg)
2559 3014
2560Sends an ext event to the client. 3015Sends an ext event to the client.
2563 3018
2564sub cf::client::ext_msg($$@) { 3019sub cf::client::ext_msg($$@) {
2565 my ($self, $type, @msg) = @_; 3020 my ($self, $type, @msg) = @_;
2566 3021
2567 if ($self->extcmd == 2) { 3022 if ($self->extcmd == 2) {
2568 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3023 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2569 } elsif ($self->extcmd == 1) { # TODO: remove 3024 } elsif ($self->extcmd == 1) { # TODO: remove
2570 push @msg, msgtype => "event_$type"; 3025 push @msg, msgtype => "event_$type";
2571 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2572 } 3027 }
2573} 3028}
2574 3029
2575=item $client->ext_reply ($msgid, @msg) 3030=item $client->ext_reply ($msgid, @msg)
2576 3031
2580 3035
2581sub cf::client::ext_reply($$@) { 3036sub cf::client::ext_reply($$@) {
2582 my ($self, $id, @msg) = @_; 3037 my ($self, $id, @msg) = @_;
2583 3038
2584 if ($self->extcmd == 2) { 3039 if ($self->extcmd == 2) {
2585 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2586 } elsif ($self->extcmd == 1) { 3041 } elsif ($self->extcmd == 1) {
2587 #TODO: version 1, remove 3042 #TODO: version 1, remove
2588 unshift @msg, msgtype => "reply", msgid => $id; 3043 unshift @msg, msgtype => "reply", msgid => $id;
2589 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3044 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2590 } 3045 }
2591} 3046}
2592 3047
2593=item $success = $client->query ($flags, "text", \&cb) 3048=item $success = $client->query ($flags, "text", \&cb)
2594 3049
2695 3150
2696 $coro 3151 $coro
2697} 3152}
2698 3153
2699cf::client->attach ( 3154cf::client->attach (
2700 on_destroy => sub { 3155 on_client_destroy => sub {
2701 my ($ns) = @_; 3156 my ($ns) = @_;
2702 3157
2703 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3158 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2704 }, 3159 },
2705); 3160);
2721our $safe_hole = new Safe::Hole; 3176our $safe_hole = new Safe::Hole;
2722 3177
2723$SIG{FPE} = 'IGNORE'; 3178$SIG{FPE} = 'IGNORE';
2724 3179
2725$safe->permit_only (Opcode::opset qw( 3180$safe->permit_only (Opcode::opset qw(
2726 :base_core :base_mem :base_orig :base_math 3181 :base_core :base_mem :base_orig :base_math :base_loop
2727 grepstart grepwhile mapstart mapwhile 3182 grepstart grepwhile mapstart mapwhile
2728 sort time 3183 sort time
2729)); 3184));
2730 3185
2731# here we export the classes and methods available to script code 3186# here we export the classes and methods available to script code
2733=pod 3188=pod
2734 3189
2735The following functions and methods are available within a safe environment: 3190The following functions and methods are available within a safe environment:
2736 3191
2737 cf::object 3192 cf::object
2738 contr pay_amount pay_player map x y force_find force_add 3193 contr pay_amount pay_player map x y force_find force_add destroy
2739 insert remove name archname title slaying race decrease_ob_nr 3194 insert remove name archname title slaying race decrease split
3195 value
2740 3196
2741 cf::object::player 3197 cf::object::player
2742 player 3198 player
2743 3199
2744 cf::player 3200 cf::player
2749 3205
2750=cut 3206=cut
2751 3207
2752for ( 3208for (
2753 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3209 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2754 insert remove inv name archname title slaying race 3210 insert remove inv nrof name archname title slaying race
2755 decrease_ob_nr)], 3211 decrease split destroy change_exp value msg lore send_msg)],
2756 ["cf::object::player" => qw(player)], 3212 ["cf::object::player" => qw(player)],
2757 ["cf::player" => qw(peaceful)], 3213 ["cf::player" => qw(peaceful send_msg)],
2758 ["cf::map" => qw(trigger)], 3214 ["cf::map" => qw(trigger)],
2759) { 3215) {
2760 no strict 'refs'; 3216 no strict 'refs';
2761 my ($pkg, @funs) = @$_; 3217 my ($pkg, @funs) = @$_;
2762 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2780 3236
2781 my $qcode = $code; 3237 my $qcode = $code;
2782 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3238 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2783 $qcode =~ s/\n/\\n/g; 3239 $qcode =~ s/\n/\\n/g;
2784 3240
3241 %vars = (_dummy => 0) unless %vars;
3242
3243 my @res;
2785 local $_; 3244 local $_;
2786 local @safe::cf::_safe_eval_args = values %vars;
2787 3245
2788 my $eval = 3246 my $eval =
2789 "do {\n" 3247 "do {\n"
2790 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3248 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2791 . "#line 0 \"{$qcode}\"\n" 3249 . "#line 0 \"{$qcode}\"\n"
2792 . $code 3250 . $code
2793 . "\n}" 3251 . "\n}"
2794 ; 3252 ;
2795 3253
3254 if ($CFG{safe_eval}) {
2796 sub_generation_inc; 3255 sub_generation_inc;
3256 local @safe::cf::_safe_eval_args = values %vars;
2797 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3257 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2798 sub_generation_inc; 3258 sub_generation_inc;
3259 } else {
3260 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval;
3262 }
2799 3263
2800 if ($@) { 3264 if ($@) {
2801 warn "$@"; 3265 warn "$@";
2802 warn "while executing safe code '$code'\n"; 3266 warn "while executing safe code '$code'\n";
2803 warn "with arguments " . (join " ", %vars) . "\n"; 3267 warn "with arguments " . (join " ", %vars) . "\n";
2822=cut 3286=cut
2823 3287
2824sub register_script_function { 3288sub register_script_function {
2825 my ($fun, $cb) = @_; 3289 my ($fun, $cb) = @_;
2826 3290
2827 no strict 'refs'; 3291 $fun = "safe::$fun" if $CFG{safe_eval};
2828 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3292 *$fun = $safe_hole->wrap ($cb);
2829} 3293}
2830 3294
2831=back 3295=back
2832 3296
2833=cut 3297=cut
2854 3318
2855 $facedata->{version} == 2 3319 $facedata->{version} == 2
2856 or cf::cleanup "$path: version mismatch, cannot proceed."; 3320 or cf::cleanup "$path: version mismatch, cannot proceed.";
2857 3321
2858 # patch in the exptable 3322 # patch in the exptable
3323 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2859 $facedata->{resource}{"res/exp_table"} = { 3324 $facedata->{resource}{"res/exp_table"} = {
2860 type => FT_RSRC, 3325 type => FT_RSRC,
2861 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3326 data => $exp_table,
3327 hash => (Digest::MD5::md5 $exp_table),
2862 }; 3328 };
2863 cf::cede_to_tick; 3329 cf::cede_to_tick;
2864 3330
2865 { 3331 {
2866 my $faces = $facedata->{faceinfo}; 3332 my $faces = $facedata->{faceinfo};
2867 3333
2868 while (my ($face, $info) = each %$faces) { 3334 while (my ($face, $info) = each %$faces) {
2869 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3335 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3336
2870 cf::face::set_visibility $idx, $info->{visibility}; 3337 cf::face::set_visibility $idx, $info->{visibility};
2871 cf::face::set_magicmap $idx, $info->{magicmap}; 3338 cf::face::set_magicmap $idx, $info->{magicmap};
2872 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2873 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2874 3341
2875 cf::cede_to_tick; 3342 cf::cede_to_tick;
2876 } 3343 }
2877 3344
2878 while (my ($face, $info) = each %$faces) { 3345 while (my ($face, $info) = each %$faces) {
2879 next unless $info->{smooth}; 3346 next unless $info->{smooth};
3347
2880 my $idx = cf::face::find $face 3348 my $idx = cf::face::find $face
2881 or next; 3349 or next;
3350
2882 if (my $smooth = cf::face::find $info->{smooth}) { 3351 if (my $smooth = cf::face::find $info->{smooth}) {
2883 cf::face::set_smooth $idx, $smooth; 3352 cf::face::set_smooth $idx, $smooth;
2884 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3353 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2885 } else { 3354 } else {
2886 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3355 warn "smooth face '$info->{smooth}' not found for face '$face'";
2900 3369
2901 cf::anim::invalidate_all; # d'oh 3370 cf::anim::invalidate_all; # d'oh
2902 } 3371 }
2903 3372
2904 { 3373 {
2905 # TODO: for gcfclient pleasure, we should give resources
2906 # that gcfclient doesn't grok a >10000 face index.
2907 my $res = $facedata->{resource}; 3374 my $res = $facedata->{resource};
2908 3375
2909 my $soundconf = delete $res->{"res/sound.conf"};
2910
2911 while (my ($name, $info) = each %$res) { 3376 while (my ($name, $info) = each %$res) {
3377 if (defined $info->{type}) {
2912 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3378 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2913 my $data;
2914 3379
2915 if ($info->{type} & 1) { 3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2916 # prepend meta info 3381 cf::face::set_type $idx, $info->{type};
2917
2918 my $meta = $enc->encode ({
2919 name => $name,
2920 %{ $info->{meta} || {} },
2921 });
2922
2923 $data = pack "(w/a*)*", $meta, $info->{data};
2924 } else { 3382 } else {
2925 $data = $info->{data}; 3383 $RESOURCE{$name} = $info;
2926 } 3384 }
2927 3385
2928 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2929 cf::face::set_type $idx, $info->{type};
2930
2931 cf::cede_to_tick; 3386 cf::cede_to_tick;
2932 } 3387 }
2933
2934 if ($soundconf) {
2935 $soundconf = $enc->decode (delete $soundconf->{data});
2936
2937 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2938 my $sound = $soundconf->{compat}[$_]
2939 or next;
2940
2941 my $face = cf::face::find "sound/$sound->[1]";
2942 cf::sound::set $sound->[0] => $face;
2943 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2944 }
2945
2946 while (my ($k, $v) = each %{$soundconf->{event}}) {
2947 my $face = cf::face::find "sound/$v";
2948 cf::sound::set $k => $face;
2949 }
2950 }
2951 } 3388 }
3389
3390 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2952 3391
2953 1 3392 1
2954} 3393}
3394
3395cf::global->attach (on_resource_update => sub {
3396 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3397 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3398
3399 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3400 my $sound = $soundconf->{compat}[$_]
3401 or next;
3402
3403 my $face = cf::face::find "sound/$sound->[1]";
3404 cf::sound::set $sound->[0] => $face;
3405 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3406 }
3407
3408 while (my ($k, $v) = each %{$soundconf->{event}}) {
3409 my $face = cf::face::find "sound/$v";
3410 cf::sound::set $k => $face;
3411 }
3412 }
3413});
2955 3414
2956register_exticmd fx_want => sub { 3415register_exticmd fx_want => sub {
2957 my ($ns, $want) = @_; 3416 my ($ns, $want) = @_;
2958 3417
2959 while (my ($k, $v) = each %$want) { 3418 while (my ($k, $v) = each %$want) {
2960 $ns->fx_want ($k, $v); 3419 $ns->fx_want ($k, $v);
2961 } 3420 }
2962}; 3421};
3422
3423sub load_resource_file($) {
3424 my $guard = lock_acquire "load_resource_file";
3425
3426 my $status = load_resource_file_ $_[0];
3427 get_slot 0.1, 100;
3428 cf::arch::commit_load;
3429
3430 $status
3431}
2963 3432
2964sub reload_regions { 3433sub reload_regions {
2965 # HACK to clear player env face cache, we need some signal framework 3434 # HACK to clear player env face cache, we need some signal framework
2966 # for this (global event?) 3435 # for this (global event?)
2967 %ext::player_env::MUSIC_FACE_CACHE = (); 3436 %ext::player_env::MUSIC_FACE_CACHE = ();
2981} 3450}
2982 3451
2983sub reload_archetypes { 3452sub reload_archetypes {
2984 load_resource_file "$DATADIR/archetypes" 3453 load_resource_file "$DATADIR/archetypes"
2985 or die "unable to load archetypes\n"; 3454 or die "unable to load archetypes\n";
2986 #d# NEED to laod twice to resolve forward references
2987 # this really needs to be done in an extra post-pass
2988 # (which needs to be synchronous, so solve it differently)
2989 load_resource_file "$DATADIR/archetypes"
2990 or die "unable to load archetypes\n";
2991} 3455}
2992 3456
2993sub reload_treasures { 3457sub reload_treasures {
2994 load_resource_file "$DATADIR/treasures" 3458 load_resource_file "$DATADIR/treasures"
2995 or die "unable to load treasurelists\n"; 3459 or die "unable to load treasurelists\n";
2996} 3460}
2997 3461
2998sub reload_resources { 3462sub reload_resources {
2999 warn "reloading resource files...\n"; 3463 warn "reloading resource files...\n";
3000 3464
3465 reload_facedata;
3466 reload_archetypes;
3001 reload_regions; 3467 reload_regions;
3002 reload_facedata;
3003 #reload_archetypes;#d#
3004 reload_archetypes;
3005 reload_treasures; 3468 reload_treasures;
3006 3469
3007 warn "finished reloading resource files\n"; 3470 warn "finished reloading resource files\n";
3008} 3471}
3009 3472
3010sub init {
3011 reload_resources;
3012}
3013
3014sub reload_config { 3473sub reload_config {
3474 warn "reloading config file...\n";
3475
3015 open my $fh, "<:utf8", "$CONFDIR/config" 3476 open my $fh, "<:utf8", "$CONFDIR/config"
3016 or return; 3477 or return;
3017 3478
3018 local $/; 3479 local $/;
3019 *CFG = YAML::Syck::Load <$fh>; 3480 *CFG = YAML::XS::Load scalar <$fh>;
3020 3481
3021 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3022 3483
3023 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3024 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3485 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3028 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3029 and die "WARNING: m(un)lockall failed: $!\n"; 3490 and die "WARNING: m(un)lockall failed: $!\n";
3030 }; 3491 };
3031 warn $@ if $@; 3492 warn $@ if $@;
3032 } 3493 }
3494
3495 warn "finished reloading resource files\n";
3496}
3497
3498sub pidfile() {
3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3500 or die "$PIDFILE: $!";
3501 flock $fh, &Fcntl::LOCK_EX
3502 or die "$PIDFILE: flock: $!";
3503 $fh
3504}
3505
3506# make sure only one server instance is running at any one time
3507sub atomic {
3508 my $fh = pidfile;
3509
3510 my $pid = <$fh>;
3511 kill 9, $pid if $pid > 0;
3512
3513 seek $fh, 0, 0;
3514 print $fh $$;
3515}
3516
3517sub main_loop {
3518 warn "EV::loop starting\n";
3519 if (1) {
3520 EV::loop;
3521 }
3522 warn "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP;
3033} 3524}
3034 3525
3035sub main { 3526sub main {
3527 cf::init_globals; # initialise logging
3528
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533
3534 cf::init_experience;
3535 cf::init_anim;
3536 cf::init_attackmess;
3537 cf::init_dynamic;
3538
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540
3036 # we must not ever block the main coroutine 3541 # we must not ever block the main coroutine
3037 local $Coro::idle = sub { 3542 local $Coro::idle = sub {
3038 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3543 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3039 (async { 3544 (async {
3040 Event::one_event; 3545 $Coro::current->{desc} = "IDLE BUG HANDLER";
3546 EV::loop EV::LOOP_ONESHOT;
3041 })->prio (Coro::PRIO_MAX); 3547 })->prio (Coro::PRIO_MAX);
3042 }; 3548 };
3043 3549
3550 evthread_start IO::AIO::poll_fileno;
3551
3552 cf::sync_job {
3553 cf::load_settings;
3554 cf::load_materials;
3555
3556 reload_resources;
3044 reload_config; 3557 reload_config;
3045 db_init; 3558 db_init;
3559
3560 cf::init_uuid;
3561 cf::init_signals;
3562 cf::init_skills;
3563
3564 cf::init_beforeplay;
3565
3566 atomic;
3567
3046 load_extensions; 3568 load_extensions;
3047 3569
3048 $TICK_WATCHER->start; 3570 utime time, time, $RUNTIMEFILE;
3049 Event::loop; 3571
3572 # no (long-running) fork's whatsoever before this point(!)
3573 use POSIX ();
3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575
3576 (pop @POST_INIT)->(0) while @POST_INIT;
3577 };
3578
3579 main_loop;
3050} 3580}
3051 3581
3052############################################################################# 3582#############################################################################
3053# initialisation and cleanup 3583# initialisation and cleanup
3054 3584
3055# install some emergency cleanup handlers 3585# install some emergency cleanup handlers
3056BEGIN { 3586BEGIN {
3587 our %SIGWATCHER = ();
3057 for my $signal (qw(INT HUP TERM)) { 3588 for my $signal (qw(INT HUP TERM)) {
3058 Event->signal ( 3589 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3059 reentrant => 0,
3060 data => WF_AUTOCANCEL,
3061 signal => $signal,
3062 prio => 0,
3063 cb => sub {
3064 cf::cleanup "SIG$signal"; 3590 cf::cleanup "SIG$signal";
3065 },
3066 ); 3591 };
3067 } 3592 }
3068} 3593}
3069 3594
3070sub write_runtime { 3595sub write_runtime_sync {
3071 my $runtime = "$LOCALDIR/runtime"; 3596 my $t0 = EV::time;
3072 3597
3073 # first touch the runtime file to show we are still running: 3598 # first touch the runtime file to show we are still running:
3074 # the fsync below can take a very very long time. 3599 # the fsync below can take a very very long time.
3075 3600
3076 IO::AIO::aio_utime $runtime, undef, undef; 3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3077 3602
3078 my $guard = cf::lock_acquire "write_runtime"; 3603 my $guard = cf::lock_acquire "write_runtime";
3079 3604
3080 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3605 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3081 or return; 3606 or return;
3082 3607
3083 my $value = $cf::RUNTIME + 90 + 10; 3608 my $value = $cf::RUNTIME + 90 + 10;
3084 # 10 is the runtime save interval, for a monotonic clock 3609 # 10 is the runtime save interval, for a monotonic clock
3085 # 60 allows for the watchdog to kill the server. 3610 # 60 allows for the watchdog to kill the server.
3095 aio_utime $fh, undef, undef; 3620 aio_utime $fh, undef, undef;
3096 3621
3097 close $fh 3622 close $fh
3098 or return; 3623 or return;
3099 3624
3100 aio_rename "$runtime~", $runtime 3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3101 and return; 3626 and return;
3102 3627
3103 warn "runtime file written.\n"; 3628 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3104 3629
3105 1 3630 1
3631}
3632
3633our $uuid_lock;
3634our $uuid_skip;
3635
3636sub write_uuid_sync($) {
3637 $uuid_skip ||= $_[0];
3638
3639 return if $uuid_lock;
3640 local $uuid_lock = 1;
3641
3642 my $uuid = "$LOCALDIR/uuid";
3643
3644 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3645 or return;
3646
3647 my $value = uuid_seq uuid_cur;
3648
3649 unless ($value) {
3650 warn "cowardly refusing to write zero uuid value!\n";
3651 return;
3652 }
3653
3654 my $value = uuid_str $value + $uuid_skip;
3655 $uuid_skip = 0;
3656
3657 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3658 and return;
3659
3660 # always fsync - this file is important
3661 aio_fsync $fh
3662 and return;
3663
3664 close $fh
3665 or return;
3666
3667 aio_rename "$uuid~", $uuid
3668 and return;
3669
3670 warn "uuid file written ($value).\n";
3671
3672 1
3673
3674}
3675
3676sub write_uuid($$) {
3677 my ($skip, $sync) = @_;
3678
3679 $sync ? write_uuid_sync $skip
3680 : async { write_uuid_sync $skip };
3106} 3681}
3107 3682
3108sub emergency_save() { 3683sub emergency_save() {
3109 my $freeze_guard = cf::freeze_mainloop; 3684 my $freeze_guard = cf::freeze_mainloop;
3110 3685
3111 warn "enter emergency perl save\n"; 3686 warn "emergency_perl_save: enter\n";
3112 3687
3113 cf::sync_job { 3688 cf::sync_job {
3689 # this is a trade-off: we want to be very quick here, so
3690 # save all maps without fsync, and later call a global sync
3691 # (which in turn might be very very slow)
3692 local $USE_FSYNC = 0;
3693
3114 # use a peculiar iteration method to avoid tripping on perl 3694 # use a peculiar iteration method to avoid tripping on perl
3115 # refcount bugs in for. also avoids problems with players 3695 # refcount bugs in for. also avoids problems with players
3116 # and maps saved/destroyed asynchronously. 3696 # and maps saved/destroyed asynchronously.
3117 warn "begin emergency player save\n"; 3697 warn "emergency_perl_save: begin player save\n";
3118 for my $login (keys %cf::PLAYER) { 3698 for my $login (keys %cf::PLAYER) {
3119 my $pl = $cf::PLAYER{$login} or next; 3699 my $pl = $cf::PLAYER{$login} or next;
3120 $pl->valid or next; 3700 $pl->valid or next;
3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3121 $pl->save; 3702 $pl->save;
3122 } 3703 }
3123 warn "end emergency player save\n"; 3704 warn "emergency_perl_save: end player save\n";
3124 3705
3125 warn "begin emergency map save\n"; 3706 warn "emergency_perl_save: begin map save\n";
3126 for my $path (keys %cf::MAP) { 3707 for my $path (keys %cf::MAP) {
3127 my $map = $cf::MAP{$path} or next; 3708 my $map = $cf::MAP{$path} or next;
3128 $map->valid or next; 3709 $map->valid or next;
3129 $map->save; 3710 $map->save;
3130 } 3711 }
3131 warn "end emergency map save\n"; 3712 warn "emergency_perl_save: end map save\n";
3132 3713
3133 warn "begin emergency database checkpoint\n"; 3714 warn "emergency_perl_save: begin database checkpoint\n";
3134 BDB::db_env_txn_checkpoint $DB_ENV; 3715 BDB::db_env_txn_checkpoint $DB_ENV;
3135 warn "end emergency database checkpoint\n"; 3716 warn "emergency_perl_save: end database checkpoint\n";
3717
3718 warn "emergency_perl_save: begin write uuid\n";
3719 write_uuid_sync 1;
3720 warn "emergency_perl_save: end write uuid\n";
3136 }; 3721 };
3137 3722
3723 warn "emergency_perl_save: starting sync()\n";
3724 IO::AIO::aio_sync sub {
3725 warn "emergency_perl_save: finished sync()\n";
3726 };
3727
3138 warn "leave emergency perl save\n"; 3728 warn "emergency_perl_save: leave\n";
3139} 3729}
3140 3730
3141sub post_cleanup { 3731sub post_cleanup {
3142 my ($make_core) = @_; 3732 my ($make_core) = @_;
3143 3733
3144 warn Carp::longmess "post_cleanup backtrace" 3734 warn Carp::longmess "post_cleanup backtrace"
3145 if $make_core; 3735 if $make_core;
3736
3737 my $fh = pidfile;
3738 unlink $PIDFILE if <$fh> == $$;
3739}
3740
3741# a safer delete_package, copied from Symbol
3742sub clear_package($) {
3743 my $pkg = shift;
3744
3745 # expand to full symbol table name if needed
3746 unless ($pkg =~ /^main::.*::$/) {
3747 $pkg = "main$pkg" if $pkg =~ /^::/;
3748 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3749 $pkg .= '::' unless $pkg =~ /::$/;
3750 }
3751
3752 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3753 my $stem_symtab = *{$stem}{HASH};
3754
3755 defined $stem_symtab and exists $stem_symtab->{$leaf}
3756 or return;
3757
3758 # clear all symbols
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 }
3764 warn "cleared package $pkg\n";#d#
3146} 3765}
3147 3766
3148sub do_reload_perl() { 3767sub do_reload_perl() {
3149 # can/must only be called in main 3768 # can/must only be called in main
3150 if ($Coro::current != $Coro::main) { 3769 if ($Coro::current != $Coro::main) {
3151 warn "can only reload from main coroutine"; 3770 warn "can only reload from main coroutine";
3152 return; 3771 return;
3153 } 3772 }
3154 3773
3774 return if $RELOAD++;
3775
3776 my $t1 = EV::time;
3777
3778 while ($RELOAD) {
3155 warn "reloading..."; 3779 warn "reloading...";
3156 3780
3157 warn "entering sync_job"; 3781 warn "entering sync_job";
3158 3782
3159 cf::sync_job { 3783 cf::sync_job {
3160 cf::write_runtime; # external watchdog should not bark 3784 cf::write_runtime_sync; # external watchdog should not bark
3161 cf::emergency_save; 3785 cf::emergency_save;
3162 cf::write_runtime; # external watchdog should not bark 3786 cf::write_runtime_sync; # external watchdog should not bark
3163 3787
3164 warn "syncing database to disk"; 3788 warn "syncing database to disk";
3165 BDB::db_env_txn_checkpoint $DB_ENV; 3789 BDB::db_env_txn_checkpoint $DB_ENV;
3166 3790
3167 # if anything goes wrong in here, we should simply crash as we already saved 3791 # if anything goes wrong in here, we should simply crash as we already saved
3168 3792
3169 warn "cancelling all WF_AUTOCANCEL watchers";
3170 for (Event::all_watchers) {
3171 $_->cancel if $_->data & WF_AUTOCANCEL;
3172 }
3173
3174 warn "flushing outstanding aio requests"; 3793 warn "flushing outstanding aio requests";
3175 for (;;) {
3176 BDB::flush;
3177 IO::AIO::flush;
3178 Coro::cede;
3179 last unless IO::AIO::nreqs || BDB::nreqs; 3794 while (IO::AIO::nreqs || BDB::nreqs) {
3180 warn "iterate..."; 3795 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3181 }
3182
3183 ++$RELOAD;
3184
3185 warn "cancelling all extension coros";
3186 $_->cancel for values %EXT_CORO;
3187 %EXT_CORO = ();
3188
3189 warn "removing commands";
3190 %COMMAND = ();
3191
3192 warn "removing ext/exti commands";
3193 %EXTCMD = ();
3194 %EXTICMD = ();
3195
3196 warn "unloading/nuking all extensions";
3197 for my $pkg (@EXTS) {
3198 warn "... unloading $pkg";
3199
3200 if (my $cb = $pkg->can ("unload")) {
3201 eval {
3202 $cb->($pkg);
3203 1
3204 } or warn "$pkg unloaded, but with errors: $@";
3205 } 3796 }
3206 3797
3207 warn "... nuking $pkg"; 3798 warn "cancelling all extension coros";
3208 Symbol::delete_package $pkg; 3799 $_->cancel for values %EXT_CORO;
3209 } 3800 %EXT_CORO = ();
3210 3801
3211 warn "unloading all perl modules loaded from $LIBDIR"; 3802 warn "removing commands";
3212 while (my ($k, $v) = each %INC) { 3803 %COMMAND = ();
3213 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3214 3804
3805 warn "removing ext/exti commands";
3806 %EXTCMD = ();
3807 %EXTICMD = ();
3808
3809 warn "unloading/nuking all extensions";
3810 for my $pkg (@EXTS) {
3215 warn "... unloading $k"; 3811 warn "... unloading $pkg";
3216 delete $INC{$k};
3217 3812
3218 $k =~ s/\.pm$//;
3219 $k =~ s/\//::/g;
3220
3221 if (my $cb = $k->can ("unload_module")) { 3813 if (my $cb = $pkg->can ("unload")) {
3814 eval {
3222 $cb->(); 3815 $cb->($pkg);
3816 1
3817 } or warn "$pkg unloaded, but with errors: $@";
3818 }
3819
3820 warn "... clearing $pkg";
3821 clear_package $pkg;
3223 } 3822 }
3224 3823
3225 Symbol::delete_package $k; 3824 warn "unloading all perl modules loaded from $LIBDIR";
3825 while (my ($k, $v) = each %INC) {
3826 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3827
3828 warn "... unloading $k";
3829 delete $INC{$k};
3830
3831 $k =~ s/\.pm$//;
3832 $k =~ s/\//::/g;
3833
3834 if (my $cb = $k->can ("unload_module")) {
3835 $cb->();
3836 }
3837
3838 clear_package $k;
3226 } 3839 }
3227 3840
3228 warn "getting rid of safe::, as good as possible"; 3841 warn "getting rid of safe::, as good as possible";
3229 Symbol::delete_package "safe::$_" 3842 clear_package "safe::$_"
3230 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3843 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3231 3844
3232 warn "unloading cf.pm \"a bit\""; 3845 warn "unloading cf.pm \"a bit\"";
3233 delete $INC{"cf.pm"}; 3846 delete $INC{"cf.pm"};
3234 delete $INC{"cf/pod.pm"}; 3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3235 3848
3236 # don't, removes xs symbols, too, 3849 # don't, removes xs symbols, too,
3237 # and global variables created in xs 3850 # and global variables created in xs
3238 #Symbol::delete_package __PACKAGE__; 3851 #clear_package __PACKAGE__;
3239 3852
3240 warn "unload completed, starting to reload now"; 3853 warn "unload completed, starting to reload now";
3241 3854
3242 warn "reloading cf.pm"; 3855 warn "reloading cf.pm";
3243 require cf; 3856 require cf;
3244 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3857 cf::_connect_to_perl_1;
3245 3858
3246 warn "loading config and database again"; 3859 warn "loading config and database again";
3247 cf::reload_config; 3860 cf::reload_config;
3248 3861
3249 warn "loading extensions"; 3862 warn "loading extensions";
3250 cf::load_extensions; 3863 cf::load_extensions;
3251 3864
3865 if ($REATTACH_ON_RELOAD) {
3252 warn "reattaching attachments to objects/players"; 3866 warn "reattaching attachments to objects/players";
3253 _global_reattach; # objects, sockets 3867 _global_reattach; # objects, sockets
3254 warn "reattaching attachments to maps"; 3868 warn "reattaching attachments to maps";
3255 reattach $_ for values %MAP; 3869 reattach $_ for values %MAP;
3256 warn "reattaching attachments to players"; 3870 warn "reattaching attachments to players";
3257 reattach $_ for values %PLAYER; 3871 reattach $_ for values %PLAYER;
3872 }
3258 3873
3874 warn "running post_init jobs";
3875 (pop @POST_INIT)->(1) while @POST_INIT;
3876
3259 warn "leaving sync_job"; 3877 warn "leaving sync_job";
3260 3878
3261 1 3879 1
3262 } or do { 3880 } or do {
3263 warn $@; 3881 warn $@;
3264 warn "error while reloading, exiting."; 3882 cf::cleanup "error while reloading, exiting.";
3265 exit 1;
3266 }; 3883 };
3267 3884
3268 warn "reloaded"; 3885 warn "reloaded";
3886 --$RELOAD;
3887 }
3888
3889 $t1 = EV::time - $t1;
3890 warn "reload completed in ${t1}s\n";
3269}; 3891};
3270 3892
3271our $RELOAD_WATCHER; # used only during reload 3893our $RELOAD_WATCHER; # used only during reload
3272 3894
3273sub reload_perl() { 3895sub reload_perl() {
3274 # doing reload synchronously and two reloads happen back-to-back, 3896 # doing reload synchronously and two reloads happen back-to-back,
3275 # coro crashes during coro_state_free->destroy here. 3897 # coro crashes during coro_state_free->destroy here.
3276 3898
3277 $RELOAD_WATCHER ||= Event->timer ( 3899 $RELOAD_WATCHER ||= cf::async {
3278 reentrant => 0, 3900 Coro::AIO::aio_wait cache_extensions;
3279 after => 0, 3901
3280 data => WF_AUTOCANCEL, 3902 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3281 cb => sub {
3282 do_reload_perl; 3903 do_reload_perl;
3283 undef $RELOAD_WATCHER; 3904 undef $RELOAD_WATCHER;
3284 }, 3905 };
3285 ); 3906 };
3286} 3907}
3287 3908
3288register_command "reload" => sub { 3909register_command "reload" => sub {
3289 my ($who, $arg) = @_; 3910 my ($who, $arg) = @_;
3290 3911
3291 if ($who->flag (FLAG_WIZ)) { 3912 if ($who->flag (FLAG_WIZ)) {
3292 $who->message ("reloading server."); 3913 $who->message ("reloading server.");
3914 async {
3915 $Coro::current->{desc} = "perl_reload";
3293 async { reload_perl }; 3916 reload_perl;
3917 };
3294 } 3918 }
3295}; 3919};
3296 3920
3297unshift @INC, $LIBDIR; 3921unshift @INC, $LIBDIR;
3298 3922
3300 3924
3301our @WAIT_FOR_TICK; 3925our @WAIT_FOR_TICK;
3302our @WAIT_FOR_TICK_BEGIN; 3926our @WAIT_FOR_TICK_BEGIN;
3303 3927
3304sub wait_for_tick { 3928sub wait_for_tick {
3305 return unless $TICK_WATCHER->is_active;
3306 return if $Coro::current == $Coro::main; 3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3307 3930
3308 my $signal = new Coro::Signal; 3931 my $signal = new Coro::Signal;
3309 push @WAIT_FOR_TICK, $signal; 3932 push @WAIT_FOR_TICK, $signal;
3310 $signal->wait; 3933 $signal->wait;
3311} 3934}
3312 3935
3313sub wait_for_tick_begin { 3936sub wait_for_tick_begin {
3314 return unless $TICK_WATCHER->is_active;
3315 return if $Coro::current == $Coro::main; 3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3316 3938
3317 my $signal = new Coro::Signal; 3939 my $signal = new Coro::Signal;
3318 push @WAIT_FOR_TICK_BEGIN, $signal; 3940 push @WAIT_FOR_TICK_BEGIN, $signal;
3319 $signal->wait; 3941 $signal->wait;
3320} 3942}
3321 3943
3322 my $min = 1e6;#d# 3944sub tick {
3323 my $avg = 10;
3324$TICK_WATCHER = Event->timer (
3325 reentrant => 0,
3326 parked => 1,
3327 prio => 0,
3328 at => $NEXT_TICK || $TICK,
3329 data => WF_AUTOCANCEL,
3330 cb => sub {
3331 if ($Coro::current != $Coro::main) { 3945 if ($Coro::current != $Coro::main) {
3332 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3946 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3333 unless ++$bug_warning > 10; 3947 unless ++$bug_warning > 10;
3334 return; 3948 return;
3335 } 3949 }
3336 3950
3337 $NOW = $tick_start = Event::time;
3338
3339 cf::server_tick; # one server iteration 3951 cf::server_tick; # one server iteration
3340 3952
3341 0 && sync_job {#d# 3953 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3342 for(1..10) {
3343 my $t = Event::time;
3344 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3345 or die;
3346 3954
3347 $map->width (50); 3955 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3348 $map->height (50); 3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3349 $map->alloc; 3957 Coro::async_pool {
3350 $map->_load_objects ("/tmp/x.map", 1); 3958 $Coro::current->{desc} = "runtime saver";
3351 my $t = Event::time - $t; 3959 write_runtime_sync
3352 3960 or warn "ERROR: unable to write runtime file: $!";
3353 #next unless $t < 0.0013;#d#
3354 if ($t < $min) {
3355 $min = $t;
3356 }
3357 $avg = $avg * 0.99 + $t * 0.01;
3358 }
3359 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3360 exit 0;
3361 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3362 }; 3961 };
3962 }
3363 3963
3364 $RUNTIME += $TICK;
3365 $NEXT_TICK += $TICK;
3366
3367 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3368 $NEXT_RUNTIME_WRITE = $NOW + 10;
3369 Coro::async_pool {
3370 write_runtime
3371 or warn "ERROR: unable to write runtime file: $!";
3372 };
3373 }
3374
3375# my $AFTER = Event::time;
3376# warn $AFTER - $NOW;#d#
3377
3378 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3964 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3379 $sig->send; 3965 $sig->send;
3380 } 3966 }
3381 while (my $sig = shift @WAIT_FOR_TICK) { 3967 while (my $sig = shift @WAIT_FOR_TICK) {
3382 $sig->send; 3968 $sig->send;
3383 } 3969 }
3384 3970
3385 $NOW = Event::time; 3971 $LOAD = ($NOW - $TICK_START) / $TICK;
3386
3387 # if we are delayed by four ticks or more, skip them all
3388 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3389
3390 $TICK_WATCHER->at ($NEXT_TICK);
3391 $TICK_WATCHER->start;
3392
3393 $LOAD = ($NOW - $tick_start) / $TICK;
3394 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3972 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3395 3973
3396 _post_tick; 3974 if (0) {
3397 3975 if ($NEXT_TICK) {
3398 3976 my $jitter = $TICK_START - $NEXT_TICK;
3977 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3978 warn "jitter $JITTER\n";#d#
3979 }
3399 }, 3980 }
3400); 3981}
3401 3982
3402{ 3983{
3403 BDB::max_poll_time $TICK * 0.1; 3984 # configure BDB
3404 $BDB_POLL_WATCHER = Event->io ( 3985
3405 reentrant => 0,
3406 fd => BDB::poll_fileno,
3407 poll => 'r',
3408 prio => 0,
3409 data => WF_AUTOCANCEL,
3410 cb => \&BDB::poll_cb,
3411 );
3412 BDB::min_parallel 8; 3986 BDB::min_parallel 16;
3413 3987 BDB::max_poll_reqs $TICK * 0.1;
3414 BDB::set_sync_prepare { 3988 $AnyEvent::BDB::WATCHER->priority (1);
3415 my $status;
3416 my $current = $Coro::current;
3417 (
3418 sub {
3419 $status = $!;
3420 $current->ready; undef $current;
3421 },
3422 sub {
3423 Coro::schedule while defined $current;
3424 $! = $status;
3425 },
3426 )
3427 };
3428 3989
3429 unless ($DB_ENV) { 3990 unless ($DB_ENV) {
3430 $DB_ENV = BDB::db_env_create; 3991 $DB_ENV = BDB::db_env_create;
3992 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3993 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3994 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3995 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3996 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3431 3997
3432 cf::sync_job { 3998 cf::sync_job {
3433 eval { 3999 eval {
3434 BDB::db_env_open 4000 BDB::db_env_open
3435 $DB_ENV, 4001 $DB_ENV,
3437 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4003 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3438 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4004 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3439 0666; 4005 0666;
3440 4006
3441 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4007 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3442
3443 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3444 $DB_ENV->set_lk_detect;
3445 }; 4008 };
3446 4009
3447 cf::cleanup "db_env_open(db): $@" if $@; 4010 cf::cleanup "db_env_open(db): $@" if $@;
3448 }; 4011 };
3449 } 4012 }
4013
4014 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4015 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4016 };
4017 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4018 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4019 };
4020 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4021 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4022 };
3450} 4023}
3451 4024
3452{ 4025{
4026 # configure IO::AIO
4027
3453 IO::AIO::min_parallel 8; 4028 IO::AIO::min_parallel 8;
3454
3455 undef $Coro::AIO::WATCHER;
3456 IO::AIO::max_poll_time $TICK * 0.1; 4029 IO::AIO::max_poll_time $TICK * 0.1;
3457 $AIO_POLL_WATCHER = Event->io ( 4030 undef $AnyEvent::AIO::WATCHER;
3458 reentrant => 0,
3459 data => WF_AUTOCANCEL,
3460 fd => IO::AIO::poll_fileno,
3461 poll => 'r',
3462 prio => 6,
3463 cb => \&IO::AIO::poll_cb,
3464 );
3465} 4031}
3466 4032
3467my $_log_backtrace; 4033my $_log_backtrace;
3468 4034
3469sub _log_backtrace { 4035sub _log_backtrace {
3472 $msg =~ s/\n//; 4038 $msg =~ s/\n//;
3473 4039
3474 # limit the # of concurrent backtraces 4040 # limit the # of concurrent backtraces
3475 if ($_log_backtrace < 2) { 4041 if ($_log_backtrace < 2) {
3476 ++$_log_backtrace; 4042 ++$_log_backtrace;
4043 my $perl_bt = Carp::longmess $msg;
3477 async { 4044 async {
4045 $Coro::current->{desc} = "abt $msg";
4046
3478 my @bt = fork_call { 4047 my @bt = fork_call {
3479 @addr = map { sprintf "%x", $_ } @addr; 4048 @addr = map { sprintf "%x", $_ } @addr;
3480 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4049 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3481 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4050 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3482 or die "addr2line: $!"; 4051 or die "addr2line: $!";
3490 } 4059 }
3491 4060
3492 @funcs 4061 @funcs
3493 }; 4062 };
3494 4063
3495 LOG llevInfo, "[ABT] $msg\n"; 4064 LOG llevInfo, "[ABT] $perl_bt\n";
4065 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3496 LOG llevInfo, "[ABT] $_\n" for @bt; 4066 LOG llevInfo, "[ABT] $_\n" for @bt;
3497 --$_log_backtrace; 4067 --$_log_backtrace;
3498 }; 4068 };
3499 } else { 4069 } else {
3500 LOG llevInfo, "[ABT] $msg\n"; 4070 LOG llevInfo, "[ABT] $msg\n";
3501 LOG llevInfo, "[ABT] [suppressed]\n"; 4071 LOG llevInfo, "[ABT] [suppressed]\n";
3502 } 4072 }
3503} 4073}
3504 4074
3505# load additional modules 4075# load additional modules
3506use cf::pod; 4076require "cf/$_.pm" for @EXTRA_MODULES;
4077cf::_connect_to_perl_2;
3507 4078
3508END { cf::emergency_save } 4079END { cf::emergency_save }
3509 4080
35101 40811
3511 4082

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines