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

Diff Legend

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