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.332 by root, Sat Aug 18 17:33:53 2007 UTC vs.
Revision 1.496 by root, Sun Nov 15 18:03:59 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 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 1.4 (); 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
366Locks are *not* recursive, locking from the same coro twice results in a
367deadlocked coro.
368
277Lock names should begin with a unique identifier (for example, cf::map::find 369Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 370uses map_find and cf::map::load uses map_load).
279 371
280=item $locked = cf::lock_active $string 372=item $locked = cf::lock_active $string
281 373
282Return 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.
283 375
284=cut 376=cut
285 377
286our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
287 379
288sub lock_wait($) { 380sub lock_wait($) {
289 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
290
291 # wait for lock, if any
292 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule;
295 }
296} 382}
297 383
298sub lock_acquire($) { 384sub lock_acquire($) {
299 my ($key) = @_; 385 $LOCKS->guard ($_[0])
300
301 # wait, to be sure we are not locked
302 lock_wait $key;
303
304 $LOCK{$key} = [];
305
306 Coro::guard {
307 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} };
309 }
310} 386}
311 387
312sub lock_active($) { 388sub lock_active($) {
313 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
314
315 ! ! $LOCK{$key}
316} 390}
317 391
318sub freeze_mainloop { 392sub freeze_mainloop {
319 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
320 394
321 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
322 $TICK_WATCHER->start; 396}
323 }; 397
324 $TICK_WATCHER->stop; 398=item cf::periodic $interval, $cb
325 $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
326} 411}
327 412
328=item cf::get_slot $time[, $priority[, $name]] 413=item cf::get_slot $time[, $priority[, $name]]
329 414
330Allocate $time seconds of blocking CPU time at priority C<$priority>: 415Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
341our @SLOT_QUEUE; 426our @SLOT_QUEUE;
342our $SLOT_QUEUE; 427our $SLOT_QUEUE;
343 428
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 429$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 430$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager");
432
346 my $signal = new Coro::Signal; 433 my $signal = new Coro::Signal;
347 434
348 while () { 435 while () {
349 next_job: 436 next_job:
350 my $avail = cf::till_tick; 437 my $avail = cf::till_tick;
… …
358 } 445 }
359 } 446 }
360 } 447 }
361 448
362 if (@SLOT_QUEUE) { 449 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive 450 # we do not use wait_for_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal; 451 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait; 452 $signal->wait;
366 } else { 453 } else {
367 Coro::schedule; 454 Coro::schedule;
368 } 455 }
369 } 456 }
370}; 457};
371 458
372sub get_slot($;$$) { 459sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main;
461
373 my ($time, $pri, $name) = @_; 462 my ($time, $pri, $name) = @_;
374 463
375 $time = $TICK * .6 if $time > $TICK * .6; 464 $time = $TICK * .6 if $time > $TICK * .6;
376 my $sig = new Coro::Signal; 465 my $sig = new Coro::Signal;
377 466
… …
391 480
392BEGIN { *async = \&Coro::async_pool } 481BEGIN { *async = \&Coro::async_pool }
393 482
394=item cf::sync_job { BLOCK } 483=item cf::sync_job { BLOCK }
395 484
396The design of Crossfire TRT requires that the main coroutine ($Coro::main) 485The design of Deliantra requires that the main coroutine ($Coro::main)
397is always able to handle events or runnable, as Crossfire TRT is only 486is always able to handle events or runnable, as Deliantra is only
398partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 487partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399acceptable. 488acceptable.
400 489
401If it must be done, put the blocking parts into C<sync_job>. This will run 490If it must be done, put the blocking parts into C<sync_job>. This will run
402the given BLOCK in another coroutine while waiting for the result. The 491the given BLOCK in another coroutine while waiting for the result. The
… …
407 496
408sub sync_job(&) { 497sub sync_job(&) {
409 my ($job) = @_; 498 my ($job) = @_;
410 499
411 if ($Coro::current == $Coro::main) { 500 if ($Coro::current == $Coro::main) {
412 my $time = Event::time; 501 my $time = EV::time;
413 502
414 # this is the main coro, too bad, we have to block 503 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 504 # till the operation succeeds, freezing the server :/
416 505
417 # TODO: use suspend/resume instead 506 LOG llevError, Carp::longmess "sync job";#d#
418 # (but this is cancel-safe) 507
419 my $freeze_guard = freeze_mainloop; 508 my $freeze_guard = freeze_mainloop;
420 509
421 my $busy = 1; 510 my $busy = 1;
422 my @res; 511 my @res;
423 512
424 (async { 513 (async {
514 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 515 @res = eval { $job->() };
426 warn $@ if $@; 516 warn $@ if $@;
427 undef $busy; 517 undef $busy;
428 })->prio (Coro::PRIO_MAX); 518 })->prio (Coro::PRIO_MAX);
429 519
430 while ($busy) { 520 while ($busy) {
431 Coro::cede or Event::one_event; 521 if (Coro::nready) {
522 Coro::cede_notself;
523 } else {
524 EV::loop EV::LOOP_ONESHOT;
432 } 525 }
526 }
433 527
434 $time = Event::time - $time; 528 my $time = EV::time - $time;
435 529
436 LOG llevError | logBacktrace, Carp::longmess "long sync job"
437 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438
439 $tick_start += $time; # do not account sync jobs to server load 530 $TICK_START += $time; # do not account sync jobs to server load
440 531
441 wantarray ? @res : $res[0] 532 wantarray ? @res : $res[0]
442 } else { 533 } else {
443 # we are in another coroutine, how wonderful, everything just works 534 # we are in another coroutine, how wonderful, everything just works
444 535
… …
469=item fork_call { }, $args 560=item fork_call { }, $args
470 561
471Executes the given code block with the given arguments in a seperate 562Executes the given code block with the given arguments in a seperate
472process, returning the results. Everything must be serialisable with 563process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may 564Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling. 565never block itself or use any form of event handling.
475 566
476=cut 567=cut
477 568
478sub fork_call(&@) { 569sub fork_call(&@) {
479 my ($cb, @args) = @_; 570 my ($cb, @args) = @_;
480 571
481 # we seemingly have to make a local copy of the whole thing, 572 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 573 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 574 # TODO: investigate and fix (likely this will be rather laborious)
484 575
485 my @res = Coro::Util::fork_eval { 576 my @res = Coro::Util::fork_eval {
486 reset_signals; 577 reset_signals;
487 &$cb 578 &$cb
488 }, @args; 579 }, @args;
489 580
490 wantarray ? @res : $res[-1] 581 wantarray ? @res : $res[-1]
491} 582}
492 583
584=item $coin = coin_from_name $name
585
586=cut
587
588our %coin_alias = (
589 "silver" => "silvercoin",
590 "silvercoin" => "silvercoin",
591 "silvercoins" => "silvercoin",
592 "gold" => "goldcoin",
593 "goldcoin" => "goldcoin",
594 "goldcoins" => "goldcoin",
595 "platinum" => "platinacoin",
596 "platinumcoin" => "platinacoin",
597 "platinumcoins" => "platinacoin",
598 "platina" => "platinacoin",
599 "platinacoin" => "platinacoin",
600 "platinacoins" => "platinacoin",
601 "royalty" => "royalty",
602 "royalties" => "royalty",
603);
604
605sub coin_from_name($) {
606 $coin_alias{$_[0]}
607 ? cf::arch::find $coin_alias{$_[0]}
608 : undef
609}
610
493=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
494 612
495Returns a single value from the environment database. 613Returns a single value from the environment database.
496 614
497=item cf::db_put $family => $key => $value 615=item cf::db_put $family => $key => $value
498 616
499Stores the given C<$value> in the family. It can currently store binary 617Stores the given C<$value> in the family. It can currently store binary
500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 618data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 619
620=item $db = cf::db_table "name"
621
622Create and/or open a new database table. The string must not be "db" and must be unique
623within each server.
624
502=cut 625=cut
626
627sub db_table($) {
628 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV;
630
631 eval {
632 $db->set_flags (BDB::CHKSUM);
633
634 utf8::encode $name;
635 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
636 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
637 cf::cleanup "db_open(db): $!" if $!;
638 };
639 cf::cleanup "db_open(db): $@" if $@;
640
641 $db
642}
503 643
504our $DB; 644our $DB;
505 645
506sub db_init { 646sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 647 cf::sync_job {
511 eval { 648 $DB ||= db_table "db";
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
520 } 649 };
521} 650}
522 651
523sub db_get($$) { 652sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 653 my $key = "$_[0]/$_[1]";
525 654
… …
575 if (1) { 704 if (1) {
576 $md5 = 705 $md5 =
577 join "\x00", 706 join "\x00",
578 $processversion, 707 $processversion,
579 map { 708 map {
580 Coro::cede; 709 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 710 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 711 } 0.. $#$src;
583 712
584 713
585 my $dbmd5 = db_get cache => "$id/md5"; 714 my $dbmd5 = db_get cache => "$id/md5";
… …
623 752
624############################################################################# 753#############################################################################
625 754
626=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
627 756
628Many objects in crossfire are so-called attachable objects. That means you can 757Many objects in deliantra are so-called attachable objects. That means you can
629attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
630to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
631 760
632In the following description, CLASS can be any of C<global>, C<object> 761In the following description, CLASS can be any of C<global>, C<object>
633C<player>, C<client> or C<map> (i.e. the attachable objects in 762C<player>, C<client> or C<map> (i.e. the attachable objects in
634Crossfire TRT). 763Deliantra).
635 764
636=over 4 765=over 4
637 766
638=item $attachable->attach ($attachment, key => $value...) 767=item $attachable->attach ($attachment, key => $value...)
639 768
… …
683=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
684 813
685Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
686given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
687 816
688Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
689that are attached at load/instantiate time, thus the need for a name. 818that are attached at load/instantiate time, thus the need for a name.
690 819
691These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
692 821
693=over 4 822=over 4
… …
921 } 1050 }
922 1051
923 0 1052 0
924} 1053}
925 1054
926=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
927 1056
928=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1057=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
929 1058
930Generate an object-specific event with the given arguments. 1059Generate an object-specific event with the given arguments.
931 1060
… …
937 1066
938=cut 1067=cut
939 1068
940############################################################################# 1069#############################################################################
941# object support 1070# object support
942#
943 1071
1072sub _object_equal($$);
1073sub _object_equal($$) {
1074 my ($a, $b) = @_;
1075
1076 return 0 unless (ref $a) eq (ref $b);
1077
1078 if ("HASH" eq ref $a) {
1079 my @ka = keys %$a;
1080 my @kb = keys %$b;
1081
1082 return 0 if @ka != @kb;
1083
1084 for (0 .. $#ka) {
1085 return 0 unless $ka[$_] eq $kb[$_];
1086 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1087 }
1088
1089 } elsif ("ARRAY" eq ref $a) {
1090
1091 return 0 if @$a != @$b;
1092
1093 for (0 .. $#$a) {
1094 return 0 unless _object_equal $a->[$_], $b->[$_];
1095 }
1096
1097 } elsif ($a ne $b) {
1098 return 0;
1099 }
1100
1101 1
1102}
1103
1104our $SLOW_MERGES;#d#
944sub _can_merge { 1105sub _can_merge {
945 my ($ob1, $ob2) = @_; 1106 my ($ob1, $ob2) = @_;
946 1107
947 local $Storable::canonical = 1; 1108 ++$SLOW_MERGES;#d#
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950 1109
951 $fob1 eq $fob2 1110 # we do the slow way here
1111 return _object_equal $ob1, $ob2
952} 1112}
953 1113
954sub reattach { 1114sub reattach {
955 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
956 my ($obj) = @_; 1116 my ($obj) = @_;
957 1117
1118 # no longer needed after getting rid of delete_package?
958 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1119 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
959 1120
960 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
961 1122
962 @$registry = (); 1123 @$registry = ();
963 1124
… …
978cf::attachable->attach ( 1139cf::attachable->attach (
979 prio => -1000000, 1140 prio => -1000000,
980 on_instantiate => sub { 1141 on_instantiate => sub {
981 my ($obj, $data) = @_; 1142 my ($obj, $data) = @_;
982 1143
983 $data = from_json $data; 1144 $data = decode_json $data;
984 1145
985 for (@$data) { 1146 for (@$data) {
986 my ($name, $args) = @$_; 1147 my ($name, $args) = @$_;
987 1148
988 $obj->attach ($name, %{$args || {} }); 1149 $obj->attach ($name, %{$args || {} });
… …
1004sub object_freezer_save { 1165sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1166 my ($filename, $rdata, $objs) = @_;
1006 1167
1007 sync_job { 1168 sync_job {
1008 if (length $$rdata) { 1169 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1011 1173
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1177 if ($cf::USE_FSYNC) {
1178 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;
1179 aio_fsync $fh;
1180 }
1016 close $fh; 1181 aio_close $fh;
1017 1182
1018 if (@$objs) { 1183 if (@$objs) {
1019 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1020 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1188 if ($cf::USE_FSYNC) {
1189 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;
1190 aio_fsync $fh;
1191 }
1024 close $fh; 1192 aio_close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1194 }
1027 } else { 1195 } else {
1028 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1029 } 1197 }
1030 1198
1031 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1032 } else { 1203 } else {
1033 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1034 } 1205 }
1035 } else { 1206 } else {
1036 aio_unlink $filename; 1207 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1038 } 1209 }
1039 } 1210 };
1040} 1211}
1041 1212
1042sub object_freezer_as_string { 1213sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1214 my ($rdata, $objs) = @_;
1044 1215
… …
1056 or return; 1227 or return;
1057 1228
1058 unless (aio_stat "$filename.pst") { 1229 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1230 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1231 or return;
1232
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1233 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs};
1062 } 1235 }
1063 1236
1237 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1238 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1239 $decname, length $data, scalar @{$av || []};
1240
1066 return ($data, $av); 1241 ($data, $av)
1067} 1242}
1068 1243
1069=head2 COMMAND CALLBACKS 1244=head2 COMMAND CALLBACKS
1070 1245
1071=over 4 1246=over 4
… …
1125 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1126 1301
1127 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1128} 1303}
1129 1304
1305use File::Glob ();
1306
1130cf::player->attach ( 1307cf::player->attach (
1131 on_command => sub { 1308 on_command => sub {
1132 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1133 1310
1134 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
… …
1149 my ($type, $reply, @payload) = 1326 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1327 "ARRAY" eq ref $msg
1151 ? @$msg 1328 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1329 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1330
1331 my @reply;
1332
1154 if (my $cb = $EXTCMD{$type}) { 1333 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1334 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1335 }
1336
1337 $pl->ext_reply ($reply, @reply)
1338 if $reply;
1339
1160 } else { 1340 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1341 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1342 }
1163 1343
1164 cf::override; 1344 cf::override;
1165 }, 1345 },
1166); 1346);
1347
1348# "readahead" all extensions
1349sub cache_extensions {
1350 my $grp = IO::AIO::aio_group;
1351
1352 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1353 for (grep /\.ext$/, @{$_[0]}) {
1354 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1355 }
1356 };
1357
1358 $grp
1359}
1167 1360
1168sub load_extensions { 1361sub load_extensions {
1169 cf::sync_job { 1362 cf::sync_job {
1170 my %todo; 1363 my %todo;
1171 1364
… …
1191 1384
1192 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1193 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1194 1387
1195 $ext{source} = 1388 $ext{source} =
1196 "package $pkg; use strict; use utf8;\n" 1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1197 . "#line 1 \"$path\"\n{\n" 1390 . "#line 1 \"$path\"\n{\n"
1198 . $source 1391 . $source
1199 . "\n};\n1"; 1392 . "\n};\n1";
1200 1393
1201 $todo{$base} = \%ext; 1394 $todo{$base} = \%ext;
… …
1217 my $msg = $@ ? "$v->{path}: $@\n" 1410 my $msg = $@ ? "$v->{path}: $@\n"
1218 : "$v->{base}: extension inactive.\n"; 1411 : "$v->{base}: extension inactive.\n";
1219 1412
1220 if (exists $v->{meta}{mandatory}) { 1413 if (exists $v->{meta}{mandatory}) {
1221 warn $msg; 1414 warn $msg;
1222 warn "mandatory extension failed to load, exiting.\n"; 1415 cf::cleanup "mandatory extension failed to load, exiting.";
1223 exit 1;
1224 } 1416 }
1225 1417
1226 warn $msg; 1418 warn $msg;
1227 } 1419 }
1228 1420
… …
1242 1434
1243=back 1435=back
1244 1436
1245=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1246 1438
1247Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1248 1440
1249=cut 1441=cut
1250 1442
1251package cf::player; 1443package cf::player;
1252 1444
1253use Coro::AIO; 1445use Coro::AIO;
1254 1446
1255=head3 cf::player 1447=head3 cf::player
1256 1448
1257=over 4 1449=over 4
1450
1451=item cf::player::num_playing
1452
1453Returns the official number of playing players, as per the Crossfire metaserver rules.
1454
1455=cut
1456
1457sub num_playing {
1458 scalar grep
1459 $_->ob->map
1460 && !$_->hidden
1461 && !$_->ob->flag (cf::FLAG_WIZ),
1462 cf::player::list
1463}
1258 1464
1259=item cf::player::find $login 1465=item cf::player::find $login
1260 1466
1261Returns the given player object, loading it if necessary (might block). 1467Returns the given player object, loading it if necessary (might block).
1262 1468
… …
1281 1487
1282sub exists($) { 1488sub exists($) {
1283 my ($login) = @_; 1489 my ($login) = @_;
1284 1490
1285 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1286 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1287} 1493}
1288 1494
1289sub find($) { 1495sub find($) {
1290 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1291 my $login = $_[0]; 1497 my $login = $_[0];
… …
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1504 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1505 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1506 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1507 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1508
1303 my $pl = load_pl path $login 1509 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1510 or return;
1511
1512 my $pl = cf::player::load_pl $f
1513 or return;
1514
1515 local $cf::PLAYER_LOADING{$login} = $pl;
1516 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1517 $cf::PLAYER{$login} = $pl
1306 } 1518 }
1307 } 1519 }
1308} 1520}
1309 1521
… …
1318 return if $pl->{deny_save}; 1530 return if $pl->{deny_save};
1319 1531
1320 aio_mkdir playerdir $pl, 0770; 1532 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1533 $pl->{last_save} = $cf::RUNTIME;
1322 1534
1535 cf::get_slot 0.01;
1536
1323 $pl->save_pl ($path); 1537 $pl->save_pl ($path);
1324 Coro::cede; 1538 cf::cede_to_tick;
1325} 1539}
1326 1540
1327sub new($) { 1541sub new($) {
1328 my ($login) = @_; 1542 my ($login) = @_;
1329 1543
… …
1358 my ($pl) = @_; 1572 my ($pl) = @_;
1359 1573
1360 my $name = $pl->ob->name; 1574 my $name = $pl->ob->name;
1361 1575
1362 $pl->{deny_save} = 1; 1576 $pl->{deny_save} = 1;
1363 $pl->password ("*"); # this should lock out the player until we nuked the dir 1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1364 1578
1365 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1366 $pl->deactivate; 1580 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1367 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1583 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1368 $pl->ns->destroy if $pl->ns; 1584 $pl->ns->destroy if $pl->ns;
1369 1585
1370 my $path = playerdir $pl; 1586 my $path = playerdir $pl;
1371 my $temp = "$path~$cf::RUNTIME~deleting~"; 1587 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1407 or return []; 1623 or return [];
1408 1624
1409 my @logins; 1625 my @logins;
1410 1626
1411 for my $login (@$dirs) { 1627 for my $login (@$dirs) {
1628 my $path = path $login;
1629
1630 # a .pst is a dead give-away for a valid player
1631 # if no pst file found, open and chekc for blocked users
1632 if (aio_stat "$path.pst") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1633 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1634 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1635 $buf !~ /^password -------------$/m or next; # official not-valid tag
1636 }
1415 1637
1416 utf8::decode $login; 1638 utf8::decode $login;
1417 push @logins, $login; 1639 push @logins, $login;
1418 } 1640 }
1419 1641
… …
1446 } 1668 }
1447 1669
1448 \@paths 1670 \@paths
1449} 1671}
1450 1672
1451=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1452 1674
1453Expand crossfire pod fragments into protocol xml. 1675Expand deliantra pod fragments into protocol xml.
1454
1455=cut
1456
1457sub expand_cfpod {
1458 ((my $self), (local $_)) = @_;
1459
1460 # escape & and <
1461 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g;
1463
1464 # this is buggy, it needs to properly take care of nested <'s
1465
1466 1 while
1467 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/
1471 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1
1474 }ge
1475 # replace H<hint text>
1476 || s{H<([^\>]*)>}
1477 {
1478 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1479 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480 "")
1481 [$self->{hintmode}]
1482 }ge;
1483
1484 # create single paragraphs (very hackish)
1485 s/(?<=\S)\n(?=\w)/ /g;
1486
1487 # compress some whitespace
1488 s/\s+\n/\n/g; # ws line-ends
1489 s/\n\n+/\n/g; # double lines
1490 s/^\n+//; # beginning lines
1491 s/\n+$//; # ending lines
1492
1493 $_
1494}
1495
1496sub hintmode {
1497 $_[0]{hintmode} = $_[1] if @_ > 1;
1498 $_[0]{hintmode}
1499}
1500 1676
1501=item $player->ext_reply ($msgid, @msg) 1677=item $player->ext_reply ($msgid, @msg)
1502 1678
1503Sends an ext reply to the player. 1679Sends an ext reply to the player.
1504 1680
1505=cut 1681=cut
1506 1682
1507sub ext_reply($$@) { 1683sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1684 my ($self, $id, @msg) = @_;
1509 1685
1510 if ($self->ns->extcmd == 2) { 1686 $self->ns->ext_reply ($id, @msg)
1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1517} 1687}
1518 1688
1519=item $player->ext_msg ($type, @msg) 1689=item $player->ext_msg ($type, @msg)
1520 1690
1521Sends an ext event to the client. 1691Sends an ext event to the client.
… …
1577our $MAX_RESET = 3600; 1747our $MAX_RESET = 3600;
1578our $DEFAULT_RESET = 3000; 1748our $DEFAULT_RESET = 3000;
1579 1749
1580sub generate_random_map { 1750sub generate_random_map {
1581 my ($self, $rmp) = @_; 1751 my ($self, $rmp) = @_;
1752
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754
1582 # mit "rum" bekleckern, nicht 1755 # mit "rum" bekleckern, nicht
1583 $self->_create_random_map ( 1756 $self->_create_random_map (
1584 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1585 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1586 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1708 1881
1709# the temporary/swap location 1882# the temporary/swap location
1710sub save_path { 1883sub save_path {
1711 my ($self) = @_; 1884 my ($self) = @_;
1712 1885
1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1886 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1714 "$TMPDIR/$path.map" 1887 "$TMPDIR/$path.map"
1715} 1888}
1716 1889
1717# the unique path, undef == no special unique path 1890# the unique path, undef == no special unique path
1718sub uniq_path { 1891sub uniq_path {
1719 my ($self) = @_; 1892 my ($self) = @_;
1720 1893
1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1722 "$UNIQUEDIR/$path" 1895 "$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} 1896}
1733 1897
1734sub decay_objects { 1898sub decay_objects {
1735 my ($self) = @_; 1899 my ($self) = @_;
1736 1900
… …
1749 1913
1750sub load_header_from($) { 1914sub load_header_from($) {
1751 my ($self, $path) = @_; 1915 my ($self, $path) = @_;
1752 1916
1753 utf8::encode $path; 1917 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1918 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1919 or return;
1920
1921 $self->_load_header ($f)
1922 or return;
1923
1924 local $MAP_LOADING{$self->{path}} = $self;
1925 $f->resolve_delayed_derefs;
1759 1926
1760 $self->{load_path} = $path; 1927 $self->{load_path} = $path;
1761 1928
1762 1 1929 1
1763} 1930}
… …
1817sub find { 1984sub find {
1818 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1819 1986
1820 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1821 1988
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1823 1991
1824 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path";
1826 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
1827 or return; 1994 or return;
1828 1995
1829 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1830 1997
… …
1832 or return; 1999 or return;
1833 2000
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2001 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 2002 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 2003 #$cf::WAIT_FOR_TICK->wait;
2004 undef $guard2;
2005 undef $guard1;
1837 $map->reset; 2006 $map->reset;
1838 undef $guard;
1839 return find $path; 2007 return find $path;
1840 } 2008 }
1841 2009
1842 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
1843 } 2011 }
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 2020 local $self->{deny_reset} = 1; # loading can take a long time
1853 2021
1854 my $path = $self->{path}; 2022 my $path = $self->{path};
1855 2023
1856 { 2024 {
1857 my $guard = cf::lock_acquire "map_load:$path"; 2025 my $guard = cf::lock_acquire "map_data:$path";
1858 2026
2027 return unless $self->valid;
1859 return if $self->in_memory != cf::MAP_SWAPPED; 2028 return unless $self->in_memory == cf::MAP_SWAPPED;
1860 2029
1861 $self->in_memory (cf::MAP_LOADING); 2030 $self->in_memory (cf::MAP_LOADING);
1862 2031
1863 $self->alloc; 2032 $self->alloc;
1864 2033
1865 $self->pre_load; 2034 $self->pre_load;
1866 Coro::cede; 2035 cf::cede_to_tick;
1867 2036
2037 my $f = new_from_file cf::object::thawer $self->{load_path};
2038 $f->skip_block;
1868 $self->_load_objects ($self->{load_path}, 1) 2039 $self->_load_objects ($f)
1869 or return; 2040 or return;
1870 2041
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
1872 if delete $self->{load_original}; 2043 if delete $self->{load_original};
1873 2044
1874 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
1875 utf8::encode $uniq; 2046 utf8::encode $uniq;
1876 if (aio_open $uniq, O_RDONLY, 0) { 2047 unless (aio_stat $uniq) {
2048 if (my $f = new_from_file cf::object::thawer $uniq) {
1877 $self->clear_unique_items; 2049 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 2050 $self->_load_objects ($f);
2051 $f->resolve_delayed_derefs;
2052 }
1879 } 2053 }
1880 } 2054 }
1881 2055
1882 Coro::cede; 2056 $f->resolve_delayed_derefs;
2057
2058 cf::cede_to_tick;
1883 # now do the right thing for maps 2059 # now do the right thing for maps
1884 $self->link_multipart_objects; 2060 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 2061 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 2062 unless $self->difficulty;
1887 Coro::cede; 2063 cf::cede_to_tick;
1888 2064
1889 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 2066 $self->decay_objects;
1891 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
1892 $self->update_buttons; 2068 $self->update_buttons;
1893 Coro::cede; 2069 cf::cede_to_tick;
1894 $self->set_darkness_map;
1895 Coro::cede;
1896 $self->activate; 2070 $self->activate;
1897 } 2071 }
1898 2072
1899 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
1901 2075
1902 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_ACTIVE);
1903 } 2077 }
1904 2078
1905 $self->post_load; 2079 $self->post_load;
1906} 2080}
1907 2081
… …
1916 2090
1917 $self 2091 $self
1918} 2092}
1919 2093
1920# find and load all maps in the 3x3 area around a map 2094# find and load all maps in the 3x3 area around a map
1921sub load_diag { 2095sub load_neighbours {
1922 my ($map) = @_; 2096 my ($map) = @_;
1923 2097
1924 my @diag; # diagonal neighbours 2098 my @neigh; # diagonal neighbours
1925 2099
1926 for (0 .. 3) { 2100 for (0 .. 3) {
1927 my $neigh = $map->tile_path ($_) 2101 my $neigh = $map->tile_path ($_)
1928 or next; 2102 or next;
1929 $neigh = find $neigh, $map 2103 $neigh = find $neigh, $map
1930 or next; 2104 or next;
1931 $neigh->load; 2105 $neigh->load;
1932 2106
2107 push @neigh,
1933 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2108 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1934 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2109 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1935 } 2110 }
1936 2111
1937 for (@diag) { 2112 for (grep defined $_->[0], @neigh) {
2113 my ($path, $origin) = @$_;
1938 my $neigh = find @$_ 2114 my $neigh = find $path, $origin
1939 or next; 2115 or next;
1940 $neigh->load; 2116 $neigh->load;
1941 } 2117 }
1942} 2118}
1943 2119
… …
1948} 2124}
1949 2125
1950sub do_load_sync { 2126sub do_load_sync {
1951 my ($map) = @_; 2127 my ($map) = @_;
1952 2128
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main;
2131
1953 cf::sync_job { $map->load }; 2132 cf::sync_job { $map->load };
1954} 2133}
1955 2134
1956our %MAP_PREFETCH; 2135our %MAP_PREFETCH;
1957our $MAP_PREFETCHER = undef; 2136our $MAP_PREFETCHER = undef;
1958 2137
1959sub find_async { 2138sub find_async {
1960 my ($path, $origin) = @_; 2139 my ($path, $origin, $load) = @_;
1961 2140
1962 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
1963 2142
1964 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
1965 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1966 } 2145 }
1967 2146
1968 undef $MAP_PREFETCH{$path}; 2147 $MAP_PREFETCH{$path} |= $load;
2148
1969 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
1970 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
1971 for my $path (keys %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
1972 if (my $map = find $path) { 2154 if (my $map = find $k) {
1973 $map->load; 2155 $map->load if $v;
1974 } 2156 }
1975 2157
1976 delete $MAP_PREFETCH{$path}; 2158 delete $MAP_PREFETCH{$k};
1977 } 2159 }
1978 } 2160 }
1979 undef $MAP_PREFETCHER; 2161 undef $MAP_PREFETCHER;
1980 }; 2162 };
1981 $MAP_PREFETCHER->prio (6); 2163 $MAP_PREFETCHER->prio (6);
… …
1984} 2166}
1985 2167
1986sub save { 2168sub save {
1987 my ($self) = @_; 2169 my ($self) = @_;
1988 2170
1989 my $lock = cf::lock_acquire "map_data:" . $self->path; 2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
1990 2172
1991 $self->{last_save} = $cf::RUNTIME; 2173 $self->{last_save} = $cf::RUNTIME;
1992 2174
1993 return unless $self->dirty; 2175 return unless $self->dirty;
1994 2176
… …
2000 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2001 2183
2002 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
2003 2185
2004 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
2005 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2006 }; 2189 };
2190
2191 cf::get_slot 0.02;
2007 2192
2008 if ($uniq) { 2193 if ($uniq) {
2009 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2194 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2010 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2195 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2011 } else { 2196 } else {
… …
2017 my ($self) = @_; 2202 my ($self) = @_;
2018 2203
2019 # save first because save cedes 2204 # save first because save cedes
2020 $self->save; 2205 $self->save;
2021 2206
2022 my $lock = cf::lock_acquire "map_data:" . $self->path; 2207 my $lock = cf::lock_acquire "map_data:$self->{path}";
2023 2208
2024 return if $self->players; 2209 return if $self->players;
2025 return if $self->in_memory != cf::MAP_IN_MEMORY; 2210 return if $self->in_memory != cf::MAP_ACTIVE;
2026 return if $self->{deny_save}; 2211 return if $self->{deny_save};
2027 2212
2213 $self->in_memory (cf::MAP_SWAPPED);
2214
2215 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2217 $self->clear;
2029 $self->in_memory (cf::MAP_SWAPPED);
2030} 2218}
2031 2219
2032sub reset_at { 2220sub reset_at {
2033 my ($self) = @_; 2221 my ($self) = @_;
2034 2222
… …
2052 2240
2053 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2054 2242
2055 return if $self->players; 2243 return if $self->players;
2056 2244
2057 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2058 2246
2059 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2060 2248
2061 # need to save uniques path 2249 # need to save uniques path
2062 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
… …
2066 if $uniq; 2254 if $uniq;
2067 } 2255 }
2068 2256
2069 delete $cf::MAP{$self->path}; 2257 delete $cf::MAP{$self->path};
2070 2258
2259 $self->deactivate;
2260 $_->clear_links_to ($self) for values %cf::MAP;
2071 $self->clear; 2261 $self->clear;
2072
2073 $_->clear_links_to ($self) for values %cf::MAP;
2074 2262
2075 $self->unlink_save; 2263 $self->unlink_save;
2076 $self->destroy; 2264 $self->destroy;
2077} 2265}
2078 2266
2079my $nuke_counter = "aaaa"; 2267my $nuke_counter = "aaaa";
2080 2268
2081sub nuke { 2269sub nuke {
2082 my ($self) = @_; 2270 my ($self) = @_;
2083 2271
2272 {
2273 my $lock = cf::lock_acquire "map_data:$self->{path}";
2274
2084 delete $cf::MAP{$self->path}; 2275 delete $cf::MAP{$self->path};
2085 2276
2086 $self->unlink_save; 2277 $self->unlink_save;
2087 2278
2088 bless $self, "cf::map"; 2279 bless $self, "cf::map";
2089 delete $self->{deny_reset}; 2280 delete $self->{deny_reset};
2090 $self->{deny_save} = 1; 2281 $self->{deny_save} = 1;
2091 $self->reset_timeout (1); 2282 $self->reset_timeout (1);
2092 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2093 2284
2094 $cf::MAP{$self->path} = $self; 2285 $cf::MAP{$self->path} = $self;
2286 }
2095 2287
2096 $self->reset; # polite request, might not happen 2288 $self->reset; # polite request, might not happen
2097} 2289}
2098 2290
2099=item $maps = cf::map::tmp_maps 2291=item $maps = cf::map::tmp_maps
… …
2141 2333
2142sub unique_maps() { 2334sub unique_maps() {
2143 [ 2335 [
2144 map { 2336 map {
2145 utf8::decode $_; 2337 utf8::decode $_;
2146 /\.map$/ 2338 s/\.map$//; # TODO future compatibility hack
2339 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2340 ? ()
2147 ? normalise $_ 2341 : normalise $_
2148 : ()
2149 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2150 ] 2343 ]
2151} 2344}
2152 2345
2153package cf; 2346=item cf::map::static_maps
2347
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory excluding F</styles> and F</editor>). May
2350block.
2351
2352=cut
2353
2354sub static_maps() {
2355 my @dirs = "";
2356 my @maps;
2357
2358 while (@dirs) {
2359 my $dir = shift @dirs;
2360
2361 next if $dir eq "/styles" || $dir eq "/editor";
2362
2363 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2364 or return;
2365
2366 for (@$files) {
2367 s/\.map$// or next;
2368 utf8::decode $_;
2369 push @maps, "$dir/$_";
2370 }
2371
2372 push @dirs, map "$dir/$_", @$dirs;
2373 }
2374
2375 \@maps
2376}
2154 2377
2155=back 2378=back
2156 2379
2157=head3 cf::object 2380=head3 cf::object
2158 2381
… …
2162 2385
2163=over 4 2386=over 4
2164 2387
2165=item $ob->inv_recursive 2388=item $ob->inv_recursive
2166 2389
2167Returns the inventory of the object _and_ their inventories, recursively. 2390Returns the inventory of the object I<and> their inventories, recursively,
2391but I<not> the object itself.
2168 2392
2169=cut 2393=cut
2170 2394
2171sub inv_recursive_; 2395sub inv_recursive_;
2172sub inv_recursive_ { 2396sub inv_recursive_ {
… …
2175 2399
2176sub inv_recursive { 2400sub inv_recursive {
2177 inv_recursive_ inv $_[0] 2401 inv_recursive_ inv $_[0]
2178} 2402}
2179 2403
2404=item $ref = $ob->ref
2405
2406Creates and returns a persistent reference to an object that can be stored as a string.
2407
2408=item $ob = cf::object::deref ($refstring)
2409
2410returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2411even if the object actually exists. May block.
2412
2413=cut
2414
2415sub deref {
2416 my ($ref) = @_;
2417
2418 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2419 my ($uuid, $name) = ($1, $2);
2420 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2421 or return;
2422 $pl->ob->uuid eq $uuid
2423 or return;
2424
2425 $pl->ob
2426 } else {
2427 warn "$ref: cannot resolve object reference\n";
2428 undef
2429 }
2430}
2431
2180package cf; 2432package cf;
2181 2433
2182=back 2434=back
2183 2435
2184=head3 cf::object::player 2436=head3 cf::object::player
… …
2190Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2442Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2191can be C<undef>. Does the right thing when the player is currently in a 2443can be C<undef>. Does the right thing when the player is currently in a
2192dialogue with the given NPC character. 2444dialogue with the given NPC character.
2193 2445
2194=cut 2446=cut
2447
2448our $SAY_CHANNEL = {
2449 id => "say",
2450 title => "Map",
2451 reply => "say ",
2452 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2453};
2454
2455our $CHAT_CHANNEL = {
2456 id => "chat",
2457 title => "Chat",
2458 reply => "chat ",
2459 tooltip => "Player chat and shouts, global to the server.",
2460};
2195 2461
2196# rough implementation of a future "reply" method that works 2462# rough implementation of a future "reply" method that works
2197# with dialog boxes. 2463# with dialog boxes.
2198#TODO: the first argument must go, split into a $npc->reply_to ( method 2464#TODO: the first argument must go, split into a $npc->reply_to ( method
2199sub cf::object::player::reply($$$;$) { 2465sub cf::object::player::reply($$$;$) {
… …
2211 my $dialog = $pl->{npc_dialog}; 2477 my $dialog = $pl->{npc_dialog};
2212 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2213 2479
2214 } else { 2480 } else {
2215 $msg = $npc->name . " says: $msg" if $npc; 2481 $msg = $npc->name . " says: $msg" if $npc;
2216 $self->message ($msg, $flags); 2482 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2217 } 2483 }
2218 } 2484 }
2219} 2485}
2220 2486
2221=item $object->send_msg ($channel, $msg, $color, [extra...]) 2487=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2246 2512
2247=item $player_object->enter_link 2513=item $player_object->enter_link
2248 2514
2249Freezes the player and moves him/her to a special map (C<{link}>). 2515Freezes the player and moves him/her to a special map (C<{link}>).
2250 2516
2251The player should be reasonably safe there for short amounts of time. You 2517The player should be reasonably safe there for short amounts of time (e.g.
2252I<MUST> call C<leave_link> as soon as possible, though. 2518for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2519though, as the palyer cannot control the character while it is on the link
2520map.
2253 2521
2254Will never block. 2522Will never block.
2255 2523
2256=item $player_object->leave_link ($map, $x, $y) 2524=item $player_object->leave_link ($map, $x, $y)
2257 2525
… …
2309 ($x, $y) = (-1, -1) 2577 ($x, $y) = (-1, -1)
2310 unless (defined $x) && (defined $y); 2578 unless (defined $x) && (defined $y);
2311 2579
2312 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2313 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2314 if $x <=0 && $y <= 0; 2582 if $x <= 0 && $y <= 0;
2315 2583
2316 $map->load; 2584 $map->load;
2317 $map->load_diag; 2585 $map->load_neighbours;
2318 2586
2319 return unless $self->contr->active; 2587 return unless $self->contr->active;
2320 $self->activate_recursive;
2321 2588
2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2323 $self->enter_map ($map, $x, $y); 2590 $self->enter_map ($map, $x, $y);
2591
2592 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive;
2324} 2594}
2325 2595
2326=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2327 2597
2328Moves the player to the given map-path and coordinates by first freezing 2598Moves the player to the given map-path and coordinates by first freezing
2329her, loading and preparing them map, calling the provided $check callback 2599her, loading and preparing them map, calling the provided $check callback
2330that has to return the map if sucecssful, and then unfreezes the player on 2600that has to return the map if sucecssful, and then unfreezes the player on
2331the new (success) or old (failed) map position. In either case, $done will 2601the new (success) or old (failed) map position. In either case, $done will
2332be called at the end of this process. 2602be called at the end of this process.
2333 2603
2604Note that $check will be called with a potentially non-loaded map, so if
2605it needs a loaded map it has to call C<< ->load >>.
2606
2334=cut 2607=cut
2335 2608
2336our $GOTOGEN; 2609our $GOTOGEN;
2337 2610
2338sub cf::object::player::goto { 2611sub cf::object::player::goto {
… …
2342 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2615 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2343 2616
2344 $self->enter_link; 2617 $self->enter_link;
2345 2618
2346 (async { 2619 (async {
2620 $Coro::current->{desc} = "player::goto $path $x $y";
2621
2622 # *tag paths override both path and x|y
2623 if ($path =~ /^\*(.*)$/) {
2624 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2625 my $ob = $obs[rand @obs];
2626
2627 # see if we actually can go there
2628 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2629 $ob = $obs[rand @obs];
2630 } else {
2631 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2632 }
2633 # else put us there anyways for now #d#
2634
2635 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2636 } else {
2637 ($path, $x, $y) = (undef, undef, undef);
2638 }
2639 }
2640
2347 my $map = eval { 2641 my $map = eval {
2348 my $map = cf::map::find $path; 2642 my $map = defined $path ? cf::map::find $path : undef;
2349 2643
2350 if ($map) { 2644 if ($map) {
2351 $map = $map->customise_for ($self); 2645 $map = $map->customise_for ($self);
2352 $map = $check->($map) if $check && $map; 2646 $map = $check->($map) if $check && $map;
2353 } else { 2647 } else {
2354 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2648 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2355 } 2649 }
2356 2650
2357 $map 2651 $map
2358 }; 2652 };
2359 2653
… …
2395} 2689}
2396 2690
2397sub prepare_random_map { 2691sub prepare_random_map {
2398 my ($exit) = @_; 2692 my ($exit) = @_;
2399 2693
2400 my $guard = cf::lock_acquire "exit_prepare:$exit";
2401
2402 # all this does is basically replace the /! path by 2694 # all this does is basically replace the /! path by
2403 # a new random map path (?random/...) with a seed 2695 # a new random map path (?random/...) with a seed
2404 # that depends on the exit object 2696 # that depends on the exit object
2405 2697
2406 my $rmp = parse_random_map_params $exit->msg; 2698 my $rmp = parse_random_map_params $exit->msg;
… …
2408 if ($exit->map) { 2700 if ($exit->map) {
2409 $rmp->{region} = $exit->region->name; 2701 $rmp->{region} = $exit->region->name;
2410 $rmp->{origin_map} = $exit->map->path; 2702 $rmp->{origin_map} = $exit->map->path;
2411 $rmp->{origin_x} = $exit->x; 2703 $rmp->{origin_x} = $exit->x;
2412 $rmp->{origin_y} = $exit->y; 2704 $rmp->{origin_y} = $exit->y;
2705
2706 $exit->map->touch;
2413 } 2707 }
2414 2708
2415 $rmp->{random_seed} ||= $exit->random_seed; 2709 $rmp->{random_seed} ||= $exit->random_seed;
2416 2710
2417 my $data = cf::to_json $rmp; 2711 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2418 my $md5 = Digest::MD5::md5_hex $data; 2712 my $md5 = Digest::MD5::md5_hex $data;
2419 my $meta = "$RANDOMDIR/$md5.meta"; 2713 my $meta = "$RANDOMDIR/$md5.meta";
2420 2714
2421 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2715 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2422 aio_write $fh, 0, (length $data), $data, 0; 2716 aio_write $fh, 0, (length $data), $data, 0;
2423 undef $fh; 2717 undef $fh;
2424 aio_rename "$meta~", $meta; 2718 aio_rename "$meta~", $meta;
2425 2719
2720 my $slaying = "?random/$md5";
2721
2722 if ($exit->valid) {
2426 $exit->slaying ("?random/$md5"); 2723 $exit->slaying ("?random/$md5");
2427 $exit->msg (undef); 2724 $exit->msg (undef);
2725 }
2428 } 2726 }
2429} 2727}
2430 2728
2431sub cf::object::player::enter_exit { 2729sub cf::object::player::enter_exit {
2432 my ($self, $exit) = @_; 2730 my ($self, $exit) = @_;
2433 2731
2434 return unless $self->type == cf::PLAYER; 2732 return unless $self->type == cf::PLAYER;
2435 2733
2436 if ($exit->slaying eq "/!") {
2437 #TODO: this should de-fi-ni-te-ly not be a sync-job
2438 # the problem is that $exit might not survive long enough
2439 # so it needs to be done right now, right here
2440 cf::sync_job { prepare_random_map $exit };
2441 }
2442
2443 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2444 my $hp = $exit->stats->hp;
2445 my $sp = $exit->stats->sp;
2446
2447 $self->enter_link; 2734 $self->enter_link;
2448 2735
2449 # if exit is damned, update players death & WoR home-position
2450 $self->contr->savebed ($slaying, $hp, $sp)
2451 if $exit->flag (FLAG_DAMNED);
2452
2453 (async { 2736 (async {
2454 $self->deactivate_recursive; # just to be sure 2737 $Coro::current->{desc} = "enter_exit";
2738
2455 unless (eval { 2739 unless (eval {
2740 $self->deactivate_recursive; # just to be sure
2741
2742 # random map handling
2743 {
2744 my $guard = cf::lock_acquire "exit_prepare:$exit";
2745
2746 prepare_random_map $exit
2747 if $exit->slaying eq "/!";
2748 }
2749
2750 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2751 my $x = $exit->stats->hp;
2752 my $y = $exit->stats->sp;
2753
2456 $self->goto ($slaying, $hp, $sp); 2754 $self->goto ($map, $x, $y);
2457 2755
2756 # if exit is damned, update players death & WoR home-position
2757 $self->contr->savebed ($map, $x, $y)
2758 if $exit->flag (cf::FLAG_DAMNED);
2759
2458 1; 2760 1
2459 }) { 2761 }) {
2460 $self->message ("Something went wrong deep within the crossfire server. " 2762 $self->message ("Something went wrong deep within the deliantra server. "
2461 . "I'll try to bring you back to the map you were before. " 2763 . "I'll try to bring you back to the map you were before. "
2462 . "Please report this to the dungeon master!", 2764 . "Please report this to the dungeon master!",
2463 cf::NDI_UNIQUE | cf::NDI_RED); 2765 cf::NDI_UNIQUE | cf::NDI_RED);
2464 2766
2465 warn "ERROR in enter_exit: $@"; 2767 warn "ERROR in enter_exit: $@";
… …
2482sub cf::client::send_drawinfo { 2784sub cf::client::send_drawinfo {
2483 my ($self, $text, $flags) = @_; 2785 my ($self, $text, $flags) = @_;
2484 2786
2485 utf8::encode $text; 2787 utf8::encode $text;
2486 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2788 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2789}
2790
2791=item $client->send_big_packet ($pkt)
2792
2793Like C<send_packet>, but tries to compress large packets, and fragments
2794them as required.
2795
2796=cut
2797
2798our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2799
2800sub cf::client::send_big_packet {
2801 my ($self, $pkt) = @_;
2802
2803 # try lzf for large packets
2804 $pkt = "lzf " . Compress::LZF::compress $pkt
2805 if 1024 <= length $pkt and $self->{can_lzf};
2806
2807 # split very large packets
2808 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2809 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2810 $pkt = "frag";
2811 }
2812
2813 $self->send_packet ($pkt);
2487} 2814}
2488 2815
2489=item $client->send_msg ($channel, $msg, $color, [extra...]) 2816=item $client->send_msg ($channel, $msg, $color, [extra...])
2490 2817
2491Send a drawinfo or msg packet to the client, formatting the msg for the 2818Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2493the message, with C<log> being the default. If C<$color> is negative, suppress 2820the message, with C<log> being the default. If C<$color> is negative, suppress
2494the message unless the client supports the msg packet. 2821the message unless the client supports the msg packet.
2495 2822
2496=cut 2823=cut
2497 2824
2825# non-persistent channels (usually the info channel)
2826our %CHANNEL = (
2827 "c/motd" => {
2828 id => "infobox",
2829 title => "MOTD",
2830 reply => undef,
2831 tooltip => "The message of the day",
2832 },
2833 "c/identify" => {
2834 id => "infobox",
2835 title => "Identify",
2836 reply => undef,
2837 tooltip => "Items recently identified",
2838 },
2839 "c/examine" => {
2840 id => "infobox",
2841 title => "Examine",
2842 reply => undef,
2843 tooltip => "Signs and other items you examined",
2844 },
2845 "c/shopinfo" => {
2846 id => "infobox",
2847 title => "Shop Info",
2848 reply => undef,
2849 tooltip => "What your bargaining skill tells you about the shop",
2850 },
2851 "c/book" => {
2852 id => "infobox",
2853 title => "Book",
2854 reply => undef,
2855 tooltip => "The contents of a note or book",
2856 },
2857 "c/lookat" => {
2858 id => "infobox",
2859 title => "Look",
2860 reply => undef,
2861 tooltip => "What you saw there",
2862 },
2863 "c/who" => {
2864 id => "infobox",
2865 title => "Players",
2866 reply => undef,
2867 tooltip => "Shows players who are currently online",
2868 },
2869 "c/body" => {
2870 id => "infobox",
2871 title => "Body Parts",
2872 reply => undef,
2873 tooltip => "Shows which body parts you posess and are available",
2874 },
2875 "c/statistics" => {
2876 id => "infobox",
2877 title => "Statistics",
2878 reply => undef,
2879 tooltip => "Shows your primary statistics",
2880 },
2881 "c/skills" => {
2882 id => "infobox",
2883 title => "Skills",
2884 reply => undef,
2885 tooltip => "Shows your experience per skill and item power",
2886 },
2887 "c/shopitems" => {
2888 id => "infobox",
2889 title => "Shop Items",
2890 reply => undef,
2891 tooltip => "Shows the items currently for sale in this shop",
2892 },
2893 "c/resistances" => {
2894 id => "infobox",
2895 title => "Resistances",
2896 reply => undef,
2897 tooltip => "Shows your resistances",
2898 },
2899 "c/pets" => {
2900 id => "infobox",
2901 title => "Pets",
2902 reply => undef,
2903 tooltip => "Shows information abotu your pets/a specific pet",
2904 },
2905 "c/perceiveself" => {
2906 id => "infobox",
2907 title => "Perceive Self",
2908 reply => undef,
2909 tooltip => "You gained detailed knowledge about yourself",
2910 },
2911 "c/uptime" => {
2912 id => "infobox",
2913 title => "Uptime",
2914 reply => undef,
2915 tooltip => "How long the server has been running since last restart",
2916 },
2917 "c/mapinfo" => {
2918 id => "infobox",
2919 title => "Map Info",
2920 reply => undef,
2921 tooltip => "Information related to the maps",
2922 },
2923 "c/party" => {
2924 id => "party",
2925 title => "Party",
2926 reply => "gsay ",
2927 tooltip => "Messages and chat related to your party",
2928 },
2929 "c/death" => {
2930 id => "death",
2931 title => "Death",
2932 reply => undef,
2933 tooltip => "Reason for and more info about your most recent death",
2934 },
2935 "c/say" => $SAY_CHANNEL,
2936 "c/chat" => $CHAT_CHANNEL,
2937);
2938
2498sub cf::client::send_msg { 2939sub cf::client::send_msg {
2499 my ($self, $channel, $msg, $color, @extra) = @_; 2940 my ($self, $channel, $msg, $color, @extra) = @_;
2500 2941
2501 $msg = $self->pl->expand_cfpod ($msg); 2942 $msg = $self->pl->expand_cfpod ($msg)
2943 unless $color & cf::NDI_VERBATIM;
2502 2944
2503 $color &= cf::NDI_CLIENT_MASK; # just in case... 2945 $color &= cf::NDI_CLIENT_MASK; # just in case...
2504 2946
2947 # check predefined channels, for the benefit of C
2948 if ($CHANNEL{$channel}) {
2949 $channel = $CHANNEL{$channel};
2950
2951 $self->ext_msg (channel_info => $channel);
2952 $channel = $channel->{id};
2953
2505 if (ref $channel) { 2954 } elsif (ref $channel) {
2506 # send meta info to client, if not yet sent 2955 # send meta info to client, if not yet sent
2507 unless (exists $self->{channel}{$channel->{id}}) { 2956 unless (exists $self->{channel}{$channel->{id}}) {
2508 $self->{channel}{$channel->{id}} = $channel; 2957 $self->{channel}{$channel->{id}} = $channel;
2509 $self->ext_msg (channel_info => $channel); 2958 $self->ext_msg (channel_info => $channel);
2510 } 2959 }
… …
2512 $channel = $channel->{id}; 2961 $channel = $channel->{id};
2513 } 2962 }
2514 2963
2515 return unless @extra || length $msg; 2964 return unless @extra || length $msg;
2516 2965
2517 if ($self->can_msg) {
2518 # default colour, mask it out 2966 # default colour, mask it out
2519 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2967 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2520 if $color & cf::NDI_DEF; 2968 if $color & cf::NDI_DEF;
2521 2969
2522 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2970 my $pkt = "msg "
2971 . $self->{json_coder}->encode (
2523 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2972 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2524 } else { 2973 );
2525 if ($color >= 0) {
2526 # replace some tags by gcfclient-compatible ones
2527 for ($msg) {
2528 1 while
2529 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2530 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2531 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2532 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2533 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2534 }
2535 2974
2536 $color &= cf::NDI_COLOR_MASK; 2975 $self->send_big_packet ($pkt);
2537
2538 utf8::encode $msg;
2539
2540 if (0 && $msg =~ /\[/) {
2541 # COMMAND/INFO
2542 $self->send_packet ("drawextinfo $color 10 8 $msg")
2543 } else {
2544 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2545 $self->send_packet ("drawinfo $color $msg")
2546 }
2547 }
2548 }
2549} 2976}
2550 2977
2551=item $client->ext_msg ($type, @msg) 2978=item $client->ext_msg ($type, @msg)
2552 2979
2553Sends an ext event to the client. 2980Sends an ext event to the client.
… …
2555=cut 2982=cut
2556 2983
2557sub cf::client::ext_msg($$@) { 2984sub cf::client::ext_msg($$@) {
2558 my ($self, $type, @msg) = @_; 2985 my ($self, $type, @msg) = @_;
2559 2986
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) { 2987 if ($self->extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove 2989 } elsif ($self->extcmd == 1) { # TODO: remove
2565 push @msg, msgtype => "event_$type"; 2990 push @msg, msgtype => "event_$type";
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2992 }
2993}
2994
2995=item $client->ext_reply ($msgid, @msg)
2996
2997Sends an ext reply to the client.
2998
2999=cut
3000
3001sub cf::client::ext_reply($$@) {
3002 my ($self, $id, @msg) = @_;
3003
3004 if ($self->extcmd == 2) {
3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3006 } elsif ($self->extcmd == 1) {
3007 #TODO: version 1, remove
3008 unshift @msg, msgtype => "reply", msgid => $id;
3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 } 3010 }
2568} 3011}
2569 3012
2570=item $success = $client->query ($flags, "text", \&cb) 3013=item $success = $client->query ($flags, "text", \&cb)
2571 3014
… …
2632 my ($type, $reply, @payload) = 3075 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg 3076 "ARRAY" eq ref $msg
2634 ? @$msg 3077 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3078 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636 3079
3080 my @reply;
3081
2637 if (my $cb = $EXTICMD{$type}) { 3082 if (my $cb = $EXTICMD{$type}) {
2638 my @reply = $cb->($ns, @payload); 3083 @reply = $cb->($ns, @payload);
2639
2640 $ns->ext_reply ($reply, @reply)
2641 if $reply;
2642 } 3084 }
3085
3086 $ns->ext_reply ($reply, @reply)
3087 if $reply;
3088
2643 } else { 3089 } else {
2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3090 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2645 } 3091 }
2646 3092
2647 cf::override; 3093 cf::override;
… …
2707=pod 3153=pod
2708 3154
2709The following functions and methods are available within a safe environment: 3155The following functions and methods are available within a safe environment:
2710 3156
2711 cf::object 3157 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 3158 contr pay_amount pay_player map x y force_find force_add destroy
2713 insert remove name archname title slaying race 3159 insert remove name archname title slaying race decrease split
3160 value
2714 3161
2715 cf::object::player 3162 cf::object::player
2716 player 3163 player
2717 3164
2718 cf::player 3165 cf::player
… …
2723 3170
2724=cut 3171=cut
2725 3172
2726for ( 3173for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3174 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove inv name archname title slaying race)], 3175 insert remove inv nrof name archname title slaying race
3176 decrease split destroy change_exp value msg lore send_msg)],
2729 ["cf::object::player" => qw(player)], 3177 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 3178 ["cf::player" => qw(peaceful send_msg)],
2731 ["cf::map" => qw(trigger)], 3179 ["cf::map" => qw(trigger)],
2732) { 3180) {
2733 no strict 'refs'; 3181 no strict 'refs';
2734 my ($pkg, @funs) = @$_; 3182 my ($pkg, @funs) = @$_;
2735 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2752 my ($code, %vars) = @_; 3200 my ($code, %vars) = @_;
2753 3201
2754 my $qcode = $code; 3202 my $qcode = $code;
2755 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2756 $qcode =~ s/\n/\\n/g; 3204 $qcode =~ s/\n/\\n/g;
3205
3206 %vars = (_dummy => 0) unless %vars;
2757 3207
2758 local $_; 3208 local $_;
2759 local @safe::cf::_safe_eval_args = values %vars; 3209 local @safe::cf::_safe_eval_args = values %vars;
2760 3210
2761 my $eval = 3211 my $eval =
… …
2809# the server's init and main functions 3259# the server's init and main functions
2810 3260
2811sub load_facedata($) { 3261sub load_facedata($) {
2812 my ($path) = @_; 3262 my ($path) = @_;
2813 3263
3264 # HACK to clear player env face cache, we need some signal framework
3265 # for this (global event?)
3266 %ext::player_env::MUSIC_FACE_CACHE = ();
3267
3268 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3269
2814 warn "loading facedata from $path\n"; 3270 warn "loading facedata from $path\n";
2815 3271
2816 my $facedata; 3272 my $facedata;
2817 0 < aio_load $path, $facedata 3273 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 3274 or die "$path: $!";
… …
2820 $facedata = Coro::Storable::thaw $facedata; 3276 $facedata = Coro::Storable::thaw $facedata;
2821 3277
2822 $facedata->{version} == 2 3278 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3279 or cf::cleanup "$path: version mismatch, cannot proceed.";
2824 3280
3281 # patch in the exptable
3282 $facedata->{resource}{"res/exp_table"} = {
3283 type => FT_RSRC,
3284 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3285 };
3286 cf::cede_to_tick;
3287
2825 { 3288 {
2826 my $faces = $facedata->{faceinfo}; 3289 my $faces = $facedata->{faceinfo};
2827 3290
2828 while (my ($face, $info) = each %$faces) { 3291 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3292 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3293
2830 cf::face::set_visibility $idx, $info->{visibility}; 3294 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3295 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3296 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3297 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2834 3298
2835 cf::cede_to_tick; 3299 cf::cede_to_tick;
2836 } 3300 }
2837 3301
2838 while (my ($face, $info) = each %$faces) { 3302 while (my ($face, $info) = each %$faces) {
2839 next unless $info->{smooth}; 3303 next unless $info->{smooth};
3304
2840 my $idx = cf::face::find $face 3305 my $idx = cf::face::find $face
2841 or next; 3306 or next;
3307
2842 if (my $smooth = cf::face::find $info->{smooth}) { 3308 if (my $smooth = cf::face::find $info->{smooth}) {
2843 cf::face::set_smooth $idx, $smooth; 3309 cf::face::set_smooth $idx, $smooth;
2844 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3310 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2845 } else { 3311 } else {
2846 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3312 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
2860 3326
2861 cf::anim::invalidate_all; # d'oh 3327 cf::anim::invalidate_all; # d'oh
2862 } 3328 }
2863 3329
2864 { 3330 {
2865 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3331 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869
2870 my $soundconf = delete $res->{"res/sound.conf"};
2871 3332
2872 while (my ($name, $info) = each %$res) { 3333 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({ 3334 if (defined $info->{type}) {
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3335 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2879 3336
2880 if ($info->{type} & 1) {
2881 # prepend meta info
2882
2883 my $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886 cf::face::set_data $idx, 0, $data, $chk; 3337 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3338 cf::face::set_type $idx, $info->{type};
2887 } else { 3339 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3340 $RESOURCE{$name} = $info;
2889 } 3341 }
2890 3342
2891 cf::face::set_type $idx, $info->{type};
2892
2893 cf::cede_to_tick; 3343 cf::cede_to_tick;
2894 } 3344 }
2895
2896 if ($soundconf) {
2897 $soundconf = $enc->decode (delete $soundconf->{data});
2898
2899 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2900 my $sound = $soundconf->{compat}[$_]
2901 or next;
2902
2903 my $face = cf::face::find "sound/$sound->[1]";
2904 cf::sound::set $sound->[0] => $face;
2905 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2906 }
2907
2908 while (my ($k, $v) = each %{$soundconf->{event}}) {
2909 my $face = cf::face::find "sound/$v";
2910 cf::sound::set $k => $face;
2911 }
2912 }
2913 } 3345 }
3346
3347 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2914 3348
2915 1 3349 1
2916} 3350}
3351
3352cf::global->attach (on_resource_update => sub {
3353 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3354 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3355
3356 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3357 my $sound = $soundconf->{compat}[$_]
3358 or next;
3359
3360 my $face = cf::face::find "sound/$sound->[1]";
3361 cf::sound::set $sound->[0] => $face;
3362 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3363 }
3364
3365 while (my ($k, $v) = each %{$soundconf->{event}}) {
3366 my $face = cf::face::find "sound/$v";
3367 cf::sound::set $k => $face;
3368 }
3369 }
3370});
2917 3371
2918register_exticmd fx_want => sub { 3372register_exticmd fx_want => sub {
2919 my ($ns, $want) = @_; 3373 my ($ns, $want) = @_;
2920 3374
2921 while (my ($k, $v) = each %$want) { 3375 while (my ($k, $v) = each %$want) {
2922 $ns->fx_want ($k, $v); 3376 $ns->fx_want ($k, $v);
2923 } 3377 }
2924}; 3378};
2925 3379
3380sub load_resource_file($) {
3381 my $guard = lock_acquire "load_resource_file";
3382
3383 my $status = load_resource_file_ $_[0];
3384 get_slot 0.1, 100;
3385 cf::arch::commit_load;
3386
3387 $status
3388}
3389
2926sub reload_regions { 3390sub reload_regions {
3391 # HACK to clear player env face cache, we need some signal framework
3392 # for this (global event?)
3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3394
2927 load_resource_file "$MAPDIR/regions" 3395 load_resource_file "$MAPDIR/regions"
2928 or die "unable to load regions file\n"; 3396 or die "unable to load regions file\n";
2929 3397
2930 for (cf::region::list) { 3398 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/ 3399 $_->{match} = qr/$_->{match}/
… …
2939} 3407}
2940 3408
2941sub reload_archetypes { 3409sub reload_archetypes {
2942 load_resource_file "$DATADIR/archetypes" 3410 load_resource_file "$DATADIR/archetypes"
2943 or die "unable to load archetypes\n"; 3411 or die "unable to load archetypes\n";
2944 #d# NEED to laod twice to resolve forward references
2945 # this really needs to be done in an extra post-pass
2946 # (which needs to be synchronous, so solve it differently)
2947 load_resource_file "$DATADIR/archetypes"
2948 or die "unable to load archetypes\n";
2949} 3412}
2950 3413
2951sub reload_treasures { 3414sub reload_treasures {
2952 load_resource_file "$DATADIR/treasures" 3415 load_resource_file "$DATADIR/treasures"
2953 or die "unable to load treasurelists\n"; 3416 or die "unable to load treasurelists\n";
2954} 3417}
2955 3418
2956sub reload_resources { 3419sub reload_resources {
2957 warn "reloading resource files...\n"; 3420 warn "reloading resource files...\n";
2958 3421
3422 reload_facedata;
3423 reload_archetypes;
2959 reload_regions; 3424 reload_regions;
2960 reload_facedata;
2961 #reload_archetypes;#d#
2962 reload_archetypes;
2963 reload_treasures; 3425 reload_treasures;
2964 3426
2965 warn "finished reloading resource files\n"; 3427 warn "finished reloading resource files\n";
2966} 3428}
2967 3429
2968sub init { 3430sub reload_config {
2969 reload_resources; 3431 warn "reloading config file...\n";
2970}
2971 3432
2972sub cfg_load {
2973 open my $fh, "<:utf8", "$CONFDIR/config" 3433 open my $fh, "<:utf8", "$CONFDIR/config"
2974 or return; 3434 or return;
2975 3435
2976 local $/; 3436 local $/;
2977 *CFG = YAML::Syck::Load <$fh>; 3437 *CFG = YAML::XS::Load scalar <$fh>;
2978 3438
2979 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3439 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2980 3440
2981 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3441 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2982 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3442 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2986 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3446 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2987 and die "WARNING: m(un)lockall failed: $!\n"; 3447 and die "WARNING: m(un)lockall failed: $!\n";
2988 }; 3448 };
2989 warn $@ if $@; 3449 warn $@ if $@;
2990 } 3450 }
3451
3452 warn "finished reloading resource files\n";
3453}
3454
3455sub pidfile() {
3456 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3457 or die "$PIDFILE: $!";
3458 flock $fh, &Fcntl::LOCK_EX
3459 or die "$PIDFILE: flock: $!";
3460 $fh
3461}
3462
3463# make sure only one server instance is running at any one time
3464sub atomic {
3465 my $fh = pidfile;
3466
3467 my $pid = <$fh>;
3468 kill 9, $pid if $pid > 0;
3469
3470 seek $fh, 0, 0;
3471 print $fh $$;
3472}
3473
3474sub main_loop {
3475 warn "EV::loop starting\n";
3476 if (1) {
3477 EV::loop;
3478 }
3479 warn "EV::loop returned\n";
3480 goto &main_loop unless $REALLY_UNLOOP;
2991} 3481}
2992 3482
2993sub main { 3483sub main {
3484 cf::init_globals; # initialise logging
3485
3486 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3487 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3488 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3489 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3490
3491 cf::init_experience;
3492 cf::init_anim;
3493 cf::init_attackmess;
3494 cf::init_dynamic;
3495
3496 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3497
2994 # we must not ever block the main coroutine 3498 # we must not ever block the main coroutine
2995 local $Coro::idle = sub { 3499 local $Coro::idle = sub {
2996 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3500 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2997 (async { 3501 (async {
2998 Event::one_event; 3502 $Coro::current->{desc} = "IDLE BUG HANDLER";
3503 EV::loop EV::LOOP_ONESHOT;
2999 })->prio (Coro::PRIO_MAX); 3504 })->prio (Coro::PRIO_MAX);
3000 }; 3505 };
3001 3506
3002 cfg_load; 3507 evthread_start IO::AIO::poll_fileno;
3508
3509 cf::sync_job {
3510 cf::load_settings;
3511 cf::load_materials;
3512
3513 reload_resources;
3514 reload_config;
3003 db_init; 3515 db_init;
3516
3517 cf::init_uuid;
3518 cf::init_signals;
3519 cf::init_commands;
3520 cf::init_skills;
3521
3522 cf::init_beforeplay;
3523
3524 atomic;
3525
3004 load_extensions; 3526 load_extensions;
3005 3527
3006 $TICK_WATCHER->start; 3528 utime time, time, $RUNTIMEFILE;
3007 Event::loop; 3529
3530 # no (long-running) fork's whatsoever before this point(!)
3531 use POSIX ();
3532 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3533
3534 (pop @POST_INIT)->(0) while @POST_INIT;
3535 };
3536
3537 main_loop;
3008} 3538}
3009 3539
3010############################################################################# 3540#############################################################################
3011# initialisation and cleanup 3541# initialisation and cleanup
3012 3542
3013# install some emergency cleanup handlers 3543# install some emergency cleanup handlers
3014BEGIN { 3544BEGIN {
3545 our %SIGWATCHER = ();
3015 for my $signal (qw(INT HUP TERM)) { 3546 for my $signal (qw(INT HUP TERM)) {
3016 Event->signal ( 3547 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3017 reentrant => 0,
3018 data => WF_AUTOCANCEL,
3019 signal => $signal,
3020 prio => 0,
3021 cb => sub {
3022 cf::cleanup "SIG$signal"; 3548 cf::cleanup "SIG$signal";
3023 },
3024 ); 3549 };
3025 } 3550 }
3026} 3551}
3027 3552
3028sub write_runtime { 3553sub write_runtime_sync {
3029 my $runtime = "$LOCALDIR/runtime";
3030
3031 # first touch the runtime file to show we are still running: 3554 # first touch the runtime file to show we are still running:
3032 # the fsync below can take a very very long time. 3555 # the fsync below can take a very very long time.
3033 3556
3034 IO::AIO::aio_utime $runtime, undef, undef; 3557 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3035 3558
3036 my $guard = cf::lock_acquire "write_runtime"; 3559 my $guard = cf::lock_acquire "write_runtime";
3037 3560
3038 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3561 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3039 or return; 3562 or return;
3040 3563
3041 my $value = $cf::RUNTIME + 90 + 10; 3564 my $value = $cf::RUNTIME + 90 + 10;
3042 # 10 is the runtime save interval, for a monotonic clock 3565 # 10 is the runtime save interval, for a monotonic clock
3043 # 60 allows for the watchdog to kill the server. 3566 # 60 allows for the watchdog to kill the server.
… …
3053 aio_utime $fh, undef, undef; 3576 aio_utime $fh, undef, undef;
3054 3577
3055 close $fh 3578 close $fh
3056 or return; 3579 or return;
3057 3580
3058 aio_rename "$runtime~", $runtime 3581 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3059 and return; 3582 and return;
3060 3583
3061 warn "runtime file written.\n"; 3584 warn "runtime file written.\n";
3062 3585
3063 1 3586 1
3587}
3588
3589our $uuid_lock;
3590our $uuid_skip;
3591
3592sub write_uuid_sync($) {
3593 $uuid_skip ||= $_[0];
3594
3595 return if $uuid_lock;
3596 local $uuid_lock = 1;
3597
3598 my $uuid = "$LOCALDIR/uuid";
3599
3600 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3601 or return;
3602
3603 my $value = uuid_seq uuid_cur;
3604
3605 unless ($value) {
3606 warn "cowardly refusing to write zero uuid value!\n";
3607 return;
3608 }
3609
3610 my $value = uuid_str $value + $uuid_skip;
3611 $uuid_skip = 0;
3612
3613 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3614 and return;
3615
3616 # always fsync - this file is important
3617 aio_fsync $fh
3618 and return;
3619
3620 close $fh
3621 or return;
3622
3623 aio_rename "$uuid~", $uuid
3624 and return;
3625
3626 warn "uuid file written ($value).\n";
3627
3628 1
3629
3630}
3631
3632sub write_uuid($$) {
3633 my ($skip, $sync) = @_;
3634
3635 $sync ? write_uuid_sync $skip
3636 : async { write_uuid_sync $skip };
3064} 3637}
3065 3638
3066sub emergency_save() { 3639sub emergency_save() {
3067 my $freeze_guard = cf::freeze_mainloop; 3640 my $freeze_guard = cf::freeze_mainloop;
3068 3641
3069 warn "enter emergency perl save\n"; 3642 warn "emergency_perl_save: enter\n";
3070 3643
3071 cf::sync_job { 3644 cf::sync_job {
3645 # this is a trade-off: we want to be very quick here, so
3646 # save all maps without fsync, and later call a global sync
3647 # (which in turn might be very very slow)
3648 local $USE_FSYNC = 0;
3649
3072 # use a peculiar iteration method to avoid tripping on perl 3650 # use a peculiar iteration method to avoid tripping on perl
3073 # refcount bugs in for. also avoids problems with players 3651 # refcount bugs in for. also avoids problems with players
3074 # and maps saved/destroyed asynchronously. 3652 # and maps saved/destroyed asynchronously.
3075 warn "begin emergency player save\n"; 3653 warn "emergency_perl_save: begin player save\n";
3076 for my $login (keys %cf::PLAYER) { 3654 for my $login (keys %cf::PLAYER) {
3077 my $pl = $cf::PLAYER{$login} or next; 3655 my $pl = $cf::PLAYER{$login} or next;
3078 $pl->valid or next; 3656 $pl->valid or next;
3657 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3079 $pl->save; 3658 $pl->save;
3080 } 3659 }
3081 warn "end emergency player save\n"; 3660 warn "emergency_perl_save: end player save\n";
3082 3661
3083 warn "begin emergency map save\n"; 3662 warn "emergency_perl_save: begin map save\n";
3084 for my $path (keys %cf::MAP) { 3663 for my $path (keys %cf::MAP) {
3085 my $map = $cf::MAP{$path} or next; 3664 my $map = $cf::MAP{$path} or next;
3086 $map->valid or next; 3665 $map->valid or next;
3087 $map->save; 3666 $map->save;
3088 } 3667 }
3089 warn "end emergency map save\n"; 3668 warn "emergency_perl_save: end map save\n";
3090 3669
3091 warn "begin emergency database checkpoint\n"; 3670 warn "emergency_perl_save: begin database checkpoint\n";
3092 BDB::db_env_txn_checkpoint $DB_ENV; 3671 BDB::db_env_txn_checkpoint $DB_ENV;
3093 warn "end emergency database checkpoint\n"; 3672 warn "emergency_perl_save: end database checkpoint\n";
3673
3674 warn "emergency_perl_save: begin write uuid\n";
3675 write_uuid_sync 1;
3676 warn "emergency_perl_save: end write uuid\n";
3094 }; 3677 };
3095 3678
3679 warn "emergency_perl_save: starting sync()\n";
3680 IO::AIO::aio_sync sub {
3681 warn "emergency_perl_save: finished sync()\n";
3682 };
3683
3096 warn "leave emergency perl save\n"; 3684 warn "emergency_perl_save: leave\n";
3097} 3685}
3098 3686
3099sub post_cleanup { 3687sub post_cleanup {
3100 my ($make_core) = @_; 3688 my ($make_core) = @_;
3101 3689
3102 warn Carp::longmess "post_cleanup backtrace" 3690 warn Carp::longmess "post_cleanup backtrace"
3103 if $make_core; 3691 if $make_core;
3692
3693 my $fh = pidfile;
3694 unlink $PIDFILE if <$fh> == $$;
3695}
3696
3697# a safer delete_package, copied from Symbol
3698sub clear_package($) {
3699 my $pkg = shift;
3700
3701 # expand to full symbol table name if needed
3702 unless ($pkg =~ /^main::.*::$/) {
3703 $pkg = "main$pkg" if $pkg =~ /^::/;
3704 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3705 $pkg .= '::' unless $pkg =~ /::$/;
3706 }
3707
3708 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3709 my $stem_symtab = *{$stem}{HASH};
3710
3711 defined $stem_symtab and exists $stem_symtab->{$leaf}
3712 or return;
3713
3714 # clear all symbols
3715 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3716 for my $name (keys %$leaf_symtab) {
3717 _gv_clear *{"$pkg$name"};
3718# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3719 }
3720 warn "cleared package $pkg\n";#d#
3104} 3721}
3105 3722
3106sub do_reload_perl() { 3723sub do_reload_perl() {
3107 # can/must only be called in main 3724 # can/must only be called in main
3108 if ($Coro::current != $Coro::main) { 3725 if ($Coro::current != $Coro::main) {
3109 warn "can only reload from main coroutine"; 3726 warn "can only reload from main coroutine";
3110 return; 3727 return;
3111 } 3728 }
3112 3729
3730 return if $RELOAD++;
3731
3732 my $t1 = EV::time;
3733
3734 while ($RELOAD) {
3113 warn "reloading..."; 3735 warn "reloading...";
3114 3736
3115 warn "entering sync_job"; 3737 warn "entering sync_job";
3116 3738
3117 cf::sync_job { 3739 cf::sync_job {
3118 cf::write_runtime; # external watchdog should not bark 3740 cf::write_runtime_sync; # external watchdog should not bark
3119 cf::emergency_save; 3741 cf::emergency_save;
3120 cf::write_runtime; # external watchdog should not bark 3742 cf::write_runtime_sync; # external watchdog should not bark
3121 3743
3122 warn "syncing database to disk"; 3744 warn "syncing database to disk";
3123 BDB::db_env_txn_checkpoint $DB_ENV; 3745 BDB::db_env_txn_checkpoint $DB_ENV;
3124 3746
3125 # if anything goes wrong in here, we should simply crash as we already saved 3747 # if anything goes wrong in here, we should simply crash as we already saved
3126 3748
3127 warn "cancelling all WF_AUTOCANCEL watchers";
3128 for (Event::all_watchers) {
3129 $_->cancel if $_->data & WF_AUTOCANCEL;
3130 }
3131
3132 warn "flushing outstanding aio requests"; 3749 warn "flushing outstanding aio requests";
3133 for (;;) {
3134 BDB::flush;
3135 IO::AIO::flush;
3136 Coro::cede;
3137 last unless IO::AIO::nreqs || BDB::nreqs; 3750 while (IO::AIO::nreqs || BDB::nreqs) {
3138 warn "iterate..."; 3751 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3139 }
3140
3141 ++$RELOAD;
3142
3143 warn "cancelling all extension coros";
3144 $_->cancel for values %EXT_CORO;
3145 %EXT_CORO = ();
3146
3147 warn "removing commands";
3148 %COMMAND = ();
3149
3150 warn "removing ext/exti commands";
3151 %EXTCMD = ();
3152 %EXTICMD = ();
3153
3154 warn "unloading/nuking all extensions";
3155 for my $pkg (@EXTS) {
3156 warn "... unloading $pkg";
3157
3158 if (my $cb = $pkg->can ("unload")) {
3159 eval {
3160 $cb->($pkg);
3161 1
3162 } or warn "$pkg unloaded, but with errors: $@";
3163 } 3752 }
3164 3753
3165 warn "... nuking $pkg"; 3754 warn "cancelling all extension coros";
3166 Symbol::delete_package $pkg; 3755 $_->cancel for values %EXT_CORO;
3167 } 3756 %EXT_CORO = ();
3168 3757
3169 warn "unloading all perl modules loaded from $LIBDIR"; 3758 warn "removing commands";
3170 while (my ($k, $v) = each %INC) { 3759 %COMMAND = ();
3171 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3172 3760
3761 warn "removing ext/exti commands";
3762 %EXTCMD = ();
3763 %EXTICMD = ();
3764
3765 warn "unloading/nuking all extensions";
3766 for my $pkg (@EXTS) {
3173 warn "... unloading $k"; 3767 warn "... unloading $pkg";
3174 delete $INC{$k};
3175 3768
3176 $k =~ s/\.pm$//;
3177 $k =~ s/\//::/g;
3178
3179 if (my $cb = $k->can ("unload_module")) { 3769 if (my $cb = $pkg->can ("unload")) {
3770 eval {
3180 $cb->(); 3771 $cb->($pkg);
3772 1
3773 } or warn "$pkg unloaded, but with errors: $@";
3774 }
3775
3776 warn "... clearing $pkg";
3777 clear_package $pkg;
3181 } 3778 }
3182 3779
3183 Symbol::delete_package $k; 3780 warn "unloading all perl modules loaded from $LIBDIR";
3781 while (my ($k, $v) = each %INC) {
3782 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3783
3784 warn "... unloading $k";
3785 delete $INC{$k};
3786
3787 $k =~ s/\.pm$//;
3788 $k =~ s/\//::/g;
3789
3790 if (my $cb = $k->can ("unload_module")) {
3791 $cb->();
3792 }
3793
3794 clear_package $k;
3184 } 3795 }
3185 3796
3186 warn "getting rid of safe::, as good as possible"; 3797 warn "getting rid of safe::, as good as possible";
3187 Symbol::delete_package "safe::$_" 3798 clear_package "safe::$_"
3188 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3799 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3189 3800
3190 warn "unloading cf.pm \"a bit\""; 3801 warn "unloading cf.pm \"a bit\"";
3191 delete $INC{"cf.pm"}; 3802 delete $INC{"cf.pm"};
3192 delete $INC{"cf/pod.pm"}; 3803 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3193 3804
3194 # don't, removes xs symbols, too, 3805 # don't, removes xs symbols, too,
3195 # and global variables created in xs 3806 # and global variables created in xs
3196 #Symbol::delete_package __PACKAGE__; 3807 #clear_package __PACKAGE__;
3197 3808
3198 warn "unload completed, starting to reload now"; 3809 warn "unload completed, starting to reload now";
3199 3810
3200 warn "reloading cf.pm"; 3811 warn "reloading cf.pm";
3201 require cf; 3812 require cf;
3202 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3813 cf::_connect_to_perl_1;
3203 3814
3204 warn "loading config and database again"; 3815 warn "loading config and database again";
3205 cf::cfg_load; 3816 cf::reload_config;
3206 3817
3207 warn "loading extensions"; 3818 warn "loading extensions";
3208 cf::load_extensions; 3819 cf::load_extensions;
3209 3820
3821 if ($REATTACH_ON_RELOAD) {
3210 warn "reattaching attachments to objects/players"; 3822 warn "reattaching attachments to objects/players";
3211 _global_reattach; # objects, sockets 3823 _global_reattach; # objects, sockets
3212 warn "reattaching attachments to maps"; 3824 warn "reattaching attachments to maps";
3213 reattach $_ for values %MAP; 3825 reattach $_ for values %MAP;
3214 warn "reattaching attachments to players"; 3826 warn "reattaching attachments to players";
3215 reattach $_ for values %PLAYER; 3827 reattach $_ for values %PLAYER;
3828 }
3216 3829
3830 warn "running post_init jobs";
3831 (pop @POST_INIT)->(1) while @POST_INIT;
3832
3217 warn "leaving sync_job"; 3833 warn "leaving sync_job";
3218 3834
3219 1 3835 1
3220 } or do { 3836 } or do {
3221 warn $@; 3837 warn $@;
3222 warn "error while reloading, exiting."; 3838 cf::cleanup "error while reloading, exiting.";
3223 exit 1;
3224 }; 3839 };
3225 3840
3226 warn "reloaded"; 3841 warn "reloaded";
3842 --$RELOAD;
3843 }
3844
3845 $t1 = EV::time - $t1;
3846 warn "reload completed in ${t1}s\n";
3227}; 3847};
3228 3848
3229our $RELOAD_WATCHER; # used only during reload 3849our $RELOAD_WATCHER; # used only during reload
3230 3850
3231sub reload_perl() { 3851sub reload_perl() {
3232 # doing reload synchronously and two reloads happen back-to-back, 3852 # doing reload synchronously and two reloads happen back-to-back,
3233 # coro crashes during coro_state_free->destroy here. 3853 # coro crashes during coro_state_free->destroy here.
3234 3854
3235 $RELOAD_WATCHER ||= Event->timer ( 3855 $RELOAD_WATCHER ||= cf::async {
3236 reentrant => 0, 3856 Coro::AIO::aio_wait cache_extensions;
3237 after => 0, 3857
3238 data => WF_AUTOCANCEL, 3858 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3239 cb => sub {
3240 do_reload_perl; 3859 do_reload_perl;
3241 undef $RELOAD_WATCHER; 3860 undef $RELOAD_WATCHER;
3242 }, 3861 };
3243 ); 3862 };
3244} 3863}
3245 3864
3246register_command "reload" => sub { 3865register_command "reload" => sub {
3247 my ($who, $arg) = @_; 3866 my ($who, $arg) = @_;
3248 3867
3249 if ($who->flag (FLAG_WIZ)) { 3868 if ($who->flag (FLAG_WIZ)) {
3250 $who->message ("reloading server."); 3869 $who->message ("reloading server.");
3870 async {
3871 $Coro::current->{desc} = "perl_reload";
3251 async { reload_perl }; 3872 reload_perl;
3873 };
3252 } 3874 }
3253}; 3875};
3254 3876
3255unshift @INC, $LIBDIR; 3877unshift @INC, $LIBDIR;
3256 3878
… …
3258 3880
3259our @WAIT_FOR_TICK; 3881our @WAIT_FOR_TICK;
3260our @WAIT_FOR_TICK_BEGIN; 3882our @WAIT_FOR_TICK_BEGIN;
3261 3883
3262sub wait_for_tick { 3884sub wait_for_tick {
3263 return unless $TICK_WATCHER->is_active;
3264 return if $Coro::current == $Coro::main; 3885 return if tick_inhibit || $Coro::current == $Coro::main;
3265 3886
3266 my $signal = new Coro::Signal; 3887 my $signal = new Coro::Signal;
3267 push @WAIT_FOR_TICK, $signal; 3888 push @WAIT_FOR_TICK, $signal;
3268 $signal->wait; 3889 $signal->wait;
3269} 3890}
3270 3891
3271sub wait_for_tick_begin { 3892sub wait_for_tick_begin {
3272 return unless $TICK_WATCHER->is_active;
3273 return if $Coro::current == $Coro::main; 3893 return if tick_inhibit || $Coro::current == $Coro::main;
3274 3894
3275 my $signal = new Coro::Signal; 3895 my $signal = new Coro::Signal;
3276 push @WAIT_FOR_TICK_BEGIN, $signal; 3896 push @WAIT_FOR_TICK_BEGIN, $signal;
3277 $signal->wait; 3897 $signal->wait;
3278} 3898}
3279 3899
3280 my $min = 1e6;#d# 3900sub tick {
3281 my $avg = 10;
3282$TICK_WATCHER = Event->timer (
3283 reentrant => 0,
3284 parked => 1,
3285 prio => 0,
3286 at => $NEXT_TICK || $TICK,
3287 data => WF_AUTOCANCEL,
3288 cb => sub {
3289 if ($Coro::current != $Coro::main) { 3901 if ($Coro::current != $Coro::main) {
3290 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3902 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3291 unless ++$bug_warning > 10; 3903 unless ++$bug_warning > 10;
3292 return; 3904 return;
3293 } 3905 }
3294 3906
3295 $NOW = $tick_start = Event::time;
3296
3297 cf::server_tick; # one server iteration 3907 cf::server_tick; # one server iteration
3298 3908
3299 0 && sync_job {#d# 3909 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3300 for(1..10) { 3910 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3301 my $t = Event::time; 3911 Coro::async_pool {
3302 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3912 $Coro::current->{desc} = "runtime saver";
3303 or die; 3913 write_runtime_sync
3304 3914 or warn "ERROR: unable to write runtime file: $!";
3305 $map->width (50);
3306 $map->height (50);
3307 $map->alloc;
3308 $map->_load_objects ("/tmp/x.map", 1);
3309 my $t = Event::time - $t;
3310
3311 #next unless $t < 0.0013;#d#
3312 if ($t < $min) {
3313 $min = $t;
3314 }
3315 $avg = $avg * 0.99 + $t * 0.01;
3316 }
3317 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3318 exit 0;
3319 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3320 }; 3915 };
3916 }
3321 3917
3322 $RUNTIME += $TICK;
3323 $NEXT_TICK += $TICK;
3324
3325 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3326 $NEXT_RUNTIME_WRITE = $NOW + 10;
3327 Coro::async_pool {
3328 write_runtime
3329 or warn "ERROR: unable to write runtime file: $!";
3330 };
3331 }
3332
3333# my $AFTER = Event::time;
3334# warn $AFTER - $NOW;#d#
3335
3336 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3918 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3337 $sig->send; 3919 $sig->send;
3338 } 3920 }
3339 while (my $sig = shift @WAIT_FOR_TICK) { 3921 while (my $sig = shift @WAIT_FOR_TICK) {
3340 $sig->send; 3922 $sig->send;
3341 } 3923 }
3342 3924
3343 $NOW = Event::time; 3925 $LOAD = ($NOW - $TICK_START) / $TICK;
3344
3345 # if we are delayed by four ticks or more, skip them all
3346 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3347
3348 $TICK_WATCHER->at ($NEXT_TICK);
3349 $TICK_WATCHER->start;
3350
3351 $LOAD = ($NOW - $tick_start) / $TICK;
3352 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3926 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3353 3927
3354 _post_tick; 3928 if (0) {
3355 3929 if ($NEXT_TICK) {
3356 3930 my $jitter = $TICK_START - $NEXT_TICK;
3931 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3932 warn "jitter $JITTER\n";#d#
3933 }
3357 }, 3934 }
3358); 3935}
3359 3936
3360{ 3937{
3361 BDB::max_poll_time $TICK * 0.1; 3938 # configure BDB
3362 $BDB_POLL_WATCHER = Event->io ( 3939
3363 reentrant => 0,
3364 fd => BDB::poll_fileno,
3365 poll => 'r',
3366 prio => 0,
3367 data => WF_AUTOCANCEL,
3368 cb => \&BDB::poll_cb,
3369 );
3370 BDB::min_parallel 8; 3940 BDB::min_parallel 8;
3371 3941 BDB::max_poll_reqs $TICK * 0.1;
3372 BDB::set_sync_prepare { 3942 $AnyEvent::BDB::WATCHER->priority (1);
3373 my $status;
3374 my $current = $Coro::current;
3375 (
3376 sub {
3377 $status = $!;
3378 $current->ready; undef $current;
3379 },
3380 sub {
3381 Coro::schedule while defined $current;
3382 $! = $status;
3383 },
3384 )
3385 };
3386 3943
3387 unless ($DB_ENV) { 3944 unless ($DB_ENV) {
3388 $DB_ENV = BDB::db_env_create; 3945 $DB_ENV = BDB::db_env_create;
3946 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3947 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3948 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3949 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3950 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3389 3951
3390 cf::sync_job { 3952 cf::sync_job {
3391 eval { 3953 eval {
3392 BDB::db_env_open 3954 BDB::db_env_open
3393 $DB_ENV, 3955 $DB_ENV,
… …
3395 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3957 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3396 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3958 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3397 0666; 3959 0666;
3398 3960
3399 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3961 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3400
3401 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3402 $DB_ENV->set_lk_detect;
3403 }; 3962 };
3404 3963
3405 cf::cleanup "db_env_open(db): $@" if $@; 3964 cf::cleanup "db_env_open(db): $@" if $@;
3406 }; 3965 };
3407 } 3966 }
3967
3968 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3969 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3970 };
3971 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3972 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3973 };
3974 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3975 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3976 };
3408} 3977}
3409 3978
3410{ 3979{
3980 # configure IO::AIO
3981
3411 IO::AIO::min_parallel 8; 3982 IO::AIO::min_parallel 8;
3412
3413 undef $Coro::AIO::WATCHER;
3414 IO::AIO::max_poll_time $TICK * 0.1; 3983 IO::AIO::max_poll_time $TICK * 0.1;
3415 $AIO_POLL_WATCHER = Event->io ( 3984 undef $AnyEvent::AIO::WATCHER;
3416 reentrant => 0,
3417 data => WF_AUTOCANCEL,
3418 fd => IO::AIO::poll_fileno,
3419 poll => 'r',
3420 prio => 6,
3421 cb => \&IO::AIO::poll_cb,
3422 );
3423} 3985}
3424 3986
3425my $_log_backtrace; 3987my $_log_backtrace;
3426 3988
3427sub _log_backtrace { 3989sub _log_backtrace {
… …
3430 $msg =~ s/\n//; 3992 $msg =~ s/\n//;
3431 3993
3432 # limit the # of concurrent backtraces 3994 # limit the # of concurrent backtraces
3433 if ($_log_backtrace < 2) { 3995 if ($_log_backtrace < 2) {
3434 ++$_log_backtrace; 3996 ++$_log_backtrace;
3997 my $perl_bt = Carp::longmess $msg;
3435 async { 3998 async {
3999 $Coro::current->{desc} = "abt $msg";
4000
3436 my @bt = fork_call { 4001 my @bt = fork_call {
3437 @addr = map { sprintf "%x", $_ } @addr; 4002 @addr = map { sprintf "%x", $_ } @addr;
3438 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4003 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3439 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4004 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3440 or die "addr2line: $!"; 4005 or die "addr2line: $!";
… …
3448 } 4013 }
3449 4014
3450 @funcs 4015 @funcs
3451 }; 4016 };
3452 4017
3453 LOG llevInfo, "[ABT] $msg\n"; 4018 LOG llevInfo, "[ABT] $perl_bt\n";
4019 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3454 LOG llevInfo, "[ABT] $_\n" for @bt; 4020 LOG llevInfo, "[ABT] $_\n" for @bt;
3455 --$_log_backtrace; 4021 --$_log_backtrace;
3456 }; 4022 };
3457 } else { 4023 } else {
3458 LOG llevInfo, "[ABT] $msg\n"; 4024 LOG llevInfo, "[ABT] $msg\n";
3459 LOG llevInfo, "[ABT] [suppressed]\n"; 4025 LOG llevInfo, "[ABT] [suppressed]\n";
3460 } 4026 }
3461} 4027}
3462 4028
3463# load additional modules 4029# load additional modules
3464use cf::pod; 4030require "cf/$_.pm" for @EXTRA_MODULES;
4031cf::_connect_to_perl_2;
3465 4032
3466END { cf::emergency_save } 4033END { cf::emergency_save }
3467 4034
34681 40351
3469 4036

Diff Legend

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