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.115 by root, Mon Jan 1 16:50:10 2007 UTC vs.
Revision 1.141 by root, Fri Jan 5 20:08:53 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
… …
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %MAP; # all maps 52our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 53our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 54our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 55our %EXT_CORO;
57 56
58binmode STDOUT; 57binmode STDOUT;
59binmode STDERR; 58binmode STDERR;
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 70mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 71mkdir $RANDOM_MAPS;
73 72
74# a special map that is always available 73# a special map that is always available
75our $LINK_MAP; 74our $LINK_MAP;
76 75our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 76
79############################################################################# 77#############################################################################
80 78
81=head2 GLOBAL VARIABLES 79=head2 GLOBAL VARIABLES
82 80
… …
181sub to_json($) { 179sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 180 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 181 JSON::Syck::Dump $_[0]
184} 182}
185 183
184=item cf::lock_wait $string
185
186Wait until the given lock is available. See cf::lock_acquire.
187
188=item my $lock = cf::lock_acquire $string
189
190Wait until the given lock is available and then acquires it and returns
191a Coro::guard object. If the guard object gets destroyed (goes out of scope,
192for example when the coroutine gets canceled), the lock is automatically
193returned.
194
195Lock names should begin with a unique identifier (for example, cf::map::find
196uses map_find and cf::map::load uses map_load).
197
198=cut
199
200our %LOCK;
201
202sub lock_wait($) {
203 my ($key) = @_;
204
205 # wait for lock, if any
206 while ($LOCK{$key}) {
207 push @{ $LOCK{$key} }, $Coro::current;
208 Coro::schedule;
209 }
210}
211
212sub lock_acquire($) {
213 my ($key) = @_;
214
215 # wait, to be sure we are not locked
216 lock_wait $key;
217
218 $LOCK{$key} = [];
219
220 Coro::guard {
221 # wake up all waiters, to be on the safe side
222 $_->ready for @{ delete $LOCK{$key} };
223 }
224}
225
226sub freeze_mainloop {
227 return unless $TICK_WATCHER->is_active;
228
229 my $guard = Coro::guard { $TICK_WATCHER->start };
230 $TICK_WATCHER->stop;
231 $guard
232}
233
234=item cf::async { BLOCK }
235
236Currently the same as Coro::async_pool, meaning you cannot use
237C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
238thing you are allowed to do is call C<prio> on it.
239
240=cut
241
242BEGIN { *async = \&Coro::async_pool }
243
186=item cf::sync_job { BLOCK } 244=item cf::sync_job { BLOCK }
187 245
188The design of crossfire+ requires that the main coro ($Coro::main) is 246The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 247always able to handle events or runnable, as crossfire+ is only partly
190reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 248reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
… …
203 # this is the main coro, too bad, we have to block 261 # this is the main coro, too bad, we have to block
204 # till the operation succeeds, freezing the server :/ 262 # till the operation succeeds, freezing the server :/
205 263
206 # TODO: use suspend/resume instead 264 # TODO: use suspend/resume instead
207 # (but this is cancel-safe) 265 # (but this is cancel-safe)
208 local $FREEZE = 1; 266 my $freeze_guard = freeze_mainloop;
209 267
210 my $busy = 1; 268 my $busy = 1;
211 my @res; 269 my @res;
212 270
213 (Coro::async { 271 (async {
214 @res = eval { $job->() }; 272 @res = eval { $job->() };
215 warn $@ if $@; 273 warn $@ if $@;
216 undef $busy; 274 undef $busy;
217 })->prio (Coro::PRIO_MAX); 275 })->prio (Coro::PRIO_MAX);
218 276
219 while ($busy) { 277 while ($busy) {
220 Coro::cede_notself; 278 Coro::cede or Event::one_event;
221 Event::one_event unless Coro::nready;
222 } 279 }
223 280
224 wantarray ? @res : $res[0] 281 wantarray ? @res : $res[0]
225 } else { 282 } else {
226 # we are in another coroutine, how wonderful, everything just works 283 # we are in another coroutine, how wonderful, everything just works
227 284
228 $job->() 285 $job->()
229 } 286 }
230} 287}
231 288
232=item $coro = cf::coro { BLOCK } 289=item $coro = cf::async_ext { BLOCK }
233 290
234Creates and returns a new coro. This coro is automcatially being canceled 291Like async, but this coro is automcatially being canceled when the
235when the extension calling this is being unloaded. 292extension calling this is being unloaded.
236 293
237=cut 294=cut
238 295
239sub coro(&) { 296sub async_ext(&) {
240 my $cb = shift; 297 my $cb = shift;
241 298
242 my $coro; $coro = async { 299 my $coro = &Coro::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 300
249 $coro->on_destroy (sub { 301 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 302 delete $EXT_CORO{$coro+0};
251 }); 303 });
252 $EXT_CORO{$coro+0} = $coro; 304 $EXT_CORO{$coro+0} = $coro;
… …
817 (aio_load "$filename.pst", $av) >= 0 869 (aio_load "$filename.pst", $av) >= 0
818 or return; 870 or return;
819 $av = eval { (Storable::thaw $av)->{objs} }; 871 $av = eval { (Storable::thaw $av)->{objs} };
820 } 872 }
821 873
874 warn sprintf "loading %s (%d)\n",
875 $filename, length $data, scalar @{$av || []};#d#
822 return ($data, $av); 876 return ($data, $av);
823} 877}
824 878
825############################################################################# 879#############################################################################
826# command handling &c 880# command handling &c
… …
1060package cf::map; 1114package cf::map;
1061 1115
1062use Fcntl; 1116use Fcntl;
1063use Coro::AIO; 1117use Coro::AIO;
1064 1118
1065our $MAX_RESET = 7200; 1119our $MAX_RESET = 3600;
1066our $DEFAULT_RESET = 3600; 1120our $DEFAULT_RESET = 3000;
1067 1121
1068sub generate_random_map { 1122sub generate_random_map {
1069 my ($path, $rmp) = @_; 1123 my ($path, $rmp) = @_;
1070 1124
1071 # mit "rum" bekleckern, nicht 1125 # mit "rum" bekleckern, nicht
… …
1087# and all this just because we cannot iterate over 1141# and all this just because we cannot iterate over
1088# all maps in C++... 1142# all maps in C++...
1089sub change_all_map_light { 1143sub change_all_map_light {
1090 my ($change) = @_; 1144 my ($change) = @_;
1091 1145
1092 $_->change_map_light ($change) for values %cf::MAP; 1146 $_->change_map_light ($change)
1147 for grep $_->outdoor, values %cf::MAP;
1093} 1148}
1094 1149
1095sub try_load_header($) { 1150sub try_load_header($) {
1096 my ($path) = @_; 1151 my ($path) = @_;
1097 1152
… …
1100 or return; 1155 or return;
1101 1156
1102 my $map = cf::map::new 1157 my $map = cf::map::new
1103 or return; 1158 or return;
1104 1159
1160 # for better error messages only, will be overwritten
1161 $map->path ($path);
1162
1105 $map->load_header ($path) 1163 $map->load_header ($path)
1106 or return; 1164 or return;
1107 1165
1108 $map->{load_path} = $path; 1166 $map->{load_path} = $path;
1109 1167
1110 $map 1168 $map
1111} 1169}
1112 1170
1171sub find;
1113sub find_map { 1172sub find {
1114 my ($path, $origin) = @_; 1173 my ($path, $origin) = @_;
1115 1174
1116 #warn "find_map<$path,$origin>\n";#d# 1175 #warn "find<$path,$origin>\n";#d#
1117 1176
1118 $path = new cf::path $path, $origin && $origin->path; 1177 $path = new cf::path $path, $origin && $origin->path;
1119 my $key = $path->as_string; 1178 my $key = $path->as_string;
1120 1179
1180 cf::lock_wait "map_find:$key";
1181
1121 $cf::MAP{$key} || do { 1182 $cf::MAP{$key} || do {
1183 my $guard = cf::lock_acquire "map_find:$key";
1184
1122 # do it the slow way 1185 # do it the slow way
1123 my $map = try_load_header $path->save_path; 1186 my $map = try_load_header $path->save_path;
1124 1187
1188 Coro::cede;
1189
1125 if ($map) { 1190 if ($map) {
1191 $map->last_access ((delete $map->{last_access})
1192 || $cf::RUNTIME); #d#
1126 # safety 1193 # safety
1127 $map->{instantiate_time} = $cf::RUNTIME 1194 $map->{instantiate_time} = $cf::RUNTIME
1128 if $map->{instantiate_time} > $cf::RUNTIME; 1195 if $map->{instantiate_time} > $cf::RUNTIME;
1129 } else { 1196 } else {
1130 if (my $rmp = $path->random_map_params) { 1197 if (my $rmp = $path->random_map_params) {
… …
1135 1202
1136 $map or return; 1203 $map or return;
1137 1204
1138 $map->{load_original} = 1; 1205 $map->{load_original} = 1;
1139 $map->{instantiate_time} = $cf::RUNTIME; 1206 $map->{instantiate_time} = $cf::RUNTIME;
1207 $map->last_access ($cf::RUNTIME);
1140 $map->instantiate; 1208 $map->instantiate;
1141 1209
1142 # per-player maps become, after loading, normal maps 1210 # per-player maps become, after loading, normal maps
1143 $map->per_player (0) if $path->{user_rel}; 1211 $map->per_player (0) if $path->{user_rel};
1144 } 1212 }
1145 1213
1146 $map->path ($key); 1214 $map->path ($key);
1147 $map->{path} = $path; 1215 $map->{path} = $path;
1148 $map->last_access ($cf::RUNTIME); 1216 $map->{last_save} = $cf::RUNTIME;
1217
1218 Coro::cede;
1149 1219
1150 if ($map->should_reset) { 1220 if ($map->should_reset) {
1151 $map->reset; 1221 $map->reset;
1222 undef $guard;
1152 $map = find_map $path; 1223 $map = find $path
1224 or return;
1153 } 1225 }
1154 1226
1155 $cf::MAP{$key} = $map 1227 $cf::MAP{$key} = $map
1156 } 1228 }
1157} 1229}
1158 1230
1159sub load { 1231sub load {
1160 my ($self) = @_; 1232 my ($self) = @_;
1161 1233
1234 my $path = $self->{path};
1235 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1236
1162 return if $self->in_memory != cf::MAP_SWAPPED; 1237 return if $self->in_memory != cf::MAP_SWAPPED;
1163 1238
1164 $self->in_memory (cf::MAP_LOADING); 1239 $self->in_memory (cf::MAP_LOADING);
1165
1166 my $path = $self->{path};
1167 1240
1168 $self->alloc; 1241 $self->alloc;
1169 $self->load_objects ($self->{load_path}, 1) 1242 $self->load_objects ($self->{load_path}, 1)
1170 or return; 1243 or return;
1171 1244
… …
1177 if (aio_open $uniq, O_RDONLY, 0) { 1250 if (aio_open $uniq, O_RDONLY, 0) {
1178 $self->clear_unique_items; 1251 $self->clear_unique_items;
1179 $self->load_objects ($uniq, 0); 1252 $self->load_objects ($uniq, 0);
1180 } 1253 }
1181 } 1254 }
1255
1256 Coro::cede;
1182 1257
1183 # now do the right thing for maps 1258 # now do the right thing for maps
1184 $self->link_multipart_objects; 1259 $self->link_multipart_objects;
1185 1260
1186 if ($self->{path}->is_style_map) { 1261 if ($self->{path}->is_style_map) {
… …
1194 $self->difficulty ($self->estimate_difficulty) 1269 $self->difficulty ($self->estimate_difficulty)
1195 unless $self->difficulty; 1270 unless $self->difficulty;
1196 $self->activate; 1271 $self->activate;
1197 } 1272 }
1198 1273
1274 Coro::cede;
1275
1199 $self->in_memory (cf::MAP_IN_MEMORY); 1276 $self->in_memory (cf::MAP_IN_MEMORY);
1200} 1277}
1201 1278
1202sub load_map_sync { 1279sub find_sync {
1203 my ($path, $origin) = @_; 1280 my ($path, $origin) = @_;
1204 1281
1205 #warn "load_map_sync<$path, $origin>\n";#d# 1282 cf::sync_job { cf::map::find $path, $origin }
1283}
1206 1284
1207 cf::sync_job { 1285sub do_load_sync {
1208 my $map = cf::map::find_map $path, $origin 1286 my ($map) = @_;
1209 or return; 1287
1210 $map->load; 1288 cf::sync_job { $map->load };
1211 $map
1212 }
1213} 1289}
1214 1290
1215sub save { 1291sub save {
1216 my ($self) = @_; 1292 my ($self) = @_;
1217 1293
1294 my $lock = cf::lock_acquire "map_data:" . $self->path;
1295
1296 $self->{last_save} = $cf::RUNTIME;
1297
1298 return unless $self->dirty;
1299
1218 my $save = $self->{path}->save_path; utf8::encode $save; 1300 my $save = $self->{path}->save_path; utf8::encode $save;
1219 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1301 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1220 1302
1221 $self->{last_save} = $cf::RUNTIME;
1222
1223 return unless $self->dirty;
1224
1225 $self->{load_path} = $save; 1303 $self->{load_path} = $save;
1226 1304
1227 return if $self->{deny_save}; 1305 return if $self->{deny_save};
1306
1307 local $self->{last_access} = $self->last_access;#d#
1228 1308
1229 if ($uniq) { 1309 if ($uniq) {
1230 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1310 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1231 $self->save_objects ($uniq, cf::IO_UNIQUES); 1311 $self->save_objects ($uniq, cf::IO_UNIQUES);
1232 } else { 1312 } else {
… …
1235} 1315}
1236 1316
1237sub swap_out { 1317sub swap_out {
1238 my ($self) = @_; 1318 my ($self) = @_;
1239 1319
1320 # save first because save cedes
1321 $self->save;
1322
1323 my $lock = cf::lock_acquire "map_data:" . $self->path;
1324
1240 return if $self->players; 1325 return if $self->players;
1241 return if $self->in_memory != cf::MAP_IN_MEMORY; 1326 return if $self->in_memory != cf::MAP_IN_MEMORY;
1242 return if $self->{deny_save}; 1327 return if $self->{deny_save};
1243 1328
1244 $self->save;
1245 $self->clear; 1329 $self->clear;
1246 $self->in_memory (cf::MAP_SWAPPED); 1330 $self->in_memory (cf::MAP_SWAPPED);
1247} 1331}
1248 1332
1249sub reset_at { 1333sub reset_at {
… …
1287} 1371}
1288 1372
1289sub reset { 1373sub reset {
1290 my ($self) = @_; 1374 my ($self) = @_;
1291 1375
1376 my $lock = cf::lock_acquire "map_data:" . $self->path;
1377
1292 return if $self->players; 1378 return if $self->players;
1293 return if $self->{path}{user_rel};#d# 1379 return if $self->{path}{user_rel};#d#
1294 1380
1295 warn "resetting map ", $self->path;#d# 1381 warn "resetting map ", $self->path;#d#
1296 1382
… …
1315 1401
1316sub customise_for { 1402sub customise_for {
1317 my ($map, $ob) = @_; 1403 my ($map, $ob) = @_;
1318 1404
1319 if ($map->per_player) { 1405 if ($map->per_player) {
1320 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1406 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1321 } 1407 }
1322 1408
1323 $map 1409 $map
1324} 1410}
1325 1411
1326sub emergency_save { 1412sub emergency_save {
1327 local $cf::FREEZE = 1; 1413 my $freeze_guard = cf::freeze_mainloop;
1328 1414
1329 warn "enter emergency map save\n"; 1415 warn "enter emergency map save\n";
1330 1416
1331 cf::sync_job { 1417 cf::sync_job {
1332 warn "begin emergency map save\n"; 1418 warn "begin emergency map save\n";
… …
1404=cut 1490=cut
1405 1491
1406sub cf::object::player::enter_link { 1492sub cf::object::player::enter_link {
1407 my ($self) = @_; 1493 my ($self) = @_;
1408 1494
1495 $self->deactivate_recursive;
1496
1409 return if $self->map == $LINK_MAP; 1497 return if $self->map == $LINK_MAP;
1410 1498
1411 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1499 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1412 if $self->map; 1500 if $self->map;
1413 1501
1414 $self->enter_map ($LINK_MAP, 20, 20); 1502 $self->enter_map ($LINK_MAP, 20, 20);
1415 $self->deactivate_recursive;
1416} 1503}
1417 1504
1418sub cf::object::player::leave_link { 1505sub cf::object::player::leave_link {
1419 my ($self, $map, $x, $y) = @_; 1506 my ($self, $map, $x, $y) = @_;
1420 1507
1421 my $link_pos = delete $self->{_link_pos}; 1508 my $link_pos = delete $self->{_link_pos};
1422 1509
1423 unless ($map) { 1510 unless ($map) {
1424 # restore original map position 1511 # restore original map position
1425 ($map, $x, $y) = @{ $link_pos || [] }; 1512 ($map, $x, $y) = @{ $link_pos || [] };
1426 $map = cf::map::find_map $map; 1513 $map = cf::map::find $map;
1427 1514
1428 unless ($map) { 1515 unless ($map) {
1429 ($map, $x, $y) = @$EMERGENCY_POSITION; 1516 ($map, $x, $y) = @$EMERGENCY_POSITION;
1430 $map = cf::map::find_map $map 1517 $map = cf::map::find $map
1431 or die "FATAL: cannot load emergency map\n"; 1518 or die "FATAL: cannot load emergency map\n";
1432 } 1519 }
1433 } 1520 }
1434 1521
1435 ($x, $y) = (-1, -1) 1522 ($x, $y) = (-1, -1)
… …
1443 1530
1444 $self->activate_recursive; 1531 $self->activate_recursive;
1445 $self->enter_map ($map, $x, $y); 1532 $self->enter_map ($map, $x, $y);
1446} 1533}
1447 1534
1535cf::player->attach (
1536 on_logout => sub {
1537 my ($pl) = @_;
1538
1539 # abort map switching before logout
1540 if ($pl->ob->{_link_pos}) {
1541 cf::sync_job {
1542 $pl->ob->leave_link
1543 };
1544 }
1545 },
1546 on_login => sub {
1547 my ($pl) = @_;
1548
1549 # try to abort aborted map switching on player login :)
1550 # should happen only on crashes
1551 if ($pl->ob->{_link_pos}) {
1552
1553 $pl->ob->enter_link;
1554 (async {
1555 # we need this sleep as the login has a concurrent enter_exit running
1556 # and this sleep increases chances of the player not ending up in scorn
1557 $pl->ob->reply (undef,
1558 "There was an internal problem at your last logout, "
1559 . "the server will try to bring you to your intended destination in a second.",
1560 cf::NDI_RED);
1561 Coro::Timer::sleep 1;
1562 $pl->ob->leave_link;
1563 })->prio (2);
1564 }
1565 },
1566);
1567
1448=item $player_object->goto_map ($map, $x, $y) 1568=item $player_object->goto ($path, $x, $y)
1449 1569
1450=cut 1570=cut
1451 1571
1452sub cf::object::player::goto_map { 1572sub cf::object::player::goto {
1453 my ($self, $path, $x, $y) = @_; 1573 my ($self, $path, $x, $y) = @_;
1454 1574
1455 $self->enter_link; 1575 $self->enter_link;
1456 1576
1457 (Coro::async { 1577 (async {
1458 $path = new cf::path $path; 1578 $path = new cf::path $path;
1459 1579
1460 my $map = cf::map::find_map $path->as_string; 1580 my $map = cf::map::find $path->as_string;
1461 $map = $map->customise_for ($self) if $map; 1581 $map = $map->customise_for ($self) if $map;
1462 1582
1463 warn "entering ", $map->path, " at ($x, $y)\n" 1583# warn "entering ", $map->path, " at ($x, $y)\n"
1464 if $map; 1584# if $map;
1465 1585
1466 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1586 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1467 1587
1468 $self->leave_link ($map, $x, $y); 1588 $self->leave_link ($map, $x, $y);
1469 })->prio (1); 1589 })->prio (1);
… …
1524 1644
1525 return unless $self->type == cf::PLAYER; 1645 return unless $self->type == cf::PLAYER;
1526 1646
1527 $self->enter_link; 1647 $self->enter_link;
1528 1648
1529 (Coro::async { 1649 (async {
1650 $self->deactivate_recursive; # just to be sure
1530 unless (eval { 1651 unless (eval {
1531
1532 prepare_random_map $exit 1652 prepare_random_map $exit
1533 if $exit->slaying eq "/!"; 1653 if $exit->slaying eq "/!";
1534 1654
1535 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1655 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1536 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1656 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1537 1657
1538 1; 1658 1;
1539 }) { 1659 }) {
1540 $self->message ("Something went wrong deep within the crossfire server. " 1660 $self->message ("Something went wrong deep within the crossfire server. "
1541 . "I'll try to bring you back to the map you were before. " 1661 . "I'll try to bring you back to the map you were before. "
… …
1598 on_reply => sub { 1718 on_reply => sub {
1599 my ($ns, $msg) = @_; 1719 my ($ns, $msg) = @_;
1600 1720
1601 # this weird shuffling is so that direct followup queries 1721 # this weird shuffling is so that direct followup queries
1602 # get handled first 1722 # get handled first
1603 my $queue = delete $ns->{query_queue}; 1723 my $queue = delete $ns->{query_queue}
1724 or return; # be conservative, not sure how that can happen, but we saw a crash here
1604 1725
1605 (shift @$queue)->[1]->($msg); 1726 (shift @$queue)->[1]->($msg);
1606 1727
1607 push @{ $ns->{query_queue} }, @$queue; 1728 push @{ $ns->{query_queue} }, @$queue;
1608 1729
… …
1614 } 1735 }
1615 } 1736 }
1616 }, 1737 },
1617); 1738);
1618 1739
1619=item $client->coro (\&cb) 1740=item $client->async (\&cb)
1620 1741
1621Create a new coroutine, running the specified callback. The coroutine will 1742Create a new coroutine, running the specified callback. The coroutine will
1622be automatically cancelled when the client gets destroyed (e.g. on logout, 1743be automatically cancelled when the client gets destroyed (e.g. on logout,
1623or loss of connection). 1744or loss of connection).
1624 1745
1625=cut 1746=cut
1626 1747
1627sub cf::client::coro { 1748sub cf::client::async {
1628 my ($self, $cb) = @_; 1749 my ($self, $cb) = @_;
1629 1750
1630 my $coro; $coro = async { 1751 my $coro = &Coro::async ($cb);
1631 eval {
1632 $cb->();
1633 };
1634 warn $@ if $@;
1635 };
1636 1752
1637 $coro->on_destroy (sub { 1753 $coro->on_destroy (sub {
1638 delete $self->{_coro}{$coro+0}; 1754 delete $self->{_coro}{$coro+0};
1639 }); 1755 });
1640 1756
… …
1812 1928
1813{ 1929{
1814 my $path = cf::localdir . "/database.pst"; 1930 my $path = cf::localdir . "/database.pst";
1815 1931
1816 sub db_load() { 1932 sub db_load() {
1817 warn "loading database $path\n";#d# remove later
1818 $DB = stat $path ? Storable::retrieve $path : { }; 1933 $DB = stat $path ? Storable::retrieve $path : { };
1819 } 1934 }
1820 1935
1821 my $pid; 1936 my $pid;
1822 1937
1823 sub db_save() { 1938 sub db_save() {
1824 warn "saving database $path\n";#d# remove later
1825 waitpid $pid, 0 if $pid; 1939 waitpid $pid, 0 if $pid;
1826 if (0 == ($pid = fork)) { 1940 if (0 == ($pid = fork)) {
1827 $DB->{_meta}{version} = 1; 1941 $DB->{_meta}{version} = 1;
1828 Storable::nstore $DB, "$path~"; 1942 Storable::nstore $DB, "$path~";
1829 rename "$path~", $path; 1943 rename "$path~", $path;
… …
1877 open my $fh, "<:utf8", cf::confdir . "/config" 1991 open my $fh, "<:utf8", cf::confdir . "/config"
1878 or return; 1992 or return;
1879 1993
1880 local $/; 1994 local $/;
1881 *CFG = YAML::Syck::Load <$fh>; 1995 *CFG = YAML::Syck::Load <$fh>;
1996
1997 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1998
1999 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2000 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2001
2002 if (exists $CFG{mlockall}) {
2003 eval {
2004 $CFG{mlockall} ? &mlockall : &munlockall
2005 and die "WARNING: m(un)lockall failed: $!\n";
2006 };
2007 warn $@ if $@;
2008 }
1882} 2009}
1883 2010
1884sub main { 2011sub main {
1885 # we must not ever block the main coroutine 2012 # we must not ever block the main coroutine
1886 local $Coro::idle = sub { 2013 local $Coro::idle = sub {
1887 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2014 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1888 (Coro::unblock_sub {
1889 Event::one_event; 2015 async { Event::one_event };
1890 })->();
1891 }; 2016 };
1892 2017
1893 cfg_load; 2018 cfg_load;
1894 db_load; 2019 db_load;
1895 load_extensions; 2020 load_extensions;
… …
1906 return; 2031 return;
1907 } 2032 }
1908 2033
1909 warn "reloading..."; 2034 warn "reloading...";
1910 2035
1911 local $FREEZE = 1; 2036 my $guard = freeze_mainloop;
1912 cf::emergency_save; 2037 cf::emergency_save;
1913 2038
1914 eval { 2039 eval {
1915 # if anything goes wrong in here, we should simply crash as we already saved 2040 # if anything goes wrong in here, we should simply crash as we already saved
1916 2041
… …
2052 reentrant => 0, 2177 reentrant => 0,
2053 prio => 0, 2178 prio => 0,
2054 at => $NEXT_TICK || $TICK, 2179 at => $NEXT_TICK || $TICK,
2055 data => WF_AUTOCANCEL, 2180 data => WF_AUTOCANCEL,
2056 cb => sub { 2181 cb => sub {
2057 unless ($FREEZE) {
2058 cf::server_tick; # one server iteration 2182 cf::server_tick; # one server iteration
2059 $RUNTIME += $TICK; 2183 $RUNTIME += $TICK;
2060 }
2061
2062 $NEXT_TICK += $TICK; 2184 $NEXT_TICK += $TICK;
2063 2185
2064 # if we are delayed by four ticks or more, skip them all 2186 # if we are delayed by four ticks or more, skip them all
2065 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2187 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2066 2188
… …
2089 or warn "ERROR: unable to write runtime file: $!"; 2211 or warn "ERROR: unable to write runtime file: $!";
2090 })->(); 2212 })->();
2091 }, 2213 },
2092); 2214);
2093 2215
2216END { cf::emergency_save }
2217
20941 22181
2095 2219

Diff Legend

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