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.347 by root, Thu Aug 30 05:16:09 2007 UTC vs.
Revision 1.505 by root, Sun Jan 31 03:46:20 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_command => sub {
1135 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1136 1317
1137 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
… …
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}
1315 1537
… …
1323 1545
1324 return if $pl->{deny_save}; 1546 return if $pl->{deny_save};
1325 1547
1326 aio_mkdir playerdir $pl, 0770; 1548 aio_mkdir playerdir $pl, 0770;
1327 $pl->{last_save} = $cf::RUNTIME; 1549 $pl->{last_save} = $cf::RUNTIME;
1550
1551 cf::get_slot 0.01;
1328 1552
1329 $pl->save_pl ($path); 1553 $pl->save_pl ($path);
1330 cf::cede_to_tick; 1554 cf::cede_to_tick;
1331} 1555}
1332 1556
… …
1364 my ($pl) = @_; 1588 my ($pl) = @_;
1365 1589
1366 my $name = $pl->ob->name; 1590 my $name = $pl->ob->name;
1367 1591
1368 $pl->{deny_save} = 1; 1592 $pl->{deny_save} = 1;
1369 $pl->password ("*"); # this should lock out the player until we nuked the dir 1593 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1370 1594
1371 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1372 $pl->deactivate; 1596 $pl->deactivate;
1597 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1598 $pl->ob->check_score;
1373 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1599 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1374 $pl->ns->destroy if $pl->ns; 1600 $pl->ns->destroy if $pl->ns;
1375 1601
1376 my $path = playerdir $pl; 1602 my $path = playerdir $pl;
1377 my $temp = "$path~$cf::RUNTIME~deleting~"; 1603 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1413 or return []; 1639 or return [];
1414 1640
1415 my @logins; 1641 my @logins;
1416 1642
1417 for my $login (@$dirs) { 1643 for my $login (@$dirs) {
1644 my $path = path $login;
1645
1646 # a .pst is a dead give-away for a valid player
1647 # if no pst file found, open and chekc for blocked users
1648 if (aio_stat "$path.pst") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1649 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1650 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1651 $buf !~ /^password -------------$/m or next; # official not-valid tag
1652 }
1421 1653
1422 utf8::decode $login; 1654 utf8::decode $login;
1423 push @logins, $login; 1655 push @logins, $login;
1424 } 1656 }
1425 1657
… …
1452 } 1684 }
1453 1685
1454 \@paths 1686 \@paths
1455} 1687}
1456 1688
1457=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1689=item $protocol_xml = $player->expand_cfpod ($cfpod)
1458 1690
1459Expand crossfire pod fragments into protocol xml. 1691Expand 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 1692
1507=item $player->ext_reply ($msgid, @msg) 1693=item $player->ext_reply ($msgid, @msg)
1508 1694
1509Sends an ext reply to the player. 1695Sends an ext reply to the player.
1510 1696
… …
1577our $MAX_RESET = 3600; 1763our $MAX_RESET = 3600;
1578our $DEFAULT_RESET = 3000; 1764our $DEFAULT_RESET = 3000;
1579 1765
1580sub generate_random_map { 1766sub generate_random_map {
1581 my ($self, $rmp) = @_; 1767 my ($self, $rmp) = @_;
1768
1769 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1770
1582 # mit "rum" bekleckern, nicht 1771 # mit "rum" bekleckern, nicht
1583 $self->_create_random_map ( 1772 $self->_create_random_map (
1584 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1585 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1586 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1708 1897
1709# the temporary/swap location 1898# the temporary/swap location
1710sub save_path { 1899sub save_path {
1711 my ($self) = @_; 1900 my ($self) = @_;
1712 1901
1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1902 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1714 "$TMPDIR/$path.map" 1903 "$TMPDIR/$path.map"
1715} 1904}
1716 1905
1717# the unique path, undef == no special unique path 1906# the unique path, undef == no special unique path
1718sub uniq_path { 1907sub uniq_path {
1719 my ($self) = @_; 1908 my ($self) = @_;
1720 1909
1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1910 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1722 "$UNIQUEDIR/$path" 1911 "$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} 1912}
1733 1913
1734sub decay_objects { 1914sub decay_objects {
1735 my ($self) = @_; 1915 my ($self) = @_;
1736 1916
… …
1749 1929
1750sub load_header_from($) { 1930sub load_header_from($) {
1751 my ($self, $path) = @_; 1931 my ($self, $path) = @_;
1752 1932
1753 utf8::encode $path; 1933 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1934 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1935 or return;
1936
1937 $self->_load_header ($f)
1938 or return;
1939
1940 local $MAP_LOADING{$self->{path}} = $self;
1941 $f->resolve_delayed_derefs;
1759 1942
1760 $self->{load_path} = $path; 1943 $self->{load_path} = $path;
1761 1944
1762 1 1945 1
1763} 1946}
… …
1817sub find { 2000sub find {
1818 my ($path, $origin) = @_; 2001 my ($path, $origin) = @_;
1819 2002
1820 $path = normalise $path, $origin && $origin->path; 2003 $path = normalise $path, $origin && $origin->path;
1821 2004
2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 2006 my $guard2 = cf::lock_acquire "map_find:$path";
1823 2007
1824 $cf::MAP{$path} || do { 2008 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path";
1826 my $map = new_from_path cf::map $path 2009 my $map = new_from_path cf::map $path
1827 or return; 2010 or return;
1828 2011
1829 $map->{last_save} = $cf::RUNTIME; 2012 $map->{last_save} = $cf::RUNTIME;
1830 2013
… …
1832 or return; 2015 or return;
1833 2016
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2017 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 2018 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 2019 #$cf::WAIT_FOR_TICK->wait;
2020 undef $guard2;
2021 undef $guard1;
1837 $map->reset; 2022 $map->reset;
1838 undef $guard;
1839 return find $path; 2023 return find $path;
1840 } 2024 }
1841 2025
1842 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
1843 } 2027 }
1844} 2028}
1845 2029
1846sub pre_load { } 2030sub pre_load { }
1847sub post_load { } 2031#sub post_load { } # XS
1848 2032
1849sub load { 2033sub load {
1850 my ($self) = @_; 2034 my ($self) = @_;
1851 2035
1852 local $self->{deny_reset} = 1; # loading can take a long time 2036 local $self->{deny_reset} = 1; # loading can take a long time
1853 2037
1854 my $path = $self->{path}; 2038 my $path = $self->{path};
1855 2039
1856 { 2040 {
1857 my $guard1 = cf::lock_acquire "map_data:$path"; 2041 my $guard = cf::lock_acquire "map_data:$path";
1858 my $guard2 = cf::lock_acquire "map_load:$path";
1859 2042
2043 return unless $self->valid;
1860 return if $self->in_memory != cf::MAP_SWAPPED; 2044 return unless $self->in_memory == cf::MAP_SWAPPED;
1861 2045
1862 $self->in_memory (cf::MAP_LOADING); 2046 $self->in_memory (cf::MAP_LOADING);
1863 2047
1864 $self->alloc; 2048 $self->alloc;
1865 2049
1866 $self->pre_load; 2050 $self->pre_load;
1867 cf::cede_to_tick; 2051 cf::cede_to_tick;
1868 2052
2053 my $f = new_from_file cf::object::thawer $self->{load_path};
2054 $f->skip_block;
1869 $self->_load_objects ($self->{load_path}, 1) 2055 $self->_load_objects ($f)
1870 or return; 2056 or return;
1871 2057
1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2058 $self->post_load_original
1873 if delete $self->{load_original}; 2059 if delete $self->{load_original};
1874 2060
1875 if (my $uniq = $self->uniq_path) { 2061 if (my $uniq = $self->uniq_path) {
1876 utf8::encode $uniq; 2062 utf8::encode $uniq;
1877 if (aio_open $uniq, O_RDONLY, 0) { 2063 unless (aio_stat $uniq) {
2064 if (my $f = new_from_file cf::object::thawer $uniq) {
1878 $self->clear_unique_items; 2065 $self->clear_unique_items;
1879 $self->_load_objects ($uniq, 0); 2066 $self->_load_objects ($f);
2067 $f->resolve_delayed_derefs;
2068 }
1880 } 2069 }
1881 } 2070 }
2071
2072 $f->resolve_delayed_derefs;
1882 2073
1883 cf::cede_to_tick; 2074 cf::cede_to_tick;
1884 # now do the right thing for maps 2075 # now do the right thing for maps
1885 $self->link_multipart_objects; 2076 $self->link_multipart_objects;
1886 $self->difficulty ($self->estimate_difficulty) 2077 $self->difficulty ($self->estimate_difficulty)
… …
1890 unless ($self->{deny_activate}) { 2081 unless ($self->{deny_activate}) {
1891 $self->decay_objects; 2082 $self->decay_objects;
1892 $self->fix_auto_apply; 2083 $self->fix_auto_apply;
1893 $self->update_buttons; 2084 $self->update_buttons;
1894 cf::cede_to_tick; 2085 cf::cede_to_tick;
1895 $self->set_darkness_map;
1896 cf::cede_to_tick;
1897 $self->activate; 2086 $self->activate;
1898 } 2087 }
1899 2088
1900 $self->{last_save} = $cf::RUNTIME; 2089 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME); 2090 $self->last_access ($cf::RUNTIME);
1902 2091
1903 $self->in_memory (cf::MAP_IN_MEMORY); 2092 $self->in_memory (cf::MAP_ACTIVE);
1904 } 2093 }
1905 2094
1906 $self->post_load; 2095 $self->post_load;
1907} 2096}
1908 2097
… …
1966 my ($path, $origin, $load) = @_; 2155 my ($path, $origin, $load) = @_;
1967 2156
1968 $path = normalise $path, $origin && $origin->{path}; 2157 $path = normalise $path, $origin && $origin->{path};
1969 2158
1970 if (my $map = $cf::MAP{$path}) { 2159 if (my $map = $cf::MAP{$path}) {
1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2160 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1972 } 2161 }
1973 2162
1974 $MAP_PREFETCH{$path} |= $load; 2163 $MAP_PREFETCH{$path} |= $load;
1975 2164
1976 $MAP_PREFETCHER ||= cf::async { 2165 $MAP_PREFETCHER ||= cf::async {
2166 $Coro::current->{desc} = "map prefetcher";
2167
1977 while (%MAP_PREFETCH) { 2168 while (%MAP_PREFETCH) {
1978 while (my ($k, $v) = each %MAP_PREFETCH) { 2169 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $k) { 2170 if (my $map = find $k) {
1980 $map->load if $v; 2171 $map->load if $v;
1981 } 2172 }
… …
2007 return if $self->{deny_save}; 2198 return if $self->{deny_save};
2008 2199
2009 local $self->{last_access} = $self->last_access;#d# 2200 local $self->{last_access} = $self->last_access;#d#
2010 2201
2011 cf::async { 2202 cf::async {
2203 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2204 $_->contr->save for $self->players;
2013 }; 2205 };
2206
2207 cf::get_slot 0.02;
2014 2208
2015 if ($uniq) { 2209 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2210 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2017 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2211 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2018 } else { 2212 } else {
… …
2027 $self->save; 2221 $self->save;
2028 2222
2029 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2223 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2224
2031 return if $self->players; 2225 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2226 return if $self->in_memory != cf::MAP_ACTIVE;
2033 return if $self->{deny_save}; 2227 return if $self->{deny_save};
2034 2228
2229 $self->in_memory (cf::MAP_SWAPPED);
2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2233 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2234}
2038 2235
2039sub reset_at { 2236sub reset_at {
2040 my ($self) = @_; 2237 my ($self) = @_;
2041 2238
… …
2059 2256
2060 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2061 2258
2062 return if $self->players; 2259 return if $self->players;
2063 2260
2064 warn "resetting map ", $self->path; 2261 warn "resetting map ", $self->path, "\n";
2065 2262
2066 $self->in_memory (cf::MAP_SWAPPED); 2263 $self->in_memory (cf::MAP_SWAPPED);
2067 2264
2068 # need to save uniques path 2265 # need to save uniques path
2069 unless ($self->{deny_save}) { 2266 unless ($self->{deny_save}) {
… …
2073 if $uniq; 2270 if $uniq;
2074 } 2271 }
2075 2272
2076 delete $cf::MAP{$self->path}; 2273 delete $cf::MAP{$self->path};
2077 2274
2275 $self->deactivate;
2276 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2277 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2278
2082 $self->unlink_save; 2279 $self->unlink_save;
2083 $self->destroy; 2280 $self->destroy;
2084} 2281}
2085 2282
2086my $nuke_counter = "aaaa"; 2283my $nuke_counter = "aaaa";
2087 2284
2088sub nuke { 2285sub nuke {
2089 my ($self) = @_; 2286 my ($self) = @_;
2090 2287
2288 {
2289 my $lock = cf::lock_acquire "map_data:$self->{path}";
2290
2091 delete $cf::MAP{$self->path}; 2291 delete $cf::MAP{$self->path};
2092 2292
2093 $self->unlink_save; 2293 $self->unlink_save;
2094 2294
2095 bless $self, "cf::map"; 2295 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2296 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2297 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2298 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2299 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2300
2101 $cf::MAP{$self->path} = $self; 2301 $cf::MAP{$self->path} = $self;
2302 }
2102 2303
2103 $self->reset; # polite request, might not happen 2304 $self->reset; # polite request, might not happen
2104} 2305}
2105 2306
2106=item $maps = cf::map::tmp_maps 2307=item $maps = cf::map::tmp_maps
… …
2148 2349
2149sub unique_maps() { 2350sub unique_maps() {
2150 [ 2351 [
2151 map { 2352 map {
2152 utf8::decode $_; 2353 utf8::decode $_;
2153 /\.map$/ 2354 s/\.map$//; # TODO future compatibility hack
2355 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2356 ? ()
2154 ? normalise $_ 2357 : normalise $_
2155 : ()
2156 } @{ aio_readdir $UNIQUEDIR or [] } 2358 } @{ aio_readdir $UNIQUEDIR or [] }
2157 ] 2359 ]
2158} 2360}
2159 2361
2160package cf; 2362=item cf::map::static_maps
2363
2364Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2365file in the shared directory excluding F</styles> and F</editor>). May
2366block.
2367
2368=cut
2369
2370sub static_maps() {
2371 my @dirs = "";
2372 my @maps;
2373
2374 while (@dirs) {
2375 my $dir = shift @dirs;
2376
2377 next if $dir eq "/styles" || $dir eq "/editor";
2378
2379 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2380 or return;
2381
2382 for (@$files) {
2383 s/\.map$// or next;
2384 utf8::decode $_;
2385 push @maps, "$dir/$_";
2386 }
2387
2388 push @dirs, map "$dir/$_", @$dirs;
2389 }
2390
2391 \@maps
2392}
2161 2393
2162=back 2394=back
2163 2395
2164=head3 cf::object 2396=head3 cf::object
2165 2397
… …
2169 2401
2170=over 4 2402=over 4
2171 2403
2172=item $ob->inv_recursive 2404=item $ob->inv_recursive
2173 2405
2174Returns the inventory of the object _and_ their inventories, recursively. 2406Returns the inventory of the object I<and> their inventories, recursively,
2407but I<not> the object itself.
2175 2408
2176=cut 2409=cut
2177 2410
2178sub inv_recursive_; 2411sub inv_recursive_;
2179sub inv_recursive_ { 2412sub inv_recursive_ {
… …
2182 2415
2183sub inv_recursive { 2416sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2185} 2418}
2186 2419
2420=item $ref = $ob->ref
2421
2422Creates and returns a persistent reference to an object that can be stored as a string.
2423
2424=item $ob = cf::object::deref ($refstring)
2425
2426returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2427even if the object actually exists. May block.
2428
2429=cut
2430
2431sub deref {
2432 my ($ref) = @_;
2433
2434 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2435 my ($uuid, $name) = ($1, $2);
2436 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2437 or return;
2438 $pl->ob->uuid eq $uuid
2439 or return;
2440
2441 $pl->ob
2442 } else {
2443 warn "$ref: cannot resolve object reference\n";
2444 undef
2445 }
2446}
2447
2187package cf; 2448package cf;
2188 2449
2189=back 2450=back
2190 2451
2191=head3 cf::object::player 2452=head3 cf::object::player
… …
2197Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2458Sends 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 2459can be C<undef>. Does the right thing when the player is currently in a
2199dialogue with the given NPC character. 2460dialogue with the given NPC character.
2200 2461
2201=cut 2462=cut
2463
2464our $SAY_CHANNEL = {
2465 id => "say",
2466 title => "Map",
2467 reply => "say ",
2468 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2469};
2470
2471our $CHAT_CHANNEL = {
2472 id => "chat",
2473 title => "Chat",
2474 reply => "chat ",
2475 tooltip => "Player chat and shouts, global to the server.",
2476};
2202 2477
2203# rough implementation of a future "reply" method that works 2478# rough implementation of a future "reply" method that works
2204# with dialog boxes. 2479# with dialog boxes.
2205#TODO: the first argument must go, split into a $npc->reply_to ( method 2480#TODO: the first argument must go, split into a $npc->reply_to ( method
2206sub cf::object::player::reply($$$;$) { 2481sub cf::object::player::reply($$$;$) {
… …
2218 my $dialog = $pl->{npc_dialog}; 2493 my $dialog = $pl->{npc_dialog};
2219 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2494 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220 2495
2221 } else { 2496 } else {
2222 $msg = $npc->name . " says: $msg" if $npc; 2497 $msg = $npc->name . " says: $msg" if $npc;
2223 $self->message ($msg, $flags); 2498 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2224 } 2499 }
2225 } 2500 }
2226} 2501}
2227 2502
2228=item $object->send_msg ($channel, $msg, $color, [extra...]) 2503=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2253 2528
2254=item $player_object->enter_link 2529=item $player_object->enter_link
2255 2530
2256Freezes the player and moves him/her to a special map (C<{link}>). 2531Freezes the player and moves him/her to a special map (C<{link}>).
2257 2532
2258The player should be reasonably safe there for short amounts of time. You 2533The player should be reasonably safe there for short amounts of time (e.g.
2259I<MUST> call C<leave_link> as soon as possible, though. 2534for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2535though, as the palyer cannot control the character while it is on the link
2536map.
2260 2537
2261Will never block. 2538Will never block.
2262 2539
2263=item $player_object->leave_link ($map, $x, $y) 2540=item $player_object->leave_link ($map, $x, $y)
2264 2541
… …
2316 ($x, $y) = (-1, -1) 2593 ($x, $y) = (-1, -1)
2317 unless (defined $x) && (defined $y); 2594 unless (defined $x) && (defined $y);
2318 2595
2319 # use -1 or undef as default coordinates, not 0, 0 2596 # use -1 or undef as default coordinates, not 0, 0
2320 ($x, $y) = ($map->enter_x, $map->enter_y) 2597 ($x, $y) = ($map->enter_x, $map->enter_y)
2321 if $x <=0 && $y <= 0; 2598 if $x <= 0 && $y <= 0;
2322 2599
2323 $map->load; 2600 $map->load;
2324 $map->load_neighbours; 2601 $map->load_neighbours;
2325 2602
2326 return unless $self->contr->active; 2603 return unless $self->contr->active;
2327 $self->activate_recursive;
2328 2604
2329 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2605 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2330 $self->enter_map ($map, $x, $y); 2606 $self->enter_map ($map, $x, $y);
2607
2608 # only activate afterwards, to support waiting in hooks
2609 $self->activate_recursive;
2331} 2610}
2332 2611
2333=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2612=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2334 2613
2335Moves the player to the given map-path and coordinates by first freezing 2614Moves the player to the given map-path and coordinates by first freezing
2336her, loading and preparing them map, calling the provided $check callback 2615her, loading and preparing them map, calling the provided $check callback
2337that has to return the map if sucecssful, and then unfreezes the player on 2616that 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 2617the new (success) or old (failed) map position. In either case, $done will
2339be called at the end of this process. 2618be called at the end of this process.
2340 2619
2620Note that $check will be called with a potentially non-loaded map, so if
2621it needs a loaded map it has to call C<< ->load >>.
2622
2341=cut 2623=cut
2342 2624
2343our $GOTOGEN; 2625our $GOTOGEN;
2344 2626
2345sub cf::object::player::goto { 2627sub cf::object::player::goto {
… …
2349 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2631 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2350 2632
2351 $self->enter_link; 2633 $self->enter_link;
2352 2634
2353 (async { 2635 (async {
2636 $Coro::current->{desc} = "player::goto $path $x $y";
2637
2638 # *tag paths override both path and x|y
2639 if ($path =~ /^\*(.*)$/) {
2640 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2641 my $ob = $obs[rand @obs];
2642
2643 # see if we actually can go there
2644 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2645 $ob = $obs[rand @obs];
2646 } else {
2647 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2648 }
2649 # else put us there anyways for now #d#
2650
2651 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2652 } else {
2653 ($path, $x, $y) = (undef, undef, undef);
2654 }
2655 }
2656
2354 my $map = eval { 2657 my $map = eval {
2355 my $map = cf::map::find $path; 2658 my $map = defined $path ? cf::map::find $path : undef;
2356 2659
2357 if ($map) { 2660 if ($map) {
2358 $map = $map->customise_for ($self); 2661 $map = $map->customise_for ($self);
2359 $map = $check->($map) if $check && $map; 2662 $map = $check->($map) if $check && $map;
2360 } else { 2663 } else {
2361 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2664 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2362 } 2665 }
2363 2666
2364 $map 2667 $map
2365 }; 2668 };
2366 2669
… …
2402} 2705}
2403 2706
2404sub prepare_random_map { 2707sub prepare_random_map {
2405 my ($exit) = @_; 2708 my ($exit) = @_;
2406 2709
2407 my $guard = cf::lock_acquire "exit_prepare:$exit";
2408
2409 # all this does is basically replace the /! path by 2710 # all this does is basically replace the /! path by
2410 # a new random map path (?random/...) with a seed 2711 # a new random map path (?random/...) with a seed
2411 # that depends on the exit object 2712 # that depends on the exit object
2412 2713
2413 my $rmp = parse_random_map_params $exit->msg; 2714 my $rmp = parse_random_map_params $exit->msg;
… …
2415 if ($exit->map) { 2716 if ($exit->map) {
2416 $rmp->{region} = $exit->region->name; 2717 $rmp->{region} = $exit->region->name;
2417 $rmp->{origin_map} = $exit->map->path; 2718 $rmp->{origin_map} = $exit->map->path;
2418 $rmp->{origin_x} = $exit->x; 2719 $rmp->{origin_x} = $exit->x;
2419 $rmp->{origin_y} = $exit->y; 2720 $rmp->{origin_y} = $exit->y;
2721
2722 $exit->map->touch;
2420 } 2723 }
2421 2724
2422 $rmp->{random_seed} ||= $exit->random_seed; 2725 $rmp->{random_seed} ||= $exit->random_seed;
2423 2726
2424 my $data = cf::to_json $rmp; 2727 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2425 my $md5 = Digest::MD5::md5_hex $data; 2728 my $md5 = Digest::MD5::md5_hex $data;
2426 my $meta = "$RANDOMDIR/$md5.meta"; 2729 my $meta = "$RANDOMDIR/$md5.meta";
2427 2730
2428 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2731 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2429 aio_write $fh, 0, (length $data), $data, 0; 2732 aio_write $fh, 0, (length $data), $data, 0;
2430 undef $fh; 2733 undef $fh;
2431 aio_rename "$meta~", $meta; 2734 aio_rename "$meta~", $meta;
2432 2735
2736 my $slaying = "?random/$md5";
2737
2738 if ($exit->valid) {
2433 $exit->slaying ("?random/$md5"); 2739 $exit->slaying ("?random/$md5");
2434 $exit->msg (undef); 2740 $exit->msg (undef);
2741 }
2435 } 2742 }
2436} 2743}
2437 2744
2438sub cf::object::player::enter_exit { 2745sub cf::object::player::enter_exit {
2439 my ($self, $exit) = @_; 2746 my ($self, $exit) = @_;
2440 2747
2441 return unless $self->type == cf::PLAYER; 2748 return unless $self->type == cf::PLAYER;
2442 2749
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; 2750 $self->enter_link;
2455 2751
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 { 2752 (async {
2461 $self->deactivate_recursive; # just to be sure 2753 $Coro::current->{desc} = "enter_exit";
2754
2462 unless (eval { 2755 unless (eval {
2756 $self->deactivate_recursive; # just to be sure
2757
2758 # random map handling
2759 {
2760 my $guard = cf::lock_acquire "exit_prepare:$exit";
2761
2762 prepare_random_map $exit
2763 if $exit->slaying eq "/!";
2764 }
2765
2766 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2767 my $x = $exit->stats->hp;
2768 my $y = $exit->stats->sp;
2769
2463 $self->goto ($slaying, $hp, $sp); 2770 $self->goto ($map, $x, $y);
2464 2771
2772 # if exit is damned, update players death & WoR home-position
2773 $self->contr->savebed ($map, $x, $y)
2774 if $exit->flag (cf::FLAG_DAMNED);
2775
2465 1; 2776 1
2466 }) { 2777 }) {
2467 $self->message ("Something went wrong deep within the crossfire server. " 2778 $self->message ("Something went wrong deep within the deliantra server. "
2468 . "I'll try to bring you back to the map you were before. " 2779 . "I'll try to bring you back to the map you were before. "
2469 . "Please report this to the dungeon master!", 2780 . "Please report this to the dungeon master!",
2470 cf::NDI_UNIQUE | cf::NDI_RED); 2781 cf::NDI_UNIQUE | cf::NDI_RED);
2471 2782
2472 warn "ERROR in enter_exit: $@"; 2783 warn "ERROR in enter_exit: $@";
… …
2489sub cf::client::send_drawinfo { 2800sub cf::client::send_drawinfo {
2490 my ($self, $text, $flags) = @_; 2801 my ($self, $text, $flags) = @_;
2491 2802
2492 utf8::encode $text; 2803 utf8::encode $text;
2493 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2804 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2805}
2806
2807=item $client->send_big_packet ($pkt)
2808
2809Like C<send_packet>, but tries to compress large packets, and fragments
2810them as required.
2811
2812=cut
2813
2814our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2815
2816sub cf::client::send_big_packet {
2817 my ($self, $pkt) = @_;
2818
2819 # try lzf for large packets
2820 $pkt = "lzf " . Compress::LZF::compress $pkt
2821 if 1024 <= length $pkt and $self->{can_lzf};
2822
2823 # split very large packets
2824 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2825 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2826 $pkt = "frag";
2827 }
2828
2829 $self->send_packet ($pkt);
2494} 2830}
2495 2831
2496=item $client->send_msg ($channel, $msg, $color, [extra...]) 2832=item $client->send_msg ($channel, $msg, $color, [extra...])
2497 2833
2498Send a drawinfo or msg packet to the client, formatting the msg for the 2834Send 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 2836the message, with C<log> being the default. If C<$color> is negative, suppress
2501the message unless the client supports the msg packet. 2837the message unless the client supports the msg packet.
2502 2838
2503=cut 2839=cut
2504 2840
2841# non-persistent channels (usually the info channel)
2842our %CHANNEL = (
2843 "c/motd" => {
2844 id => "infobox",
2845 title => "MOTD",
2846 reply => undef,
2847 tooltip => "The message of the day",
2848 },
2849 "c/identify" => {
2850 id => "infobox",
2851 title => "Identify",
2852 reply => undef,
2853 tooltip => "Items recently identified",
2854 },
2855 "c/examine" => {
2856 id => "infobox",
2857 title => "Examine",
2858 reply => undef,
2859 tooltip => "Signs and other items you examined",
2860 },
2861 "c/shopinfo" => {
2862 id => "infobox",
2863 title => "Shop Info",
2864 reply => undef,
2865 tooltip => "What your bargaining skill tells you about the shop",
2866 },
2867 "c/book" => {
2868 id => "infobox",
2869 title => "Book",
2870 reply => undef,
2871 tooltip => "The contents of a note or book",
2872 },
2873 "c/lookat" => {
2874 id => "infobox",
2875 title => "Look",
2876 reply => undef,
2877 tooltip => "What you saw there",
2878 },
2879 "c/who" => {
2880 id => "infobox",
2881 title => "Players",
2882 reply => undef,
2883 tooltip => "Shows players who are currently online",
2884 },
2885 "c/body" => {
2886 id => "infobox",
2887 title => "Body Parts",
2888 reply => undef,
2889 tooltip => "Shows which body parts you posess and are available",
2890 },
2891 "c/statistics" => {
2892 id => "infobox",
2893 title => "Statistics",
2894 reply => undef,
2895 tooltip => "Shows your primary statistics",
2896 },
2897 "c/skills" => {
2898 id => "infobox",
2899 title => "Skills",
2900 reply => undef,
2901 tooltip => "Shows your experience per skill and item power",
2902 },
2903 "c/shopitems" => {
2904 id => "infobox",
2905 title => "Shop Items",
2906 reply => undef,
2907 tooltip => "Shows the items currently for sale in this shop",
2908 },
2909 "c/resistances" => {
2910 id => "infobox",
2911 title => "Resistances",
2912 reply => undef,
2913 tooltip => "Shows your resistances",
2914 },
2915 "c/pets" => {
2916 id => "infobox",
2917 title => "Pets",
2918 reply => undef,
2919 tooltip => "Shows information abotu your pets/a specific pet",
2920 },
2921 "c/perceiveself" => {
2922 id => "infobox",
2923 title => "Perceive Self",
2924 reply => undef,
2925 tooltip => "You gained detailed knowledge about yourself",
2926 },
2927 "c/uptime" => {
2928 id => "infobox",
2929 title => "Uptime",
2930 reply => undef,
2931 tooltip => "How long the server has been running since last restart",
2932 },
2933 "c/mapinfo" => {
2934 id => "infobox",
2935 title => "Map Info",
2936 reply => undef,
2937 tooltip => "Information related to the maps",
2938 },
2939 "c/party" => {
2940 id => "party",
2941 title => "Party",
2942 reply => "gsay ",
2943 tooltip => "Messages and chat related to your party",
2944 },
2945 "c/death" => {
2946 id => "death",
2947 title => "Death",
2948 reply => undef,
2949 tooltip => "Reason for and more info about your most recent death",
2950 },
2951 "c/say" => $SAY_CHANNEL,
2952 "c/chat" => $CHAT_CHANNEL,
2953);
2954
2505sub cf::client::send_msg { 2955sub cf::client::send_msg {
2506 my ($self, $channel, $msg, $color, @extra) = @_; 2956 my ($self, $channel, $msg, $color, @extra) = @_;
2507 2957
2508 $msg = $self->pl->expand_cfpod ($msg); 2958 $msg = $self->pl->expand_cfpod ($msg)
2959 unless $color & cf::NDI_VERBATIM;
2509 2960
2510 $color &= cf::NDI_CLIENT_MASK; # just in case... 2961 $color &= cf::NDI_CLIENT_MASK; # just in case...
2511 2962
2963 # check predefined channels, for the benefit of C
2964 if ($CHANNEL{$channel}) {
2965 $channel = $CHANNEL{$channel};
2966
2967 $self->ext_msg (channel_info => $channel);
2968 $channel = $channel->{id};
2969
2512 if (ref $channel) { 2970 } elsif (ref $channel) {
2513 # send meta info to client, if not yet sent 2971 # send meta info to client, if not yet sent
2514 unless (exists $self->{channel}{$channel->{id}}) { 2972 unless (exists $self->{channel}{$channel->{id}}) {
2515 $self->{channel}{$channel->{id}} = $channel; 2973 $self->{channel}{$channel->{id}} = $channel;
2516 $self->ext_msg (channel_info => $channel); 2974 $self->ext_msg (channel_info => $channel);
2517 } 2975 }
… …
2519 $channel = $channel->{id}; 2977 $channel = $channel->{id};
2520 } 2978 }
2521 2979
2522 return unless @extra || length $msg; 2980 return unless @extra || length $msg;
2523 2981
2524 if ($self->can_msg) {
2525 # default colour, mask it out 2982 # default colour, mask it out
2526 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2983 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2527 if $color & cf::NDI_DEF; 2984 if $color & cf::NDI_DEF;
2528 2985
2529 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2986 my $pkt = "msg "
2987 . $self->{json_coder}->encode (
2530 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2988 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2531 } else { 2989 );
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 2990
2543 $color &= cf::NDI_COLOR_MASK; 2991 $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} 2992}
2557 2993
2558=item $client->ext_msg ($type, @msg) 2994=item $client->ext_msg ($type, @msg)
2559 2995
2560Sends an ext event to the client. 2996Sends an ext event to the client.
… …
2563 2999
2564sub cf::client::ext_msg($$@) { 3000sub cf::client::ext_msg($$@) {
2565 my ($self, $type, @msg) = @_; 3001 my ($self, $type, @msg) = @_;
2566 3002
2567 if ($self->extcmd == 2) { 3003 if ($self->extcmd == 2) {
2568 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3004 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2569 } elsif ($self->extcmd == 1) { # TODO: remove 3005 } elsif ($self->extcmd == 1) { # TODO: remove
2570 push @msg, msgtype => "event_$type"; 3006 push @msg, msgtype => "event_$type";
2571 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2572 } 3008 }
2573} 3009}
2574 3010
2575=item $client->ext_reply ($msgid, @msg) 3011=item $client->ext_reply ($msgid, @msg)
2576 3012
… …
2580 3016
2581sub cf::client::ext_reply($$@) { 3017sub cf::client::ext_reply($$@) {
2582 my ($self, $id, @msg) = @_; 3018 my ($self, $id, @msg) = @_;
2583 3019
2584 if ($self->extcmd == 2) { 3020 if ($self->extcmd == 2) {
2585 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3021 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2586 } elsif ($self->extcmd == 1) { 3022 } elsif ($self->extcmd == 1) {
2587 #TODO: version 1, remove 3023 #TODO: version 1, remove
2588 unshift @msg, msgtype => "reply", msgid => $id; 3024 unshift @msg, msgtype => "reply", msgid => $id;
2589 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3025 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2590 } 3026 }
2591} 3027}
2592 3028
2593=item $success = $client->query ($flags, "text", \&cb) 3029=item $success = $client->query ($flags, "text", \&cb)
2594 3030
… …
2721our $safe_hole = new Safe::Hole; 3157our $safe_hole = new Safe::Hole;
2722 3158
2723$SIG{FPE} = 'IGNORE'; 3159$SIG{FPE} = 'IGNORE';
2724 3160
2725$safe->permit_only (Opcode::opset qw( 3161$safe->permit_only (Opcode::opset qw(
2726 :base_core :base_mem :base_orig :base_math 3162 :base_core :base_mem :base_orig :base_math :base_loop
2727 grepstart grepwhile mapstart mapwhile 3163 grepstart grepwhile mapstart mapwhile
2728 sort time 3164 sort time
2729)); 3165));
2730 3166
2731# here we export the classes and methods available to script code 3167# here we export the classes and methods available to script code
… …
2733=pod 3169=pod
2734 3170
2735The following functions and methods are available within a safe environment: 3171The following functions and methods are available within a safe environment:
2736 3172
2737 cf::object 3173 cf::object
2738 contr pay_amount pay_player map x y force_find force_add 3174 contr pay_amount pay_player map x y force_find force_add destroy
2739 insert remove name archname title slaying race decrease_ob_nr 3175 insert remove name archname title slaying race decrease split
3176 value
2740 3177
2741 cf::object::player 3178 cf::object::player
2742 player 3179 player
2743 3180
2744 cf::player 3181 cf::player
… …
2749 3186
2750=cut 3187=cut
2751 3188
2752for ( 3189for (
2753 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3190 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2754 insert remove inv name archname title slaying race 3191 insert remove inv nrof name archname title slaying race
2755 decrease_ob_nr)], 3192 decrease split destroy change_exp value msg lore send_msg)],
2756 ["cf::object::player" => qw(player)], 3193 ["cf::object::player" => qw(player)],
2757 ["cf::player" => qw(peaceful)], 3194 ["cf::player" => qw(peaceful send_msg)],
2758 ["cf::map" => qw(trigger)], 3195 ["cf::map" => qw(trigger)],
2759) { 3196) {
2760 no strict 'refs'; 3197 no strict 'refs';
2761 my ($pkg, @funs) = @$_; 3198 my ($pkg, @funs) = @$_;
2762 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3199 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2780 3217
2781 my $qcode = $code; 3218 my $qcode = $code;
2782 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3219 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2783 $qcode =~ s/\n/\\n/g; 3220 $qcode =~ s/\n/\\n/g;
2784 3221
3222 %vars = (_dummy => 0) unless %vars;
3223
3224 my @res;
2785 local $_; 3225 local $_;
2786 local @safe::cf::_safe_eval_args = values %vars;
2787 3226
2788 my $eval = 3227 my $eval =
2789 "do {\n" 3228 "do {\n"
2790 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3229 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2791 . "#line 0 \"{$qcode}\"\n" 3230 . "#line 0 \"{$qcode}\"\n"
2792 . $code 3231 . $code
2793 . "\n}" 3232 . "\n}"
2794 ; 3233 ;
2795 3234
3235 if ($CFG{safe_eval}) {
2796 sub_generation_inc; 3236 sub_generation_inc;
3237 local @safe::cf::_safe_eval_args = values %vars;
2797 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3238 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2798 sub_generation_inc; 3239 sub_generation_inc;
3240 } else {
3241 local @cf::_safe_eval_args = values %vars;
3242 @res = wantarray ? eval eval : scalar eval $eval;
3243 }
2799 3244
2800 if ($@) { 3245 if ($@) {
2801 warn "$@"; 3246 warn "$@";
2802 warn "while executing safe code '$code'\n"; 3247 warn "while executing safe code '$code'\n";
2803 warn "with arguments " . (join " ", %vars) . "\n"; 3248 warn "with arguments " . (join " ", %vars) . "\n";
… …
2822=cut 3267=cut
2823 3268
2824sub register_script_function { 3269sub register_script_function {
2825 my ($fun, $cb) = @_; 3270 my ($fun, $cb) = @_;
2826 3271
2827 no strict 'refs'; 3272 $fun = "safe::$fun" if $CFG{safe_eval};
2828 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3273 *$fun = $safe_hole->wrap ($cb);
2829} 3274}
2830 3275
2831=back 3276=back
2832 3277
2833=cut 3278=cut
… …
2835############################################################################# 3280#############################################################################
2836# the server's init and main functions 3281# the server's init and main functions
2837 3282
2838sub load_facedata($) { 3283sub load_facedata($) {
2839 my ($path) = @_; 3284 my ($path) = @_;
3285
3286 # HACK to clear player env face cache, we need some signal framework
3287 # for this (global event?)
3288 %ext::player_env::MUSIC_FACE_CACHE = ();
2840 3289
2841 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3290 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2842 3291
2843 warn "loading facedata from $path\n"; 3292 warn "loading facedata from $path\n";
2844 3293
… …
2850 3299
2851 $facedata->{version} == 2 3300 $facedata->{version} == 2
2852 or cf::cleanup "$path: version mismatch, cannot proceed."; 3301 or cf::cleanup "$path: version mismatch, cannot proceed.";
2853 3302
2854 # patch in the exptable 3303 # patch in the exptable
3304 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2855 $facedata->{resource}{"res/exp_table"} = { 3305 $facedata->{resource}{"res/exp_table"} = {
2856 type => FT_RSRC, 3306 type => FT_RSRC,
2857 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3307 data => $exp_table,
3308 hash => (Digest::MD5::md5 $exp_table),
2858 }; 3309 };
2859 cf::cede_to_tick; 3310 cf::cede_to_tick;
2860 3311
2861 { 3312 {
2862 my $faces = $facedata->{faceinfo}; 3313 my $faces = $facedata->{faceinfo};
2863 3314
2864 while (my ($face, $info) = each %$faces) { 3315 while (my ($face, $info) = each %$faces) {
2865 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3316 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3317
2866 cf::face::set_visibility $idx, $info->{visibility}; 3318 cf::face::set_visibility $idx, $info->{visibility};
2867 cf::face::set_magicmap $idx, $info->{magicmap}; 3319 cf::face::set_magicmap $idx, $info->{magicmap};
2868 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3320 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2869 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3321 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2870 3322
2871 cf::cede_to_tick; 3323 cf::cede_to_tick;
2872 } 3324 }
2873 3325
2874 while (my ($face, $info) = each %$faces) { 3326 while (my ($face, $info) = each %$faces) {
2875 next unless $info->{smooth}; 3327 next unless $info->{smooth};
3328
2876 my $idx = cf::face::find $face 3329 my $idx = cf::face::find $face
2877 or next; 3330 or next;
3331
2878 if (my $smooth = cf::face::find $info->{smooth}) { 3332 if (my $smooth = cf::face::find $info->{smooth}) {
2879 cf::face::set_smooth $idx, $smooth; 3333 cf::face::set_smooth $idx, $smooth;
2880 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3334 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2881 } else { 3335 } else {
2882 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3336 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
2896 3350
2897 cf::anim::invalidate_all; # d'oh 3351 cf::anim::invalidate_all; # d'oh
2898 } 3352 }
2899 3353
2900 { 3354 {
2901 # TODO: for gcfclient pleasure, we should give resources
2902 # that gcfclient doesn't grok a >10000 face index.
2903 my $res = $facedata->{resource}; 3355 my $res = $facedata->{resource};
2904 3356
2905 my $soundconf = delete $res->{"res/sound.conf"};
2906
2907 while (my ($name, $info) = each %$res) { 3357 while (my ($name, $info) = each %$res) {
3358 if (defined $info->{type}) {
2908 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3359 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2909 my $data;
2910 3360
2911 if ($info->{type} & 1) { 3361 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2912 # prepend meta info 3362 cf::face::set_type $idx, $info->{type};
2913
2914 my $meta = $enc->encode ({
2915 name => $name,
2916 %{ $info->{meta} || {} },
2917 });
2918
2919 $data = pack "(w/a*)*", $meta, $info->{data};
2920 } else { 3363 } else {
2921 $data = $info->{data}; 3364 $RESOURCE{$name} = $info;
2922 } 3365 }
2923 3366
2924 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2925 cf::face::set_type $idx, $info->{type};
2926
2927 cf::cede_to_tick; 3367 cf::cede_to_tick;
2928 } 3368 }
2929
2930 if ($soundconf) {
2931 $soundconf = $enc->decode (delete $soundconf->{data});
2932
2933 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2934 my $sound = $soundconf->{compat}[$_]
2935 or next;
2936
2937 my $face = cf::face::find "sound/$sound->[1]";
2938 cf::sound::set $sound->[0] => $face;
2939 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2940 }
2941
2942 while (my ($k, $v) = each %{$soundconf->{event}}) {
2943 my $face = cf::face::find "sound/$v";
2944 cf::sound::set $k => $face;
2945 }
2946 }
2947 } 3369 }
3370
3371 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2948 3372
2949 1 3373 1
2950} 3374}
3375
3376cf::global->attach (on_resource_update => sub {
3377 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3378 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3379
3380 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3381 my $sound = $soundconf->{compat}[$_]
3382 or next;
3383
3384 my $face = cf::face::find "sound/$sound->[1]";
3385 cf::sound::set $sound->[0] => $face;
3386 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3387 }
3388
3389 while (my ($k, $v) = each %{$soundconf->{event}}) {
3390 my $face = cf::face::find "sound/$v";
3391 cf::sound::set $k => $face;
3392 }
3393 }
3394});
2951 3395
2952register_exticmd fx_want => sub { 3396register_exticmd fx_want => sub {
2953 my ($ns, $want) = @_; 3397 my ($ns, $want) = @_;
2954 3398
2955 while (my ($k, $v) = each %$want) { 3399 while (my ($k, $v) = each %$want) {
2956 $ns->fx_want ($k, $v); 3400 $ns->fx_want ($k, $v);
2957 } 3401 }
2958}; 3402};
2959 3403
3404sub load_resource_file($) {
3405 my $guard = lock_acquire "load_resource_file";
3406
3407 my $status = load_resource_file_ $_[0];
3408 get_slot 0.1, 100;
3409 cf::arch::commit_load;
3410
3411 $status
3412}
3413
2960sub reload_regions { 3414sub reload_regions {
3415 # HACK to clear player env face cache, we need some signal framework
3416 # for this (global event?)
3417 %ext::player_env::MUSIC_FACE_CACHE = ();
3418
2961 load_resource_file "$MAPDIR/regions" 3419 load_resource_file "$MAPDIR/regions"
2962 or die "unable to load regions file\n"; 3420 or die "unable to load regions file\n";
2963 3421
2964 for (cf::region::list) { 3422 for (cf::region::list) {
2965 $_->{match} = qr/$_->{match}/ 3423 $_->{match} = qr/$_->{match}/
… …
2973} 3431}
2974 3432
2975sub reload_archetypes { 3433sub reload_archetypes {
2976 load_resource_file "$DATADIR/archetypes" 3434 load_resource_file "$DATADIR/archetypes"
2977 or die "unable to load archetypes\n"; 3435 or die "unable to load archetypes\n";
2978 #d# NEED to laod twice to resolve forward references
2979 # this really needs to be done in an extra post-pass
2980 # (which needs to be synchronous, so solve it differently)
2981 load_resource_file "$DATADIR/archetypes"
2982 or die "unable to load archetypes\n";
2983} 3436}
2984 3437
2985sub reload_treasures { 3438sub reload_treasures {
2986 load_resource_file "$DATADIR/treasures" 3439 load_resource_file "$DATADIR/treasures"
2987 or die "unable to load treasurelists\n"; 3440 or die "unable to load treasurelists\n";
2988} 3441}
2989 3442
2990sub reload_resources { 3443sub reload_resources {
2991 warn "reloading resource files...\n"; 3444 warn "reloading resource files...\n";
2992 3445
3446 reload_facedata;
3447 reload_archetypes;
2993 reload_regions; 3448 reload_regions;
2994 reload_facedata;
2995 #reload_archetypes;#d#
2996 reload_archetypes;
2997 reload_treasures; 3449 reload_treasures;
2998 3450
2999 warn "finished reloading resource files\n"; 3451 warn "finished reloading resource files\n";
3000} 3452}
3001 3453
3002sub init {
3003 reload_resources;
3004}
3005
3006sub reload_config { 3454sub reload_config {
3455 warn "reloading config file...\n";
3456
3007 open my $fh, "<:utf8", "$CONFDIR/config" 3457 open my $fh, "<:utf8", "$CONFDIR/config"
3008 or return; 3458 or return;
3009 3459
3010 local $/; 3460 local $/;
3011 *CFG = YAML::Syck::Load <$fh>; 3461 *CFG = YAML::XS::Load scalar <$fh>;
3012 3462
3013 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3463 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3014 3464
3015 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3465 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3016 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3466 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3020 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3470 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3021 and die "WARNING: m(un)lockall failed: $!\n"; 3471 and die "WARNING: m(un)lockall failed: $!\n";
3022 }; 3472 };
3023 warn $@ if $@; 3473 warn $@ if $@;
3024 } 3474 }
3475
3476 warn "finished reloading resource files\n";
3477}
3478
3479sub pidfile() {
3480 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3481 or die "$PIDFILE: $!";
3482 flock $fh, &Fcntl::LOCK_EX
3483 or die "$PIDFILE: flock: $!";
3484 $fh
3485}
3486
3487# make sure only one server instance is running at any one time
3488sub atomic {
3489 my $fh = pidfile;
3490
3491 my $pid = <$fh>;
3492 kill 9, $pid if $pid > 0;
3493
3494 seek $fh, 0, 0;
3495 print $fh $$;
3496}
3497
3498sub main_loop {
3499 warn "EV::loop starting\n";
3500 if (1) {
3501 EV::loop;
3502 }
3503 warn "EV::loop returned\n";
3504 goto &main_loop unless $REALLY_UNLOOP;
3025} 3505}
3026 3506
3027sub main { 3507sub main {
3508 cf::init_globals; # initialise logging
3509
3510 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3511 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3512 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3513 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3514
3515 cf::init_experience;
3516 cf::init_anim;
3517 cf::init_attackmess;
3518 cf::init_dynamic;
3519
3520 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3521
3028 # we must not ever block the main coroutine 3522 # we must not ever block the main coroutine
3029 local $Coro::idle = sub { 3523 local $Coro::idle = sub {
3030 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3524 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3031 (async { 3525 (async {
3032 Event::one_event; 3526 $Coro::current->{desc} = "IDLE BUG HANDLER";
3527 EV::loop EV::LOOP_ONESHOT;
3033 })->prio (Coro::PRIO_MAX); 3528 })->prio (Coro::PRIO_MAX);
3034 }; 3529 };
3035 3530
3531 evthread_start IO::AIO::poll_fileno;
3532
3533 cf::sync_job {
3534 cf::load_settings;
3535 cf::load_materials;
3536
3537 reload_resources;
3036 reload_config; 3538 reload_config;
3037 db_init; 3539 db_init;
3540
3541 cf::init_uuid;
3542 cf::init_signals;
3543 cf::init_commands;
3544 cf::init_skills;
3545
3546 cf::init_beforeplay;
3547
3548 atomic;
3549
3038 load_extensions; 3550 load_extensions;
3039 3551
3040 $TICK_WATCHER->start; 3552 utime time, time, $RUNTIMEFILE;
3041 Event::loop; 3553
3554 # no (long-running) fork's whatsoever before this point(!)
3555 use POSIX ();
3556 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3557
3558 (pop @POST_INIT)->(0) while @POST_INIT;
3559 };
3560
3561 main_loop;
3042} 3562}
3043 3563
3044############################################################################# 3564#############################################################################
3045# initialisation and cleanup 3565# initialisation and cleanup
3046 3566
3047# install some emergency cleanup handlers 3567# install some emergency cleanup handlers
3048BEGIN { 3568BEGIN {
3569 our %SIGWATCHER = ();
3049 for my $signal (qw(INT HUP TERM)) { 3570 for my $signal (qw(INT HUP TERM)) {
3050 Event->signal ( 3571 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3051 reentrant => 0,
3052 data => WF_AUTOCANCEL,
3053 signal => $signal,
3054 prio => 0,
3055 cb => sub {
3056 cf::cleanup "SIG$signal"; 3572 cf::cleanup "SIG$signal";
3057 },
3058 ); 3573 };
3059 } 3574 }
3060} 3575}
3061 3576
3062sub write_runtime { 3577sub write_runtime_sync {
3063 my $runtime = "$LOCALDIR/runtime";
3064
3065 # first touch the runtime file to show we are still running: 3578 # first touch the runtime file to show we are still running:
3066 # the fsync below can take a very very long time. 3579 # the fsync below can take a very very long time.
3067 3580
3068 IO::AIO::aio_utime $runtime, undef, undef; 3581 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3069 3582
3070 my $guard = cf::lock_acquire "write_runtime"; 3583 my $guard = cf::lock_acquire "write_runtime";
3071 3584
3072 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3585 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3073 or return; 3586 or return;
3074 3587
3075 my $value = $cf::RUNTIME + 90 + 10; 3588 my $value = $cf::RUNTIME + 90 + 10;
3076 # 10 is the runtime save interval, for a monotonic clock 3589 # 10 is the runtime save interval, for a monotonic clock
3077 # 60 allows for the watchdog to kill the server. 3590 # 60 allows for the watchdog to kill the server.
… …
3087 aio_utime $fh, undef, undef; 3600 aio_utime $fh, undef, undef;
3088 3601
3089 close $fh 3602 close $fh
3090 or return; 3603 or return;
3091 3604
3092 aio_rename "$runtime~", $runtime 3605 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3093 and return; 3606 and return;
3094 3607
3095 warn "runtime file written.\n"; 3608 warn "runtime file written.\n";
3096 3609
3097 1 3610 1
3611}
3612
3613our $uuid_lock;
3614our $uuid_skip;
3615
3616sub write_uuid_sync($) {
3617 $uuid_skip ||= $_[0];
3618
3619 return if $uuid_lock;
3620 local $uuid_lock = 1;
3621
3622 my $uuid = "$LOCALDIR/uuid";
3623
3624 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3625 or return;
3626
3627 my $value = uuid_seq uuid_cur;
3628
3629 unless ($value) {
3630 warn "cowardly refusing to write zero uuid value!\n";
3631 return;
3632 }
3633
3634 my $value = uuid_str $value + $uuid_skip;
3635 $uuid_skip = 0;
3636
3637 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3638 and return;
3639
3640 # always fsync - this file is important
3641 aio_fsync $fh
3642 and return;
3643
3644 close $fh
3645 or return;
3646
3647 aio_rename "$uuid~", $uuid
3648 and return;
3649
3650 warn "uuid file written ($value).\n";
3651
3652 1
3653
3654}
3655
3656sub write_uuid($$) {
3657 my ($skip, $sync) = @_;
3658
3659 $sync ? write_uuid_sync $skip
3660 : async { write_uuid_sync $skip };
3098} 3661}
3099 3662
3100sub emergency_save() { 3663sub emergency_save() {
3101 my $freeze_guard = cf::freeze_mainloop; 3664 my $freeze_guard = cf::freeze_mainloop;
3102 3665
3103 warn "enter emergency perl save\n"; 3666 warn "emergency_perl_save: enter\n";
3104 3667
3105 cf::sync_job { 3668 cf::sync_job {
3669 # this is a trade-off: we want to be very quick here, so
3670 # save all maps without fsync, and later call a global sync
3671 # (which in turn might be very very slow)
3672 local $USE_FSYNC = 0;
3673
3106 # use a peculiar iteration method to avoid tripping on perl 3674 # use a peculiar iteration method to avoid tripping on perl
3107 # refcount bugs in for. also avoids problems with players 3675 # refcount bugs in for. also avoids problems with players
3108 # and maps saved/destroyed asynchronously. 3676 # and maps saved/destroyed asynchronously.
3109 warn "begin emergency player save\n"; 3677 warn "emergency_perl_save: begin player save\n";
3110 for my $login (keys %cf::PLAYER) { 3678 for my $login (keys %cf::PLAYER) {
3111 my $pl = $cf::PLAYER{$login} or next; 3679 my $pl = $cf::PLAYER{$login} or next;
3112 $pl->valid or next; 3680 $pl->valid or next;
3681 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3113 $pl->save; 3682 $pl->save;
3114 } 3683 }
3115 warn "end emergency player save\n"; 3684 warn "emergency_perl_save: end player save\n";
3116 3685
3117 warn "begin emergency map save\n"; 3686 warn "emergency_perl_save: begin map save\n";
3118 for my $path (keys %cf::MAP) { 3687 for my $path (keys %cf::MAP) {
3119 my $map = $cf::MAP{$path} or next; 3688 my $map = $cf::MAP{$path} or next;
3120 $map->valid or next; 3689 $map->valid or next;
3121 $map->save; 3690 $map->save;
3122 } 3691 }
3123 warn "end emergency map save\n"; 3692 warn "emergency_perl_save: end map save\n";
3124 3693
3125 warn "begin emergency database checkpoint\n"; 3694 warn "emergency_perl_save: begin database checkpoint\n";
3126 BDB::db_env_txn_checkpoint $DB_ENV; 3695 BDB::db_env_txn_checkpoint $DB_ENV;
3127 warn "end emergency database checkpoint\n"; 3696 warn "emergency_perl_save: end database checkpoint\n";
3697
3698 warn "emergency_perl_save: begin write uuid\n";
3699 write_uuid_sync 1;
3700 warn "emergency_perl_save: end write uuid\n";
3128 }; 3701 };
3129 3702
3703 warn "emergency_perl_save: starting sync()\n";
3704 IO::AIO::aio_sync sub {
3705 warn "emergency_perl_save: finished sync()\n";
3706 };
3707
3130 warn "leave emergency perl save\n"; 3708 warn "emergency_perl_save: leave\n";
3131} 3709}
3132 3710
3133sub post_cleanup { 3711sub post_cleanup {
3134 my ($make_core) = @_; 3712 my ($make_core) = @_;
3135 3713
3136 warn Carp::longmess "post_cleanup backtrace" 3714 warn Carp::longmess "post_cleanup backtrace"
3137 if $make_core; 3715 if $make_core;
3716
3717 my $fh = pidfile;
3718 unlink $PIDFILE if <$fh> == $$;
3719}
3720
3721# a safer delete_package, copied from Symbol
3722sub clear_package($) {
3723 my $pkg = shift;
3724
3725 # expand to full symbol table name if needed
3726 unless ($pkg =~ /^main::.*::$/) {
3727 $pkg = "main$pkg" if $pkg =~ /^::/;
3728 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3729 $pkg .= '::' unless $pkg =~ /::$/;
3730 }
3731
3732 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3733 my $stem_symtab = *{$stem}{HASH};
3734
3735 defined $stem_symtab and exists $stem_symtab->{$leaf}
3736 or return;
3737
3738 # clear all symbols
3739 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3740 for my $name (keys %$leaf_symtab) {
3741 _gv_clear *{"$pkg$name"};
3742# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3743 }
3744 warn "cleared package $pkg\n";#d#
3138} 3745}
3139 3746
3140sub do_reload_perl() { 3747sub do_reload_perl() {
3141 # can/must only be called in main 3748 # can/must only be called in main
3142 if ($Coro::current != $Coro::main) { 3749 if ($Coro::current != $Coro::main) {
3143 warn "can only reload from main coroutine"; 3750 warn "can only reload from main coroutine";
3144 return; 3751 return;
3145 } 3752 }
3146 3753
3754 return if $RELOAD++;
3755
3756 my $t1 = EV::time;
3757
3758 while ($RELOAD) {
3147 warn "reloading..."; 3759 warn "reloading...";
3148 3760
3149 warn "entering sync_job"; 3761 warn "entering sync_job";
3150 3762
3151 cf::sync_job { 3763 cf::sync_job {
3152 cf::write_runtime; # external watchdog should not bark 3764 cf::write_runtime_sync; # external watchdog should not bark
3153 cf::emergency_save; 3765 cf::emergency_save;
3154 cf::write_runtime; # external watchdog should not bark 3766 cf::write_runtime_sync; # external watchdog should not bark
3155 3767
3156 warn "syncing database to disk"; 3768 warn "syncing database to disk";
3157 BDB::db_env_txn_checkpoint $DB_ENV; 3769 BDB::db_env_txn_checkpoint $DB_ENV;
3158 3770
3159 # if anything goes wrong in here, we should simply crash as we already saved 3771 # if anything goes wrong in here, we should simply crash as we already saved
3160 3772
3161 warn "cancelling all WF_AUTOCANCEL watchers";
3162 for (Event::all_watchers) {
3163 $_->cancel if $_->data & WF_AUTOCANCEL;
3164 }
3165
3166 warn "flushing outstanding aio requests"; 3773 warn "flushing outstanding aio requests";
3167 for (;;) {
3168 BDB::flush;
3169 IO::AIO::flush;
3170 Coro::cede;
3171 last unless IO::AIO::nreqs || BDB::nreqs; 3774 while (IO::AIO::nreqs || BDB::nreqs) {
3172 warn "iterate..."; 3775 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3173 }
3174
3175 ++$RELOAD;
3176
3177 warn "cancelling all extension coros";
3178 $_->cancel for values %EXT_CORO;
3179 %EXT_CORO = ();
3180
3181 warn "removing commands";
3182 %COMMAND = ();
3183
3184 warn "removing ext/exti commands";
3185 %EXTCMD = ();
3186 %EXTICMD = ();
3187
3188 warn "unloading/nuking all extensions";
3189 for my $pkg (@EXTS) {
3190 warn "... unloading $pkg";
3191
3192 if (my $cb = $pkg->can ("unload")) {
3193 eval {
3194 $cb->($pkg);
3195 1
3196 } or warn "$pkg unloaded, but with errors: $@";
3197 } 3776 }
3198 3777
3199 warn "... nuking $pkg"; 3778 warn "cancelling all extension coros";
3200 Symbol::delete_package $pkg; 3779 $_->cancel for values %EXT_CORO;
3201 } 3780 %EXT_CORO = ();
3202 3781
3203 warn "unloading all perl modules loaded from $LIBDIR"; 3782 warn "removing commands";
3204 while (my ($k, $v) = each %INC) { 3783 %COMMAND = ();
3205 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3206 3784
3785 warn "removing ext/exti commands";
3786 %EXTCMD = ();
3787 %EXTICMD = ();
3788
3789 warn "unloading/nuking all extensions";
3790 for my $pkg (@EXTS) {
3207 warn "... unloading $k"; 3791 warn "... unloading $pkg";
3208 delete $INC{$k};
3209 3792
3210 $k =~ s/\.pm$//;
3211 $k =~ s/\//::/g;
3212
3213 if (my $cb = $k->can ("unload_module")) { 3793 if (my $cb = $pkg->can ("unload")) {
3794 eval {
3214 $cb->(); 3795 $cb->($pkg);
3796 1
3797 } or warn "$pkg unloaded, but with errors: $@";
3798 }
3799
3800 warn "... clearing $pkg";
3801 clear_package $pkg;
3215 } 3802 }
3216 3803
3217 Symbol::delete_package $k; 3804 warn "unloading all perl modules loaded from $LIBDIR";
3805 while (my ($k, $v) = each %INC) {
3806 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3807
3808 warn "... unloading $k";
3809 delete $INC{$k};
3810
3811 $k =~ s/\.pm$//;
3812 $k =~ s/\//::/g;
3813
3814 if (my $cb = $k->can ("unload_module")) {
3815 $cb->();
3816 }
3817
3818 clear_package $k;
3218 } 3819 }
3219 3820
3220 warn "getting rid of safe::, as good as possible"; 3821 warn "getting rid of safe::, as good as possible";
3221 Symbol::delete_package "safe::$_" 3822 clear_package "safe::$_"
3222 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3823 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3223 3824
3224 warn "unloading cf.pm \"a bit\""; 3825 warn "unloading cf.pm \"a bit\"";
3225 delete $INC{"cf.pm"}; 3826 delete $INC{"cf.pm"};
3226 delete $INC{"cf/pod.pm"}; 3827 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3227 3828
3228 # don't, removes xs symbols, too, 3829 # don't, removes xs symbols, too,
3229 # and global variables created in xs 3830 # and global variables created in xs
3230 #Symbol::delete_package __PACKAGE__; 3831 #clear_package __PACKAGE__;
3231 3832
3232 warn "unload completed, starting to reload now"; 3833 warn "unload completed, starting to reload now";
3233 3834
3234 warn "reloading cf.pm"; 3835 warn "reloading cf.pm";
3235 require cf; 3836 require cf;
3236 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3837 cf::_connect_to_perl_1;
3237 3838
3238 warn "loading config and database again"; 3839 warn "loading config and database again";
3239 cf::reload_config; 3840 cf::reload_config;
3240 3841
3241 warn "loading extensions"; 3842 warn "loading extensions";
3242 cf::load_extensions; 3843 cf::load_extensions;
3243 3844
3845 if ($REATTACH_ON_RELOAD) {
3244 warn "reattaching attachments to objects/players"; 3846 warn "reattaching attachments to objects/players";
3245 _global_reattach; # objects, sockets 3847 _global_reattach; # objects, sockets
3246 warn "reattaching attachments to maps"; 3848 warn "reattaching attachments to maps";
3247 reattach $_ for values %MAP; 3849 reattach $_ for values %MAP;
3248 warn "reattaching attachments to players"; 3850 warn "reattaching attachments to players";
3249 reattach $_ for values %PLAYER; 3851 reattach $_ for values %PLAYER;
3852 }
3250 3853
3854 warn "running post_init jobs";
3855 (pop @POST_INIT)->(1) while @POST_INIT;
3856
3251 warn "leaving sync_job"; 3857 warn "leaving sync_job";
3252 3858
3253 1 3859 1
3254 } or do { 3860 } or do {
3255 warn $@; 3861 warn $@;
3256 warn "error while reloading, exiting."; 3862 cf::cleanup "error while reloading, exiting.";
3257 exit 1;
3258 }; 3863 };
3259 3864
3260 warn "reloaded"; 3865 warn "reloaded";
3866 --$RELOAD;
3867 }
3868
3869 $t1 = EV::time - $t1;
3870 warn "reload completed in ${t1}s\n";
3261}; 3871};
3262 3872
3263our $RELOAD_WATCHER; # used only during reload 3873our $RELOAD_WATCHER; # used only during reload
3264 3874
3265sub reload_perl() { 3875sub reload_perl() {
3266 # doing reload synchronously and two reloads happen back-to-back, 3876 # doing reload synchronously and two reloads happen back-to-back,
3267 # coro crashes during coro_state_free->destroy here. 3877 # coro crashes during coro_state_free->destroy here.
3268 3878
3269 $RELOAD_WATCHER ||= Event->timer ( 3879 $RELOAD_WATCHER ||= cf::async {
3270 reentrant => 0, 3880 Coro::AIO::aio_wait cache_extensions;
3271 after => 0, 3881
3272 data => WF_AUTOCANCEL, 3882 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3273 cb => sub {
3274 do_reload_perl; 3883 do_reload_perl;
3275 undef $RELOAD_WATCHER; 3884 undef $RELOAD_WATCHER;
3276 }, 3885 };
3277 ); 3886 };
3278} 3887}
3279 3888
3280register_command "reload" => sub { 3889register_command "reload" => sub {
3281 my ($who, $arg) = @_; 3890 my ($who, $arg) = @_;
3282 3891
3283 if ($who->flag (FLAG_WIZ)) { 3892 if ($who->flag (FLAG_WIZ)) {
3284 $who->message ("reloading server."); 3893 $who->message ("reloading server.");
3894 async {
3895 $Coro::current->{desc} = "perl_reload";
3285 async { reload_perl }; 3896 reload_perl;
3897 };
3286 } 3898 }
3287}; 3899};
3288 3900
3289unshift @INC, $LIBDIR; 3901unshift @INC, $LIBDIR;
3290 3902
… …
3292 3904
3293our @WAIT_FOR_TICK; 3905our @WAIT_FOR_TICK;
3294our @WAIT_FOR_TICK_BEGIN; 3906our @WAIT_FOR_TICK_BEGIN;
3295 3907
3296sub wait_for_tick { 3908sub wait_for_tick {
3297 return unless $TICK_WATCHER->is_active;
3298 return if $Coro::current == $Coro::main; 3909 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3299 3910
3300 my $signal = new Coro::Signal; 3911 my $signal = new Coro::Signal;
3301 push @WAIT_FOR_TICK, $signal; 3912 push @WAIT_FOR_TICK, $signal;
3302 $signal->wait; 3913 $signal->wait;
3303} 3914}
3304 3915
3305sub wait_for_tick_begin { 3916sub wait_for_tick_begin {
3306 return unless $TICK_WATCHER->is_active;
3307 return if $Coro::current == $Coro::main; 3917 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3308 3918
3309 my $signal = new Coro::Signal; 3919 my $signal = new Coro::Signal;
3310 push @WAIT_FOR_TICK_BEGIN, $signal; 3920 push @WAIT_FOR_TICK_BEGIN, $signal;
3311 $signal->wait; 3921 $signal->wait;
3312} 3922}
3313 3923
3314 my $min = 1e6;#d# 3924sub tick {
3315 my $avg = 10;
3316$TICK_WATCHER = Event->timer (
3317 reentrant => 0,
3318 parked => 1,
3319 prio => 0,
3320 at => $NEXT_TICK || $TICK,
3321 data => WF_AUTOCANCEL,
3322 cb => sub {
3323 if ($Coro::current != $Coro::main) { 3925 if ($Coro::current != $Coro::main) {
3324 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3926 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3325 unless ++$bug_warning > 10; 3927 unless ++$bug_warning > 10;
3326 return; 3928 return;
3327 } 3929 }
3328 3930
3329 $NOW = $tick_start = Event::time;
3330
3331 cf::server_tick; # one server iteration 3931 cf::server_tick; # one server iteration
3332 3932
3333 0 && sync_job {#d# 3933 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3334 for(1..10) {
3335 my $t = Event::time;
3336 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3337 or die;
3338 3934
3339 $map->width (50); 3935 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3340 $map->height (50); 3936 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3341 $map->alloc; 3937 Coro::async_pool {
3342 $map->_load_objects ("/tmp/x.map", 1); 3938 $Coro::current->{desc} = "runtime saver";
3343 my $t = Event::time - $t; 3939 write_runtime_sync
3344 3940 or warn "ERROR: unable to write runtime file: $!";
3345 #next unless $t < 0.0013;#d#
3346 if ($t < $min) {
3347 $min = $t;
3348 }
3349 $avg = $avg * 0.99 + $t * 0.01;
3350 }
3351 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3352 exit 0;
3353 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3354 }; 3941 };
3942 }
3355 3943
3356 $RUNTIME += $TICK;
3357 $NEXT_TICK += $TICK;
3358
3359 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3360 $NEXT_RUNTIME_WRITE = $NOW + 10;
3361 Coro::async_pool {
3362 write_runtime
3363 or warn "ERROR: unable to write runtime file: $!";
3364 };
3365 }
3366
3367# my $AFTER = Event::time;
3368# warn $AFTER - $NOW;#d#
3369
3370 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3944 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3371 $sig->send; 3945 $sig->send;
3372 } 3946 }
3373 while (my $sig = shift @WAIT_FOR_TICK) { 3947 while (my $sig = shift @WAIT_FOR_TICK) {
3374 $sig->send; 3948 $sig->send;
3375 } 3949 }
3376 3950
3377 $NOW = Event::time; 3951 $LOAD = ($NOW - $TICK_START) / $TICK;
3378
3379 # if we are delayed by four ticks or more, skip them all
3380 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3381
3382 $TICK_WATCHER->at ($NEXT_TICK);
3383 $TICK_WATCHER->start;
3384
3385 $LOAD = ($NOW - $tick_start) / $TICK;
3386 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3952 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3387 3953
3388 _post_tick; 3954 if (0) {
3389 3955 if ($NEXT_TICK) {
3390 3956 my $jitter = $TICK_START - $NEXT_TICK;
3957 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3958 warn "jitter $JITTER\n";#d#
3959 }
3391 }, 3960 }
3392); 3961}
3393 3962
3394{ 3963{
3395 BDB::max_poll_time $TICK * 0.1; 3964 # configure BDB
3396 $BDB_POLL_WATCHER = Event->io ( 3965
3397 reentrant => 0,
3398 fd => BDB::poll_fileno,
3399 poll => 'r',
3400 prio => 0,
3401 data => WF_AUTOCANCEL,
3402 cb => \&BDB::poll_cb,
3403 );
3404 BDB::min_parallel 8; 3966 BDB::min_parallel 16;
3405 3967 BDB::max_poll_reqs $TICK * 0.1;
3406 BDB::set_sync_prepare { 3968 $AnyEvent::BDB::WATCHER->priority (1);
3407 my $status;
3408 my $current = $Coro::current;
3409 (
3410 sub {
3411 $status = $!;
3412 $current->ready; undef $current;
3413 },
3414 sub {
3415 Coro::schedule while defined $current;
3416 $! = $status;
3417 },
3418 )
3419 };
3420 3969
3421 unless ($DB_ENV) { 3970 unless ($DB_ENV) {
3422 $DB_ENV = BDB::db_env_create; 3971 $DB_ENV = BDB::db_env_create;
3972 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3973 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3974 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3975 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3976 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3423 3977
3424 cf::sync_job { 3978 cf::sync_job {
3425 eval { 3979 eval {
3426 BDB::db_env_open 3980 BDB::db_env_open
3427 $DB_ENV, 3981 $DB_ENV,
… …
3429 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3983 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3430 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3984 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3431 0666; 3985 0666;
3432 3986
3433 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3987 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3434
3435 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3436 $DB_ENV->set_lk_detect;
3437 }; 3988 };
3438 3989
3439 cf::cleanup "db_env_open(db): $@" if $@; 3990 cf::cleanup "db_env_open(db): $@" if $@;
3440 }; 3991 };
3441 } 3992 }
3993
3994 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3995 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3996 };
3997 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3998 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3999 };
4000 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4001 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4002 };
3442} 4003}
3443 4004
3444{ 4005{
4006 # configure IO::AIO
4007
3445 IO::AIO::min_parallel 8; 4008 IO::AIO::min_parallel 8;
3446
3447 undef $Coro::AIO::WATCHER;
3448 IO::AIO::max_poll_time $TICK * 0.1; 4009 IO::AIO::max_poll_time $TICK * 0.1;
3449 $AIO_POLL_WATCHER = Event->io ( 4010 undef $AnyEvent::AIO::WATCHER;
3450 reentrant => 0,
3451 data => WF_AUTOCANCEL,
3452 fd => IO::AIO::poll_fileno,
3453 poll => 'r',
3454 prio => 6,
3455 cb => \&IO::AIO::poll_cb,
3456 );
3457} 4011}
3458 4012
3459my $_log_backtrace; 4013my $_log_backtrace;
3460 4014
3461sub _log_backtrace { 4015sub _log_backtrace {
… …
3464 $msg =~ s/\n//; 4018 $msg =~ s/\n//;
3465 4019
3466 # limit the # of concurrent backtraces 4020 # limit the # of concurrent backtraces
3467 if ($_log_backtrace < 2) { 4021 if ($_log_backtrace < 2) {
3468 ++$_log_backtrace; 4022 ++$_log_backtrace;
4023 my $perl_bt = Carp::longmess $msg;
3469 async { 4024 async {
4025 $Coro::current->{desc} = "abt $msg";
4026
3470 my @bt = fork_call { 4027 my @bt = fork_call {
3471 @addr = map { sprintf "%x", $_ } @addr; 4028 @addr = map { sprintf "%x", $_ } @addr;
3472 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4029 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3473 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4030 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3474 or die "addr2line: $!"; 4031 or die "addr2line: $!";
… …
3482 } 4039 }
3483 4040
3484 @funcs 4041 @funcs
3485 }; 4042 };
3486 4043
3487 LOG llevInfo, "[ABT] $msg\n"; 4044 LOG llevInfo, "[ABT] $perl_bt\n";
4045 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3488 LOG llevInfo, "[ABT] $_\n" for @bt; 4046 LOG llevInfo, "[ABT] $_\n" for @bt;
3489 --$_log_backtrace; 4047 --$_log_backtrace;
3490 }; 4048 };
3491 } else { 4049 } else {
3492 LOG llevInfo, "[ABT] $msg\n"; 4050 LOG llevInfo, "[ABT] $msg\n";
3493 LOG llevInfo, "[ABT] [suppressed]\n"; 4051 LOG llevInfo, "[ABT] [suppressed]\n";
3494 } 4052 }
3495} 4053}
3496 4054
3497# load additional modules 4055# load additional modules
3498use cf::pod; 4056require "cf/$_.pm" for @EXTRA_MODULES;
4057cf::_connect_to_perl_2;
3499 4058
3500END { cf::emergency_save } 4059END { cf::emergency_save }
3501 4060
35021 40611
3503 4062

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines