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.356 by root, Tue Sep 4 05:43:21 2007 UTC vs.
Revision 1.534 by root, Thu Apr 29 08:13:51 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, %PLAYER_LOADING); # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # 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
409=cut 518=cut
410 519
411sub sync_job(&) { 520sub sync_job(&) {
412 my ($job) = @_; 521 my ($job) = @_;
413 522
414 if ($Coro::current == $Coro::main) { 523 if (in_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) = @_;
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 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
665 my ($name) = @_;
666 my $db = BDB::db_create $DB_ENV;
667
668 eval {
669 $db->set_flags (BDB::CHKSUM);
670
671 utf8::encode $name;
672 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
673 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
674 cf::cleanup "db_open(db): $!" if $!;
675 };
676 cf::cleanup "db_open(db): $@" if $@;
677
678 $db
679}
506 680
507our $DB; 681our $DB;
508 682
509sub db_init { 683sub db_init {
510 unless ($DB) { 684 $DB ||= db_table "db";
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job {
514 eval {
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 }
524} 685}
525 686
526sub db_get($$) { 687sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
528 689
529 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
530 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
531 694
532 $! ? () 695 $! ? ()
533 : $data 696 : $data
534 }
535} 697}
536 698
537sub db_put($$$) { 699sub db_put($$$) {
538 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
539 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
595 757
596 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
597 my $data = $process->(\@data); 759 my $data = $process->(\@data);
598 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
599 761
600 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
601 763
602 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
603 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
604 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
605 767
615 777
616=cut 778=cut
617 779
618sub datalog($@) { 780sub datalog($@) {
619 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
620 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
621} 783}
622 784
623=back 785=back
624 786
625=cut 787=cut
626 788
627############################################################################# 789#############################################################################
628 790
629=head2 ATTACHABLE OBJECTS 791=head2 ATTACHABLE OBJECTS
630 792
631Many objects in crossfire are so-called attachable objects. That means you can 793Many objects in deliantra are so-called attachable objects. That means you can
632attach callbacks/event handlers (a collection of which is called an "attachment") 794attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 795to it. All such attachable objects support the following methods.
634 796
635In the following description, CLASS can be any of C<global>, C<object> 797In 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 798C<player>, C<client> or C<map> (i.e. the attachable objects in
637Crossfire TRT). 799Deliantra).
638 800
639=over 4 801=over 4
640 802
641=item $attachable->attach ($attachment, key => $value...) 803=item $attachable->attach ($attachment, key => $value...)
642 804
686=item cf::CLASS::attachment $name, ... 848=item cf::CLASS::attachment $name, ...
687 849
688Register an attachment by C<$name> through which attachable objects of the 850Register an attachment by C<$name> through which attachable objects of the
689given CLASS can refer to this attachment. 851given CLASS can refer to this attachment.
690 852
691Some classes such as crossfire maps and objects can specify attachments 853Some classes such as deliantra maps and objects can specify attachments
692that are attached at load/instantiate time, thus the need for a name. 854that are attached at load/instantiate time, thus the need for a name.
693 855
694These calls expect any number of the following handler/hook descriptions: 856These calls expect any number of the following handler/hook descriptions:
695 857
696=over 4 858=over 4
820 982
821 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
822 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
823 985
824 } elsif (ref $type) { 986 } elsif (ref $type) {
825 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
826 988
827 } else { 989 } else {
828 shift @arg; 990 shift @arg;
829 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
830 } 992 }
831 } 993 }
832} 994}
833 995
834sub _object_attach { 996sub _object_attach {
844 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
845 } 1007 }
846 1008
847 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
848 } else { 1010 } else {
849 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
850 } 1012 }
851 1013
852 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
853} 1015}
854 1016
913 1075
914 for (@$callbacks) { 1076 for (@$callbacks) {
915 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
916 1078
917 if ($@) { 1079 if ($@) {
918 warn "$@";
919 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
920 override; 1081 override;
921 } 1082 }
922 1083
923 return 1 if $override; 1084 return 1 if $override;
924 } 1085 }
925 1086
926 0 1087 0
927} 1088}
928 1089
929=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1090=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930 1091
931=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1092=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932 1093
933Generate an object-specific event with the given arguments. 1094Generate an object-specific event with the given arguments.
934 1095
940 1101
941=cut 1102=cut
942 1103
943############################################################################# 1104#############################################################################
944# object support 1105# object support
945#
946 1106
1107sub _object_equal($$);
1108sub _object_equal($$) {
1109 my ($a, $b) = @_;
1110
1111 return 0 unless (ref $a) eq (ref $b);
1112
1113 if ("HASH" eq ref $a) {
1114 my @ka = keys %$a;
1115 my @kb = keys %$b;
1116
1117 return 0 if @ka != @kb;
1118
1119 for (0 .. $#ka) {
1120 return 0 unless $ka[$_] eq $kb[$_];
1121 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1122 }
1123
1124 } elsif ("ARRAY" eq ref $a) {
1125
1126 return 0 if @$a != @$b;
1127
1128 for (0 .. $#$a) {
1129 return 0 unless _object_equal $a->[$_], $b->[$_];
1130 }
1131
1132 } elsif ($a ne $b) {
1133 return 0;
1134 }
1135
1136 1
1137}
1138
1139our $SLOW_MERGES;#d#
947sub _can_merge { 1140sub _can_merge {
948 my ($ob1, $ob2) = @_; 1141 my ($ob1, $ob2) = @_;
949 1142
950 local $Storable::canonical = 1; 1143 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1144
954 $fob1 eq $fob2 1145 # we do the slow way here
1146 return _object_equal $ob1, $ob2
955} 1147}
956 1148
957sub reattach { 1149sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1150 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1151 my ($obj) = @_;
960 1152
1153 # no longer needed after getting rid of delete_package?
961 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1154 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
962 1155
963 my $registry = $obj->registry; 1156 my $registry = $obj->registry;
964 1157
965 @$registry = (); 1158 @$registry = ();
966 1159
971 for (@$attach) { 1164 for (@$attach) {
972 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
973 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
974 } 1167 }
975 } else { 1168 } else {
976 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
977 } 1170 }
978 } 1171 }
979} 1172}
980 1173
981cf::attachable->attach ( 1174cf::attachable->attach (
982 prio => -1000000, 1175 prio => -1000000,
983 on_instantiate => sub { 1176 on_instantiate => sub {
984 my ($obj, $data) = @_; 1177 my ($obj, $data) = @_;
985 1178
986 $data = from_json $data; 1179 $data = decode_json $data;
987 1180
988 for (@$data) { 1181 for (@$data) {
989 my ($name, $args) = @$_; 1182 my ($name, $args) = @$_;
990 1183
991 $obj->attach ($name, %{$args || {} }); 1184 $obj->attach ($name, %{$args || {} });
1005); 1198);
1006 1199
1007sub object_freezer_save { 1200sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1009 1202
1010 my $guard = cf::lock_acquire "io";
1011
1012 sync_job { 1203 sync_job {
1013 if (length $$rdata) { 1204 if (length $$rdata) {
1205 utf8::decode (my $decname = $filename);
1014 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1015 $filename, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1016 1209
1017 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1018 chmod SAVE_MODE, $fh; 1211 aio_chmod $fh, SAVE_MODE;
1019 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1020 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 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;
1215 aio_fsync $fh;
1216 }
1021 close $fh; 1217 aio_close $fh;
1022 1218
1023 if (@$objs) { 1219 if (@$objs) {
1024 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1220 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1025 chmod SAVE_MODE, $fh; 1221 aio_chmod $fh, SAVE_MODE;
1026 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1222 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1027 aio_write $fh, 0, (length $data), $data, 0; 1223 aio_write $fh, 0, (length $data), $data, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1224 if ($cf::USE_FSYNC) {
1225 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;
1226 aio_fsync $fh;
1227 }
1029 close $fh; 1228 aio_close $fh;
1030 aio_rename "$filename.pst~", "$filename.pst"; 1229 aio_rename "$filename.pst~", "$filename.pst";
1031 } 1230 }
1032 } else { 1231 } else {
1033 aio_unlink "$filename.pst"; 1232 aio_unlink "$filename.pst";
1034 } 1233 }
1035 1234
1036 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1236
1237 $filename =~ s%/[^/]+$%%;
1238 aio_pathsync $filename if $cf::USE_FSYNC;
1037 } else { 1239 } else {
1038 warn "FATAL: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1039 } 1241 }
1040 } else { 1242 } else {
1041 aio_unlink $filename; 1243 aio_unlink $filename;
1042 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1043 } 1245 }
1044 }; 1246 };
1045
1046 undef $guard;
1047} 1247}
1048 1248
1049sub object_freezer_as_string { 1249sub object_freezer_as_string {
1050 my ($rdata, $objs) = @_; 1250 my ($rdata, $objs) = @_;
1051 1251
1056 1256
1057sub object_thawer_load { 1257sub object_thawer_load {
1058 my ($filename) = @_; 1258 my ($filename) = @_;
1059 1259
1060 my ($data, $av); 1260 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
1063 1261
1064 (aio_load $filename, $data) >= 0 1262 (aio_load $filename, $data) >= 0
1065 or return; 1263 or return;
1066 1264
1067 unless (aio_stat "$filename.pst") { 1265 unless (aio_stat "$filename.pst") {
1068 (aio_load "$filename.pst", $av) >= 0 1266 (aio_load "$filename.pst", $av) >= 0
1069 or return; 1267 or return;
1070 1268
1071 undef $guard;
1072 $av = eval { (Storable::thaw $av)->{objs} }; 1269 my $st = eval { Coro::Storable::thaw $av };
1270 $av = $st->{objs};
1073 } 1271 }
1074 1272
1273 utf8::decode (my $decname = $filename);
1075 warn sprintf "loading %s (%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1076 $filename, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1077 1277
1078 ($data, $av) 1278 ($data, $av)
1079} 1279}
1080 1280
1081=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1137 my ($name, $cb) = @_; 1337 my ($name, $cb) = @_;
1138 1338
1139 $EXTICMD{$name} = $cb; 1339 $EXTICMD{$name} = $cb;
1140} 1340}
1141 1341
1342use File::Glob ();
1343
1142cf::player->attach ( 1344cf::player->attach (
1143 on_command => sub { 1345 on_unknown_command => sub {
1144 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1145 1347
1146 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1147 or return; 1349 or return;
1148 1350
1171 1373
1172 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1173 if $reply; 1375 if $reply;
1174 1376
1175 } else { 1377 } else {
1176 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1177 } 1379 }
1178 1380
1179 cf::override; 1381 cf::override;
1180 }, 1382 },
1181); 1383);
1182 1384
1385# "readahead" all extensions
1386sub cache_extensions {
1387 my $grp = IO::AIO::aio_group;
1388
1389 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1390 for (grep /\.ext$/, @{$_[0]}) {
1391 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1392 }
1393 };
1394
1395 $grp
1396}
1397
1183sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1184 cf::sync_job { 1401 cf::sync_job {
1185 my %todo; 1402 my %todo;
1186 1403
1187 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1188 next unless -r $path; 1405 next unless -r $path;
1206 1423
1207 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1208 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1209 1426
1210 $ext{source} = 1427 $ext{source} =
1211 "package $pkg; use strict; use utf8;\n" 1428 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1212 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1213 . $source 1430 . $source
1214 . "\n};\n1"; 1431 . "\n};\n1";
1215 1432
1216 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1217 } 1434 }
1218 1435
1436 my $pass = 0;
1219 my %done; 1437 my %done;
1220 while (%todo) { 1438 while (%todo) {
1221 my $progress; 1439 my $progress;
1222 1440
1441 ++$pass;
1442
1443 ext:
1223 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1224 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1225 goto skip 1446 next ext
1226 unless exists $done{$_}; 1447 unless exists $done{$_};
1227 } 1448 }
1228 1449
1229 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1230 1451
1231 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1232 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1233 : "$v->{base}: extension inactive.\n";
1234 1456
1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1235 if (exists $v->{meta}{mandatory}) { 1458 if exists $v->{meta}{mandatory};
1236 warn $msg; 1459
1237 warn "mandatory extension failed to load, exiting.\n"; 1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1238 exit 1; 1461 delete $todo{$k};
1239 } 1462 } else {
1240 1463 $done{$k} = delete $todo{$k};
1241 warn $msg; 1464 push @EXTS, $v->{pkg};
1465 $progress = 1;
1466
1467 info "$v->{base}: extension inactive.\n"
1468 unless $active;
1242 } 1469 }
1243
1244 $done{$k} = delete $todo{$k};
1245 push @EXTS, $v->{pkg};
1246 $progress = 1;
1247 } 1470 }
1248 1471
1249 skip: 1472 unless ($progress) {
1250 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1473 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1251 unless $progress; 1474
1475 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory};
1478 }
1479 }
1252 } 1480 }
1253 }; 1481 };
1254} 1482}
1255 1483
1256############################################################################# 1484#############################################################################
1257 1485
1258=back 1486=back
1259 1487
1260=head2 CORE EXTENSIONS 1488=head2 CORE EXTENSIONS
1261 1489
1262Functions and methods that extend core crossfire objects. 1490Functions and methods that extend core deliantra objects.
1263 1491
1264=cut 1492=cut
1265 1493
1266package cf::player; 1494package cf::player;
1267 1495
1268use Coro::AIO; 1496use Coro::AIO;
1269 1497
1270=head3 cf::player 1498=head3 cf::player
1271 1499
1272=over 4 1500=over 4
1501
1502=item cf::player::num_playing
1503
1504Returns the official number of playing players, as per the Crossfire metaserver rules.
1505
1506=cut
1507
1508sub num_playing {
1509 scalar grep
1510 $_->ob->map
1511 && !$_->hidden
1512 && !$_->ob->flag (cf::FLAG_WIZ),
1513 cf::player::list
1514}
1273 1515
1274=item cf::player::find $login 1516=item cf::player::find $login
1275 1517
1276Returns the given player object, loading it if necessary (might block). 1518Returns the given player object, loading it if necessary (might block).
1277 1519
1296 1538
1297sub exists($) { 1539sub exists($) {
1298 my ($login) = @_; 1540 my ($login) = @_;
1299 1541
1300 $cf::PLAYER{$login} 1542 $cf::PLAYER{$login}
1301 or cf::sync_job { !aio_stat path $login } 1543 or !aio_stat path $login
1302} 1544}
1303 1545
1304sub find($) { 1546sub find($) {
1305 return $cf::PLAYER{$_[0]} || do { 1547 return $cf::PLAYER{$_[0]} || do {
1306 my $login = $_[0]; 1548 my $login = $_[0];
1316 aio_unlink +(playerdir $login) . "/$login.pl"; 1558 aio_unlink +(playerdir $login) . "/$login.pl";
1317 1559
1318 my $f = new_from_file cf::object::thawer path $login 1560 my $f = new_from_file cf::object::thawer path $login
1319 or return; 1561 or return;
1320 1562
1321 $f->next;
1322 my $pl = cf::player::load_pl $f 1563 my $pl = cf::player::load_pl $f
1323 or return; 1564 or return;
1565
1324 local $cf::PLAYER_LOADING{$login} = $pl; 1566 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs; 1567 $f->resolve_delayed_derefs;
1326 $cf::PLAYER{$login} = $pl 1568 $cf::PLAYER{$login} = $pl
1327 } 1569 }
1328 } 1570 }
1329} 1571}
1330 1572
1573cf::player->attach (
1574 on_load => sub {
1575 my ($pl, $path) = @_;
1576
1577 # restore slots saved in save, below
1578 my $slots = delete $pl->{_slots};
1579
1580 $pl->ob->current_weapon ($slots->[0]);
1581 $pl->combat_ob ($slots->[1]);
1582 $pl->ranged_ob ($slots->[2]);
1583 },
1584);
1585
1331sub save($) { 1586sub save($) {
1332 my ($pl) = @_; 1587 my ($pl) = @_;
1333 1588
1334 return if $pl->{deny_save}; 1589 return if $pl->{deny_save};
1335 1590
1338 1593
1339 return if $pl->{deny_save}; 1594 return if $pl->{deny_save};
1340 1595
1341 aio_mkdir playerdir $pl, 0770; 1596 aio_mkdir playerdir $pl, 0770;
1342 $pl->{last_save} = $cf::RUNTIME; 1597 $pl->{last_save} = $cf::RUNTIME;
1598
1599 cf::get_slot 0.01;
1600
1601 # save slots, to be restored later
1602 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1343 1603
1344 $pl->save_pl ($path); 1604 $pl->save_pl ($path);
1345 cf::cede_to_tick; 1605 cf::cede_to_tick;
1346} 1606}
1347 1607
1379 my ($pl) = @_; 1639 my ($pl) = @_;
1380 1640
1381 my $name = $pl->ob->name; 1641 my $name = $pl->ob->name;
1382 1642
1383 $pl->{deny_save} = 1; 1643 $pl->{deny_save} = 1;
1384 $pl->password ("*"); # this should lock out the player until we nuked the dir 1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1385 1645
1386 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1387 $pl->deactivate; 1647 $pl->deactivate;
1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1388 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1389 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1390 1651
1391 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1392 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
1431 1692
1432 for my $login (@$dirs) { 1693 for my $login (@$dirs) {
1433 my $path = path $login; 1694 my $path = path $login;
1434 1695
1435 # a .pst is a dead give-away for a valid player 1696 # a .pst is a dead give-away for a valid player
1436 unless (-e "$path.pst") { 1697 # if no pst file found, open and chekc for blocked users
1698 if (aio_stat "$path.pst") {
1437 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1699 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1438 aio_read $fh, 0, 512, my $buf, 0 or next; 1700 aio_read $fh, 0, 512, my $buf, 0 or next;
1439 $buf !~ /^password -------------$/m or next; # official not-valid tag 1701 $buf !~ /^password -------------$/m or next; # official not-valid tag
1440 } 1702 }
1441 1703
1445 1707
1446 \@logins 1708 \@logins
1447} 1709}
1448 1710
1449=item $player->maps 1711=item $player->maps
1712
1713=item cf::player::maps $login
1450 1714
1451Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1452player. May block. 1716player. May block.
1453 1717
1454=cut 1718=cut
1472 } 1736 }
1473 1737
1474 \@paths 1738 \@paths
1475} 1739}
1476 1740
1477=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1741=item $protocol_xml = $player->expand_cfpod ($cfpod)
1478 1742
1479Expand crossfire pod fragments into protocol xml. 1743Expand deliantra pod fragments into protocol xml.
1480
1481=cut
1482
1483sub expand_cfpod {
1484 ((my $self), (local $_)) = @_;
1485
1486 # escape & and <
1487 s/&/&amp;/g;
1488 s/(?<![BIUGHT])</&lt;/g;
1489
1490 # this is buggy, it needs to properly take care of nested <'s
1491
1492 1 while
1493 # replace B<>, I<>, U<> etc.
1494 s/B<([^\>]*)>/<b>$1<\/b>/
1495 || s/I<([^\>]*)>/<i>$1<\/i>/
1496 || s/U<([^\>]*)>/<u>$1<\/u>/
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1498 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1
1501 }ge
1502 # replace H<hint text>
1503 || s{H<([^\>]*)>}
1504 {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "")
1508 [$self->{hintmode}]
1509 }ge;
1510
1511 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g;
1513
1514 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines
1519
1520 $_
1521}
1522
1523sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode}
1526}
1527 1744
1528=item $player->ext_reply ($msgid, @msg) 1745=item $player->ext_reply ($msgid, @msg)
1529 1746
1530Sends an ext reply to the player. 1747Sends an ext reply to the player.
1531 1748
1563 1780
1564=cut 1781=cut
1565 1782
1566sub find_by_path($) { 1783sub find_by_path($) {
1567 my ($path) = @_; 1784 my ($path) = @_;
1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1568 1787
1569 my ($match, $specificity); 1788 my ($match, $specificity);
1570 1789
1571 for my $region (list) { 1790 for my $region (list) {
1572 if ($region->{match} && $path =~ $region->{match}) { 1791 if ($region->{match} && $path =~ $region->{match}) {
1598our $MAX_RESET = 3600; 1817our $MAX_RESET = 3600;
1599our $DEFAULT_RESET = 3000; 1818our $DEFAULT_RESET = 3000;
1600 1819
1601sub generate_random_map { 1820sub generate_random_map {
1602 my ($self, $rmp) = @_; 1821 my ($self, $rmp) = @_;
1822
1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1824
1603 # mit "rum" bekleckern, nicht 1825 # mit "rum" bekleckern, nicht
1604 $self->_create_random_map ( 1826 $self->_create_random_map (
1605 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1606 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1607 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1608 $rmp->{exit_on_final_map}, 1830 $rmp->{exit_on_final_map},
1609 $rmp->{xsize}, $rmp->{ysize}, 1831 $rmp->{xsize}, $rmp->{ysize},
1610 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1611 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1633 1855
1634 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1635} 1857}
1636 1858
1637# also paths starting with '/' 1859# also paths starting with '/'
1638$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1639 1861
1640sub thawer_merge { 1862sub thawer_merge {
1641 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1642 1864
1643 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
1729 1951
1730# the temporary/swap location 1952# the temporary/swap location
1731sub save_path { 1953sub save_path {
1732 my ($self) = @_; 1954 my ($self) = @_;
1733 1955
1734 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1956 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1735 "$TMPDIR/$path.map" 1957 "$TMPDIR/$path.map"
1736} 1958}
1737 1959
1738# the unique path, undef == no special unique path 1960# the unique path, undef == no special unique path
1739sub uniq_path { 1961sub uniq_path {
1740 my ($self) = @_; 1962 my ($self) = @_;
1741 1963
1742 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1964 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1743 "$UNIQUEDIR/$path" 1965 "$UNIQUEDIR/$path"
1744}
1745
1746# and all this just because we cannot iterate over
1747# all maps in C++...
1748sub change_all_map_light {
1749 my ($change) = @_;
1750
1751 $_->change_map_light ($change)
1752 for grep $_->outdoor, values %cf::MAP;
1753} 1966}
1754 1967
1755sub decay_objects { 1968sub decay_objects {
1756 my ($self) = @_; 1969 my ($self) = @_;
1757 1970
1841sub find { 2054sub find {
1842 my ($path, $origin) = @_; 2055 my ($path, $origin) = @_;
1843 2056
1844 $path = normalise $path, $origin && $origin->path; 2057 $path = normalise $path, $origin && $origin->path;
1845 2058
2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1846 cf::lock_wait "map_find:$path"; 2060 my $guard2 = cf::lock_acquire "map_find:$path";
1847 2061
1848 $cf::MAP{$path} || do { 2062 $cf::MAP{$path} || do {
1849 my $guard = cf::lock_acquire "map_find:$path";
1850 my $map = new_from_path cf::map $path 2063 my $map = new_from_path cf::map $path
1851 or return; 2064 or return;
1852 2065
1853 $map->{last_save} = $cf::RUNTIME; 2066 $map->{last_save} = $cf::RUNTIME;
1854 2067
1856 or return; 2069 or return;
1857 2070
1858 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2071 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1859 # doing this can freeze the server in a sync job, obviously 2072 # doing this can freeze the server in a sync job, obviously
1860 #$cf::WAIT_FOR_TICK->wait; 2073 #$cf::WAIT_FOR_TICK->wait;
2074 undef $guard2;
2075 undef $guard1;
1861 $map->reset; 2076 $map->reset;
1862 undef $guard;
1863 return find $path; 2077 return find $path;
1864 } 2078 }
1865 2079
1866 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
1867 } 2081 }
1868} 2082}
1869 2083
1870sub pre_load { } 2084sub pre_load { }
1871sub post_load { } 2085#sub post_load { } # XS
1872 2086
1873sub load { 2087sub load {
1874 my ($self) = @_; 2088 my ($self) = @_;
1875 2089
1876 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
1877 2091
1878 my $path = $self->{path}; 2092 my $path = $self->{path};
1879 2093
1880 { 2094 {
1881 my $guard1 = cf::lock_acquire "map_data:$path"; 2095 my $guard = cf::lock_acquire "map_data:$path";
1882 my $guard2 = cf::lock_acquire "map_load:$path";
1883 2096
2097 return unless $self->valid;
1884 return if $self->in_memory != cf::MAP_SWAPPED; 2098 return unless $self->in_memory == cf::MAP_SWAPPED;
1885 2099
1886 $self->in_memory (cf::MAP_LOADING); 2100 $self->in_memory (cf::MAP_LOADING);
1887 2101
1888 $self->alloc; 2102 $self->alloc;
1889 2103
1893 my $f = new_from_file cf::object::thawer $self->{load_path}; 2107 my $f = new_from_file cf::object::thawer $self->{load_path};
1894 $f->skip_block; 2108 $f->skip_block;
1895 $self->_load_objects ($f) 2109 $self->_load_objects ($f)
1896 or return; 2110 or return;
1897 2111
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2112 $self->post_load_original
1899 if delete $self->{load_original}; 2113 if delete $self->{load_original};
1900 2114
1901 if (my $uniq = $self->uniq_path) { 2115 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 2116 utf8::encode $uniq;
1903 unless (aio_stat $uniq) { 2117 unless (aio_stat $uniq) {
1921 unless ($self->{deny_activate}) { 2135 unless ($self->{deny_activate}) {
1922 $self->decay_objects; 2136 $self->decay_objects;
1923 $self->fix_auto_apply; 2137 $self->fix_auto_apply;
1924 $self->update_buttons; 2138 $self->update_buttons;
1925 cf::cede_to_tick; 2139 cf::cede_to_tick;
1926 $self->set_darkness_map;
1927 cf::cede_to_tick;
1928 $self->activate; 2140 $self->activate;
1929 } 2141 }
1930 2142
1931 $self->{last_save} = $cf::RUNTIME; 2143 $self->{last_save} = $cf::RUNTIME;
1932 $self->last_access ($cf::RUNTIME); 2144 $self->last_access ($cf::RUNTIME);
1933 2145
1934 $self->in_memory (cf::MAP_IN_MEMORY); 2146 $self->in_memory (cf::MAP_ACTIVE);
1935 } 2147 }
1936 2148
1937 $self->post_load; 2149 $self->post_load;
1938} 2150}
1939 2151
2152# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath
1940sub customise_for { 2155sub customise_for {
1941 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
1942 2157
1943 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
1944 if $self->per_player; 2159 if $self->per_player;
1960 or next; 2175 or next;
1961 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
1962 or next; 2177 or next;
1963 $neigh->load; 2178 $neigh->load;
1964 2179
2180 # now find the diagonal neighbours
1965 push @neigh, 2181 push @neigh,
1966 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1967 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1968 } 2184 }
1969 2185
1976} 2192}
1977 2193
1978sub find_sync { 2194sub find_sync {
1979 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
1980 2196
1981 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
1982} 2201}
1983 2202
1984sub do_load_sync { 2203sub do_load_sync {
1985 my ($map) = @_; 2204 my ($map) = @_;
1986 2205
1987 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
1988 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
1989 2208
1990 cf::sync_job { $map->load }; 2209 $map->load;
1991} 2210}
1992 2211
1993our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
1995 2214
1997 my ($path, $origin, $load) = @_; 2216 my ($path, $origin, $load) = @_;
1998 2217
1999 $path = normalise $path, $origin && $origin->{path}; 2218 $path = normalise $path, $origin && $origin->{path};
2000 2219
2001 if (my $map = $cf::MAP{$path}) { 2220 if (my $map = $cf::MAP{$path}) {
2002 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2221 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2003 } 2222 }
2004 2223
2005 $MAP_PREFETCH{$path} |= $load; 2224 $MAP_PREFETCH{$path} |= $load;
2006 2225
2007 $MAP_PREFETCHER ||= cf::async { 2226 $MAP_PREFETCHER ||= cf::async {
2227 $Coro::current->{desc} = "map prefetcher";
2228
2008 while (%MAP_PREFETCH) { 2229 while (%MAP_PREFETCH) {
2009 while (my ($k, $v) = each %MAP_PREFETCH) { 2230 while (my ($k, $v) = each %MAP_PREFETCH) {
2010 if (my $map = find $k) { 2231 if (my $map = find $k) {
2011 $map->load if $v; 2232 $map->load if $v;
2012 } 2233 }
2019 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2020 2241
2021 () 2242 ()
2022} 2243}
2023 2244
2245# common code, used by both ->save and ->swapout
2024sub save { 2246sub _save {
2025 my ($self) = @_; 2247 my ($self) = @_;
2026
2027 my $lock = cf::lock_acquire "map_data:$self->{path}";
2028 2248
2029 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2030 2250
2031 return unless $self->dirty; 2251 return unless $self->dirty;
2032 2252
2038 return if $self->{deny_save}; 2258 return if $self->{deny_save};
2039 2259
2040 local $self->{last_access} = $self->last_access;#d# 2260 local $self->{last_access} = $self->last_access;#d#
2041 2261
2042 cf::async { 2262 cf::async {
2263 $Coro::current->{desc} = "map player save";
2043 $_->contr->save for $self->players; 2264 $_->contr->save for $self->players;
2044 }; 2265 };
2266
2267 cf::get_slot 0.02;
2045 2268
2046 if ($uniq) { 2269 if ($uniq) {
2047 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2270 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2048 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2271 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2049 } else { 2272 } else {
2050 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2273 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2051 } 2274 }
2052} 2275}
2053 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2054sub swap_out { 2285sub swap_out {
2055 my ($self) = @_; 2286 my ($self) = @_;
2056 2287
2057 # save first because save cedes
2058 $self->save;
2059
2060 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2061 2289
2290 return if $self->in_memory != cf::MAP_ACTIVE;
2291 return if $self->{deny_save};
2062 return if $self->players; 2292 return if $self->players;
2063 return if $self->in_memory != cf::MAP_IN_MEMORY;
2064 return if $self->{deny_save};
2065 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # then atomically save
2300 $self->_save;
2301
2302 # then free the map
2066 $self->clear; 2303 $self->clear;
2067 $self->in_memory (cf::MAP_SWAPPED);
2068} 2304}
2069 2305
2070sub reset_at { 2306sub reset_at {
2071 my ($self) = @_; 2307 my ($self) = @_;
2072 2308
2090 2326
2091 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2092 2328
2093 return if $self->players; 2329 return if $self->players;
2094 2330
2095 warn "resetting map ", $self->path; 2331 cf::trace "resetting map ", $self->path, "\n";
2096 2332
2097 $self->in_memory (cf::MAP_SWAPPED); 2333 $self->in_memory (cf::MAP_SWAPPED);
2098 2334
2099 # need to save uniques path 2335 # need to save uniques path
2100 unless ($self->{deny_save}) { 2336 unless ($self->{deny_save}) {
2104 if $uniq; 2340 if $uniq;
2105 } 2341 }
2106 2342
2107 delete $cf::MAP{$self->path}; 2343 delete $cf::MAP{$self->path};
2108 2344
2345 $self->deactivate;
2346 $_->clear_links_to ($self) for values %cf::MAP;
2109 $self->clear; 2347 $self->clear;
2110
2111 $_->clear_links_to ($self) for values %cf::MAP;
2112 2348
2113 $self->unlink_save; 2349 $self->unlink_save;
2114 $self->destroy; 2350 $self->destroy;
2115} 2351}
2116 2352
2124 2360
2125 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2126 2362
2127 $self->unlink_save; 2363 $self->unlink_save;
2128 2364
2129 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2130 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2131 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2132 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2133 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2134 2370
2183 2419
2184sub unique_maps() { 2420sub unique_maps() {
2185 [ 2421 [
2186 map { 2422 map {
2187 utf8::decode $_; 2423 utf8::decode $_;
2188 /\.map$/ 2424 s/\.map$//; # TODO future compatibility hack
2425 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2426 ? ()
2189 ? normalise $_ 2427 : normalise $_
2190 : ()
2191 } @{ aio_readdir $UNIQUEDIR or [] } 2428 } @{ aio_readdir $UNIQUEDIR or [] }
2192 ] 2429 ]
2193} 2430}
2194 2431
2195package cf; 2432=item cf::map::static_maps
2433
2434Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2435file in the shared directory excluding F</styles> and F</editor>). May
2436block.
2437
2438=cut
2439
2440sub static_maps() {
2441 my @dirs = "";
2442 my @maps;
2443
2444 while (@dirs) {
2445 my $dir = shift @dirs;
2446
2447 next if $dir eq "/styles" || $dir eq "/editor";
2448
2449 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2450 or return;
2451
2452 for (@$files) {
2453 s/\.map$// or next;
2454 utf8::decode $_;
2455 push @maps, "$dir/$_";
2456 }
2457
2458 push @dirs, map "$dir/$_", @$dirs;
2459 }
2460
2461 \@maps
2462}
2196 2463
2197=back 2464=back
2198 2465
2199=head3 cf::object 2466=head3 cf::object
2200 2467
2204 2471
2205=over 4 2472=over 4
2206 2473
2207=item $ob->inv_recursive 2474=item $ob->inv_recursive
2208 2475
2209Returns the inventory of the object _and_ their inventories, recursively. 2476Returns the inventory of the object I<and> their inventories, recursively,
2477but I<not> the object itself.
2210 2478
2211=cut 2479=cut
2212 2480
2213sub inv_recursive_; 2481sub inv_recursive_;
2214sub inv_recursive_ { 2482sub inv_recursive_ {
2219 inv_recursive_ inv $_[0] 2487 inv_recursive_ inv $_[0]
2220} 2488}
2221 2489
2222=item $ref = $ob->ref 2490=item $ref = $ob->ref
2223 2491
2224creates and returns a persistent reference to an objetc that can be stored as a string. 2492Creates and returns a persistent reference to an object that can be stored as a string.
2225 2493
2226=item $ob = cf::object::deref ($refstring) 2494=item $ob = cf::object::deref ($refstring)
2227 2495
2228returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2496returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2229even if the object actually exists. May block. 2497even if the object actually exists. May block.
2231=cut 2499=cut
2232 2500
2233sub deref { 2501sub deref {
2234 my ($ref) = @_; 2502 my ($ref) = @_;
2235 2503
2236 # temporary compatibility#TODO#remove
2237 $ref =~ s{^<}{player/<};
2238
2239 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2504 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2240 my ($uuid, $name) = ($1, $2); 2505 my ($uuid, $name) = ($1, $2);
2241 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2506 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2242 or return; 2507 or return;
2243 $pl->ob->uuid eq $uuid 2508 $pl->ob->uuid eq $uuid
2244 or return; 2509 or return;
2264can be C<undef>. Does the right thing when the player is currently in a 2529can be C<undef>. Does the right thing when the player is currently in a
2265dialogue with the given NPC character. 2530dialogue with the given NPC character.
2266 2531
2267=cut 2532=cut
2268 2533
2534our $SAY_CHANNEL = {
2535 id => "say",
2536 title => "Map",
2537 reply => "say ",
2538 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2539};
2540
2541our $CHAT_CHANNEL = {
2542 id => "chat",
2543 title => "Chat",
2544 reply => "chat ",
2545 tooltip => "Player chat and shouts, global to the server.",
2546};
2547
2269# rough implementation of a future "reply" method that works 2548# rough implementation of a future "reply" method that works
2270# with dialog boxes. 2549# with dialog boxes.
2271#TODO: the first argument must go, split into a $npc->reply_to ( method 2550#TODO: the first argument must go, split into a $npc->reply_to ( method
2272sub cf::object::player::reply($$$;$) { 2551sub cf::object::player::reply($$$;$) {
2273 my ($self, $npc, $msg, $flags) = @_; 2552 my ($self, $npc, $msg, $flags) = @_;
2284 my $dialog = $pl->{npc_dialog}; 2563 my $dialog = $pl->{npc_dialog};
2285 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2564 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2286 2565
2287 } else { 2566 } else {
2288 $msg = $npc->name . " says: $msg" if $npc; 2567 $msg = $npc->name . " says: $msg" if $npc;
2289 $self->message ($msg, $flags); 2568 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2290 } 2569 }
2291 } 2570 }
2292} 2571}
2293 2572
2294=item $object->send_msg ($channel, $msg, $color, [extra...]) 2573=item $object->send_msg ($channel, $msg, $color, [extra...])
2319 2598
2320=item $player_object->enter_link 2599=item $player_object->enter_link
2321 2600
2322Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2323 2602
2324The player should be reasonably safe there for short amounts of time. You 2603The player should be reasonably safe there for short amounts of time (e.g.
2325I<MUST> call C<leave_link> as soon as possible, though. 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2605though, as the player cannot control the character while it is on the link
2606map.
2326 2607
2327Will never block. 2608Will never block.
2328 2609
2329=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
2330 2611
2350sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2351 my ($self) = @_; 2632 my ($self) = @_;
2352 2633
2353 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2354 2635
2636 ++$self->{_link_recursion};
2637
2355 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2356 2639
2357 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2358 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2359 2642
2360 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2361} 2644}
2362 2645
2363sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2364 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2365 2648
2382 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
2383 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
2384 2667
2385 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
2386 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
2387 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
2388 2671
2389 $map->load; 2672 $map->load;
2390 $map->load_neighbours; 2673 $map->load_neighbours;
2391 2674
2392 return unless $self->contr->active; 2675 return unless $self->contr->active;
2393 $self->activate_recursive;
2394 2676
2395 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2396 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2397} 2679 # entering was successful
2680 delete $self->{_link_recursion};
2681 # only activate afterwards, to support waiting in hooks
2682 $self->activate_recursive;
2683 }
2398 2684
2685}
2686
2399=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2400 2688
2401Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2402her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2403that has to return the map if sucecssful, and then unfreezes the player on 2691that has to return the map if sucecssful, and then unfreezes the player on
2404the new (success) or old (failed) map position. In either case, $done will 2692the new (success) or old (failed) map position. In either case, $done will
2405be called at the end of this process. 2693be called at the end of this process.
2406 2694
2695Note that $check will be called with a potentially non-loaded map, so if
2696it needs a loaded map it has to call C<< ->load >>.
2697
2407=cut 2698=cut
2408 2699
2409our $GOTOGEN; 2700our $GOTOGEN;
2410 2701
2411sub cf::object::player::goto { 2702sub cf::object::player::goto {
2412 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2413 2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2710
2414 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
2415 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2416 2713
2417 $self->enter_link; 2714 $self->enter_link;
2418 2715
2419 (async { 2716 (async {
2717 $Coro::current->{desc} = "player::goto $path $x $y";
2718
2719 # *tag paths override both path and x|y
2720 if ($path =~ /^\*(.*)$/) {
2721 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2722 my $ob = $obs[rand @obs];
2723
2724 # see if we actually can go there
2725 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2726 $ob = $obs[rand @obs];
2727 } else {
2728 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2729 }
2730 # else put us there anyways for now #d#
2731
2732 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2733 } else {
2734 ($path, $x, $y) = (undef, undef, undef);
2735 }
2736 }
2737
2420 my $map = eval { 2738 my $map = eval {
2421 my $map = cf::map::find $path; 2739 my $map = defined $path ? cf::map::find $path : undef;
2422 2740
2423 if ($map) { 2741 if ($map) {
2424 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2425 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2426 } else { 2744 } else {
2427 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2428 } 2746 }
2429 2747
2430 $map 2748 $map
2431 }; 2749 };
2432 2750
2438 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2439 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2440 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2441 } 2759 }
2442 2760
2443 $done->() if $done; 2761 $done->($self) if $done;
2444 })->prio (1); 2762 })->prio (1);
2445} 2763}
2446 2764
2447=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2448 2766
2468} 2786}
2469 2787
2470sub prepare_random_map { 2788sub prepare_random_map {
2471 my ($exit) = @_; 2789 my ($exit) = @_;
2472 2790
2473 my $guard = cf::lock_acquire "exit_prepare:$exit";
2474
2475 # all this does is basically replace the /! path by 2791 # all this does is basically replace the /! path by
2476 # a new random map path (?random/...) with a seed 2792 # a new random map path (?random/...) with a seed
2477 # that depends on the exit object 2793 # that depends on the exit object
2478 2794
2479 my $rmp = parse_random_map_params $exit->msg; 2795 my $rmp = parse_random_map_params $exit->msg;
2481 if ($exit->map) { 2797 if ($exit->map) {
2482 $rmp->{region} = $exit->region->name; 2798 $rmp->{region} = $exit->region->name;
2483 $rmp->{origin_map} = $exit->map->path; 2799 $rmp->{origin_map} = $exit->map->path;
2484 $rmp->{origin_x} = $exit->x; 2800 $rmp->{origin_x} = $exit->x;
2485 $rmp->{origin_y} = $exit->y; 2801 $rmp->{origin_y} = $exit->y;
2802
2803 $exit->map->touch;
2486 } 2804 }
2487 2805
2488 $rmp->{random_seed} ||= $exit->random_seed; 2806 $rmp->{random_seed} ||= $exit->random_seed;
2489 2807
2490 my $data = cf::to_json $rmp; 2808 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2491 my $md5 = Digest::MD5::md5_hex $data; 2809 my $md5 = Digest::MD5::md5_hex $data;
2492 my $meta = "$RANDOMDIR/$md5.meta"; 2810 my $meta = "$RANDOMDIR/$md5.meta";
2493 2811
2494 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2812 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2495 aio_write $fh, 0, (length $data), $data, 0; 2813 aio_write $fh, 0, (length $data), $data, 0;
2496 undef $fh; 2814 undef $fh;
2497 aio_rename "$meta~", $meta; 2815 aio_rename "$meta~", $meta;
2498 2816
2817 my $slaying = "?random/$md5";
2818
2819 if ($exit->valid) {
2499 $exit->slaying ("?random/$md5"); 2820 $exit->slaying ("?random/$md5");
2500 $exit->msg (undef); 2821 $exit->msg (undef);
2822 }
2501 } 2823 }
2502} 2824}
2503 2825
2504sub cf::object::player::enter_exit { 2826sub cf::object::player::enter_exit {
2505 my ($self, $exit) = @_; 2827 my ($self, $exit) = @_;
2506 2828
2507 return unless $self->type == cf::PLAYER; 2829 return unless $self->type == cf::PLAYER;
2508 2830
2509 if ($exit->slaying eq "/!") {
2510 #TODO: this should de-fi-ni-te-ly not be a sync-job
2511 # the problem is that $exit might not survive long enough
2512 # so it needs to be done right now, right here
2513 cf::sync_job { prepare_random_map $exit };
2514 }
2515
2516 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2517 my $hp = $exit->stats->hp;
2518 my $sp = $exit->stats->sp;
2519
2520 $self->enter_link; 2831 $self->enter_link;
2521 2832
2522 # if exit is damned, update players death & WoR home-position
2523 $self->contr->savebed ($slaying, $hp, $sp)
2524 if $exit->flag (FLAG_DAMNED);
2525
2526 (async { 2833 (async {
2527 $self->deactivate_recursive; # just to be sure 2834 $Coro::current->{desc} = "enter_exit";
2835
2528 unless (eval { 2836 unless (eval {
2837 $self->deactivate_recursive; # just to be sure
2838
2839 # random map handling
2840 {
2841 my $guard = cf::lock_acquire "exit_prepare:$exit";
2842
2843 prepare_random_map $exit
2844 if $exit->slaying eq "/!";
2845 }
2846
2847 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2848 my $x = $exit->stats->hp;
2849 my $y = $exit->stats->sp;
2850
2529 $self->goto ($slaying, $hp, $sp); 2851 $self->goto ($map, $x, $y);
2530 2852
2853 # if exit is damned, update players death & WoR home-position
2854 $self->contr->savebed ($map, $x, $y)
2855 if $exit->flag (cf::FLAG_DAMNED);
2856
2531 1; 2857 1
2532 }) { 2858 }) {
2533 $self->message ("Something went wrong deep within the crossfire server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2534 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2535 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2536 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2537 2863
2538 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2539 $self->leave_link; 2865 $self->leave_link;
2540 } 2866 }
2541 })->prio (1); 2867 })->prio (1);
2542} 2868}
2543 2869
2555sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2556 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2557 2883
2558 utf8::encode $text; 2884 utf8::encode $text;
2559 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2885 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2886}
2887
2888=item $client->send_big_packet ($pkt)
2889
2890Like C<send_packet>, but tries to compress large packets, and fragments
2891them as required.
2892
2893=cut
2894
2895our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2896
2897sub cf::client::send_big_packet {
2898 my ($self, $pkt) = @_;
2899
2900 # try lzf for large packets
2901 $pkt = "lzf " . Compress::LZF::compress $pkt
2902 if 1024 <= length $pkt and $self->{can_lzf};
2903
2904 # split very large packets
2905 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2906 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2907 $pkt = "frag";
2908 }
2909
2910 $self->send_packet ($pkt);
2560} 2911}
2561 2912
2562=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2563 2914
2564Send a drawinfo or msg packet to the client, formatting the msg for the 2915Send a drawinfo or msg packet to the client, formatting the msg for the
2566the message, with C<log> being the default. If C<$color> is negative, suppress 2917the message, with C<log> being the default. If C<$color> is negative, suppress
2567the message unless the client supports the msg packet. 2918the message unless the client supports the msg packet.
2568 2919
2569=cut 2920=cut
2570 2921
2922# non-persistent channels (usually the info channel)
2571our %CHANNEL = ( 2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2572 "c/identify" => { 2930 "c/identify" => {
2573 id => "identify", 2931 id => "infobox",
2574 title => "Identify", 2932 title => "Identify",
2575 reply => undef, 2933 reply => undef,
2576 tooltip => "Items recently identified", 2934 tooltip => "Items recently identified",
2577 }, 2935 },
2578 "c/examine" => { 2936 "c/examine" => {
2579 id => "examine", 2937 id => "infobox",
2580 title => "Examine", 2938 title => "Examine",
2581 reply => undef, 2939 reply => undef,
2582 tooltip => "Signs and other items you examined", 2940 tooltip => "Signs and other items you examined",
2583 }, 2941 },
2942 "c/shopinfo" => {
2943 id => "infobox",
2944 title => "Shop Info",
2945 reply => undef,
2946 tooltip => "What your bargaining skill tells you about the shop",
2947 },
2948 "c/book" => {
2949 id => "infobox",
2950 title => "Book",
2951 reply => undef,
2952 tooltip => "The contents of a note or book",
2953 },
2954 "c/lookat" => {
2955 id => "infobox",
2956 title => "Look",
2957 reply => undef,
2958 tooltip => "What you saw there",
2959 },
2960 "c/who" => {
2961 id => "infobox",
2962 title => "Players",
2963 reply => undef,
2964 tooltip => "Shows players who are currently online",
2965 },
2966 "c/body" => {
2967 id => "infobox",
2968 title => "Body Parts",
2969 reply => undef,
2970 tooltip => "Shows which body parts you posess and are available",
2971 },
2972 "c/statistics" => {
2973 id => "infobox",
2974 title => "Statistics",
2975 reply => undef,
2976 tooltip => "Shows your primary statistics",
2977 },
2978 "c/skills" => {
2979 id => "infobox",
2980 title => "Skills",
2981 reply => undef,
2982 tooltip => "Shows your experience per skill and item power",
2983 },
2984 "c/shopitems" => {
2985 id => "infobox",
2986 title => "Shop Items",
2987 reply => undef,
2988 tooltip => "Shows the items currently for sale in this shop",
2989 },
2990 "c/resistances" => {
2991 id => "infobox",
2992 title => "Resistances",
2993 reply => undef,
2994 tooltip => "Shows your resistances",
2995 },
2996 "c/pets" => {
2997 id => "infobox",
2998 title => "Pets",
2999 reply => undef,
3000 tooltip => "Shows information abotu your pets/a specific pet",
3001 },
3002 "c/perceiveself" => {
3003 id => "infobox",
3004 title => "Perceive Self",
3005 reply => undef,
3006 tooltip => "You gained detailed knowledge about yourself",
3007 },
3008 "c/uptime" => {
3009 id => "infobox",
3010 title => "Uptime",
3011 reply => undef,
3012 tooltip => "How long the server has been running since last restart",
3013 },
3014 "c/mapinfo" => {
3015 id => "infobox",
3016 title => "Map Info",
3017 reply => undef,
3018 tooltip => "Information related to the maps",
3019 },
3020 "c/party" => {
3021 id => "party",
3022 title => "Party",
3023 reply => "gsay ",
3024 tooltip => "Messages and chat related to your party",
3025 },
3026 "c/death" => {
3027 id => "death",
3028 title => "Death",
3029 reply => undef,
3030 tooltip => "Reason for and more info about your most recent death",
3031 },
3032 "c/say" => $SAY_CHANNEL,
3033 "c/chat" => $CHAT_CHANNEL,
2584); 3034);
2585 3035
2586sub cf::client::send_msg { 3036sub cf::client::send_msg {
2587 my ($self, $channel, $msg, $color, @extra) = @_; 3037 my ($self, $channel, $msg, $color, @extra) = @_;
2588 3038
2589 $msg = $self->pl->expand_cfpod ($msg); 3039 $msg = $self->pl->expand_cfpod ($msg)
3040 unless $color & cf::NDI_VERBATIM;
2590 3041
2591 $color &= cf::NDI_CLIENT_MASK; # just in case... 3042 $color &= cf::NDI_CLIENT_MASK; # just in case...
2592 3043
2593 # check predefined channels, for the benefit of C 3044 # check predefined channels, for the benefit of C
2594 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3045 if ($CHANNEL{$channel}) {
3046 $channel = $CHANNEL{$channel};
2595 3047
3048 $self->ext_msg (channel_info => $channel);
3049 $channel = $channel->{id};
3050
2596 if (ref $channel) { 3051 } elsif (ref $channel) {
2597 # send meta info to client, if not yet sent 3052 # send meta info to client, if not yet sent
2598 unless (exists $self->{channel}{$channel->{id}}) { 3053 unless (exists $self->{channel}{$channel->{id}}) {
2599 $self->{channel}{$channel->{id}} = $channel; 3054 $self->{channel}{$channel->{id}} = $channel;
2600 $self->ext_msg (channel_info => $channel) 3055 $self->ext_msg (channel_info => $channel);
2601 if $self->can_msg;
2602 } 3056 }
2603 3057
2604 $channel = $channel->{id}; 3058 $channel = $channel->{id};
2605 } 3059 }
2606 3060
2607 return unless @extra || length $msg; 3061 return unless @extra || length $msg;
2608 3062
2609 if ($self->can_msg) {
2610 # default colour, mask it out 3063 # default colour, mask it out
2611 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3064 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2612 if $color & cf::NDI_DEF; 3065 if $color & cf::NDI_DEF;
2613 3066
2614 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3067 my $pkt = "msg "
3068 . $self->{json_coder}->encode (
2615 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2616 } else { 3070 );
2617 if ($color >= 0) {
2618 # replace some tags by gcfclient-compatible ones
2619 for ($msg) {
2620 1 while
2621 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2622 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2623 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2624 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2625 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2626 }
2627 3071
2628 $color &= cf::NDI_COLOR_MASK; 3072 $self->send_big_packet ($pkt);
2629
2630 utf8::encode $msg;
2631
2632 if (0 && $msg =~ /\[/) {
2633 # COMMAND/INFO
2634 $self->send_packet ("drawextinfo $color 10 8 $msg")
2635 } else {
2636 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2637 $self->send_packet ("drawinfo $color $msg")
2638 }
2639 }
2640 }
2641} 3073}
2642 3074
2643=item $client->ext_msg ($type, @msg) 3075=item $client->ext_msg ($type, @msg)
2644 3076
2645Sends an ext event to the client. 3077Sends an ext event to the client.
2648 3080
2649sub cf::client::ext_msg($$@) { 3081sub cf::client::ext_msg($$@) {
2650 my ($self, $type, @msg) = @_; 3082 my ($self, $type, @msg) = @_;
2651 3083
2652 if ($self->extcmd == 2) { 3084 if ($self->extcmd == 2) {
2653 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2654 } elsif ($self->extcmd == 1) { # TODO: remove 3086 } elsif ($self->extcmd == 1) { # TODO: remove
2655 push @msg, msgtype => "event_$type"; 3087 push @msg, msgtype => "event_$type";
2656 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2657 } 3089 }
2658} 3090}
2659 3091
2660=item $client->ext_reply ($msgid, @msg) 3092=item $client->ext_reply ($msgid, @msg)
2661 3093
2665 3097
2666sub cf::client::ext_reply($$@) { 3098sub cf::client::ext_reply($$@) {
2667 my ($self, $id, @msg) = @_; 3099 my ($self, $id, @msg) = @_;
2668 3100
2669 if ($self->extcmd == 2) { 3101 if ($self->extcmd == 2) {
2670 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2671 } elsif ($self->extcmd == 1) { 3103 } elsif ($self->extcmd == 1) {
2672 #TODO: version 1, remove 3104 #TODO: version 1, remove
2673 unshift @msg, msgtype => "reply", msgid => $id; 3105 unshift @msg, msgtype => "reply", msgid => $id;
2674 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2675 } 3107 }
2676} 3108}
2677 3109
2678=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2679 3111
2750 3182
2751 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
2752 if $reply; 3184 if $reply;
2753 3185
2754 } else { 3186 } else {
2755 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2756 } 3188 }
2757 3189
2758 cf::override; 3190 cf::override;
2759 }, 3191 },
2760); 3192);
2780 3212
2781 $coro 3213 $coro
2782} 3214}
2783 3215
2784cf::client->attach ( 3216cf::client->attach (
2785 on_destroy => sub { 3217 on_client_destroy => sub {
2786 my ($ns) = @_; 3218 my ($ns) = @_;
2787 3219
2788 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2789 }, 3221 },
2790); 3222);
2806our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
2807 3239
2808$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
2809 3241
2810$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
2811 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
2812 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
2813 sort time 3245 sort time
2814)); 3246));
2815 3247
2816# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
2818=pod 3250=pod
2819 3251
2820The following functions and methods are available within a safe environment: 3252The following functions and methods are available within a safe environment:
2821 3253
2822 cf::object 3254 cf::object
2823 contr pay_amount pay_player map x y force_find force_add 3255 contr pay_amount pay_player map x y force_find force_add destroy
2824 insert remove name archname title slaying race decrease_ob_nr 3256 insert remove name archname title slaying race decrease split
3257 value
2825 3258
2826 cf::object::player 3259 cf::object::player
2827 player 3260 player
2828 3261
2829 cf::player 3262 cf::player
2834 3267
2835=cut 3268=cut
2836 3269
2837for ( 3270for (
2838 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3271 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2839 insert remove inv name archname title slaying race 3272 insert remove inv nrof name archname title slaying race
2840 decrease_ob_nr)], 3273 decrease split destroy change_exp value msg lore send_msg)],
2841 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
2842 ["cf::player" => qw(peaceful)], 3275 ["cf::player" => qw(peaceful send_msg)],
2843 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
2844) { 3277) {
2845 no strict 'refs'; 3278 no strict 'refs';
2846 my ($pkg, @funs) = @$_; 3279 my ($pkg, @funs) = @$_;
2847 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3280 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2865 3298
2866 my $qcode = $code; 3299 my $qcode = $code;
2867 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3300 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2868 $qcode =~ s/\n/\\n/g; 3301 $qcode =~ s/\n/\\n/g;
2869 3302
3303 %vars = (_dummy => 0) unless %vars;
3304
3305 my @res;
2870 local $_; 3306 local $_;
2871 local @safe::cf::_safe_eval_args = values %vars;
2872 3307
2873 my $eval = 3308 my $eval =
2874 "do {\n" 3309 "do {\n"
2875 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3310 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2876 . "#line 0 \"{$qcode}\"\n" 3311 . "#line 0 \"{$qcode}\"\n"
2877 . $code 3312 . $code
2878 . "\n}" 3313 . "\n}"
2879 ; 3314 ;
2880 3315
3316 if ($CFG{safe_eval}) {
2881 sub_generation_inc; 3317 sub_generation_inc;
3318 local @safe::cf::_safe_eval_args = values %vars;
2882 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3319 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2883 sub_generation_inc; 3320 sub_generation_inc;
3321 } else {
3322 local @cf::_safe_eval_args = values %vars;
3323 @res = wantarray ? eval eval : scalar eval $eval;
3324 }
2884 3325
2885 if ($@) { 3326 if ($@) {
2886 warn "$@"; 3327 warn "$@",
2887 warn "while executing safe code '$code'\n"; 3328 "while executing safe code '$code'\n",
2888 warn "with arguments " . (join " ", %vars) . "\n"; 3329 "with arguments " . (join " ", %vars) . "\n";
2889 } 3330 }
2890 3331
2891 wantarray ? @res : $res[0] 3332 wantarray ? @res : $res[0]
2892} 3333}
2893 3334
2907=cut 3348=cut
2908 3349
2909sub register_script_function { 3350sub register_script_function {
2910 my ($fun, $cb) = @_; 3351 my ($fun, $cb) = @_;
2911 3352
2912 no strict 'refs'; 3353 $fun = "safe::$fun" if $CFG{safe_eval};
2913 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3354 *$fun = $safe_hole->wrap ($cb);
2914} 3355}
2915 3356
2916=back 3357=back
2917 3358
2918=cut 3359=cut
2927 # for this (global event?) 3368 # for this (global event?)
2928 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
2929 3370
2930 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3371 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2931 3372
2932 warn "loading facedata from $path\n"; 3373 trace "loading facedata from $path\n";
2933 3374
2934 my $facedata; 3375 my $facedata;
2935 0 < aio_load $path, $facedata 3376 0 < aio_load $path, $facedata
2936 or die "$path: $!"; 3377 or die "$path: $!";
2937 3378
2939 3380
2940 $facedata->{version} == 2 3381 $facedata->{version} == 2
2941 or cf::cleanup "$path: version mismatch, cannot proceed."; 3382 or cf::cleanup "$path: version mismatch, cannot proceed.";
2942 3383
2943 # patch in the exptable 3384 # patch in the exptable
3385 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2944 $facedata->{resource}{"res/exp_table"} = { 3386 $facedata->{resource}{"res/exp_table"} = {
2945 type => FT_RSRC, 3387 type => FT_RSRC,
2946 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3388 data => $exp_table,
3389 hash => (Digest::MD5::md5 $exp_table),
2947 }; 3390 };
2948 cf::cede_to_tick; 3391 cf::cede_to_tick;
2949 3392
2950 { 3393 {
2951 my $faces = $facedata->{faceinfo}; 3394 my $faces = $facedata->{faceinfo};
2952 3395
2953 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
2954 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3397 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3398
2955 cf::face::set_visibility $idx, $info->{visibility}; 3399 cf::face::set_visibility $idx, $info->{visibility};
2956 cf::face::set_magicmap $idx, $info->{magicmap}; 3400 cf::face::set_magicmap $idx, $info->{magicmap};
2957 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2958 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2959 3403
2960 cf::cede_to_tick; 3404 cf::cede_to_tick;
2961 } 3405 }
2962 3406
2963 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
2964 next unless $info->{smooth}; 3408 next unless $info->{smooth};
3409
2965 my $idx = cf::face::find $face 3410 my $idx = cf::face::find $face
2966 or next; 3411 or next;
3412
2967 if (my $smooth = cf::face::find $info->{smooth}) { 3413 if (my $smooth = cf::face::find $info->{smooth}) {
2968 cf::face::set_smooth $idx, $smooth; 3414 cf::face::set_smooth $idx, $smooth;
2969 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3415 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2970 } else { 3416 } else {
2971 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3417 error "smooth face '$info->{smooth}' not found for face '$face'";
2972 } 3418 }
2973 3419
2974 cf::cede_to_tick; 3420 cf::cede_to_tick;
2975 } 3421 }
2976 } 3422 }
2985 3431
2986 cf::anim::invalidate_all; # d'oh 3432 cf::anim::invalidate_all; # d'oh
2987 } 3433 }
2988 3434
2989 { 3435 {
2990 # TODO: for gcfclient pleasure, we should give resources
2991 # that gcfclient doesn't grok a >10000 face index.
2992 my $res = $facedata->{resource}; 3436 my $res = $facedata->{resource};
2993 3437
2994 my $soundconf = delete $res->{"res/sound.conf"};
2995
2996 while (my ($name, $info) = each %$res) { 3438 while (my ($name, $info) = each %$res) {
3439 if (defined $info->{type}) {
2997 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3440 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2998 my $data;
2999 3441
3000 if ($info->{type} & 1) { 3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3001 # prepend meta info 3443 cf::face::set_type $idx, $info->{type};
3002
3003 my $meta = $enc->encode ({
3004 name => $name,
3005 %{ $info->{meta} || {} },
3006 });
3007
3008 $data = pack "(w/a*)*", $meta, $info->{data};
3009 } else { 3444 } else {
3010 $data = $info->{data}; 3445 $RESOURCE{$name} = $info; # unused
3011 } 3446 }
3012 3447
3013 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3014 cf::face::set_type $idx, $info->{type};
3015
3016 cf::cede_to_tick; 3448 cf::cede_to_tick;
3017 } 3449 }
3018
3019 if ($soundconf) {
3020 $soundconf = $enc->decode (delete $soundconf->{data});
3021
3022 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3023 my $sound = $soundconf->{compat}[$_]
3024 or next;
3025
3026 my $face = cf::face::find "sound/$sound->[1]";
3027 cf::sound::set $sound->[0] => $face;
3028 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3029 }
3030
3031 while (my ($k, $v) = each %{$soundconf->{event}}) {
3032 my $face = cf::face::find "sound/$v";
3033 cf::sound::set $k => $face;
3034 }
3035 }
3036 } 3450 }
3451
3452 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3037 3453
3038 1 3454 1
3039} 3455}
3040 3456
3041register_exticmd fx_want => sub { 3457register_exticmd fx_want => sub {
3043 3459
3044 while (my ($k, $v) = each %$want) { 3460 while (my ($k, $v) = each %$want) {
3045 $ns->fx_want ($k, $v); 3461 $ns->fx_want ($k, $v);
3046 } 3462 }
3047}; 3463};
3464
3465sub load_resource_file($) {
3466 my $guard = lock_acquire "load_resource_file";
3467
3468 my $status = load_resource_file_ $_[0];
3469 get_slot 0.1, 100;
3470 cf::arch::commit_load;
3471
3472 $status
3473}
3048 3474
3049sub reload_regions { 3475sub reload_regions {
3050 # HACK to clear player env face cache, we need some signal framework 3476 # HACK to clear player env face cache, we need some signal framework
3051 # for this (global event?) 3477 # for this (global event?)
3052 %ext::player_env::MUSIC_FACE_CACHE = (); 3478 %ext::player_env::MUSIC_FACE_CACHE = ();
3066} 3492}
3067 3493
3068sub reload_archetypes { 3494sub reload_archetypes {
3069 load_resource_file "$DATADIR/archetypes" 3495 load_resource_file "$DATADIR/archetypes"
3070 or die "unable to load archetypes\n"; 3496 or die "unable to load archetypes\n";
3071 #d# NEED to laod twice to resolve forward references
3072 # this really needs to be done in an extra post-pass
3073 # (which needs to be synchronous, so solve it differently)
3074 load_resource_file "$DATADIR/archetypes"
3075 or die "unable to load archetypes\n";
3076} 3497}
3077 3498
3078sub reload_treasures { 3499sub reload_treasures {
3079 load_resource_file "$DATADIR/treasures" 3500 load_resource_file "$DATADIR/treasures"
3080 or die "unable to load treasurelists\n"; 3501 or die "unable to load treasurelists\n";
3081} 3502}
3082 3503
3504sub reload_sound {
3505 trace "loading sound config from $DATADIR/sound\n";
3506
3507 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3508 or die "$DATADIR/sound $!";
3509
3510 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3511
3512 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3513 my $sound = $soundconf->{compat}[$_]
3514 or next;
3515
3516 my $face = cf::face::find "sound/$sound->[1]";
3517 cf::sound::set $sound->[0] => $face;
3518 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3519 }
3520
3521 while (my ($k, $v) = each %{$soundconf->{event}}) {
3522 my $face = cf::face::find "sound/$v";
3523 cf::sound::set $k => $face;
3524 }
3525}
3526
3083sub reload_resources { 3527sub reload_resources {
3084 warn "reloading resource files...\n"; 3528 trace "reloading resource files...\n";
3085 3529
3530 reload_facedata;
3531 reload_sound;
3532 reload_archetypes;
3086 reload_regions; 3533 reload_regions;
3087 reload_facedata;
3088 #reload_archetypes;#d#
3089 reload_archetypes;
3090 reload_treasures; 3534 reload_treasures;
3091 3535
3092 warn "finished reloading resource files\n"; 3536 trace "finished reloading resource files\n";
3093}
3094
3095sub init {
3096 reload_resources;
3097} 3537}
3098 3538
3099sub reload_config { 3539sub reload_config {
3540 trace "reloading config file...\n";
3541
3100 open my $fh, "<:utf8", "$CONFDIR/config" 3542 open my $fh, "<:utf8", "$CONFDIR/config"
3101 or return; 3543 or return;
3102 3544
3103 local $/; 3545 local $/;
3104 *CFG = YAML::Syck::Load <$fh>; 3546 *CFG = YAML::XS::Load scalar <$fh>;
3105 3547
3106 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3548 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3107 3549
3108 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3550 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3109 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3551 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3110 3552
3111 if (exists $CFG{mlockall}) { 3553 if (exists $CFG{mlockall}) {
3113 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3555 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3114 and die "WARNING: m(un)lockall failed: $!\n"; 3556 and die "WARNING: m(un)lockall failed: $!\n";
3115 }; 3557 };
3116 warn $@ if $@; 3558 warn $@ if $@;
3117 } 3559 }
3560
3561 trace "finished reloading resource files\n";
3562}
3563
3564sub pidfile() {
3565 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3566 or die "$PIDFILE: $!";
3567 flock $fh, &Fcntl::LOCK_EX
3568 or die "$PIDFILE: flock: $!";
3569 $fh
3570}
3571
3572# make sure only one server instance is running at any one time
3573sub atomic {
3574 my $fh = pidfile;
3575
3576 my $pid = <$fh>;
3577 kill 9, $pid if $pid > 0;
3578
3579 seek $fh, 0, 0;
3580 print $fh $$;
3581}
3582
3583sub main_loop {
3584 trace "EV::loop starting\n";
3585 if (1) {
3586 EV::loop;
3587 }
3588 trace "EV::loop returned\n";
3589 goto &main_loop unless $REALLY_UNLOOP;
3118} 3590}
3119 3591
3120sub main { 3592sub main {
3593 cf::init_globals; # initialise logging
3594
3595 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3596 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3597 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3598 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3599
3600 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3601
3121 # we must not ever block the main coroutine 3602 # we must not ever block the main coroutine
3122 local $Coro::idle = sub { 3603 local $Coro::idle = sub {
3123 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3604 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3124 (async { 3605 (async {
3125 Event::one_event; 3606 $Coro::current->{desc} = "IDLE BUG HANDLER";
3607 EV::loop EV::LOOP_ONESHOT;
3126 })->prio (Coro::PRIO_MAX); 3608 })->prio (Coro::PRIO_MAX);
3127 }; 3609 };
3128 3610
3611 evthread_start IO::AIO::poll_fileno;
3612
3613 cf::sync_job {
3614 cf::init_experience;
3615 cf::init_anim;
3616 cf::init_attackmess;
3617 cf::init_dynamic;
3618
3619 cf::load_settings;
3620 cf::load_materials;
3621
3622 reload_resources;
3129 reload_config; 3623 reload_config;
3130 db_init; 3624 db_init;
3625
3626 cf::init_uuid;
3627 cf::init_signals;
3628 cf::init_skills;
3629
3630 cf::init_beforeplay;
3631
3632 atomic;
3633
3131 load_extensions; 3634 load_extensions;
3132 3635
3133 $TICK_WATCHER->start; 3636 utime time, time, $RUNTIMEFILE;
3134 Event::loop; 3637
3638 # no (long-running) fork's whatsoever before this point(!)
3639 use POSIX ();
3640 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3641
3642 (pop @POST_INIT)->(0) while @POST_INIT;
3643 };
3644
3645 cf::object::thawer::errors_are_fatal 0;
3646 info "parse errors in files are no longer fatal from this point on.\n";
3647
3648 main_loop;
3135} 3649}
3136 3650
3137############################################################################# 3651#############################################################################
3138# initialisation and cleanup 3652# initialisation and cleanup
3139 3653
3140# install some emergency cleanup handlers 3654# install some emergency cleanup handlers
3141BEGIN { 3655BEGIN {
3656 our %SIGWATCHER = ();
3142 for my $signal (qw(INT HUP TERM)) { 3657 for my $signal (qw(INT HUP TERM)) {
3143 Event->signal ( 3658 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3144 reentrant => 0,
3145 data => WF_AUTOCANCEL,
3146 signal => $signal,
3147 prio => 0,
3148 cb => sub {
3149 cf::cleanup "SIG$signal"; 3659 cf::cleanup "SIG$signal";
3150 },
3151 ); 3660 };
3152 } 3661 }
3153} 3662}
3154 3663
3155sub write_runtime { 3664sub write_runtime_sync {
3156 my $runtime = "$LOCALDIR/runtime"; 3665 my $t0 = AE::time;
3157 3666
3158 # first touch the runtime file to show we are still running: 3667 # first touch the runtime file to show we are still running:
3159 # the fsync below can take a very very long time. 3668 # the fsync below can take a very very long time.
3160 3669
3161 IO::AIO::aio_utime $runtime, undef, undef; 3670 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3162 3671
3163 my $guard = cf::lock_acquire "write_runtime"; 3672 my $guard = cf::lock_acquire "write_runtime";
3164 3673
3165 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3674 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3166 or return; 3675 or return;
3167 3676
3168 my $value = $cf::RUNTIME + 90 + 10; 3677 my $value = $cf::RUNTIME + 90 + 10;
3169 # 10 is the runtime save interval, for a monotonic clock 3678 # 10 is the runtime save interval, for a monotonic clock
3170 # 60 allows for the watchdog to kill the server. 3679 # 60 allows for the watchdog to kill the server.
3180 aio_utime $fh, undef, undef; 3689 aio_utime $fh, undef, undef;
3181 3690
3182 close $fh 3691 close $fh
3183 or return; 3692 or return;
3184 3693
3185 aio_rename "$runtime~", $runtime 3694 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3186 and return; 3695 and return;
3187 3696
3188 warn "runtime file written.\n"; 3697 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3189 3698
3190 1 3699 1
3700}
3701
3702our $uuid_lock;
3703our $uuid_skip;
3704
3705sub write_uuid_sync($) {
3706 $uuid_skip ||= $_[0];
3707
3708 return if $uuid_lock;
3709 local $uuid_lock = 1;
3710
3711 my $uuid = "$LOCALDIR/uuid";
3712
3713 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3714 or return;
3715
3716 my $value = uuid_seq uuid_cur;
3717
3718 unless ($value) {
3719 info "cowardly refusing to write zero uuid value!\n";
3720 return;
3721 }
3722
3723 my $value = uuid_str $value + $uuid_skip;
3724 $uuid_skip = 0;
3725
3726 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3727 and return;
3728
3729 # always fsync - this file is important
3730 aio_fsync $fh
3731 and return;
3732
3733 close $fh
3734 or return;
3735
3736 aio_rename "$uuid~", $uuid
3737 and return;
3738
3739 trace "uuid file written ($value).\n";
3740
3741 1
3742
3743}
3744
3745sub write_uuid($$) {
3746 my ($skip, $sync) = @_;
3747
3748 $sync ? write_uuid_sync $skip
3749 : async { write_uuid_sync $skip };
3191} 3750}
3192 3751
3193sub emergency_save() { 3752sub emergency_save() {
3194 my $freeze_guard = cf::freeze_mainloop; 3753 my $freeze_guard = cf::freeze_mainloop;
3195 3754
3196 warn "enter emergency perl save\n"; 3755 info "emergency_perl_save: enter\n";
3756
3757 # this is a trade-off: we want to be very quick here, so
3758 # save all maps without fsync, and later call a global sync
3759 # (which in turn might be very very slow)
3760 local $USE_FSYNC = 0;
3197 3761
3198 cf::sync_job { 3762 cf::sync_job {
3199 # use a peculiar iteration method to avoid tripping on perl 3763 # use a peculiar iteration method to avoid tripping on perl
3200 # refcount bugs in for. also avoids problems with players 3764 # refcount bugs in for. also avoids problems with players
3201 # and maps saved/destroyed asynchronously. 3765 # and maps saved/destroyed asynchronously.
3202 warn "begin emergency player save\n"; 3766 info "emergency_perl_save: begin player save\n";
3203 for my $login (keys %cf::PLAYER) { 3767 for my $login (keys %cf::PLAYER) {
3204 my $pl = $cf::PLAYER{$login} or next; 3768 my $pl = $cf::PLAYER{$login} or next;
3205 $pl->valid or next; 3769 $pl->valid or next;
3770 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3206 $pl->save; 3771 $pl->save;
3207 } 3772 }
3208 warn "end emergency player save\n"; 3773 info "emergency_perl_save: end player save\n";
3209 3774
3210 warn "begin emergency map save\n"; 3775 info "emergency_perl_save: begin map save\n";
3211 for my $path (keys %cf::MAP) { 3776 for my $path (keys %cf::MAP) {
3212 my $map = $cf::MAP{$path} or next; 3777 my $map = $cf::MAP{$path} or next;
3213 $map->valid or next; 3778 $map->valid or next;
3214 $map->save; 3779 $map->save;
3215 } 3780 }
3216 warn "end emergency map save\n"; 3781 info "emergency_perl_save: end map save\n";
3217 3782
3218 warn "begin emergency database checkpoint\n"; 3783 info "emergency_perl_save: begin database checkpoint\n";
3219 BDB::db_env_txn_checkpoint $DB_ENV; 3784 BDB::db_env_txn_checkpoint $DB_ENV;
3220 warn "end emergency database checkpoint\n"; 3785 info "emergency_perl_save: end database checkpoint\n";
3786
3787 info "emergency_perl_save: begin write uuid\n";
3788 write_uuid_sync 1;
3789 info "emergency_perl_save: end write uuid\n";
3221 }; 3790 };
3222 3791
3223 warn "leave emergency perl save\n"; 3792 info "emergency_perl_save: starting sync()\n";
3793 IO::AIO::aio_sync sub {
3794 info "emergency_perl_save: finished sync()\n";
3795 };
3796
3797 info "emergency_perl_save: leave\n";
3224} 3798}
3225 3799
3226sub post_cleanup { 3800sub post_cleanup {
3227 my ($make_core) = @_; 3801 my ($make_core) = @_;
3228 3802
3229 warn Carp::longmess "post_cleanup backtrace" 3803 error Carp::longmess "post_cleanup backtrace"
3230 if $make_core; 3804 if $make_core;
3805
3806 my $fh = pidfile;
3807 unlink $PIDFILE if <$fh> == $$;
3808}
3809
3810# a safer delete_package, copied from Symbol
3811sub clear_package($) {
3812 my $pkg = shift;
3813
3814 # expand to full symbol table name if needed
3815 unless ($pkg =~ /^main::.*::$/) {
3816 $pkg = "main$pkg" if $pkg =~ /^::/;
3817 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3818 $pkg .= '::' unless $pkg =~ /::$/;
3819 }
3820
3821 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3822 my $stem_symtab = *{$stem}{HASH};
3823
3824 defined $stem_symtab and exists $stem_symtab->{$leaf}
3825 or return;
3826
3827 # clear all symbols
3828 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3829 for my $name (keys %$leaf_symtab) {
3830 _gv_clear *{"$pkg$name"};
3831# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3832 }
3231} 3833}
3232 3834
3233sub do_reload_perl() { 3835sub do_reload_perl() {
3234 # can/must only be called in main 3836 # can/must only be called in main
3235 if ($Coro::current != $Coro::main) { 3837 if (in_main) {
3236 warn "can only reload from main coroutine"; 3838 error "can only reload from main coroutine";
3237 return; 3839 return;
3238 } 3840 }
3239 3841
3842 return if $RELOAD++;
3843
3844 my $t1 = AE::time;
3845
3846 while ($RELOAD) {
3240 warn "reloading..."; 3847 info "reloading...";
3241 3848
3242 warn "entering sync_job"; 3849 trace "entering sync_job";
3243 3850
3244 cf::sync_job { 3851 cf::sync_job {
3245 cf::write_runtime; # external watchdog should not bark 3852 cf::write_runtime_sync; # external watchdog should not bark
3246 cf::emergency_save; 3853 cf::emergency_save;
3247 cf::write_runtime; # external watchdog should not bark 3854 cf::write_runtime_sync; # external watchdog should not bark
3248 3855
3249 warn "syncing database to disk"; 3856 trace "syncing database to disk";
3250 BDB::db_env_txn_checkpoint $DB_ENV; 3857 BDB::db_env_txn_checkpoint $DB_ENV;
3251 3858
3252 # if anything goes wrong in here, we should simply crash as we already saved 3859 # if anything goes wrong in here, we should simply crash as we already saved
3253 3860
3254 warn "cancelling all WF_AUTOCANCEL watchers";
3255 for (Event::all_watchers) {
3256 $_->cancel if $_->data & WF_AUTOCANCEL;
3257 }
3258
3259 warn "flushing outstanding aio requests"; 3861 trace "flushing outstanding aio requests";
3260 for (;;) {
3261 BDB::flush;
3262 IO::AIO::flush;
3263 Coro::cede;
3264 last unless IO::AIO::nreqs || BDB::nreqs; 3862 while (IO::AIO::nreqs || BDB::nreqs) {
3265 warn "iterate..."; 3863 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3266 }
3267
3268 ++$RELOAD;
3269
3270 warn "cancelling all extension coros";
3271 $_->cancel for values %EXT_CORO;
3272 %EXT_CORO = ();
3273
3274 warn "removing commands";
3275 %COMMAND = ();
3276
3277 warn "removing ext/exti commands";
3278 %EXTCMD = ();
3279 %EXTICMD = ();
3280
3281 warn "unloading/nuking all extensions";
3282 for my $pkg (@EXTS) {
3283 warn "... unloading $pkg";
3284
3285 if (my $cb = $pkg->can ("unload")) {
3286 eval {
3287 $cb->($pkg);
3288 1
3289 } or warn "$pkg unloaded, but with errors: $@";
3290 } 3864 }
3291 3865
3292 warn "... nuking $pkg"; 3866 trace "cancelling all extension coros";
3293 Symbol::delete_package $pkg; 3867 $_->cancel for values %EXT_CORO;
3294 } 3868 %EXT_CORO = ();
3295 3869
3296 warn "unloading all perl modules loaded from $LIBDIR"; 3870 trace "removing commands";
3297 while (my ($k, $v) = each %INC) { 3871 %COMMAND = ();
3298 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3299 3872
3873 trace "removing ext/exti commands";
3874 %EXTCMD = ();
3875 %EXTICMD = ();
3876
3877 trace "unloading/nuking all extensions";
3878 for my $pkg (@EXTS) {
3300 warn "... unloading $k"; 3879 trace "... unloading $pkg";
3301 delete $INC{$k};
3302 3880
3303 $k =~ s/\.pm$//;
3304 $k =~ s/\//::/g;
3305
3306 if (my $cb = $k->can ("unload_module")) { 3881 if (my $cb = $pkg->can ("unload")) {
3882 eval {
3307 $cb->(); 3883 $cb->($pkg);
3884 1
3885 } or error "$pkg unloaded, but with errors: $@";
3886 }
3887
3888 trace "... clearing $pkg";
3889 clear_package $pkg;
3308 } 3890 }
3309 3891
3310 Symbol::delete_package $k; 3892 trace "unloading all perl modules loaded from $LIBDIR";
3893 while (my ($k, $v) = each %INC) {
3894 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3895
3896 trace "... unloading $k";
3897 delete $INC{$k};
3898
3899 $k =~ s/\.pm$//;
3900 $k =~ s/\//::/g;
3901
3902 if (my $cb = $k->can ("unload_module")) {
3903 $cb->();
3904 }
3905
3906 clear_package $k;
3311 } 3907 }
3312 3908
3313 warn "getting rid of safe::, as good as possible"; 3909 trace "getting rid of safe::, as good as possible";
3314 Symbol::delete_package "safe::$_" 3910 clear_package "safe::$_"
3315 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3911 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3316 3912
3317 warn "unloading cf.pm \"a bit\""; 3913 trace "unloading cf.pm \"a bit\"";
3318 delete $INC{"cf.pm"}; 3914 delete $INC{"cf.pm"};
3319 delete $INC{"cf/pod.pm"}; 3915 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3320 3916
3321 # don't, removes xs symbols, too, 3917 # don't, removes xs symbols, too,
3322 # and global variables created in xs 3918 # and global variables created in xs
3323 #Symbol::delete_package __PACKAGE__; 3919 #clear_package __PACKAGE__;
3324 3920
3325 warn "unload completed, starting to reload now"; 3921 info "unload completed, starting to reload now";
3326 3922
3327 warn "reloading cf.pm"; 3923 trace "reloading cf.pm";
3328 require cf; 3924 require cf;
3329 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3925 cf::_connect_to_perl_1;
3330 3926
3331 warn "loading config and database again"; 3927 trace "loading config and database again";
3332 cf::reload_config; 3928 cf::reload_config;
3333 3929
3334 warn "loading extensions"; 3930 trace "loading extensions";
3335 cf::load_extensions; 3931 cf::load_extensions;
3336 3932
3933 if ($REATTACH_ON_RELOAD) {
3337 warn "reattaching attachments to objects/players"; 3934 trace "reattaching attachments to objects/players";
3338 _global_reattach; # objects, sockets 3935 _global_reattach; # objects, sockets
3339 warn "reattaching attachments to maps"; 3936 trace "reattaching attachments to maps";
3340 reattach $_ for values %MAP; 3937 reattach $_ for values %MAP;
3341 warn "reattaching attachments to players"; 3938 trace "reattaching attachments to players";
3342 reattach $_ for values %PLAYER; 3939 reattach $_ for values %PLAYER;
3940 }
3343 3941
3942 trace "running post_init jobs";
3943 (pop @POST_INIT)->(1) while @POST_INIT;
3944
3344 warn "leaving sync_job"; 3945 trace "leaving sync_job";
3345 3946
3346 1 3947 1
3347 } or do { 3948 } or do {
3348 warn $@; 3949 error $@;
3349 warn "error while reloading, exiting."; 3950 cf::cleanup "error while reloading, exiting.";
3350 exit 1; 3951 };
3952
3953 info "reloaded";
3954 --$RELOAD;
3351 }; 3955 }
3352 3956
3353 warn "reloaded"; 3957 $t1 = AE::time - $t1;
3958 info "reload completed in ${t1}s\n";
3354}; 3959};
3355 3960
3356our $RELOAD_WATCHER; # used only during reload 3961our $RELOAD_WATCHER; # used only during reload
3357 3962
3358sub reload_perl() { 3963sub reload_perl() {
3359 # doing reload synchronously and two reloads happen back-to-back, 3964 # doing reload synchronously and two reloads happen back-to-back,
3360 # coro crashes during coro_state_free->destroy here. 3965 # coro crashes during coro_state_free->destroy here.
3361 3966
3362 $RELOAD_WATCHER ||= Event->timer ( 3967 $RELOAD_WATCHER ||= cf::async {
3363 reentrant => 0, 3968 Coro::AIO::aio_wait cache_extensions;
3364 after => 0, 3969
3365 data => WF_AUTOCANCEL, 3970 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3366 cb => sub {
3367 do_reload_perl; 3971 do_reload_perl;
3368 undef $RELOAD_WATCHER; 3972 undef $RELOAD_WATCHER;
3369 }, 3973 };
3370 ); 3974 };
3371} 3975}
3372 3976
3373register_command "reload" => sub { 3977register_command "reload" => sub {
3374 my ($who, $arg) = @_; 3978 my ($who, $arg) = @_;
3375 3979
3376 if ($who->flag (FLAG_WIZ)) { 3980 if ($who->flag (FLAG_WIZ)) {
3377 $who->message ("reloading server."); 3981 $who->message ("reloading server.");
3982 async {
3983 $Coro::current->{desc} = "perl_reload";
3378 async { reload_perl }; 3984 reload_perl;
3985 };
3379 } 3986 }
3380}; 3987};
3381 3988
3382unshift @INC, $LIBDIR; 3989unshift @INC, $LIBDIR;
3383 3990
3385 3992
3386our @WAIT_FOR_TICK; 3993our @WAIT_FOR_TICK;
3387our @WAIT_FOR_TICK_BEGIN; 3994our @WAIT_FOR_TICK_BEGIN;
3388 3995
3389sub wait_for_tick { 3996sub wait_for_tick {
3390 return unless $TICK_WATCHER->is_active;
3391 return if $Coro::current == $Coro::main; 3997 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3392 3998
3393 my $signal = new Coro::Signal; 3999 my $signal = new Coro::Signal;
3394 push @WAIT_FOR_TICK, $signal; 4000 push @WAIT_FOR_TICK, $signal;
3395 $signal->wait; 4001 $signal->wait;
3396} 4002}
3397 4003
3398sub wait_for_tick_begin { 4004sub wait_for_tick_begin {
3399 return unless $TICK_WATCHER->is_active;
3400 return if $Coro::current == $Coro::main; 4005 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3401 4006
3402 my $signal = new Coro::Signal; 4007 my $signal = new Coro::Signal;
3403 push @WAIT_FOR_TICK_BEGIN, $signal; 4008 push @WAIT_FOR_TICK_BEGIN, $signal;
3404 $signal->wait; 4009 $signal->wait;
3405} 4010}
3406 4011
3407 my $min = 1e6;#d# 4012sub tick {
3408 my $avg = 10;
3409$TICK_WATCHER = Event->timer (
3410 reentrant => 0,
3411 parked => 1,
3412 prio => 0,
3413 at => $NEXT_TICK || $TICK,
3414 data => WF_AUTOCANCEL,
3415 cb => sub {
3416 if ($Coro::current != $Coro::main) { 4013 if ($Coro::current != $Coro::main) {
3417 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4014 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3418 unless ++$bug_warning > 10; 4015 unless ++$bug_warning > 10;
3419 return; 4016 return;
3420 } 4017 }
3421 4018
3422 $NOW = $tick_start = Event::time;
3423
3424 cf::server_tick; # one server iteration 4019 cf::server_tick; # one server iteration
3425 4020
3426 0 && sync_job {#d# 4021 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3427 for(1..10) {
3428 my $t = Event::time;
3429 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3430 or die;
3431 4022
3432 $map->width (50); 4023 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3433 $map->height (50); 4024 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3434 $map->alloc; 4025 Coro::async_pool {
3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work 4026 $Coro::current->{desc} = "runtime saver";
3436 my $t = Event::time - $t; 4027 write_runtime_sync
3437 4028 or error "ERROR: unable to write runtime file: $!";
3438 #next unless $t < 0.0013;#d#
3439 if ($t < $min) {
3440 $min = $t;
3441 }
3442 $avg = $avg * 0.99 + $t * 0.01;
3443 }
3444 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3445 exit 0;
3446 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3447 }; 4029 };
4030 }
3448 4031
3449 $RUNTIME += $TICK;
3450 $NEXT_TICK += $TICK;
3451
3452 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3453 $NEXT_RUNTIME_WRITE = $NOW + 10;
3454 Coro::async_pool {
3455 write_runtime
3456 or warn "ERROR: unable to write runtime file: $!";
3457 };
3458 }
3459
3460# my $AFTER = Event::time;
3461# warn $AFTER - $NOW;#d#
3462
3463 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4032 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3464 $sig->send; 4033 $sig->send;
3465 } 4034 }
3466 while (my $sig = shift @WAIT_FOR_TICK) { 4035 while (my $sig = shift @WAIT_FOR_TICK) {
3467 $sig->send; 4036 $sig->send;
3468 } 4037 }
3469 4038
3470 $NOW = Event::time; 4039 $LOAD = ($NOW - $TICK_START) / $TICK;
3471
3472 # if we are delayed by four ticks or more, skip them all
3473 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3474
3475 $TICK_WATCHER->at ($NEXT_TICK);
3476 $TICK_WATCHER->start;
3477
3478 $LOAD = ($NOW - $tick_start) / $TICK;
3479 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4040 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3480 4041
3481 _post_tick; 4042 if (0) {
3482 4043 if ($NEXT_TICK) {
3483 4044 my $jitter = $TICK_START - $NEXT_TICK;
4045 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4046 debug "jitter $JITTER\n";#d#
4047 }
3484 }, 4048 }
3485); 4049}
3486 4050
3487{ 4051{
3488 BDB::max_poll_time $TICK * 0.1; 4052 # configure BDB
3489 $BDB_POLL_WATCHER = Event->io ( 4053
3490 reentrant => 0,
3491 fd => BDB::poll_fileno,
3492 poll => 'r',
3493 prio => 0,
3494 data => WF_AUTOCANCEL,
3495 cb => \&BDB::poll_cb,
3496 );
3497 BDB::min_parallel 8; 4054 BDB::min_parallel 16;
3498 4055 BDB::max_poll_reqs $TICK * 0.1;
3499 BDB::set_sync_prepare { 4056 $AnyEvent::BDB::WATCHER->priority (1);
3500 my $status;
3501 my $current = $Coro::current;
3502 (
3503 sub {
3504 $status = $!;
3505 $current->ready; undef $current;
3506 },
3507 sub {
3508 Coro::schedule while defined $current;
3509 $! = $status;
3510 },
3511 )
3512 };
3513 4057
3514 unless ($DB_ENV) { 4058 unless ($DB_ENV) {
3515 $DB_ENV = BDB::db_env_create; 4059 $DB_ENV = BDB::db_env_create;
4060 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4061 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4062 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4063 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4064 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3516 4065
3517 cf::sync_job { 4066 cf::sync_job {
3518 eval { 4067 eval {
3519 BDB::db_env_open 4068 BDB::db_env_open
3520 $DB_ENV, 4069 $DB_ENV,
3522 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4071 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3523 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4072 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3524 0666; 4073 0666;
3525 4074
3526 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4075 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3527
3528 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3529 $DB_ENV->set_lk_detect;
3530 }; 4076 };
3531 4077
3532 cf::cleanup "db_env_open(db): $@" if $@; 4078 cf::cleanup "db_env_open(db): $@" if $@;
3533 }; 4079 };
3534 } 4080 }
4081
4082 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4083 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4084 };
4085 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4086 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4087 };
4088 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4089 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4090 };
3535} 4091}
3536 4092
3537{ 4093{
4094 # configure IO::AIO
4095
3538 IO::AIO::min_parallel 8; 4096 IO::AIO::min_parallel 8;
3539
3540 undef $Coro::AIO::WATCHER;
3541 IO::AIO::max_poll_time $TICK * 0.1; 4097 IO::AIO::max_poll_time $TICK * 0.1;
3542 $AIO_POLL_WATCHER = Event->io ( 4098 undef $AnyEvent::AIO::WATCHER;
3543 reentrant => 0,
3544 data => WF_AUTOCANCEL,
3545 fd => IO::AIO::poll_fileno,
3546 poll => 'r',
3547 prio => 6,
3548 cb => \&IO::AIO::poll_cb,
3549 );
3550} 4099}
3551 4100
3552my $_log_backtrace; 4101my $_log_backtrace;
3553 4102
3554sub _log_backtrace { 4103sub _log_backtrace {
3557 $msg =~ s/\n//; 4106 $msg =~ s/\n//;
3558 4107
3559 # limit the # of concurrent backtraces 4108 # limit the # of concurrent backtraces
3560 if ($_log_backtrace < 2) { 4109 if ($_log_backtrace < 2) {
3561 ++$_log_backtrace; 4110 ++$_log_backtrace;
4111 my $perl_bt = Carp::longmess $msg;
3562 async { 4112 async {
4113 $Coro::current->{desc} = "abt $msg";
4114
3563 my @bt = fork_call { 4115 my @bt = fork_call {
3564 @addr = map { sprintf "%x", $_ } @addr; 4116 @addr = map { sprintf "%x", $_ } @addr;
3565 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4117 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3566 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4118 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3567 or die "addr2line: $!"; 4119 or die "addr2line: $!";
3575 } 4127 }
3576 4128
3577 @funcs 4129 @funcs
3578 }; 4130 };
3579 4131
3580 LOG llevInfo, "[ABT] $msg\n"; 4132 LOG llevInfo, "[ABT] $perl_bt\n";
4133 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3581 LOG llevInfo, "[ABT] $_\n" for @bt; 4134 LOG llevInfo, "[ABT] $_\n" for @bt;
3582 --$_log_backtrace; 4135 --$_log_backtrace;
3583 }; 4136 };
3584 } else { 4137 } else {
3585 LOG llevInfo, "[ABT] $msg\n"; 4138 LOG llevInfo, "[ABT] $msg\n";
3586 LOG llevInfo, "[ABT] [suppressed]\n"; 4139 LOG llevInfo, "[ABT] [suppressed]\n";
3587 } 4140 }
3588} 4141}
3589 4142
3590# load additional modules 4143# load additional modules
3591use cf::pod; 4144require "cf/$_.pm" for @EXTRA_MODULES;
4145cf::_connect_to_perl_2;
3592 4146
3593END { cf::emergency_save } 4147END { cf::emergency_save }
3594 4148
35951 41491
3596 4150

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines