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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines