Skip to content

Commit 2648e28

Browse files
committed
kernel: remove some private stuff from header files
1 parent 3822353 commit 2648e28

8 files changed

Lines changed: 13 additions & 108 deletions

File tree

src/collectors.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,6 @@
6565
#define SC_RWS_GENERATORS(sc) \
6666
(CONST_ADDR_OBJ(sc)[SCP_RWS_GENERATORS])
6767

68-
/****************************************************************************
69-
**
70-
*F FuncFinPowConjCol_CollectWordOrFail( <self>, <sc>, <vv>, <w> )
71-
*/
72-
extern Obj FuncFinPowConjCol_CollectWordOrFail ( Obj, Obj, Obj, Obj );
73-
7468

7569
/****************************************************************************
7670
**

src/hpc/thread.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ typedef struct ThreadData {
6060
} ThreadData;
6161

6262
Region *LimboRegion, *ReadOnlyRegion;
63-
Obj PublicRegion;
6463
Obj PublicRegionName;
6564

6665
static int GlobalPauseInProgress;

src/hpc/thread.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ void RegionUnlock(Region *region);
6262
Region *CurrentRegion(void);
6363
Region *GetRegionOf(Obj obj);
6464
extern Region *LimboRegion, *ReadOnlyRegion;
65-
extern Obj PublicRegion;
6665
extern Obj PublicRegionName;
6766

6867
void SetRegionName(Region *region, Obj name);

src/hpc/threadapi.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ struct WaitList {
6969
ThreadLocalStorage * thread;
7070
};
7171

72+
typedef struct {
73+
pthread_mutex_t lock;
74+
struct WaitList *head, *tail;
75+
} Monitor;
76+
7277
typedef struct Channel {
7378
Obj monitor;
7479
Obj queue;
@@ -618,7 +623,7 @@ Obj FuncResumeThread(Obj self, Obj thread)
618623
*F FuncRegionOf ... return region of an object
619624
**
620625
*/
621-
626+
static Obj PublicRegion;
622627

