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.354 by root, Sun Sep 2 12:26:54 2007 UTC vs.
Revision 1.504 by root, Sat Jan 30 23:50:16 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines