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.441 by root, Sat Aug 30 05:19:03 2008 UTC vs.
Revision 1.480 by root, Thu Oct 8 05:09:43 2009 UTC

… …
21 21
22package cf; 22package cf;
23 23
24use 5.10.0; 24use 5.10.0;
25use utf8; 25use utf8;
26use strict "vars", "subs"; 26use strict qw(vars subs);
27 27
28use Symbol; 28use Symbol;
29use List::Util; 29use List::Util;
30use Socket; 30use Socket;
31use EV; 31use EV;
32use Opcode; 32use Opcode;
33use Safe; 33use Safe;
34use Safe::Hole; 34use Safe::Hole;
35use Storable (); 35use Storable ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
… …
63 65
64# configure various modules to our taste 66# configure various modules to our taste
65# 67#
66$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
69 76
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 77# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71 79
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 81
74our %COMMAND = (); 82our %COMMAND = ();
75our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
… …
78our %EXTCMD = (); 86our %EXTCMD = ();
79our %EXTICMD = (); 87our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
82 90
83our $RELOAD; # number of reloads so far 91our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 92our @EVENT;
93our @REFLECT; # set by XS
94our %REFLECT; # set by us
85 95
86our $CONFDIR = confdir; 96our $CONFDIR = confdir;
87our $DATADIR = datadir; 97our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 98our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 99our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 100our $MAPDIR = "$DATADIR/" . mapdir;
91our $LOCALDIR = localdir; 101our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 102our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 103our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 104our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 105our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 106our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime";
109
97our %RESOURCE; 110our %RESOURCE;
98 111
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 114our $NEXT_TICK;
102our $USE_FSYNC = 1; # use fsync to write maps - default off 115our $USE_FSYNC = 1; # use fsync to write maps - default on
103 116
104our $BDB_DEADLOCK_WATCHER; 117our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER; 118our $BDB_CHECKPOINT_WATCHER;
106our $BDB_TRICKLE_WATCHER; 119our $BDB_TRICKLE_WATCHER;
107our $DB_ENV; 120our $DB_ENV;
108 121
122our @EXTRA_MODULES = qw(pod mapscript);
123
109our %CFG; 124our %CFG;
110 125
111our $UPTIME; $UPTIME ||= time; 126our $UPTIME; $UPTIME ||= time;
112our $RUNTIME; 127our $RUNTIME;
113our $NOW; 128our $NOW;
… …
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 137our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 138our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 139our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 140our $TICK_START; # for load detecting purposes
126 141
142our @POST_INIT;
143
144our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
145our $REALLY_UNLOOP; # never set to true, please :)
146
127binmode STDOUT; 147binmode STDOUT;
128binmode STDERR; 148binmode STDERR;
129 149
130# read virtual server time, if available 150# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 151unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 152 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 153 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 154 $RUNTIME = <$fh> + 0.;
135} 155}
156
157eval "sub TICK() { $TICK } 1" or die;
136 158
137mkdir $_ 159mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 160 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
139 161
140our $EMERGENCY_POSITION; 162our $EMERGENCY_POSITION;
141 163
142sub cf::map::normalise; 164sub cf::map::normalise;
165
166#############################################################################
167
168%REFLECT = ();
169for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect;
172}
173
174# this is decidedly evil
175$REFLECT{object}{flags} = [grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"}];
143 176
144############################################################################# 177#############################################################################
145 178
146=head2 GLOBAL VARIABLES 179=head2 GLOBAL VARIABLES
147 180
… …
198 231
199This array contains the results of the last C<invoke ()> call. When 232This array contains the results of the last C<invoke ()> call. When
200C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 233C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
201that call. 234that call.
202 235
236=item %cf::REFLECT
237
238Contains, for each (C++) class name, a hash reference with information
239about object members (methods, scalars, arrays and flags) and other
240metadata, which is useful for introspection.
241
203=back 242=back
204 243
205=cut 244=cut
206 245
207BEGIN { 246$Coro::State::WARNHOOK = sub {
208 *CORE::GLOBAL::warn = sub {
209 my $msg = join "", @_; 247 my $msg = join "", @_;
210 248
211 $msg .= "\n" 249 $msg .= "\n"
212 unless $msg =~ /\n$/; 250 unless $msg =~ /\n$/;
213 251
214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 252 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
215 253
216 LOG llevError, $msg; 254 LOG llevError, $msg;
217 }; 255};
218}
219 256
220$Coro::State::DIEHOOK = sub { 257$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "==" 258 return unless $^S eq 0; # "eq", not "=="
259
260 warn Carp::longmess $_[0];
222 261
223 if ($Coro::current == $Coro::main) {#d# 262 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d# 263 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d# 264 return;#d#
226 }#d# 265 }#d#
227 266
228 # kill coroutine otherwise 267 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate 268 Coro::terminate
231}; 269};
232
233$SIG{__DIE__} = sub { }; #d#?
234 270
235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 271@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 272@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 273@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 274@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 335our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300 336
301sub encode_json($) { $json_coder->encode ($_[0]) } 337sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 338sub decode_json($) { $json_coder->decode ($_[0]) }
303 339
340=item cf::post_init { BLOCK }
341
342Execute the given codeblock, I<after> all extensions have been (re-)loaded,
343but I<before> the server starts ticking again.
344
345The cdoeblock will have a single boolean argument to indicate whether this
346is a reload or not.
347
348=cut
349
350sub post_init(&) {
351 push @POST_INIT, shift;
352}
353
304=item cf::lock_wait $string 354=item cf::lock_wait $string
305 355
306Wait until the given lock is available. See cf::lock_acquire. 356Wait until the given lock is available. See cf::lock_acquire.
307 357
308=item my $lock = cf::lock_acquire $string 358=item my $lock = cf::lock_acquire $string
309 359
310Wait until the given lock is available and then acquires it and returns 360Wait until the given lock is available and then acquires it and returns
311a Coro::guard object. If the guard object gets destroyed (goes out of scope, 361a L<Guard> object. If the guard object gets destroyed (goes out of scope,
312for example when the coroutine gets canceled), the lock is automatically 362for example when the coroutine gets canceled), the lock is automatically
313returned. 363returned.
314 364
315Locks are *not* recursive, locking from the same coro twice results in a 365Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro. 366deadlocked coro.
… …
322 372
323Return true if the lock is currently active, i.e. somebody has locked it. 373Return true if the lock is currently active, i.e. somebody has locked it.
324 374
325=cut 375=cut
326 376
327our %LOCK; 377our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 378
330sub lock_wait($) { 379sub lock_wait($) {
331 my ($key) = @_; 380 $LOCKS->wait ($_[0]);
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
337
338 # wait for lock, if any
339 while ($LOCK{$key}) {
340 push @{ $LOCK{$key} }, $Coro::current;
341 Coro::schedule;
342 }
343} 381}
344 382
345sub lock_acquire($) { 383sub lock_acquire($) {
346 my ($key) = @_; 384 $LOCKS->guard ($_[0])
347
348 # wait, to be sure we are not locked
349 lock_wait $key;
350
351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
353
354 Coro::guard {
355 delete $LOCKER{$key};#d#
356 # wake up all waiters, to be on the safe side
357 $_->ready for @{ delete $LOCK{$key} };
358 }
359} 385}
360 386
361sub lock_active($) { 387sub lock_active($) {
362 my ($key) = @_; 388 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 389}
366 390
367sub freeze_mainloop { 391sub freeze_mainloop {
368 tick_inhibit_inc; 392 tick_inhibit_inc;
369 393
370 Coro::guard \&tick_inhibit_dec; 394 &Guard::guard (\&tick_inhibit_dec);
371} 395}
372 396
373=item cf::periodic $interval, $cb 397=item cf::periodic $interval, $cb
374 398
375Like EV::periodic, but randomly selects a starting point so that the actions 399Like EV::periodic, but randomly selects a starting point so that the actions
… …
727 751
728############################################################################# 752#############################################################################
729 753
730=head2 ATTACHABLE OBJECTS 754=head2 ATTACHABLE OBJECTS
731 755
732Many objects in crossfire are so-called attachable objects. That means you can 756Many objects in deliantra are so-called attachable objects. That means you can
733attach callbacks/event handlers (a collection of which is called an "attachment") 757attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 758to it. All such attachable objects support the following methods.
735 759
736In the following description, CLASS can be any of C<global>, C<object> 760In the following description, CLASS can be any of C<global>, C<object>
737C<player>, C<client> or C<map> (i.e. the attachable objects in 761C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
787=item cf::CLASS::attachment $name, ... 811=item cf::CLASS::attachment $name, ...
788 812
789Register an attachment by C<$name> through which attachable objects of the 813Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 814given CLASS can refer to this attachment.
791 815
792Some classes such as crossfire maps and objects can specify attachments 816Some classes such as deliantra maps and objects can specify attachments
793that are attached at load/instantiate time, thus the need for a name. 817that are attached at load/instantiate time, thus the need for a name.
794 818
795These calls expect any number of the following handler/hook descriptions: 819These calls expect any number of the following handler/hook descriptions:
796 820
797=over 4 821=over 4
… …
1147 $decname, length $$rdata, scalar @$objs; 1171 $decname, length $$rdata, scalar @$objs;
1148 1172
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1174 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1176 if ($cf::USE_FSYNC) {
1177 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;
1178 aio_fsync $fh;
1179 }
1153 aio_close $fh; 1180 aio_close $fh;
1154 1181
1155 if (@$objs) { 1182 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1183 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1184 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1185 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1186 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1187 if ($cf::USE_FSYNC) {
1188 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;
1189 aio_fsync $fh;
1190 }
1161 aio_close $fh; 1191 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1192 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1193 }
1164 } else { 1194 } else {
1165 aio_unlink "$filename.pst"; 1195 aio_unlink "$filename.pst";
1166 } 1196 }
1167 1197
1168 aio_rename "$filename~", $filename; 1198 aio_rename "$filename~", $filename;
1199
1200 $filename =~ s%/[^/]+$%%;
1201 aio_pathsync $filename if $cf::USE_FSYNC;
1169 } else { 1202 } else {
1170 warn "FATAL: $filename~: $!\n"; 1203 warn "unable to save objects: $filename~: $!\n";
1171 } 1204 }
1172 } else { 1205 } else {
1173 aio_unlink $filename; 1206 aio_unlink $filename;
1174 aio_unlink "$filename.pst"; 1207 aio_unlink "$filename.pst";
1175 } 1208 }
… …
1266 my ($name, $cb) = @_; 1299 my ($name, $cb) = @_;
1267 1300
1268 $EXTICMD{$name} = $cb; 1301 $EXTICMD{$name} = $cb;
1269} 1302}
1270 1303
1304use File::Glob ();
1305
1271cf::player->attach ( 1306cf::player->attach (
1272 on_command => sub { 1307 on_command => sub {
1273 my ($pl, $name, $params) = @_; 1308 my ($pl, $name, $params) = @_;
1274 1309
1275 my $cb = $COMMAND{$name} 1310 my $cb = $COMMAND{$name}
… …
1306 } 1341 }
1307 1342
1308 cf::override; 1343 cf::override;
1309 }, 1344 },
1310); 1345);
1346
1347# "readahead" all extensions
1348sub cache_extensions {
1349 my $grp = IO::AIO::aio_group;
1350
1351 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1352 for (grep /\.ext$/, @{$_[0]}) {
1353 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1354 }
1355 };
1356
1357 $grp
1358}
1311 1359
1312sub load_extensions { 1360sub load_extensions {
1313 cf::sync_job { 1361 cf::sync_job {
1314 my %todo; 1362 my %todo;
1315 1363
… …
1385 1433
1386=back 1434=back
1387 1435
1388=head2 CORE EXTENSIONS 1436=head2 CORE EXTENSIONS
1389 1437
1390Functions and methods that extend core crossfire objects. 1438Functions and methods that extend core deliantra objects.
1391 1439
1392=cut 1440=cut
1393 1441
1394package cf::player; 1442package cf::player;
1395 1443
… …
1438 1486
1439sub exists($) { 1487sub exists($) {
1440 my ($login) = @_; 1488 my ($login) = @_;
1441 1489
1442 $cf::PLAYER{$login} 1490 $cf::PLAYER{$login}
1443 or cf::sync_job { !aio_stat path $login } 1491 or !aio_stat path $login
1444} 1492}
1445 1493
1446sub find($) { 1494sub find($) {
1447 return $cf::PLAYER{$_[0]} || do { 1495 return $cf::PLAYER{$_[0]} || do {
1448 my $login = $_[0]; 1496 my $login = $_[0];
… …
1523 my ($pl) = @_; 1571 my ($pl) = @_;
1524 1572
1525 my $name = $pl->ob->name; 1573 my $name = $pl->ob->name;
1526 1574
1527 $pl->{deny_save} = 1; 1575 $pl->{deny_save} = 1;
1528 $pl->password ("*"); # this should lock out the player until we nuked the dir 1576 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1529 1577
1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1578 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1531 $pl->deactivate; 1579 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1580 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score; 1581 $pl->ob->check_score;
… …
1619 } 1667 }
1620 1668
1621 \@paths 1669 \@paths
1622} 1670}
1623 1671
1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1672=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625 1673
1626Expand crossfire pod fragments into protocol xml. 1674Expand deliantra pod fragments into protocol xml.
1627
1628=cut
1629
1630use re 'eval';
1631
1632my $group;
1633my $interior; $interior = qr{
1634 # match a pod interior sequence sans C<< >>
1635 (?:
1636 \ (.*?)\ (?{ $group = $^N })
1637 | < (??{$interior}) >
1638 )
1639}x;
1640
1641sub expand_cfpod {
1642 my ($self, $pod) = @_;
1643
1644 my $xml;
1645
1646 while () {
1647 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1648 $group = $1;
1649
1650 $group =~ s/&/&amp;/g;
1651 $group =~ s/</&lt;/g;
1652
1653 $xml .= $group;
1654 } elsif ($pod =~ m%\G
1655 ([BCGHITU])
1656 <
1657 (?:
1658 ([^<>]*) (?{ $group = $^N })
1659 | < $interior >
1660 )
1661 >
1662 %gcsx
1663 ) {
1664 my ($code, $data) = ($1, $group);
1665
1666 if ($code eq "B") {
1667 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1668 } elsif ($code eq "I") {
1669 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1670 } elsif ($code eq "U") {
1671 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1672 } elsif ($code eq "C") {
1673 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1674 } elsif ($code eq "T") {
1675 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1676 } elsif ($code eq "G") {
1677 my ($male, $female) = split /\|/, $data;
1678 $data = $self->gender ? $female : $male;
1679 $xml .= expand_cfpod ($self, $data);
1680 } elsif ($code eq "H") {
1681 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1682 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1683 "")
1684 [$self->{hintmode}];
1685 } else {
1686 $xml .= "error processing '$code($data)' directive";
1687 }
1688 } else {
1689 if ($pod =~ /\G(.+)/) {
1690 warn "parse error while expanding $pod (at $1)";
1691 }
1692 last;
1693 }
1694 }
1695
1696 for ($xml) {
1697 # create single paragraphs (very hackish)
1698 s/(?<=\S)\n(?=\w)/ /g;
1699
1700 # compress some whitespace
1701 s/\s+\n/\n/g; # ws line-ends
1702 s/\n\n+/\n/g; # double lines
1703 s/^\n+//; # beginning lines
1704 s/\n+$//; # ending lines
1705 }
1706
1707 $xml
1708}
1709
1710no re 'eval';
1711
1712sub hintmode {
1713 $_[0]{hintmode} = $_[1] if @_ > 1;
1714 $_[0]{hintmode}
1715}
1716 1675
1717=item $player->ext_reply ($msgid, @msg) 1676=item $player->ext_reply ($msgid, @msg)
1718 1677
1719Sends an ext reply to the player. 1678Sends an ext reply to the player.
1720 1679
… …
1933 1892
1934 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1893 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1935 "$UNIQUEDIR/$path" 1894 "$UNIQUEDIR/$path"
1936} 1895}
1937 1896
1938# and all this just because we cannot iterate over
1939# all maps in C++...
1940sub change_all_map_light {
1941 my ($change) = @_;
1942
1943 $_->change_map_light ($change)
1944 for grep $_->outdoor, values %cf::MAP;
1945}
1946
1947sub decay_objects { 1897sub decay_objects {
1948 my ($self) = @_; 1898 my ($self) = @_;
1949 1899
1950 return if $self->{deny_reset}; 1900 return if $self->{deny_reset};
1951 1901
… …
2033sub find { 1983sub find {
2034 my ($path, $origin) = @_; 1984 my ($path, $origin) = @_;
2035 1985
2036 $path = normalise $path, $origin && $origin->path; 1986 $path = normalise $path, $origin && $origin->path;
2037 1987
2038 cf::lock_wait "map_data:$path";#d#remove 1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2039 cf::lock_wait "map_find:$path"; 1989 my $guard2 = cf::lock_acquire "map_find:$path";
2040 1990
2041 $cf::MAP{$path} || do { 1991 $cf::MAP{$path} || do {
2042 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2043 my $guard2 = cf::lock_acquire "map_find:$path";
2044
2045 my $map = new_from_path cf::map $path 1992 my $map = new_from_path cf::map $path
2046 or return; 1993 or return;
2047 1994
2048 $map->{last_save} = $cf::RUNTIME; 1995 $map->{last_save} = $cf::RUNTIME;
2049 1996
… …
2117 unless ($self->{deny_activate}) { 2064 unless ($self->{deny_activate}) {
2118 $self->decay_objects; 2065 $self->decay_objects;
2119 $self->fix_auto_apply; 2066 $self->fix_auto_apply;
2120 $self->update_buttons; 2067 $self->update_buttons;
2121 cf::cede_to_tick; 2068 cf::cede_to_tick;
2122 $self->set_darkness_map;
2123 cf::cede_to_tick;
2124 $self->activate; 2069 $self->activate;
2125 } 2070 }
2126 2071
2127 $self->{last_save} = $cf::RUNTIME; 2072 $self->{last_save} = $cf::RUNTIME;
2128 $self->last_access ($cf::RUNTIME); 2073 $self->last_access ($cf::RUNTIME);
… …
2294 2239
2295 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2296 2241
2297 return if $self->players; 2242 return if $self->players;
2298 2243
2299 warn "resetting map ", $self->path; 2244 warn "resetting map ", $self->path, "\n";
2300 2245
2301 $self->in_memory (cf::MAP_SWAPPED); 2246 $self->in_memory (cf::MAP_SWAPPED);
2302 2247
2303 # need to save uniques path 2248 # need to save uniques path
2304 unless ($self->{deny_save}) { 2249 unless ($self->{deny_save}) {
… …
2469 2414
2470our $SAY_CHANNEL = { 2415our $SAY_CHANNEL = {
2471 id => "say", 2416 id => "say",
2472 title => "Map", 2417 title => "Map",
2473 reply => "say ", 2418 reply => "say ",
2474 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2419 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2475}; 2420};
2476 2421
2477our $CHAT_CHANNEL = { 2422our $CHAT_CHANNEL = {
2478 id => "chat", 2423 id => "chat",
2479 title => "Chat", 2424 title => "Chat",
… …
2534 2479
2535=item $player_object->enter_link 2480=item $player_object->enter_link
2536 2481
2537Freezes the player and moves him/her to a special map (C<{link}>). 2482Freezes the player and moves him/her to a special map (C<{link}>).
2538 2483
2539The player should be reasonably safe there for short amounts of time. You 2484The player should be reasonably safe there for short amounts of time (e.g.
2540I<MUST> call C<leave_link> as soon as possible, though. 2485for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2486though, as the palyer cannot control the character while it is on the link
2487map.
2541 2488
2542Will never block. 2489Will never block.
2543 2490
2544=item $player_object->leave_link ($map, $x, $y) 2491=item $player_object->leave_link ($map, $x, $y)
2545 2492
… …
2603 2550
2604 $map->load; 2551 $map->load;
2605 $map->load_neighbours; 2552 $map->load_neighbours;
2606 2553
2607 return unless $self->contr->active; 2554 return unless $self->contr->active;
2608 $self->activate_recursive;
2609 2555
2610 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2611 $self->enter_map ($map, $x, $y); 2557 $self->enter_map ($map, $x, $y);
2558
2559 # only activate afterwards, to support waiting in hooks
2560 $self->activate_recursive;
2612} 2561}
2613 2562
2614=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2615 2564
2616Moves the player to the given map-path and coordinates by first freezing 2565Moves the player to the given map-path and coordinates by first freezing
… …
2775 $self->contr->savebed ($map, $x, $y) 2724 $self->contr->savebed ($map, $x, $y)
2776 if $exit->flag (cf::FLAG_DAMNED); 2725 if $exit->flag (cf::FLAG_DAMNED);
2777 2726
2778 1 2727 1
2779 }) { 2728 }) {
2780 $self->message ("Something went wrong deep within the crossfire server. " 2729 $self->message ("Something went wrong deep within the deliantra server. "
2781 . "I'll try to bring you back to the map you were before. " 2730 . "I'll try to bring you back to the map you were before. "
2782 . "Please report this to the dungeon master!", 2731 . "Please report this to the dungeon master!",
2783 cf::NDI_UNIQUE | cf::NDI_RED); 2732 cf::NDI_UNIQUE | cf::NDI_RED);
2784 2733
2785 warn "ERROR in enter_exit: $@"; 2734 warn "ERROR in enter_exit: $@";
… …
2851 id => "infobox", 2800 id => "infobox",
2852 title => "Body Parts", 2801 title => "Body Parts",
2853 reply => undef, 2802 reply => undef,
2854 tooltip => "Shows which body parts you posess and are available", 2803 tooltip => "Shows which body parts you posess and are available",
2855 }, 2804 },
2805 "c/statistics" => {
2806 id => "infobox",
2807 title => "Statistics",
2808 reply => undef,
2809 tooltip => "Shows your primary statistics",
2810 },
2811 "c/skills" => {
2812 id => "infobox",
2813 title => "Skills",
2814 reply => undef,
2815 tooltip => "Shows your experience per skill and item power",
2816 },
2817 "c/shopitems" => {
2818 id => "infobox",
2819 title => "Shop Items",
2820 reply => undef,
2821 tooltip => "Shows the items currently for sale in this shop",
2822 },
2823 "c/resistances" => {
2824 id => "infobox",
2825 title => "Resistances",
2826 reply => undef,
2827 tooltip => "Shows your resistances",
2828 },
2829 "c/pets" => {
2830 id => "infobox",
2831 title => "Pets",
2832 reply => undef,
2833 tooltip => "Shows information abotu your pets/a specific pet",
2834 },
2835 "c/perceiveself" => {
2836 id => "infobox",
2837 title => "Perceive Self",
2838 reply => undef,
2839 tooltip => "You gained detailed knowledge about yourself",
2840 },
2856 "c/uptime" => { 2841 "c/uptime" => {
2857 id => "infobox", 2842 id => "infobox",
2858 title => "Uptime", 2843 title => "Uptime",
2859 reply => undef, 2844 reply => undef,
2860 tooltip => "How long the server has been running since last restart", 2845 tooltip => "How long the server has been running since last restart",
… …
2869 id => "party", 2854 id => "party",
2870 title => "Party", 2855 title => "Party",
2871 reply => "gsay ", 2856 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party", 2857 tooltip => "Messages and chat related to your party",
2873 }, 2858 },
2859 "c/death" => {
2860 id => "death",
2861 title => "Death",
2862 reply => undef,
2863 tooltip => "Reason for and more info about your most recent death",
2864 },
2865 "c/say" => $SAY_CHANNEL,
2866 "c/chat" => $CHAT_CHANNEL,
2874); 2867);
2875 2868
2876sub cf::client::send_msg { 2869sub cf::client::send_msg {
2877 my ($self, $channel, $msg, $color, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2878 2871
2879 $msg = $self->pl->expand_cfpod ($msg); 2872 $msg = $self->pl->expand_cfpod ($msg)
2873 unless $color & cf::NDI_VERBATIM;
2880 2874
2881 $color &= cf::NDI_CLIENT_MASK; # just in case... 2875 $color &= cf::NDI_CLIENT_MASK; # just in case...
2882 2876
2883 # check predefined channels, for the benefit of C 2877 # check predefined channels, for the benefit of C
2884 if ($CHANNEL{$channel}) { 2878 if ($CHANNEL{$channel}) {
2885 $channel = $CHANNEL{$channel}; 2879 $channel = $CHANNEL{$channel};
2886 2880
2887 $self->ext_msg (channel_info => $channel) 2881 $self->ext_msg (channel_info => $channel);
2888 if $self->can_msg;
2889
2890 $channel = $channel->{id}; 2882 $channel = $channel->{id};
2891 2883
2892 } elsif (ref $channel) { 2884 } elsif (ref $channel) {
2893 # send meta info to client, if not yet sent 2885 # send meta info to client, if not yet sent
2894 unless (exists $self->{channel}{$channel->{id}}) { 2886 unless (exists $self->{channel}{$channel->{id}}) {
2895 $self->{channel}{$channel->{id}} = $channel; 2887 $self->{channel}{$channel->{id}} = $channel;
2896 $self->ext_msg (channel_info => $channel) 2888 $self->ext_msg (channel_info => $channel);
2897 if $self->can_msg;
2898 } 2889 }
2899 2890
2900 $channel = $channel->{id}; 2891 $channel = $channel->{id};
2901 } 2892 }
2902 2893
2903 return unless @extra || length $msg; 2894 return unless @extra || length $msg;
2904 2895
2905 if ($self->can_msg) {
2906 # default colour, mask it out 2896 # default colour, mask it out
2907 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2897 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2908 if $color & cf::NDI_DEF; 2898 if $color & cf::NDI_DEF;
2909 2899
2910 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2900 my $pkt = "msg "
2901 . $self->{json_coder}->encode (
2911 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2912 } else { 2903 );
2913 if ($color >= 0) {
2914 # replace some tags by gcfclient-compatible ones
2915 for ($msg) {
2916 1 while
2917 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2918 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2919 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2920 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2921 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2922 }
2923 2904
2924 $color &= cf::NDI_COLOR_MASK; 2905 # try lzf for large packets
2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2907 if 1024 <= length $pkt and $self->{can_lzf};
2925 2908
2926 utf8::encode $msg; 2909 # split very large packets
2927 2910 if (8192 < length $pkt and $self->{can_lzf}) {
2928 if (0 && $msg =~ /\[/) { 2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2929 # COMMAND/INFO 2912 $pkt = "frag";
2930 $self->send_packet ("drawextinfo $color 10 8 $msg")
2931 } else {
2932 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2933 $self->send_packet ("drawinfo $color $msg")
2934 }
2935 }
2936 } 2913 }
2914
2915 $self->send_packet ($pkt);
2937} 2916}
2938 2917
2939=item $client->ext_msg ($type, @msg) 2918=item $client->ext_msg ($type, @msg)
2940 2919
2941Sends an ext event to the client. 2920Sends an ext event to the client.
… …
3116The following functions and methods are available within a safe environment: 3095The following functions and methods are available within a safe environment:
3117 3096
3118 cf::object 3097 cf::object
3119 contr pay_amount pay_player map x y force_find force_add destroy 3098 contr pay_amount pay_player map x y force_find force_add destroy
3120 insert remove name archname title slaying race decrease split 3099 insert remove name archname title slaying race decrease split
3100 value
3121 3101
3122 cf::object::player 3102 cf::object::player
3123 player 3103 player
3124 3104
3125 cf::player 3105 cf::player
… …
3131=cut 3111=cut
3132 3112
3133for ( 3113for (
3134 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3114 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3135 insert remove inv nrof name archname title slaying race 3115 insert remove inv nrof name archname title slaying race
3136 decrease split destroy change_exp)], 3116 decrease split destroy change_exp value msg lore send_msg)],
3137 ["cf::object::player" => qw(player)], 3117 ["cf::object::player" => qw(player)],
3138 ["cf::player" => qw(peaceful)], 3118 ["cf::player" => qw(peaceful send_msg)],
3139 ["cf::map" => qw(trigger)], 3119 ["cf::map" => qw(trigger)],
3140) { 3120) {
3141 no strict 'refs'; 3121 no strict 'refs';
3142 my ($pkg, @funs) = @$_; 3122 my ($pkg, @funs) = @$_;
3143 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3160 my ($code, %vars) = @_; 3140 my ($code, %vars) = @_;
3161 3141
3162 my $qcode = $code; 3142 my $qcode = $code;
3163 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3164 $qcode =~ s/\n/\\n/g; 3144 $qcode =~ s/\n/\\n/g;
3145
3146 %vars = (_dummy => 0) unless %vars;
3165 3147
3166 local $_; 3148 local $_;
3167 local @safe::cf::_safe_eval_args = values %vars; 3149 local @safe::cf::_safe_eval_args = values %vars;
3168 3150
3169 my $eval = 3151 my $eval =
… …
3399 reload_treasures; 3381 reload_treasures;
3400 3382
3401 warn "finished reloading resource files\n"; 3383 warn "finished reloading resource files\n";
3402} 3384}
3403 3385
3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
3409 reload_resources;
3410}
3411
3412sub reload_config { 3386sub reload_config {
3413 open my $fh, "<:utf8", "$CONFDIR/config" 3387 open my $fh, "<:utf8", "$CONFDIR/config"
3414 or return; 3388 or return;
3415 3389
3416 local $/; 3390 local $/;
… …
3428 }; 3402 };
3429 warn $@ if $@; 3403 warn $@ if $@;
3430 } 3404 }
3431} 3405}
3432 3406
3407sub pidfile() {
3408 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3409 or die "$PIDFILE: $!";
3410 flock $fh, &Fcntl::LOCK_EX
3411 or die "$PIDFILE: flock: $!";
3412 $fh
3413}
3414
3415# make sure only one server instance is running at any one time
3416sub atomic {
3417 my $fh = pidfile;
3418
3419 my $pid = <$fh>;
3420 kill 9, $pid if $pid > 0;
3421
3422 seek $fh, 0, 0;
3423 print $fh $$;
3424}
3425
3426sub main_loop {
3427 warn "EV::loop starting\n";
3428 if (1) {
3429 EV::loop;
3430 }
3431 warn "EV::loop returned\n";
3432 goto &main_loop unless $REALLY_UNLOOP;
3433}
3434
3433sub main { 3435sub main {
3436 cf::init_globals; # initialise logging
3437
3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442
3443 cf::init_experience;
3444 cf::init_anim;
3445 cf::init_attackmess;
3446 cf::init_dynamic;
3447
3448 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449
3434 # we must not ever block the main coroutine 3450 # we must not ever block the main coroutine
3435 local $Coro::idle = sub { 3451 local $Coro::idle = sub {
3436 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3452 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3437 (async { 3453 (async {
3438 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3454 $Coro::current->{desc} = "IDLE BUG HANDLER";
3439 EV::loop EV::LOOP_ONESHOT; 3455 EV::loop EV::LOOP_ONESHOT;
3440 })->prio (Coro::PRIO_MAX); 3456 })->prio (Coro::PRIO_MAX);
3441 }; 3457 };
3442 3458
3443 { 3459 evthread_start IO::AIO::poll_fileno;
3444 my $guard = freeze_mainloop; 3460
3461 cf::sync_job {
3462 reload_resources;
3445 reload_config; 3463 reload_config;
3446 db_init; 3464 db_init;
3465
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid;
3469 cf::init_signals;
3470 cf::init_commands;
3471 cf::init_skills;
3472
3473 cf::init_beforeplay;
3474
3475 atomic;
3476
3447 load_extensions; 3477 load_extensions;
3448 3478
3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3479 utime time, time, $RUNTIMEFILE;
3480
3481 # no (long-running) fork's whatsoever before this point(!)
3482 use POSIX ();
3483 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484
3485 (pop @POST_INIT)->(0) while @POST_INIT;
3450 } 3486 };
3451 3487
3452 EV::loop; 3488 main_loop;
3453} 3489}
3454 3490
3455############################################################################# 3491#############################################################################
3456# initialisation and cleanup 3492# initialisation and cleanup
3457 3493
… …
3464 }; 3500 };
3465 } 3501 }
3466} 3502}
3467 3503
3468sub write_runtime_sync { 3504sub write_runtime_sync {
3469 my $runtime = "$LOCALDIR/runtime";
3470
3471 # first touch the runtime file to show we are still running: 3505 # first touch the runtime file to show we are still running:
3472 # the fsync below can take a very very long time. 3506 # the fsync below can take a very very long time.
3473 3507
3474 IO::AIO::aio_utime $runtime, undef, undef; 3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3475 3509
3476 my $guard = cf::lock_acquire "write_runtime"; 3510 my $guard = cf::lock_acquire "write_runtime";
3477 3511
3478 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3479 or return; 3513 or return;
3480 3514
3481 my $value = $cf::RUNTIME + 90 + 10; 3515 my $value = $cf::RUNTIME + 90 + 10;
3482 # 10 is the runtime save interval, for a monotonic clock 3516 # 10 is the runtime save interval, for a monotonic clock
3483 # 60 allows for the watchdog to kill the server. 3517 # 60 allows for the watchdog to kill the server.
… …
3493 aio_utime $fh, undef, undef; 3527 aio_utime $fh, undef, undef;
3494 3528
3495 close $fh 3529 close $fh
3496 or return; 3530 or return;
3497 3531
3498 aio_rename "$runtime~", $runtime 3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3499 and return; 3533 and return;
3500 3534
3501 warn "runtime file written.\n"; 3535 warn "runtime file written.\n";
3502 3536
3503 1 3537 1
… …
3515 my $uuid = "$LOCALDIR/uuid"; 3549 my $uuid = "$LOCALDIR/uuid";
3516 3550
3517 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3551 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3518 or return; 3552 or return;
3519 3553
3520 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3554 my $value = uuid_seq uuid_cur;
3555
3556 unless ($value) {
3557 warn "cowardly refusing to write zero uuid value!\n";
3558 return;
3559 }
3560
3561 my $value = uuid_str $value + $uuid_skip;
3521 $uuid_skip = 0; 3562 $uuid_skip = 0;
3522 3563
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3564 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return; 3565 and return;
3525 3566
… …
3547} 3588}
3548 3589
3549sub emergency_save() { 3590sub emergency_save() {
3550 my $freeze_guard = cf::freeze_mainloop; 3591 my $freeze_guard = cf::freeze_mainloop;
3551 3592
3552 warn "enter emergency perl save\n"; 3593 warn "emergency_perl_save: enter\n";
3553 3594
3554 cf::sync_job { 3595 cf::sync_job {
3596 # this is a trade-off: we want to be very quick here, so
3597 # save all maps without fsync, and later call a global sync
3598 # (which in turn might be very very slow)
3599 local $USE_FSYNC = 0;
3600
3555 # use a peculiar iteration method to avoid tripping on perl 3601 # use a peculiar iteration method to avoid tripping on perl
3556 # refcount bugs in for. also avoids problems with players 3602 # refcount bugs in for. also avoids problems with players
3557 # and maps saved/destroyed asynchronously. 3603 # and maps saved/destroyed asynchronously.
3558 warn "begin emergency player save\n"; 3604 warn "emergency_perl_save: begin player save\n";
3559 for my $login (keys %cf::PLAYER) { 3605 for my $login (keys %cf::PLAYER) {
3560 my $pl = $cf::PLAYER{$login} or next; 3606 my $pl = $cf::PLAYER{$login} or next;
3561 $pl->valid or next; 3607 $pl->valid or next;
3562 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3563 $pl->save; 3609 $pl->save;
3564 } 3610 }
3565 warn "end emergency player save\n"; 3611 warn "emergency_perl_save: end player save\n";
3566 3612
3567 warn "begin emergency map save\n"; 3613 warn "emergency_perl_save: begin map save\n";
3568 for my $path (keys %cf::MAP) { 3614 for my $path (keys %cf::MAP) {
3569 my $map = $cf::MAP{$path} or next; 3615 my $map = $cf::MAP{$path} or next;
3570 $map->valid or next; 3616 $map->valid or next;
3571 $map->save; 3617 $map->save;
3572 } 3618 }
3573 warn "end emergency map save\n"; 3619 warn "emergency_perl_save: end map save\n";
3574 3620
3575 warn "begin emergency database checkpoint\n"; 3621 warn "emergency_perl_save: begin database checkpoint\n";
3576 BDB::db_env_txn_checkpoint $DB_ENV; 3622 BDB::db_env_txn_checkpoint $DB_ENV;
3577 warn "end emergency database checkpoint\n"; 3623 warn "emergency_perl_save: end database checkpoint\n";
3578 3624
3579 warn "begin write uuid\n"; 3625 warn "emergency_perl_save: begin write uuid\n";
3580 write_uuid_sync 1; 3626 write_uuid_sync 1;
3581 warn "end write uuid\n"; 3627 warn "emergency_perl_save: end write uuid\n";
3582 }; 3628 };
3583 3629
3630 warn "emergency_perl_save: starting sync()\n";
3631 IO::AIO::aio_sync sub {
3632 warn "emergency_perl_save: finished sync()\n";
3633 };
3634
3584 warn "leave emergency perl save\n"; 3635 warn "emergency_perl_save: leave\n";
3585} 3636}
3586 3637
3587sub post_cleanup { 3638sub post_cleanup {
3588 my ($make_core) = @_; 3639 my ($make_core) = @_;
3589 3640
3590 warn Carp::longmess "post_cleanup backtrace" 3641 warn Carp::longmess "post_cleanup backtrace"
3591 if $make_core; 3642 if $make_core;
3643
3644 my $fh = pidfile;
3645 unlink $PIDFILE if <$fh> == $$;
3592} 3646}
3593 3647
3594# a safer delete_package, copied from Symbol 3648# a safer delete_package, copied from Symbol
3595sub clear_package($) { 3649sub clear_package($) {
3596 my $pkg = shift; 3650 my $pkg = shift;
… …
3612 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3666 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3613 for my $name (keys %$leaf_symtab) { 3667 for my $name (keys %$leaf_symtab) {
3614 _gv_clear *{"$pkg$name"}; 3668 _gv_clear *{"$pkg$name"};
3615# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3669# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3616 } 3670 }
3617 warn "cleared package #$pkg\n";#d# 3671 warn "cleared package $pkg\n";#d#
3618} 3672}
3619
3620our $RELOAD; # how many times to reload
3621 3673
3622sub do_reload_perl() { 3674sub do_reload_perl() {
3623 # can/must only be called in main 3675 # can/must only be called in main
3624 if ($Coro::current != $Coro::main) { 3676 if ($Coro::current != $Coro::main) {
3625 warn "can only reload from main coroutine"; 3677 warn "can only reload from main coroutine";
3626 return; 3678 return;
3627 } 3679 }
3628 3680
3629 return if $RELOAD++; 3681 return if $RELOAD++;
3682
3683 my $t1 = EV::time;
3630 3684
3631 while ($RELOAD) { 3685 while ($RELOAD) {
3632 warn "reloading..."; 3686 warn "reloading...";
3633 3687
3634 warn "entering sync_job"; 3688 warn "entering sync_job";
… …
3695 clear_package "safe::$_" 3749 clear_package "safe::$_"
3696 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3750 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3697 3751
3698 warn "unloading cf.pm \"a bit\""; 3752 warn "unloading cf.pm \"a bit\"";
3699 delete $INC{"cf.pm"}; 3753 delete $INC{"cf.pm"};
3700 delete $INC{"cf/pod.pm"}; 3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3701 3755
3702 # don't, removes xs symbols, too, 3756 # don't, removes xs symbols, too,
3703 # and global variables created in xs 3757 # and global variables created in xs
3704 #clear_package __PACKAGE__; 3758 #clear_package __PACKAGE__;
3705 3759
… …
3713 cf::reload_config; 3767 cf::reload_config;
3714 3768
3715 warn "loading extensions"; 3769 warn "loading extensions";
3716 cf::load_extensions; 3770 cf::load_extensions;
3717 3771
3772 if ($REATTACH_ON_RELOAD) {
3718 warn "reattaching attachments to objects/players"; 3773 warn "reattaching attachments to objects/players";
3719 _global_reattach; # objects, sockets 3774 _global_reattach; # objects, sockets
3720 warn "reattaching attachments to maps"; 3775 warn "reattaching attachments to maps";
3721 reattach $_ for values %MAP; 3776 reattach $_ for values %MAP;
3722 warn "reattaching attachments to players"; 3777 warn "reattaching attachments to players";
3723 reattach $_ for values %PLAYER; 3778 reattach $_ for values %PLAYER;
3779 }
3780
3781 warn "running post_init jobs";
3782 (pop @POST_INIT)->(1) while @POST_INIT;
3724 3783
3725 warn "leaving sync_job"; 3784 warn "leaving sync_job";
3726 3785
3727 1 3786 1
3728 } or do { 3787 } or do {
… …
3731 }; 3790 };
3732 3791
3733 warn "reloaded"; 3792 warn "reloaded";
3734 --$RELOAD; 3793 --$RELOAD;
3735 } 3794 }
3795
3796 $t1 = EV::time - $t1;
3797 warn "reload completed in ${t1}s\n";
3736}; 3798};
3737 3799
3738our $RELOAD_WATCHER; # used only during reload 3800our $RELOAD_WATCHER; # used only during reload
3739 3801
3740sub reload_perl() { 3802sub reload_perl() {
3741 # doing reload synchronously and two reloads happen back-to-back, 3803 # doing reload synchronously and two reloads happen back-to-back,
3742 # coro crashes during coro_state_free->destroy here. 3804 # coro crashes during coro_state_free->destroy here.
3743 3805
3806 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions;
3808
3744 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3745 do_reload_perl; 3810 do_reload_perl;
3746 undef $RELOAD_WATCHER; 3811 undef $RELOAD_WATCHER;
3812 };
3747 }; 3813 };
3748} 3814}
3749 3815
3750register_command "reload" => sub { 3816register_command "reload" => sub {
3751 my ($who, $arg) = @_; 3817 my ($who, $arg) = @_;
… …
3877 $msg =~ s/\n//; 3943 $msg =~ s/\n//;
3878 3944
3879 # limit the # of concurrent backtraces 3945 # limit the # of concurrent backtraces
3880 if ($_log_backtrace < 2) { 3946 if ($_log_backtrace < 2) {
3881 ++$_log_backtrace; 3947 ++$_log_backtrace;
3948 my $perl_bt = Carp::longmess $msg;
3882 async { 3949 async {
3883 $Coro::current->{desc} = "abt $msg"; 3950 $Coro::current->{desc} = "abt $msg";
3884 3951
3885 my @bt = fork_call { 3952 my @bt = fork_call {
3886 @addr = map { sprintf "%x", $_ } @addr; 3953 @addr = map { sprintf "%x", $_ } @addr;
… …
3897 } 3964 }
3898 3965
3899 @funcs 3966 @funcs
3900 }; 3967 };
3901 3968
3902 LOG llevInfo, "[ABT] $msg\n"; 3969 LOG llevInfo, "[ABT] $perl_bt\n";
3970 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3903 LOG llevInfo, "[ABT] $_\n" for @bt; 3971 LOG llevInfo, "[ABT] $_\n" for @bt;
3904 --$_log_backtrace; 3972 --$_log_backtrace;
3905 }; 3973 };
3906 } else { 3974 } else {
3907 LOG llevInfo, "[ABT] $msg\n"; 3975 LOG llevInfo, "[ABT] $msg\n";
3908 LOG llevInfo, "[ABT] [suppressed]\n"; 3976 LOG llevInfo, "[ABT] [suppressed]\n";
3909 } 3977 }
3910} 3978}
3911 3979
3912# load additional modules 3980# load additional modules
3913use cf::pod; 3981require "cf/$_.pm" for @EXTRA_MODULES;
3914 3982
3915END { cf::emergency_save } 3983END { cf::emergency_save }
3916 3984
39171 39851
3918 3986

Diff Legend

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