623628
Obj FuncRegionOf(Obj self, Obj obj)
624629
{

src/hpc/threadapi.h

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -34,33 +34,11 @@ typedef struct ThreadObject {
3434

3535
Obj NewThreadObject(UInt id);
3636

37-
38-
typedef struct {
39-
pthread_mutex_t lock;
40-
struct WaitList *head, *tail;
41-
} Monitor;
42-
4337
Obj KeepAlive(Obj);
4438
void StopKeepAlive(Obj);
4539
#define KEPTALIVE(obj) (ADDR_OBJ(obj)[1])
4640

47-
EXPORT_INLINE Monitor *MonitorPtr(Obj obj)
48-
{
49-
assert(TNUM_OBJ(obj) == T_MONITOR);
50-
return (Monitor *)(PTR_BAG(obj));
51-
}
52-
Obj NewMonitor(void);
53-
void LockMonitor(Monitor *monitor);
54-
int TryLockMonitor(Monitor *monitor);
55-
void UnlockMonitor(Monitor *monitor);
56-
void WaitForMonitor(Monitor *monitor);
57-
UInt WaitForAnyMonitor(UInt count, Monitor **monitors);
58-
void SignalMonitor(Monitor *monitor);
59-
void SortMonitors(UInt count, Monitor **monitors);
60-
void LockMonitors(UInt count, Monitor **monitors);
61-
void UnlockMonitors(UInt count, Monitor **monitors);
62-
63-
void InitSignals(void);
41+
extern void InitSignals(void);
6442

6543

6644
/****************************************************************************

src/lists.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -636,12 +636,6 @@ EXPORT_INLINE Int IS_SSORT_LIST(Obj list)
636636
return (*IsSSortListFuncs[TNUM_OBJ(list)])(list);
637637
}
638638

639-
/****************************************************************************
640-
**
641-
*F IsSSortListProp
642-
*/
643-
extern Obj IsSSortListProp;
644-
645639

646640
/****************************************************************************
647641
**

src/opers.c

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ static Obj ArglistObjVal;
5656
static Obj ArglistObj;
5757

5858

59+
static Obj SetterAndFilter(Obj getter);
60+
static Obj TesterAndFilter(Obj getter);
61+
62+
5963
/****************************************************************************
6064
**
6165
*F * * * * * * * * * * * * internal flags functions * * * * * * * * * * * * *
@@ -2428,13 +2432,6 @@ Obj NewConstructor(Obj name)
24282432
}
24292433

24302434

2431-
/****************************************************************************
2432-
**
2433-
*F DoAttribute( <name> ) . . . . . . . . . . . . . . . make a new attribute
2434-
*/
2435-
2436-
2437-
24382435
/****************************************************************************
24392436
**
24402437
** DoTestAttribute( <attr>, <obj> )
@@ -2755,7 +2752,6 @@ static void SetupAttribute(Obj attr, Obj setter, Obj tester, Int flag2)
27552752
SET_ENABLED_ATTR(attr,1);
27562753
CHANGED_BAG(attr);
27572754
}
2758-
27592755

27602756

27612757
Obj NewAttribute (
@@ -2781,6 +2777,7 @@ Obj NewAttribute (
27812777
return getter;
27822778
}
27832779

2780+
27842781
/****************************************************************************
27852782
**
27862783
*F ConvertOperationIntoAttribute( <oper> ) transform an operation (which

src/opers.h

Lines changed: 1 addition & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -490,63 +490,10 @@ extern Obj SET_FILTER_OBJ;
490490
extern Obj RESET_FILTER_OBJ;
491491

492492

493-
494-
/****************************************************************************
495-
**
496-
*F SetterFilter( <oper> ) . . . . . . . . . . . . . . . setter of a filter
497-
*/
498-
extern Obj SetterFilter (
499-
Obj oper );
500-
501-
502-
/****************************************************************************
503-
**
504-
*F SetterAndFilter( <getter> ) . . . . . . setter of a concatenated filter
505-
*/
506-
extern Obj DoSetAndFilter (
507-
Obj self,
508-
Obj obj,
509-
Obj val );
510-
511-
extern Obj SetterAndFilter (
512-
Obj getter );
513-
514-
515-
/****************************************************************************
516-
**
517-
*F TesterFilter( <oper> ) . . . . . . . . . . . . . . . tester of a filter
518-
*/
519-
extern Obj TesterFilter (
520-
Obj oper );
521-
522-
523-
/****************************************************************************
524-
**
525-
*F TestAndFilter( <getter> ) . . . . . . . .tester of a concatenated filter
526-
*/
527-
extern Obj DoTestAndFilter (
528-
Obj self,
529-
Obj obj );
530-
531-
extern Obj TesterAndFilter (
532-
Obj getter );
533-
534-
535493
/****************************************************************************
536494
**
537495
*F NewFilter( <name>, <narg>, <nams>, <hdlr> ) . . . . . make a new filter
538496
*/
539-
extern Obj NewTesterFilter (
540-
Obj getter );
541-
542-
extern Obj DoSetFilter (
543-
Obj self,
544-
Obj obj,
545-
Obj val );
546-
547-
extern Obj NewSetterFilter (
548-
Obj getter );
549-
550497
extern Obj DoFilter (
551498
Obj self,
552499
Obj obj );
@@ -557,17 +504,13 @@ extern Obj NewFilter (
557504
Obj nams,
558505
ObjFunc hdlr );
559506

560-
561507
extern Obj DoTestAttribute( Obj self, Obj obj);
562508

509+
563510
/****************************************************************************
564511
**
565512
*F NewAndFilter( <filt1>, <filt2> ) . . . . . make a new concatenated filter
566513
*/
567-
extern Obj DoAndFilter (
568-
Obj self,
569-
Obj obj );
570-
571514
extern Obj NewAndFilter (
572515
Obj oper1,
573516
Obj oper2 );
@@ -697,10 +640,6 @@ extern Obj DoAttribute (
697640
Obj self,
698641
Obj obj );
699642

700-
extern Obj DoVerboseAttribute (
701-
Obj self,
702-
Obj obj );
703-
704643
extern Obj NewAttribute (
705644
Obj name,
706645
Int narg,

0 commit comments

Comments
 (0)